From 7e9032857c3cb980b2c13e88160ceb7c93e9a28c Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:00:44 +0530
Subject: [PATCH 01/20] feat(terminal): Add core infrastructure for custom
 terminal configurations

- Add TerminalConfig types to settings schema (global & project-specific)
- Create RC generator with hex-to-xterm-256 color mapping
- Create RC file manager for .automaker/terminal/ directory
- Add terminal theme color data (40 themes) to platform package
- Integrate terminal config injection into TerminalService
- Support bash, zsh, and sh with proper env var injection (BASH_ENV, ZDOTDIR, ENV)
- Add onThemeChange hook for theme synchronization

Part of custom terminal configurations feature implementation.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 apps/server/src/lib/terminal-themes-data.ts  |  25 +
 apps/server/src/services/terminal-service.ts | 149 ++++-
 apps/ui/src/config/terminal-themes.d.ts      |  66 +++
 apps/ui/src/config/terminal-themes.d.ts.map  |   1 +
 apps/ui/src/config/terminal-themes.js        | 566 ++++++++++++++++++
 apps/ui/src/config/terminal-themes.js.map    |   1 +
 docs/terminal-custom-configs-plan.md         | 572 +++++++++++++++++++
 libs/platform/src/index.ts                   |  34 ++
 libs/platform/src/rc-file-manager.ts         | 250 ++++++++
 libs/platform/src/rc-generator.ts            | 423 ++++++++++++++
 libs/platform/src/terminal-theme-colors.ts   | 468 +++++++++++++++
 libs/types/src/settings.ts                   |  56 +-
 12 files changed, 2602 insertions(+), 9 deletions(-)
 create mode 100644 apps/server/src/lib/terminal-themes-data.ts
 create mode 100644 apps/ui/src/config/terminal-themes.d.ts
 create mode 100644 apps/ui/src/config/terminal-themes.d.ts.map
 create mode 100644 apps/ui/src/config/terminal-themes.js
 create mode 100644 apps/ui/src/config/terminal-themes.js.map
 create mode 100644 docs/terminal-custom-configs-plan.md
 create mode 100644 libs/platform/src/rc-file-manager.ts
 create mode 100644 libs/platform/src/rc-generator.ts
 create mode 100644 libs/platform/src/terminal-theme-colors.ts

diff --git a/apps/server/src/lib/terminal-themes-data.ts b/apps/server/src/lib/terminal-themes-data.ts
new file mode 100644
index 000000000..854bf1a80
--- /dev/null
+++ b/apps/server/src/lib/terminal-themes-data.ts
@@ -0,0 +1,25 @@
+/**
+ * Terminal Theme Data - Re-export terminal themes from platform package
+ *
+ * This module re-exports terminal theme data for use in the server.
+ */
+
+import { terminalThemeColors, getTerminalThemeColors as getThemeColors } from '@automaker/platform';
+import type { ThemeMode } from '@automaker/types';
+import type { TerminalTheme } from '@automaker/platform';
+
+/**
+ * Get terminal theme colors for a given theme mode
+ */
+export function getTerminalThemeColors(theme: ThemeMode): TerminalTheme {
+  return getThemeColors(theme);
+}
+
+/**
+ * Get all terminal themes
+ */
+export function getAllTerminalThemes(): Record<ThemeMode, TerminalTheme> {
+  return terminalThemeColors;
+}
+
+export default terminalThemeColors;
diff --git a/apps/server/src/services/terminal-service.ts b/apps/server/src/services/terminal-service.ts
index f83aaede6..836ddabdd 100644
--- a/apps/server/src/services/terminal-service.ts
+++ b/apps/server/src/services/terminal-service.ts
@@ -13,6 +13,14 @@ import * as path from 'path';
 // to enforce ALLOWED_ROOT_DIRECTORY security boundary
 import * as secureFs from '../lib/secure-fs.js';
 import { createLogger } from '@automaker/utils';
+import type { SettingsService } from './settings-service.js';
+import { getTerminalThemeColors, getAllTerminalThemes } from '../lib/terminal-themes-data.js';
+import {
+  getRcFilePath,
+  getTerminalDir,
+  ensureRcFilesUpToDate,
+  type TerminalConfig,
+} from '@automaker/platform';
 
 const logger = createLogger('Terminal');
 // System paths module handles shell binary checks and WSL detection
@@ -77,6 +85,12 @@ export class TerminalService extends EventEmitter {
     !!(process.versions && (process.versions as Record<string, string>).electron) ||
     !!process.env.ELECTRON_RUN_AS_NODE;
   private useConptyFallback = false; // Track if we need to use winpty fallback on Windows
+  private settingsService: SettingsService | null = null;
+
+  constructor(settingsService?: SettingsService) {
+    super();
+    this.settingsService = settingsService || null;
+  }
 
   /**
    * Kill a PTY process with platform-specific handling.
@@ -332,6 +346,90 @@ export class TerminalService extends EventEmitter {
       }
     }
 
+    // Terminal config injection (custom prompts, themes)
+    const terminalConfigEnv: Record<string, string> = {};
+    if (this.settingsService) {
+      try {
+        const globalSettings = await this.settingsService.getGlobalSettings();
+        const projectSettings = options.cwd
+          ? await this.settingsService.getProjectSettings(options.cwd)
+          : null;
+
+        // Merge global and project terminal configs
+        const globalTerminalConfig = globalSettings?.terminalConfig;
+        const projectTerminalConfig = projectSettings?.terminalConfig;
+
+        // Determine if terminal config is enabled
+        const enabled =
+          projectTerminalConfig?.enabled !== undefined
+            ? projectTerminalConfig.enabled
+            : globalTerminalConfig?.enabled || false;
+
+        if (enabled && globalTerminalConfig) {
+          const currentTheme = globalSettings?.theme || 'dark';
+          const themeColors = getTerminalThemeColors(currentTheme);
+          const allThemes = getAllTerminalThemes();
+
+          // Full config object (global + project overrides)
+          const effectiveConfig: TerminalConfig = {
+            enabled: true,
+            customPrompt: globalTerminalConfig.customPrompt,
+            promptFormat: globalTerminalConfig.promptFormat,
+            showGitBranch: globalTerminalConfig.showGitBranch,
+            showGitStatus: globalTerminalConfig.showGitStatus,
+            customAliases:
+              projectTerminalConfig?.customAliases || globalTerminalConfig.customAliases,
+            customEnvVars: {
+              ...globalTerminalConfig.customEnvVars,
+              ...projectTerminalConfig?.customEnvVars,
+            },
+            rcFileVersion: globalTerminalConfig.rcFileVersion,
+          };
+
+          // Ensure RC files are up to date
+          await ensureRcFilesUpToDate(
+            options.cwd || cwd,
+            currentTheme,
+            effectiveConfig,
+            themeColors,
+            allThemes
+          );
+
+          // Set shell-specific env vars
+          const shellName = path.basename(shell).toLowerCase();
+
+          if (shellName.includes('bash')) {
+            terminalConfigEnv.BASH_ENV = getRcFilePath(options.cwd || cwd, 'bash');
+            terminalConfigEnv.AUTOMAKER_CUSTOM_PROMPT = effectiveConfig.customPrompt
+              ? 'true'
+              : 'false';
+            terminalConfigEnv.AUTOMAKER_THEME = currentTheme;
+          } else if (shellName.includes('zsh')) {
+            terminalConfigEnv.ZDOTDIR = getTerminalDir(options.cwd || cwd);
+            terminalConfigEnv.AUTOMAKER_CUSTOM_PROMPT = effectiveConfig.customPrompt
+              ? 'true'
+              : 'false';
+            terminalConfigEnv.AUTOMAKER_THEME = currentTheme;
+          } else if (shellName === 'sh') {
+            terminalConfigEnv.ENV = getRcFilePath(options.cwd || cwd, 'sh');
+            terminalConfigEnv.AUTOMAKER_CUSTOM_PROMPT = effectiveConfig.customPrompt
+              ? 'true'
+              : 'false';
+            terminalConfigEnv.AUTOMAKER_THEME = currentTheme;
+          }
+
+          // Add custom env vars from config
+          Object.assign(terminalConfigEnv, effectiveConfig.customEnvVars);
+
+          logger.info(
+            `[createSession] Terminal config enabled for session ${id}, shell: ${shellName}`
+          );
+        }
+      } catch (error) {
+        logger.warn(`[createSession] Failed to apply terminal config: ${error}`);
+      }
+    }
+
     const env: Record<string, string> = {
       ...cleanEnv,
       TERM: 'xterm-256color',
@@ -341,6 +439,7 @@ export class TerminalService extends EventEmitter {
       LANG: process.env.LANG || 'en_US.UTF-8',
       LC_ALL: process.env.LC_ALL || process.env.LANG || 'en_US.UTF-8',
       ...options.env,
+      ...terminalConfigEnv, // Apply terminal config env vars last (highest priority)
     };
 
     logger.info(`Creating session ${id} with shell: ${shell} in ${cwd}`);
@@ -652,6 +751,52 @@ export class TerminalService extends EventEmitter {
     return () => this.exitCallbacks.delete(callback);
   }
 
+  /**
+   * Handle theme change - regenerate RC files with new theme colors
+   */
+  async onThemeChange(projectPath: string, newTheme: string): Promise<void> {
+    if (!this.settingsService) {
+      logger.warn('[onThemeChange] SettingsService not available');
+      return;
+    }
+
+    try {
+      const globalSettings = await this.settingsService.getGlobalSettings();
+      const terminalConfig = globalSettings?.terminalConfig;
+
+      if (terminalConfig?.enabled) {
+        const themeColors = getTerminalThemeColors(
+          newTheme as import('@automaker/types').ThemeMode
+        );
+        const allThemes = getAllTerminalThemes();
+
+        // Regenerate RC files with new theme
+        const effectiveConfig: TerminalConfig = {
+          enabled: true,
+          customPrompt: terminalConfig.customPrompt,
+          promptFormat: terminalConfig.promptFormat,
+          showGitBranch: terminalConfig.showGitBranch,
+          showGitStatus: terminalConfig.showGitStatus,
+          customAliases: terminalConfig.customAliases,
+          customEnvVars: terminalConfig.customEnvVars,
+          rcFileVersion: terminalConfig.rcFileVersion,
+        };
+
+        await ensureRcFilesUpToDate(
+          projectPath,
+          newTheme as import('@automaker/types').ThemeMode,
+          effectiveConfig,
+          themeColors,
+          allThemes
+        );
+
+        logger.info(`[onThemeChange] Regenerated RC files for theme: ${newTheme}`);
+      }
+    } catch (error) {
+      logger.error(`[onThemeChange] Failed to regenerate RC files: ${error}`);
+    }
+  }
+
   /**
    * Clean up all sessions
    */
@@ -676,9 +821,9 @@ export class TerminalService extends EventEmitter {
 // Singleton instance
 let terminalService: TerminalService | null = null;
 
-export function getTerminalService(): TerminalService {
+export function getTerminalService(settingsService?: SettingsService): TerminalService {
   if (!terminalService) {
-    terminalService = new TerminalService();
+    terminalService = new TerminalService(settingsService);
   }
   return terminalService;
 }
diff --git a/apps/ui/src/config/terminal-themes.d.ts b/apps/ui/src/config/terminal-themes.d.ts
new file mode 100644
index 000000000..e4a875743
--- /dev/null
+++ b/apps/ui/src/config/terminal-themes.d.ts
@@ -0,0 +1,66 @@
+/**
+ * Terminal themes that match the app themes
+ * Each theme provides colors for xterm.js terminal emulator
+ */
+import type { ThemeMode } from '@/store/app-store';
+import { type UIFontOption } from '@/config/ui-font-options';
+export interface TerminalTheme {
+  background: string;
+  foreground: string;
+  cursor: string;
+  cursorAccent: string;
+  selectionBackground: string;
+  selectionForeground?: string;
+  black: string;
+  red: string;
+  green: string;
+  yellow: string;
+  blue: string;
+  magenta: string;
+  cyan: string;
+  white: string;
+  brightBlack: string;
+  brightRed: string;
+  brightGreen: string;
+  brightYellow: string;
+  brightBlue: string;
+  brightMagenta: string;
+  brightCyan: string;
+  brightWhite: string;
+  searchMatchBackground: string;
+  searchMatchBorder: string;
+  searchActiveMatchBackground: string;
+  searchActiveMatchBorder: string;
+}
+/**
+ * Terminal font options for user selection
+ *
+ * Uses the same fonts as UI_MONO_FONT_OPTIONS for consistency across the app.
+ * All fonts listed here are bundled with the app via @fontsource packages
+ * or are system fonts with appropriate fallbacks.
+ */
+export type TerminalFontOption = UIFontOption;
+/**
+ * Terminal font options - reuses UI_MONO_FONT_OPTIONS with terminal-specific default
+ *
+ * The 'default' value means "use the default terminal font" (Menlo/Monaco)
+ */
+export declare const TERMINAL_FONT_OPTIONS: readonly UIFontOption[];
+/**
+ * Default terminal font family
+ * Uses the DEFAULT_FONT_VALUE sentinel which maps to Menlo/Monaco
+ */
+export declare const DEFAULT_TERMINAL_FONT: any;
+/**
+ * Get the actual font family CSS value for terminal
+ * Converts DEFAULT_FONT_VALUE to the actual Menlo/Monaco font stack
+ */
+export declare function getTerminalFontFamily(fontValue: string | undefined): string;
+declare const terminalThemes: Record<ThemeMode, TerminalTheme>;
+/**
+ * Get terminal theme for the given app theme
+ * For "system" theme, it checks the user's system preference
+ */
+export declare function getTerminalTheme(theme: ThemeMode): TerminalTheme;
+export default terminalThemes;
+//# sourceMappingURL=terminal-themes.d.ts.map
diff --git a/apps/ui/src/config/terminal-themes.d.ts.map b/apps/ui/src/config/terminal-themes.d.ts.map
new file mode 100644
index 000000000..db9beffe7
--- /dev/null
+++ b/apps/ui/src/config/terminal-themes.d.ts.map
@@ -0,0 +1 @@
+{"version":3,"file":"terminal-themes.d.ts","sourceRoot":"","sources":["terminal-themes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IAEpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,CAAC;IACpC,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED;;;;;;GAMG;AAGH,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,YAAY,EAMvD,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,KAAqB,CAAC;AAExD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAK3E;AAoeD,QAAA,MAAM,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,aAAa,CA6CpD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,aAAa,CAUhE;AAED,eAAe,cAAc,CAAC"}
\ No newline at end of file
diff --git a/apps/ui/src/config/terminal-themes.js b/apps/ui/src/config/terminal-themes.js
new file mode 100644
index 000000000..a788c2853
--- /dev/null
+++ b/apps/ui/src/config/terminal-themes.js
@@ -0,0 +1,566 @@
+'use strict';
+/**
+ * Terminal themes that match the app themes
+ * Each theme provides colors for xterm.js terminal emulator
+ */
+Object.defineProperty(exports, '__esModule', { value: true });
+exports.DEFAULT_TERMINAL_FONT = exports.TERMINAL_FONT_OPTIONS = void 0;
+exports.getTerminalFontFamily = getTerminalFontFamily;
+exports.getTerminalTheme = getTerminalTheme;
+const ui_font_options_1 = require('@/config/ui-font-options');
+/**
+ * Terminal font options - reuses UI_MONO_FONT_OPTIONS with terminal-specific default
+ *
+ * The 'default' value means "use the default terminal font" (Menlo/Monaco)
+ */
+exports.TERMINAL_FONT_OPTIONS = ui_font_options_1.UI_MONO_FONT_OPTIONS.map((option) => {
+  // Replace the UI default label with terminal-specific default
+  if (option.value === ui_font_options_1.DEFAULT_FONT_VALUE) {
+    return { value: option.value, label: 'Default (Menlo / Monaco)' };
+  }
+  return option;
+});
+/**
+ * Default terminal font family
+ * Uses the DEFAULT_FONT_VALUE sentinel which maps to Menlo/Monaco
+ */
+exports.DEFAULT_TERMINAL_FONT = ui_font_options_1.DEFAULT_FONT_VALUE;
+/**
+ * Get the actual font family CSS value for terminal
+ * Converts DEFAULT_FONT_VALUE to the actual Menlo/Monaco font stack
+ */
+function getTerminalFontFamily(fontValue) {
+  if (!fontValue || fontValue === ui_font_options_1.DEFAULT_FONT_VALUE) {
+    return "Menlo, Monaco, 'Courier New', monospace";
+  }
+  return fontValue;
+}
+// Dark theme (default)
+const darkTheme = {
+  background: '#0a0a0a',
+  foreground: '#d4d4d4',
+  cursor: '#d4d4d4',
+  cursorAccent: '#0a0a0a',
+  selectionBackground: '#264f78',
+  black: '#1e1e1e',
+  red: '#f44747',
+  green: '#6a9955',
+  yellow: '#dcdcaa',
+  blue: '#569cd6',
+  magenta: '#c586c0',
+  cyan: '#4ec9b0',
+  white: '#d4d4d4',
+  brightBlack: '#808080',
+  brightRed: '#f44747',
+  brightGreen: '#6a9955',
+  brightYellow: '#dcdcaa',
+  brightBlue: '#569cd6',
+  brightMagenta: '#c586c0',
+  brightCyan: '#4ec9b0',
+  brightWhite: '#ffffff',
+  // Search colors - bright yellow for visibility on dark background
+  searchMatchBackground: '#6b5300',
+  searchMatchBorder: '#e2ac00',
+  searchActiveMatchBackground: '#ff8c00',
+  searchActiveMatchBorder: '#ffb74d',
+};
+// Light theme
+const lightTheme = {
+  background: '#ffffff',
+  foreground: '#383a42',
+  cursor: '#383a42',
+  cursorAccent: '#ffffff',
+  selectionBackground: '#add6ff',
+  black: '#383a42',
+  red: '#e45649',
+  green: '#50a14f',
+  yellow: '#c18401',
+  blue: '#4078f2',
+  magenta: '#a626a4',
+  cyan: '#0184bc',
+  white: '#fafafa',
+  brightBlack: '#4f525e',
+  brightRed: '#e06c75',
+  brightGreen: '#98c379',
+  brightYellow: '#e5c07b',
+  brightBlue: '#61afef',
+  brightMagenta: '#c678dd',
+  brightCyan: '#56b6c2',
+  brightWhite: '#ffffff',
+  // Search colors - darker for visibility on light background
+  searchMatchBackground: '#fff3b0',
+  searchMatchBorder: '#c9a500',
+  searchActiveMatchBackground: '#ffcc00',
+  searchActiveMatchBorder: '#996600',
+};
+// Retro / Cyberpunk theme - neon green on black
+const retroTheme = {
+  background: '#000000',
+  foreground: '#39ff14',
+  cursor: '#39ff14',
+  cursorAccent: '#000000',
+  selectionBackground: '#39ff14',
+  selectionForeground: '#000000',
+  black: '#000000',
+  red: '#ff0055',
+  green: '#39ff14',
+  yellow: '#ffff00',
+  blue: '#00ffff',
+  magenta: '#ff00ff',
+  cyan: '#00ffff',
+  white: '#39ff14',
+  brightBlack: '#555555',
+  brightRed: '#ff5555',
+  brightGreen: '#55ff55',
+  brightYellow: '#ffff55',
+  brightBlue: '#55ffff',
+  brightMagenta: '#ff55ff',
+  brightCyan: '#55ffff',
+  brightWhite: '#ffffff',
+  // Search colors - magenta/pink for contrast with green text
+  searchMatchBackground: '#660066',
+  searchMatchBorder: '#ff00ff',
+  searchActiveMatchBackground: '#cc00cc',
+  searchActiveMatchBorder: '#ff66ff',
+};
+// Dracula theme
+const draculaTheme = {
+  background: '#282a36',
+  foreground: '#f8f8f2',
+  cursor: '#f8f8f2',
+  cursorAccent: '#282a36',
+  selectionBackground: '#44475a',
+  black: '#21222c',
+  red: '#ff5555',
+  green: '#50fa7b',
+  yellow: '#f1fa8c',
+  blue: '#bd93f9',
+  magenta: '#ff79c6',
+  cyan: '#8be9fd',
+  white: '#f8f8f2',
+  brightBlack: '#6272a4',
+  brightRed: '#ff6e6e',
+  brightGreen: '#69ff94',
+  brightYellow: '#ffffa5',
+  brightBlue: '#d6acff',
+  brightMagenta: '#ff92df',
+  brightCyan: '#a4ffff',
+  brightWhite: '#ffffff',
+  // Search colors - orange for visibility
+  searchMatchBackground: '#8b5a00',
+  searchMatchBorder: '#ffb86c',
+  searchActiveMatchBackground: '#ff9500',
+  searchActiveMatchBorder: '#ffcc80',
+};
+// Nord theme
+const nordTheme = {
+  background: '#2e3440',
+  foreground: '#d8dee9',
+  cursor: '#d8dee9',
+  cursorAccent: '#2e3440',
+  selectionBackground: '#434c5e',
+  black: '#3b4252',
+  red: '#bf616a',
+  green: '#a3be8c',
+  yellow: '#ebcb8b',
+  blue: '#81a1c1',
+  magenta: '#b48ead',
+  cyan: '#88c0d0',
+  white: '#e5e9f0',
+  brightBlack: '#4c566a',
+  brightRed: '#bf616a',
+  brightGreen: '#a3be8c',
+  brightYellow: '#ebcb8b',
+  brightBlue: '#81a1c1',
+  brightMagenta: '#b48ead',
+  brightCyan: '#8fbcbb',
+  brightWhite: '#eceff4',
+  // Search colors - warm yellow/orange for cold blue theme
+  searchMatchBackground: '#5e4a00',
+  searchMatchBorder: '#ebcb8b',
+  searchActiveMatchBackground: '#d08770',
+  searchActiveMatchBorder: '#e8a87a',
+};
+// Monokai theme
+const monokaiTheme = {
+  background: '#272822',
+  foreground: '#f8f8f2',
+  cursor: '#f8f8f2',
+  cursorAccent: '#272822',
+  selectionBackground: '#49483e',
+  black: '#272822',
+  red: '#f92672',
+  green: '#a6e22e',
+  yellow: '#f4bf75',
+  blue: '#66d9ef',
+  magenta: '#ae81ff',
+  cyan: '#a1efe4',
+  white: '#f8f8f2',
+  brightBlack: '#75715e',
+  brightRed: '#f92672',
+  brightGreen: '#a6e22e',
+  brightYellow: '#f4bf75',
+  brightBlue: '#66d9ef',
+  brightMagenta: '#ae81ff',
+  brightCyan: '#a1efe4',
+  brightWhite: '#f9f8f5',
+  // Search colors - orange/gold for contrast
+  searchMatchBackground: '#6b4400',
+  searchMatchBorder: '#f4bf75',
+  searchActiveMatchBackground: '#e69500',
+  searchActiveMatchBorder: '#ffd080',
+};
+// Tokyo Night theme
+const tokyonightTheme = {
+  background: '#1a1b26',
+  foreground: '#a9b1d6',
+  cursor: '#c0caf5',
+  cursorAccent: '#1a1b26',
+  selectionBackground: '#33467c',
+  black: '#15161e',
+  red: '#f7768e',
+  green: '#9ece6a',
+  yellow: '#e0af68',
+  blue: '#7aa2f7',
+  magenta: '#bb9af7',
+  cyan: '#7dcfff',
+  white: '#a9b1d6',
+  brightBlack: '#414868',
+  brightRed: '#f7768e',
+  brightGreen: '#9ece6a',
+  brightYellow: '#e0af68',
+  brightBlue: '#7aa2f7',
+  brightMagenta: '#bb9af7',
+  brightCyan: '#7dcfff',
+  brightWhite: '#c0caf5',
+  // Search colors - warm orange for cold blue theme
+  searchMatchBackground: '#5c4a00',
+  searchMatchBorder: '#e0af68',
+  searchActiveMatchBackground: '#ff9e64',
+  searchActiveMatchBorder: '#ffb380',
+};
+// Solarized Dark theme (improved contrast for WCAG compliance)
+const solarizedTheme = {
+  background: '#002b36',
+  foreground: '#93a1a1', // Changed from #839496 (base0) to #93a1a1 (base1) for better contrast
+  cursor: '#93a1a1',
+  cursorAccent: '#002b36',
+  selectionBackground: '#073642',
+  black: '#073642',
+  red: '#dc322f',
+  green: '#859900',
+  yellow: '#b58900',
+  blue: '#268bd2',
+  magenta: '#d33682',
+  cyan: '#2aa198',
+  white: '#eee8d5',
+  brightBlack: '#002b36',
+  brightRed: '#cb4b16',
+  brightGreen: '#586e75',
+  brightYellow: '#657b83',
+  brightBlue: '#839496',
+  brightMagenta: '#6c71c4',
+  brightCyan: '#93a1a1',
+  brightWhite: '#fdf6e3',
+  // Search colors - orange (solarized orange) for visibility
+  searchMatchBackground: '#5c3d00',
+  searchMatchBorder: '#b58900',
+  searchActiveMatchBackground: '#cb4b16',
+  searchActiveMatchBorder: '#e07040',
+};
+// Gruvbox Dark theme
+const gruvboxTheme = {
+  background: '#282828',
+  foreground: '#ebdbb2',
+  cursor: '#ebdbb2',
+  cursorAccent: '#282828',
+  selectionBackground: '#504945',
+  black: '#282828',
+  red: '#cc241d',
+  green: '#98971a',
+  yellow: '#d79921',
+  blue: '#458588',
+  magenta: '#b16286',
+  cyan: '#689d6a',
+  white: '#a89984',
+  brightBlack: '#928374',
+  brightRed: '#fb4934',
+  brightGreen: '#b8bb26',
+  brightYellow: '#fabd2f',
+  brightBlue: '#83a598',
+  brightMagenta: '#d3869b',
+  brightCyan: '#8ec07c',
+  brightWhite: '#ebdbb2',
+  // Search colors - bright orange for gruvbox
+  searchMatchBackground: '#6b4500',
+  searchMatchBorder: '#d79921',
+  searchActiveMatchBackground: '#fe8019',
+  searchActiveMatchBorder: '#ffaa40',
+};
+// Catppuccin Mocha theme
+const catppuccinTheme = {
+  background: '#1e1e2e',
+  foreground: '#cdd6f4',
+  cursor: '#f5e0dc',
+  cursorAccent: '#1e1e2e',
+  selectionBackground: '#45475a',
+  black: '#45475a',
+  red: '#f38ba8',
+  green: '#a6e3a1',
+  yellow: '#f9e2af',
+  blue: '#89b4fa',
+  magenta: '#cba6f7',
+  cyan: '#94e2d5',
+  white: '#bac2de',
+  brightBlack: '#585b70',
+  brightRed: '#f38ba8',
+  brightGreen: '#a6e3a1',
+  brightYellow: '#f9e2af',
+  brightBlue: '#89b4fa',
+  brightMagenta: '#cba6f7',
+  brightCyan: '#94e2d5',
+  brightWhite: '#a6adc8',
+  // Search colors - peach/orange from catppuccin palette
+  searchMatchBackground: '#5c4020',
+  searchMatchBorder: '#fab387',
+  searchActiveMatchBackground: '#fab387',
+  searchActiveMatchBorder: '#fcc8a0',
+};
+// One Dark theme
+const onedarkTheme = {
+  background: '#282c34',
+  foreground: '#abb2bf',
+  cursor: '#528bff',
+  cursorAccent: '#282c34',
+  selectionBackground: '#3e4451',
+  black: '#282c34',
+  red: '#e06c75',
+  green: '#98c379',
+  yellow: '#e5c07b',
+  blue: '#61afef',
+  magenta: '#c678dd',
+  cyan: '#56b6c2',
+  white: '#abb2bf',
+  brightBlack: '#5c6370',
+  brightRed: '#e06c75',
+  brightGreen: '#98c379',
+  brightYellow: '#e5c07b',
+  brightBlue: '#61afef',
+  brightMagenta: '#c678dd',
+  brightCyan: '#56b6c2',
+  brightWhite: '#ffffff',
+  // Search colors - orange/gold for visibility
+  searchMatchBackground: '#5c4500',
+  searchMatchBorder: '#e5c07b',
+  searchActiveMatchBackground: '#d19a66',
+  searchActiveMatchBorder: '#e8b888',
+};
+// Synthwave '84 theme
+const synthwaveTheme = {
+  background: '#262335',
+  foreground: '#ffffff',
+  cursor: '#ff7edb',
+  cursorAccent: '#262335',
+  selectionBackground: '#463465',
+  black: '#262335',
+  red: '#fe4450',
+  green: '#72f1b8',
+  yellow: '#fede5d',
+  blue: '#03edf9',
+  magenta: '#ff7edb',
+  cyan: '#03edf9',
+  white: '#ffffff',
+  brightBlack: '#614d85',
+  brightRed: '#fe4450',
+  brightGreen: '#72f1b8',
+  brightYellow: '#f97e72',
+  brightBlue: '#03edf9',
+  brightMagenta: '#ff7edb',
+  brightCyan: '#03edf9',
+  brightWhite: '#ffffff',
+  // Search colors - hot pink/magenta for synthwave aesthetic
+  searchMatchBackground: '#6b2a7a',
+  searchMatchBorder: '#ff7edb',
+  searchActiveMatchBackground: '#ff7edb',
+  searchActiveMatchBorder: '#ffffff',
+};
+// Red theme - Dark theme with red accents
+const redTheme = {
+  background: '#1a0a0a',
+  foreground: '#c8b0b0',
+  cursor: '#ff4444',
+  cursorAccent: '#1a0a0a',
+  selectionBackground: '#5a2020',
+  black: '#2a1010',
+  red: '#ff4444',
+  green: '#6a9a6a',
+  yellow: '#ccaa55',
+  blue: '#6688aa',
+  magenta: '#aa5588',
+  cyan: '#558888',
+  white: '#b0a0a0',
+  brightBlack: '#6a4040',
+  brightRed: '#ff6666',
+  brightGreen: '#88bb88',
+  brightYellow: '#ddbb66',
+  brightBlue: '#88aacc',
+  brightMagenta: '#cc77aa',
+  brightCyan: '#77aaaa',
+  brightWhite: '#d0c0c0',
+  // Search colors - orange/gold to contrast with red theme
+  searchMatchBackground: '#5a3520',
+  searchMatchBorder: '#ccaa55',
+  searchActiveMatchBackground: '#ddbb66',
+  searchActiveMatchBorder: '#ffdd88',
+};
+// Cream theme - Warm, soft, easy on the eyes
+const creamTheme = {
+  background: '#f5f3ee',
+  foreground: '#5a4a3a',
+  cursor: '#9d6b53',
+  cursorAccent: '#f5f3ee',
+  selectionBackground: '#d4c4b0',
+  black: '#5a4a3a',
+  red: '#c85a4f',
+  green: '#7a9a6a',
+  yellow: '#c9a554',
+  blue: '#6b8aaa',
+  magenta: '#a66a8a',
+  cyan: '#5a9a8a',
+  white: '#b0a090',
+  brightBlack: '#8a7a6a',
+  brightRed: '#e07060',
+  brightGreen: '#90b080',
+  brightYellow: '#e0bb70',
+  brightBlue: '#80a0c0',
+  brightMagenta: '#c080a0',
+  brightCyan: '#70b0a0',
+  brightWhite: '#d0c0b0',
+  // Search colors - blue for contrast on light cream background
+  searchMatchBackground: '#c0d4e8',
+  searchMatchBorder: '#6b8aaa',
+  searchActiveMatchBackground: '#6b8aaa',
+  searchActiveMatchBorder: '#4a6a8a',
+};
+// Sunset theme - Mellow oranges and soft pastels
+const sunsetTheme = {
+  background: '#1e1a24',
+  foreground: '#f2e8dd',
+  cursor: '#dd8855',
+  cursorAccent: '#1e1a24',
+  selectionBackground: '#3a2a40',
+  black: '#1e1a24',
+  red: '#dd6655',
+  green: '#88bb77',
+  yellow: '#ddaa66',
+  blue: '#6699cc',
+  magenta: '#cc7799',
+  cyan: '#66ccaa',
+  white: '#e8d8c8',
+  brightBlack: '#4a3a50',
+  brightRed: '#ee8866',
+  brightGreen: '#99cc88',
+  brightYellow: '#eebb77',
+  brightBlue: '#88aadd',
+  brightMagenta: '#dd88aa',
+  brightCyan: '#88ddbb',
+  brightWhite: '#f5e8dd',
+  // Search colors - orange for warm sunset theme
+  searchMatchBackground: '#5a3a30',
+  searchMatchBorder: '#ddaa66',
+  searchActiveMatchBackground: '#eebb77',
+  searchActiveMatchBorder: '#ffdd99',
+};
+// Gray theme - Modern, minimal gray scheme inspired by Cursor
+const grayTheme = {
+  background: '#2a2d32',
+  foreground: '#d0d0d5',
+  cursor: '#8fa0c0',
+  cursorAccent: '#2a2d32',
+  selectionBackground: '#3a3f48',
+  black: '#2a2d32',
+  red: '#d87070',
+  green: '#78b088',
+  yellow: '#d0b060',
+  blue: '#7090c0',
+  magenta: '#a880b0',
+  cyan: '#60a0b0',
+  white: '#b0b0b8',
+  brightBlack: '#606068',
+  brightRed: '#e88888',
+  brightGreen: '#90c8a0',
+  brightYellow: '#e0c878',
+  brightBlue: '#90b0d8',
+  brightMagenta: '#c098c8',
+  brightCyan: '#80b8c8',
+  brightWhite: '#e0e0e8',
+  // Search colors - blue for modern feel
+  searchMatchBackground: '#3a4a60',
+  searchMatchBorder: '#7090c0',
+  searchActiveMatchBackground: '#90b0d8',
+  searchActiveMatchBorder: '#b0d0f0',
+};
+// Theme mapping
+const terminalThemes = {
+  // Special
+  system: darkTheme, // Will be resolved at runtime
+  // Dark themes
+  dark: darkTheme,
+  retro: retroTheme,
+  dracula: draculaTheme,
+  nord: nordTheme,
+  monokai: monokaiTheme,
+  tokyonight: tokyonightTheme,
+  solarized: solarizedTheme,
+  gruvbox: gruvboxTheme,
+  catppuccin: catppuccinTheme,
+  onedark: onedarkTheme,
+  synthwave: synthwaveTheme,
+  red: redTheme,
+  sunset: sunsetTheme,
+  gray: grayTheme,
+  forest: gruvboxTheme, // Green-ish theme, gruvbox is close
+  ocean: nordTheme, // Blue-ish theme, nord is close
+  ember: monokaiTheme, // Warm orange theme, monokai is close
+  'ayu-dark': darkTheme, // Deep dark with warm accents
+  'ayu-mirage': darkTheme, // Soft dark with golden accents
+  matcha: nordTheme, // Calming blue-gray with sage green
+  // Light themes
+  light: lightTheme,
+  cream: creamTheme,
+  solarizedlight: lightTheme, // TODO: Create dedicated solarized light terminal theme
+  github: lightTheme, // TODO: Create dedicated github terminal theme
+  paper: lightTheme,
+  rose: lightTheme,
+  mint: lightTheme,
+  lavender: lightTheme,
+  sand: creamTheme, // Warm tones like cream
+  sky: lightTheme,
+  peach: creamTheme, // Warm tones like cream
+  snow: lightTheme,
+  sepia: creamTheme, // Warm tones like cream
+  gruvboxlight: creamTheme, // Warm light theme
+  nordlight: lightTheme, // Cool light theme
+  blossom: lightTheme,
+  'ayu-light': lightTheme, // Clean light with orange accents
+  onelight: lightTheme, // Atom One Light - blue accent
+  bluloco: lightTheme, // Bluloco - cyan-blue accent
+  feather: lightTheme, // Feather - orange accent
+};
+/**
+ * Get terminal theme for the given app theme
+ * For "system" theme, it checks the user's system preference
+ */
+function getTerminalTheme(theme) {
+  if (theme === 'system') {
+    // Check system preference
+    if (typeof window !== 'undefined') {
+      const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+      return prefersDark ? darkTheme : lightTheme;
+    }
+    return darkTheme; // Default to dark for SSR
+  }
+  return terminalThemes[theme] || darkTheme;
+}
+exports.default = terminalThemes;
+//# sourceMappingURL=terminal-themes.js.map
diff --git a/apps/ui/src/config/terminal-themes.js.map b/apps/ui/src/config/terminal-themes.js.map
new file mode 100644
index 000000000..5c219487c
--- /dev/null
+++ b/apps/ui/src/config/terminal-themes.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"terminal-themes.js","sourceRoot":"","sources":["terminal-themes.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
new file mode 100644
index 000000000..474638e87
--- /dev/null
+++ b/docs/terminal-custom-configs-plan.md
@@ -0,0 +1,572 @@
+# Implementation Plan: Custom Terminal Configurations with Theme Synchronization
+
+## Overview
+
+Implement custom shell configuration files (.bashrc, .zshrc) that automatically sync with Automaker's 40 themes, providing a seamless terminal experience where prompt colors match the app theme. This is an **opt-in feature** that creates configs in `.automaker/terminal/` without modifying user's existing RC files.
+
+## Architecture
+
+### Core Components
+
+1. **RC Generator** (`libs/platform/src/rc-generator.ts`) - NEW
+   - Template-based generation for bash/zsh/sh
+   - Theme-to-ANSI color mapping from hex values
+   - Git info integration (branch, dirty status)
+   - Prompt format templates (standard, minimal, powerline, starship-inspired)
+
+2. **RC File Manager** (`libs/platform/src/rc-file-manager.ts`) - NEW
+   - File I/O for `.automaker/terminal/` directory
+   - Version checking and regeneration logic
+   - Path resolution for different shells
+
+3. **Terminal Service** (`apps/server/src/services/terminal-service.ts`) - MODIFY
+   - Inject BASH_ENV/ZDOTDIR environment variables when spawning PTY
+   - Hook for theme change regeneration
+   - Backwards compatible (no change when disabled)
+
+4. **Settings Schema** (`libs/types/src/settings.ts`) - MODIFY
+   - Add `terminalConfig` to GlobalSettings and ProjectSettings
+   - Include enable toggle, prompt format, git info toggles, custom aliases/env vars
+
+5. **Settings UI** (`apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx`) - NEW
+   - Enable/disable toggle with explanation
+   - Prompt format selector (4 formats)
+   - Git info toggles (branch/status)
+   - Custom aliases textarea
+   - Custom env vars key-value editor
+   - Live preview panel showing example prompt
+
+## File Structure
+
+```
+.automaker/terminal/
+├── bashrc.sh          # Bash config (sourced via BASH_ENV)
+├── zshrc.zsh          # Zsh config (via ZDOTDIR)
+├── common.sh          # Shared functions (git prompt, etc.)
+├── themes/
+│   ├── dark.sh        # Theme-specific color exports (40 files)
+│   ├── dracula.sh
+│   ├── nord.sh
+│   └── ... (38 more)
+├── version.txt        # RC file format version (for migrations)
+└── user-custom.sh     # User's additional customizations (optional)
+```
+
+## Implementation Steps
+
+### Step 1: Create RC Generator Package
+
+**File**: `libs/platform/src/rc-generator.ts`
+
+**Key Functions**:
+
+```typescript
+// Main generation functions
+export function generateBashrc(theme: ThemeMode, config: TerminalConfig): string;
+export function generateZshrc(theme: ThemeMode, config: TerminalConfig): string;
+export function generateCommonFunctions(): string;
+export function generateThemeColors(theme: ThemeMode): string;
+
+// Color mapping
+export function hexToXterm256(hex: string): number;
+export function getThemeANSIColors(terminalTheme: TerminalTheme): ANSIColors;
+```
+
+**Templates**:
+
+- Source user's original ~/.bashrc or ~/.zshrc first
+- Load theme colors from `themes/${AUTOMAKER_THEME}.sh`
+- Set custom PS1/PROMPT only if `AUTOMAKER_CUSTOM_PROMPT=true`
+- Include git prompt function: `automaker_git_prompt()`
+
+**Example bashrc.sh template**:
+
+```bash
+#!/bin/bash
+# Automaker Terminal Configuration v1.0
+
+# Source user's original bashrc first
+if [ -f "$HOME/.bashrc" ]; then
+    source "$HOME/.bashrc"
+fi
+
+# Load Automaker theme colors
+AUTOMAKER_THEME="${AUTOMAKER_THEME:-dark}"
+if [ -f "${BASH_SOURCE%/*}/themes/$AUTOMAKER_THEME.sh" ]; then
+    source "${BASH_SOURCE%/*}/themes/$AUTOMAKER_THEME.sh"
+fi
+
+# Load common functions (git prompt)
+source "${BASH_SOURCE%/*}/common.sh"
+
+# Set custom prompt (only if enabled)
+if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
+    PS1="\[$COLOR_USER\]\u@\h\[$COLOR_RESET\] "
+    PS1="$PS1\[$COLOR_PATH\]\w\[$COLOR_RESET\]"
+    PS1="$PS1\$(automaker_git_prompt) "
+    PS1="$PS1\[$COLOR_PROMPT\]\$\[$COLOR_RESET\] "
+fi
+
+# Load user customizations (if exists)
+if [ -f "${BASH_SOURCE%/*}/user-custom.sh" ]; then
+    source "${BASH_SOURCE%/*}/user-custom.sh"
+fi
+```
+
+**Color Mapping Algorithm**:
+
+1. Get hex colors from `apps/ui/src/config/terminal-themes.ts` (TerminalTheme interface)
+2. Convert hex to RGB
+3. Map to closest xterm-256 color code using Euclidean distance in RGB space
+4. Generate ANSI escape codes: `\[\e[38;5;{code}m\]` for foreground
+
+### Step 2: Create RC File Manager
+
+**File**: `libs/platform/src/rc-file-manager.ts`
+
+**Key Functions**:
+
+```typescript
+export async function ensureTerminalDir(projectPath: string): Promise<void>;
+export async function writeRcFiles(
+  projectPath: string,
+  theme: ThemeMode,
+  config: TerminalConfig
+): Promise<void>;
+export function getRcFilePath(projectPath: string, shell: 'bash' | 'zsh' | 'sh'): string;
+export async function checkRcFileVersion(projectPath: string): Promise<number | null>;
+export async function needsRegeneration(projectPath: string, theme: ThemeMode): Promise<boolean>;
+```
+
+**File Operations**:
+
+- Create `.automaker/terminal/` if doesn't exist
+- Write RC files with 0644 permissions
+- Write theme color files (40 themes × 1 file each)
+- Create version.txt with format version (currently "1")
+- Support atomic writes (write to temp, then rename)
+
+### Step 3: Add Settings Schema
+
+**File**: `libs/types/src/settings.ts`
+
+**Add to GlobalSettings** (around line 842):
+
+```typescript
+/** Terminal configuration settings */
+terminalConfig?: {
+  /** Enable custom terminal configurations (default: false) */
+  enabled: boolean;
+
+  /** Enable custom prompt (default: true when enabled) */
+  customPrompt: boolean;
+
+  /** Prompt format template */
+  promptFormat: 'standard' | 'minimal' | 'powerline' | 'starship';
+
+  /** Show git branch in prompt (default: true) */
+  showGitBranch: boolean;
+
+  /** Show git status dirty indicator (default: true) */
+  showGitStatus: boolean;
+
+  /** User-provided custom aliases (multiline string) */
+  customAliases: string;
+
+  /** User-provided custom env vars */
+  customEnvVars: Record<string, string>;
+
+  /** RC file format version (for migration) */
+  rcFileVersion?: number;
+};
+```
+
+**Add to ProjectSettings**:
+
+```typescript
+/** Project-specific terminal config overrides */
+terminalConfig?: {
+  /** Override global enabled setting */
+  enabled?: boolean;
+
+  /** Project-specific custom aliases */
+  customAliases?: string;
+
+  /** Project-specific env vars */
+  customEnvVars?: Record<string, string>;
+
+  /** Custom welcome message for this project */
+  welcomeMessage?: string;
+};
+```
+
+**Defaults**:
+
+```typescript
+const DEFAULT_TERMINAL_CONFIG = {
+  enabled: false,
+  customPrompt: true,
+  promptFormat: 'standard' as const,
+  showGitBranch: true,
+  showGitStatus: true,
+  customAliases: '',
+  customEnvVars: {},
+  rcFileVersion: 1,
+};
+```
+
+### Step 4: Modify Terminal Service
+
+**File**: `apps/server/src/services/terminal-service.ts`
+
+**Modification Point**: In `createSession()` method, around line 335-344 where `env` object is built.
+
+**Add before PTY spawn**:
+
+```typescript
+// Get terminal config from settings
+const terminalConfig = await this.settingsService?.getGlobalSettings();
+const projectSettings = options.projectPath
+  ? await this.settingsService?.getProjectSettings(options.projectPath)
+  : null;
+
+const effectiveTerminalConfig = {
+  ...terminalConfig?.terminalConfig,
+  ...projectSettings?.terminalConfig,
+};
+
+if (effectiveTerminalConfig?.enabled) {
+  // Ensure RC files are up to date
+  const currentTheme = terminalConfig?.theme || 'dark';
+  await ensureRcFilesUpToDate(options.projectPath || cwd, currentTheme, effectiveTerminalConfig);
+
+  // Set shell-specific env vars
+  const shellName = path.basename(shell).toLowerCase();
+
+  if (shellName.includes('bash')) {
+    env.BASH_ENV = getRcFilePath(options.projectPath || cwd, 'bash');
+    env.AUTOMAKER_CUSTOM_PROMPT = effectiveTerminalConfig.customPrompt ? 'true' : 'false';
+    env.AUTOMAKER_THEME = currentTheme;
+  } else if (shellName.includes('zsh')) {
+    env.ZDOTDIR = path.join(options.projectPath || cwd, '.automaker', 'terminal');
+    env.AUTOMAKER_CUSTOM_PROMPT = effectiveTerminalConfig.customPrompt ? 'true' : 'false';
+    env.AUTOMAKER_THEME = currentTheme;
+  } else if (shellName === 'sh') {
+    env.ENV = getRcFilePath(options.projectPath || cwd, 'sh');
+    env.AUTOMAKER_CUSTOM_PROMPT = effectiveTerminalConfig.customPrompt ? 'true' : 'false';
+    env.AUTOMAKER_THEME = currentTheme;
+  }
+}
+```
+
+**Add new method for theme changes**:
+
+```typescript
+async onThemeChange(projectPath: string, newTheme: ThemeMode): Promise<void> {
+  const globalSettings = await this.settingsService?.getGlobalSettings();
+  const terminalConfig = globalSettings?.terminalConfig;
+
+  if (terminalConfig?.enabled) {
+    // Regenerate RC files with new theme
+    await writeRcFiles(projectPath, newTheme, terminalConfig);
+  }
+}
+```
+
+### Step 5: Create Settings UI
+
+**File**: `apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx`
+
+**Component Structure**:
+
+```typescript
+export function TerminalConfigSection() {
+  return (
+    <div>
+      {/* Enable Toggle with Warning */}
+      <div>
+        <Label>Custom Terminal Configurations</Label>
+        <Switch checked={enabled} onCheckedChange={handleToggle} />
+        <p>Creates custom shell configs in .automaker/terminal/</p>
+      </div>
+
+      {enabled && (
+        <>
+          {/* Custom Prompt Toggle */}
+          <Switch checked={customPrompt} />
+
+          {/* Prompt Format Selector */}
+          <Select value={promptFormat} onValueChange={setPromptFormat}>
+            <option value="standard">Standard</option>
+            <option value="minimal">Minimal</option>
+            <option value="powerline">Powerline</option>
+            <option value="starship">Starship-Inspired</option>
+          </Select>
+
+          {/* Git Info Toggles */}
+          <Switch checked={showGitBranch} label="Show Git Branch" />
+          <Switch checked={showGitStatus} label="Show Git Status" />
+
+          {/* Custom Aliases */}
+          <Textarea
+            value={customAliases}
+            placeholder="# Custom aliases\nalias ll='ls -la'"
+          />
+
+          {/* Custom Env Vars */}
+          <KeyValueEditor
+            value={customEnvVars}
+            onChange={setCustomEnvVars}
+          />
+
+          {/* Live Preview Panel */}
+          <PromptPreview
+            format={promptFormat}
+            theme={effectiveTheme}
+            gitBranch={showGitBranch ? 'main' : null}
+            gitDirty={showGitStatus}
+          />
+        </>
+      )}
+    </div>
+  );
+}
+```
+
+**Preview Component**:
+Shows example prompt like: `[user@host] ~/projects/automaker (main*) $`
+Updates instantly when theme or format changes.
+
+### Step 6: Theme Change Hook
+
+**File**: `apps/server/src/routes/settings.ts`
+
+**Hook into theme update endpoint**:
+
+```typescript
+// After updating theme in settings
+if (oldTheme !== newTheme) {
+  // Regenerate RC files for all projects with terminal config enabled
+  const projects = settings.projects;
+  for (const project of projects) {
+    const projectSettings = await settingsService.getProjectSettings(project.path);
+    if (projectSettings.terminalConfig?.enabled !== false) {
+      await terminalService.onThemeChange(project.path, newTheme);
+    }
+  }
+}
+```
+
+## Shell Configuration Strategy
+
+### Bash (via BASH_ENV)
+
+- Set `BASH_ENV=/path/to/.automaker/terminal/bashrc.sh`
+- BASH_ENV is loaded for all shells (interactive and non-interactive)
+- User's ~/.bashrc is sourced first within our bashrc.sh
+- No need for `--rcfile` flag (which would skip ~/.bashrc)
+
+### Zsh (via ZDOTDIR)
+
+- Set `ZDOTDIR=/path/to/.automaker/terminal/`
+- Create `.zshrc` symlink: `zshrc.zsh`
+- User's ~/.zshrc is sourced within our zshrc.zsh
+- Zsh's canonical configuration directory mechanism
+
+### Sh (via ENV)
+
+- Set `ENV=/path/to/.automaker/terminal/common.sh`
+- POSIX shell standard environment variable
+- Minimal prompt (POSIX sh doesn't support advanced prompts)
+
+## Prompt Formats
+
+### 1. Standard
+
+```
+[user@host] ~/path/to/project (main*) $
+```
+
+### 2. Minimal
+
+```
+~/project (main*) $
+```
+
+### 3. Powerline (Unicode box-drawing)
+
+```
+┌─[user@host]─[~/path]─[main*]
+└─$
+```
+
+### 4. Starship-Inspired
+
+```
+user@host in ~/path on main*
+❯
+```
+
+## Theme Synchronization
+
+### On Initial Enable
+
+1. User toggles "Enable Custom Terminal Configs"
+2. Show confirmation dialog explaining what will happen
+3. Generate RC files for current theme
+4. Set `rcFileVersion: 1` in settings
+
+### On Theme Change
+
+1. User changes app theme in settings
+2. Settings API detects theme change
+3. Call `terminalService.onThemeChange()` for each project
+4. Regenerate theme color files (`.automaker/terminal/themes/`)
+5. Existing terminals keep old theme (expected behavior)
+6. New terminals use new theme
+
+### On Disable
+
+1. User toggles off "Enable Custom Terminal Configs"
+2. Delete `.automaker/terminal/` directory
+3. New terminals spawn without custom env vars
+4. Existing terminals continue with current config until restarted
+
+## Critical Files
+
+### Files to Modify
+
+1. `/home/dhanush/Projects/automaker/apps/server/src/services/terminal-service.ts` - Add env var injection logic at line ~335-344
+2. `/home/dhanush/Projects/automaker/libs/types/src/settings.ts` - Add terminalConfig to GlobalSettings (~line 842) and ProjectSettings
+3. `/home/dhanush/Projects/automaker/apps/server/src/routes/settings.ts` - Add theme change hook
+
+### Files to Create
+
+1. `/home/dhanush/Projects/automaker/libs/platform/src/rc-generator.ts` - RC file generation logic
+2. `/home/dhanush/Projects/automaker/libs/platform/src/rc-file-manager.ts` - File I/O and path resolution
+3. `/home/dhanush/Projects/automaker/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx` - Settings UI
+4. `/home/dhanush/Projects/automaker/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx` - Live preview component
+
+### Files to Read
+
+1. `/home/dhanush/Projects/automaker/apps/ui/src/config/terminal-themes.ts` - Source of theme hex colors for ANSI mapping
+
+## Testing Approach
+
+### Unit Tests
+
+- `rc-generator.test.ts`: Test template generation for all 40 themes
+- `rc-file-manager.test.ts`: Test file I/O and version checking
+- `terminal-service.test.ts`: Test env var injection with mocked PTY spawn
+
+### E2E Tests
+
+- Enable custom configs in settings
+- Change theme and verify new terminals use new colors
+- Add custom aliases and verify they work in terminal
+- Test all 4 prompt formats
+- Test disable flow (files removed, terminals work normally)
+
+### Manual Testing Checklist
+
+- [ ] Test on macOS with zsh
+- [ ] Test on Linux with bash
+- [ ] Test all 40 themes have correct colors
+- [ ] Test git prompt in repo vs non-repo directories
+- [ ] Test custom aliases execution
+- [ ] Test custom env vars available
+- [ ] Test project-specific overrides
+- [ ] Test disable/re-enable flow
+
+## Verification
+
+### End-to-End Test
+
+1. Enable custom terminal configs in settings
+2. Set prompt format to "powerline"
+3. Add custom alias: `alias gs='git status'`
+4. Change theme to "dracula"
+5. Open new terminal
+6. Verify:
+   - Prompt uses powerline format with theme colors
+   - Git branch shows if in repo
+   - `gs` alias works
+   - User's ~/.bashrc still loaded (test with known alias from user's file)
+7. Change theme to "nord"
+8. Open new terminal
+9. Verify prompt colors changed to match nord theme
+10. Disable custom configs
+11. Verify `.automaker/terminal/` deleted
+12. Open new terminal
+13. Verify standard prompt without custom config
+
+### Success Criteria
+
+- ✅ Feature can be enabled/disabled in settings
+- ✅ RC files generated in `.automaker/terminal/`
+- ✅ Prompt colors match theme (all 40 themes)
+- ✅ Git branch/status shown in prompt
+- ✅ Custom aliases work
+- ✅ Custom env vars available
+- ✅ User's original ~/.bashrc or ~/.zshrc still loads
+- ✅ Theme changes regenerate color files
+- ✅ Works on Mac (zsh) and Linux (bash)
+- ✅ No breaking changes to existing terminal functionality
+
+## Security & Safety
+
+### File Permissions
+
+- RC files: 0644 (user read/write, others read)
+- Directory: 0755 (user rwx, others rx)
+- No secrets in RC files
+
+### Input Sanitization
+
+- Escape special characters in custom aliases
+- Validate env var names (alphanumeric + underscore only)
+- No eval of user-provided code
+- Shell escaping for all user inputs
+
+### Backwards Compatibility
+
+- Feature disabled by default
+- Existing terminals unaffected when disabled
+- User's original RC files always sourced first
+- Easy rollback (just disable and delete files)
+
+## Branch Creation
+
+Per PR workflow in DEVELOPMENT_WORKFLOW.md:
+
+1. Create feature branch: `git checkout -b feature/custom-terminal-configs`
+2. Implement changes following this plan
+3. Test thoroughly
+4. Merge upstream RC before shipping: `git merge upstream/v0.14.0rc --no-edit`
+5. Push to origin: `git push -u origin feature/custom-terminal-configs`
+6. Create PR targeting `main` branch
+
+## Documentation
+
+After implementation, create comprehensive documentation at:
+`/home/dhanush/Projects/automaker/docs/terminal-custom-configs.md`
+
+**Documentation should cover**:
+
+- Feature overview and benefits
+- How to enable custom terminal configs
+- Prompt format options with examples
+- Custom aliases and env vars
+- Theme synchronization behavior
+- Troubleshooting common issues
+- How to disable the feature
+- Technical details for contributors
+
+## Timeline Estimate
+
+- Week 1: Core infrastructure (RC generator, file manager, settings schema)
+- Week 2: Terminal service integration, theme sync
+- Week 3: Settings UI, preview component
+- Week 4: Testing, documentation, polish
+
+Total: ~4 weeks for complete implementation
diff --git a/libs/platform/src/index.ts b/libs/platform/src/index.ts
index 5952ba2d8..aa47d46e6 100644
--- a/libs/platform/src/index.ts
+++ b/libs/platform/src/index.ts
@@ -186,3 +186,37 @@ export {
   findTerminalById,
   openInExternalTerminal,
 } from './terminal.js';
+
+// RC Generator - Shell configuration file generation
+export {
+  hexToXterm256,
+  getThemeANSIColors,
+  generateBashrc,
+  generateZshrc,
+  generateCommonFunctions,
+  generateThemeColors,
+  getShellName,
+  type TerminalConfig,
+  type TerminalTheme,
+  type ANSIColors,
+} from './rc-generator.js';
+
+// RC File Manager - Shell configuration file I/O
+export {
+  RC_FILE_VERSION,
+  getTerminalDir,
+  getThemesDir,
+  getRcFilePath,
+  ensureTerminalDir,
+  checkRcFileVersion,
+  needsRegeneration,
+  writeAllThemeFiles,
+  writeThemeFile,
+  writeRcFiles,
+  ensureRcFilesUpToDate,
+  deleteTerminalDir,
+  ensureUserCustomFile,
+} from './rc-file-manager.js';
+
+// Terminal Theme Colors - Raw theme color data for all 40 themes
+export { terminalThemeColors, getTerminalThemeColors } from './terminal-theme-colors.js';
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
new file mode 100644
index 000000000..debf6fe3b
--- /dev/null
+++ b/libs/platform/src/rc-file-manager.ts
@@ -0,0 +1,250 @@
+/**
+ * RC File Manager - Manage shell configuration files in .automaker/terminal/
+ *
+ * This module handles file I/O operations for generating and managing shell RC files,
+ * including version checking and regeneration logic.
+ */
+
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+import type { ThemeMode } from '@automaker/types';
+import {
+  generateBashrc,
+  generateZshrc,
+  generateCommonFunctions,
+  generateThemeColors,
+  type TerminalConfig,
+  type TerminalTheme,
+} from './rc-generator.js';
+
+/**
+ * Current RC file format version
+ */
+export const RC_FILE_VERSION = 1;
+
+/**
+ * Get the terminal directory path
+ */
+export function getTerminalDir(projectPath: string): string {
+  return path.join(projectPath, '.automaker', 'terminal');
+}
+
+/**
+ * Get the themes directory path
+ */
+export function getThemesDir(projectPath: string): string {
+  return path.join(getTerminalDir(projectPath), 'themes');
+}
+
+/**
+ * Get RC file path for specific shell
+ */
+export function getRcFilePath(projectPath: string, shell: 'bash' | 'zsh' | 'sh'): string {
+  const terminalDir = getTerminalDir(projectPath);
+  switch (shell) {
+    case 'bash':
+      return path.join(terminalDir, 'bashrc.sh');
+    case 'zsh':
+      return path.join(terminalDir, '.zshrc'); // Zsh looks for .zshrc in ZDOTDIR
+    case 'sh':
+      return path.join(terminalDir, 'common.sh');
+  }
+}
+
+/**
+ * Ensure terminal directory exists
+ */
+export async function ensureTerminalDir(projectPath: string): Promise<void> {
+  const terminalDir = getTerminalDir(projectPath);
+  const themesDir = getThemesDir(projectPath);
+
+  await fs.mkdir(terminalDir, { recursive: true, mode: 0o755 });
+  await fs.mkdir(themesDir, { recursive: true, mode: 0o755 });
+}
+
+/**
+ * Write RC file with atomic write (write to temp, then rename)
+ */
+async function atomicWriteFile(
+  filePath: string,
+  content: string,
+  mode: number = 0o644
+): Promise<void> {
+  const tempPath = `${filePath}.tmp`;
+  await fs.writeFile(tempPath, content, { encoding: 'utf8', mode });
+  await fs.rename(tempPath, filePath);
+}
+
+/**
+ * Check current RC file version
+ */
+export async function checkRcFileVersion(projectPath: string): Promise<number | null> {
+  const versionPath = path.join(getTerminalDir(projectPath), 'version.txt');
+  try {
+    const content = await fs.readFile(versionPath, 'utf8');
+    const version = parseInt(content.trim(), 10);
+    return isNaN(version) ? null : version;
+  } catch (error) {
+    return null; // File doesn't exist or can't be read
+  }
+}
+
+/**
+ * Write version file
+ */
+async function writeVersionFile(projectPath: string, version: number): Promise<void> {
+  const versionPath = path.join(getTerminalDir(projectPath), 'version.txt');
+  await atomicWriteFile(versionPath, `${version}\n`, 0o644);
+}
+
+/**
+ * Check if RC files need regeneration
+ */
+export async function needsRegeneration(projectPath: string, theme: ThemeMode): Promise<boolean> {
+  const currentVersion = await checkRcFileVersion(projectPath);
+
+  // Regenerate if version doesn't match or files don't exist
+  if (currentVersion !== RC_FILE_VERSION) {
+    return true;
+  }
+
+  // Check if critical files exist
+  const bashrcPath = getRcFilePath(projectPath, 'bash');
+  const zshrcPath = getRcFilePath(projectPath, 'zsh');
+  const commonPath = path.join(getTerminalDir(projectPath), 'common.sh');
+  const themeFilePath = path.join(getThemesDir(projectPath), `${theme}.sh`);
+
+  try {
+    await Promise.all([
+      fs.access(bashrcPath),
+      fs.access(zshrcPath),
+      fs.access(commonPath),
+      fs.access(themeFilePath),
+    ]);
+    return false; // All files exist
+  } catch {
+    return true; // Some files are missing
+  }
+}
+
+/**
+ * Write all theme color files (all 40 themes)
+ */
+export async function writeAllThemeFiles(
+  projectPath: string,
+  terminalThemes: Record<ThemeMode, TerminalTheme>
+): Promise<void> {
+  const themesDir = getThemesDir(projectPath);
+  await fs.mkdir(themesDir, { recursive: true, mode: 0o755 });
+
+  const themeEntries = Object.entries(terminalThemes);
+  await Promise.all(
+    themeEntries.map(async ([themeName, theme]) => {
+      const themeFilePath = path.join(themesDir, `${themeName}.sh`);
+      const content = generateThemeColors(theme);
+      await atomicWriteFile(themeFilePath, content, 0o644);
+    })
+  );
+}
+
+/**
+ * Write a single theme color file
+ */
+export async function writeThemeFile(
+  projectPath: string,
+  theme: ThemeMode,
+  themeColors: TerminalTheme
+): Promise<void> {
+  const themesDir = getThemesDir(projectPath);
+  await fs.mkdir(themesDir, { recursive: true, mode: 0o755 });
+
+  const themeFilePath = path.join(themesDir, `${theme}.sh`);
+  const content = generateThemeColors(themeColors);
+  await atomicWriteFile(themeFilePath, content, 0o644);
+}
+
+/**
+ * Write all RC files
+ */
+export async function writeRcFiles(
+  projectPath: string,
+  theme: ThemeMode,
+  config: TerminalConfig,
+  themeColors: TerminalTheme,
+  allThemes: Record<ThemeMode, TerminalTheme>
+): Promise<void> {
+  await ensureTerminalDir(projectPath);
+
+  // Write common functions file
+  const commonPath = path.join(getTerminalDir(projectPath), 'common.sh');
+  const commonContent = generateCommonFunctions(config);
+  await atomicWriteFile(commonPath, commonContent, 0o644);
+
+  // Write bashrc
+  const bashrcPath = getRcFilePath(projectPath, 'bash');
+  const bashrcContent = generateBashrc(themeColors, config);
+  await atomicWriteFile(bashrcPath, bashrcContent, 0o644);
+
+  // Write zshrc
+  const zshrcPath = getRcFilePath(projectPath, 'zsh');
+  const zshrcContent = generateZshrc(themeColors, config);
+  await atomicWriteFile(zshrcPath, zshrcContent, 0o644);
+
+  // Write all theme files (40 themes)
+  await writeAllThemeFiles(projectPath, allThemes);
+
+  // Write version file
+  await writeVersionFile(projectPath, RC_FILE_VERSION);
+}
+
+/**
+ * Ensure RC files are up to date
+ */
+export async function ensureRcFilesUpToDate(
+  projectPath: string,
+  theme: ThemeMode,
+  config: TerminalConfig,
+  themeColors: TerminalTheme,
+  allThemes: Record<ThemeMode, TerminalTheme>
+): Promise<void> {
+  const needsRegen = await needsRegeneration(projectPath, theme);
+  if (needsRegen) {
+    await writeRcFiles(projectPath, theme, config, themeColors, allThemes);
+  }
+}
+
+/**
+ * Delete terminal directory (for disable flow)
+ */
+export async function deleteTerminalDir(projectPath: string): Promise<void> {
+  const terminalDir = getTerminalDir(projectPath);
+  try {
+    await fs.rm(terminalDir, { recursive: true, force: true });
+  } catch (error) {
+    // Ignore errors if directory doesn't exist
+  }
+}
+
+/**
+ * Create user-custom.sh placeholder if it doesn't exist
+ */
+export async function ensureUserCustomFile(projectPath: string): Promise<void> {
+  const userCustomPath = path.join(getTerminalDir(projectPath), 'user-custom.sh');
+  try {
+    await fs.access(userCustomPath);
+  } catch {
+    // File doesn't exist, create it
+    const content = `#!/bin/sh
+# Automaker User Customizations
+# Add your custom shell configuration here
+# This file will not be overwritten by Automaker
+
+# Example: Add custom aliases
+# alias myalias='command'
+
+# Example: Add custom environment variables
+# export MY_VAR="value"
+`;
+    await atomicWriteFile(userCustomPath, content, 0o644);
+  }
+}
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
new file mode 100644
index 000000000..b074c383c
--- /dev/null
+++ b/libs/platform/src/rc-generator.ts
@@ -0,0 +1,423 @@
+/**
+ * RC Generator - Generate shell configuration files for custom terminal prompts
+ *
+ * This module generates bash/zsh/sh configuration files that sync with Automaker's themes,
+ * providing custom prompts with theme-matched colors while preserving user's existing RC files.
+ */
+
+import type { ThemeMode } from '@automaker/types';
+
+/**
+ * Terminal configuration options
+ */
+export interface TerminalConfig {
+  enabled: boolean;
+  customPrompt: boolean;
+  promptFormat: 'standard' | 'minimal' | 'powerline' | 'starship';
+  showGitBranch: boolean;
+  showGitStatus: boolean;
+  customAliases: string;
+  customEnvVars: Record<string, string>;
+  rcFileVersion?: number;
+}
+
+/**
+ * Terminal theme colors (hex values)
+ */
+export interface TerminalTheme {
+  background: string;
+  foreground: string;
+  cursor: string;
+  cursorAccent: string;
+  selectionBackground: string;
+  selectionForeground?: string;
+  black: string;
+  red: string;
+  green: string;
+  yellow: string;
+  blue: string;
+  magenta: string;
+  cyan: string;
+  white: string;
+  brightBlack: string;
+  brightRed: string;
+  brightGreen: string;
+  brightYellow: string;
+  brightBlue: string;
+  brightMagenta: string;
+  brightCyan: string;
+  brightWhite: string;
+}
+
+/**
+ * ANSI color codes for shell prompts
+ */
+export interface ANSIColors {
+  user: string;
+  host: string;
+  path: string;
+  gitBranch: string;
+  gitDirty: string;
+  prompt: string;
+  reset: string;
+}
+
+/**
+ * Convert hex color to RGB
+ */
+function hexToRgb(hex: string): { r: number; g: number; b: number } {
+  const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  if (!result) {
+    throw new Error(`Invalid hex color: ${hex}`);
+  }
+  return {
+    r: parseInt(result[1], 16),
+    g: parseInt(result[2], 16),
+    b: parseInt(result[3], 16),
+  };
+}
+
+/**
+ * Calculate Euclidean distance between two RGB colors
+ */
+function colorDistance(
+  c1: { r: number; g: number; b: number },
+  c2: { r: number; g: number; b: number }
+): number {
+  return Math.sqrt(Math.pow(c1.r - c2.r, 2) + Math.pow(c1.g - c2.g, 2) + Math.pow(c1.b - c2.b, 2));
+}
+
+/**
+ * xterm-256 color palette (simplified - standard colors + 6x6x6 RGB cube + grayscale)
+ */
+const XTERM_256_PALETTE: Array<{ r: number; g: number; b: number }> = [];
+
+// Standard colors (0-15) - already handled by ANSI basic colors
+// RGB cube (16-231): 6x6x6 cube with levels 0, 95, 135, 175, 215, 255
+const levels = [0, 95, 135, 175, 215, 255];
+for (let r = 0; r < 6; r++) {
+  for (let g = 0; g < 6; g++) {
+    for (let b = 0; b < 6; b++) {
+      XTERM_256_PALETTE.push({ r: levels[r], g: levels[g], b: levels[b] });
+    }
+  }
+}
+
+// Grayscale (232-255): 24 shades from #080808 to #eeeeee
+for (let i = 0; i < 24; i++) {
+  const gray = 8 + i * 10;
+  XTERM_256_PALETTE.push({ r: gray, g: gray, b: gray });
+}
+
+/**
+ * Convert hex color to closest xterm-256 color code
+ */
+export function hexToXterm256(hex: string): number {
+  const rgb = hexToRgb(hex);
+  let closestIndex = 16; // Start from RGB cube
+  let minDistance = Infinity;
+
+  XTERM_256_PALETTE.forEach((color, index) => {
+    const distance = colorDistance(rgb, color);
+    if (distance < minDistance) {
+      minDistance = distance;
+      closestIndex = index + 16; // Offset by 16 (standard colors)
+    }
+  });
+
+  return closestIndex;
+}
+
+/**
+ * Get ANSI color codes from theme colors
+ */
+export function getThemeANSIColors(theme: TerminalTheme): ANSIColors {
+  return {
+    user: `\\[\\e[38;5;${hexToXterm256(theme.cyan)}m\\]`,
+    host: `\\[\\e[38;5;${hexToXterm256(theme.blue)}m\\]`,
+    path: `\\[\\e[38;5;${hexToXterm256(theme.yellow)}m\\]`,
+    gitBranch: `\\[\\e[38;5;${hexToXterm256(theme.magenta)}m\\]`,
+    gitDirty: `\\[\\e[38;5;${hexToXterm256(theme.red)}m\\]`,
+    prompt: `\\[\\e[38;5;${hexToXterm256(theme.green)}m\\]`,
+    reset: '\\[\\e[0m\\]',
+  };
+}
+
+/**
+ * Escape shell special characters in user input
+ */
+function shellEscape(str: string): string {
+  return str.replace(/([`$\\"])/g, '\\$1');
+}
+
+/**
+ * Validate environment variable name
+ */
+function isValidEnvVarName(name: string): boolean {
+  return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name);
+}
+
+/**
+ * Generate common shell functions (git prompt, etc.)
+ */
+export function generateCommonFunctions(config: TerminalConfig): string {
+  const gitPrompt = config.showGitBranch
+    ? `
+automaker_git_prompt() {
+  local branch=""
+  local dirty=""
+
+  # Check if we're in a git repository
+  if git rev-parse --git-dir > /dev/null 2>&1; then
+    # Get current branch name
+    branch=$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)
+
+    ${
+      config.showGitStatus
+        ? `
+    # Check if working directory is dirty
+    if [ -n "$(git status --porcelain 2>/dev/null)" ]; then
+      dirty="*"
+    fi
+    `
+        : ''
+    }
+
+    if [ -n "$branch" ]; then
+      echo -n " ($branch$dirty)"
+    fi
+  fi
+}
+`
+    : `
+automaker_git_prompt() {
+  # Git prompt disabled
+  echo -n ""
+}
+`;
+
+  return `#!/bin/sh
+# Automaker Terminal Configuration - Common Functions v1.0
+
+${gitPrompt}
+`;
+}
+
+/**
+ * Generate prompt based on format
+ */
+function generatePrompt(format: TerminalConfig['promptFormat'], colors: ANSIColors): string {
+  switch (format) {
+    case 'minimal':
+      return `PS1="${colors.path}\\w${colors.reset}\\$(automaker_git_prompt) ${colors.prompt}\\$${colors.reset} "`;
+
+    case 'powerline':
+      return `PS1="┌─[${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset}]─[${colors.path}\\w${colors.reset}]\\$(automaker_git_prompt)\\n└─${colors.prompt}\\$${colors.reset} "`;
+
+    case 'starship':
+      return `PS1="${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset} in ${colors.path}\\w${colors.reset}\\$(automaker_git_prompt)\\n${colors.prompt}❯${colors.reset} "`;
+
+    case 'standard':
+    default:
+      return `PS1="[${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset}] ${colors.path}\\w${colors.reset}\\$(automaker_git_prompt) ${colors.prompt}\\$${colors.reset} "`;
+  }
+}
+
+/**
+ * Generate Zsh prompt based on format
+ */
+function generateZshPrompt(format: TerminalConfig['promptFormat'], colors: ANSIColors): string {
+  // Convert bash-style \u, \h, \w to zsh-style %n, %m, %~
+  // Remove bash-style escaping \[ \] (not needed in zsh)
+  const zshColors = {
+    user: colors.user
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+    host: colors.host
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+    path: colors.path
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+    gitBranch: colors.gitBranch
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+    gitDirty: colors.gitDirty
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+    prompt: colors.prompt
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+    reset: colors.reset
+      .replace(/\\[\[\]\\e]/g, '')
+      .replace(/\\e/g, '%{')
+      .replace(/m\\]/g, 'm%}'),
+  };
+
+  switch (format) {
+    case 'minimal':
+      return `PROMPT="${zshColors.path}%~${zshColors.reset}\\$(automaker_git_prompt) ${zshColors.prompt}%#${zshColors.reset} "`;
+
+    case 'powerline':
+      return `PROMPT="┌─[${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset}]─[${zshColors.path}%~${zshColors.reset}]\\$(automaker_git_prompt)
+└─${zshColors.prompt}%#${zshColors.reset} "`;
+
+    case 'starship':
+      return `PROMPT="${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset} in ${zshColors.path}%~${zshColors.reset}\\$(automaker_git_prompt)
+${zshColors.prompt}❯${zshColors.reset} "`;
+
+    case 'standard':
+    default:
+      return `PROMPT="[${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset}] ${zshColors.path}%~${zshColors.reset}\\$(automaker_git_prompt) ${zshColors.prompt}%#${zshColors.reset} "`;
+  }
+}
+
+/**
+ * Generate custom aliases section
+ */
+function generateAliases(config: TerminalConfig): string {
+  if (!config.customAliases) return '';
+
+  // Escape and validate aliases
+  const escapedAliases = shellEscape(config.customAliases);
+  return `
+# Custom aliases
+${escapedAliases}
+`;
+}
+
+/**
+ * Generate custom environment variables section
+ */
+function generateEnvVars(config: TerminalConfig): string {
+  if (!config.customEnvVars || Object.keys(config.customEnvVars).length === 0) {
+    return '';
+  }
+
+  const validEnvVars = Object.entries(config.customEnvVars)
+    .filter(([name]) => isValidEnvVarName(name))
+    .map(([name, value]) => `export ${name}="${shellEscape(value)}"`)
+    .join('\n');
+
+  return validEnvVars
+    ? `
+# Custom environment variables
+${validEnvVars}
+`
+    : '';
+}
+
+/**
+ * Generate bashrc configuration
+ */
+export function generateBashrc(theme: TerminalTheme, config: TerminalConfig): string {
+  const colors = getThemeANSIColors(theme);
+  const promptLine = generatePrompt(config.promptFormat, colors);
+
+  return `#!/bin/bash
+# Automaker Terminal Configuration v1.0
+# This file is automatically generated - manual edits will be overwritten
+
+# Source user's original bashrc first (preserves user configuration)
+if [ -f "$HOME/.bashrc" ]; then
+    source "$HOME/.bashrc"
+fi
+
+# Load Automaker theme colors
+AUTOMAKER_THEME="\${AUTOMAKER_THEME:-dark}"
+if [ -f "\${BASH_SOURCE%/*}/themes/$AUTOMAKER_THEME.sh" ]; then
+    source "\${BASH_SOURCE%/*}/themes/$AUTOMAKER_THEME.sh"
+fi
+
+# Load common functions (git prompt)
+if [ -f "\${BASH_SOURCE%/*}/common.sh" ]; then
+    source "\${BASH_SOURCE%/*}/common.sh"
+fi
+
+# Set custom prompt (only if enabled)
+if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
+    ${promptLine}
+fi
+${generateAliases(config)}${generateEnvVars(config)}
+# Load user customizations (if exists)
+if [ -f "\${BASH_SOURCE%/*}/user-custom.sh" ]; then
+    source "\${BASH_SOURCE%/*}/user-custom.sh"
+fi
+`;
+}
+
+/**
+ * Generate zshrc configuration
+ */
+export function generateZshrc(theme: TerminalTheme, config: TerminalConfig): string {
+  const colors = getThemeANSIColors(theme);
+  const promptLine = generateZshPrompt(config.promptFormat, colors);
+
+  return `#!/bin/zsh
+# Automaker Terminal Configuration v1.0
+# This file is automatically generated - manual edits will be overwritten
+
+# Source user's original zshrc first (preserves user configuration)
+if [ -f "$HOME/.zshrc" ]; then
+    source "$HOME/.zshrc"
+fi
+
+# Load Automaker theme colors
+AUTOMAKER_THEME="\${AUTOMAKER_THEME:-dark}"
+if [ -f "\${ZDOTDIR:-\${0:a:h}}/themes/$AUTOMAKER_THEME.sh" ]; then
+    source "\${ZDOTDIR:-\${0:a:h}}/themes/$AUTOMAKER_THEME.sh"
+fi
+
+# Load common functions (git prompt)
+if [ -f "\${ZDOTDIR:-\${0:a:h}}/common.sh" ]; then
+    source "\${ZDOTDIR:-\${0:a:h}}/common.sh"
+fi
+
+# Set custom prompt (only if enabled)
+if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
+    ${promptLine}
+fi
+${generateAliases(config)}${generateEnvVars(config)}
+# Load user customizations (if exists)
+if [ -f "\${ZDOTDIR:-\${0:a:h}}/user-custom.sh" ]; then
+    source "\${ZDOTDIR:-\${0:a:h}}/user-custom.sh"
+fi
+`;
+}
+
+/**
+ * Generate theme color exports for shell
+ */
+export function generateThemeColors(theme: TerminalTheme): string {
+  const colors = getThemeANSIColors(theme);
+
+  return `#!/bin/sh
+# Automaker Theme Colors
+# This file is automatically generated - manual edits will be overwritten
+
+# ANSI color codes for prompt
+export COLOR_USER="${colors.user}"
+export COLOR_HOST="${colors.host}"
+export COLOR_PATH="${colors.path}"
+export COLOR_GIT_BRANCH="${colors.gitBranch}"
+export COLOR_GIT_DIRTY="${colors.gitDirty}"
+export COLOR_PROMPT="${colors.prompt}"
+export COLOR_RESET="${colors.reset}"
+`;
+}
+
+/**
+ * Get shell name from file extension
+ */
+export function getShellName(rcFile: string): 'bash' | 'zsh' | 'sh' | null {
+  if (rcFile.endsWith('.sh') && rcFile.includes('bashrc')) return 'bash';
+  if (rcFile.endsWith('.zsh') || rcFile.endsWith('.zshrc')) return 'zsh';
+  if (rcFile.endsWith('.sh')) return 'sh';
+  return null;
+}
diff --git a/libs/platform/src/terminal-theme-colors.ts b/libs/platform/src/terminal-theme-colors.ts
new file mode 100644
index 000000000..29e8ffc63
--- /dev/null
+++ b/libs/platform/src/terminal-theme-colors.ts
@@ -0,0 +1,468 @@
+/**
+ * Terminal Theme Colors - Color definitions for all 40 themes
+ *
+ * This module contains only the raw color data for terminal themes,
+ * extracted from the UI package to avoid circular dependencies.
+ * These colors are used by both UI (xterm.js) and server (RC file generation).
+ */
+
+import type { ThemeMode } from '@automaker/types';
+import type { TerminalTheme } from './rc-generator.js';
+
+// Dark theme (default)
+const darkTheme: TerminalTheme = {
+  background: '#0a0a0a',
+  foreground: '#d4d4d4',
+  cursor: '#d4d4d4',
+  cursorAccent: '#0a0a0a',
+  selectionBackground: '#264f78',
+  black: '#1e1e1e',
+  red: '#f44747',
+  green: '#6a9955',
+  yellow: '#dcdcaa',
+  blue: '#569cd6',
+  magenta: '#c586c0',
+  cyan: '#4ec9b0',
+  white: '#d4d4d4',
+  brightBlack: '#808080',
+  brightRed: '#f44747',
+  brightGreen: '#6a9955',
+  brightYellow: '#dcdcaa',
+  brightBlue: '#569cd6',
+  brightMagenta: '#c586c0',
+  brightCyan: '#4ec9b0',
+  brightWhite: '#ffffff',
+};
+
+// Light theme
+const lightTheme: TerminalTheme = {
+  background: '#ffffff',
+  foreground: '#383a42',
+  cursor: '#383a42',
+  cursorAccent: '#ffffff',
+  selectionBackground: '#add6ff',
+  black: '#383a42',
+  red: '#e45649',
+  green: '#50a14f',
+  yellow: '#c18401',
+  blue: '#4078f2',
+  magenta: '#a626a4',
+  cyan: '#0184bc',
+  white: '#fafafa',
+  brightBlack: '#4f525e',
+  brightRed: '#e06c75',
+  brightGreen: '#98c379',
+  brightYellow: '#e5c07b',
+  brightBlue: '#61afef',
+  brightMagenta: '#c678dd',
+  brightCyan: '#56b6c2',
+  brightWhite: '#ffffff',
+};
+
+// Retro / Cyberpunk theme - neon green on black
+const retroTheme: TerminalTheme = {
+  background: '#000000',
+  foreground: '#39ff14',
+  cursor: '#39ff14',
+  cursorAccent: '#000000',
+  selectionBackground: '#39ff14',
+  selectionForeground: '#000000',
+  black: '#000000',
+  red: '#ff0055',
+  green: '#39ff14',
+  yellow: '#ffff00',
+  blue: '#00ffff',
+  magenta: '#ff00ff',
+  cyan: '#00ffff',
+  white: '#39ff14',
+  brightBlack: '#555555',
+  brightRed: '#ff5555',
+  brightGreen: '#55ff55',
+  brightYellow: '#ffff55',
+  brightBlue: '#55ffff',
+  brightMagenta: '#ff55ff',
+  brightCyan: '#55ffff',
+  brightWhite: '#ffffff',
+};
+
+// Dracula theme
+const draculaTheme: TerminalTheme = {
+  background: '#282a36',
+  foreground: '#f8f8f2',
+  cursor: '#f8f8f2',
+  cursorAccent: '#282a36',
+  selectionBackground: '#44475a',
+  black: '#21222c',
+  red: '#ff5555',
+  green: '#50fa7b',
+  yellow: '#f1fa8c',
+  blue: '#bd93f9',
+  magenta: '#ff79c6',
+  cyan: '#8be9fd',
+  white: '#f8f8f2',
+  brightBlack: '#6272a4',
+  brightRed: '#ff6e6e',
+  brightGreen: '#69ff94',
+  brightYellow: '#ffffa5',
+  brightBlue: '#d6acff',
+  brightMagenta: '#ff92df',
+  brightCyan: '#a4ffff',
+  brightWhite: '#ffffff',
+};
+
+// Nord theme
+const nordTheme: TerminalTheme = {
+  background: '#2e3440',
+  foreground: '#d8dee9',
+  cursor: '#d8dee9',
+  cursorAccent: '#2e3440',
+  selectionBackground: '#434c5e',
+  black: '#3b4252',
+  red: '#bf616a',
+  green: '#a3be8c',
+  yellow: '#ebcb8b',
+  blue: '#81a1c1',
+  magenta: '#b48ead',
+  cyan: '#88c0d0',
+  white: '#e5e9f0',
+  brightBlack: '#4c566a',
+  brightRed: '#bf616a',
+  brightGreen: '#a3be8c',
+  brightYellow: '#ebcb8b',
+  brightBlue: '#81a1c1',
+  brightMagenta: '#b48ead',
+  brightCyan: '#8fbcbb',
+  brightWhite: '#eceff4',
+};
+
+// Monokai theme
+const monokaiTheme: TerminalTheme = {
+  background: '#272822',
+  foreground: '#f8f8f2',
+  cursor: '#f8f8f2',
+  cursorAccent: '#272822',
+  selectionBackground: '#49483e',
+  black: '#272822',
+  red: '#f92672',
+  green: '#a6e22e',
+  yellow: '#f4bf75',
+  blue: '#66d9ef',
+  magenta: '#ae81ff',
+  cyan: '#a1efe4',
+  white: '#f8f8f2',
+  brightBlack: '#75715e',
+  brightRed: '#f92672',
+  brightGreen: '#a6e22e',
+  brightYellow: '#f4bf75',
+  brightBlue: '#66d9ef',
+  brightMagenta: '#ae81ff',
+  brightCyan: '#a1efe4',
+  brightWhite: '#f9f8f5',
+};
+
+// Tokyo Night theme
+const tokyonightTheme: TerminalTheme = {
+  background: '#1a1b26',
+  foreground: '#a9b1d6',
+  cursor: '#c0caf5',
+  cursorAccent: '#1a1b26',
+  selectionBackground: '#33467c',
+  black: '#15161e',
+  red: '#f7768e',
+  green: '#9ece6a',
+  yellow: '#e0af68',
+  blue: '#7aa2f7',
+  magenta: '#bb9af7',
+  cyan: '#7dcfff',
+  white: '#a9b1d6',
+  brightBlack: '#414868',
+  brightRed: '#f7768e',
+  brightGreen: '#9ece6a',
+  brightYellow: '#e0af68',
+  brightBlue: '#7aa2f7',
+  brightMagenta: '#bb9af7',
+  brightCyan: '#7dcfff',
+  brightWhite: '#c0caf5',
+};
+
+// Solarized Dark theme
+const solarizedTheme: TerminalTheme = {
+  background: '#002b36',
+  foreground: '#93a1a1',
+  cursor: '#93a1a1',
+  cursorAccent: '#002b36',
+  selectionBackground: '#073642',
+  black: '#073642',
+  red: '#dc322f',
+  green: '#859900',
+  yellow: '#b58900',
+  blue: '#268bd2',
+  magenta: '#d33682',
+  cyan: '#2aa198',
+  white: '#eee8d5',
+  brightBlack: '#002b36',
+  brightRed: '#cb4b16',
+  brightGreen: '#586e75',
+  brightYellow: '#657b83',
+  brightBlue: '#839496',
+  brightMagenta: '#6c71c4',
+  brightCyan: '#93a1a1',
+  brightWhite: '#fdf6e3',
+};
+
+// Gruvbox Dark theme
+const gruvboxTheme: TerminalTheme = {
+  background: '#282828',
+  foreground: '#ebdbb2',
+  cursor: '#ebdbb2',
+  cursorAccent: '#282828',
+  selectionBackground: '#504945',
+  black: '#282828',
+  red: '#cc241d',
+  green: '#98971a',
+  yellow: '#d79921',
+  blue: '#458588',
+  magenta: '#b16286',
+  cyan: '#689d6a',
+  white: '#a89984',
+  brightBlack: '#928374',
+  brightRed: '#fb4934',
+  brightGreen: '#b8bb26',
+  brightYellow: '#fabd2f',
+  brightBlue: '#83a598',
+  brightMagenta: '#d3869b',
+  brightCyan: '#8ec07c',
+  brightWhite: '#ebdbb2',
+};
+
+// Catppuccin Mocha theme
+const catppuccinTheme: TerminalTheme = {
+  background: '#1e1e2e',
+  foreground: '#cdd6f4',
+  cursor: '#f5e0dc',
+  cursorAccent: '#1e1e2e',
+  selectionBackground: '#45475a',
+  black: '#45475a',
+  red: '#f38ba8',
+  green: '#a6e3a1',
+  yellow: '#f9e2af',
+  blue: '#89b4fa',
+  magenta: '#cba6f7',
+  cyan: '#94e2d5',
+  white: '#bac2de',
+  brightBlack: '#585b70',
+  brightRed: '#f38ba8',
+  brightGreen: '#a6e3a1',
+  brightYellow: '#f9e2af',
+  brightBlue: '#89b4fa',
+  brightMagenta: '#cba6f7',
+  brightCyan: '#94e2d5',
+  brightWhite: '#a6adc8',
+};
+
+// One Dark theme
+const onedarkTheme: TerminalTheme = {
+  background: '#282c34',
+  foreground: '#abb2bf',
+  cursor: '#528bff',
+  cursorAccent: '#282c34',
+  selectionBackground: '#3e4451',
+  black: '#282c34',
+  red: '#e06c75',
+  green: '#98c379',
+  yellow: '#e5c07b',
+  blue: '#61afef',
+  magenta: '#c678dd',
+  cyan: '#56b6c2',
+  white: '#abb2bf',
+  brightBlack: '#5c6370',
+  brightRed: '#e06c75',
+  brightGreen: '#98c379',
+  brightYellow: '#e5c07b',
+  brightBlue: '#61afef',
+  brightMagenta: '#c678dd',
+  brightCyan: '#56b6c2',
+  brightWhite: '#ffffff',
+};
+
+// Synthwave '84 theme
+const synthwaveTheme: TerminalTheme = {
+  background: '#262335',
+  foreground: '#ffffff',
+  cursor: '#ff7edb',
+  cursorAccent: '#262335',
+  selectionBackground: '#463465',
+  black: '#262335',
+  red: '#fe4450',
+  green: '#72f1b8',
+  yellow: '#fede5d',
+  blue: '#03edf9',
+  magenta: '#ff7edb',
+  cyan: '#03edf9',
+  white: '#ffffff',
+  brightBlack: '#614d85',
+  brightRed: '#fe4450',
+  brightGreen: '#72f1b8',
+  brightYellow: '#f97e72',
+  brightBlue: '#03edf9',
+  brightMagenta: '#ff7edb',
+  brightCyan: '#03edf9',
+  brightWhite: '#ffffff',
+};
+
+// Red theme
+const redTheme: TerminalTheme = {
+  background: '#1a0a0a',
+  foreground: '#c8b0b0',
+  cursor: '#ff4444',
+  cursorAccent: '#1a0a0a',
+  selectionBackground: '#5a2020',
+  black: '#2a1010',
+  red: '#ff4444',
+  green: '#6a9a6a',
+  yellow: '#ccaa55',
+  blue: '#6688aa',
+  magenta: '#aa5588',
+  cyan: '#558888',
+  white: '#b0a0a0',
+  brightBlack: '#6a4040',
+  brightRed: '#ff6666',
+  brightGreen: '#88bb88',
+  brightYellow: '#ddbb66',
+  brightBlue: '#88aacc',
+  brightMagenta: '#cc77aa',
+  brightCyan: '#77aaaa',
+  brightWhite: '#d0c0c0',
+};
+
+// Cream theme
+const creamTheme: TerminalTheme = {
+  background: '#f5f3ee',
+  foreground: '#5a4a3a',
+  cursor: '#9d6b53',
+  cursorAccent: '#f5f3ee',
+  selectionBackground: '#d4c4b0',
+  black: '#5a4a3a',
+  red: '#c85a4f',
+  green: '#7a9a6a',
+  yellow: '#c9a554',
+  blue: '#6b8aaa',
+  magenta: '#a66a8a',
+  cyan: '#5a9a8a',
+  white: '#b0a090',
+  brightBlack: '#8a7a6a',
+  brightRed: '#e07060',
+  brightGreen: '#90b080',
+  brightYellow: '#e0bb70',
+  brightBlue: '#80a0c0',
+  brightMagenta: '#c080a0',
+  brightCyan: '#70b0a0',
+  brightWhite: '#d0c0b0',
+};
+
+// Sunset theme
+const sunsetTheme: TerminalTheme = {
+  background: '#1e1a24',
+  foreground: '#f2e8dd',
+  cursor: '#dd8855',
+  cursorAccent: '#1e1a24',
+  selectionBackground: '#3a2a40',
+  black: '#1e1a24',
+  red: '#dd6655',
+  green: '#88bb77',
+  yellow: '#ddaa66',
+  blue: '#6699cc',
+  magenta: '#cc7799',
+  cyan: '#66ccaa',
+  white: '#e8d8c8',
+  brightBlack: '#4a3a50',
+  brightRed: '#ee8866',
+  brightGreen: '#99cc88',
+  brightYellow: '#eebb77',
+  brightBlue: '#88aadd',
+  brightMagenta: '#dd88aa',
+  brightCyan: '#88ddbb',
+  brightWhite: '#f5e8dd',
+};
+
+// Gray theme
+const grayTheme: TerminalTheme = {
+  background: '#2a2d32',
+  foreground: '#d0d0d5',
+  cursor: '#8fa0c0',
+  cursorAccent: '#2a2d32',
+  selectionBackground: '#3a3f48',
+  black: '#2a2d32',
+  red: '#d87070',
+  green: '#78b088',
+  yellow: '#d0b060',
+  blue: '#7090c0',
+  magenta: '#a880b0',
+  cyan: '#60a0b0',
+  white: '#b0b0b8',
+  brightBlack: '#606068',
+  brightRed: '#e88888',
+  brightGreen: '#90c8a0',
+  brightYellow: '#e0c878',
+  brightBlue: '#90b0d8',
+  brightMagenta: '#c098c8',
+  brightCyan: '#80b8c8',
+  brightWhite: '#e0e0e8',
+};
+
+/**
+ * Theme color mapping for all 40 themes
+ */
+export const terminalThemeColors: Record<ThemeMode, TerminalTheme> = {
+  // Special
+  system: darkTheme, // Resolved at runtime based on OS preference
+  // Dark themes (16)
+  dark: darkTheme,
+  retro: retroTheme,
+  dracula: draculaTheme,
+  nord: nordTheme,
+  monokai: monokaiTheme,
+  tokyonight: tokyonightTheme,
+  solarized: solarizedTheme,
+  gruvbox: gruvboxTheme,
+  catppuccin: catppuccinTheme,
+  onedark: onedarkTheme,
+  synthwave: synthwaveTheme,
+  red: redTheme,
+  sunset: sunsetTheme,
+  gray: grayTheme,
+  forest: gruvboxTheme, // Green-ish theme
+  ocean: nordTheme, // Blue-ish theme
+  ember: monokaiTheme, // Warm orange theme
+  'ayu-dark': darkTheme,
+  'ayu-mirage': darkTheme,
+  matcha: nordTheme,
+  // Light themes (16)
+  light: lightTheme,
+  cream: creamTheme,
+  solarizedlight: lightTheme,
+  github: lightTheme,
+  paper: lightTheme,
+  rose: lightTheme,
+  mint: lightTheme,
+  lavender: lightTheme,
+  sand: creamTheme,
+  sky: lightTheme,
+  peach: creamTheme,
+  snow: lightTheme,
+  sepia: creamTheme,
+  gruvboxlight: creamTheme,
+  nordlight: lightTheme,
+  blossom: lightTheme,
+  'ayu-light': lightTheme,
+  onelight: lightTheme,
+  bluloco: lightTheme,
+  feather: lightTheme,
+};
+
+/**
+ * Get terminal theme colors for a given theme mode
+ */
+export function getTerminalThemeColors(theme: ThemeMode): TerminalTheme {
+  return terminalThemeColors[theme] || darkTheme;
+}
diff --git a/libs/types/src/settings.ts b/libs/types/src/settings.ts
index 554284f9b..9c9b7c6d9 100644
--- a/libs/types/src/settings.ts
+++ b/libs/types/src/settings.ts
@@ -27,14 +27,16 @@ export type { ModelAlias };
  *
  * Includes system theme and multiple color schemes organized by dark/light:
  * - System: Respects OS dark/light mode preference
- * - Dark themes (16): dark, retro, dracula, nord, monokai, tokyonight, solarized,
- *   gruvbox, catppuccin, onedark, synthwave, red, sunset, gray, forest, ocean
- * - Light themes (16): light, cream, solarizedlight, github, paper, rose, mint,
- *   lavender, sand, sky, peach, snow, sepia, gruvboxlight, nordlight, blossom
+ * - Dark themes (20): dark, retro, dracula, nord, monokai, tokyonight, solarized,
+ *   gruvbox, catppuccin, onedark, synthwave, red, sunset, gray, forest, ocean,
+ *   ember, ayu-dark, ayu-mirage, matcha
+ * - Light themes (20): light, cream, solarizedlight, github, paper, rose, mint,
+ *   lavender, sand, sky, peach, snow, sepia, gruvboxlight, nordlight, blossom,
+ *   ayu-light, onelight, bluloco, feather
  */
 export type ThemeMode =
   | 'system'
-  // Dark themes (16)
+  // Dark themes (20)
   | 'dark'
   | 'retro'
   | 'dracula'
@@ -51,7 +53,11 @@ export type ThemeMode =
   | 'gray'
   | 'forest'
   | 'ocean'
-  // Light themes (16)
+  | 'ember'
+  | 'ayu-dark'
+  | 'ayu-mirage'
+  | 'matcha'
+  // Light themes (20)
   | 'light'
   | 'cream'
   | 'solarizedlight'
@@ -67,7 +73,11 @@ export type ThemeMode =
   | 'sepia'
   | 'gruvboxlight'
   | 'nordlight'
-  | 'blossom';
+  | 'blossom'
+  | 'ayu-light'
+  | 'onelight'
+  | 'bluloco'
+  | 'feather';
 
 /** PlanningMode - Planning levels for feature generation workflows */
 export type PlanningMode = 'skip' | 'lite' | 'spec' | 'full';
@@ -840,6 +850,25 @@ export interface GlobalSettings {
   // Terminal Configuration
   /** How to open terminals from "Open in Terminal" worktree action */
   openTerminalMode?: 'newTab' | 'split';
+  /** Custom terminal configuration settings (prompt theming, aliases, env vars) */
+  terminalConfig?: {
+    /** Enable custom terminal configurations (default: false) */
+    enabled: boolean;
+    /** Enable custom prompt (default: true when enabled) */
+    customPrompt: boolean;
+    /** Prompt format template */
+    promptFormat: 'standard' | 'minimal' | 'powerline' | 'starship';
+    /** Show git branch in prompt (default: true) */
+    showGitBranch: boolean;
+    /** Show git status dirty indicator (default: true) */
+    showGitStatus: boolean;
+    /** User-provided custom aliases (multiline string) */
+    customAliases: string;
+    /** User-provided custom env vars */
+    customEnvVars: Record<string, string>;
+    /** RC file format version (for migration) */
+    rcFileVersion?: number;
+  };
 
   // UI State Preferences
   /** Whether sidebar is currently open */
@@ -1245,6 +1274,19 @@ export interface ProjectSettings {
    */
   defaultFeatureModel?: PhaseModelEntry;
 
+  // Terminal Configuration Override (per-project)
+  /** Project-specific terminal config overrides */
+  terminalConfig?: {
+    /** Override global enabled setting */
+    enabled?: boolean;
+    /** Project-specific custom aliases */
+    customAliases?: string;
+    /** Project-specific env vars */
+    customEnvVars?: Record<string, string>;
+    /** Custom welcome message for this project */
+    welcomeMessage?: string;
+  };
+
   // Deprecated Claude API Profile Override
   /**
    * @deprecated Use phaseModelOverrides instead.

From cea405fc79bb1e4db853646d337a8ee17befe3ee Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:05:06 +0530
Subject: [PATCH 02/20] feat(terminal): Wire terminal service with settings
 service

- Pass SettingsService to TerminalService constructor
- Initialize terminal service with settings service dependency
- Enable terminal config injection to work with actual settings

This completes Steps 1-4 of the terminal configuration plan:
- RC Generator (color mapping, prompt formats)
- RC File Manager (file I/O, atomic writes)
- Settings Schema (GlobalSettings + ProjectSettings)
- Terminal Service Integration (env var injection)

Next steps: Settings UI and theme change hooks.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 apps/server/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/server/src/index.ts b/apps/server/src/index.ts
index 4bd496bc8..2255fdc13 100644
--- a/apps/server/src/index.ts
+++ b/apps/server/src/index.ts
@@ -390,7 +390,7 @@ const server = createServer(app);
 // WebSocket servers using noServer mode for proper multi-path support
 const wss = new WebSocketServer({ noServer: true });
 const terminalWss = new WebSocketServer({ noServer: true });
-const terminalService = getTerminalService();
+const terminalService = getTerminalService(settingsService);
 
 /**
  * Authenticate WebSocket upgrade requests

From 13457decc5c9dbfe9ffccbd2a74d5096beea667c Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:15:59 +0530
Subject: [PATCH 03/20] feat(terminal): Add Settings UI and theme change
 synchronization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Complete Steps 5 & 6 of terminal configuration implementation:

Settings UI Components:
- Add PromptPreview component with live theme-aware rendering
- Add TerminalConfigSection with comprehensive controls:
  * Enable/disable toggle with confirmation dialog
  * Custom prompt toggle
  * Prompt format selector (4 formats)
  * Git branch/status toggles
  * Custom aliases textarea
  * Custom env vars key-value editor with validation
  * Info box explaining behavior
- Integrate into existing TerminalSection

Theme Change Hook:
- Add theme detection in update-global settings route
- Regenerate RC files for all projects when theme changes
- Skip projects with terminal config disabled
- Error handling with per-project logging
- Inject terminal service with settings service dependency

This completes the full terminal configuration feature:
✓ RC Generator (color mapping, prompts)
✓ RC File Manager (file I/O, versioning)
✓ Settings Schema (types, defaults)
✓ Terminal Service Integration (env vars, PTY spawn)
✓ Settings UI (comprehensive controls, preview)
✓ Theme Synchronization (automatic RC regeneration)

New terminals will use custom prompts matching app theme.
Existing terminals unaffected. User RC files preserved.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../routes/settings/routes/update-global.ts   |  36 ++
 .../settings-view/terminal/prompt-preview.tsx | 130 ++++
 .../terminal/terminal-config-section.tsx      | 350 +++++++++++
 .../terminal/terminal-section.tsx             |   6 +
 apps/ui/src/config/terminal-themes.d.ts       |  66 --
 apps/ui/src/config/terminal-themes.d.ts.map   |   1 -
 apps/ui/src/config/terminal-themes.js         | 566 ------------------
 apps/ui/src/config/terminal-themes.js.map     |   1 -
 8 files changed, 522 insertions(+), 634 deletions(-)
 create mode 100644 apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
 create mode 100644 apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
 delete mode 100644 apps/ui/src/config/terminal-themes.d.ts
 delete mode 100644 apps/ui/src/config/terminal-themes.d.ts.map
 delete mode 100644 apps/ui/src/config/terminal-themes.js
 delete mode 100644 apps/ui/src/config/terminal-themes.js.map

diff --git a/apps/server/src/routes/settings/routes/update-global.ts b/apps/server/src/routes/settings/routes/update-global.ts
index b45e99650..817b5c1da 100644
--- a/apps/server/src/routes/settings/routes/update-global.ts
+++ b/apps/server/src/routes/settings/routes/update-global.ts
@@ -14,6 +14,7 @@ import type { GlobalSettings } from '../../../types/settings.js';
 import { getErrorMessage, logError, logger } from '../common.js';
 import { setLogLevel, LogLevel } from '@automaker/utils';
 import { setRequestLoggingEnabled } from '../../../index.js';
+import { getTerminalService } from '../../../services/terminal-service.js';
 
 /**
  * Map server log level string to LogLevel enum
@@ -57,6 +58,10 @@ export function createUpdateGlobalHandler(settingsService: SettingsService) {
         }, localStorageMigrated=${(updates as any).localStorageMigrated ?? 'n/a'}`
       );
 
+      // Get old settings to detect theme changes
+      const oldSettings = await settingsService.getGlobalSettings();
+      const oldTheme = oldSettings?.theme;
+
       logger.info('[SERVER_SETTINGS_UPDATE] Calling updateGlobalSettings...');
       const settings = await settingsService.updateGlobalSettings(updates);
       logger.info(
@@ -64,6 +69,37 @@ export function createUpdateGlobalHandler(settingsService: SettingsService) {
         settings.projects?.length ?? 0
       );
 
+      // Handle theme change - regenerate terminal RC files for all projects
+      if ('theme' in updates && updates.theme && updates.theme !== oldTheme) {
+        const terminalService = getTerminalService(settingsService);
+        const newTheme = updates.theme;
+
+        logger.info(
+          `[TERMINAL_CONFIG] Theme changed from ${oldTheme} to ${newTheme}, regenerating RC files`
+        );
+
+        // Regenerate RC files for all projects with terminal config enabled
+        const projects = settings.projects || [];
+        for (const project of projects) {
+          try {
+            const projectSettings = await settingsService.getProjectSettings(project.path);
+            // Check if terminal config is enabled (global or project-specific)
+            const terminalConfigEnabled =
+              projectSettings.terminalConfig?.enabled !== false &&
+              settings.terminalConfig?.enabled === true;
+
+            if (terminalConfigEnabled) {
+              await terminalService.onThemeChange(project.path, newTheme);
+              logger.info(`[TERMINAL_CONFIG] Regenerated RC files for project: ${project.name}`);
+            }
+          } catch (error) {
+            logger.warn(
+              `[TERMINAL_CONFIG] Failed to regenerate RC files for project ${project.name}: ${error}`
+            );
+          }
+        }
+      }
+
       // Apply server log level if it was updated
       if ('serverLogLevel' in updates && updates.serverLogLevel) {
         const level = LOG_LEVEL_MAP[updates.serverLogLevel];
diff --git a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
new file mode 100644
index 000000000..ff8d4292e
--- /dev/null
+++ b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
@@ -0,0 +1,130 @@
+/**
+ * Prompt Preview - Shows a live preview of the custom terminal prompt
+ */
+
+import { cn } from '@/lib/utils';
+import type { ThemeMode } from '@automaker/types';
+import { getTerminalTheme } from '@/config/terminal-themes';
+
+interface PromptPreviewProps {
+  format: 'standard' | 'minimal' | 'powerline' | 'starship';
+  theme: ThemeMode;
+  showGitBranch: boolean;
+  showGitStatus: boolean;
+  className?: string;
+}
+
+export function PromptPreview({
+  format,
+  theme,
+  showGitBranch,
+  showGitStatus,
+  className,
+}: PromptPreviewProps) {
+  const terminalTheme = getTerminalTheme(theme);
+
+  // Generate preview text based on format
+  const renderPrompt = () => {
+    const user = 'user';
+    const host = 'automaker';
+    const path = '~/projects/automaker';
+    const branch = showGitBranch ? 'main' : null;
+    const dirty = showGitStatus && showGitBranch ? '*' : '';
+
+    const gitInfo = branch ? ` (${branch}${dirty})` : '';
+
+    switch (format) {
+      case 'minimal':
+        return (
+          <div className="font-mono text-sm leading-relaxed">
+            <span style={{ color: terminalTheme.yellow }}>{path}</span>
+            {gitInfo && <span style={{ color: terminalTheme.magenta }}>{gitInfo}</span>}
+            <span style={{ color: terminalTheme.green }}> $</span>
+            <span className="ml-1 animate-pulse">▊</span>
+          </div>
+        );
+
+      case 'powerline':
+        return (
+          <div className="font-mono text-sm leading-relaxed space-y-1">
+            <div>
+              <span style={{ color: terminalTheme.cyan }}>┌─[</span>
+              <span style={{ color: terminalTheme.cyan }}>{user}</span>
+              <span style={{ color: terminalTheme.foreground }}>@</span>
+              <span style={{ color: terminalTheme.blue }}>{host}</span>
+              <span style={{ color: terminalTheme.cyan }}>]─[</span>
+              <span style={{ color: terminalTheme.yellow }}>{path}</span>
+              <span style={{ color: terminalTheme.cyan }}>]</span>
+              {gitInfo && <span style={{ color: terminalTheme.magenta }}>{gitInfo}</span>}
+            </div>
+            <div>
+              <span style={{ color: terminalTheme.cyan }}>└─</span>
+              <span style={{ color: terminalTheme.green }}>$</span>
+              <span className="ml-1 animate-pulse">▊</span>
+            </div>
+          </div>
+        );
+
+      case 'starship':
+        return (
+          <div className="font-mono text-sm leading-relaxed space-y-1">
+            <div>
+              <span style={{ color: terminalTheme.cyan }}>{user}</span>
+              <span style={{ color: terminalTheme.foreground }}>@</span>
+              <span style={{ color: terminalTheme.blue }}>{host}</span>
+              <span style={{ color: terminalTheme.foreground }}> in </span>
+              <span style={{ color: terminalTheme.yellow }}>{path}</span>
+              {branch && (
+                <>
+                  <span style={{ color: terminalTheme.foreground }}> on </span>
+                  <span style={{ color: terminalTheme.magenta }}>
+                    {branch}
+                    {dirty}
+                  </span>
+                </>
+              )}
+            </div>
+            <div>
+              <span style={{ color: terminalTheme.green }}>❯</span>
+              <span className="ml-1 animate-pulse">▊</span>
+            </div>
+          </div>
+        );
+
+      case 'standard':
+      default:
+        return (
+          <div className="font-mono text-sm leading-relaxed">
+            <span style={{ color: terminalTheme.cyan }}>[{user}</span>
+            <span style={{ color: terminalTheme.foreground }}>@</span>
+            <span style={{ color: terminalTheme.blue }}>{host}</span>
+            <span style={{ color: terminalTheme.cyan }}>]</span>
+            <span style={{ color: terminalTheme.yellow }}> {path}</span>
+            {gitInfo && <span style={{ color: terminalTheme.magenta }}>{gitInfo}</span>}
+            <span style={{ color: terminalTheme.green }}> $</span>
+            <span className="ml-1 animate-pulse">▊</span>
+          </div>
+        );
+    }
+  };
+
+  return (
+    <div
+      className={cn(
+        'rounded-lg border p-4',
+        'bg-[var(--terminal-bg)] text-[var(--terminal-fg)]',
+        'shadow-inner',
+        className
+      )}
+      style={
+        {
+          '--terminal-bg': terminalTheme.background,
+          '--terminal-fg': terminalTheme.foreground,
+        } as React.CSSProperties
+      }
+    >
+      <div className="mb-2 text-xs text-muted-foreground opacity-70">Preview</div>
+      {renderPrompt()}
+    </div>
+  );
+}
diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
new file mode 100644
index 000000000..1a4e2f782
--- /dev/null
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -0,0 +1,350 @@
+/**
+ * Terminal Config Section - Custom terminal configurations with theme synchronization
+ *
+ * This component provides UI for enabling custom terminal prompts that automatically
+ * sync with Automaker's 40 themes. It's an opt-in feature that generates shell configs
+ * in .automaker/terminal/ without modifying user's existing RC files.
+ */
+
+import { useState } from 'react';
+import { Label } from '@/components/ui/label';
+import { Switch } from '@/components/ui/switch';
+import { Textarea } from '@/components/ui/textarea';
+import { Input } from '@/components/ui/input';
+import { Button } from '@/components/ui/button';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@/components/ui/select';
+import { Wand2, GitBranch, Info, Plus, X } from 'lucide-react';
+import { cn } from '@/lib/utils';
+import { useAppStore } from '@/store/app-store';
+import { toast } from 'sonner';
+import { PromptPreview } from './prompt-preview';
+
+export function TerminalConfigSection() {
+  const { theme, globalSettings, updateGlobalSettings } = useAppStore();
+  const [localEnvVars, setLocalEnvVars] = useState<Array<{ key: string; value: string }>>(
+    Object.entries(globalSettings?.terminalConfig?.customEnvVars || {}).map(([key, value]) => ({
+      key,
+      value,
+    }))
+  );
+
+  const terminalConfig = globalSettings?.terminalConfig || {
+    enabled: false,
+    customPrompt: true,
+    promptFormat: 'standard' as const,
+    showGitBranch: true,
+    showGitStatus: true,
+    customAliases: '',
+    customEnvVars: {},
+  };
+
+  const handleToggleEnabled = async (enabled: boolean) => {
+    if (enabled) {
+      // Show confirmation when enabling
+      const confirmed = window.confirm(
+        'Enable custom terminal configurations?\n\n' +
+          'This will:\n' +
+          '• Create shell config files in .automaker/terminal/\n' +
+          '• Set custom prompts that match your app theme\n' +
+          '• Not modify your existing ~/.bashrc or ~/.zshrc\n\n' +
+          'New terminals will use the custom prompt. Existing terminals are unaffected.'
+      );
+
+      if (!confirmed) return;
+    }
+
+    await updateGlobalSettings({
+      terminalConfig: {
+        ...terminalConfig,
+        enabled,
+      },
+    });
+
+    toast.success(
+      enabled ? 'Custom terminal configs enabled' : 'Custom terminal configs disabled',
+      {
+        description: enabled
+          ? 'New terminals will use custom prompts'
+          : '.automaker/terminal/ will be cleaned up',
+      }
+    );
+  };
+
+  const handleUpdateConfig = async (updates: Partial<typeof terminalConfig>) => {
+    await updateGlobalSettings({
+      terminalConfig: {
+        ...terminalConfig,
+        ...updates,
+      },
+    });
+  };
+
+  const addEnvVar = () => {
+    setLocalEnvVars([...localEnvVars, { key: '', value: '' }]);
+  };
+
+  const removeEnvVar = (index: number) => {
+    const newVars = localEnvVars.filter((_, i) => i !== index);
+    setLocalEnvVars(newVars);
+
+    // Update settings
+    const envVarsObject = newVars.reduce(
+      (acc, { key, value }) => {
+        if (key) acc[key] = value;
+        return acc;
+      },
+      {} as Record<string, string>
+    );
+
+    handleUpdateConfig({ customEnvVars: envVarsObject });
+  };
+
+  const updateEnvVar = (index: number, field: 'key' | 'value', newValue: string) => {
+    const newVars = [...localEnvVars];
+    newVars[index][field] = newValue;
+    setLocalEnvVars(newVars);
+
+    // Validate and update settings (only if key is valid)
+    const envVarsObject = newVars.reduce(
+      (acc, { key, value }) => {
+        // Only include vars with valid keys (alphanumeric + underscore)
+        if (key && /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) {
+          acc[key] = value;
+        }
+        return acc;
+      },
+      {} as Record<string, string>
+    );
+
+    handleUpdateConfig({ customEnvVars: envVarsObject });
+  };
+
+  return (
+    <div
+      className={cn(
+        'rounded-2xl overflow-hidden',
+        'border border-border/50',
+        'bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl',
+        'shadow-sm shadow-black/5'
+      )}
+    >
+      <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-purple-500/5 to-transparent">
+        <div className="flex items-center gap-3 mb-2">
+          <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-purple-500/20 to-purple-600/10 flex items-center justify-center border border-purple-500/20">
+            <Wand2 className="w-5 h-5 text-purple-500" />
+          </div>
+          <h2 className="text-lg font-semibold text-foreground tracking-tight">
+            Custom Terminal Configurations
+          </h2>
+        </div>
+        <p className="text-sm text-muted-foreground/80 ml-12">
+          Generate custom shell prompts that automatically sync with your app theme. Opt-in feature
+          that creates configs in .automaker/terminal/ without modifying your existing RC files.
+        </p>
+      </div>
+
+      <div className="p-6 space-y-6">
+        {/* Enable Toggle */}
+        <div className="flex items-center justify-between">
+          <div className="space-y-1">
+            <Label className="text-foreground font-medium">Enable Custom Configurations</Label>
+            <p className="text-xs text-muted-foreground">
+              Create theme-synced shell configs in .automaker/terminal/
+            </p>
+          </div>
+          <Switch checked={terminalConfig.enabled} onCheckedChange={handleToggleEnabled} />
+        </div>
+
+        {terminalConfig.enabled && (
+          <>
+            {/* Info Box */}
+            <div className="rounded-lg border border-purple-500/20 bg-purple-500/5 p-3 flex gap-2">
+              <Info className="h-4 w-4 text-purple-500 flex-shrink-0 mt-0.5" />
+              <div className="text-xs text-foreground/80">
+                <strong>How it works:</strong> Custom configs are applied to new terminals only.
+                Your ~/.bashrc and ~/.zshrc are still loaded first. Close and reopen terminals to
+                see changes.
+              </div>
+            </div>
+
+            {/* Custom Prompt Toggle */}
+            <div className="flex items-center justify-between">
+              <div className="space-y-1">
+                <Label className="text-foreground font-medium">Custom Prompt</Label>
+                <p className="text-xs text-muted-foreground">
+                  Override default shell prompt with themed version
+                </p>
+              </div>
+              <Switch
+                checked={terminalConfig.customPrompt}
+                onCheckedChange={(checked) => handleUpdateConfig({ customPrompt: checked })}
+              />
+            </div>
+
+            {terminalConfig.customPrompt && (
+              <>
+                {/* Prompt Format */}
+                <div className="space-y-3">
+                  <Label className="text-foreground font-medium">Prompt Format</Label>
+                  <Select
+                    value={terminalConfig.promptFormat}
+                    onValueChange={(value: 'standard' | 'minimal' | 'powerline' | 'starship') =>
+                      handleUpdateConfig({ promptFormat: value })
+                    }
+                  >
+                    <SelectTrigger>
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="standard">
+                        <div className="space-y-0.5">
+                          <div>Standard</div>
+                          <div className="text-xs text-muted-foreground">
+                            [user@host] ~/path (main*) $
+                          </div>
+                        </div>
+                      </SelectItem>
+                      <SelectItem value="minimal">
+                        <div className="space-y-0.5">
+                          <div>Minimal</div>
+                          <div className="text-xs text-muted-foreground">~/path (main*) $</div>
+                        </div>
+                      </SelectItem>
+                      <SelectItem value="powerline">
+                        <div className="space-y-0.5">
+                          <div>Powerline</div>
+                          <div className="text-xs text-muted-foreground">
+                            ┌─[user@host]─[~/path]─[main*]
+                          </div>
+                        </div>
+                      </SelectItem>
+                      <SelectItem value="starship">
+                        <div className="space-y-0.5">
+                          <div>Starship-Inspired</div>
+                          <div className="text-xs text-muted-foreground">
+                            user@host in ~/path on main*
+                          </div>
+                        </div>
+                      </SelectItem>
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                {/* Git Info Toggles */}
+                <div className="space-y-4 pl-4 border-l-2 border-border/30">
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <GitBranch className="w-4 h-4 text-muted-foreground" />
+                      <Label className="text-sm">Show Git Branch</Label>
+                    </div>
+                    <Switch
+                      checked={terminalConfig.showGitBranch}
+                      onCheckedChange={(checked) => handleUpdateConfig({ showGitBranch: checked })}
+                    />
+                  </div>
+
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <span className="text-sm text-muted-foreground">*</span>
+                      <Label className="text-sm">Show Git Status (dirty indicator)</Label>
+                    </div>
+                    <Switch
+                      checked={terminalConfig.showGitStatus}
+                      onCheckedChange={(checked) => handleUpdateConfig({ showGitStatus: checked })}
+                      disabled={!terminalConfig.showGitBranch}
+                    />
+                  </div>
+                </div>
+
+                {/* Live Preview */}
+                <div className="space-y-3">
+                  <Label className="text-foreground font-medium">Preview</Label>
+                  <PromptPreview
+                    format={terminalConfig.promptFormat}
+                    theme={theme}
+                    showGitBranch={terminalConfig.showGitBranch}
+                    showGitStatus={terminalConfig.showGitStatus}
+                  />
+                </div>
+              </>
+            )}
+
+            {/* Custom Aliases */}
+            <div className="space-y-3">
+              <div className="space-y-1">
+                <Label className="text-foreground font-medium">Custom Aliases</Label>
+                <p className="text-xs text-muted-foreground">
+                  Add shell aliases (one per line, e.g., alias ll='ls -la')
+                </p>
+              </div>
+              <Textarea
+                value={terminalConfig.customAliases}
+                onChange={(e) => handleUpdateConfig({ customAliases: e.target.value })}
+                placeholder="# Custom aliases&#10;alias gs='git status'&#10;alias ll='ls -la'&#10;alias ..='cd ..'"
+                className="font-mono text-sm h-32"
+              />
+            </div>
+
+            {/* Custom Environment Variables */}
+            <div className="space-y-3">
+              <div className="flex items-center justify-between">
+                <div className="space-y-1">
+                  <Label className="text-foreground font-medium">
+                    Custom Environment Variables
+                  </Label>
+                  <p className="text-xs text-muted-foreground">
+                    Add custom env vars (alphanumeric + underscore only)
+                  </p>
+                </div>
+                <Button variant="outline" size="sm" onClick={addEnvVar} className="h-8 gap-1.5">
+                  <Plus className="w-3.5 h-3.5" />
+                  Add
+                </Button>
+              </div>
+
+              {localEnvVars.length > 0 && (
+                <div className="space-y-2">
+                  {localEnvVars.map((envVar, index) => (
+                    <div key={index} className="flex gap-2 items-start">
+                      <Input
+                        value={envVar.key}
+                        onChange={(e) => updateEnvVar(index, 'key', e.target.value)}
+                        placeholder="VAR_NAME"
+                        className={cn(
+                          'font-mono text-sm flex-1',
+                          envVar.key &&
+                            !/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(envVar.key) &&
+                            'border-destructive'
+                        )}
+                      />
+                      <Input
+                        value={envVar.value}
+                        onChange={(e) => updateEnvVar(index, 'value', e.target.value)}
+                        placeholder="value"
+                        className="font-mono text-sm flex-[2]"
+                      />
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => removeEnvVar(index)}
+                        className="h-9 w-9 p-0 text-muted-foreground hover:text-destructive"
+                      >
+                        <X className="w-4 h-4" />
+                      </Button>
+                    </div>
+                  ))}
+                </div>
+              )}
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx
index eb81e8476..68c37814f 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx
@@ -24,6 +24,7 @@ import { TERMINAL_FONT_OPTIONS } from '@/config/terminal-themes';
 import { DEFAULT_FONT_VALUE } from '@/config/ui-font-options';
 import { useAvailableTerminals } from '@/components/views/board-view/worktree-panel/hooks/use-available-terminals';
 import { getTerminalIcon } from '@/components/icons/terminal-icons';
+import { TerminalConfigSection } from './terminal-config-section';
 
 export function TerminalSection() {
   const {
@@ -300,6 +301,11 @@ export function TerminalSection() {
           />
         </div>
       </div>
+
+      {/* Custom Terminal Configurations */}
+      <div className="mt-6">
+        <TerminalConfigSection />
+      </div>
     </div>
   );
 }
diff --git a/apps/ui/src/config/terminal-themes.d.ts b/apps/ui/src/config/terminal-themes.d.ts
deleted file mode 100644
index e4a875743..000000000
--- a/apps/ui/src/config/terminal-themes.d.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Terminal themes that match the app themes
- * Each theme provides colors for xterm.js terminal emulator
- */
-import type { ThemeMode } from '@/store/app-store';
-import { type UIFontOption } from '@/config/ui-font-options';
-export interface TerminalTheme {
-  background: string;
-  foreground: string;
-  cursor: string;
-  cursorAccent: string;
-  selectionBackground: string;
-  selectionForeground?: string;
-  black: string;
-  red: string;
-  green: string;
-  yellow: string;
-  blue: string;
-  magenta: string;
-  cyan: string;
-  white: string;
-  brightBlack: string;
-  brightRed: string;
-  brightGreen: string;
-  brightYellow: string;
-  brightBlue: string;
-  brightMagenta: string;
-  brightCyan: string;
-  brightWhite: string;
-  searchMatchBackground: string;
-  searchMatchBorder: string;
-  searchActiveMatchBackground: string;
-  searchActiveMatchBorder: string;
-}
-/**
- * Terminal font options for user selection
- *
- * Uses the same fonts as UI_MONO_FONT_OPTIONS for consistency across the app.
- * All fonts listed here are bundled with the app via @fontsource packages
- * or are system fonts with appropriate fallbacks.
- */
-export type TerminalFontOption = UIFontOption;
-/**
- * Terminal font options - reuses UI_MONO_FONT_OPTIONS with terminal-specific default
- *
- * The 'default' value means "use the default terminal font" (Menlo/Monaco)
- */
-export declare const TERMINAL_FONT_OPTIONS: readonly UIFontOption[];
-/**
- * Default terminal font family
- * Uses the DEFAULT_FONT_VALUE sentinel which maps to Menlo/Monaco
- */
-export declare const DEFAULT_TERMINAL_FONT: any;
-/**
- * Get the actual font family CSS value for terminal
- * Converts DEFAULT_FONT_VALUE to the actual Menlo/Monaco font stack
- */
-export declare function getTerminalFontFamily(fontValue: string | undefined): string;
-declare const terminalThemes: Record<ThemeMode, TerminalTheme>;
-/**
- * Get terminal theme for the given app theme
- * For "system" theme, it checks the user's system preference
- */
-export declare function getTerminalTheme(theme: ThemeMode): TerminalTheme;
-export default terminalThemes;
-//# sourceMappingURL=terminal-themes.d.ts.map
diff --git a/apps/ui/src/config/terminal-themes.d.ts.map b/apps/ui/src/config/terminal-themes.d.ts.map
deleted file mode 100644
index db9beffe7..000000000
--- a/apps/ui/src/config/terminal-themes.d.ts.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"terminal-themes.d.ts","sourceRoot":"","sources":["terminal-themes.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,0BAA0B,CAAC;AAElC,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IAEpB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,CAAC;IACpC,uBAAuB,EAAE,MAAM,CAAC;CACjC;AAED;;;;;;GAMG;AAGH,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAE9C;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,YAAY,EAMvD,CAAC;AAEH;;;GAGG;AACH,eAAO,MAAM,qBAAqB,KAAqB,CAAC;AAExD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAK3E;AAoeD,QAAA,MAAM,cAAc,EAAE,MAAM,CAAC,SAAS,EAAE,aAAa,CA6CpD,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,aAAa,CAUhE;AAED,eAAe,cAAc,CAAC"}
\ No newline at end of file
diff --git a/apps/ui/src/config/terminal-themes.js b/apps/ui/src/config/terminal-themes.js
deleted file mode 100644
index a788c2853..000000000
--- a/apps/ui/src/config/terminal-themes.js
+++ /dev/null
@@ -1,566 +0,0 @@
-'use strict';
-/**
- * Terminal themes that match the app themes
- * Each theme provides colors for xterm.js terminal emulator
- */
-Object.defineProperty(exports, '__esModule', { value: true });
-exports.DEFAULT_TERMINAL_FONT = exports.TERMINAL_FONT_OPTIONS = void 0;
-exports.getTerminalFontFamily = getTerminalFontFamily;
-exports.getTerminalTheme = getTerminalTheme;
-const ui_font_options_1 = require('@/config/ui-font-options');
-/**
- * Terminal font options - reuses UI_MONO_FONT_OPTIONS with terminal-specific default
- *
- * The 'default' value means "use the default terminal font" (Menlo/Monaco)
- */
-exports.TERMINAL_FONT_OPTIONS = ui_font_options_1.UI_MONO_FONT_OPTIONS.map((option) => {
-  // Replace the UI default label with terminal-specific default
-  if (option.value === ui_font_options_1.DEFAULT_FONT_VALUE) {
-    return { value: option.value, label: 'Default (Menlo / Monaco)' };
-  }
-  return option;
-});
-/**
- * Default terminal font family
- * Uses the DEFAULT_FONT_VALUE sentinel which maps to Menlo/Monaco
- */
-exports.DEFAULT_TERMINAL_FONT = ui_font_options_1.DEFAULT_FONT_VALUE;
-/**
- * Get the actual font family CSS value for terminal
- * Converts DEFAULT_FONT_VALUE to the actual Menlo/Monaco font stack
- */
-function getTerminalFontFamily(fontValue) {
-  if (!fontValue || fontValue === ui_font_options_1.DEFAULT_FONT_VALUE) {
-    return "Menlo, Monaco, 'Courier New', monospace";
-  }
-  return fontValue;
-}
-// Dark theme (default)
-const darkTheme = {
-  background: '#0a0a0a',
-  foreground: '#d4d4d4',
-  cursor: '#d4d4d4',
-  cursorAccent: '#0a0a0a',
-  selectionBackground: '#264f78',
-  black: '#1e1e1e',
-  red: '#f44747',
-  green: '#6a9955',
-  yellow: '#dcdcaa',
-  blue: '#569cd6',
-  magenta: '#c586c0',
-  cyan: '#4ec9b0',
-  white: '#d4d4d4',
-  brightBlack: '#808080',
-  brightRed: '#f44747',
-  brightGreen: '#6a9955',
-  brightYellow: '#dcdcaa',
-  brightBlue: '#569cd6',
-  brightMagenta: '#c586c0',
-  brightCyan: '#4ec9b0',
-  brightWhite: '#ffffff',
-  // Search colors - bright yellow for visibility on dark background
-  searchMatchBackground: '#6b5300',
-  searchMatchBorder: '#e2ac00',
-  searchActiveMatchBackground: '#ff8c00',
-  searchActiveMatchBorder: '#ffb74d',
-};
-// Light theme
-const lightTheme = {
-  background: '#ffffff',
-  foreground: '#383a42',
-  cursor: '#383a42',
-  cursorAccent: '#ffffff',
-  selectionBackground: '#add6ff',
-  black: '#383a42',
-  red: '#e45649',
-  green: '#50a14f',
-  yellow: '#c18401',
-  blue: '#4078f2',
-  magenta: '#a626a4',
-  cyan: '#0184bc',
-  white: '#fafafa',
-  brightBlack: '#4f525e',
-  brightRed: '#e06c75',
-  brightGreen: '#98c379',
-  brightYellow: '#e5c07b',
-  brightBlue: '#61afef',
-  brightMagenta: '#c678dd',
-  brightCyan: '#56b6c2',
-  brightWhite: '#ffffff',
-  // Search colors - darker for visibility on light background
-  searchMatchBackground: '#fff3b0',
-  searchMatchBorder: '#c9a500',
-  searchActiveMatchBackground: '#ffcc00',
-  searchActiveMatchBorder: '#996600',
-};
-// Retro / Cyberpunk theme - neon green on black
-const retroTheme = {
-  background: '#000000',
-  foreground: '#39ff14',
-  cursor: '#39ff14',
-  cursorAccent: '#000000',
-  selectionBackground: '#39ff14',
-  selectionForeground: '#000000',
-  black: '#000000',
-  red: '#ff0055',
-  green: '#39ff14',
-  yellow: '#ffff00',
-  blue: '#00ffff',
-  magenta: '#ff00ff',
-  cyan: '#00ffff',
-  white: '#39ff14',
-  brightBlack: '#555555',
-  brightRed: '#ff5555',
-  brightGreen: '#55ff55',
-  brightYellow: '#ffff55',
-  brightBlue: '#55ffff',
-  brightMagenta: '#ff55ff',
-  brightCyan: '#55ffff',
-  brightWhite: '#ffffff',
-  // Search colors - magenta/pink for contrast with green text
-  searchMatchBackground: '#660066',
-  searchMatchBorder: '#ff00ff',
-  searchActiveMatchBackground: '#cc00cc',
-  searchActiveMatchBorder: '#ff66ff',
-};
-// Dracula theme
-const draculaTheme = {
-  background: '#282a36',
-  foreground: '#f8f8f2',
-  cursor: '#f8f8f2',
-  cursorAccent: '#282a36',
-  selectionBackground: '#44475a',
-  black: '#21222c',
-  red: '#ff5555',
-  green: '#50fa7b',
-  yellow: '#f1fa8c',
-  blue: '#bd93f9',
-  magenta: '#ff79c6',
-  cyan: '#8be9fd',
-  white: '#f8f8f2',
-  brightBlack: '#6272a4',
-  brightRed: '#ff6e6e',
-  brightGreen: '#69ff94',
-  brightYellow: '#ffffa5',
-  brightBlue: '#d6acff',
-  brightMagenta: '#ff92df',
-  brightCyan: '#a4ffff',
-  brightWhite: '#ffffff',
-  // Search colors - orange for visibility
-  searchMatchBackground: '#8b5a00',
-  searchMatchBorder: '#ffb86c',
-  searchActiveMatchBackground: '#ff9500',
-  searchActiveMatchBorder: '#ffcc80',
-};
-// Nord theme
-const nordTheme = {
-  background: '#2e3440',
-  foreground: '#d8dee9',
-  cursor: '#d8dee9',
-  cursorAccent: '#2e3440',
-  selectionBackground: '#434c5e',
-  black: '#3b4252',
-  red: '#bf616a',
-  green: '#a3be8c',
-  yellow: '#ebcb8b',
-  blue: '#81a1c1',
-  magenta: '#b48ead',
-  cyan: '#88c0d0',
-  white: '#e5e9f0',
-  brightBlack: '#4c566a',
-  brightRed: '#bf616a',
-  brightGreen: '#a3be8c',
-  brightYellow: '#ebcb8b',
-  brightBlue: '#81a1c1',
-  brightMagenta: '#b48ead',
-  brightCyan: '#8fbcbb',
-  brightWhite: '#eceff4',
-  // Search colors - warm yellow/orange for cold blue theme
-  searchMatchBackground: '#5e4a00',
-  searchMatchBorder: '#ebcb8b',
-  searchActiveMatchBackground: '#d08770',
-  searchActiveMatchBorder: '#e8a87a',
-};
-// Monokai theme
-const monokaiTheme = {
-  background: '#272822',
-  foreground: '#f8f8f2',
-  cursor: '#f8f8f2',
-  cursorAccent: '#272822',
-  selectionBackground: '#49483e',
-  black: '#272822',
-  red: '#f92672',
-  green: '#a6e22e',
-  yellow: '#f4bf75',
-  blue: '#66d9ef',
-  magenta: '#ae81ff',
-  cyan: '#a1efe4',
-  white: '#f8f8f2',
-  brightBlack: '#75715e',
-  brightRed: '#f92672',
-  brightGreen: '#a6e22e',
-  brightYellow: '#f4bf75',
-  brightBlue: '#66d9ef',
-  brightMagenta: '#ae81ff',
-  brightCyan: '#a1efe4',
-  brightWhite: '#f9f8f5',
-  // Search colors - orange/gold for contrast
-  searchMatchBackground: '#6b4400',
-  searchMatchBorder: '#f4bf75',
-  searchActiveMatchBackground: '#e69500',
-  searchActiveMatchBorder: '#ffd080',
-};
-// Tokyo Night theme
-const tokyonightTheme = {
-  background: '#1a1b26',
-  foreground: '#a9b1d6',
-  cursor: '#c0caf5',
-  cursorAccent: '#1a1b26',
-  selectionBackground: '#33467c',
-  black: '#15161e',
-  red: '#f7768e',
-  green: '#9ece6a',
-  yellow: '#e0af68',
-  blue: '#7aa2f7',
-  magenta: '#bb9af7',
-  cyan: '#7dcfff',
-  white: '#a9b1d6',
-  brightBlack: '#414868',
-  brightRed: '#f7768e',
-  brightGreen: '#9ece6a',
-  brightYellow: '#e0af68',
-  brightBlue: '#7aa2f7',
-  brightMagenta: '#bb9af7',
-  brightCyan: '#7dcfff',
-  brightWhite: '#c0caf5',
-  // Search colors - warm orange for cold blue theme
-  searchMatchBackground: '#5c4a00',
-  searchMatchBorder: '#e0af68',
-  searchActiveMatchBackground: '#ff9e64',
-  searchActiveMatchBorder: '#ffb380',
-};
-// Solarized Dark theme (improved contrast for WCAG compliance)
-const solarizedTheme = {
-  background: '#002b36',
-  foreground: '#93a1a1', // Changed from #839496 (base0) to #93a1a1 (base1) for better contrast
-  cursor: '#93a1a1',
-  cursorAccent: '#002b36',
-  selectionBackground: '#073642',
-  black: '#073642',
-  red: '#dc322f',
-  green: '#859900',
-  yellow: '#b58900',
-  blue: '#268bd2',
-  magenta: '#d33682',
-  cyan: '#2aa198',
-  white: '#eee8d5',
-  brightBlack: '#002b36',
-  brightRed: '#cb4b16',
-  brightGreen: '#586e75',
-  brightYellow: '#657b83',
-  brightBlue: '#839496',
-  brightMagenta: '#6c71c4',
-  brightCyan: '#93a1a1',
-  brightWhite: '#fdf6e3',
-  // Search colors - orange (solarized orange) for visibility
-  searchMatchBackground: '#5c3d00',
-  searchMatchBorder: '#b58900',
-  searchActiveMatchBackground: '#cb4b16',
-  searchActiveMatchBorder: '#e07040',
-};
-// Gruvbox Dark theme
-const gruvboxTheme = {
-  background: '#282828',
-  foreground: '#ebdbb2',
-  cursor: '#ebdbb2',
-  cursorAccent: '#282828',
-  selectionBackground: '#504945',
-  black: '#282828',
-  red: '#cc241d',
-  green: '#98971a',
-  yellow: '#d79921',
-  blue: '#458588',
-  magenta: '#b16286',
-  cyan: '#689d6a',
-  white: '#a89984',
-  brightBlack: '#928374',
-  brightRed: '#fb4934',
-  brightGreen: '#b8bb26',
-  brightYellow: '#fabd2f',
-  brightBlue: '#83a598',
-  brightMagenta: '#d3869b',
-  brightCyan: '#8ec07c',
-  brightWhite: '#ebdbb2',
-  // Search colors - bright orange for gruvbox
-  searchMatchBackground: '#6b4500',
-  searchMatchBorder: '#d79921',
-  searchActiveMatchBackground: '#fe8019',
-  searchActiveMatchBorder: '#ffaa40',
-};
-// Catppuccin Mocha theme
-const catppuccinTheme = {
-  background: '#1e1e2e',
-  foreground: '#cdd6f4',
-  cursor: '#f5e0dc',
-  cursorAccent: '#1e1e2e',
-  selectionBackground: '#45475a',
-  black: '#45475a',
-  red: '#f38ba8',
-  green: '#a6e3a1',
-  yellow: '#f9e2af',
-  blue: '#89b4fa',
-  magenta: '#cba6f7',
-  cyan: '#94e2d5',
-  white: '#bac2de',
-  brightBlack: '#585b70',
-  brightRed: '#f38ba8',
-  brightGreen: '#a6e3a1',
-  brightYellow: '#f9e2af',
-  brightBlue: '#89b4fa',
-  brightMagenta: '#cba6f7',
-  brightCyan: '#94e2d5',
-  brightWhite: '#a6adc8',
-  // Search colors - peach/orange from catppuccin palette
-  searchMatchBackground: '#5c4020',
-  searchMatchBorder: '#fab387',
-  searchActiveMatchBackground: '#fab387',
-  searchActiveMatchBorder: '#fcc8a0',
-};
-// One Dark theme
-const onedarkTheme = {
-  background: '#282c34',
-  foreground: '#abb2bf',
-  cursor: '#528bff',
-  cursorAccent: '#282c34',
-  selectionBackground: '#3e4451',
-  black: '#282c34',
-  red: '#e06c75',
-  green: '#98c379',
-  yellow: '#e5c07b',
-  blue: '#61afef',
-  magenta: '#c678dd',
-  cyan: '#56b6c2',
-  white: '#abb2bf',
-  brightBlack: '#5c6370',
-  brightRed: '#e06c75',
-  brightGreen: '#98c379',
-  brightYellow: '#e5c07b',
-  brightBlue: '#61afef',
-  brightMagenta: '#c678dd',
-  brightCyan: '#56b6c2',
-  brightWhite: '#ffffff',
-  // Search colors - orange/gold for visibility
-  searchMatchBackground: '#5c4500',
-  searchMatchBorder: '#e5c07b',
-  searchActiveMatchBackground: '#d19a66',
-  searchActiveMatchBorder: '#e8b888',
-};
-// Synthwave '84 theme
-const synthwaveTheme = {
-  background: '#262335',
-  foreground: '#ffffff',
-  cursor: '#ff7edb',
-  cursorAccent: '#262335',
-  selectionBackground: '#463465',
-  black: '#262335',
-  red: '#fe4450',
-  green: '#72f1b8',
-  yellow: '#fede5d',
-  blue: '#03edf9',
-  magenta: '#ff7edb',
-  cyan: '#03edf9',
-  white: '#ffffff',
-  brightBlack: '#614d85',
-  brightRed: '#fe4450',
-  brightGreen: '#72f1b8',
-  brightYellow: '#f97e72',
-  brightBlue: '#03edf9',
-  brightMagenta: '#ff7edb',
-  brightCyan: '#03edf9',
-  brightWhite: '#ffffff',
-  // Search colors - hot pink/magenta for synthwave aesthetic
-  searchMatchBackground: '#6b2a7a',
-  searchMatchBorder: '#ff7edb',
-  searchActiveMatchBackground: '#ff7edb',
-  searchActiveMatchBorder: '#ffffff',
-};
-// Red theme - Dark theme with red accents
-const redTheme = {
-  background: '#1a0a0a',
-  foreground: '#c8b0b0',
-  cursor: '#ff4444',
-  cursorAccent: '#1a0a0a',
-  selectionBackground: '#5a2020',
-  black: '#2a1010',
-  red: '#ff4444',
-  green: '#6a9a6a',
-  yellow: '#ccaa55',
-  blue: '#6688aa',
-  magenta: '#aa5588',
-  cyan: '#558888',
-  white: '#b0a0a0',
-  brightBlack: '#6a4040',
-  brightRed: '#ff6666',
-  brightGreen: '#88bb88',
-  brightYellow: '#ddbb66',
-  brightBlue: '#88aacc',
-  brightMagenta: '#cc77aa',
-  brightCyan: '#77aaaa',
-  brightWhite: '#d0c0c0',
-  // Search colors - orange/gold to contrast with red theme
-  searchMatchBackground: '#5a3520',
-  searchMatchBorder: '#ccaa55',
-  searchActiveMatchBackground: '#ddbb66',
-  searchActiveMatchBorder: '#ffdd88',
-};
-// Cream theme - Warm, soft, easy on the eyes
-const creamTheme = {
-  background: '#f5f3ee',
-  foreground: '#5a4a3a',
-  cursor: '#9d6b53',
-  cursorAccent: '#f5f3ee',
-  selectionBackground: '#d4c4b0',
-  black: '#5a4a3a',
-  red: '#c85a4f',
-  green: '#7a9a6a',
-  yellow: '#c9a554',
-  blue: '#6b8aaa',
-  magenta: '#a66a8a',
-  cyan: '#5a9a8a',
-  white: '#b0a090',
-  brightBlack: '#8a7a6a',
-  brightRed: '#e07060',
-  brightGreen: '#90b080',
-  brightYellow: '#e0bb70',
-  brightBlue: '#80a0c0',
-  brightMagenta: '#c080a0',
-  brightCyan: '#70b0a0',
-  brightWhite: '#d0c0b0',
-  // Search colors - blue for contrast on light cream background
-  searchMatchBackground: '#c0d4e8',
-  searchMatchBorder: '#6b8aaa',
-  searchActiveMatchBackground: '#6b8aaa',
-  searchActiveMatchBorder: '#4a6a8a',
-};
-// Sunset theme - Mellow oranges and soft pastels
-const sunsetTheme = {
-  background: '#1e1a24',
-  foreground: '#f2e8dd',
-  cursor: '#dd8855',
-  cursorAccent: '#1e1a24',
-  selectionBackground: '#3a2a40',
-  black: '#1e1a24',
-  red: '#dd6655',
-  green: '#88bb77',
-  yellow: '#ddaa66',
-  blue: '#6699cc',
-  magenta: '#cc7799',
-  cyan: '#66ccaa',
-  white: '#e8d8c8',
-  brightBlack: '#4a3a50',
-  brightRed: '#ee8866',
-  brightGreen: '#99cc88',
-  brightYellow: '#eebb77',
-  brightBlue: '#88aadd',
-  brightMagenta: '#dd88aa',
-  brightCyan: '#88ddbb',
-  brightWhite: '#f5e8dd',
-  // Search colors - orange for warm sunset theme
-  searchMatchBackground: '#5a3a30',
-  searchMatchBorder: '#ddaa66',
-  searchActiveMatchBackground: '#eebb77',
-  searchActiveMatchBorder: '#ffdd99',
-};
-// Gray theme - Modern, minimal gray scheme inspired by Cursor
-const grayTheme = {
-  background: '#2a2d32',
-  foreground: '#d0d0d5',
-  cursor: '#8fa0c0',
-  cursorAccent: '#2a2d32',
-  selectionBackground: '#3a3f48',
-  black: '#2a2d32',
-  red: '#d87070',
-  green: '#78b088',
-  yellow: '#d0b060',
-  blue: '#7090c0',
-  magenta: '#a880b0',
-  cyan: '#60a0b0',
-  white: '#b0b0b8',
-  brightBlack: '#606068',
-  brightRed: '#e88888',
-  brightGreen: '#90c8a0',
-  brightYellow: '#e0c878',
-  brightBlue: '#90b0d8',
-  brightMagenta: '#c098c8',
-  brightCyan: '#80b8c8',
-  brightWhite: '#e0e0e8',
-  // Search colors - blue for modern feel
-  searchMatchBackground: '#3a4a60',
-  searchMatchBorder: '#7090c0',
-  searchActiveMatchBackground: '#90b0d8',
-  searchActiveMatchBorder: '#b0d0f0',
-};
-// Theme mapping
-const terminalThemes = {
-  // Special
-  system: darkTheme, // Will be resolved at runtime
-  // Dark themes
-  dark: darkTheme,
-  retro: retroTheme,
-  dracula: draculaTheme,
-  nord: nordTheme,
-  monokai: monokaiTheme,
-  tokyonight: tokyonightTheme,
-  solarized: solarizedTheme,
-  gruvbox: gruvboxTheme,
-  catppuccin: catppuccinTheme,
-  onedark: onedarkTheme,
-  synthwave: synthwaveTheme,
-  red: redTheme,
-  sunset: sunsetTheme,
-  gray: grayTheme,
-  forest: gruvboxTheme, // Green-ish theme, gruvbox is close
-  ocean: nordTheme, // Blue-ish theme, nord is close
-  ember: monokaiTheme, // Warm orange theme, monokai is close
-  'ayu-dark': darkTheme, // Deep dark with warm accents
-  'ayu-mirage': darkTheme, // Soft dark with golden accents
-  matcha: nordTheme, // Calming blue-gray with sage green
-  // Light themes
-  light: lightTheme,
-  cream: creamTheme,
-  solarizedlight: lightTheme, // TODO: Create dedicated solarized light terminal theme
-  github: lightTheme, // TODO: Create dedicated github terminal theme
-  paper: lightTheme,
-  rose: lightTheme,
-  mint: lightTheme,
-  lavender: lightTheme,
-  sand: creamTheme, // Warm tones like cream
-  sky: lightTheme,
-  peach: creamTheme, // Warm tones like cream
-  snow: lightTheme,
-  sepia: creamTheme, // Warm tones like cream
-  gruvboxlight: creamTheme, // Warm light theme
-  nordlight: lightTheme, // Cool light theme
-  blossom: lightTheme,
-  'ayu-light': lightTheme, // Clean light with orange accents
-  onelight: lightTheme, // Atom One Light - blue accent
-  bluloco: lightTheme, // Bluloco - cyan-blue accent
-  feather: lightTheme, // Feather - orange accent
-};
-/**
- * Get terminal theme for the given app theme
- * For "system" theme, it checks the user's system preference
- */
-function getTerminalTheme(theme) {
-  if (theme === 'system') {
-    // Check system preference
-    if (typeof window !== 'undefined') {
-      const prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
-      return prefersDark ? darkTheme : lightTheme;
-    }
-    return darkTheme; // Default to dark for SSR
-  }
-  return terminalThemes[theme] || darkTheme;
-}
-exports.default = terminalThemes;
-//# sourceMappingURL=terminal-themes.js.map
diff --git a/apps/ui/src/config/terminal-themes.js.map b/apps/ui/src/config/terminal-themes.js.map
deleted file mode 100644
index 5c219487c..000000000
--- a/apps/ui/src/config/terminal-themes.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"terminal-themes.js","sourceRoot":"","sources":["terminal-themes.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

From 4f282860bc8404f74310b1b3c5446741177fc06b Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:27:47 +0530
Subject: [PATCH 04/20] fix(terminal): Add error handling and explicit field
 mapping for terminal config

- Add try-catch block to handleToggleEnabled
- Explicitly set all required terminalConfig fields
- Add console logging for debugging
- Show error toast if update fails
- Include rcFileVersion: 1 in config object

This should fix the issue where the toggle doesn't enable after
clicking OK in the confirmation dialog.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../terminal/terminal-config-section.tsx      | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
index 1a4e2f782..71afaef6a 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -59,21 +59,39 @@ export function TerminalConfigSection() {
       if (!confirmed) return;
     }
 
-    await updateGlobalSettings({
-      terminalConfig: {
-        ...terminalConfig,
+    try {
+      // Ensure all required fields are present
+      const updatedConfig = {
         enabled,
-      },
-    });
+        customPrompt: terminalConfig.customPrompt,
+        promptFormat: terminalConfig.promptFormat,
+        showGitBranch: terminalConfig.showGitBranch,
+        showGitStatus: terminalConfig.showGitStatus,
+        customAliases: terminalConfig.customAliases,
+        customEnvVars: terminalConfig.customEnvVars,
+        rcFileVersion: 1,
+      };
 
-    toast.success(
-      enabled ? 'Custom terminal configs enabled' : 'Custom terminal configs disabled',
-      {
-        description: enabled
-          ? 'New terminals will use custom prompts'
-          : '.automaker/terminal/ will be cleaned up',
-      }
-    );
+      console.log('[TerminalConfig] Updating settings with:', updatedConfig);
+
+      await updateGlobalSettings({
+        terminalConfig: updatedConfig,
+      });
+
+      toast.success(
+        enabled ? 'Custom terminal configs enabled' : 'Custom terminal configs disabled',
+        {
+          description: enabled
+            ? 'New terminals will use custom prompts'
+            : '.automaker/terminal/ will be cleaned up',
+        }
+      );
+    } catch (error) {
+      console.error('[TerminalConfig] Failed to update settings:', error);
+      toast.error('Failed to update terminal config', {
+        description: error instanceof Error ? error.message : 'Unknown error',
+      });
+    }
   };
 
   const handleUpdateConfig = async (updates: Partial<typeof terminalConfig>) => {

From 691c181ee3ddc395c68fb9953e40ecf6ac6631cf Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:35:38 +0530
Subject: [PATCH 05/20] fix(terminal): Use React Query mutation hook for
 settings updates

The issue was that `updateGlobalSettings` doesn't exist in the app store.
The correct pattern is to use the `useUpdateGlobalSettings` hook from
use-settings-mutations.ts, which is a React Query mutation.

Changes:
- Import useUpdateGlobalSettings from mutations hook
- Use mutation.mutate() instead of direct function call
- Add proper onSuccess/onError callbacks
- Remove async/await pattern (React Query handles this)

This fixes the toggle not enabling after clicking OK in the confirmation dialog.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../terminal/terminal-config-section.tsx      | 72 ++++++++++---------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
index 71afaef6a..2355371b3 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -24,9 +24,11 @@ import { cn } from '@/lib/utils';
 import { useAppStore } from '@/store/app-store';
 import { toast } from 'sonner';
 import { PromptPreview } from './prompt-preview';
+import { useUpdateGlobalSettings } from '@/hooks/mutations/use-settings-mutations';
 
 export function TerminalConfigSection() {
-  const { theme, globalSettings, updateGlobalSettings } = useAppStore();
+  const { theme, globalSettings } = useAppStore();
+  const updateGlobalSettings = useUpdateGlobalSettings({ showSuccessToast: false });
   const [localEnvVars, setLocalEnvVars] = useState<Array<{ key: string; value: string }>>(
     Object.entries(globalSettings?.terminalConfig?.customEnvVars || {}).map(([key, value]) => ({
       key,
@@ -59,43 +61,45 @@ export function TerminalConfigSection() {
       if (!confirmed) return;
     }
 
-    try {
-      // Ensure all required fields are present
-      const updatedConfig = {
-        enabled,
-        customPrompt: terminalConfig.customPrompt,
-        promptFormat: terminalConfig.promptFormat,
-        showGitBranch: terminalConfig.showGitBranch,
-        showGitStatus: terminalConfig.showGitStatus,
-        customAliases: terminalConfig.customAliases,
-        customEnvVars: terminalConfig.customEnvVars,
-        rcFileVersion: 1,
-      };
+    // Ensure all required fields are present
+    const updatedConfig = {
+      enabled,
+      customPrompt: terminalConfig.customPrompt,
+      promptFormat: terminalConfig.promptFormat,
+      showGitBranch: terminalConfig.showGitBranch,
+      showGitStatus: terminalConfig.showGitStatus,
+      customAliases: terminalConfig.customAliases,
+      customEnvVars: terminalConfig.customEnvVars,
+      rcFileVersion: 1,
+    };
 
-      console.log('[TerminalConfig] Updating settings with:', updatedConfig);
+    console.log('[TerminalConfig] Updating settings with:', updatedConfig);
 
-      await updateGlobalSettings({
-        terminalConfig: updatedConfig,
-      });
-
-      toast.success(
-        enabled ? 'Custom terminal configs enabled' : 'Custom terminal configs disabled',
-        {
-          description: enabled
-            ? 'New terminals will use custom prompts'
-            : '.automaker/terminal/ will be cleaned up',
-        }
-      );
-    } catch (error) {
-      console.error('[TerminalConfig] Failed to update settings:', error);
-      toast.error('Failed to update terminal config', {
-        description: error instanceof Error ? error.message : 'Unknown error',
-      });
-    }
+    updateGlobalSettings.mutate(
+      { terminalConfig: updatedConfig },
+      {
+        onSuccess: () => {
+          toast.success(
+            enabled ? 'Custom terminal configs enabled' : 'Custom terminal configs disabled',
+            {
+              description: enabled
+                ? 'New terminals will use custom prompts'
+                : '.automaker/terminal/ will be cleaned up',
+            }
+          );
+        },
+        onError: (error) => {
+          console.error('[TerminalConfig] Failed to update settings:', error);
+          toast.error('Failed to update terminal config', {
+            description: error instanceof Error ? error.message : 'Unknown error',
+          });
+        },
+      }
+    );
   };
 
-  const handleUpdateConfig = async (updates: Partial<typeof terminalConfig>) => {
-    await updateGlobalSettings({
+  const handleUpdateConfig = (updates: Partial<typeof terminalConfig>) => {
+    updateGlobalSettings.mutate({
       terminalConfig: {
         ...terminalConfig,
         ...updates,

From 8d2d6d8f62dbcb02d132bc15ccef51a9707deca7 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:46:57 +0530
Subject: [PATCH 06/20] fix(terminal): Use React Query hook for globalSettings
 instead of store
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The root cause: Component was reading globalSettings from the app store,
which doesn't update reactively when the mutation completes.

Solution: Use useGlobalSettings() React Query hook which:
- Automatically refetches when the mutation invalidates the cache
- Triggers re-render with updated data
- Makes the toggle reflect the new state

Now the flow is:
1. User clicks toggle → confirmation dialog
2. Click OK → mutation.mutate() called
3. Mutation succeeds → invalidates queryKeys.settings.global()
4. Query refetches → component re-renders with new globalSettings
5. Toggle shows enabled state ✓

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .../views/settings-view/terminal/terminal-config-section.tsx  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
index 2355371b3..a73e0b215 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -25,9 +25,11 @@ import { useAppStore } from '@/store/app-store';
 import { toast } from 'sonner';
 import { PromptPreview } from './prompt-preview';
 import { useUpdateGlobalSettings } from '@/hooks/mutations/use-settings-mutations';
+import { useGlobalSettings } from '@/hooks/queries/use-settings';
 
 export function TerminalConfigSection() {
-  const { theme, globalSettings } = useAppStore();
+  const { theme } = useAppStore();
+  const { data: globalSettings } = useGlobalSettings();
   const updateGlobalSettings = useUpdateGlobalSettings({ showSuccessToast: false });
   const [localEnvVars, setLocalEnvVars] = useState<Array<{ key: string; value: string }>>(
     Object.entries(globalSettings?.terminalConfig?.customEnvVars || {}).map(([key, value]) => ({

From f07fbc045c5c2dc25b4696d09ed7a94468820812 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 00:58:05 +0530
Subject: [PATCH 07/20] debug(terminal): Add detailed logging for terminal
 config application

Add logging to track:
- When terminal config check happens
- CWD being used
- Global and project enabled states
- Effective enabled state

This will help diagnose why RC files aren't being generated
when opening terminals in Automaker.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 apps/server/src/services/terminal-service.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/server/src/services/terminal-service.ts b/apps/server/src/services/terminal-service.ts
index 836ddabdd..25bba66d5 100644
--- a/apps/server/src/services/terminal-service.ts
+++ b/apps/server/src/services/terminal-service.ts
@@ -350,6 +350,9 @@ export class TerminalService extends EventEmitter {
     const terminalConfigEnv: Record<string, string> = {};
     if (this.settingsService) {
       try {
+        logger.info(
+          `[createSession] Checking terminal config for session ${id}, cwd: ${options.cwd || cwd}`
+        );
         const globalSettings = await this.settingsService.getGlobalSettings();
         const projectSettings = options.cwd
           ? await this.settingsService.getProjectSettings(options.cwd)
@@ -359,12 +362,18 @@ export class TerminalService extends EventEmitter {
         const globalTerminalConfig = globalSettings?.terminalConfig;
         const projectTerminalConfig = projectSettings?.terminalConfig;
 
+        logger.info(
+          `[createSession] Terminal config: global.enabled=${globalTerminalConfig?.enabled}, project.enabled=${projectTerminalConfig?.enabled}`
+        );
+
         // Determine if terminal config is enabled
         const enabled =
           projectTerminalConfig?.enabled !== undefined
             ? projectTerminalConfig.enabled
             : globalTerminalConfig?.enabled || false;
 
+        logger.info(`[createSession] Terminal config effective enabled: ${enabled}`);
+
         if (enabled && globalTerminalConfig) {
           const currentTheme = globalSettings?.theme || 'dark';
           const themeColors = getTerminalThemeColors(currentTheme);

From efad21955f00016b8f17393e0a36c6d2e27788fe Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 01:25:24 +0530
Subject: [PATCH 08/20] Fix terminal rc updates and bash rcfile loading

---
 apps/server/src/services/terminal-service.ts | 44 ++++++++--
 libs/platform/src/rc-file-manager.ts         | 62 ++++++++++++-
 libs/platform/tests/rc-file-manager.test.ts  | 92 ++++++++++++++++++++
 3 files changed, 188 insertions(+), 10 deletions(-)
 create mode 100644 libs/platform/tests/rc-file-manager.test.ts

diff --git a/apps/server/src/services/terminal-service.ts b/apps/server/src/services/terminal-service.ts
index 25bba66d5..54d899bd6 100644
--- a/apps/server/src/services/terminal-service.ts
+++ b/apps/server/src/services/terminal-service.ts
@@ -32,6 +32,12 @@ import {
   getShellPaths,
 } from '@automaker/platform';
 
+const BASH_LOGIN_ARG = '--login';
+const BASH_RCFILE_ARG = '--rcfile';
+const SHELL_NAME_BASH = 'bash';
+const SHELL_NAME_ZSH = 'zsh';
+const SHELL_NAME_SH = 'sh';
+
 // Maximum scrollback buffer size (characters)
 const MAX_SCROLLBACK_SIZE = 50000; // ~50KB per terminal
 
@@ -50,6 +56,25 @@ let maxSessions = parseInt(process.env.TERMINAL_MAX_SESSIONS || '1000', 10);
 const OUTPUT_THROTTLE_MS = 4; // ~250fps max update rate for responsive input
 const OUTPUT_BATCH_SIZE = 4096; // Smaller batches for lower latency
 
+function applyBashRcFileArgs(args: string[], rcFilePath: string): string[] {
+  const sanitizedArgs: string[] = [];
+
+  for (let index = 0; index < args.length; index += 1) {
+    const arg = args[index];
+    if (arg === BASH_LOGIN_ARG) {
+      continue;
+    }
+    if (arg === BASH_RCFILE_ARG) {
+      index += 1;
+      continue;
+    }
+    sanitizedArgs.push(arg);
+  }
+
+  sanitizedArgs.push(BASH_RCFILE_ARG, rcFilePath);
+  return sanitizedArgs;
+}
+
 export interface TerminalSession {
   id: string;
   pty: pty.IPty;
@@ -130,11 +155,11 @@ export class TerminalService extends EventEmitter {
         return [];
       }
       // sh doesn't support --login in all implementations
-      if (shellName === 'sh') {
+      if (shellName === SHELL_NAME_SH) {
         return [];
       }
       // bash, zsh, and other POSIX shells support --login
-      return ['--login'];
+      return [BASH_LOGIN_ARG];
     };
 
     // Check if running in WSL - prefer user's shell or bash with --login
@@ -327,8 +352,9 @@ export class TerminalService extends EventEmitter {
 
     const id = `term-${Date.now()}-${Math.random().toString(36).slice(2, 11)}`;
 
-    const { shell: detectedShell, args: shellArgs } = this.detectShell();
+    const { shell: detectedShell, args: detectedShellArgs } = this.detectShell();
     const shell = options.shell || detectedShell;
+    let shellArgs = [...detectedShellArgs];
 
     // Validate and resolve working directory
     // Uses secureFs internally to enforce ALLOWED_ROOT_DIRECTORY
@@ -407,20 +433,22 @@ export class TerminalService extends EventEmitter {
           // Set shell-specific env vars
           const shellName = path.basename(shell).toLowerCase();
 
-          if (shellName.includes('bash')) {
-            terminalConfigEnv.BASH_ENV = getRcFilePath(options.cwd || cwd, 'bash');
+          if (shellName.includes(SHELL_NAME_BASH)) {
+            const bashRcFilePath = getRcFilePath(options.cwd || cwd, SHELL_NAME_BASH);
+            terminalConfigEnv.BASH_ENV = bashRcFilePath;
             terminalConfigEnv.AUTOMAKER_CUSTOM_PROMPT = effectiveConfig.customPrompt
               ? 'true'
               : 'false';
             terminalConfigEnv.AUTOMAKER_THEME = currentTheme;
-          } else if (shellName.includes('zsh')) {
+            shellArgs = applyBashRcFileArgs(shellArgs, bashRcFilePath);
+          } else if (shellName.includes(SHELL_NAME_ZSH)) {
             terminalConfigEnv.ZDOTDIR = getTerminalDir(options.cwd || cwd);
             terminalConfigEnv.AUTOMAKER_CUSTOM_PROMPT = effectiveConfig.customPrompt
               ? 'true'
               : 'false';
             terminalConfigEnv.AUTOMAKER_THEME = currentTheme;
-          } else if (shellName === 'sh') {
-            terminalConfigEnv.ENV = getRcFilePath(options.cwd || cwd, 'sh');
+          } else if (shellName === SHELL_NAME_SH) {
+            terminalConfigEnv.ENV = getRcFilePath(options.cwd || cwd, SHELL_NAME_SH);
             terminalConfigEnv.AUTOMAKER_CUSTOM_PROMPT = effectiveConfig.customPrompt
               ? 'true'
               : 'false';
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index debf6fe3b..1e64ddfe0 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -7,6 +7,7 @@
 
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
+import { createHash } from 'node:crypto';
 import type { ThemeMode } from '@automaker/types';
 import {
   generateBashrc,
@@ -22,6 +23,8 @@ import {
  */
 export const RC_FILE_VERSION = 1;
 
+const RC_SIGNATURE_FILENAME = 'config.sha256';
+
 /**
  * Get the terminal directory path
  */
@@ -75,6 +78,47 @@ async function atomicWriteFile(
   await fs.rename(tempPath, filePath);
 }
 
+function sortObjectKeys(value: unknown): unknown {
+  if (Array.isArray(value)) {
+    return value.map((item) => sortObjectKeys(item));
+  }
+
+  if (value && typeof value === 'object') {
+    const sortedEntries = Object.entries(value as Record<string, unknown>)
+      .filter(([, entryValue]) => entryValue !== undefined)
+      .sort(([left], [right]) => left.localeCompare(right));
+
+    const sortedObject: Record<string, unknown> = {};
+    for (const [key, entryValue] of sortedEntries) {
+      sortedObject[key] = sortObjectKeys(entryValue);
+    }
+    return sortedObject;
+  }
+
+  return value;
+}
+
+function buildConfigSignature(theme: ThemeMode, config: TerminalConfig): string {
+  const payload = { theme, config: sortObjectKeys(config) };
+  const serializedPayload = JSON.stringify(payload);
+  return createHash('sha256').update(serializedPayload).digest('hex');
+}
+
+async function readSignatureFile(projectPath: string): Promise<string | null> {
+  const signaturePath = path.join(getTerminalDir(projectPath), RC_SIGNATURE_FILENAME);
+  try {
+    const signature = await fs.readFile(signaturePath, 'utf8');
+    return signature.trim() || null;
+  } catch {
+    return null;
+  }
+}
+
+async function writeSignatureFile(projectPath: string, signature: string): Promise<void> {
+  const signaturePath = path.join(getTerminalDir(projectPath), RC_SIGNATURE_FILENAME);
+  await atomicWriteFile(signaturePath, `${signature}\n`, 0o644);
+}
+
 /**
  * Check current RC file version
  */
@@ -100,7 +144,11 @@ async function writeVersionFile(projectPath: string, version: number): Promise<v
 /**
  * Check if RC files need regeneration
  */
-export async function needsRegeneration(projectPath: string, theme: ThemeMode): Promise<boolean> {
+export async function needsRegeneration(
+  projectPath: string,
+  theme: ThemeMode,
+  config: TerminalConfig
+): Promise<boolean> {
   const currentVersion = await checkRcFileVersion(projectPath);
 
   // Regenerate if version doesn't match or files don't exist
@@ -108,6 +156,12 @@ export async function needsRegeneration(projectPath: string, theme: ThemeMode):
     return true;
   }
 
+  const expectedSignature = buildConfigSignature(theme, config);
+  const existingSignature = await readSignatureFile(projectPath);
+  if (!existingSignature || existingSignature !== expectedSignature) {
+    return true;
+  }
+
   // Check if critical files exist
   const bashrcPath = getRcFilePath(projectPath, 'bash');
   const zshrcPath = getRcFilePath(projectPath, 'zsh');
@@ -195,6 +249,10 @@ export async function writeRcFiles(
 
   // Write version file
   await writeVersionFile(projectPath, RC_FILE_VERSION);
+
+  // Write config signature for change detection
+  const signature = buildConfigSignature(theme, config);
+  await writeSignatureFile(projectPath, signature);
 }
 
 /**
@@ -207,7 +265,7 @@ export async function ensureRcFilesUpToDate(
   themeColors: TerminalTheme,
   allThemes: Record<ThemeMode, TerminalTheme>
 ): Promise<void> {
-  const needsRegen = await needsRegeneration(projectPath, theme);
+  const needsRegen = await needsRegeneration(projectPath, theme, config);
   if (needsRegen) {
     await writeRcFiles(projectPath, theme, config, themeColors, allThemes);
   }
diff --git a/libs/platform/tests/rc-file-manager.test.ts b/libs/platform/tests/rc-file-manager.test.ts
new file mode 100644
index 000000000..1f676bc67
--- /dev/null
+++ b/libs/platform/tests/rc-file-manager.test.ts
@@ -0,0 +1,92 @@
+import { describe, it, expect, beforeEach, afterEach } from 'vitest';
+import fs from 'fs/promises';
+import path from 'path';
+import os from 'os';
+import { needsRegeneration, writeRcFiles } from '../src/rc-file-manager';
+import { terminalThemeColors } from '../src/terminal-theme-colors';
+import type { TerminalConfig } from '../src/rc-generator';
+import type { ThemeMode } from '@automaker/types';
+
+describe('rc-file-manager.ts', () => {
+  let tempDir: string;
+  let projectPath: string;
+
+  const TEMP_DIR_PREFIX = 'platform-rc-files-test-';
+  const PROJECT_DIR_NAME = 'test-project';
+  const THEME_DARK = 'dark' as ThemeMode;
+  const THEME_LIGHT = 'light' as ThemeMode;
+  const PROMPT_FORMAT_STANDARD: TerminalConfig['promptFormat'] = 'standard';
+  const PROMPT_FORMAT_MINIMAL: TerminalConfig['promptFormat'] = 'minimal';
+  const EMPTY_ALIASES = '';
+
+  const baseConfig: TerminalConfig = {
+    enabled: true,
+    customPrompt: true,
+    promptFormat: PROMPT_FORMAT_STANDARD,
+    showGitBranch: true,
+    showGitStatus: true,
+    customAliases: EMPTY_ALIASES,
+    customEnvVars: {},
+  };
+
+  beforeEach(async () => {
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), TEMP_DIR_PREFIX));
+    projectPath = path.join(tempDir, PROJECT_DIR_NAME);
+    await fs.mkdir(projectPath, { recursive: true });
+  });
+
+  afterEach(async () => {
+    try {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    } catch {
+      // Ignore cleanup errors
+    }
+  });
+
+  it('should not regenerate when signature matches', async () => {
+    await writeRcFiles(
+      projectPath,
+      THEME_DARK,
+      baseConfig,
+      terminalThemeColors[THEME_DARK],
+      terminalThemeColors
+    );
+
+    const needsRegen = await needsRegeneration(projectPath, THEME_DARK, baseConfig);
+
+    expect(needsRegen).toBe(false);
+  });
+
+  it('should regenerate when config changes', async () => {
+    await writeRcFiles(
+      projectPath,
+      THEME_DARK,
+      baseConfig,
+      terminalThemeColors[THEME_DARK],
+      terminalThemeColors
+    );
+
+    const updatedConfig: TerminalConfig = {
+      ...baseConfig,
+      promptFormat: PROMPT_FORMAT_MINIMAL,
+    };
+
+    const needsRegen = await needsRegeneration(projectPath, THEME_DARK, updatedConfig);
+
+    expect(needsRegen).toBe(true);
+  });
+
+  it('should regenerate when theme changes', async () => {
+    await writeRcFiles(
+      projectPath,
+      THEME_DARK,
+      baseConfig,
+      terminalThemeColors[THEME_DARK],
+      terminalThemeColors
+    );
+
+    const needsRegen = await needsRegeneration(projectPath, THEME_LIGHT, baseConfig);
+
+    expect(needsRegen).toBe(true);
+  });
+});

From 7d31a0589c949c8a43a311ea017b1cad2e056dfb Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 01:49:45 +0530
Subject: [PATCH 09/20] feat(terminal): add banner on shell start

---
 docs/terminal-custom-configs-plan.md     |   8 +-
 libs/platform/src/rc-file-manager.ts     |   2 +-
 libs/platform/src/rc-generator.ts        | 215 +++++++++++++++++++++++
 libs/platform/tests/rc-generator.test.ts |  41 +++++
 4 files changed, 263 insertions(+), 3 deletions(-)
 create mode 100644 libs/platform/tests/rc-generator.test.ts

diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 474638e87..9e6de2e7a 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -135,7 +135,11 @@ export async function writeRcFiles(
 ): Promise<void>;
 export function getRcFilePath(projectPath: string, shell: 'bash' | 'zsh' | 'sh'): string;
 export async function checkRcFileVersion(projectPath: string): Promise<number | null>;
-export async function needsRegeneration(projectPath: string, theme: ThemeMode): Promise<boolean>;
+export async function needsRegeneration(
+  projectPath: string,
+  theme: ThemeMode,
+  config: TerminalConfig
+): Promise<boolean>;
 ```
 
 **File Operations**:
@@ -143,7 +147,7 @@ export async function needsRegeneration(projectPath: string, theme: ThemeMode):
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "1")
+- Create version.txt with format version (currently "2")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 1e64ddfe0..96af883ca 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 1;
+export const RC_FILE_VERSION = 2;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index b074c383c..cca403d38 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -157,6 +157,10 @@ function isValidEnvVarName(name: string): boolean {
   return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name);
 }
 
+function stripPromptEscapes(ansiColor: string): string {
+  return ansiColor.replace(/\\\[/g, '').replace(/\\\]/g, '');
+}
+
 /**
  * Generate common shell functions (git prompt, etc.)
  */
@@ -200,6 +204,189 @@ automaker_git_prompt() {
 # Automaker Terminal Configuration - Common Functions v1.0
 
 ${gitPrompt}
+
+AUTOMAKER_INFO_UNKNOWN="Unknown"
+AUTOMAKER_BANNER_LABEL_WIDTH=12
+AUTOMAKER_BYTES_PER_KIB=1024
+AUTOMAKER_KIB_PER_MIB=1024
+AUTOMAKER_MIB_PER_GIB=1024
+
+automaker_command_exists() {
+  command -v "$1" >/dev/null 2>&1
+}
+
+automaker_get_os() {
+  if [ -f /etc/os-release ]; then
+    . /etc/os-release
+    if [ -n "$PRETTY_NAME" ]; then
+      echo "$PRETTY_NAME"
+      return
+    fi
+    if [ -n "$NAME" ] && [ -n "$VERSION" ]; then
+      echo "$NAME $VERSION"
+      return
+    fi
+  fi
+
+  if automaker_command_exists sw_vers; then
+    echo "$(sw_vers -productName) $(sw_vers -productVersion)"
+    return
+  fi
+
+  uname -s 2>/dev/null || echo "$AUTOMAKER_INFO_UNKNOWN"
+}
+
+automaker_get_uptime() {
+  if automaker_command_exists uptime; then
+    if uptime -p >/dev/null 2>&1; then
+      uptime -p
+      return
+    fi
+    uptime 2>/dev/null | sed 's/.*up \\([^,]*\\).*/\\1/' || uptime 2>/dev/null
+    return
+  fi
+
+  echo "$AUTOMAKER_INFO_UNKNOWN"
+}
+
+automaker_get_cpu() {
+  if automaker_command_exists lscpu; then
+    lscpu | sed -n 's/Model name:[[:space:]]*//p' | head -n 1
+    return
+  fi
+
+  if automaker_command_exists sysctl; then
+    sysctl -n machdep.cpu.brand_string 2>/dev/null || sysctl -n hw.model 2>/dev/null
+    return
+  fi
+
+  uname -m 2>/dev/null || echo "$AUTOMAKER_INFO_UNKNOWN"
+}
+
+automaker_get_memory() {
+  if automaker_command_exists free; then
+    free -h | awk '/Mem:/ {print $3 " / " $2}'
+    return
+  fi
+
+  if automaker_command_exists vm_stat; then
+    local page_size
+    local pages_free
+    local pages_active
+    local pages_inactive
+    local pages_wired
+    local pages_total
+    page_size=$(vm_stat | awk '/page size of/ {print $8}')
+    pages_free=$(vm_stat | awk '/Pages free/ {print $3}' | tr -d '.')
+    pages_active=$(vm_stat | awk '/Pages active/ {print $3}' | tr -d '.')
+    pages_inactive=$(vm_stat | awk '/Pages inactive/ {print $3}' | tr -d '.')
+    pages_wired=$(vm_stat | awk '/Pages wired down/ {print $4}' | tr -d '.')
+    pages_total=$((pages_free + pages_active + pages_inactive + pages_wired))
+    awk -v total="$pages_total" -v free="$pages_free" -v size="$page_size" \
+      -v bytes_kib="$AUTOMAKER_BYTES_PER_KIB" \
+      -v kib_mib="$AUTOMAKER_KIB_PER_MIB" \
+      -v mib_gib="$AUTOMAKER_MIB_PER_GIB" \
+      'BEGIN {
+      total_gb = total * size / bytes_kib / kib_mib / mib_gib;
+      used_gb = (total - free) * size / bytes_kib / kib_mib / mib_gib;
+      printf("%.1f GB / %.1f GB", used_gb, total_gb);
+    }'
+    return
+  fi
+
+  if automaker_command_exists sysctl; then
+    local total_bytes
+    total_bytes=$(sysctl -n hw.memsize 2>/dev/null)
+    if [ -n "$total_bytes" ]; then
+      awk -v total="$total_bytes" \
+        -v bytes_kib="$AUTOMAKER_BYTES_PER_KIB" \
+        -v kib_mib="$AUTOMAKER_KIB_PER_MIB" \
+        -v mib_gib="$AUTOMAKER_MIB_PER_GIB" \
+        'BEGIN {printf("%.1f GB", total / bytes_kib / kib_mib / mib_gib)}'
+      return
+    fi
+  fi
+
+  echo "$AUTOMAKER_INFO_UNKNOWN"
+}
+
+automaker_get_disk() {
+  if automaker_command_exists df; then
+    df -h / 2>/dev/null | awk 'NR==2 {print $3 " / " $2}'
+    return
+  fi
+
+  echo "$AUTOMAKER_INFO_UNKNOWN"
+}
+
+automaker_get_ip() {
+  if automaker_command_exists hostname; then
+    local ip_addr
+    ip_addr=$(hostname -I 2>/dev/null | awk '{print $1}')
+    if [ -n "$ip_addr" ]; then
+      echo "$ip_addr"
+      return
+    fi
+  fi
+
+  if automaker_command_exists ipconfig; then
+    local ip_addr
+    ip_addr=$(ipconfig getifaddr en0 2>/dev/null)
+    if [ -n "$ip_addr" ]; then
+      echo "$ip_addr"
+      return
+    fi
+  fi
+
+  echo "$AUTOMAKER_INFO_UNKNOWN"
+}
+
+automaker_show_banner() {
+  local label_width="$AUTOMAKER_BANNER_LABEL_WIDTH"
+  local logo_line_1="  █▀▀█ █  █ ▀▀█▀▀ █▀▀█ █▀▄▀█ █▀▀█ █ █ █▀▀ █▀▀█  "
+  local logo_line_2="  █▄▄█ █  █   █   █  █ █ ▀ █ █▄▄█ █▀▄ █▀▀ █▄▄▀  "
+  local logo_line_3="  ▀  ▀  ▀▀▀   ▀   ▀▀▀▀ ▀   ▀ ▀  ▀ ▀ ▀ ▀▀▀ ▀ ▀▀  "
+  local accent_color="\${COLOR_PROMPT_RAW:-}"
+  local secondary_color="\${COLOR_PATH_RAW:-}"
+  local label_color="\${COLOR_GIT_BRANCH_RAW:-}"
+  local reset_color="\${COLOR_RESET_RAW:-}"
+
+  printf "%b%s%b\n" "$accent_color" "$logo_line_1" "$reset_color"
+  printf "%b%s%b\n" "$secondary_color" "$logo_line_2" "$reset_color"
+  printf "%b%s%b\n" "$secondary_color" "$logo_line_3" "$reset_color"
+  printf "\n"
+
+  local shell_name="\${SHELL##*/}"
+  if [ -z "$shell_name" ]; then
+    shell_name=$(basename "$0" 2>/dev/null || echo "shell")
+  fi
+  local user_host="\${USER:-unknown}@$(hostname 2>/dev/null || echo unknown)"
+  printf "%b%s%b\n" "$label_color" "$user_host" "$reset_color"
+
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "OS:" "$reset_color" "$(automaker_get_os)"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "Uptime:" "$reset_color" "$(automaker_get_uptime)"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "Shell:" "$reset_color" "$shell_name"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "Terminal:" "$reset_color" "\${TERM_PROGRAM:-$TERM}"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "CPU:" "$reset_color" "$(automaker_get_cpu)"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "Memory:" "$reset_color" "$(automaker_get_memory)"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "Disk:" "$reset_color" "$(automaker_get_disk)"
+  printf "%b%-\${label_width}s%b %s\n" "$label_color" "Local IP:" "$reset_color" "$(automaker_get_ip)"
+  printf "\n"
+}
+
+automaker_show_banner_once() {
+  case "$-" in
+    *i*) ;;
+    *) return ;;
+  esac
+
+  if [ "$AUTOMAKER_BANNER_SHOWN" = "true" ]; then
+    return
+  fi
+
+  automaker_show_banner
+  export AUTOMAKER_BANNER_SHOWN="true"
+}
 `;
 }
 
@@ -340,6 +527,11 @@ if [ -f "\${BASH_SOURCE%/*}/common.sh" ]; then
     source "\${BASH_SOURCE%/*}/common.sh"
 fi
 
+# Show Automaker banner on shell start
+if command -v automaker_show_banner_once >/dev/null 2>&1; then
+    automaker_show_banner_once
+fi
+
 # Set custom prompt (only if enabled)
 if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
     ${promptLine}
@@ -379,6 +571,11 @@ if [ -f "\${ZDOTDIR:-\${0:a:h}}/common.sh" ]; then
     source "\${ZDOTDIR:-\${0:a:h}}/common.sh"
 fi
 
+# Show Automaker banner on shell start
+if command -v automaker_show_banner_once >/dev/null 2>&1; then
+    automaker_show_banner_once
+fi
+
 # Set custom prompt (only if enabled)
 if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
     ${promptLine}
@@ -396,6 +593,15 @@ fi
  */
 export function generateThemeColors(theme: TerminalTheme): string {
   const colors = getThemeANSIColors(theme);
+  const rawColors = {
+    user: stripPromptEscapes(colors.user),
+    host: stripPromptEscapes(colors.host),
+    path: stripPromptEscapes(colors.path),
+    gitBranch: stripPromptEscapes(colors.gitBranch),
+    gitDirty: stripPromptEscapes(colors.gitDirty),
+    prompt: stripPromptEscapes(colors.prompt),
+    reset: stripPromptEscapes(colors.reset),
+  };
 
   return `#!/bin/sh
 # Automaker Theme Colors
@@ -409,6 +615,15 @@ export COLOR_GIT_BRANCH="${colors.gitBranch}"
 export COLOR_GIT_DIRTY="${colors.gitDirty}"
 export COLOR_PROMPT="${colors.prompt}"
 export COLOR_RESET="${colors.reset}"
+
+# ANSI color codes for banner output (no prompt escapes)
+export COLOR_USER_RAW="${rawColors.user}"
+export COLOR_HOST_RAW="${rawColors.host}"
+export COLOR_PATH_RAW="${rawColors.path}"
+export COLOR_GIT_BRANCH_RAW="${rawColors.gitBranch}"
+export COLOR_GIT_DIRTY_RAW="${rawColors.gitDirty}"
+export COLOR_PROMPT_RAW="${rawColors.prompt}"
+export COLOR_RESET_RAW="${rawColors.reset}"
 `;
 }
 
diff --git a/libs/platform/tests/rc-generator.test.ts b/libs/platform/tests/rc-generator.test.ts
new file mode 100644
index 000000000..c3985f61c
--- /dev/null
+++ b/libs/platform/tests/rc-generator.test.ts
@@ -0,0 +1,41 @@
+import { describe, it, expect } from 'vitest';
+import { generateCommonFunctions, generateThemeColors } from '../src/rc-generator';
+import { terminalThemeColors } from '../src/terminal-theme-colors';
+import type { TerminalConfig } from '../src/rc-generator';
+import type { ThemeMode } from '@automaker/types';
+
+describe('rc-generator.ts', () => {
+  const THEME_DARK = 'dark' as ThemeMode;
+  const PROMPT_FORMAT_STANDARD: TerminalConfig['promptFormat'] = 'standard';
+  const EMPTY_ALIASES = '';
+  const EMPTY_ENV_VARS = {};
+  const EXPECTED_BANNER_FUNCTION = 'automaker_show_banner_once';
+  const RAW_COLOR_PREFIX = 'export COLOR_USER_RAW=';
+  const RAW_COLOR_ESCAPE_START = '\\\\[';
+  const RAW_COLOR_ESCAPE_END = '\\\\]';
+
+  const baseConfig: TerminalConfig = {
+    enabled: true,
+    customPrompt: true,
+    promptFormat: PROMPT_FORMAT_STANDARD,
+    showGitBranch: true,
+    showGitStatus: true,
+    customAliases: EMPTY_ALIASES,
+    customEnvVars: EMPTY_ENV_VARS,
+  };
+
+  it('includes banner functions in common shell script', () => {
+    const output = generateCommonFunctions(baseConfig);
+
+    expect(output).toContain(EXPECTED_BANNER_FUNCTION);
+  });
+
+  it('exports raw banner colors without prompt escape wrappers', () => {
+    const output = generateThemeColors(terminalThemeColors[THEME_DARK]);
+    const rawLine = output.split('\n').find((line) => line.startsWith(RAW_COLOR_PREFIX));
+
+    expect(rawLine).toBeDefined();
+    expect(rawLine).not.toContain(RAW_COLOR_ESCAPE_START);
+    expect(rawLine).not.toContain(RAW_COLOR_ESCAPE_END);
+  });
+});

From 92cbb42105be06489931fc426693a8cbb89828de Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 01:58:17 +0530
Subject: [PATCH 10/20] feat(terminal): colorize banner per theme

---
 libs/platform/src/rc-generator.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index cca403d38..3f19ef89e 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -346,14 +346,15 @@ automaker_show_banner() {
   local logo_line_1="  █▀▀█ █  █ ▀▀█▀▀ █▀▀█ █▀▄▀█ █▀▀█ █ █ █▀▀ █▀▀█  "
   local logo_line_2="  █▄▄█ █  █   █   █  █ █ ▀ █ █▄▄█ █▀▄ █▀▀ █▄▄▀  "
   local logo_line_3="  ▀  ▀  ▀▀▀   ▀   ▀▀▀▀ ▀   ▀ ▀  ▀ ▀ ▀ ▀▀▀ ▀ ▀▀  "
-  local accent_color="\${COLOR_PROMPT_RAW:-}"
-  local secondary_color="\${COLOR_PATH_RAW:-}"
+  local accent_color="\${COLOR_USER_RAW:-}"
+  local secondary_color="\${COLOR_HOST_RAW:-}"
+  local tertiary_color="\${COLOR_PATH_RAW:-}"
   local label_color="\${COLOR_GIT_BRANCH_RAW:-}"
   local reset_color="\${COLOR_RESET_RAW:-}"
 
   printf "%b%s%b\n" "$accent_color" "$logo_line_1" "$reset_color"
   printf "%b%s%b\n" "$secondary_color" "$logo_line_2" "$reset_color"
-  printf "%b%s%b\n" "$secondary_color" "$logo_line_3" "$reset_color"
+  printf "%b%s%b\n" "$tertiary_color" "$logo_line_3" "$reset_color"
   printf "\n"
 
   local shell_name="\${SHELL##*/}"

From a44d4258fa01f6973730ee98d893bb1990762d6a Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 02:02:40 +0530
Subject: [PATCH 11/20] chore(terminal): bump rc version for banner colors

---
 docs/terminal-custom-configs-plan.md | 2 +-
 libs/platform/src/rc-file-manager.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 9e6de2e7a..2dc2aad09 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "2")
+- Create version.txt with format version (currently "3")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 96af883ca..3b2371f30 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 2;
+export const RC_FILE_VERSION = 3;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 

From b1387d2ed70e2fb3d06b8c9971ec7638d4f7c6f3 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 02:11:01 +0530
Subject: [PATCH 12/20] feat(terminal): match banner colors to launcher

---
 docs/terminal-custom-configs-plan.md     |  2 +-
 libs/platform/src/rc-file-manager.ts     |  2 +-
 libs/platform/src/rc-generator.ts        | 18 +++++++++++++-----
 libs/platform/tests/rc-generator.test.ts |  6 ++++++
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 2dc2aad09..630ee0b69 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "3")
+- Create version.txt with format version (currently "4")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 3b2371f30..3236a6db7 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 3;
+export const RC_FILE_VERSION = 4;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index 3f19ef89e..1d93590d9 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -62,6 +62,10 @@ export interface ANSIColors {
   reset: string;
 }
 
+const STARTUP_COLOR_PRIMARY = 51;
+const STARTUP_COLOR_SECONDARY = 39;
+const STARTUP_COLOR_ACCENT = 33;
+
 /**
  * Convert hex color to RGB
  */
@@ -210,6 +214,10 @@ AUTOMAKER_BANNER_LABEL_WIDTH=12
 AUTOMAKER_BYTES_PER_KIB=1024
 AUTOMAKER_KIB_PER_MIB=1024
 AUTOMAKER_MIB_PER_GIB=1024
+AUTOMAKER_COLOR_PRIMARY="\\033[38;5;${STARTUP_COLOR_PRIMARY}m"
+AUTOMAKER_COLOR_SECONDARY="\\033[38;5;${STARTUP_COLOR_SECONDARY}m"
+AUTOMAKER_COLOR_ACCENT="\\033[38;5;${STARTUP_COLOR_ACCENT}m"
+AUTOMAKER_COLOR_RESET="\\033[0m"
 
 automaker_command_exists() {
   command -v "$1" >/dev/null 2>&1
@@ -346,11 +354,11 @@ automaker_show_banner() {
   local logo_line_1="  █▀▀█ █  █ ▀▀█▀▀ █▀▀█ █▀▄▀█ █▀▀█ █ █ █▀▀ █▀▀█  "
   local logo_line_2="  █▄▄█ █  █   █   █  █ █ ▀ █ █▄▄█ █▀▄ █▀▀ █▄▄▀  "
   local logo_line_3="  ▀  ▀  ▀▀▀   ▀   ▀▀▀▀ ▀   ▀ ▀  ▀ ▀ ▀ ▀▀▀ ▀ ▀▀  "
-  local accent_color="\${COLOR_USER_RAW:-}"
-  local secondary_color="\${COLOR_HOST_RAW:-}"
-  local tertiary_color="\${COLOR_PATH_RAW:-}"
-  local label_color="\${COLOR_GIT_BRANCH_RAW:-}"
-  local reset_color="\${COLOR_RESET_RAW:-}"
+  local accent_color="\${AUTOMAKER_COLOR_PRIMARY}"
+  local secondary_color="\${AUTOMAKER_COLOR_SECONDARY}"
+  local tertiary_color="\${AUTOMAKER_COLOR_ACCENT}"
+  local label_color="\${AUTOMAKER_COLOR_SECONDARY}"
+  local reset_color="\${AUTOMAKER_COLOR_RESET}"
 
   printf "%b%s%b\n" "$accent_color" "$logo_line_1" "$reset_color"
   printf "%b%s%b\n" "$secondary_color" "$logo_line_2" "$reset_color"
diff --git a/libs/platform/tests/rc-generator.test.ts b/libs/platform/tests/rc-generator.test.ts
index c3985f61c..41c9e8294 100644
--- a/libs/platform/tests/rc-generator.test.ts
+++ b/libs/platform/tests/rc-generator.test.ts
@@ -13,6 +13,9 @@ describe('rc-generator.ts', () => {
   const RAW_COLOR_PREFIX = 'export COLOR_USER_RAW=';
   const RAW_COLOR_ESCAPE_START = '\\\\[';
   const RAW_COLOR_ESCAPE_END = '\\\\]';
+  const STARTUP_PRIMARY_COLOR = '38;5;51m';
+  const STARTUP_SECONDARY_COLOR = '38;5;39m';
+  const STARTUP_ACCENT_COLOR = '38;5;33m';
 
   const baseConfig: TerminalConfig = {
     enabled: true,
@@ -28,6 +31,9 @@ describe('rc-generator.ts', () => {
     const output = generateCommonFunctions(baseConfig);
 
     expect(output).toContain(EXPECTED_BANNER_FUNCTION);
+    expect(output).toContain(STARTUP_PRIMARY_COLOR);
+    expect(output).toContain(STARTUP_SECONDARY_COLOR);
+    expect(output).toContain(STARTUP_ACCENT_COLOR);
   });
 
   it('exports raw banner colors without prompt escape wrappers', () => {

From ca5a16f144ea5bf038ebce713945a9f56c165c3b Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 02:52:49 +0530
Subject: [PATCH 13/20] feat(terminal): add prompt customization controls

---
 apps/server/src/services/terminal-service.ts  |  53 ++-
 .../settings-view/terminal/prompt-preview.tsx | 163 ++++++++--
 .../terminal/terminal-config-section.tsx      | 165 +++++++++-
 docs/terminal-custom-configs-plan.md          |   2 +-
 libs/platform/src/rc-file-manager.ts          |   2 +-
 libs/platform/src/rc-generator.ts             | 307 ++++++++++++++++--
 libs/platform/tests/rc-file-manager.test.ts   |   8 +
 libs/platform/tests/rc-generator.test.ts      |   8 +
 libs/types/src/settings.ts                    |  24 ++
 start-automaker.sh                            |   6 +-
 10 files changed, 672 insertions(+), 66 deletions(-)

diff --git a/apps/server/src/services/terminal-service.ts b/apps/server/src/services/terminal-service.ts
index 54d899bd6..776b4b5fb 100644
--- a/apps/server/src/services/terminal-service.ts
+++ b/apps/server/src/services/terminal-service.ts
@@ -37,6 +37,16 @@ const BASH_RCFILE_ARG = '--rcfile';
 const SHELL_NAME_BASH = 'bash';
 const SHELL_NAME_ZSH = 'zsh';
 const SHELL_NAME_SH = 'sh';
+const DEFAULT_SHOW_USER_HOST = true;
+const DEFAULT_SHOW_PATH = true;
+const DEFAULT_SHOW_TIME = false;
+const DEFAULT_SHOW_EXIT_STATUS = false;
+const DEFAULT_PATH_DEPTH = 0;
+const DEFAULT_PATH_STYLE: TerminalConfig['pathStyle'] = 'full';
+const DEFAULT_CUSTOM_PROMPT = true;
+const DEFAULT_PROMPT_FORMAT: TerminalConfig['promptFormat'] = 'standard';
+const DEFAULT_SHOW_GIT_BRANCH = true;
+const DEFAULT_SHOW_GIT_STATUS = true;
 
 // Maximum scrollback buffer size (characters)
 const MAX_SCROLLBACK_SIZE = 50000; // ~50KB per terminal
@@ -75,6 +85,21 @@ function applyBashRcFileArgs(args: string[], rcFilePath: string): string[] {
   return sanitizedArgs;
 }
 
+function normalizePathStyle(
+  pathStyle: TerminalConfig['pathStyle'] | undefined
+): TerminalConfig['pathStyle'] {
+  if (pathStyle === 'short' || pathStyle === 'basename') {
+    return pathStyle;
+  }
+  return DEFAULT_PATH_STYLE;
+}
+
+function normalizePathDepth(pathDepth: number | undefined): number {
+  const depth =
+    typeof pathDepth === 'number' && Number.isFinite(pathDepth) ? pathDepth : DEFAULT_PATH_DEPTH;
+  return Math.max(DEFAULT_PATH_DEPTH, Math.floor(depth));
+}
+
 export interface TerminalSession {
   id: string;
   pty: pty.IPty;
@@ -408,10 +433,16 @@ export class TerminalService extends EventEmitter {
           // Full config object (global + project overrides)
           const effectiveConfig: TerminalConfig = {
             enabled: true,
-            customPrompt: globalTerminalConfig.customPrompt,
-            promptFormat: globalTerminalConfig.promptFormat,
-            showGitBranch: globalTerminalConfig.showGitBranch,
-            showGitStatus: globalTerminalConfig.showGitStatus,
+            customPrompt: globalTerminalConfig.customPrompt ?? DEFAULT_CUSTOM_PROMPT,
+            promptFormat: globalTerminalConfig.promptFormat ?? DEFAULT_PROMPT_FORMAT,
+            showGitBranch: globalTerminalConfig.showGitBranch ?? DEFAULT_SHOW_GIT_BRANCH,
+            showGitStatus: globalTerminalConfig.showGitStatus ?? DEFAULT_SHOW_GIT_STATUS,
+            showUserHost: globalTerminalConfig.showUserHost ?? DEFAULT_SHOW_USER_HOST,
+            showPath: globalTerminalConfig.showPath ?? DEFAULT_SHOW_PATH,
+            pathStyle: normalizePathStyle(globalTerminalConfig.pathStyle),
+            pathDepth: normalizePathDepth(globalTerminalConfig.pathDepth),
+            showTime: globalTerminalConfig.showTime ?? DEFAULT_SHOW_TIME,
+            showExitStatus: globalTerminalConfig.showExitStatus ?? DEFAULT_SHOW_EXIT_STATUS,
             customAliases:
               projectTerminalConfig?.customAliases || globalTerminalConfig.customAliases,
             customEnvVars: {
@@ -810,10 +841,16 @@ export class TerminalService extends EventEmitter {
         // Regenerate RC files with new theme
         const effectiveConfig: TerminalConfig = {
           enabled: true,
-          customPrompt: terminalConfig.customPrompt,
-          promptFormat: terminalConfig.promptFormat,
-          showGitBranch: terminalConfig.showGitBranch,
-          showGitStatus: terminalConfig.showGitStatus,
+          customPrompt: terminalConfig.customPrompt ?? DEFAULT_CUSTOM_PROMPT,
+          promptFormat: terminalConfig.promptFormat ?? DEFAULT_PROMPT_FORMAT,
+          showGitBranch: terminalConfig.showGitBranch ?? DEFAULT_SHOW_GIT_BRANCH,
+          showGitStatus: terminalConfig.showGitStatus ?? DEFAULT_SHOW_GIT_STATUS,
+          showUserHost: terminalConfig.showUserHost ?? DEFAULT_SHOW_USER_HOST,
+          showPath: terminalConfig.showPath ?? DEFAULT_SHOW_PATH,
+          pathStyle: normalizePathStyle(terminalConfig.pathStyle),
+          pathDepth: normalizePathDepth(terminalConfig.pathDepth),
+          showTime: terminalConfig.showTime ?? DEFAULT_SHOW_TIME,
+          showExitStatus: terminalConfig.showExitStatus ?? DEFAULT_SHOW_EXIT_STATUS,
           customAliases: terminalConfig.customAliases,
           customEnvVars: terminalConfig.customEnvVars,
           rcFileVersion: terminalConfig.rcFileVersion,
diff --git a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
index ff8d4292e..5f5ff48d7 100644
--- a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
@@ -2,6 +2,7 @@
  * Prompt Preview - Shows a live preview of the custom terminal prompt
  */
 
+import type { ReactNode } from 'react';
 import { cn } from '@/lib/utils';
 import type { ThemeMode } from '@automaker/types';
 import { getTerminalTheme } from '@/config/terminal-themes';
@@ -11,6 +12,12 @@ interface PromptPreviewProps {
   theme: ThemeMode;
   showGitBranch: boolean;
   showGitStatus: boolean;
+  showUserHost: boolean;
+  showPath: boolean;
+  pathStyle: 'full' | 'short' | 'basename';
+  pathDepth: number;
+  showTime: boolean;
+  showExitStatus: boolean;
   className?: string;
 }
 
@@ -19,17 +26,63 @@ export function PromptPreview({
   theme,
   showGitBranch,
   showGitStatus,
+  showUserHost,
+  showPath,
+  pathStyle,
+  pathDepth,
+  showTime,
+  showExitStatus,
   className,
 }: PromptPreviewProps) {
   const terminalTheme = getTerminalTheme(theme);
 
+  const formatPath = (inputPath: string) => {
+    let displayPath = inputPath;
+    let prefix = '';
+
+    if (displayPath.startsWith('~/')) {
+      prefix = '~/';
+      displayPath = displayPath.slice(2);
+    } else if (displayPath.startsWith('/')) {
+      prefix = '/';
+      displayPath = displayPath.slice(1);
+    }
+
+    const segments = displayPath.split('/').filter((segment) => segment.length > 0);
+    const depth = Math.max(0, pathDepth);
+    const trimmedSegments = depth > 0 ? segments.slice(-depth) : segments;
+
+    let formattedSegments = trimmedSegments;
+    if (pathStyle === 'basename' && trimmedSegments.length > 0) {
+      formattedSegments = [trimmedSegments[trimmedSegments.length - 1]];
+    } else if (pathStyle === 'short') {
+      formattedSegments = trimmedSegments.map((segment, index) => {
+        if (index < trimmedSegments.length - 1) {
+          return segment.slice(0, 1);
+        }
+        return segment;
+      });
+    }
+
+    const joined = formattedSegments.join('/');
+    if (prefix === '/' && joined.length === 0) {
+      return '/';
+    }
+    if (prefix === '~/' && joined.length === 0) {
+      return '~';
+    }
+    return `${prefix}${joined}`;
+  };
+
   // Generate preview text based on format
   const renderPrompt = () => {
     const user = 'user';
     const host = 'automaker';
-    const path = '~/projects/automaker';
+    const path = formatPath('~/projects/automaker');
     const branch = showGitBranch ? 'main' : null;
     const dirty = showGitStatus && showGitBranch ? '*' : '';
+    const time = showTime ? '[14:32]' : '';
+    const status = showExitStatus ? '✗ 1' : '';
 
     const gitInfo = branch ? ` (${branch}${dirty})` : '';
 
@@ -37,25 +90,79 @@ export function PromptPreview({
       case 'minimal':
         return (
           <div className="font-mono text-sm leading-relaxed">
-            <span style={{ color: terminalTheme.yellow }}>{path}</span>
+            {showTime && <span style={{ color: terminalTheme.magenta }}>{time} </span>}
+            {showUserHost && (
+              <span style={{ color: terminalTheme.cyan }}>
+                {user}
+                <span style={{ color: terminalTheme.foreground }}>@</span>
+                <span style={{ color: terminalTheme.blue }}>{host}</span>{' '}
+              </span>
+            )}
+            {showPath && <span style={{ color: terminalTheme.yellow }}>{path}</span>}
             {gitInfo && <span style={{ color: terminalTheme.magenta }}>{gitInfo}</span>}
+            {showExitStatus && <span style={{ color: terminalTheme.red }}> {status}</span>}
             <span style={{ color: terminalTheme.green }}> $</span>
             <span className="ml-1 animate-pulse">▊</span>
           </div>
         );
 
       case 'powerline':
+        const powerlineSegments: ReactNode[] = [];
+        if (showUserHost) {
+          powerlineSegments.push(
+            <span key="user-host" style={{ color: terminalTheme.cyan }}>
+              [{user}
+              <span style={{ color: terminalTheme.foreground }}>@</span>
+              <span style={{ color: terminalTheme.blue }}>{host}</span>]
+            </span>
+          );
+        }
+        if (showPath) {
+          powerlineSegments.push(
+            <span key="path" style={{ color: terminalTheme.yellow }}>
+              [{path}]
+            </span>
+          );
+        }
+        const powerlineCore = powerlineSegments.flatMap((segment, index) =>
+          index === 0
+            ? [segment]
+            : [
+                <span key={`sep-${index}`} style={{ color: terminalTheme.cyan }}>
+                  ─
+                </span>,
+                segment,
+              ]
+        );
+        const powerlineExtras: ReactNode[] = [];
+        if (gitInfo) {
+          powerlineExtras.push(
+            <span key="git" style={{ color: terminalTheme.magenta }}>
+              {gitInfo}
+            </span>
+          );
+        }
+        if (showTime) {
+          powerlineExtras.push(
+            <span key="time" style={{ color: terminalTheme.magenta }}>
+              {time}
+            </span>
+          );
+        }
+        if (showExitStatus) {
+          powerlineExtras.push(
+            <span key="status" style={{ color: terminalTheme.red }}>
+              {status}
+            </span>
+          );
+        }
+        const powerlineLine = [...powerlineCore, ...powerlineExtras].filter(Boolean);
+
         return (
           <div className="font-mono text-sm leading-relaxed space-y-1">
             <div>
-              <span style={{ color: terminalTheme.cyan }}>┌─[</span>
-              <span style={{ color: terminalTheme.cyan }}>{user}</span>
-              <span style={{ color: terminalTheme.foreground }}>@</span>
-              <span style={{ color: terminalTheme.blue }}>{host}</span>
-              <span style={{ color: terminalTheme.cyan }}>]─[</span>
-              <span style={{ color: terminalTheme.yellow }}>{path}</span>
-              <span style={{ color: terminalTheme.cyan }}>]</span>
-              {gitInfo && <span style={{ color: terminalTheme.magenta }}>{gitInfo}</span>}
+              <span style={{ color: terminalTheme.cyan }}>┌─</span>
+              {powerlineLine}
             </div>
             <div>
               <span style={{ color: terminalTheme.cyan }}>└─</span>
@@ -69,11 +176,20 @@ export function PromptPreview({
         return (
           <div className="font-mono text-sm leading-relaxed space-y-1">
             <div>
-              <span style={{ color: terminalTheme.cyan }}>{user}</span>
-              <span style={{ color: terminalTheme.foreground }}>@</span>
-              <span style={{ color: terminalTheme.blue }}>{host}</span>
-              <span style={{ color: terminalTheme.foreground }}> in </span>
-              <span style={{ color: terminalTheme.yellow }}>{path}</span>
+              {showTime && <span style={{ color: terminalTheme.magenta }}>{time} </span>}
+              {showUserHost && (
+                <>
+                  <span style={{ color: terminalTheme.cyan }}>{user}</span>
+                  <span style={{ color: terminalTheme.foreground }}>@</span>
+                  <span style={{ color: terminalTheme.blue }}>{host}</span>
+                </>
+              )}
+              {showPath && (
+                <>
+                  <span style={{ color: terminalTheme.foreground }}> in </span>
+                  <span style={{ color: terminalTheme.yellow }}>{path}</span>
+                </>
+              )}
               {branch && (
                 <>
                   <span style={{ color: terminalTheme.foreground }}> on </span>
@@ -83,6 +199,7 @@ export function PromptPreview({
                   </span>
                 </>
               )}
+              {showExitStatus && <span style={{ color: terminalTheme.red }}> {status}</span>}
             </div>
             <div>
               <span style={{ color: terminalTheme.green }}>❯</span>
@@ -95,12 +212,18 @@ export function PromptPreview({
       default:
         return (
           <div className="font-mono text-sm leading-relaxed">
-            <span style={{ color: terminalTheme.cyan }}>[{user}</span>
-            <span style={{ color: terminalTheme.foreground }}>@</span>
-            <span style={{ color: terminalTheme.blue }}>{host}</span>
-            <span style={{ color: terminalTheme.cyan }}>]</span>
-            <span style={{ color: terminalTheme.yellow }}> {path}</span>
+            {showTime && <span style={{ color: terminalTheme.magenta }}>{time} </span>}
+            {showUserHost && (
+              <>
+                <span style={{ color: terminalTheme.cyan }}>[{user}</span>
+                <span style={{ color: terminalTheme.foreground }}>@</span>
+                <span style={{ color: terminalTheme.blue }}>{host}</span>
+                <span style={{ color: terminalTheme.cyan }}>]</span>
+              </>
+            )}
+            {showPath && <span style={{ color: terminalTheme.yellow }}> {path}</span>}
             {gitInfo && <span style={{ color: terminalTheme.magenta }}>{gitInfo}</span>}
+            {showExitStatus && <span style={{ color: terminalTheme.red }}> {status}</span>}
             <span style={{ color: terminalTheme.green }}> $</span>
             <span className="ml-1 animate-pulse">▊</span>
           </div>
diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
index a73e0b215..c1d054693 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -26,8 +26,11 @@ import { toast } from 'sonner';
 import { PromptPreview } from './prompt-preview';
 import { useUpdateGlobalSettings } from '@/hooks/mutations/use-settings-mutations';
 import { useGlobalSettings } from '@/hooks/queries/use-settings';
+import { ConfirmDialog } from '@/components/ui/confirm-dialog';
 
 export function TerminalConfigSection() {
+  const PATH_DEPTH_MIN = 0;
+  const PATH_DEPTH_MAX = 10;
   const { theme } = useAppStore();
   const { data: globalSettings } = useGlobalSettings();
   const updateGlobalSettings = useUpdateGlobalSettings({ showSuccessToast: false });
@@ -37,32 +40,37 @@ export function TerminalConfigSection() {
       value,
     }))
   );
+  const [showEnableConfirm, setShowEnableConfirm] = useState(false);
 
-  const terminalConfig = globalSettings?.terminalConfig || {
+  const clampPathDepth = (value: number) =>
+    Math.min(PATH_DEPTH_MAX, Math.max(PATH_DEPTH_MIN, value));
+
+  const defaultTerminalConfig = {
     enabled: false,
     customPrompt: true,
     promptFormat: 'standard' as const,
     showGitBranch: true,
     showGitStatus: true,
+    showUserHost: true,
+    showPath: true,
+    pathStyle: 'full' as const,
+    pathDepth: PATH_DEPTH_MIN,
+    showTime: false,
+    showExitStatus: false,
     customAliases: '',
     customEnvVars: {},
   };
 
-  const handleToggleEnabled = async (enabled: boolean) => {
-    if (enabled) {
-      // Show confirmation when enabling
-      const confirmed = window.confirm(
-        'Enable custom terminal configurations?\n\n' +
-          'This will:\n' +
-          '• Create shell config files in .automaker/terminal/\n' +
-          '• Set custom prompts that match your app theme\n' +
-          '• Not modify your existing ~/.bashrc or ~/.zshrc\n\n' +
-          'New terminals will use the custom prompt. Existing terminals are unaffected.'
-      );
-
-      if (!confirmed) return;
-    }
+  const terminalConfig = {
+    ...defaultTerminalConfig,
+    ...globalSettings?.terminalConfig,
+    customAliases:
+      globalSettings?.terminalConfig?.customAliases ?? defaultTerminalConfig.customAliases,
+    customEnvVars:
+      globalSettings?.terminalConfig?.customEnvVars ?? defaultTerminalConfig.customEnvVars,
+  };
 
+  const applyEnabledUpdate = (enabled: boolean) => {
     // Ensure all required fields are present
     const updatedConfig = {
       enabled,
@@ -70,6 +78,12 @@ export function TerminalConfigSection() {
       promptFormat: terminalConfig.promptFormat,
       showGitBranch: terminalConfig.showGitBranch,
       showGitStatus: terminalConfig.showGitStatus,
+      showUserHost: terminalConfig.showUserHost,
+      showPath: terminalConfig.showPath,
+      pathStyle: terminalConfig.pathStyle,
+      pathDepth: terminalConfig.pathDepth,
+      showTime: terminalConfig.showTime,
+      showExitStatus: terminalConfig.showExitStatus,
       customAliases: terminalConfig.customAliases,
       customEnvVars: terminalConfig.customEnvVars,
       rcFileVersion: 1,
@@ -100,6 +114,15 @@ export function TerminalConfigSection() {
     );
   };
 
+  const handleToggleEnabled = async (enabled: boolean) => {
+    if (enabled) {
+      setShowEnableConfirm(true);
+      return;
+    }
+
+    applyEnabledUpdate(false);
+  };
+
   const handleUpdateConfig = (updates: Partial<typeof terminalConfig>) => {
     updateGlobalSettings.mutate({
       terminalConfig: {
@@ -286,6 +309,91 @@ export function TerminalConfigSection() {
                   </div>
                 </div>
 
+                {/* Prompt Segments */}
+                <div className="space-y-4 pl-4 border-l-2 border-border/30">
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <Wand2 className="w-4 h-4 text-muted-foreground" />
+                      <Label className="text-sm">Show User & Host</Label>
+                    </div>
+                    <Switch
+                      checked={terminalConfig.showUserHost}
+                      onCheckedChange={(checked) => handleUpdateConfig({ showUserHost: checked })}
+                    />
+                  </div>
+
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <span className="text-sm text-muted-foreground">~/</span>
+                      <Label className="text-sm">Show Path</Label>
+                    </div>
+                    <Switch
+                      checked={terminalConfig.showPath}
+                      onCheckedChange={(checked) => handleUpdateConfig({ showPath: checked })}
+                    />
+                  </div>
+
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <span className="text-sm text-muted-foreground">⏱</span>
+                      <Label className="text-sm">Show Time</Label>
+                    </div>
+                    <Switch
+                      checked={terminalConfig.showTime}
+                      onCheckedChange={(checked) => handleUpdateConfig({ showTime: checked })}
+                    />
+                  </div>
+
+                  <div className="flex items-center justify-between">
+                    <div className="flex items-center gap-2">
+                      <span className="text-sm text-muted-foreground">✗</span>
+                      <Label className="text-sm">Show Exit Status</Label>
+                    </div>
+                    <Switch
+                      checked={terminalConfig.showExitStatus}
+                      onCheckedChange={(checked) => handleUpdateConfig({ showExitStatus: checked })}
+                    />
+                  </div>
+
+                  <div className="grid gap-3 sm:grid-cols-2">
+                    <div className="space-y-2">
+                      <Label className="text-xs text-muted-foreground">Path Style</Label>
+                      <Select
+                        value={terminalConfig.pathStyle}
+                        onValueChange={(value: 'full' | 'short' | 'basename') =>
+                          handleUpdateConfig({ pathStyle: value })
+                        }
+                        disabled={!terminalConfig.showPath}
+                      >
+                        <SelectTrigger>
+                          <SelectValue />
+                        </SelectTrigger>
+                        <SelectContent>
+                          <SelectItem value="full">Full</SelectItem>
+                          <SelectItem value="short">Short</SelectItem>
+                          <SelectItem value="basename">Basename</SelectItem>
+                        </SelectContent>
+                      </Select>
+                    </div>
+
+                    <div className="space-y-2">
+                      <Label className="text-xs text-muted-foreground">Path Depth</Label>
+                      <Input
+                        type="number"
+                        min={PATH_DEPTH_MIN}
+                        max={PATH_DEPTH_MAX}
+                        value={terminalConfig.pathDepth}
+                        onChange={(event) =>
+                          handleUpdateConfig({
+                            pathDepth: clampPathDepth(Number(event.target.value) || 0),
+                          })
+                        }
+                        disabled={!terminalConfig.showPath}
+                      />
+                    </div>
+                  </div>
+                </div>
+
                 {/* Live Preview */}
                 <div className="space-y-3">
                   <Label className="text-foreground font-medium">Preview</Label>
@@ -294,6 +402,12 @@ export function TerminalConfigSection() {
                     theme={theme}
                     showGitBranch={terminalConfig.showGitBranch}
                     showGitStatus={terminalConfig.showGitStatus}
+                    showUserHost={terminalConfig.showUserHost}
+                    showPath={terminalConfig.showPath}
+                    pathStyle={terminalConfig.pathStyle}
+                    pathDepth={terminalConfig.pathDepth}
+                    showTime={terminalConfig.showTime}
+                    showExitStatus={terminalConfig.showExitStatus}
                   />
                 </div>
               </>
@@ -369,6 +483,27 @@ export function TerminalConfigSection() {
           </>
         )}
       </div>
+
+      <ConfirmDialog
+        open={showEnableConfirm}
+        onOpenChange={setShowEnableConfirm}
+        title="Enable custom terminal configurations"
+        description="Automaker will generate per-project shell configuration files for your terminal."
+        icon={Info}
+        confirmText="Enable"
+        onConfirm={() => applyEnabledUpdate(true)}
+      >
+        <div className="space-y-3 text-sm text-muted-foreground">
+          <ul className="list-disc space-y-1 pl-5">
+            <li>Creates shell config files in `.automaker/terminal/`</li>
+            <li>Applies prompts and colors that match your app theme</li>
+            <li>Leaves your existing `~/.bashrc` and `~/.zshrc` untouched</li>
+          </ul>
+          <p className="text-xs text-muted-foreground">
+            New terminal sessions will use the custom prompt; existing sessions are unchanged.
+          </p>
+        </div>
+      </ConfirmDialog>
     </div>
   );
 }
diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 630ee0b69..0e2cf95bd 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "4")
+- Create version.txt with format version (currently "5")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 3236a6db7..728615c1c 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 4;
+export const RC_FILE_VERSION = 5;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index 1d93590d9..23fb3db38 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -16,6 +16,12 @@ export interface TerminalConfig {
   promptFormat: 'standard' | 'minimal' | 'powerline' | 'starship';
   showGitBranch: boolean;
   showGitStatus: boolean;
+  showUserHost: boolean;
+  showPath: boolean;
+  pathStyle: 'full' | 'short' | 'basename';
+  pathDepth: number;
+  showTime: boolean;
+  showExitStatus: boolean;
   customAliases: string;
   customEnvVars: Record<string, string>;
   rcFileVersion?: number;
@@ -65,6 +71,8 @@ export interface ANSIColors {
 const STARTUP_COLOR_PRIMARY = 51;
 const STARTUP_COLOR_SECONDARY = 39;
 const STARTUP_COLOR_ACCENT = 33;
+const DEFAULT_PATH_DEPTH = 0;
+const DEFAULT_PATH_STYLE: TerminalConfig['pathStyle'] = 'full';
 
 /**
  * Convert hex color to RGB
@@ -165,6 +173,21 @@ function stripPromptEscapes(ansiColor: string): string {
   return ansiColor.replace(/\\\[/g, '').replace(/\\\]/g, '');
 }
 
+function normalizePathStyle(
+  pathStyle: TerminalConfig['pathStyle'] | undefined
+): TerminalConfig['pathStyle'] {
+  if (pathStyle === 'short' || pathStyle === 'basename') {
+    return pathStyle;
+  }
+  return DEFAULT_PATH_STYLE;
+}
+
+function normalizePathDepth(pathDepth: number | undefined): number {
+  const depth =
+    typeof pathDepth === 'number' && Number.isFinite(pathDepth) ? pathDepth : DEFAULT_PATH_DEPTH;
+  return Math.max(DEFAULT_PATH_DEPTH, Math.floor(depth));
+}
+
 /**
  * Generate common shell functions (git prompt, etc.)
  */
@@ -218,6 +241,12 @@ AUTOMAKER_COLOR_PRIMARY="\\033[38;5;${STARTUP_COLOR_PRIMARY}m"
 AUTOMAKER_COLOR_SECONDARY="\\033[38;5;${STARTUP_COLOR_SECONDARY}m"
 AUTOMAKER_COLOR_ACCENT="\\033[38;5;${STARTUP_COLOR_ACCENT}m"
 AUTOMAKER_COLOR_RESET="\\033[0m"
+AUTOMAKER_SHOW_TIME="${config.showTime === true ? 'true' : 'false'}"
+AUTOMAKER_SHOW_EXIT_STATUS="${config.showExitStatus === true ? 'true' : 'false'}"
+AUTOMAKER_SHOW_USER_HOST="${config.showUserHost === false ? 'false' : 'true'}"
+AUTOMAKER_SHOW_PATH="${config.showPath === false ? 'false' : 'true'}"
+AUTOMAKER_PATH_STYLE="${normalizePathStyle(config.pathStyle)}"
+AUTOMAKER_PATH_DEPTH=${normalizePathDepth(config.pathDepth)}
 
 automaker_command_exists() {
   command -v "$1" >/dev/null 2>&1
@@ -349,6 +378,120 @@ automaker_get_ip() {
   echo "$AUTOMAKER_INFO_UNKNOWN"
 }
 
+automaker_trim_path_depth() {
+  local path="$1"
+  local depth="$2"
+  if [ -z "$depth" ] || [ "$depth" -le 0 ]; then
+    echo "$path"
+    return
+  fi
+
+  echo "$path" | awk -v depth="$depth" -F/ '{
+    prefix=""
+    start=1
+    if ($1=="") { prefix="/"; start=2 }
+    else if ($1=="~") { prefix="~/"; start=2 }
+    n=NF
+    if (n < start) {
+      if (prefix=="/") { print "/" }
+      else if (prefix=="~/") { print "~" }
+      else { print $0 }
+      next
+    }
+    segCount = n - start + 1
+    d = depth
+    if (d > segCount) { d = segCount }
+    out=""
+    for (i = n - d + 1; i <= n; i++) {
+      out = out (out=="" ? "" : "/") $i
+    }
+    if (prefix=="/") {
+      if (out=="") { out="/" } else { out="/" out }
+    } else if (prefix=="~/") {
+      if (out=="") { out="~" } else { out="~/" out }
+    }
+    print out
+  }'
+}
+
+automaker_shorten_path() {
+  local path="$1"
+  echo "$path" | awk -F/ '{
+    prefix=""
+    start=1
+    if ($1=="") { prefix="/"; start=2 }
+    else if ($1=="~") { prefix="~/"; start=2 }
+    n=NF
+    if (n < start) {
+      if (prefix=="/") { print "/" }
+      else if (prefix=="~/") { print "~" }
+      else { print $0 }
+      next
+    }
+    out=""
+    for (i = start; i <= n; i++) {
+      seg = $i
+      if (i < n && length(seg) > 0) { seg = substr(seg, 1, 1) }
+      out = out (out=="" ? "" : "/") seg
+    }
+    if (prefix=="/") { out="/" out }
+    else if (prefix=="~/") { out="~/" out }
+    print out
+  }'
+}
+
+automaker_prompt_path() {
+  if [ "$AUTOMAKER_SHOW_PATH" != "true" ]; then
+    return
+  fi
+
+  local current_path="$PWD"
+  if [ -n "$HOME" ] && [ "\${current_path#"$HOME"}" != "$current_path" ]; then
+    current_path="~\${current_path#$HOME}"
+  fi
+
+  if [ "$AUTOMAKER_PATH_DEPTH" -gt 0 ]; then
+    current_path=$(automaker_trim_path_depth "$current_path" "$AUTOMAKER_PATH_DEPTH")
+  fi
+
+  case "$AUTOMAKER_PATH_STYLE" in
+    basename)
+      if [ "$current_path" = "/" ] || [ "$current_path" = "~" ]; then
+        echo -n "$current_path"
+      else
+        echo -n "\${current_path##*/}"
+      fi
+      ;;
+    short)
+      echo -n "$(automaker_shorten_path "$current_path")"
+      ;;
+    full|*)
+      echo -n "$current_path"
+      ;;
+  esac
+}
+
+automaker_prompt_time() {
+  if [ "$AUTOMAKER_SHOW_TIME" != "true" ]; then
+    return
+  fi
+
+  date +%H:%M
+}
+
+automaker_prompt_status() {
+  automaker_last_status=$?
+  if [ "$AUTOMAKER_SHOW_EXIT_STATUS" != "true" ]; then
+    return
+  fi
+
+  if [ "$automaker_last_status" -eq 0 ]; then
+    return
+  fi
+
+  printf "✗ %s" "$automaker_last_status"
+}
+
 automaker_show_banner() {
   local label_width="$AUTOMAKER_BANNER_LABEL_WIDTH"
   local logo_line_1="  █▀▀█ █  █ ▀▀█▀▀ █▀▀█ █▀▄▀█ █▀▀█ █ █ █▀▀ █▀▀█  "
@@ -402,27 +545,92 @@ automaker_show_banner_once() {
 /**
  * Generate prompt based on format
  */
-function generatePrompt(format: TerminalConfig['promptFormat'], colors: ANSIColors): string {
+function generatePrompt(
+  format: TerminalConfig['promptFormat'],
+  colors: ANSIColors,
+  config: TerminalConfig
+): string {
+  const userHostSegment = config.showUserHost
+    ? `${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset}`
+    : '';
+  const pathSegment = config.showPath
+    ? `${colors.path}\\$(automaker_prompt_path)${colors.reset}`
+    : '';
+  const gitSegment = config.showGitBranch
+    ? `${colors.gitBranch}\\$(automaker_git_prompt)${colors.reset}`
+    : '';
+  const timeSegment = config.showTime
+    ? `${colors.gitBranch}[\\$(automaker_prompt_time)]${colors.reset}`
+    : '';
+  const statusSegment = config.showExitStatus
+    ? `${colors.gitDirty}\\$(automaker_prompt_status)${colors.reset}`
+    : '';
+
   switch (format) {
-    case 'minimal':
-      return `PS1="${colors.path}\\w${colors.reset}\\$(automaker_git_prompt) ${colors.prompt}\\$${colors.reset} "`;
+    case 'minimal': {
+      const minimalSegments = [timeSegment, userHostSegment, pathSegment, gitSegment, statusSegment]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PS1="${minimalSegments ? `${minimalSegments} ` : ''}${colors.prompt}\\$${colors.reset} "`;
+    }
 
-    case 'powerline':
-      return `PS1="┌─[${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset}]─[${colors.path}\\w${colors.reset}]\\$(automaker_git_prompt)\\n└─${colors.prompt}\\$${colors.reset} "`;
+    case 'powerline': {
+      const powerlineCoreSegments = [
+        userHostSegment ? `[${userHostSegment}]` : '',
+        pathSegment ? `[${pathSegment}]` : '',
+      ].filter((segment) => segment.length > 0);
+      const powerlineCore = powerlineCoreSegments.join('─');
+      const powerlineExtras = [gitSegment, timeSegment, statusSegment]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      const powerlineLine = [powerlineCore, powerlineExtras]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PS1="┌─${powerlineLine}\\n└─${colors.prompt}\\$${colors.reset} "`;
+    }
 
-    case 'starship':
-      return `PS1="${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset} in ${colors.path}\\w${colors.reset}\\$(automaker_git_prompt)\\n${colors.prompt}❯${colors.reset} "`;
+    case 'starship': {
+      let starshipLine = '';
+      if (userHostSegment && pathSegment) {
+        starshipLine = `${userHostSegment} in ${pathSegment}`;
+      } else {
+        starshipLine = [userHostSegment, pathSegment]
+          .filter((segment) => segment.length > 0)
+          .join(' ');
+      }
+      if (gitSegment) {
+        starshipLine = `${starshipLine}${starshipLine ? ' on ' : ''}${gitSegment}`;
+      }
+      const starshipSegments = [timeSegment, starshipLine, statusSegment]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PS1="${starshipSegments}\\n${colors.prompt}❯${colors.reset} "`;
+    }
 
     case 'standard':
-    default:
-      return `PS1="[${colors.user}\\u${colors.reset}@${colors.host}\\h${colors.reset}] ${colors.path}\\w${colors.reset}\\$(automaker_git_prompt) ${colors.prompt}\\$${colors.reset} "`;
+    default: {
+      const standardSegments = [
+        timeSegment,
+        userHostSegment ? `[${userHostSegment}]` : '',
+        pathSegment,
+        gitSegment,
+        statusSegment,
+      ]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PS1="${standardSegments ? `${standardSegments} ` : ''}${colors.prompt}\\$${colors.reset} "`;
+    }
   }
 }
 
 /**
  * Generate Zsh prompt based on format
  */
-function generateZshPrompt(format: TerminalConfig['promptFormat'], colors: ANSIColors): string {
+function generateZshPrompt(
+  format: TerminalConfig['promptFormat'],
+  colors: ANSIColors,
+  config: TerminalConfig
+): string {
   // Convert bash-style \u, \h, \w to zsh-style %n, %m, %~
   // Remove bash-style escaping \[ \] (not needed in zsh)
   const zshColors = {
@@ -456,21 +664,80 @@ function generateZshPrompt(format: TerminalConfig['promptFormat'], colors: ANSIC
       .replace(/m\\]/g, 'm%}'),
   };
 
+  const userHostSegment = config.showUserHost
+    ? `[${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset}]`
+    : '';
+  const pathSegment = config.showPath
+    ? `${zshColors.path}$(automaker_prompt_path)${zshColors.reset}`
+    : '';
+  const gitSegment = config.showGitBranch
+    ? `${zshColors.gitBranch}$(automaker_git_prompt)${zshColors.reset}`
+    : '';
+  const timeSegment = config.showTime
+    ? `${zshColors.gitBranch}[$(automaker_prompt_time)]${zshColors.reset}`
+    : '';
+  const statusSegment = config.showExitStatus
+    ? `${zshColors.gitDirty}$(automaker_prompt_status)${zshColors.reset}`
+    : '';
+  const segments = [timeSegment, userHostSegment, pathSegment, gitSegment, statusSegment].filter(
+    (segment) => segment.length > 0
+  );
+  const inlineSegments = segments.join(' ');
+  const inlineWithSpace = inlineSegments ? `${inlineSegments} ` : '';
+
   switch (format) {
-    case 'minimal':
-      return `PROMPT="${zshColors.path}%~${zshColors.reset}\\$(automaker_git_prompt) ${zshColors.prompt}%#${zshColors.reset} "`;
+    case 'minimal': {
+      return `PROMPT="${inlineWithSpace}${zshColors.prompt}%#${zshColors.reset} "`;
+    }
 
-    case 'powerline':
-      return `PROMPT="┌─[${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset}]─[${zshColors.path}%~${zshColors.reset}]\\$(automaker_git_prompt)
+    case 'powerline': {
+      const powerlineCoreSegments = [
+        userHostSegment ? `[${userHostSegment}]` : '',
+        pathSegment ? `[${pathSegment}]` : '',
+      ].filter((segment) => segment.length > 0);
+      const powerlineCore = powerlineCoreSegments.join('─');
+      const powerlineExtras = [gitSegment, timeSegment, statusSegment]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      const powerlineLine = [powerlineCore, powerlineExtras]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PROMPT="┌─${powerlineLine}
 └─${zshColors.prompt}%#${zshColors.reset} "`;
+    }
 
-    case 'starship':
-      return `PROMPT="${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset} in ${zshColors.path}%~${zshColors.reset}\\$(automaker_git_prompt)
+    case 'starship': {
+      let starshipLine = '';
+      if (userHostSegment && pathSegment) {
+        starshipLine = `${userHostSegment} in ${pathSegment}`;
+      } else {
+        starshipLine = [userHostSegment, pathSegment]
+          .filter((segment) => segment.length > 0)
+          .join(' ');
+      }
+      if (gitSegment) {
+        starshipLine = `${starshipLine}${starshipLine ? ' on ' : ''}${gitSegment}`;
+      }
+      const starshipSegments = [timeSegment, starshipLine, statusSegment]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PROMPT="${starshipSegments}
 ${zshColors.prompt}❯${zshColors.reset} "`;
+    }
 
     case 'standard':
-    default:
-      return `PROMPT="[${zshColors.user}%n${zshColors.reset}@${zshColors.host}%m${zshColors.reset}] ${zshColors.path}%~${zshColors.reset}\\$(automaker_git_prompt) ${zshColors.prompt}%#${zshColors.reset} "`;
+    default: {
+      const standardSegments = [
+        timeSegment,
+        userHostSegment ? `[${userHostSegment}]` : '',
+        pathSegment,
+        gitSegment,
+        statusSegment,
+      ]
+        .filter((segment) => segment.length > 0)
+        .join(' ');
+      return `PROMPT="${standardSegments ? `${standardSegments} ` : ''}${zshColors.prompt}%#${zshColors.reset} "`;
+    }
   }
 }
 
@@ -514,7 +781,7 @@ ${validEnvVars}
  */
 export function generateBashrc(theme: TerminalTheme, config: TerminalConfig): string {
   const colors = getThemeANSIColors(theme);
-  const promptLine = generatePrompt(config.promptFormat, colors);
+  const promptLine = generatePrompt(config.promptFormat, colors, config);
 
   return `#!/bin/bash
 # Automaker Terminal Configuration v1.0
@@ -558,7 +825,7 @@ fi
  */
 export function generateZshrc(theme: TerminalTheme, config: TerminalConfig): string {
   const colors = getThemeANSIColors(theme);
-  const promptLine = generateZshPrompt(config.promptFormat, colors);
+  const promptLine = generateZshPrompt(config.promptFormat, colors, config);
 
   return `#!/bin/zsh
 # Automaker Terminal Configuration v1.0
diff --git a/libs/platform/tests/rc-file-manager.test.ts b/libs/platform/tests/rc-file-manager.test.ts
index 1f676bc67..f3753c1a4 100644
--- a/libs/platform/tests/rc-file-manager.test.ts
+++ b/libs/platform/tests/rc-file-manager.test.ts
@@ -18,6 +18,8 @@ describe('rc-file-manager.ts', () => {
   const PROMPT_FORMAT_STANDARD: TerminalConfig['promptFormat'] = 'standard';
   const PROMPT_FORMAT_MINIMAL: TerminalConfig['promptFormat'] = 'minimal';
   const EMPTY_ALIASES = '';
+  const PATH_STYLE_FULL: TerminalConfig['pathStyle'] = 'full';
+  const PATH_DEPTH_DEFAULT = 0;
 
   const baseConfig: TerminalConfig = {
     enabled: true,
@@ -25,6 +27,12 @@ describe('rc-file-manager.ts', () => {
     promptFormat: PROMPT_FORMAT_STANDARD,
     showGitBranch: true,
     showGitStatus: true,
+    showUserHost: true,
+    showPath: true,
+    pathStyle: PATH_STYLE_FULL,
+    pathDepth: PATH_DEPTH_DEFAULT,
+    showTime: false,
+    showExitStatus: false,
     customAliases: EMPTY_ALIASES,
     customEnvVars: {},
   };
diff --git a/libs/platform/tests/rc-generator.test.ts b/libs/platform/tests/rc-generator.test.ts
index 41c9e8294..7951e259e 100644
--- a/libs/platform/tests/rc-generator.test.ts
+++ b/libs/platform/tests/rc-generator.test.ts
@@ -9,6 +9,8 @@ describe('rc-generator.ts', () => {
   const PROMPT_FORMAT_STANDARD: TerminalConfig['promptFormat'] = 'standard';
   const EMPTY_ALIASES = '';
   const EMPTY_ENV_VARS = {};
+  const PATH_STYLE_FULL: TerminalConfig['pathStyle'] = 'full';
+  const PATH_DEPTH_DEFAULT = 0;
   const EXPECTED_BANNER_FUNCTION = 'automaker_show_banner_once';
   const RAW_COLOR_PREFIX = 'export COLOR_USER_RAW=';
   const RAW_COLOR_ESCAPE_START = '\\\\[';
@@ -23,6 +25,12 @@ describe('rc-generator.ts', () => {
     promptFormat: PROMPT_FORMAT_STANDARD,
     showGitBranch: true,
     showGitStatus: true,
+    showUserHost: true,
+    showPath: true,
+    pathStyle: PATH_STYLE_FULL,
+    pathDepth: PATH_DEPTH_DEFAULT,
+    showTime: false,
+    showExitStatus: false,
     customAliases: EMPTY_ALIASES,
     customEnvVars: EMPTY_ENV_VARS,
   };
diff --git a/libs/types/src/settings.ts b/libs/types/src/settings.ts
index 9c9b7c6d9..fad236376 100644
--- a/libs/types/src/settings.ts
+++ b/libs/types/src/settings.ts
@@ -862,6 +862,18 @@ export interface GlobalSettings {
     showGitBranch: boolean;
     /** Show git status dirty indicator (default: true) */
     showGitStatus: boolean;
+    /** Show user and host in prompt (default: true) */
+    showUserHost: boolean;
+    /** Show path in prompt (default: true) */
+    showPath: boolean;
+    /** Path display style */
+    pathStyle: 'full' | 'short' | 'basename';
+    /** Limit path depth (0 = full path) */
+    pathDepth: number;
+    /** Show current time in prompt (default: false) */
+    showTime: boolean;
+    /** Show last command exit status when non-zero (default: false) */
+    showExitStatus: boolean;
     /** User-provided custom aliases (multiline string) */
     customAliases: string;
     /** User-provided custom env vars */
@@ -1279,6 +1291,18 @@ export interface ProjectSettings {
   terminalConfig?: {
     /** Override global enabled setting */
     enabled?: boolean;
+    /** Override showing user/host */
+    showUserHost?: boolean;
+    /** Override showing path */
+    showPath?: boolean;
+    /** Override path style */
+    pathStyle?: 'full' | 'short' | 'basename';
+    /** Override path depth (0 = full path) */
+    pathDepth?: number;
+    /** Override showing time */
+    showTime?: boolean;
+    /** Override showing exit status */
+    showExitStatus?: boolean;
     /** Project-specific custom aliases */
     customAliases?: string;
     /** Project-specific env vars */
diff --git a/start-automaker.sh b/start-automaker.sh
index a2029da38..fffd4a478 100755
--- a/start-automaker.sh
+++ b/start-automaker.sh
@@ -9,7 +9,11 @@ set -e
 # ============================================================================
 # CONFIGURATION & CONSTANTS
 # ============================================================================
-export $(grep -v '^#' .env | xargs)
+if [ -f .env ]; then
+    set -a
+    . ./.env
+    set +a
+fi
 APP_NAME="Automaker"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 HISTORY_FILE="${HOME}/.automaker_launcher_history"

From 01d59d570f4993cb3381affc0466d111cb87bc72 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 03:55:54 +0530
Subject: [PATCH 14/20] feat: integrate oh-my-posh prompt themes

---
 apps/server/src/services/terminal-service.ts  |  19 ++
 .../settings-view/terminal/prompt-preview.tsx |  28 +-
 .../terminal/prompt-theme-presets.ts          | 253 ++++++++++++++++++
 .../terminal/terminal-config-section.tsx      | 110 +++++++-
 docs/terminal-custom-configs-plan.md          |  58 +++-
 libs/platform/src/rc-file-manager.ts          |   2 +-
 libs/platform/src/rc-generator.ts             |  56 +++-
 libs/types/src/settings.ts                    | 131 +++++++++
 8 files changed, 647 insertions(+), 10 deletions(-)
 create mode 100644 apps/ui/src/components/views/settings-view/terminal/prompt-theme-presets.ts

diff --git a/apps/server/src/services/terminal-service.ts b/apps/server/src/services/terminal-service.ts
index 776b4b5fb..a03bc8803 100644
--- a/apps/server/src/services/terminal-service.ts
+++ b/apps/server/src/services/terminal-service.ts
@@ -47,6 +47,9 @@ const DEFAULT_CUSTOM_PROMPT = true;
 const DEFAULT_PROMPT_FORMAT: TerminalConfig['promptFormat'] = 'standard';
 const DEFAULT_SHOW_GIT_BRANCH = true;
 const DEFAULT_SHOW_GIT_STATUS = true;
+const PROMPT_THEME_CUSTOM = 'custom';
+const PROMPT_THEME_PREFIX = 'omp-';
+const OMP_THEME_ENV_VAR = 'AUTOMAKER_OMP_THEME';
 
 // Maximum scrollback buffer size (characters)
 const MAX_SCROLLBACK_SIZE = 50000; // ~50KB per terminal
@@ -100,6 +103,16 @@ function normalizePathDepth(pathDepth: number | undefined): number {
   return Math.max(DEFAULT_PATH_DEPTH, Math.floor(depth));
 }
 
+function resolveOmpThemeName(promptTheme: string | undefined): string | null {
+  if (!promptTheme || promptTheme === PROMPT_THEME_CUSTOM) {
+    return null;
+  }
+  if (promptTheme.startsWith(PROMPT_THEME_PREFIX)) {
+    return promptTheme.slice(PROMPT_THEME_PREFIX.length);
+  }
+  return null;
+}
+
 export interface TerminalSession {
   id: string;
   pty: pty.IPty;
@@ -429,6 +442,9 @@ export class TerminalService extends EventEmitter {
           const currentTheme = globalSettings?.theme || 'dark';
           const themeColors = getTerminalThemeColors(currentTheme);
           const allThemes = getAllTerminalThemes();
+          const promptTheme =
+            projectTerminalConfig?.promptTheme || globalTerminalConfig.promptTheme;
+          const ompThemeName = resolveOmpThemeName(promptTheme);
 
           // Full config object (global + project overrides)
           const effectiveConfig: TerminalConfig = {
@@ -463,6 +479,9 @@ export class TerminalService extends EventEmitter {
 
           // Set shell-specific env vars
           const shellName = path.basename(shell).toLowerCase();
+          if (ompThemeName && effectiveConfig.customPrompt) {
+            terminalConfigEnv[OMP_THEME_ENV_VAR] = ompThemeName;
+          }
 
           if (shellName.includes(SHELL_NAME_BASH)) {
             const bashRcFilePath = getRcFilePath(options.cwd || cwd, SHELL_NAME_BASH);
diff --git a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
index 5f5ff48d7..aad380593 100644
--- a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
@@ -18,6 +18,8 @@ interface PromptPreviewProps {
   pathDepth: number;
   showTime: boolean;
   showExitStatus: boolean;
+  isOmpTheme?: boolean;
+  promptThemeLabel?: string;
   className?: string;
 }
 
@@ -32,6 +34,8 @@ export function PromptPreview({
   pathDepth,
   showTime,
   showExitStatus,
+  isOmpTheme = false,
+  promptThemeLabel,
   className,
 }: PromptPreviewProps) {
   const terminalTheme = getTerminalTheme(theme);
@@ -76,6 +80,22 @@ export function PromptPreview({
 
   // Generate preview text based on format
   const renderPrompt = () => {
+    if (isOmpTheme) {
+      return (
+        <div className="font-mono text-sm leading-relaxed space-y-2">
+          <div style={{ color: terminalTheme.magenta }}>
+            {promptThemeLabel ?? 'Oh My Posh theme'}
+          </div>
+          <div className="text-xs text-muted-foreground">
+            Rendered by the oh-my-posh CLI in the terminal.
+          </div>
+          <div className="text-xs text-muted-foreground">
+            Preview here stays generic to avoid misleading output.
+          </div>
+        </div>
+      );
+    }
+
     const user = 'user';
     const host = 'automaker';
     const path = formatPath('~/projects/automaker');
@@ -156,7 +176,13 @@ export function PromptPreview({
             </span>
           );
         }
-        const powerlineLine = [...powerlineCore, ...powerlineExtras].filter(Boolean);
+        const powerlineLine: ReactNode[] = [...powerlineCore];
+        if (powerlineExtras.length > 0) {
+          if (powerlineLine.length > 0) {
+            powerlineLine.push(' ');
+          }
+          powerlineLine.push(...powerlineExtras);
+        }
 
         return (
           <div className="font-mono text-sm leading-relaxed space-y-1">
diff --git a/apps/ui/src/components/views/settings-view/terminal/prompt-theme-presets.ts b/apps/ui/src/components/views/settings-view/terminal/prompt-theme-presets.ts
new file mode 100644
index 000000000..48f0ec474
--- /dev/null
+++ b/apps/ui/src/components/views/settings-view/terminal/prompt-theme-presets.ts
@@ -0,0 +1,253 @@
+import type { TerminalPromptTheme } from '@automaker/types';
+
+export const PROMPT_THEME_CUSTOM_ID: TerminalPromptTheme = 'custom';
+
+export const OMP_THEME_NAMES = [
+  '1_shell',
+  'M365Princess',
+  'agnoster',
+  'agnoster.minimal',
+  'agnosterplus',
+  'aliens',
+  'amro',
+  'atomic',
+  'atomicBit',
+  'avit',
+  'blue-owl',
+  'blueish',
+  'bubbles',
+  'bubblesextra',
+  'bubblesline',
+  'capr4n',
+  'catppuccin',
+  'catppuccin_frappe',
+  'catppuccin_latte',
+  'catppuccin_macchiato',
+  'catppuccin_mocha',
+  'cert',
+  'chips',
+  'cinnamon',
+  'clean-detailed',
+  'cloud-context',
+  'cloud-native-azure',
+  'cobalt2',
+  'craver',
+  'darkblood',
+  'devious-diamonds',
+  'di4am0nd',
+  'dracula',
+  'easy-term',
+  'emodipt',
+  'emodipt-extend',
+  'fish',
+  'free-ukraine',
+  'froczh',
+  'gmay',
+  'glowsticks',
+  'grandpa-style',
+  'gruvbox',
+  'half-life',
+  'honukai',
+  'hotstick.minimal',
+  'hul10',
+  'hunk',
+  'huvix',
+  'if_tea',
+  'illusi0n',
+  'iterm2',
+  'jandedobbeleer',
+  'jblab_2021',
+  'jonnychipz',
+  'json',
+  'jtracey93',
+  'jv_sitecorian',
+  'kali',
+  'kushal',
+  'lambda',
+  'lambdageneration',
+  'larserikfinholt',
+  'lightgreen',
+  'marcduiker',
+  'markbull',
+  'material',
+  'microverse-power',
+  'mojada',
+  'montys',
+  'mt',
+  'multiverse-neon',
+  'negligible',
+  'neko',
+  'night-owl',
+  'nordtron',
+  'nu4a',
+  'onehalf.minimal',
+  'paradox',
+  'pararussel',
+  'patriksvensson',
+  'peru',
+  'pixelrobots',
+  'plague',
+  'poshmon',
+  'powerlevel10k_classic',
+  'powerlevel10k_lean',
+  'powerlevel10k_modern',
+  'powerlevel10k_rainbow',
+  'powerline',
+  'probua.minimal',
+  'pure',
+  'quick-term',
+  'remk',
+  'robbyrussell',
+  'rudolfs-dark',
+  'rudolfs-light',
+  'sim-web',
+  'slim',
+  'slimfat',
+  'smoothie',
+  'sonicboom_dark',
+  'sonicboom_light',
+  'sorin',
+  'space',
+  'spaceship',
+  'star',
+  'stelbent-compact.minimal',
+  'stelbent.minimal',
+  'takuya',
+  'the-unnamed',
+  'thecyberden',
+  'tiwahu',
+  'tokyo',
+  'tokyonight_storm',
+  'tonybaloney',
+  'uew',
+  'unicorn',
+  'velvet',
+  'wholespace',
+  'wopian',
+  'xtoys',
+  'ys',
+  'zash',
+] as const;
+
+type OmpThemeName = (typeof OMP_THEME_NAMES)[number];
+
+type PromptFormat = 'standard' | 'minimal' | 'powerline' | 'starship';
+
+type PathStyle = 'full' | 'short' | 'basename';
+
+export interface PromptThemeConfig {
+  promptFormat: PromptFormat;
+  showGitBranch: boolean;
+  showGitStatus: boolean;
+  showUserHost: boolean;
+  showPath: boolean;
+  pathStyle: PathStyle;
+  pathDepth: number;
+  showTime: boolean;
+  showExitStatus: boolean;
+}
+
+export interface PromptThemePreset {
+  id: TerminalPromptTheme;
+  label: string;
+  description: string;
+  config: PromptThemeConfig;
+}
+
+const PATH_DEPTH_FULL = 0;
+const PATH_DEPTH_TWO = 2;
+const PATH_DEPTH_THREE = 3;
+
+const POWERLINE_HINTS = ['powerline', 'powerlevel10k', 'agnoster', 'bubbles', 'smoothie'];
+const MINIMAL_HINTS = ['minimal', 'pure', 'slim', 'negligible'];
+const STARSHIP_HINTS = ['spaceship', 'star'];
+const SHORT_PATH_HINTS = ['compact', 'lean', 'slim'];
+const TIME_HINTS = ['time', 'clock'];
+const EXIT_STATUS_HINTS = ['status', 'exit', 'fail', 'error'];
+
+function toPromptThemeId(name: OmpThemeName): TerminalPromptTheme {
+  return `omp-${name}` as TerminalPromptTheme;
+}
+
+function formatLabel(name: string): string {
+  const cleaned = name.replace(/[._-]+/g, ' ').trim();
+  return cleaned
+    .split(' ')
+    .filter(Boolean)
+    .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
+    .join(' ');
+}
+
+function buildPresetConfig(name: OmpThemeName): PromptThemeConfig {
+  const lower = name.toLowerCase();
+  const isPowerline = POWERLINE_HINTS.some((hint) => lower.includes(hint));
+  const isMinimal = MINIMAL_HINTS.some((hint) => lower.includes(hint));
+  const isStarship = STARSHIP_HINTS.some((hint) => lower.includes(hint));
+  let promptFormat: PromptFormat = 'standard';
+
+  if (isPowerline) {
+    promptFormat = 'powerline';
+  } else if (isMinimal) {
+    promptFormat = 'minimal';
+  } else if (isStarship) {
+    promptFormat = 'starship';
+  }
+
+  const showUserHost = !isMinimal;
+  const showPath = true;
+  const pathStyle: PathStyle = isMinimal ? 'short' : 'full';
+  let pathDepth = isMinimal ? PATH_DEPTH_THREE : PATH_DEPTH_FULL;
+
+  if (SHORT_PATH_HINTS.some((hint) => lower.includes(hint))) {
+    pathDepth = PATH_DEPTH_TWO;
+  }
+
+  if (lower.includes('powerlevel10k')) {
+    pathDepth = PATH_DEPTH_THREE;
+  }
+
+  const showTime = TIME_HINTS.some((hint) => lower.includes(hint));
+  const showExitStatus = EXIT_STATUS_HINTS.some((hint) => lower.includes(hint));
+
+  return {
+    promptFormat,
+    showGitBranch: true,
+    showGitStatus: true,
+    showUserHost,
+    showPath,
+    pathStyle,
+    pathDepth,
+    showTime,
+    showExitStatus,
+  };
+}
+
+export const PROMPT_THEME_PRESETS: PromptThemePreset[] = OMP_THEME_NAMES.map((name) => ({
+  id: toPromptThemeId(name),
+  label: `${formatLabel(name)} (OMP)`,
+  description: 'Oh My Posh theme preset',
+  config: buildPresetConfig(name),
+}));
+
+export function getPromptThemePreset(presetId: TerminalPromptTheme): PromptThemePreset | null {
+  return PROMPT_THEME_PRESETS.find((preset) => preset.id === presetId) ?? null;
+}
+
+export function getMatchingPromptThemeId(config: PromptThemeConfig): TerminalPromptTheme {
+  const match = PROMPT_THEME_PRESETS.find((preset) => {
+    const presetConfig = preset.config;
+    return (
+      presetConfig.promptFormat === config.promptFormat &&
+      presetConfig.showGitBranch === config.showGitBranch &&
+      presetConfig.showGitStatus === config.showGitStatus &&
+      presetConfig.showUserHost === config.showUserHost &&
+      presetConfig.showPath === config.showPath &&
+      presetConfig.pathStyle === config.pathStyle &&
+      presetConfig.pathDepth === config.pathDepth &&
+      presetConfig.showTime === config.showTime &&
+      presetConfig.showExitStatus === config.showExitStatus
+    );
+  });
+
+  return match?.id ?? PROMPT_THEME_CUSTOM_ID;
+}
diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
index c1d054693..e28dfddc3 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -24,6 +24,14 @@ import { cn } from '@/lib/utils';
 import { useAppStore } from '@/store/app-store';
 import { toast } from 'sonner';
 import { PromptPreview } from './prompt-preview';
+import type { TerminalPromptTheme } from '@automaker/types';
+import {
+  PROMPT_THEME_CUSTOM_ID,
+  PROMPT_THEME_PRESETS,
+  getMatchingPromptThemeId,
+  getPromptThemePreset,
+  type PromptThemeConfig,
+} from './prompt-theme-presets';
 import { useUpdateGlobalSettings } from '@/hooks/mutations/use-settings-mutations';
 import { useGlobalSettings } from '@/hooks/queries/use-settings';
 import { ConfirmDialog } from '@/components/ui/confirm-dialog';
@@ -49,6 +57,7 @@ export function TerminalConfigSection() {
     enabled: false,
     customPrompt: true,
     promptFormat: 'standard' as const,
+    promptTheme: PROMPT_THEME_CUSTOM_ID,
     showGitBranch: true,
     showGitStatus: true,
     showUserHost: true,
@@ -70,6 +79,29 @@ export function TerminalConfigSection() {
       globalSettings?.terminalConfig?.customEnvVars ?? defaultTerminalConfig.customEnvVars,
   };
 
+  const promptThemeConfig: PromptThemeConfig = {
+    promptFormat: terminalConfig.promptFormat,
+    showGitBranch: terminalConfig.showGitBranch,
+    showGitStatus: terminalConfig.showGitStatus,
+    showUserHost: terminalConfig.showUserHost,
+    showPath: terminalConfig.showPath,
+    pathStyle: terminalConfig.pathStyle,
+    pathDepth: terminalConfig.pathDepth,
+    showTime: terminalConfig.showTime,
+    showExitStatus: terminalConfig.showExitStatus,
+  };
+
+  const storedPromptTheme = terminalConfig.promptTheme;
+  const activePromptThemeId =
+    storedPromptTheme === PROMPT_THEME_CUSTOM_ID
+      ? PROMPT_THEME_CUSTOM_ID
+      : (storedPromptTheme ?? getMatchingPromptThemeId(promptThemeConfig));
+  const isOmpTheme =
+    storedPromptTheme !== undefined && storedPromptTheme !== PROMPT_THEME_CUSTOM_ID;
+  const promptThemePreset = isOmpTheme
+    ? getPromptThemePreset(storedPromptTheme as TerminalPromptTheme)
+    : null;
+
   const applyEnabledUpdate = (enabled: boolean) => {
     // Ensure all required fields are present
     const updatedConfig = {
@@ -84,13 +116,12 @@ export function TerminalConfigSection() {
       pathDepth: terminalConfig.pathDepth,
       showTime: terminalConfig.showTime,
       showExitStatus: terminalConfig.showExitStatus,
+      promptTheme: terminalConfig.promptTheme ?? PROMPT_THEME_CUSTOM_ID,
       customAliases: terminalConfig.customAliases,
       customEnvVars: terminalConfig.customEnvVars,
       rcFileVersion: 1,
     };
 
-    console.log('[TerminalConfig] Updating settings with:', updatedConfig);
-
     updateGlobalSettings.mutate(
       { terminalConfig: updatedConfig },
       {
@@ -124,14 +155,35 @@ export function TerminalConfigSection() {
   };
 
   const handleUpdateConfig = (updates: Partial<typeof terminalConfig>) => {
+    const nextPromptTheme = updates.promptTheme ?? PROMPT_THEME_CUSTOM_ID;
+
     updateGlobalSettings.mutate({
       terminalConfig: {
         ...terminalConfig,
         ...updates,
+        promptTheme: nextPromptTheme,
       },
     });
   };
 
+  const handlePromptThemeChange = (themeId: string) => {
+    if (themeId === PROMPT_THEME_CUSTOM_ID) {
+      handleUpdateConfig({ promptTheme: PROMPT_THEME_CUSTOM_ID });
+      return;
+    }
+
+    const preset = getPromptThemePreset(themeId as TerminalPromptTheme);
+    if (!preset) {
+      handleUpdateConfig({ promptTheme: PROMPT_THEME_CUSTOM_ID });
+      return;
+    }
+
+    handleUpdateConfig({
+      ...preset.config,
+      promptTheme: preset.id,
+    });
+  };
+
   const addEnvVar = () => {
     setLocalEnvVars([...localEnvVars, { key: '', value: '' }]);
   };
@@ -237,6 +289,46 @@ export function TerminalConfigSection() {
             {terminalConfig.customPrompt && (
               <>
                 {/* Prompt Format */}
+                <div className="space-y-3">
+                  <Label className="text-foreground font-medium">Prompt Theme (Oh My Posh)</Label>
+                  <Select value={activePromptThemeId} onValueChange={handlePromptThemeChange}>
+                    <SelectTrigger>
+                      <SelectValue />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value={PROMPT_THEME_CUSTOM_ID}>
+                        <div className="space-y-0.5">
+                          <div>Custom</div>
+                          <div className="text-xs text-muted-foreground">
+                            Hand-tuned configuration
+                          </div>
+                        </div>
+                      </SelectItem>
+                      {PROMPT_THEME_PRESETS.map((preset) => (
+                        <SelectItem key={preset.id} value={preset.id}>
+                          <div className="space-y-0.5">
+                            <div>{preset.label}</div>
+                            <div className="text-xs text-muted-foreground">
+                              {preset.description}
+                            </div>
+                          </div>
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </div>
+
+                {isOmpTheme && (
+                  <div className="rounded-lg border border-emerald-500/20 bg-emerald-500/5 p-3 flex gap-2">
+                    <Info className="h-4 w-4 text-emerald-500 flex-shrink-0 mt-0.5" />
+                    <div className="text-xs text-foreground/80">
+                      <strong>{promptThemePreset?.label ?? 'Oh My Posh theme'}</strong> uses the
+                      oh-my-posh CLI for rendering. Ensure it&apos;s installed for the full theme.
+                      Prompt format and segment toggles are ignored while an OMP theme is selected.
+                    </div>
+                  </div>
+                )}
+
                 <div className="space-y-3">
                   <Label className="text-foreground font-medium">Prompt Format</Label>
                   <Select
@@ -244,6 +336,7 @@ export function TerminalConfigSection() {
                     onValueChange={(value: 'standard' | 'minimal' | 'powerline' | 'starship') =>
                       handleUpdateConfig({ promptFormat: value })
                     }
+                    disabled={isOmpTheme}
                   >
                     <SelectTrigger>
                       <SelectValue />
@@ -293,6 +386,7 @@ export function TerminalConfigSection() {
                     <Switch
                       checked={terminalConfig.showGitBranch}
                       onCheckedChange={(checked) => handleUpdateConfig({ showGitBranch: checked })}
+                      disabled={isOmpTheme}
                     />
                   </div>
 
@@ -304,7 +398,7 @@ export function TerminalConfigSection() {
                     <Switch
                       checked={terminalConfig.showGitStatus}
                       onCheckedChange={(checked) => handleUpdateConfig({ showGitStatus: checked })}
-                      disabled={!terminalConfig.showGitBranch}
+                      disabled={!terminalConfig.showGitBranch || isOmpTheme}
                     />
                   </div>
                 </div>
@@ -319,6 +413,7 @@ export function TerminalConfigSection() {
                     <Switch
                       checked={terminalConfig.showUserHost}
                       onCheckedChange={(checked) => handleUpdateConfig({ showUserHost: checked })}
+                      disabled={isOmpTheme}
                     />
                   </div>
 
@@ -330,6 +425,7 @@ export function TerminalConfigSection() {
                     <Switch
                       checked={terminalConfig.showPath}
                       onCheckedChange={(checked) => handleUpdateConfig({ showPath: checked })}
+                      disabled={isOmpTheme}
                     />
                   </div>
 
@@ -341,6 +437,7 @@ export function TerminalConfigSection() {
                     <Switch
                       checked={terminalConfig.showTime}
                       onCheckedChange={(checked) => handleUpdateConfig({ showTime: checked })}
+                      disabled={isOmpTheme}
                     />
                   </div>
 
@@ -352,6 +449,7 @@ export function TerminalConfigSection() {
                     <Switch
                       checked={terminalConfig.showExitStatus}
                       onCheckedChange={(checked) => handleUpdateConfig({ showExitStatus: checked })}
+                      disabled={isOmpTheme}
                     />
                   </div>
 
@@ -363,7 +461,7 @@ export function TerminalConfigSection() {
                         onValueChange={(value: 'full' | 'short' | 'basename') =>
                           handleUpdateConfig({ pathStyle: value })
                         }
-                        disabled={!terminalConfig.showPath}
+                        disabled={!terminalConfig.showPath || isOmpTheme}
                       >
                         <SelectTrigger>
                           <SelectValue />
@@ -388,7 +486,7 @@ export function TerminalConfigSection() {
                             pathDepth: clampPathDepth(Number(event.target.value) || 0),
                           })
                         }
-                        disabled={!terminalConfig.showPath}
+                        disabled={!terminalConfig.showPath || isOmpTheme}
                       />
                     </div>
                   </div>
@@ -408,6 +506,8 @@ export function TerminalConfigSection() {
                     pathDepth={terminalConfig.pathDepth}
                     showTime={terminalConfig.showTime}
                     showExitStatus={terminalConfig.showExitStatus}
+                    isOmpTheme={isOmpTheme}
+                    promptThemeLabel={promptThemePreset?.label}
                   />
                 </div>
               </>
diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 0e2cf95bd..938fa13ba 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "5")
+- Create version.txt with format version (currently "8")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
@@ -168,12 +168,33 @@ terminalConfig?: {
   /** Prompt format template */
   promptFormat: 'standard' | 'minimal' | 'powerline' | 'starship';
 
+  /** Prompt theme preset */
+  promptTheme?: TerminalPromptTheme;
+
   /** Show git branch in prompt (default: true) */
   showGitBranch: boolean;
 
   /** Show git status dirty indicator (default: true) */
   showGitStatus: boolean;
 
+  /** Show user and host in prompt (default: true) */
+  showUserHost: boolean;
+
+  /** Show path in prompt (default: true) */
+  showPath: boolean;
+
+  /** Path display style */
+  pathStyle: 'full' | 'short' | 'basename';
+
+  /** Limit path depth (0 = full path) */
+  pathDepth: number;
+
+  /** Show current time in prompt (default: false) */
+  showTime: boolean;
+
+  /** Show last command exit status when non-zero (default: false) */
+  showExitStatus: boolean;
+
   /** User-provided custom aliases (multiline string) */
   customAliases: string;
 
@@ -193,6 +214,27 @@ terminalConfig?: {
   /** Override global enabled setting */
   enabled?: boolean;
 
+  /** Override prompt theme preset */
+  promptTheme?: TerminalPromptTheme;
+
+  /** Override showing user/host */
+  showUserHost?: boolean;
+
+  /** Override showing path */
+  showPath?: boolean;
+
+  /** Override path style */
+  pathStyle?: 'full' | 'short' | 'basename';
+
+  /** Override path depth (0 = full path) */
+  pathDepth?: number;
+
+  /** Override showing time */
+  showTime?: boolean;
+
+  /** Override showing exit status */
+  showExitStatus?: boolean;
+
   /** Project-specific custom aliases */
   customAliases?: string;
 
@@ -211,14 +253,28 @@ const DEFAULT_TERMINAL_CONFIG = {
   enabled: false,
   customPrompt: true,
   promptFormat: 'standard' as const,
+  promptTheme: 'custom' as const,
   showGitBranch: true,
   showGitStatus: true,
+  showUserHost: true,
+  showPath: true,
+  pathStyle: 'full' as const,
+  pathDepth: 0,
+  showTime: false,
+  showExitStatus: false,
   customAliases: '',
   customEnvVars: {},
   rcFileVersion: 1,
 };
 ```
 
+**Oh My Posh Themes**:
+
+- When `promptTheme` starts with `omp-` and `oh-my-posh` is available, the generated RC files will
+  initialize oh-my-posh with the selected theme name.
+- If oh-my-posh is not installed, the prompt falls back to the Automaker-built prompt format.
+- `POSH_THEMES_PATH` is exported to the standard user themes directory so themes resolve offline.
+
 ### Step 4: Modify Terminal Service
 
 **File**: `apps/server/src/services/terminal-service.ts`
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 728615c1c..2d822758a 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 5;
+export const RC_FILE_VERSION = 8;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index 23fb3db38..13ccb9739 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -73,6 +73,10 @@ const STARTUP_COLOR_SECONDARY = 39;
 const STARTUP_COLOR_ACCENT = 33;
 const DEFAULT_PATH_DEPTH = 0;
 const DEFAULT_PATH_STYLE: TerminalConfig['pathStyle'] = 'full';
+const OMP_THEME_ENV_VAR = 'AUTOMAKER_OMP_THEME';
+const OMP_BINARY = 'oh-my-posh';
+const OMP_SHELL_BASH = 'bash';
+const OMP_SHELL_ZSH = 'zsh';
 
 /**
  * Convert hex color to RGB
@@ -188,6 +192,24 @@ function normalizePathDepth(pathDepth: number | undefined): number {
   return Math.max(DEFAULT_PATH_DEPTH, Math.floor(depth));
 }
 
+function generateOhMyPoshInit(
+  shell: typeof OMP_SHELL_BASH | typeof OMP_SHELL_ZSH,
+  fallback: string
+) {
+  const themeVar = `$${OMP_THEME_ENV_VAR}`;
+  const initCommand = `${OMP_BINARY} init ${shell} --config`;
+  return `if [ -n "${themeVar}" ] && command -v ${OMP_BINARY} >/dev/null 2>&1; then
+    automaker_omp_theme="$(automaker_resolve_omp_theme)"
+    if [ -n "$automaker_omp_theme" ]; then
+        eval "$(${initCommand} \\\"$automaker_omp_theme\\\")"
+    else
+        ${fallback}
+    fi
+else
+    ${fallback}
+fi`;
+}
+
 /**
  * Generate common shell functions (git prompt, etc.)
  */
@@ -247,6 +269,34 @@ AUTOMAKER_SHOW_USER_HOST="${config.showUserHost === false ? 'false' : 'true'}"
 AUTOMAKER_SHOW_PATH="${config.showPath === false ? 'false' : 'true'}"
 AUTOMAKER_PATH_STYLE="${normalizePathStyle(config.pathStyle)}"
 AUTOMAKER_PATH_DEPTH=${normalizePathDepth(config.pathDepth)}
+POSH_THEMES_PATH="\${POSH_THEMES_PATH:-\${XDG_DATA_HOME:-\$HOME/.local/share}/oh-my-posh/themes}"
+export POSH_THEMES_PATH
+
+automaker_resolve_omp_theme() {
+  automaker_theme_name="$AUTOMAKER_OMP_THEME"
+  if [ -z "$automaker_theme_name" ]; then
+    return 1
+  fi
+
+  if [ -f "$automaker_theme_name" ]; then
+    printf '%s' "$automaker_theme_name"
+    return 0
+  fi
+
+  automaker_themes_base="\${POSH_THEMES_PATH%/}"
+  if [ -n "$automaker_themes_base" ]; then
+    if [ -f "$automaker_themes_base/$automaker_theme_name.omp.json" ]; then
+      printf '%s' "$automaker_themes_base/$automaker_theme_name.omp.json"
+      return 0
+    fi
+    if [ -f "$automaker_themes_base/$automaker_theme_name.omp.yaml" ]; then
+      printf '%s' "$automaker_themes_base/$automaker_theme_name.omp.yaml"
+      return 0
+    fi
+  fi
+
+  return 1
+}
 
 automaker_command_exists() {
   command -v "$1" >/dev/null 2>&1
@@ -782,6 +832,7 @@ ${validEnvVars}
 export function generateBashrc(theme: TerminalTheme, config: TerminalConfig): string {
   const colors = getThemeANSIColors(theme);
   const promptLine = generatePrompt(config.promptFormat, colors, config);
+  const promptInitializer = generateOhMyPoshInit(OMP_SHELL_BASH, promptLine);
 
   return `#!/bin/bash
 # Automaker Terminal Configuration v1.0
@@ -810,7 +861,7 @@ fi
 
 # Set custom prompt (only if enabled)
 if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
-    ${promptLine}
+    ${promptInitializer}
 fi
 ${generateAliases(config)}${generateEnvVars(config)}
 # Load user customizations (if exists)
@@ -826,6 +877,7 @@ fi
 export function generateZshrc(theme: TerminalTheme, config: TerminalConfig): string {
   const colors = getThemeANSIColors(theme);
   const promptLine = generateZshPrompt(config.promptFormat, colors, config);
+  const promptInitializer = generateOhMyPoshInit(OMP_SHELL_ZSH, promptLine);
 
   return `#!/bin/zsh
 # Automaker Terminal Configuration v1.0
@@ -854,7 +906,7 @@ fi
 
 # Set custom prompt (only if enabled)
 if [ "$AUTOMAKER_CUSTOM_PROMPT" = "true" ]; then
-    ${promptLine}
+    ${promptInitializer}
 fi
 ${generateAliases(config)}${generateEnvVars(config)}
 # Load user customizations (if exists)
diff --git a/libs/types/src/settings.ts b/libs/types/src/settings.ts
index fad236376..eb53564df 100644
--- a/libs/types/src/settings.ts
+++ b/libs/types/src/settings.ts
@@ -79,6 +79,133 @@ export type ThemeMode =
   | 'bluloco'
   | 'feather';
 
+export type TerminalPromptTheme =
+  | 'custom'
+  | 'omp-1_shell'
+  | 'omp-agnoster'
+  | 'omp-agnoster.minimal'
+  | 'omp-agnosterplus'
+  | 'omp-aliens'
+  | 'omp-amro'
+  | 'omp-atomic'
+  | 'omp-atomicBit'
+  | 'omp-avit'
+  | 'omp-blue-owl'
+  | 'omp-blueish'
+  | 'omp-bubbles'
+  | 'omp-bubblesextra'
+  | 'omp-bubblesline'
+  | 'omp-capr4n'
+  | 'omp-catppuccin'
+  | 'omp-catppuccin_frappe'
+  | 'omp-catppuccin_latte'
+  | 'omp-catppuccin_macchiato'
+  | 'omp-catppuccin_mocha'
+  | 'omp-cert'
+  | 'omp-chips'
+  | 'omp-cinnamon'
+  | 'omp-clean-detailed'
+  | 'omp-cloud-context'
+  | 'omp-cloud-native-azure'
+  | 'omp-cobalt2'
+  | 'omp-craver'
+  | 'omp-darkblood'
+  | 'omp-devious-diamonds'
+  | 'omp-di4am0nd'
+  | 'omp-dracula'
+  | 'omp-easy-term'
+  | 'omp-emodipt'
+  | 'omp-emodipt-extend'
+  | 'omp-fish'
+  | 'omp-free-ukraine'
+  | 'omp-froczh'
+  | 'omp-gmay'
+  | 'omp-glowsticks'
+  | 'omp-grandpa-style'
+  | 'omp-gruvbox'
+  | 'omp-half-life'
+  | 'omp-honukai'
+  | 'omp-hotstick.minimal'
+  | 'omp-hul10'
+  | 'omp-hunk'
+  | 'omp-huvix'
+  | 'omp-if_tea'
+  | 'omp-illusi0n'
+  | 'omp-iterm2'
+  | 'omp-jandedobbeleer'
+  | 'omp-jblab_2021'
+  | 'omp-jonnychipz'
+  | 'omp-json'
+  | 'omp-jtracey93'
+  | 'omp-jv_sitecorian'
+  | 'omp-kali'
+  | 'omp-kushal'
+  | 'omp-lambda'
+  | 'omp-lambdageneration'
+  | 'omp-larserikfinholt'
+  | 'omp-lightgreen'
+  | 'omp-M365Princess'
+  | 'omp-marcduiker'
+  | 'omp-markbull'
+  | 'omp-material'
+  | 'omp-microverse-power'
+  | 'omp-mojada'
+  | 'omp-montys'
+  | 'omp-mt'
+  | 'omp-multiverse-neon'
+  | 'omp-negligible'
+  | 'omp-neko'
+  | 'omp-night-owl'
+  | 'omp-nordtron'
+  | 'omp-nu4a'
+  | 'omp-onehalf.minimal'
+  | 'omp-paradox'
+  | 'omp-pararussel'
+  | 'omp-patriksvensson'
+  | 'omp-peru'
+  | 'omp-pixelrobots'
+  | 'omp-plague'
+  | 'omp-poshmon'
+  | 'omp-powerlevel10k_classic'
+  | 'omp-powerlevel10k_lean'
+  | 'omp-powerlevel10k_modern'
+  | 'omp-powerlevel10k_rainbow'
+  | 'omp-powerline'
+  | 'omp-probua.minimal'
+  | 'omp-pure'
+  | 'omp-quick-term'
+  | 'omp-remk'
+  | 'omp-robbyrussell'
+  | 'omp-rudolfs-dark'
+  | 'omp-rudolfs-light'
+  | 'omp-sim-web'
+  | 'omp-slim'
+  | 'omp-slimfat'
+  | 'omp-smoothie'
+  | 'omp-sonicboom_dark'
+  | 'omp-sonicboom_light'
+  | 'omp-sorin'
+  | 'omp-space'
+  | 'omp-spaceship'
+  | 'omp-star'
+  | 'omp-stelbent-compact.minimal'
+  | 'omp-stelbent.minimal'
+  | 'omp-takuya'
+  | 'omp-the-unnamed'
+  | 'omp-thecyberden'
+  | 'omp-tiwahu'
+  | 'omp-tokyo'
+  | 'omp-tokyonight_storm'
+  | 'omp-tonybaloney'
+  | 'omp-uew'
+  | 'omp-unicorn'
+  | 'omp-velvet'
+  | 'omp-wholespace'
+  | 'omp-wopian'
+  | 'omp-xtoys'
+  | 'omp-ys'
+  | 'omp-zash';
+
 /** PlanningMode - Planning levels for feature generation workflows */
 export type PlanningMode = 'skip' | 'lite' | 'spec' | 'full';
 
@@ -858,6 +985,8 @@ export interface GlobalSettings {
     customPrompt: boolean;
     /** Prompt format template */
     promptFormat: 'standard' | 'minimal' | 'powerline' | 'starship';
+    /** Prompt theme preset */
+    promptTheme?: TerminalPromptTheme;
     /** Show git branch in prompt (default: true) */
     showGitBranch: boolean;
     /** Show git status dirty indicator (default: true) */
@@ -1291,6 +1420,8 @@ export interface ProjectSettings {
   terminalConfig?: {
     /** Override global enabled setting */
     enabled?: boolean;
+    /** Override prompt theme preset */
+    promptTheme?: TerminalPromptTheme;
     /** Override showing user/host */
     showUserHost?: boolean;
     /** Override showing path */

From b3829f61cd1bfc4556ddec581a8dad5868a36134 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 03:58:31 +0530
Subject: [PATCH 15/20] fix: resolve oh-my-posh theme path

---
 docs/terminal-custom-configs-plan.md | 2 +-
 libs/platform/src/rc-file-manager.ts | 2 +-
 libs/platform/src/rc-generator.ts    | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 938fa13ba..bfbe65864 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "8")
+- Create version.txt with format version (currently "9")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 2d822758a..ae8e89f34 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 8;
+export const RC_FILE_VERSION = 9;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index 13ccb9739..5957cea41 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -269,7 +269,10 @@ AUTOMAKER_SHOW_USER_HOST="${config.showUserHost === false ? 'false' : 'true'}"
 AUTOMAKER_SHOW_PATH="${config.showPath === false ? 'false' : 'true'}"
 AUTOMAKER_PATH_STYLE="${normalizePathStyle(config.pathStyle)}"
 AUTOMAKER_PATH_DEPTH=${normalizePathDepth(config.pathDepth)}
-POSH_THEMES_PATH="\${POSH_THEMES_PATH:-\${XDG_DATA_HOME:-\$HOME/.local/share}/oh-my-posh/themes}"
+automaker_default_themes_dir="\${XDG_DATA_HOME:-\$HOME/.local/share}/oh-my-posh/themes"
+if [ -z "$POSH_THEMES_PATH" ] || [ ! -d "$POSH_THEMES_PATH" ]; then
+  POSH_THEMES_PATH="$automaker_default_themes_dir"
+fi
 export POSH_THEMES_PATH
 
 automaker_resolve_omp_theme() {

From 942e6ba6165b3ab8ae3a6e704ae30ceefc89bc1c Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 04:06:54 +0530
Subject: [PATCH 16/20] fix: correct oh-my-posh config invocation

---
 docs/terminal-custom-configs-plan.md | 2 +-
 libs/platform/src/rc-file-manager.ts | 2 +-
 libs/platform/src/rc-generator.ts    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index bfbe65864..70a14328a 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "9")
+- Create version.txt with format version (currently "10")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index ae8e89f34..9c1db0af8 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 9;
+export const RC_FILE_VERSION = 10;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index 5957cea41..371638088 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -201,7 +201,7 @@ function generateOhMyPoshInit(
   return `if [ -n "${themeVar}" ] && command -v ${OMP_BINARY} >/dev/null 2>&1; then
     automaker_omp_theme="$(automaker_resolve_omp_theme)"
     if [ -n "$automaker_omp_theme" ]; then
-        eval "$(${initCommand} \\\"$automaker_omp_theme\\\")"
+        eval "$(${initCommand} "$automaker_omp_theme")"
     else
         ${fallback}
     fi

From b818a45253a034b86b18e60c484482974227dcb8 Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 04:16:24 +0530
Subject: [PATCH 17/20] docs: add terminal theme screenshot

---
 docs/pr/terminal-omp.png | Bin 0 -> 26965 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/pr/terminal-omp.png

diff --git a/docs/pr/terminal-omp.png b/docs/pr/terminal-omp.png
new file mode 100644
index 0000000000000000000000000000000000000000..11488b5436a45df1084527942d5332e7806f3579
GIT binary patch
literal 26965
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

literal 0
HcmV?d00001


From a204bc1ce91d612f51a411b11fe787540fcf86bc Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 04:40:42 +0530
Subject: [PATCH 18/20] fix: address review feedback and stabilize e2e test

---
 apps/server/src/services/terminal-service.ts  | 173 ++++++++++--------
 .../settings-view/terminal/prompt-preview.tsx |  12 +-
 .../terminal/terminal-config-section.tsx      | 105 ++++++++---
 apps/ui/tests/features/edit-feature.spec.ts   |   3 +-
 docs/terminal-custom-configs-plan.md          |   6 +-
 libs/platform/src/rc-file-manager.ts          |   2 +-
 libs/platform/src/rc-generator.ts             |   3 +
 start-automaker.sh                            |   4 +-
 8 files changed, 192 insertions(+), 116 deletions(-)

diff --git a/apps/server/src/services/terminal-service.ts b/apps/server/src/services/terminal-service.ts
index a03bc8803..167ab3480 100644
--- a/apps/server/src/services/terminal-service.ts
+++ b/apps/server/src/services/terminal-service.ts
@@ -47,6 +47,8 @@ const DEFAULT_CUSTOM_PROMPT = true;
 const DEFAULT_PROMPT_FORMAT: TerminalConfig['promptFormat'] = 'standard';
 const DEFAULT_SHOW_GIT_BRANCH = true;
 const DEFAULT_SHOW_GIT_STATUS = true;
+const DEFAULT_CUSTOM_ALIASES = '';
+const DEFAULT_CUSTOM_ENV_VARS: Record<string, string> = {};
 const PROMPT_THEME_CUSTOM = 'custom';
 const PROMPT_THEME_PREFIX = 'omp-';
 const OMP_THEME_ENV_VAR = 'AUTOMAKER_OMP_THEME';
@@ -103,6 +105,22 @@ function normalizePathDepth(pathDepth: number | undefined): number {
   return Math.max(DEFAULT_PATH_DEPTH, Math.floor(depth));
 }
 
+function getShellBasename(shellPath: string): string {
+  const lastSep = Math.max(shellPath.lastIndexOf('/'), shellPath.lastIndexOf('\\'));
+  return lastSep >= 0 ? shellPath.slice(lastSep + 1) : shellPath;
+}
+
+function getShellArgsForPath(shellPath: string): string[] {
+  const shellName = getShellBasename(shellPath).toLowerCase().replace('.exe', '');
+  if (shellName === 'powershell' || shellName === 'pwsh' || shellName === 'cmd') {
+    return [];
+  }
+  if (shellName === SHELL_NAME_SH) {
+    return [];
+  }
+  return [BASH_LOGIN_ARG];
+}
+
 function resolveOmpThemeName(promptTheme: string | undefined): string | null {
   if (!promptTheme || promptTheme === PROMPT_THEME_CUSTOM) {
     return null;
@@ -113,6 +131,54 @@ function resolveOmpThemeName(promptTheme: string | undefined): string | null {
   return null;
 }
 
+function buildEffectiveTerminalConfig(
+  globalTerminalConfig: TerminalConfig | undefined,
+  projectTerminalConfig: Partial<TerminalConfig> | undefined
+): TerminalConfig {
+  const mergedEnvVars = {
+    ...(globalTerminalConfig?.customEnvVars ?? DEFAULT_CUSTOM_ENV_VARS),
+    ...(projectTerminalConfig?.customEnvVars ?? DEFAULT_CUSTOM_ENV_VARS),
+  };
+
+  return {
+    enabled: projectTerminalConfig?.enabled ?? globalTerminalConfig?.enabled ?? false,
+    customPrompt: globalTerminalConfig?.customPrompt ?? DEFAULT_CUSTOM_PROMPT,
+    promptFormat: globalTerminalConfig?.promptFormat ?? DEFAULT_PROMPT_FORMAT,
+    showGitBranch:
+      projectTerminalConfig?.showGitBranch ??
+      globalTerminalConfig?.showGitBranch ??
+      DEFAULT_SHOW_GIT_BRANCH,
+    showGitStatus:
+      projectTerminalConfig?.showGitStatus ??
+      globalTerminalConfig?.showGitStatus ??
+      DEFAULT_SHOW_GIT_STATUS,
+    showUserHost:
+      projectTerminalConfig?.showUserHost ??
+      globalTerminalConfig?.showUserHost ??
+      DEFAULT_SHOW_USER_HOST,
+    showPath:
+      projectTerminalConfig?.showPath ?? globalTerminalConfig?.showPath ?? DEFAULT_SHOW_PATH,
+    pathStyle: normalizePathStyle(
+      projectTerminalConfig?.pathStyle ?? globalTerminalConfig?.pathStyle
+    ),
+    pathDepth: normalizePathDepth(
+      projectTerminalConfig?.pathDepth ?? globalTerminalConfig?.pathDepth
+    ),
+    showTime:
+      projectTerminalConfig?.showTime ?? globalTerminalConfig?.showTime ?? DEFAULT_SHOW_TIME,
+    showExitStatus:
+      projectTerminalConfig?.showExitStatus ??
+      globalTerminalConfig?.showExitStatus ??
+      DEFAULT_SHOW_EXIT_STATUS,
+    customAliases:
+      projectTerminalConfig?.customAliases ??
+      globalTerminalConfig?.customAliases ??
+      DEFAULT_CUSTOM_ALIASES,
+    customEnvVars: mergedEnvVars,
+    rcFileVersion: globalTerminalConfig?.rcFileVersion,
+  };
+}
+
 export interface TerminalSession {
   id: string;
   pty: pty.IPty;
@@ -179,37 +245,19 @@ export class TerminalService extends EventEmitter {
     const platform = os.platform();
     const shellPaths = getShellPaths();
 
-    // Helper to get basename handling both path separators
-    const getBasename = (shellPath: string): string => {
-      const lastSep = Math.max(shellPath.lastIndexOf('/'), shellPath.lastIndexOf('\\'));
-      return lastSep >= 0 ? shellPath.slice(lastSep + 1) : shellPath;
-    };
-
-    // Helper to get shell args based on shell name
-    const getShellArgs = (shell: string): string[] => {
-      const shellName = getBasename(shell).toLowerCase().replace('.exe', '');
-      // PowerShell and cmd don't need --login
-      if (shellName === 'powershell' || shellName === 'pwsh' || shellName === 'cmd') {
-        return [];
-      }
-      // sh doesn't support --login in all implementations
-      if (shellName === SHELL_NAME_SH) {
-        return [];
-      }
-      // bash, zsh, and other POSIX shells support --login
-      return [BASH_LOGIN_ARG];
-    };
-
     // Check if running in WSL - prefer user's shell or bash with --login
     if (platform === 'linux' && this.isWSL()) {
       const userShell = process.env.SHELL;
       if (userShell) {
         // Try to find userShell in allowed paths
         for (const allowedShell of shellPaths) {
-          if (allowedShell === userShell || getBasename(allowedShell) === getBasename(userShell)) {
+          if (
+            allowedShell === userShell ||
+            getShellBasename(allowedShell) === getShellBasename(userShell)
+          ) {
             try {
               if (systemPathExists(allowedShell)) {
-                return { shell: allowedShell, args: getShellArgs(allowedShell) };
+                return { shell: allowedShell, args: getShellArgsForPath(allowedShell) };
               }
             } catch {
               // Path not allowed, continue searching
@@ -221,7 +269,7 @@ export class TerminalService extends EventEmitter {
       for (const shell of shellPaths) {
         try {
           if (systemPathExists(shell)) {
-            return { shell, args: getShellArgs(shell) };
+            return { shell, args: getShellArgsForPath(shell) };
           }
         } catch {
           // Path not allowed, continue
@@ -235,10 +283,13 @@ export class TerminalService extends EventEmitter {
     if (userShell && platform !== 'win32') {
       // Try to find userShell in allowed paths
       for (const allowedShell of shellPaths) {
-        if (allowedShell === userShell || getBasename(allowedShell) === getBasename(userShell)) {
+        if (
+          allowedShell === userShell ||
+          getShellBasename(allowedShell) === getShellBasename(userShell)
+        ) {
           try {
             if (systemPathExists(allowedShell)) {
-              return { shell: allowedShell, args: getShellArgs(allowedShell) };
+              return { shell: allowedShell, args: getShellArgsForPath(allowedShell) };
             }
           } catch {
             // Path not allowed, continue searching
@@ -251,7 +302,7 @@ export class TerminalService extends EventEmitter {
     for (const shell of shellPaths) {
       try {
         if (systemPathExists(shell)) {
-          return { shell, args: getShellArgs(shell) };
+          return { shell, args: getShellArgsForPath(shell) };
         }
       } catch {
         // Path not allowed or doesn't exist, continue to next
@@ -392,7 +443,7 @@ export class TerminalService extends EventEmitter {
 
     const { shell: detectedShell, args: detectedShellArgs } = this.detectShell();
     const shell = options.shell || detectedShell;
-    let shellArgs = [...detectedShellArgs];
+    let shellArgs = options.shell ? getShellArgsForPath(shell) : [...detectedShellArgs];
 
     // Validate and resolve working directory
     // Uses secureFs internally to enforce ALLOWED_ROOT_DIRECTORY
@@ -422,52 +473,28 @@ export class TerminalService extends EventEmitter {
           ? await this.settingsService.getProjectSettings(options.cwd)
           : null;
 
-        // Merge global and project terminal configs
         const globalTerminalConfig = globalSettings?.terminalConfig;
         const projectTerminalConfig = projectSettings?.terminalConfig;
+        const effectiveConfig = buildEffectiveTerminalConfig(
+          globalTerminalConfig,
+          projectTerminalConfig
+        );
 
         logger.info(
           `[createSession] Terminal config: global.enabled=${globalTerminalConfig?.enabled}, project.enabled=${projectTerminalConfig?.enabled}`
         );
+        logger.info(
+          `[createSession] Terminal config effective enabled: ${effectiveConfig.enabled}`
+        );
 
-        // Determine if terminal config is enabled
-        const enabled =
-          projectTerminalConfig?.enabled !== undefined
-            ? projectTerminalConfig.enabled
-            : globalTerminalConfig?.enabled || false;
-
-        logger.info(`[createSession] Terminal config effective enabled: ${enabled}`);
-
-        if (enabled && globalTerminalConfig) {
+        if (effectiveConfig.enabled && globalTerminalConfig) {
           const currentTheme = globalSettings?.theme || 'dark';
           const themeColors = getTerminalThemeColors(currentTheme);
           const allThemes = getAllTerminalThemes();
           const promptTheme =
-            projectTerminalConfig?.promptTheme || globalTerminalConfig.promptTheme;
+            projectTerminalConfig?.promptTheme ?? globalTerminalConfig.promptTheme;
           const ompThemeName = resolveOmpThemeName(promptTheme);
 
-          // Full config object (global + project overrides)
-          const effectiveConfig: TerminalConfig = {
-            enabled: true,
-            customPrompt: globalTerminalConfig.customPrompt ?? DEFAULT_CUSTOM_PROMPT,
-            promptFormat: globalTerminalConfig.promptFormat ?? DEFAULT_PROMPT_FORMAT,
-            showGitBranch: globalTerminalConfig.showGitBranch ?? DEFAULT_SHOW_GIT_BRANCH,
-            showGitStatus: globalTerminalConfig.showGitStatus ?? DEFAULT_SHOW_GIT_STATUS,
-            showUserHost: globalTerminalConfig.showUserHost ?? DEFAULT_SHOW_USER_HOST,
-            showPath: globalTerminalConfig.showPath ?? DEFAULT_SHOW_PATH,
-            pathStyle: normalizePathStyle(globalTerminalConfig.pathStyle),
-            pathDepth: normalizePathDepth(globalTerminalConfig.pathDepth),
-            showTime: globalTerminalConfig.showTime ?? DEFAULT_SHOW_TIME,
-            showExitStatus: globalTerminalConfig.showExitStatus ?? DEFAULT_SHOW_EXIT_STATUS,
-            customAliases:
-              projectTerminalConfig?.customAliases || globalTerminalConfig.customAliases,
-            customEnvVars: {
-              ...globalTerminalConfig.customEnvVars,
-              ...projectTerminalConfig?.customEnvVars,
-            },
-            rcFileVersion: globalTerminalConfig.rcFileVersion,
-          };
-
           // Ensure RC files are up to date
           await ensureRcFilesUpToDate(
             options.cwd || cwd,
@@ -478,7 +505,7 @@ export class TerminalService extends EventEmitter {
           );
 
           // Set shell-specific env vars
-          const shellName = path.basename(shell).toLowerCase();
+          const shellName = getShellBasename(shell).toLowerCase();
           if (ompThemeName && effectiveConfig.customPrompt) {
             terminalConfigEnv[OMP_THEME_ENV_VAR] = ompThemeName;
           }
@@ -850,31 +877,17 @@ export class TerminalService extends EventEmitter {
     try {
       const globalSettings = await this.settingsService.getGlobalSettings();
       const terminalConfig = globalSettings?.terminalConfig;
+      const projectSettings = await this.settingsService.getProjectSettings(projectPath);
+      const projectTerminalConfig = projectSettings?.terminalConfig;
+      const effectiveConfig = buildEffectiveTerminalConfig(terminalConfig, projectTerminalConfig);
 
-      if (terminalConfig?.enabled) {
+      if (effectiveConfig.enabled && terminalConfig) {
         const themeColors = getTerminalThemeColors(
           newTheme as import('@automaker/types').ThemeMode
         );
         const allThemes = getAllTerminalThemes();
 
         // Regenerate RC files with new theme
-        const effectiveConfig: TerminalConfig = {
-          enabled: true,
-          customPrompt: terminalConfig.customPrompt ?? DEFAULT_CUSTOM_PROMPT,
-          promptFormat: terminalConfig.promptFormat ?? DEFAULT_PROMPT_FORMAT,
-          showGitBranch: terminalConfig.showGitBranch ?? DEFAULT_SHOW_GIT_BRANCH,
-          showGitStatus: terminalConfig.showGitStatus ?? DEFAULT_SHOW_GIT_STATUS,
-          showUserHost: terminalConfig.showUserHost ?? DEFAULT_SHOW_USER_HOST,
-          showPath: terminalConfig.showPath ?? DEFAULT_SHOW_PATH,
-          pathStyle: normalizePathStyle(terminalConfig.pathStyle),
-          pathDepth: normalizePathDepth(terminalConfig.pathDepth),
-          showTime: terminalConfig.showTime ?? DEFAULT_SHOW_TIME,
-          showExitStatus: terminalConfig.showExitStatus ?? DEFAULT_SHOW_EXIT_STATUS,
-          customAliases: terminalConfig.customAliases,
-          customEnvVars: terminalConfig.customEnvVars,
-          rcFileVersion: terminalConfig.rcFileVersion,
-        };
-
         await ensureRcFilesUpToDate(
           projectPath,
           newTheme as import('@automaker/types').ThemeMode,
diff --git a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
index aad380593..4315ce5ce 100644
--- a/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/prompt-preview.tsx
@@ -107,7 +107,7 @@ export function PromptPreview({
     const gitInfo = branch ? ` (${branch}${dirty})` : '';
 
     switch (format) {
-      case 'minimal':
+      case 'minimal': {
         return (
           <div className="font-mono text-sm leading-relaxed">
             {showTime && <span style={{ color: terminalTheme.magenta }}>{time} </span>}
@@ -125,8 +125,9 @@ export function PromptPreview({
             <span className="ml-1 animate-pulse">▊</span>
           </div>
         );
+      }
 
-      case 'powerline':
+      case 'powerline': {
         const powerlineSegments: ReactNode[] = [];
         if (showUserHost) {
           powerlineSegments.push(
@@ -197,8 +198,9 @@ export function PromptPreview({
             </div>
           </div>
         );
+      }
 
-      case 'starship':
+      case 'starship': {
         return (
           <div className="font-mono text-sm leading-relaxed space-y-1">
             <div>
@@ -233,9 +235,10 @@ export function PromptPreview({
             </div>
           </div>
         );
+      }
 
       case 'standard':
-      default:
+      default: {
         return (
           <div className="font-mono text-sm leading-relaxed">
             {showTime && <span style={{ color: terminalTheme.magenta }}>{time} </span>}
@@ -254,6 +257,7 @@ export function PromptPreview({
             <span className="ml-1 animate-pulse">▊</span>
           </div>
         );
+      }
     }
   };
 
diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
index e28dfddc3..ddfd9201d 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-config-section.tsx
@@ -6,7 +6,7 @@
  * in .automaker/terminal/ without modifying user's existing RC files.
  */
 
-import { useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
 import { Textarea } from '@/components/ui/textarea';
@@ -39,14 +39,31 @@ import { ConfirmDialog } from '@/components/ui/confirm-dialog';
 export function TerminalConfigSection() {
   const PATH_DEPTH_MIN = 0;
   const PATH_DEPTH_MAX = 10;
+  const ENV_VAR_UPDATE_DEBOUNCE_MS = 400;
+  const ENV_VAR_ID_PREFIX = 'env';
+  const TERMINAL_RC_FILE_VERSION = 11;
   const { theme } = useAppStore();
   const { data: globalSettings } = useGlobalSettings();
   const updateGlobalSettings = useUpdateGlobalSettings({ showSuccessToast: false });
-  const [localEnvVars, setLocalEnvVars] = useState<Array<{ key: string; value: string }>>(
-    Object.entries(globalSettings?.terminalConfig?.customEnvVars || {}).map(([key, value]) => ({
-      key,
-      value,
-    }))
+  const envVarIdRef = useRef(0);
+  const envVarUpdateTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const createEnvVarEntry = useCallback(
+    (key = '', value = '') => {
+      envVarIdRef.current += 1;
+      return {
+        id: `${ENV_VAR_ID_PREFIX}-${envVarIdRef.current}`,
+        key,
+        value,
+      };
+    },
+    [ENV_VAR_ID_PREFIX]
+  );
+  const [localEnvVars, setLocalEnvVars] = useState<
+    Array<{ id: string; key: string; value: string }>
+  >(() =>
+    Object.entries(globalSettings?.terminalConfig?.customEnvVars || {}).map(([key, value]) =>
+      createEnvVarEntry(key, value)
+    )
   );
   const [showEnableConfirm, setShowEnableConfirm] = useState(false);
 
@@ -119,7 +136,7 @@ export function TerminalConfigSection() {
       promptTheme: terminalConfig.promptTheme ?? PROMPT_THEME_CUSTOM_ID,
       customAliases: terminalConfig.customAliases,
       customEnvVars: terminalConfig.customEnvVars,
-      rcFileVersion: 1,
+      rcFileVersion: TERMINAL_RC_FILE_VERSION,
     };
 
     updateGlobalSettings.mutate(
@@ -145,6 +162,22 @@ export function TerminalConfigSection() {
     );
   };
 
+  useEffect(() => {
+    setLocalEnvVars(
+      Object.entries(globalSettings?.terminalConfig?.customEnvVars || {}).map(([key, value]) =>
+        createEnvVarEntry(key, value)
+      )
+    );
+  }, [createEnvVarEntry, globalSettings?.terminalConfig?.customEnvVars]);
+
+  useEffect(() => {
+    return () => {
+      if (envVarUpdateTimeoutRef.current) {
+        clearTimeout(envVarUpdateTimeoutRef.current);
+      }
+    };
+  }, []);
+
   const handleToggleEnabled = async (enabled: boolean) => {
     if (enabled) {
       setShowEnableConfirm(true);
@@ -157,13 +190,32 @@ export function TerminalConfigSection() {
   const handleUpdateConfig = (updates: Partial<typeof terminalConfig>) => {
     const nextPromptTheme = updates.promptTheme ?? PROMPT_THEME_CUSTOM_ID;
 
-    updateGlobalSettings.mutate({
-      terminalConfig: {
-        ...terminalConfig,
-        ...updates,
-        promptTheme: nextPromptTheme,
+    updateGlobalSettings.mutate(
+      {
+        terminalConfig: {
+          ...terminalConfig,
+          ...updates,
+          promptTheme: nextPromptTheme,
+        },
       },
-    });
+      {
+        onError: (error) => {
+          console.error('[TerminalConfig] Failed to update settings:', error);
+          toast.error('Failed to update terminal config', {
+            description: error instanceof Error ? error.message : 'Unknown error',
+          });
+        },
+      }
+    );
+  };
+
+  const scheduleEnvVarsUpdate = (envVarsObject: Record<string, string>) => {
+    if (envVarUpdateTimeoutRef.current) {
+      clearTimeout(envVarUpdateTimeoutRef.current);
+    }
+    envVarUpdateTimeoutRef.current = setTimeout(() => {
+      handleUpdateConfig({ customEnvVars: envVarsObject });
+    }, ENV_VAR_UPDATE_DEBOUNCE_MS);
   };
 
   const handlePromptThemeChange = (themeId: string) => {
@@ -185,11 +237,11 @@ export function TerminalConfigSection() {
   };
 
   const addEnvVar = () => {
-    setLocalEnvVars([...localEnvVars, { key: '', value: '' }]);
+    setLocalEnvVars([...localEnvVars, createEnvVarEntry()]);
   };
 
-  const removeEnvVar = (index: number) => {
-    const newVars = localEnvVars.filter((_, i) => i !== index);
+  const removeEnvVar = (id: string) => {
+    const newVars = localEnvVars.filter((envVar) => envVar.id !== id);
     setLocalEnvVars(newVars);
 
     // Update settings
@@ -201,12 +253,13 @@ export function TerminalConfigSection() {
       {} as Record<string, string>
     );
 
-    handleUpdateConfig({ customEnvVars: envVarsObject });
+    scheduleEnvVarsUpdate(envVarsObject);
   };
 
-  const updateEnvVar = (index: number, field: 'key' | 'value', newValue: string) => {
-    const newVars = [...localEnvVars];
-    newVars[index][field] = newValue;
+  const updateEnvVar = (id: string, field: 'key' | 'value', newValue: string) => {
+    const newVars = localEnvVars.map((envVar) =>
+      envVar.id === id ? { ...envVar, [field]: newValue } : envVar
+    );
     setLocalEnvVars(newVars);
 
     // Validate and update settings (only if key is valid)
@@ -221,7 +274,7 @@ export function TerminalConfigSection() {
       {} as Record<string, string>
     );
 
-    handleUpdateConfig({ customEnvVars: envVarsObject });
+    scheduleEnvVarsUpdate(envVarsObject);
   };
 
   return (
@@ -548,11 +601,11 @@ export function TerminalConfigSection() {
 
               {localEnvVars.length > 0 && (
                 <div className="space-y-2">
-                  {localEnvVars.map((envVar, index) => (
-                    <div key={index} className="flex gap-2 items-start">
+                  {localEnvVars.map((envVar) => (
+                    <div key={envVar.id} className="flex gap-2 items-start">
                       <Input
                         value={envVar.key}
-                        onChange={(e) => updateEnvVar(index, 'key', e.target.value)}
+                        onChange={(e) => updateEnvVar(envVar.id, 'key', e.target.value)}
                         placeholder="VAR_NAME"
                         className={cn(
                           'font-mono text-sm flex-1',
@@ -563,14 +616,14 @@ export function TerminalConfigSection() {
                       />
                       <Input
                         value={envVar.value}
-                        onChange={(e) => updateEnvVar(index, 'value', e.target.value)}
+                        onChange={(e) => updateEnvVar(envVar.id, 'value', e.target.value)}
                         placeholder="value"
                         className="font-mono text-sm flex-[2]"
                       />
                       <Button
                         variant="ghost"
                         size="sm"
-                        onClick={() => removeEnvVar(index)}
+                        onClick={() => removeEnvVar(envVar.id)}
                         className="h-9 w-9 p-0 text-muted-foreground hover:text-destructive"
                       >
                         <X className="w-4 h-4" />
diff --git a/apps/ui/tests/features/edit-feature.spec.ts b/apps/ui/tests/features/edit-feature.spec.ts
index 8b1c9dca5..1d05c4a50 100644
--- a/apps/ui/tests/features/edit-feature.spec.ts
+++ b/apps/ui/tests/features/edit-feature.spec.ts
@@ -80,6 +80,7 @@ test.describe('Edit Feature', () => {
     await clickAddFeature(page);
     await fillAddFeatureDialog(page, originalDescription);
     await confirmAddFeature(page);
+    await page.waitForTimeout(2000);
 
     // Wait for the feature to appear in the backlog
     await expect(async () => {
@@ -88,7 +89,7 @@ test.describe('Edit Feature', () => {
         hasText: originalDescription,
       });
       expect(await featureCard.count()).toBeGreaterThan(0);
-    }).toPass({ timeout: 10000 });
+    }).toPass({ timeout: 20000 });
 
     // Get the feature ID from the card
     const featureCard = page
diff --git a/docs/terminal-custom-configs-plan.md b/docs/terminal-custom-configs-plan.md
index 70a14328a..92ea53c61 100644
--- a/docs/terminal-custom-configs-plan.md
+++ b/docs/terminal-custom-configs-plan.md
@@ -147,7 +147,7 @@ export async function needsRegeneration(
 - Create `.automaker/terminal/` if doesn't exist
 - Write RC files with 0644 permissions
 - Write theme color files (40 themes × 1 file each)
-- Create version.txt with format version (currently "10")
+- Create version.txt with format version (currently "11")
 - Support atomic writes (write to temp, then rename)
 
 ### Step 3: Add Settings Schema
@@ -264,7 +264,7 @@ const DEFAULT_TERMINAL_CONFIG = {
   showExitStatus: false,
   customAliases: '',
   customEnvVars: {},
-  rcFileVersion: 1,
+  rcFileVersion: 11,
 };
 ```
 
@@ -474,7 +474,7 @@ user@host in ~/path on main*
 1. User toggles "Enable Custom Terminal Configs"
 2. Show confirmation dialog explaining what will happen
 3. Generate RC files for current theme
-4. Set `rcFileVersion: 1` in settings
+4. Set `rcFileVersion: 11` in settings
 
 ### On Theme Change
 
diff --git a/libs/platform/src/rc-file-manager.ts b/libs/platform/src/rc-file-manager.ts
index 9c1db0af8..7115879fd 100644
--- a/libs/platform/src/rc-file-manager.ts
+++ b/libs/platform/src/rc-file-manager.ts
@@ -21,7 +21,7 @@ import {
 /**
  * Current RC file format version
  */
-export const RC_FILE_VERSION = 10;
+export const RC_FILE_VERSION = 11;
 
 const RC_SIGNATURE_FILENAME = 'config.sha256';
 
diff --git a/libs/platform/src/rc-generator.ts b/libs/platform/src/rc-generator.ts
index 371638088..7c326590e 100644
--- a/libs/platform/src/rc-generator.ts
+++ b/libs/platform/src/rc-generator.ts
@@ -902,6 +902,9 @@ if [ -f "\${ZDOTDIR:-\${0:a:h}}/common.sh" ]; then
     source "\${ZDOTDIR:-\${0:a:h}}/common.sh"
 fi
 
+# Enable command substitution in PROMPT
+setopt PROMPT_SUBST
+
 # Show Automaker banner on shell start
 if command -v automaker_show_banner_once >/dev/null 2>&1; then
     automaker_show_banner_once
diff --git a/start-automaker.sh b/start-automaker.sh
index fffd4a478..6770db2ca 100755
--- a/start-automaker.sh
+++ b/start-automaker.sh
@@ -1158,7 +1158,9 @@ fi
 # Execute the appropriate command
 case $MODE in
     web)
-        export $(grep -v '^#' .env | xargs) 
+        if [ -f .env ]; then
+            export $(grep -v '^#' .env | xargs)
+        fi
         export TEST_PORT="$WEB_PORT"
         export VITE_SERVER_URL="http://${APP_HOST}:$SERVER_PORT"
         export PORT="$SERVER_PORT"

From 02659b857c765ffaaeef281271a90f8ddd01550d Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 04:45:19 +0530
Subject: [PATCH 19/20] ui: split terminal config into separate card

---
 .../terminal/terminal-section.tsx             | 462 +++++++++---------
 1 file changed, 231 insertions(+), 231 deletions(-)

diff --git a/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx b/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx
index 68c37814f..1a24eff3a 100644
--- a/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx
+++ b/apps/ui/src/components/views/settings-view/terminal/terminal-section.tsx
@@ -54,258 +54,258 @@ export function TerminalSection() {
   const { terminals, isRefreshing, refresh } = useAvailableTerminals();
 
   return (
-    <div
-      className={cn(
-        'rounded-2xl overflow-hidden',
-        'border border-border/50',
-        'bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl',
-        'shadow-sm shadow-black/5'
-      )}
-    >
-      <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
-        <div className="flex items-center gap-3 mb-2">
-          <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-green-500/20 to-green-600/10 flex items-center justify-center border border-green-500/20">
-            <SquareTerminal className="w-5 h-5 text-green-500" />
+    <div className="space-y-6">
+      <div
+        className={cn(
+          'rounded-2xl overflow-hidden',
+          'border border-border/50',
+          'bg-gradient-to-br from-card/90 via-card/70 to-card/80 backdrop-blur-xl',
+          'shadow-sm shadow-black/5'
+        )}
+      >
+        <div className="p-6 border-b border-border/50 bg-gradient-to-r from-transparent via-accent/5 to-transparent">
+          <div className="flex items-center gap-3 mb-2">
+            <div className="w-9 h-9 rounded-xl bg-gradient-to-br from-green-500/20 to-green-600/10 flex items-center justify-center border border-green-500/20">
+              <SquareTerminal className="w-5 h-5 text-green-500" />
+            </div>
+            <h2 className="text-lg font-semibold text-foreground tracking-tight">Terminal</h2>
           </div>
-          <h2 className="text-lg font-semibold text-foreground tracking-tight">Terminal</h2>
+          <p className="text-sm text-muted-foreground/80 ml-12">
+            Customize terminal appearance and behavior. Theme follows your app theme in Appearance
+            settings.
+          </p>
         </div>
-        <p className="text-sm text-muted-foreground/80 ml-12">
-          Customize terminal appearance and behavior. Theme follows your app theme in Appearance
-          settings.
-        </p>
-      </div>
-      <div className="p-6 space-y-6">
-        {/* Default External Terminal */}
-        <div className="space-y-3">
-          <div className="flex items-center justify-between">
-            <Label className="text-foreground font-medium">Default External Terminal</Label>
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-7 w-7 p-0"
-              onClick={refresh}
-              disabled={isRefreshing}
-              title="Refresh available terminals"
-              aria-label="Refresh available terminals"
+        <div className="p-6 space-y-6">
+          {/* Default External Terminal */}
+          <div className="space-y-3">
+            <div className="flex items-center justify-between">
+              <Label className="text-foreground font-medium">Default External Terminal</Label>
+              <Button
+                variant="ghost"
+                size="sm"
+                className="h-7 w-7 p-0"
+                onClick={refresh}
+                disabled={isRefreshing}
+                title="Refresh available terminals"
+                aria-label="Refresh available terminals"
+              >
+                <RefreshCw className={cn('w-3.5 h-3.5', isRefreshing && 'animate-spin')} />
+              </Button>
+            </div>
+            <p className="text-xs text-muted-foreground">
+              Terminal to use when selecting "Open in Terminal" from the worktree menu
+            </p>
+            <Select
+              value={defaultTerminalId ?? 'integrated'}
+              onValueChange={(value) => {
+                setDefaultTerminalId(value === 'integrated' ? null : value);
+                toast.success(
+                  value === 'integrated'
+                    ? 'Integrated terminal set as default'
+                    : 'Default terminal changed'
+                );
+              }}
             >
-              <RefreshCw className={cn('w-3.5 h-3.5', isRefreshing && 'animate-spin')} />
-            </Button>
+              <SelectTrigger className="w-full">
+                <SelectValue placeholder="Select a terminal" />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="integrated">
+                  <span className="flex items-center gap-2">
+                    <Terminal className="w-4 h-4" />
+                    Integrated Terminal
+                  </span>
+                </SelectItem>
+                {terminals.map((terminal) => {
+                  const TerminalIcon = getTerminalIcon(terminal.id);
+                  return (
+                    <SelectItem key={terminal.id} value={terminal.id}>
+                      <span className="flex items-center gap-2">
+                        <TerminalIcon className="w-4 h-4" />
+                        {terminal.name}
+                      </span>
+                    </SelectItem>
+                  );
+                })}
+              </SelectContent>
+            </Select>
+            {terminals.length === 0 && !isRefreshing && (
+              <p className="text-xs text-muted-foreground italic">
+                No external terminals detected. Click refresh to re-scan.
+              </p>
+            )}
           </div>
-          <p className="text-xs text-muted-foreground">
-            Terminal to use when selecting "Open in Terminal" from the worktree menu
-          </p>
-          <Select
-            value={defaultTerminalId ?? 'integrated'}
-            onValueChange={(value) => {
-              setDefaultTerminalId(value === 'integrated' ? null : value);
-              toast.success(
-                value === 'integrated'
-                  ? 'Integrated terminal set as default'
-                  : 'Default terminal changed'
-              );
-            }}
-          >
-            <SelectTrigger className="w-full">
-              <SelectValue placeholder="Select a terminal" />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="integrated">
-                <span className="flex items-center gap-2">
-                  <Terminal className="w-4 h-4" />
-                  Integrated Terminal
-                </span>
-              </SelectItem>
-              {terminals.map((terminal) => {
-                const TerminalIcon = getTerminalIcon(terminal.id);
-                return (
-                  <SelectItem key={terminal.id} value={terminal.id}>
-                    <span className="flex items-center gap-2">
-                      <TerminalIcon className="w-4 h-4" />
-                      {terminal.name}
-                    </span>
-                  </SelectItem>
-                );
-              })}
-            </SelectContent>
-          </Select>
-          {terminals.length === 0 && !isRefreshing && (
-            <p className="text-xs text-muted-foreground italic">
-              No external terminals detected. Click refresh to re-scan.
-            </p>
-          )}
-        </div>
-
-        {/* Default Open Mode */}
-        <div className="space-y-3">
-          <Label className="text-foreground font-medium">Default Open Mode</Label>
-          <p className="text-xs text-muted-foreground">
-            How to open the integrated terminal when using "Open in Terminal" from the worktree menu
-          </p>
-          <Select
-            value={openTerminalMode}
-            onValueChange={(value: 'newTab' | 'split') => {
-              setOpenTerminalMode(value);
-              toast.success(
-                value === 'newTab'
-                  ? 'New terminals will open in new tabs'
-                  : 'New terminals will split the current tab'
-              );
-            }}
-          >
-            <SelectTrigger className="w-full">
-              <SelectValue />
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="newTab">
-                <span className="flex items-center gap-2">
-                  <SquarePlus className="w-4 h-4" />
-                  New Tab
-                </span>
-              </SelectItem>
-              <SelectItem value="split">
-                <span className="flex items-center gap-2">
-                  <SplitSquareHorizontal className="w-4 h-4" />
-                  Split Current Tab
-                </span>
-              </SelectItem>
-            </SelectContent>
-          </Select>
-        </div>
 
-        {/* Font Family */}
-        <div className="space-y-3">
-          <Label className="text-foreground font-medium">Font Family</Label>
-          <Select
-            value={fontFamily || DEFAULT_FONT_VALUE}
-            onValueChange={(value) => {
-              setTerminalFontFamily(value);
-              toast.info('Font family changed', {
-                description: 'Restart terminal for changes to take effect',
-              });
-            }}
-          >
-            <SelectTrigger className="w-full">
-              <SelectValue placeholder="Default (Menlo / Monaco)" />
-            </SelectTrigger>
-            <SelectContent>
-              {TERMINAL_FONT_OPTIONS.map((option) => (
-                <SelectItem key={option.value} value={option.value}>
-                  <span
-                    style={{
-                      fontFamily: option.value === DEFAULT_FONT_VALUE ? undefined : option.value,
-                    }}
-                  >
-                    {option.label}
+          {/* Default Open Mode */}
+          <div className="space-y-3">
+            <Label className="text-foreground font-medium">Default Open Mode</Label>
+            <p className="text-xs text-muted-foreground">
+              How to open the integrated terminal when using "Open in Terminal" from the worktree
+              menu
+            </p>
+            <Select
+              value={openTerminalMode}
+              onValueChange={(value: 'newTab' | 'split') => {
+                setOpenTerminalMode(value);
+                toast.success(
+                  value === 'newTab'
+                    ? 'New terminals will open in new tabs'
+                    : 'New terminals will split the current tab'
+                );
+              }}
+            >
+              <SelectTrigger className="w-full">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                <SelectItem value="newTab">
+                  <span className="flex items-center gap-2">
+                    <SquarePlus className="w-4 h-4" />
+                    New Tab
                   </span>
                 </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-        </div>
+                <SelectItem value="split">
+                  <span className="flex items-center gap-2">
+                    <SplitSquareHorizontal className="w-4 h-4" />
+                    Split Current Tab
+                  </span>
+                </SelectItem>
+              </SelectContent>
+            </Select>
+          </div>
 
-        {/* Default Font Size */}
-        <div className="space-y-3">
-          <div className="flex items-center justify-between">
-            <Label className="text-foreground font-medium">Default Font Size</Label>
-            <span className="text-sm text-muted-foreground">{defaultFontSize}px</span>
+          {/* Font Family */}
+          <div className="space-y-3">
+            <Label className="text-foreground font-medium">Font Family</Label>
+            <Select
+              value={fontFamily || DEFAULT_FONT_VALUE}
+              onValueChange={(value) => {
+                setTerminalFontFamily(value);
+                toast.info('Font family changed', {
+                  description: 'Restart terminal for changes to take effect',
+                });
+              }}
+            >
+              <SelectTrigger className="w-full">
+                <SelectValue placeholder="Default (Menlo / Monaco)" />
+              </SelectTrigger>
+              <SelectContent>
+                {TERMINAL_FONT_OPTIONS.map((option) => (
+                  <SelectItem key={option.value} value={option.value}>
+                    <span
+                      style={{
+                        fontFamily: option.value === DEFAULT_FONT_VALUE ? undefined : option.value,
+                      }}
+                    >
+                      {option.label}
+                    </span>
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
           </div>
-          <Slider
-            value={[defaultFontSize]}
-            min={8}
-            max={32}
-            step={1}
-            onValueChange={([value]) => setTerminalDefaultFontSize(value)}
-            className="flex-1"
-          />
-        </div>
 
-        {/* Line Height */}
-        <div className="space-y-3">
-          <div className="flex items-center justify-between">
-            <Label className="text-foreground font-medium">Line Height</Label>
-            <span className="text-sm text-muted-foreground">{lineHeight.toFixed(1)}</span>
+          {/* Default Font Size */}
+          <div className="space-y-3">
+            <div className="flex items-center justify-between">
+              <Label className="text-foreground font-medium">Default Font Size</Label>
+              <span className="text-sm text-muted-foreground">{defaultFontSize}px</span>
+            </div>
+            <Slider
+              value={[defaultFontSize]}
+              min={8}
+              max={32}
+              step={1}
+              onValueChange={([value]) => setTerminalDefaultFontSize(value)}
+              className="flex-1"
+            />
           </div>
-          <Slider
-            value={[lineHeight]}
-            min={1.0}
-            max={2.0}
-            step={0.1}
-            onValueChange={([value]) => {
-              setTerminalLineHeight(value);
-            }}
-            onValueCommit={() => {
-              toast.info('Line height changed', {
-                description: 'Restart terminal for changes to take effect',
-              });
-            }}
-            className="flex-1"
-          />
-        </div>
 
-        {/* Scrollback Lines */}
-        <div className="space-y-3">
-          <div className="flex items-center justify-between">
-            <Label className="text-foreground font-medium">Scrollback Buffer</Label>
-            <span className="text-sm text-muted-foreground">
-              {(scrollbackLines / 1000).toFixed(0)}k lines
-            </span>
+          {/* Line Height */}
+          <div className="space-y-3">
+            <div className="flex items-center justify-between">
+              <Label className="text-foreground font-medium">Line Height</Label>
+              <span className="text-sm text-muted-foreground">{lineHeight.toFixed(1)}</span>
+            </div>
+            <Slider
+              value={[lineHeight]}
+              min={1.0}
+              max={2.0}
+              step={0.1}
+              onValueChange={([value]) => {
+                setTerminalLineHeight(value);
+              }}
+              onValueCommit={() => {
+                toast.info('Line height changed', {
+                  description: 'Restart terminal for changes to take effect',
+                });
+              }}
+              className="flex-1"
+            />
           </div>
-          <Slider
-            value={[scrollbackLines]}
-            min={1000}
-            max={100000}
-            step={1000}
-            onValueChange={([value]) => setTerminalScrollbackLines(value)}
-            onValueCommit={() => {
-              toast.info('Scrollback changed', {
-                description: 'Restart terminal for changes to take effect',
-              });
-            }}
-            className="flex-1"
-          />
-        </div>
 
-        {/* Default Run Script */}
-        <div className="space-y-3">
-          <Label className="text-foreground font-medium">Default Run Script</Label>
-          <p className="text-xs text-muted-foreground">
-            Command to run automatically when opening a new terminal (e.g., "claude", "codex")
-          </p>
-          <Input
-            value={defaultRunScript}
-            onChange={(e) => setTerminalDefaultRunScript(e.target.value)}
-            placeholder="e.g., claude, codex, npm run dev"
-            className="bg-accent/30 border-border/50"
-          />
-        </div>
+          {/* Scrollback Lines */}
+          <div className="space-y-3">
+            <div className="flex items-center justify-between">
+              <Label className="text-foreground font-medium">Scrollback Buffer</Label>
+              <span className="text-sm text-muted-foreground">
+                {(scrollbackLines / 1000).toFixed(0)}k lines
+              </span>
+            </div>
+            <Slider
+              value={[scrollbackLines]}
+              min={1000}
+              max={100000}
+              step={1000}
+              onValueChange={([value]) => setTerminalScrollbackLines(value)}
+              onValueCommit={() => {
+                toast.info('Scrollback changed', {
+                  description: 'Restart terminal for changes to take effect',
+                });
+              }}
+              className="flex-1"
+            />
+          </div>
 
-        {/* Screen Reader Mode */}
-        <div className="flex items-center justify-between">
-          <div className="space-y-1">
-            <Label className="text-foreground font-medium">Screen Reader Mode</Label>
+          {/* Default Run Script */}
+          <div className="space-y-3">
+            <Label className="text-foreground font-medium">Default Run Script</Label>
             <p className="text-xs text-muted-foreground">
-              Enable accessibility mode for screen readers
+              Command to run automatically when opening a new terminal (e.g., "claude", "codex")
             </p>
+            <Input
+              value={defaultRunScript}
+              onChange={(e) => setTerminalDefaultRunScript(e.target.value)}
+              placeholder="e.g., claude, codex, npm run dev"
+              className="bg-accent/30 border-border/50"
+            />
+          </div>
+
+          {/* Screen Reader Mode */}
+          <div className="flex items-center justify-between">
+            <div className="space-y-1">
+              <Label className="text-foreground font-medium">Screen Reader Mode</Label>
+              <p className="text-xs text-muted-foreground">
+                Enable accessibility mode for screen readers
+              </p>
+            </div>
+            <Switch
+              checked={screenReaderMode}
+              onCheckedChange={(checked) => {
+                setTerminalScreenReaderMode(checked);
+                toast.success(
+                  checked ? 'Screen reader mode enabled' : 'Screen reader mode disabled',
+                  {
+                    description: 'Restart terminal for changes to take effect',
+                  }
+                );
+              }}
+            />
           </div>
-          <Switch
-            checked={screenReaderMode}
-            onCheckedChange={(checked) => {
-              setTerminalScreenReaderMode(checked);
-              toast.success(
-                checked ? 'Screen reader mode enabled' : 'Screen reader mode disabled',
-                {
-                  description: 'Restart terminal for changes to take effect',
-                }
-              );
-            }}
-          />
         </div>
       </div>
 
-      {/* Custom Terminal Configurations */}
-      <div className="mt-6">
-        <TerminalConfigSection />
-      </div>
+      <TerminalConfigSection />
     </div>
   );
 }

From 19c48504c7125d04c2009c064ad06426eee55b1f Mon Sep 17 00:00:00 2001
From: DhanushSantosh <dhanushsantoshs05@gmail.com>
Date: Thu, 29 Jan 2026 16:23:33 +0530
Subject: [PATCH 20/20] fix: enable cross-platform Warp terminal detection

- Remove macOS-only platform restriction for Warp
- Add Linux CLI alias 'warp-terminal' (primary on Linux)
- Add CLI launch handler using --cwd flag
- Fixes issue where Warp was not detected on Linux systems

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 libs/platform/src/terminal.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/platform/src/terminal.ts b/libs/platform/src/terminal.ts
index 4bbe120ad..a9cbb0c49 100644
--- a/libs/platform/src/terminal.ts
+++ b/libs/platform/src/terminal.ts
@@ -140,9 +140,9 @@ const SUPPORTED_TERMINALS: TerminalDefinition[] = [
   {
     id: 'warp',
     name: 'Warp',
-    cliCommand: 'warp',
+    cliCommand: 'warp-cli',
+    cliAliases: ['warp-terminal', 'warp'],
     macAppName: 'Warp',
-    platform: 'darwin',
   },
   {
     id: 'ghostty',
@@ -476,6 +476,11 @@ async function executeTerminalCommand(terminal: TerminalInfo, targetPath: string
       await spawnDetached(command, [`--working-directory=${targetPath}`]);
       break;
 
+    case 'warp':
+      // Warp: uses --cwd flag (CLI mode, not app bundle)
+      await spawnDetached(command, ['--cwd', targetPath]);
+      break;
+
     case 'alacritty':
       // Alacritty: uses --working-directory flag
       await spawnDetached(command, ['--working-directory', targetPath]);