diff --git a/docs/users/configuration/settings.md b/docs/users/configuration/settings.md
index 85902eaf2..9cbbe0387 100644
--- a/docs/users/configuration/settings.md
+++ b/docs/users/configuration/settings.md
@@ -74,9 +74,6 @@ Settings are organized into categories. All settings should be placed within the
 | `ui.customThemes`                        | object           | Custom theme definitions.                                                                                                                                                                                                                                                                                                                                                                                           | `{}`        |
 | `ui.hideWindowTitle`                     | boolean          | Hide the window title bar.                                                                                                                                                                                                                                                                                                                                                                                          | `false`     |
 | `ui.hideTips`                            | boolean          | Hide helpful tips in the UI.                                                                                                                                                                                                                                                                                                                                                                                        | `false`     |
-| `ui.hideBanner`                          | boolean          | Hide the application banner.                                                                                                                                                                                                                                                                                                                                                                                        | `false`     |
-| `ui.hideFooter`                          | boolean          | Hide the footer from the UI.                                                                                                                                                                                                                                                                                                                                                                                        | `false`     |
-| `ui.showMemoryUsage`                     | boolean          | Display memory usage information in the UI.                                                                                                                                                                                                                                                                                                                                                                         | `false`     |
 | `ui.showLineNumbers`                     | boolean          | Show line numbers in code blocks in the CLI output.                                                                                                                                                                                                                                                                                                                                                                 | `true`      |
 | `ui.showCitations`                       | boolean          | Show citations for generated text in the chat.                                                                                                                                                                                                                                                                                                                                                                      | `true`      |
 | `enableWelcomeBack`                      | boolean          | Show welcome back dialog when returning to a project with conversation history. When enabled, Qwen Code will automatically detect if you're returning to a project with a previously generated project summary (`.qwen/PROJECT_SUMMARY.md`) and show a dialog allowing you to continue your previous conversation or start fresh. This feature integrates with the `/summary` command and quit confirmation dialog. | `true`      |
@@ -273,7 +270,6 @@ If you are experiencing performance issues with file searching (e.g., with `@` c
 | `tools.enableToolOutputTruncation`   | boolean           | Enable truncation of large tool outputs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `true`      | Requires restart: Yes                                                                                                                                                                                                                                |
 | `tools.truncateToolOutputThreshold`  | number            | Truncate tool output if it is larger than this many characters. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `25000`     | Requires restart: Yes                                                                                                                                                                                                                                |
 | `tools.truncateToolOutputLines`      | number            | Maximum lines or entries kept when truncating tool output. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `1000`      | Requires restart: Yes                                                                                                                                                                                                                                |
-| `tools.autoAccept`                   | boolean           | Controls whether the CLI automatically accepts and executes tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation. If set to `true`, the CLI will bypass the confirmation prompt for tools deemed safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `false`     |                                                                                                                                                                                                                                                      |
 
 #### mcp
 
@@ -361,7 +357,6 @@ Here is an example of a `settings.json` file with the nested structure, new as o
   },
   "ui": {
     "theme": "GitHub",
-    "hideBanner": true,
     "hideTips": false,
     "customWittyPhrases": [
       "You forget a thousand things every day. Make sure this is one of 'em",
diff --git a/docs/users/reference/keyboard-shortcuts.md b/docs/users/reference/keyboard-shortcuts.md
index b029c4a03..46f3c8c42 100644
--- a/docs/users/reference/keyboard-shortcuts.md
+++ b/docs/users/reference/keyboard-shortcuts.md
@@ -20,6 +20,7 @@ This document lists the available keyboard shortcuts in Qwen Code.
 | Shortcut                                           | Description                                                                                                                         |
 | -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
 | `!`                                                | Toggle shell mode when the input is empty.                                                                                          |
+| `?`                                                | Toggle keyboard shortcuts display when the input is empty.                                                                          |
 | `\` (at end of line) + `Enter`                     | Insert a newline.                                                                                                                   |
 | `Down Arrow`                                       | Navigate down through the input history.                                                                                            |
 | `Enter`                                            | Submit the current prompt.                                                                                                          |
@@ -38,6 +39,7 @@ This document lists the available keyboard shortcuts in Qwen Code.
 | `Ctrl+Left Arrow` / `Meta+Left Arrow` / `Meta+B`   | Move the cursor one word to the left.                                                                                               |
 | `Ctrl+N`                                           | Navigate down through the input history.                                                                                            |
 | `Ctrl+P`                                           | Navigate up through the input history.                                                                                              |
+| `Ctrl+R`                                           | Reverse search through input/shell history.                                                                                         |
 | `Ctrl+Right Arrow` / `Meta+Right Arrow` / `Meta+F` | Move the cursor one word to the right.                                                                                              |
 | `Ctrl+U`                                           | Delete from the cursor to the beginning of the line.                                                                                |
 | `Ctrl+V`                                           | Paste clipboard content. If the clipboard contains an image, it will be saved and a reference to it will be inserted in the prompt. |
diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts
index aa3e8b3b3..07b474af2 100644
--- a/packages/cli/src/config/config.test.ts
+++ b/packages/cli/src/config/config.test.ts
@@ -553,70 +553,6 @@ describe('loadCliConfig', () => {
     expect(config.getIncludePartialMessages()).toBe(true);
   });
 
-  it('should set showMemoryUsage to true when --show-memory-usage flag is present', async () => {
-    process.argv = ['node', 'script.js', '--show-memory-usage'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = {};
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(true);
-  });
-
-  it('should set showMemoryUsage to false when --memory flag is not present', async () => {
-    process.argv = ['node', 'script.js'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = {};
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(false);
-  });
-
-  it('should set showMemoryUsage to false by default from settings if CLI flag is not present', async () => {
-    process.argv = ['node', 'script.js'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = { ui: { showMemoryUsage: false } };
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(false);
-  });
-
-  it('should prioritize CLI flag over settings for showMemoryUsage (CLI true, settings false)', async () => {
-    process.argv = ['node', 'script.js', '--show-memory-usage'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = { ui: { showMemoryUsage: false } };
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(true);
-  });
-
   describe('Proxy configuration', () => {
     const originalProxyEnv: { [key: string]: string | undefined } = {};
     const proxyEnvVars = [
diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 818cc0122..018573393 100755
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -103,7 +103,6 @@ export interface CliArgs {
   prompt: string | undefined;
   promptInteractive: string | undefined;
   allFiles: boolean | undefined;
-  showMemoryUsage: boolean | undefined;
   yolo: boolean | undefined;
   approvalMode: string | undefined;
   telemetry: boolean | undefined;
@@ -296,11 +295,6 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           description: 'Include ALL files in context?',
           default: false,
         })
-        .option('show-memory-usage', {
-          type: 'boolean',
-          description: 'Show memory usage in status bar',
-          default: false,
-        })
         .option('yolo', {
           alias: 'y',
           type: 'boolean',
@@ -503,10 +497,6 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           ],
           description: 'Authentication type',
         })
-        .deprecateOption(
-          'show-memory-usage',
-          'Use the "ui.showMemoryUsage" setting in settings.json instead. This flag will be removed in a future version.',
-        )
         .deprecateOption(
           'sandbox-image',
           'Use the "tools.sandbox" setting in settings.json instead. This flag will be removed in a future version.',
@@ -1009,8 +999,6 @@ export async function loadCliConfig(
     userMemory: memoryContent,
     geminiMdFileCount: fileCount,
     approvalMode,
-    showMemoryUsage:
-      argv.showMemoryUsage || settings.ui?.showMemoryUsage || false,
     accessibility: {
       ...settings.ui?.accessibility,
       screenReader,
diff --git a/packages/cli/src/config/settings.test.ts b/packages/cli/src/config/settings.test.ts
index 6549f6f71..25a898393 100644
--- a/packages/cli/src/config/settings.test.ts
+++ b/packages/cli/src/config/settings.test.ts
@@ -2260,7 +2260,7 @@ describe('Settings Loading and Merging', () => {
           disableAutoUpdate: true,
         },
         ui: {
-          hideBanner: true,
+          hideTips: true,
           customThemes: {
             myTheme: {},
           },
@@ -2283,7 +2283,7 @@ describe('Settings Loading and Merging', () => {
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
         disableAutoUpdate: true,
-        hideBanner: true,
+        hideTips: true,
         customThemes: {
           myTheme: {},
         },
diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts
index 9d6e7c8e3..e6d62b5c5 100644
--- a/packages/cli/src/config/settings.ts
+++ b/packages/cli/src/config/settings.ts
@@ -90,13 +90,6 @@ const MIGRATION_MAP: Record<string, string> = {
   hideWindowTitle: 'ui.hideWindowTitle',
   showStatusInTitle: 'ui.showStatusInTitle',
   hideTips: 'ui.hideTips',
-  hideBanner: 'ui.hideBanner',
-  hideFooter: 'ui.hideFooter',
-  hideCWD: 'ui.footer.hideCWD',
-  hideSandboxStatus: 'ui.footer.hideSandboxStatus',
-  hideModelInfo: 'ui.footer.hideModelInfo',
-  hideContextSummary: 'ui.hideContextSummary',
-  showMemoryUsage: 'ui.showMemoryUsage',
   showLineNumbers: 'ui.showLineNumbers',
   showCitations: 'ui.showCitations',
   ideMode: 'ide.enabled',
diff --git a/packages/cli/src/config/settingsSchema.test.ts b/packages/cli/src/config/settingsSchema.test.ts
index 407d54414..adbc162b5 100644
--- a/packages/cli/src/config/settingsSchema.test.ts
+++ b/packages/cli/src/config/settingsSchema.test.ts
@@ -157,9 +157,6 @@ describe('SettingsSchema', () => {
 
     it('should have showInDialog property configured', () => {
       // Check that user-facing settings are marked for dialog display
-      expect(
-        getSettingsSchema().ui.properties.showMemoryUsage.showInDialog,
-      ).toBe(true);
       expect(getSettingsSchema().general.properties.vimMode.showInDialog).toBe(
         true,
       );
@@ -171,17 +168,14 @@ describe('SettingsSchema', () => {
       ).toBe(true);
       expect(
         getSettingsSchema().ui.properties.hideWindowTitle.showInDialog,
-      ).toBe(true);
+      ).toBe(false);
       expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe(
         true,
       );
-      expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe(
-        true,
-      );
       expect(
         getSettingsSchema().privacy.properties.usageStatisticsEnabled
           .showInDialog,
-      ).toBe(false);
+      ).toBe(true);
 
       // Check that advanced settings are hidden from dialog
       expect(getSettingsSchema().security.properties.auth.showInDialog).toBe(
@@ -194,7 +188,7 @@ describe('SettingsSchema', () => {
       expect(getSettingsSchema().telemetry.showInDialog).toBe(false);
 
       // Check that some settings are appropriately hidden
-      expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(false); // Changed to false
+      expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(true);
       expect(getSettingsSchema().ui.properties.customThemes.showInDialog).toBe(
         false,
       ); // Managed via theme editor
@@ -203,13 +197,13 @@ describe('SettingsSchema', () => {
       ).toBe(false); // Experimental feature
       expect(getSettingsSchema().ui.properties.accessibility.showInDialog).toBe(
         false,
-      ); // Changed to false
+      );
       expect(
         getSettingsSchema().context.properties.fileFiltering.showInDialog,
-      ).toBe(false); // Changed to false
+      ).toBe(false);
       expect(
         getSettingsSchema().general.properties.preferredEditor.showInDialog,
-      ).toBe(false); // Changed to false
+      ).toBe(true);
       expect(
         getSettingsSchema().advanced.properties.autoConfigureMemory
           .showInDialog,
@@ -287,7 +281,7 @@ describe('SettingsSchema', () => {
       expect(
         getSettingsSchema().security.properties.folderTrust.properties.enabled
           .showInDialog,
-      ).toBe(true);
+      ).toBe(false);
     });
 
     it('should have debugKeystrokeLogging setting in schema', () => {
@@ -310,7 +304,7 @@ describe('SettingsSchema', () => {
       expect(
         getSettingsSchema().general.properties.debugKeystrokeLogging
           .showInDialog,
-      ).toBe(true);
+      ).toBe(false);
       expect(
         getSettingsSchema().general.properties.debugKeystrokeLogging
           .description,
diff --git a/packages/cli/src/config/settingsSchema.ts b/packages/cli/src/config/settingsSchema.ts
index 3b0356ba8..116183216 100644
--- a/packages/cli/src/config/settingsSchema.ts
+++ b/packages/cli/src/config/settingsSchema.ts
@@ -132,7 +132,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: undefined as string | undefined,
         description: 'The preferred editor to open files in.',
-        showInDialog: false,
+        showInDialog: true,
       },
       vimMode: {
         type: 'boolean',
@@ -163,13 +163,13 @@ const SETTINGS_SCHEMA = {
       },
       gitCoAuthor: {
         type: 'boolean',
-        label: 'Git Co-Author',
+        label: 'Attribution: commit',
         category: 'General',
         requiresRestart: false,
         default: true,
         description:
           'Automatically add a Co-authored-by trailer to git commit messages when commits are made through Qwen Code.',
-        showInDialog: false,
+        showInDialog: true,
       },
       checkpointing: {
         type: 'object',
@@ -198,13 +198,13 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Enable debug logging of keystrokes to the console.',
-        showInDialog: true,
+        showInDialog: false,
       },
       language: {
         type: 'enum',
-        label: 'Language',
+        label: 'Language: UI',
         category: 'General',
-        requiresRestart: false,
+        requiresRestart: true,
         default: 'auto',
         description:
           'The language for the user interface. Use "auto" to detect from system settings. ' +
@@ -219,9 +219,20 @@ const SETTINGS_SCHEMA = {
           { value: 'de', label: 'Deutsch (German)' },
         ],
       },
+      outputLanguage: {
+        type: 'string',
+        label: 'Language: Model',
+        category: 'General',
+        requiresRestart: true,
+        default: 'auto',
+        description:
+          'The language for LLM output. Use "auto" to detect from system settings, ' +
+          'or set a specific language (e.g., "English", "中文", "日本語").',
+        showInDialog: true,
+      },
       terminalBell: {
         type: 'boolean',
-        label: 'Terminal Bell',
+        label: 'Terminal Bell Notification',
         category: 'General',
         requiresRestart: false,
         default: true,
@@ -257,7 +268,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: 'text',
         description: 'The format of the CLI output.',
-        showInDialog: true,
+        showInDialog: false,
         options: [
           { value: 'text', label: 'Text' },
           { value: 'json', label: 'JSON' },
@@ -280,9 +291,9 @@ const SETTINGS_SCHEMA = {
         label: 'Theme',
         category: 'UI',
         requiresRestart: false,
-        default: undefined as string | undefined,
+        default: 'Qwen Dark' as string,
         description: 'The color theme for the UI.',
-        showInDialog: false,
+        showInDialog: true,
       },
       customThemes: {
         type: 'object',
@@ -300,7 +311,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: false,
         description: 'Hide the window title bar',
-        showInDialog: true,
+        showInDialog: false,
       },
       showStatusInTitle: {
         type: 'boolean',
@@ -310,7 +321,7 @@ const SETTINGS_SCHEMA = {
         default: false,
         description:
           'Show Qwen Code status and thoughts in the terminal window title',
-        showInDialog: true,
+        showInDialog: false,
       },
       hideTips: {
         type: 'boolean',
@@ -321,89 +332,13 @@ const SETTINGS_SCHEMA = {
         description: 'Hide helpful tips in the UI',
         showInDialog: true,
       },
-      hideBanner: {
-        type: 'boolean',
-        label: 'Hide Banner',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description: 'Hide the application banner',
-        showInDialog: true,
-      },
-      hideContextSummary: {
-        type: 'boolean',
-        label: 'Hide Context Summary',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Hide the context summary (QWEN.md, MCP servers) above the input.',
-        showInDialog: true,
-      },
-      footer: {
-        type: 'object',
-        label: 'Footer',
-        category: 'UI',
-        requiresRestart: false,
-        default: {},
-        description: 'Settings for the footer.',
-        showInDialog: false,
-        properties: {
-          hideCWD: {
-            type: 'boolean',
-            label: 'Hide CWD',
-            category: 'UI',
-            requiresRestart: false,
-            default: false,
-            description:
-              'Hide the current working directory path in the footer.',
-            showInDialog: true,
-          },
-          hideSandboxStatus: {
-            type: 'boolean',
-            label: 'Hide Sandbox Status',
-            category: 'UI',
-            requiresRestart: false,
-            default: false,
-            description: 'Hide the sandbox status indicator in the footer.',
-            showInDialog: true,
-          },
-          hideModelInfo: {
-            type: 'boolean',
-            label: 'Hide Model Info',
-            category: 'UI',
-            requiresRestart: false,
-            default: false,
-            description: 'Hide the model name and context usage in the footer.',
-            showInDialog: true,
-          },
-        },
-      },
-      hideFooter: {
-        type: 'boolean',
-        label: 'Hide Footer',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description: 'Hide the footer from the UI',
-        showInDialog: true,
-      },
-      showMemoryUsage: {
-        type: 'boolean',
-        label: 'Show Memory Usage',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description: 'Display memory usage information in the UI',
-        showInDialog: true,
-      },
       showLineNumbers: {
         type: 'boolean',
-        label: 'Show Line Numbers',
+        label: 'Show Line Numbers in Code',
         category: 'UI',
         requiresRestart: false,
         default: false,
-        description: 'Show line numbers in the chat.',
+        description: 'Show line numbers in the code output.',
         showInDialog: true,
       },
       showCitations: {
@@ -413,7 +348,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Show citations for generated text in the chat.',
-        showInDialog: true,
+        showInDialog: false,
       },
       customWittyPhrases: {
         type: 'array',
@@ -426,7 +361,7 @@ const SETTINGS_SCHEMA = {
       },
       enableWelcomeBack: {
         type: 'boolean',
-        label: 'Enable Welcome Back',
+        label: 'Show Welcome Back Dialog',
         category: 'UI',
         requiresRestart: false,
         default: true,
@@ -460,7 +395,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Disable loading phrases for accessibility',
-            showInDialog: true,
+            showInDialog: false,
           },
           screenReader: {
             type: 'boolean',
@@ -470,7 +405,7 @@ const SETTINGS_SCHEMA = {
             default: undefined as boolean | undefined,
             description:
               'Render output in plain-text to be more screen reader accessible',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
@@ -497,7 +432,7 @@ const SETTINGS_SCHEMA = {
     properties: {
       enabled: {
         type: 'boolean',
-        label: 'IDE Mode',
+        label: 'Auto-connect to IDE',
         category: 'IDE',
         requiresRestart: true,
         default: false,
@@ -532,7 +467,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: true,
         description: 'Enable collection of usage statistics',
-        showInDialog: false,
+        showInDialog: true,
       },
     },
   },
@@ -573,7 +508,7 @@ const SETTINGS_SCHEMA = {
         default: -1,
         description:
           'Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.',
-        showInDialog: true,
+        showInDialog: false,
       },
       summarizeToolOutput: {
         type: 'object',
@@ -611,7 +546,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: true,
         description: 'Skip the next speaker check.',
-        showInDialog: true,
+        showInDialog: false,
       },
       skipLoopDetection: {
         type: 'boolean',
@@ -620,7 +555,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Disable all loop detection checks (streaming and LLM).',
-        showInDialog: true,
+        showInDialog: false,
       },
       skipStartupContext: {
         type: 'boolean',
@@ -630,7 +565,7 @@ const SETTINGS_SCHEMA = {
         default: false,
         description:
           'Avoid sending the workspace startup context at the beginning of each session.',
-        showInDialog: true,
+        showInDialog: false,
       },
       enableOpenAILogging: {
         type: 'boolean',
@@ -639,7 +574,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Enable OpenAI logging.',
-        showInDialog: true,
+        showInDialog: false,
       },
       openAILoggingDir: {
         type: 'string',
@@ -649,7 +584,7 @@ const SETTINGS_SCHEMA = {
         default: undefined as string | undefined,
         description:
           'Custom directory path for OpenAI API logs. If not specified, defaults to logs/openai in the current working directory.',
-        showInDialog: true,
+        showInDialog: false,
       },
       generationConfig: {
         type: 'object',
@@ -669,7 +604,7 @@ const SETTINGS_SCHEMA = {
             description: 'Request timeout in milliseconds.',
             parentKey: 'generationConfig',
             childKey: 'timeout',
-            showInDialog: true,
+            showInDialog: false,
           },
           maxRetries: {
             type: 'number',
@@ -680,7 +615,7 @@ const SETTINGS_SCHEMA = {
             description: 'Maximum number of retries for failed requests.',
             parentKey: 'generationConfig',
             childKey: 'maxRetries',
-            showInDialog: true,
+            showInDialog: false,
           },
           disableCacheControl: {
             type: 'boolean',
@@ -691,7 +626,7 @@ const SETTINGS_SCHEMA = {
             description: 'Disable cache control for DashScope providers.',
             parentKey: 'generationConfig',
             childKey: 'disableCacheControl',
-            showInDialog: true,
+            showInDialog: false,
           },
           schemaCompliance: {
             type: 'enum',
@@ -703,7 +638,7 @@ const SETTINGS_SCHEMA = {
               'The compliance mode for tool schemas sent to the model. Use "openapi_30" for strict OpenAPI 3.0 compatibility (e.g., for Gemini).',
             parentKey: 'generationConfig',
             childKey: 'schemaCompliance',
-            showInDialog: true,
+            showInDialog: false,
             options: [
               { value: 'auto', label: 'Auto (Default)' },
               { value: 'openapi_30', label: 'OpenAPI 3.0 Strict' },
@@ -759,7 +694,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Whether to load memory files from include directories.',
-        showInDialog: true,
+        showInDialog: false,
       },
       fileFiltering: {
         type: 'object',
@@ -795,7 +730,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: true,
             description: 'Enable recursive file search functionality',
-            showInDialog: true,
+            showInDialog: false,
           },
           disableFuzzySearch: {
             type: 'boolean',
@@ -804,7 +739,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Disable fuzzy search when searching for files.',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
@@ -841,7 +776,7 @@ const SETTINGS_SCHEMA = {
         properties: {
           enableInteractiveShell: {
             type: 'boolean',
-            label: 'Enable Interactive Shell',
+            label: 'Interactive Shell (PTY)',
             category: 'Tools',
             requiresRestart: true,
             default: false,
@@ -866,20 +801,10 @@ const SETTINGS_SCHEMA = {
             requiresRestart: false,
             default: false,
             description: 'Show color in shell output.',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
-      autoAccept: {
-        type: 'boolean',
-        label: 'Auto Accept',
-        category: 'Tools',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).',
-        showInDialog: true,
-      },
       core: {
         type: 'array',
         label: 'Core Tools',
@@ -911,7 +836,7 @@ const SETTINGS_SCHEMA = {
       },
       approvalMode: {
         type: 'enum',
-        label: 'Approval Mode',
+        label: 'Tool Approval Mode',
         category: 'Tools',
         requiresRestart: false,
         default: ApprovalMode.DEFAULT,
@@ -925,6 +850,16 @@ const SETTINGS_SCHEMA = {
           { value: ApprovalMode.YOLO, label: 'YOLO' },
         ],
       },
+      autoAccept: {
+        type: 'boolean',
+        label: 'Auto Accept',
+        category: 'Tools',
+        requiresRestart: false,
+        default: false,
+        description:
+          'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation.',
+        showInDialog: false,
+      },
       discoveryCommand: {
         type: 'string',
         label: 'Tool Discovery Command',
@@ -951,7 +886,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.',
-        showInDialog: true,
+        showInDialog: false,
       },
       useBuiltinRipgrep: {
         type: 'boolean',
@@ -961,7 +896,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Use the bundled ripgrep binary. When set to false, the system-level "rg" command will be used instead. This setting is only effective when useRipgrep is true.',
-        showInDialog: true,
+        showInDialog: false,
       },
       enableToolOutputTruncation: {
         type: 'boolean',
@@ -970,7 +905,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: true,
         description: 'Enable truncation of large tool outputs.',
-        showInDialog: true,
+        showInDialog: false,
       },
       truncateToolOutputThreshold: {
         type: 'number',
@@ -980,7 +915,7 @@ const SETTINGS_SCHEMA = {
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
         description:
           'Truncate tool output if it is larger than this many characters. Set to -1 to disable.',
-        showInDialog: true,
+        showInDialog: false,
       },
       truncateToolOutputLines: {
         type: 'number',
@@ -989,7 +924,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
         description: 'The number of lines to keep when truncating tool output.',
-        showInDialog: true,
+        showInDialog: false,
       },
     },
   },
@@ -1066,7 +1001,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Setting to track whether Folder trust is enabled.',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
@@ -1219,7 +1154,7 @@ const SETTINGS_SCHEMA = {
     properties: {
       skills: {
         type: 'boolean',
-        label: 'Skills',
+        label: 'Experimental: Skills',
         category: 'Experimental',
         requiresRestart: true,
         default: false,
@@ -1244,7 +1179,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Enable vision model support and auto-switching functionality. When disabled, vision models like qwen-vl-max-latest will be hidden and auto-switching will not occur.',
-        showInDialog: true,
+        showInDialog: false,
       },
       vlmSwitchMode: {
         type: 'string',
@@ -1312,9 +1247,3 @@ type InferSettings<T extends SettingsSchema> = {
 };
 
 export type Settings = InferSettings<SettingsSchemaType>;
-
-export interface FooterSettings {
-  hideCWD?: boolean;
-  hideSandboxStatus?: boolean;
-  hideModelInfo?: boolean;
-}
diff --git a/packages/cli/src/core/initializer.ts b/packages/cli/src/core/initializer.ts
index 56f65b1c5..c21d637e3 100644
--- a/packages/cli/src/core/initializer.ts
+++ b/packages/cli/src/core/initializer.ts
@@ -15,7 +15,7 @@ import { type LoadedSettings, SettingScope } from '../config/settings.js';
 import { performInitialAuth } from './auth.js';
 import { validateTheme } from './theme.js';
 import { initializeI18n } from '../i18n/index.js';
-import { initializeLlmOutputLanguage } from '../ui/commands/languageCommand.js';
+import { initializeLlmOutputLanguage } from '../utils/languageUtils.js';
 
 export interface InitializationResult {
   authError: string | null;
@@ -43,7 +43,7 @@ export async function initializeApp(
   await initializeI18n(languageSetting);
 
   // Auto-detect and set LLM output language on first use
-  initializeLlmOutputLanguage();
+  initializeLlmOutputLanguage(settings.merged.general?.outputLanguage);
 
   // Use authType from modelsConfig which respects CLI --auth-type argument
   // over settings.security.auth.selectedType
diff --git a/packages/cli/src/gemini.test.tsx b/packages/cli/src/gemini.test.tsx
index c2f971ec4..84a1b175d 100644
--- a/packages/cli/src/gemini.test.tsx
+++ b/packages/cli/src/gemini.test.tsx
@@ -456,7 +456,6 @@ describe('gemini.tsx main function kitty protocol', () => {
       promptInteractive: undefined,
       query: undefined,
       allFiles: undefined,
-      showMemoryUsage: undefined,
       yolo: undefined,
       approvalMode: undefined,
       telemetry: undefined,
diff --git a/packages/cli/src/i18n/locales/de.js b/packages/cli/src/i18n/locales/de.js
index d358811cf..cf383708b 100644
--- a/packages/cli/src/i18n/locales/de.js
+++ b/packages/cli/src/i18n/locales/de.js
@@ -60,10 +60,15 @@ export default {
   'show version info': 'Versionsinformationen anzeigen',
   'submit a bug report': 'Fehlerbericht einreichen',
   'About Qwen Code': 'Über Qwen Code',
+  Status: 'Status',
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: 'Laufzeit',
+  OS: 'Betriebssystem',
+  Auth: 'Authentifizierung',
   'CLI Version': 'CLI-Version',
   'Git Commit': 'Git-Commit',
   Model: 'Modell',
@@ -76,6 +81,7 @@ export default {
   'Session ID': 'Sitzungs-ID',
   'Auth Method': 'Authentifizierungsmethode',
   'Base URL': 'Basis-URL',
+  Proxy: 'Proxy',
   'Memory Usage': 'Speichernutzung',
   'IDE Client': 'IDE-Client',
 
@@ -97,8 +103,8 @@ export default {
   Preview: 'Vorschau',
   '(Use Enter to select, Tab to configure scope)':
     '(Enter zum Auswählen, Tab zum Konfigurieren des Bereichs)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Enter zum Anwenden des Bereichs, Tab zum Auswählen des Designs)',
+  '(Use Enter to apply scope, Tab to go back)':
+    '(Enter zum Anwenden des Bereichs, Tab zum Zurückgehen)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Design-Konfiguration aufgrund der NO_COLOR-Umgebungsvariable nicht verfügbar.',
   'Theme "{{themeName}}" not found.': 'Design "{{themeName}}" nicht gefunden.',
@@ -260,8 +266,6 @@ export default {
   'View and edit Qwen Code settings':
     'Qwen Code Einstellungen anzeigen und bearbeiten',
   Settings: 'Einstellungen',
-  '(Use Enter to select{{tabText}})': '(Enter zum Auswählen{{tabText}})',
-  ', Tab to change focus': ', Tab zum Fokuswechsel',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'Um Änderungen zu sehen, muss Qwen Code neu gestartet werden. Drücken Sie r, um jetzt zu beenden und Änderungen anzuwenden.',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -271,24 +275,24 @@ export default {
   // ============================================================================
   'Vim Mode': 'Vim-Modus',
   'Disable Auto Update': 'Automatische Updates deaktivieren',
+  'Attribution: commit': 'Attribution: Commit',
+  'Terminal Bell Notification': 'Terminal-Signalton',
+  'Enable Usage Statistics': 'Nutzungsstatistiken aktivieren',
+  Theme: 'Farbschema',
+  'Preferred Editor': 'Bevorzugter Editor',
+  'Auto-connect to IDE': 'Automatische Verbindung zur IDE',
   'Enable Prompt Completion': 'Eingabevervollständigung aktivieren',
   'Debug Keystroke Logging': 'Debug-Protokollierung von Tastatureingaben',
-  Language: 'Sprache',
+  'Language: UI': 'Sprache: Benutzeroberfläche',
+  'Language: Model': 'Sprache: Modell',
   'Output Format': 'Ausgabeformat',
   'Hide Window Title': 'Fenstertitel ausblenden',
   'Show Status in Title': 'Status im Titel anzeigen',
   'Hide Tips': 'Tipps ausblenden',
-  'Hide Banner': 'Banner ausblenden',
-  'Hide Context Summary': 'Kontextzusammenfassung ausblenden',
-  'Hide CWD': 'Arbeitsverzeichnis ausblenden',
-  'Hide Sandbox Status': 'Sandbox-Status ausblenden',
-  'Hide Model Info': 'Modellinformationen ausblenden',
-  'Hide Footer': 'Fußzeile ausblenden',
-  'Show Memory Usage': 'Speichernutzung anzeigen',
-  'Show Line Numbers': 'Zeilennummern anzeigen',
+  'Show Line Numbers in Code': 'Zeilennummern im Code anzeigen',
   'Show Citations': 'Quellenangaben anzeigen',
   'Custom Witty Phrases': 'Benutzerdefinierte Witzige Sprüche',
-  'Enable Welcome Back': 'Willkommen-zurück aktivieren',
+  'Show Welcome Back Dialog': 'Willkommen-zurück-Dialog anzeigen',
   'Enable User Feedback': 'Benutzerfeedback aktivieren',
   'How is Qwen doing this session? (optional)':
     'Wie macht sich Qwen in dieser Sitzung? (optional)',
@@ -315,7 +319,7 @@ export default {
   'Respect .qwenignore': '.qwenignore beachten',
   'Enable Recursive File Search': 'Rekursive Dateisuche aktivieren',
   'Disable Fuzzy Search': 'Unscharfe Suche deaktivieren',
-  'Enable Interactive Shell': 'Interaktive Shell aktivieren',
+  'Interactive Shell (PTY)': 'Interaktive Shell (PTY)',
   'Show Color': 'Farbe anzeigen',
   'Auto Accept': 'Automatisch akzeptieren',
   'Use Ripgrep': 'Ripgrep verwenden',
@@ -327,6 +331,7 @@ export default {
   'Folder Trust': 'Ordnervertrauen',
   'Vision Model Preview': 'Vision-Modell-Vorschau',
   'Tool Schema Compliance': 'Werkzeug-Schema-Konformität',
+  'Experimental: Skills': 'Experimentell: Fähigkeiten',
   // Settings enum options
   'Auto (detect from system)': 'Automatisch (vom System erkennen)',
   Text: 'Text',
@@ -351,6 +356,11 @@ export default {
   'Show all directories in the workspace':
     'Alle Verzeichnisse im Arbeitsbereich anzeigen',
   'set external editor preference': 'Externen Editor festlegen',
+  'Select Editor': 'Editor auswählen',
+  'Editor Preference': 'Editor-Einstellung',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    'Diese Editoren werden derzeit unterstützt. Bitte beachten Sie, dass einige Editoren nicht im Sandbox-Modus verwendet werden können.',
+  'Your preferred editor is:': 'Ihr bevorzugter Editor ist:',
   'Manage extensions': 'Erweiterungen verwalten',
   'List active extensions': 'Aktive Erweiterungen auflisten',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -419,6 +429,8 @@ export default {
   'Example: /language output English': 'Beispiel: /language output English',
   'Example: /language output 日本語': 'Beispiel: /language output Japanisch',
   'UI language changed to {{lang}}': 'UI-Sprache geändert zu {{lang}}',
+  'LLM output language set to {{lang}}':
+    'LLM-Ausgabesprache auf {{lang}} gesetzt',
   'LLM output language rule file generated at {{path}}':
     'LLM-Ausgabesprach-Regeldatei generiert unter {{path}}',
   'Please restart the application for the changes to take effect.':
@@ -441,7 +453,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Approval Mode': 'Genehmigungsmodus',
+  'Tool Approval Mode': 'Werkzeug-Genehmigungsmodus',
   'Current approval mode: {{mode}}': 'Aktueller Genehmigungsmodus: {{mode}}',
   'Available approval modes:': 'Verfügbare Genehmigungsmodi:',
   'Approval mode changed to: {{mode}}':
@@ -483,8 +495,6 @@ export default {
   'Automatically approve all tools': 'Alle Werkzeuge automatisch genehmigen',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     'Arbeitsbereich-Genehmigungsmodus existiert und hat Vorrang. Benutzerebene-Änderung hat keine Wirkung.',
-  '(Use Enter to select, Tab to change focus)':
-    '(Enter zum Auswählen, Tab zum Fokuswechsel)',
   'Apply To': 'Anwenden auf',
   'User Settings': 'Benutzereinstellungen',
   'Workspace Settings': 'Arbeitsbereich-Einstellungen',
diff --git a/packages/cli/src/i18n/locales/en.js b/packages/cli/src/i18n/locales/en.js
index e3287731d..475d19d61 100644
--- a/packages/cli/src/i18n/locales/en.js
+++ b/packages/cli/src/i18n/locales/en.js
@@ -33,6 +33,25 @@ export default {
   'Model Context Protocol command (from external servers)':
     'Model Context Protocol command (from external servers)',
   'Keyboard Shortcuts:': 'Keyboard Shortcuts:',
+  'Toggle this help display': 'Toggle this help display',
+  'Toggle shell mode': 'Toggle shell mode',
+  'Open command menu': 'Open command menu',
+  'Add file context': 'Add file context',
+  'Accept suggestion / Autocomplete': 'Accept suggestion / Autocomplete',
+  'Reverse search history': 'Reverse search history',
+  'Press ? again to close': 'Press ? again to close',
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': 'for shell mode',
+  'for commands': 'for commands',
+  'for file paths': 'for file paths',
+  'to clear input': 'to clear input',
+  'to cycle approvals': 'to cycle approvals',
+  'to quit': 'to quit',
+  'for newline': 'for newline',
+  'to clear screen': 'to clear screen',
+  'to search history': 'to search history',
+  'to paste images': 'to paste images',
+  'for external editor': 'for external editor',
   'Jump through words in the input': 'Jump through words in the input',
   'Close dialogs, cancel requests, or quit application':
     'Close dialogs, cancel requests, or quit application',
@@ -46,6 +65,7 @@ export default {
   'Connecting to MCP servers... ({{connected}}/{{total}})':
     'Connecting to MCP servers... ({{connected}}/{{total}})',
   'Type your message or @path/to/file': 'Type your message or @path/to/file',
+  '? for shortcuts': '? for shortcuts',
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.",
   'Cancel operation / Clear input (double press)':
@@ -59,10 +79,15 @@ export default {
   'show version info': 'show version info',
   'submit a bug report': 'submit a bug report',
   'About Qwen Code': 'About Qwen Code',
+  Status: 'Status',
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: 'Runtime',
+  OS: 'OS',
+  Auth: 'Auth',
   'CLI Version': 'CLI Version',
   'Git Commit': 'Git Commit',
   Model: 'Model',
@@ -75,6 +100,7 @@ export default {
   'Session ID': 'Session ID',
   'Auth Method': 'Auth Method',
   'Base URL': 'Base URL',
+  Proxy: 'Proxy',
   'Memory Usage': 'Memory Usage',
   'IDE Client': 'IDE Client',
 
@@ -98,8 +124,8 @@ export default {
   Preview: 'Preview',
   '(Use Enter to select, Tab to configure scope)':
     '(Use Enter to select, Tab to configure scope)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Use Enter to apply scope, Tab to select theme)',
+  '(Use Enter to apply scope, Tab to go back)':
+    '(Use Enter to apply scope, Tab to go back)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Theme configuration unavailable due to NO_COLOR env variable.',
   'Theme "{{themeName}}" not found.': 'Theme "{{themeName}}" not found.',
@@ -257,8 +283,6 @@ export default {
   // ============================================================================
   'View and edit Qwen Code settings': 'View and edit Qwen Code settings',
   Settings: 'Settings',
-  '(Use Enter to select{{tabText}})': '(Use Enter to select{{tabText}})',
-  ', Tab to change focus': ', Tab to change focus',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -268,24 +292,24 @@ export default {
   // ============================================================================
   'Vim Mode': 'Vim Mode',
   'Disable Auto Update': 'Disable Auto Update',
+  'Attribution: commit': 'Attribution: commit',
+  'Terminal Bell Notification': 'Terminal Bell Notification',
+  'Enable Usage Statistics': 'Enable Usage Statistics',
+  Theme: 'Theme',
+  'Preferred Editor': 'Preferred Editor',
+  'Auto-connect to IDE': 'Auto-connect to IDE',
   'Enable Prompt Completion': 'Enable Prompt Completion',
   'Debug Keystroke Logging': 'Debug Keystroke Logging',
-  Language: 'Language',
+  'Language: UI': 'Language: UI',
+  'Language: Model': 'Language: Model',
   'Output Format': 'Output Format',
   'Hide Window Title': 'Hide Window Title',
   'Show Status in Title': 'Show Status in Title',
   'Hide Tips': 'Hide Tips',
-  'Hide Banner': 'Hide Banner',
-  'Hide Context Summary': 'Hide Context Summary',
-  'Hide CWD': 'Hide CWD',
-  'Hide Sandbox Status': 'Hide Sandbox Status',
-  'Hide Model Info': 'Hide Model Info',
-  'Hide Footer': 'Hide Footer',
-  'Show Memory Usage': 'Show Memory Usage',
-  'Show Line Numbers': 'Show Line Numbers',
+  'Show Line Numbers in Code': 'Show Line Numbers in Code',
   'Show Citations': 'Show Citations',
   'Custom Witty Phrases': 'Custom Witty Phrases',
-  'Enable Welcome Back': 'Enable Welcome Back',
+  'Show Welcome Back Dialog': 'Show Welcome Back Dialog',
   'Enable User Feedback': 'Enable User Feedback',
   'How is Qwen doing this session? (optional)':
     'How is Qwen doing this session? (optional)',
@@ -312,7 +336,7 @@ export default {
   'Respect .qwenignore': 'Respect .qwenignore',
   'Enable Recursive File Search': 'Enable Recursive File Search',
   'Disable Fuzzy Search': 'Disable Fuzzy Search',
-  'Enable Interactive Shell': 'Enable Interactive Shell',
+  'Interactive Shell (PTY)': 'Interactive Shell (PTY)',
   'Show Color': 'Show Color',
   'Auto Accept': 'Auto Accept',
   'Use Ripgrep': 'Use Ripgrep',
@@ -323,6 +347,7 @@ export default {
   'Folder Trust': 'Folder Trust',
   'Vision Model Preview': 'Vision Model Preview',
   'Tool Schema Compliance': 'Tool Schema Compliance',
+  'Experimental: Skills': 'Experimental: Skills',
   // Settings enum options
   'Auto (detect from system)': 'Auto (detect from system)',
   Text: 'Text',
@@ -347,6 +372,11 @@ export default {
   'Show all directories in the workspace':
     'Show all directories in the workspace',
   'set external editor preference': 'set external editor preference',
+  'Select Editor': 'Select Editor',
+  'Editor Preference': 'Editor Preference',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.',
+  'Your preferred editor is:': 'Your preferred editor is:',
   'Manage extensions': 'Manage extensions',
   'List active extensions': 'List active extensions',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -413,6 +443,7 @@ export default {
   'Example: /language output English': 'Example: /language output English',
   'Example: /language output 日本語': 'Example: /language output 日本語',
   'UI language changed to {{lang}}': 'UI language changed to {{lang}}',
+  'LLM output language set to {{lang}}': 'LLM output language set to {{lang}}',
   'LLM output language rule file generated at {{path}}':
     'LLM output language rule file generated at {{path}}',
   'Please restart the application for the changes to take effect.':
@@ -434,7 +465,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Approval Mode': 'Approval Mode',
+  'Tool Approval Mode': 'Tool Approval Mode',
   'Current approval mode: {{mode}}': 'Current approval mode: {{mode}}',
   'Available approval modes:': 'Available approval modes:',
   'Approval mode changed to: {{mode}}': 'Approval mode changed to: {{mode}}',
@@ -473,8 +504,6 @@ export default {
   'Automatically approve all tools': 'Automatically approve all tools',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     'Workspace approval mode exists and takes priority. User-level change will have no effect.',
-  '(Use Enter to select, Tab to change focus)':
-    '(Use Enter to select, Tab to change focus)',
   'Apply To': 'Apply To',
   'User Settings': 'User Settings',
   'Workspace Settings': 'Workspace Settings',
@@ -898,14 +927,23 @@ export default {
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips for getting started:': 'Tips for getting started:',
-  '1. Ask questions, edit files, or run commands.':
-    '1. Ask questions, edit files, or run commands.',
-  '2. Be specific for the best results.':
-    '2. Be specific for the best results.',
-  'files to customize your interactions with Qwen Code.':
-    'files to customize your interactions with Qwen Code.',
-  'for more information.': 'for more information.',
+  'Tips:': 'Tips:',
+  'Use /compress when the conversation gets long to summarize history and free up context.':
+    'Use /compress when the conversation gets long to summarize history and free up context.',
+  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
+    'Start a fresh idea with /clear or /new; the previous session stays available in history.',
+  'Use /bug to submit issues to the maintainers when something goes off.':
+    'Use /bug to submit issues to the maintainers when something goes off.',
+  'Switch auth type quickly with /auth.':
+    'Switch auth type quickly with /auth.',
+  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
+    'You can run any shell commands from Qwen Code using ! (e.g. !ls).',
+  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
+    'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.',
+  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
+    'You can resume a previous conversation by running qwen --continue or qwen --resume.',
+  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
+    'You can switch permission mode quickly with Shift+Tab or /approval-mode.',
 
   // ============================================================================
   // Exit Screen / Stats
diff --git a/packages/cli/src/i18n/locales/ru.js b/packages/cli/src/i18n/locales/ru.js
index a91cd0d44..e20422474 100644
--- a/packages/cli/src/i18n/locales/ru.js
+++ b/packages/cli/src/i18n/locales/ru.js
@@ -33,6 +33,13 @@ export default {
   'Model Context Protocol command (from external servers)':
     'Команда Model Context Protocol (из внешних серверов)',
   'Keyboard Shortcuts:': 'Горячие клавиши:',
+  'Toggle this help display': 'Показать/скрыть эту справку',
+  'Toggle shell mode': 'Переключить режим оболочки',
+  'Open command menu': 'Открыть меню команд',
+  'Add file context': 'Добавить файл в контекст',
+  'Accept suggestion / Autocomplete': 'Принять подсказку / Автодополнение',
+  'Reverse search history': 'Обратный поиск по истории',
+  'Press ? again to close': 'Нажмите ? ещё раз, чтобы закрыть',
   'Jump through words in the input': 'Переход по словам во вводе',
   'Close dialogs, cancel requests, or quit application':
     'Закрыть диалоги, отменить запросы или выйти из приложения',
@@ -46,6 +53,7 @@ export default {
   'Connecting to MCP servers... ({{connected}}/{{total}})':
     'Подключение к MCP-серверам... ({{connected}}/{{total}})',
   'Type your message or @path/to/file': 'Введите сообщение или @путь/к/файлу',
+  '? for shortcuts': '? — горячие клавиши',
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Нажмите 'i' для режима ВСТАВКА и 'Esc' для ОБЫЧНОГО режима.",
   'Cancel operation / Clear input (double press)':
@@ -59,10 +67,28 @@ export default {
   'show version info': 'Просмотр информации о версии',
   'submit a bug report': 'Отправка отчёта об ошибке',
   'About Qwen Code': 'Об Qwen Code',
+  Status: 'Статус',
+
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': 'режим оболочки',
+  'for commands': 'меню команд',
+  'for file paths': 'пути к файлам',
+  'to clear input': 'очистить ввод',
+  'to cycle approvals': 'переключить режим',
+  'to quit': 'выход',
+  'for newline': 'новая строка',
+  'to clear screen': 'очистить экран',
+  'to search history': 'поиск в истории',
+  'to paste images': 'вставить изображения',
+  'for external editor': 'внешний редактор',
 
   // ============================================================================
   // Поля системной информации
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: 'Среда выполнения',
+  OS: 'ОС',
+  Auth: 'Аутентификация',
   'CLI Version': 'Версия CLI',
   'Git Commit': 'Git-коммит',
   Model: 'Модель',
@@ -75,6 +101,7 @@ export default {
   'Session ID': 'ID сессии',
   'Auth Method': 'Метод авторизации',
   'Base URL': 'Базовый URL',
+  Proxy: 'Прокси',
   'Memory Usage': 'Использование памяти',
   'IDE Client': 'Клиент IDE',
 
@@ -100,8 +127,8 @@ export default {
   Preview: 'Предпросмотр',
   '(Use Enter to select, Tab to configure scope)':
     '(Enter для выбора, Tab для настройки области)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Enter для применения области, Tab для выбора темы)',
+  '(Use Enter to apply scope, Tab to go back)':
+    '(Enter для применения области, Tab для возврата)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Настройка темы недоступна из-за переменной окружения NO_COLOR.',
   'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.',
@@ -260,8 +287,6 @@ export default {
   // ============================================================================
   'View and edit Qwen Code settings': 'Просмотр и изменение настроек Qwen Code',
   Settings: 'Настройки',
-  '(Use Enter to select{{tabText}})': '(Enter для выбора{{tabText}})',
-  ', Tab to change focus': ', Tab для смены фокуса',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'Для применения изменений необходимо перезапустить Qwen Code. Нажмите r для выхода и применения изменений.',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -271,24 +296,24 @@ export default {
   // ============================================================================
   'Vim Mode': 'Режим Vim',
   'Disable Auto Update': 'Отключить автообновление',
+  'Attribution: commit': 'Атрибуция: коммит',
+  'Terminal Bell Notification': 'Звуковое уведомление терминала',
+  'Enable Usage Statistics': 'Включить сбор статистики использования',
+  Theme: 'Тема',
+  'Preferred Editor': 'Предпочтительный редактор',
+  'Auto-connect to IDE': 'Автоподключение к IDE',
   'Enable Prompt Completion': 'Включить автодополнение промптов',
   'Debug Keystroke Logging': 'Логирование нажатий клавиш для отладки',
-  Language: 'Язык',
+  'Language: UI': 'Язык: интерфейс',
+  'Language: Model': 'Язык: модель',
   'Output Format': 'Формат вывода',
   'Hide Window Title': 'Скрыть заголовок окна',
   'Show Status in Title': 'Показывать статус в заголовке',
   'Hide Tips': 'Скрыть подсказки',
-  'Hide Banner': 'Скрыть баннер',
-  'Hide Context Summary': 'Скрыть сводку контекста',
-  'Hide CWD': 'Скрыть текущую директорию',
-  'Hide Sandbox Status': 'Скрыть статус песочницы',
-  'Hide Model Info': 'Скрыть информацию о модели',
-  'Hide Footer': 'Скрыть нижний колонтитул',
-  'Show Memory Usage': 'Показывать использование памяти',
-  'Show Line Numbers': 'Показывать номера строк',
+  'Show Line Numbers in Code': 'Показывать номера строк в коде',
   'Show Citations': 'Показывать цитаты',
   'Custom Witty Phrases': 'Пользовательские остроумные фразы',
-  'Enable Welcome Back': 'Включить приветствие при возврате',
+  'Show Welcome Back Dialog': 'Показывать диалог приветствия',
   'Enable User Feedback': 'Включить отзывы пользователей',
   'How is Qwen doing this session? (optional)':
     'Как дела у Qwen в этой сессии? (необязательно)',
@@ -315,7 +340,7 @@ export default {
   'Respect .qwenignore': 'Учитывать .qwenignore',
   'Enable Recursive File Search': 'Включить рекурсивный поиск файлов',
   'Disable Fuzzy Search': 'Отключить нечеткий поиск',
-  'Enable Interactive Shell': 'Включить интерактивный терминал',
+  'Interactive Shell (PTY)': 'Интерактивный терминал (PTY)',
   'Show Color': 'Показывать цвета',
   'Auto Accept': 'Автоподтверждение',
   'Use Ripgrep': 'Использовать Ripgrep',
@@ -326,6 +351,7 @@ export default {
   'Folder Trust': 'Доверие к папке',
   'Vision Model Preview': 'Визуальная модель (предпросмотр)',
   'Tool Schema Compliance': 'Соответствие схеме инструмента',
+  'Experimental: Skills': 'Экспериментальное: Навыки',
   // Варианты перечислений настроек
   'Auto (detect from system)': 'Авто (определить из системы)',
   Text: 'Текст',
@@ -352,6 +378,11 @@ export default {
     'Показать все директории в рабочем пространстве',
   'set external editor preference':
     'Установка предпочитаемого внешнего редактора',
+  'Select Editor': 'Выбрать редактор',
+  'Editor Preference': 'Настройка редактора',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    'В настоящее время поддерживаются следующие редакторы. Обратите внимание, что некоторые редакторы нельзя использовать в режиме песочницы.',
+  'Your preferred editor is:': 'Ваш предпочитаемый редактор:',
   'Manage extensions': 'Управление расширениями',
   'List active extensions': 'Показать активные расширения',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -419,6 +450,8 @@ export default {
   'Example: /language output English': 'Пример: /language output English',
   'Example: /language output 日本語': 'Пример: /language output 日本語',
   'UI language changed to {{lang}}': 'Язык интерфейса изменен на {{lang}}',
+  'LLM output language set to {{lang}}':
+    'Язык вывода LLM установлен на {{lang}}',
   'LLM output language rule file generated at {{path}}':
     'Файл правил языка вывода LLM создан в {{path}}',
   'Please restart the application for the changes to take effect.':
@@ -441,7 +474,7 @@ export default {
   // ============================================================================
   // Команды - Режим подтверждения
   // ============================================================================
-  'Approval Mode': 'Режим подтверждения',
+  'Tool Approval Mode': 'Режим подтверждения инструментов',
   'Current approval mode: {{mode}}': 'Текущий режим подтверждения: {{mode}}',
   'Available approval modes:': 'Доступные режимы подтверждения:',
   'Approval mode changed to: {{mode}}':
@@ -483,8 +516,6 @@ export default {
     'Автоматически подтверждать все инструменты',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     'Режим подтверждения рабочего пространства существует и имеет приоритет. Изменение на уровне пользователя не будет иметь эффекта.',
-  '(Use Enter to select, Tab to change focus)':
-    '(Enter для выбора, Tab для смены фокуса)',
   'Apply To': 'Применить к',
   'User Settings': 'Настройки пользователя',
   'Workspace Settings': 'Настройки рабочего пространства',
diff --git a/packages/cli/src/i18n/locales/zh.js b/packages/cli/src/i18n/locales/zh.js
index 466b163e3..2a0d5a368 100644
--- a/packages/cli/src/i18n/locales/zh.js
+++ b/packages/cli/src/i18n/locales/zh.js
@@ -32,6 +32,25 @@ export default {
   'Model Context Protocol command (from external servers)':
     '模型上下文协议命令（来自外部服务器）',
   'Keyboard Shortcuts:': '键盘快捷键：',
+  'Toggle this help display': '切换此帮助显示',
+  'Toggle shell mode': '切换命令行模式',
+  'Open command menu': '打开命令菜单',
+  'Add file context': '添加文件上下文',
+  'Accept suggestion / Autocomplete': '接受建议 / 自动补全',
+  'Reverse search history': '反向搜索历史',
+  'Press ? again to close': '再次按 ? 关闭',
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': '命令行模式',
+  'for commands': '命令菜单',
+  'for file paths': '文件路径',
+  'to clear input': '清空输入',
+  'to cycle approvals': '切换审批模式',
+  'to quit': '退出',
+  'for newline': '换行',
+  'to clear screen': '清屏',
+  'to search history': '搜索历史',
+  'to paste images': '粘贴图片',
+  'for external editor': '外部编辑器',
   'Jump through words in the input': '在输入中按单词跳转',
   'Close dialogs, cancel requests, or quit application':
     '关闭对话框、取消请求或退出应用程序',
@@ -45,6 +64,7 @@ export default {
   'Connecting to MCP servers... ({{connected}}/{{total}})':
     '正在连接到 MCP 服务器... ({{connected}}/{{total}})',
   'Type your message or @path/to/file': '输入您的消息或 @ 文件路径',
+  '? for shortcuts': '按 ? 查看快捷键',
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "按 'i' 进入插入模式，按 'Esc' 进入普通模式",
   'Cancel operation / Clear input (double press)':
@@ -58,10 +78,15 @@ export default {
   'show version info': '显示版本信息',
   'submit a bug report': '提交错误报告',
   'About Qwen Code': '关于 Qwen Code',
+  Status: '状态',
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: '运行环境',
+  OS: '操作系统',
+  Auth: '认证',
   'CLI Version': 'CLI 版本',
   'Git Commit': 'Git 提交',
   Model: '模型',
@@ -74,6 +99,7 @@ export default {
   'Session ID': '会话 ID',
   'Auth Method': '认证方式',
   'Base URL': '基础 URL',
+  Proxy: '代理',
   'Memory Usage': '内存使用',
   'IDE Client': 'IDE 客户端',
 
@@ -97,8 +123,8 @@ export default {
   Preview: '预览',
   '(Use Enter to select, Tab to configure scope)':
     '（使用 Enter 选择，Tab 配置作用域）',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '（使用 Enter 应用作用域，Tab 选择主题）',
+  '(Use Enter to apply scope, Tab to go back)':
+    '（使用 Enter 应用作用域，Tab 返回）',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     '由于 NO_COLOR 环境变量，主题配置不可用。',
   'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。',
@@ -248,8 +274,6 @@ export default {
   // ============================================================================
   'View and edit Qwen Code settings': '查看和编辑 Qwen Code 设置',
   Settings: '设置',
-  '(Use Enter to select{{tabText}})': '（使用 Enter 选择{{tabText}}）',
-  ', Tab to change focus': '，Tab 切换焦点',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     '要查看更改，必须重启 Qwen Code。按 r 退出并立即应用更改。',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -259,24 +283,24 @@ export default {
   // ============================================================================
   'Vim Mode': 'Vim 模式',
   'Disable Auto Update': '禁用自动更新',
+  'Attribution: commit': '署名：提交',
+  'Terminal Bell Notification': '终端响铃通知',
+  'Enable Usage Statistics': '启用使用统计',
+  Theme: '主题',
+  'Preferred Editor': '首选编辑器',
+  'Auto-connect to IDE': '自动连接到 IDE',
   'Enable Prompt Completion': '启用提示补全',
   'Debug Keystroke Logging': '调试按键记录',
-  Language: '语言',
+  'Language: UI': '语言：界面',
+  'Language: Model': '语言：模型',
   'Output Format': '输出格式',
   'Hide Window Title': '隐藏窗口标题',
   'Show Status in Title': '在标题中显示状态',
   'Hide Tips': '隐藏提示',
-  'Hide Banner': '隐藏横幅',
-  'Hide Context Summary': '隐藏上下文摘要',
-  'Hide CWD': '隐藏当前工作目录',
-  'Hide Sandbox Status': '隐藏沙箱状态',
-  'Hide Model Info': '隐藏模型信息',
-  'Hide Footer': '隐藏页脚',
-  'Show Memory Usage': '显示内存使用',
-  'Show Line Numbers': '显示行号',
+  'Show Line Numbers in Code': '在代码中显示行号',
   'Show Citations': '显示引用',
   'Custom Witty Phrases': '自定义诙谐短语',
-  'Enable Welcome Back': '启用欢迎回来',
+  'Show Welcome Back Dialog': '显示欢迎回来对话框',
   'Enable User Feedback': '启用用户反馈',
   'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）',
   Bad: '不满意',
@@ -301,7 +325,7 @@ export default {
   'Respect .qwenignore': '遵守 .qwenignore',
   'Enable Recursive File Search': '启用递归文件搜索',
   'Disable Fuzzy Search': '禁用模糊搜索',
-  'Enable Interactive Shell': '启用交互式 Shell',
+  'Interactive Shell (PTY)': '交互式 Shell (PTY)',
   'Show Color': '显示颜色',
   'Auto Accept': '自动接受',
   'Use Ripgrep': '使用 Ripgrep',
@@ -312,6 +336,7 @@ export default {
   'Folder Trust': '文件夹信任',
   'Vision Model Preview': '视觉模型预览',
   'Tool Schema Compliance': '工具 Schema 兼容性',
+  'Experimental: Skills': '实验性: 技能',
   // Settings enum options
   'Auto (detect from system)': '自动（从系统检测）',
   Text: '文本',
@@ -333,6 +358,11 @@ export default {
     '将目录添加到工作区。使用逗号分隔多个路径',
   'Show all directories in the workspace': '显示工作区中的所有目录',
   'set external editor preference': '设置外部编辑器首选项',
+  'Select Editor': '选择编辑器',
+  'Editor Preference': '编辑器首选项',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    '当前支持以下编辑器。请注意，某些编辑器无法在沙箱模式下使用。',
+  'Your preferred editor is:': '您的首选编辑器是：',
   'Manage extensions': '管理扩展',
   'List active extensions': '列出活动扩展',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -396,6 +426,7 @@ export default {
   'Example: /language output English': '示例：/language output English',
   'Example: /language output 日本語': '示例：/language output 日本語',
   'UI language changed to {{lang}}': 'UI 语言已更改为 {{lang}}',
+  'LLM output language set to {{lang}}': 'LLM 输出语言已设置为 {{lang}}',
   'LLM output language rule file generated at {{path}}':
     'LLM 输出语言规则文件已生成于 {{path}}',
   'Please restart the application for the changes to take effect.':
@@ -416,7 +447,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Approval Mode': '审批模式',
+  'Tool Approval Mode': '工具审批模式',
   'Current approval mode: {{mode}}': '当前审批模式：{{mode}}',
   'Available approval modes:': '可用的审批模式：',
   'Approval mode changed to: {{mode}}': '审批模式已更改为：{{mode}}',
@@ -450,8 +481,6 @@ export default {
   'Automatically approve all tools': '自动批准所有工具',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     '工作区审批模式已存在并具有优先级。用户级别的更改将无效。',
-  '(Use Enter to select, Tab to change focus)':
-    '（使用 Enter 选择，Tab 切换焦点）',
   'Apply To': '应用于',
   'User Settings': '用户设置',
   'Workspace Settings': '工作区设置',
@@ -851,13 +880,22 @@ export default {
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips for getting started:': '入门提示：',
-  '1. Ask questions, edit files, or run commands.':
-    '1. 提问、编辑文件或运行命令',
-  '2. Be specific for the best results.': '2. 具体描述以获得最佳结果',
-  'files to customize your interactions with Qwen Code.':
-    '文件以自定义您与 Qwen Code 的交互',
-  'for more information.': '获取更多信息',
+  'Tips:': '提示：',
+  'Use /compress when the conversation gets long to summarize history and free up context.':
+    '对话变长时用 /compress，总结历史并释放上下文。',
+  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
+    '用 /clear 或 /new 开启新思路；之前的会话会保留在历史记录中。',
+  'Use /bug to submit issues to the maintainers when something goes off.':
+    '遇到问题时，用 /bug 将问题提交给维护者。',
+  'Switch auth type quickly with /auth.': '用 /auth 快速切换认证方式。',
+  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
+    '在 Qwen Code 中使用 ! 可运行任意 shell 命令（例如 !ls）。',
+  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
+    '输入 / 打开命令弹窗；按 Tab 自动补全斜杠命令和保存的提示词。',
+  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
+    '运行 qwen --continue 或 qwen --resume 可继续之前的会话。',
+  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
+    '按 Shift+Tab 或输入 /approval-mode 可快速切换权限模式。',
 
   // ============================================================================
   // Exit Screen / Stats
diff --git a/packages/cli/src/services/BuiltinCommandLoader.test.ts b/packages/cli/src/services/BuiltinCommandLoader.test.ts
index 7c8e6fc57..7d4f50421 100644
--- a/packages/cli/src/services/BuiltinCommandLoader.test.ts
+++ b/packages/cli/src/services/BuiltinCommandLoader.test.ts
@@ -8,7 +8,8 @@ vi.mock('../ui/commands/aboutCommand.js', async () => {
   const { CommandKind } = await import('../ui/commands/types.js');
   return {
     aboutCommand: {
-      name: 'about',
+      name: 'status',
+      altNames: ['about'],
       description: 'About the CLI',
       kind: CommandKind.BUILT_IN,
     },
@@ -127,8 +128,8 @@ describe('BuiltinCommandLoader', () => {
     expect(ideCmd).toBeDefined();
 
     // Other commands should still be present.
-    const aboutCmd = commands.find((c) => c.name === 'about');
-    expect(aboutCmd).toBeDefined();
+    const statusCmd = commands.find((c) => c.name === 'status');
+    expect(statusCmd).toBeDefined();
   });
 
   it('should handle a null config gracefully when calling factories', async () => {
@@ -143,9 +144,9 @@ describe('BuiltinCommandLoader', () => {
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
 
-    const aboutCmd = commands.find((c) => c.name === 'about');
-    expect(aboutCmd).toBeDefined();
-    expect(aboutCmd?.kind).toBe(CommandKind.BUILT_IN);
+    const statusCmd = commands.find((c) => c.name === 'status');
+    expect(statusCmd).toBeDefined();
+    expect(statusCmd?.kind).toBe(CommandKind.BUILT_IN);
 
     const approvalModeCmd = commands.find((c) => c.name === 'approval-mode');
     expect(approvalModeCmd).toBeDefined();
diff --git a/packages/cli/src/ui/App.tsx b/packages/cli/src/ui/App.tsx
index ea8482a16..54684a8c2 100644
--- a/packages/cli/src/ui/App.tsx
+++ b/packages/cli/src/ui/App.tsx
@@ -5,34 +5,15 @@
  */
 
 import { useIsScreenReaderEnabled } from 'ink';
-import { useTerminalSize } from './hooks/useTerminalSize.js';
-import { lerp } from '../utils/math.js';
 import { useUIState } from './contexts/UIStateContext.js';
 import { StreamingContext } from './contexts/StreamingContext.js';
 import { QuittingDisplay } from './components/QuittingDisplay.js';
 import { ScreenReaderAppLayout } from './layouts/ScreenReaderAppLayout.js';
 import { DefaultAppLayout } from './layouts/DefaultAppLayout.js';
 
-const getContainerWidth = (terminalWidth: number): string => {
-  if (terminalWidth <= 80) {
-    return '98%';
-  }
-  if (terminalWidth >= 132) {
-    return '90%';
-  }
-
-  // Linearly interpolate between 80 columns (98%) and 132 columns (90%).
-  const t = (terminalWidth - 80) / (132 - 80);
-  const percentage = lerp(98, 90, t);
-
-  return `${Math.round(percentage)}%`;
-};
-
 export const App = () => {
   const uiState = useUIState();
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
-  const { columns } = useTerminalSize();
-  const containerWidth = getContainerWidth(columns);
 
   if (uiState.quittingMessages) {
     return <QuittingDisplay />;
@@ -40,11 +21,7 @@ export const App = () => {
 
   return (
     <StreamingContext.Provider value={uiState.streamingState}>
-      {isScreenReaderEnabled ? (
-        <ScreenReaderAppLayout />
-      ) : (
-        <DefaultAppLayout width={containerWidth} />
-      )}
+      {isScreenReaderEnabled ? <ScreenReaderAppLayout /> : <DefaultAppLayout />}
     </StreamingContext.Provider>
   );
 };
diff --git a/packages/cli/src/ui/AppContainer.test.tsx b/packages/cli/src/ui/AppContainer.test.tsx
index 60426f1dd..faf5ddb83 100644
--- a/packages/cli/src/ui/AppContainer.test.tsx
+++ b/packages/cli/src/ui/AppContainer.test.tsx
@@ -294,10 +294,7 @@ describe('AppContainer State Management', () => {
     // Mock LoadedSettings
     mockSettings = {
       merged: {
-        hideBanner: false,
-        hideFooter: false,
         hideTips: false,
-        showMemoryUsage: false,
         theme: 'default',
         ui: {
           showStatusInTitle: false,
@@ -445,10 +442,7 @@ describe('AppContainer State Management', () => {
     it('handles settings with all display options disabled', () => {
       const settingsAllHidden = {
         merged: {
-          hideBanner: true,
-          hideFooter: true,
           hideTips: true,
-          showMemoryUsage: false,
         },
       } as unknown as LoadedSettings;
 
@@ -463,28 +457,6 @@ describe('AppContainer State Management', () => {
         );
       }).not.toThrow();
     });
-
-    it('handles settings with memory usage enabled', () => {
-      const settingsWithMemory = {
-        merged: {
-          hideBanner: false,
-          hideFooter: false,
-          hideTips: false,
-          showMemoryUsage: true,
-        },
-      } as unknown as LoadedSettings;
-
-      expect(() => {
-        render(
-          <AppContainer
-            config={mockConfig}
-            settings={settingsWithMemory}
-            version="1.0.0"
-            initializationResult={mockInitResult}
-          />,
-        );
-      }).not.toThrow();
-    });
   });
 
   describe('Version Handling', () => {
diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx
index 909d2beec..4384971d2 100644
--- a/packages/cli/src/ui/AppContainer.tsx
+++ b/packages/cli/src/ui/AppContainer.tsx
@@ -272,7 +272,8 @@ export const AppContainer = (props: AppContainerProps) => {
       calculatePromptWidths(terminalWidth);
     return { inputWidth, suggestionsWidth };
   }, [terminalWidth]);
-  const mainAreaWidth = Math.floor(terminalWidth * 0.9);
+  // Uniform width for bordered box components: accounts for margins and caps at 100
+  const mainAreaWidth = Math.min(terminalWidth - 4, 100);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
 
   const isValidPath = useCallback((filePath: string): boolean => {
@@ -1404,6 +1405,8 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const uiActions: UIActions = useMemo(
     () => ({
+      openThemeDialog,
+      openEditorDialog,
       handleThemeSelect,
       handleThemeHighlight,
       handleApprovalModeSelect,
@@ -1445,6 +1448,8 @@ export const AppContainer = (props: AppContainerProps) => {
       submitFeedback,
     }),
     [
+      openThemeDialog,
+      openEditorDialog,
       handleThemeSelect,
       handleThemeHighlight,
       handleApprovalModeSelect,
diff --git a/packages/cli/src/ui/commands/aboutCommand.test.ts b/packages/cli/src/ui/commands/aboutCommand.test.ts
index 8a1daaeb1..4920f2404 100644
--- a/packages/cli/src/ui/commands/aboutCommand.test.ts
+++ b/packages/cli/src/ui/commands/aboutCommand.test.ts
@@ -64,7 +64,8 @@ describe('aboutCommand', () => {
   });
 
   it('should have the correct name and description', () => {
-    expect(aboutCommand.name).toBe('about');
+    expect(aboutCommand.name).toBe('status');
+    expect(aboutCommand.altNames).toEqual(['about']);
     expect(aboutCommand.description).toBe('show version info');
   });
 
diff --git a/packages/cli/src/ui/commands/aboutCommand.ts b/packages/cli/src/ui/commands/aboutCommand.ts
index 800b2b000..1570b9e3d 100644
--- a/packages/cli/src/ui/commands/aboutCommand.ts
+++ b/packages/cli/src/ui/commands/aboutCommand.ts
@@ -11,7 +11,8 @@ import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
 import { t } from '../../i18n/index.js';
 
 export const aboutCommand: SlashCommand = {
-  name: 'about',
+  name: 'status',
+  altNames: ['about'],
   get description() {
     return t('show version info');
   },
diff --git a/packages/cli/src/ui/commands/bugCommand.test.ts b/packages/cli/src/ui/commands/bugCommand.test.ts
index 09c28aad9..eac703cfa 100644
--- a/packages/cli/src/ui/commands/bugCommand.test.ts
+++ b/packages/cli/src/ui/commands/bugCommand.test.ts
@@ -56,27 +56,22 @@ describe('bugCommand', () => {
     if (!bugCommand.action) throw new Error('Action is not defined');
     await bugCommand.action(mockContext, 'A test bug');
 
-    const gitCommitLine =
+    const qwenCodeLine =
       GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
-        : '';
-    const expectedInfo = `
-* **CLI Version:** 0.1.0
-${gitCommitLine}* **Model:** qwen3-coder-plus
-* **Sandbox:** test
-* **OS Platform:** test-platform
-* **OS Arch:** x64
-* **OS Release:** 22.0.0
-* **Node.js Version:** v20.0.0
-* **NPM Version:** 10.0.0
-* **Session ID:** test-session-id
-* **Auth Method:** 
-* **Memory Usage:** 100 MB
-* **IDE Client:** VSCode
-`;
+        ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})`
+        : 'Qwen Code: 0.1.0';
+    const expectedInfo = `${qwenCodeLine}
+Runtime: Node.js v20.0.0 / npm 10.0.0
+IDE Client: VSCode
+OS: test-platform x64 (22.0.0)
+Model: qwen3-coder-plus
+Session ID: test-session-id
+Sandbox: test
+Proxy: no proxy
+Memory Usage: 100 MB`;
     const expectedUrl =
       'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title=A%20test%20bug&info=' +
-      encodeURIComponent(expectedInfo);
+      encodeURIComponent(`\n${expectedInfo}\n`);
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
@@ -95,27 +90,22 @@ ${gitCommitLine}* **Model:** qwen3-coder-plus
     if (!bugCommand.action) throw new Error('Action is not defined');
     await bugCommand.action(mockContext, 'A custom bug');
 
-    const gitCommitLine =
+    const qwenCodeLine =
       GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
-        : '';
-    const expectedInfo = `
-* **CLI Version:** 0.1.0
-${gitCommitLine}* **Model:** qwen3-coder-plus
-* **Sandbox:** test
-* **OS Platform:** test-platform
-* **OS Arch:** x64
-* **OS Release:** 22.0.0
-* **Node.js Version:** v20.0.0
-* **NPM Version:** 10.0.0
-* **Session ID:** test-session-id
-* **Auth Method:** 
-* **Memory Usage:** 100 MB
-* **IDE Client:** VSCode
-`;
+        ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})`
+        : 'Qwen Code: 0.1.0';
+    const expectedInfo = `${qwenCodeLine}
+Runtime: Node.js v20.0.0 / npm 10.0.0
+IDE Client: VSCode
+OS: test-platform x64 (22.0.0)
+Model: qwen3-coder-plus
+Session ID: test-session-id
+Sandbox: test
+Proxy: no proxy
+Memory Usage: 100 MB`;
     const expectedUrl = customTemplate
       .replace('{title}', encodeURIComponent('A custom bug'))
-      .replace('{info}', encodeURIComponent(expectedInfo));
+      .replace('{info}', encodeURIComponent(`\n${expectedInfo}\n`));
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
@@ -152,28 +142,23 @@ ${gitCommitLine}* **Model:** qwen3-coder-plus
     if (!bugCommand.action) throw new Error('Action is not defined');
     await bugCommand.action(mockContext, 'OpenAI bug');
 
-    const gitCommitLine =
+    const qwenCodeLine =
       GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
-        : '';
-    const expectedInfo = `
-* **CLI Version:** 0.1.0
-${gitCommitLine}* **Model:** qwen3-coder-plus
-* **Sandbox:** test
-* **OS Platform:** test-platform
-* **OS Arch:** x64
-* **OS Release:** 22.0.0
-* **Node.js Version:** v20.0.0
-* **NPM Version:** 10.0.0
-* **Session ID:** test-session-id
-* **Auth Method:** ${AuthType.USE_OPENAI}
-* **Base URL:** https://api.openai.com/v1
-* **Memory Usage:** 100 MB
-* **IDE Client:** VSCode
-`;
+        ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})`
+        : 'Qwen Code: 0.1.0';
+    const expectedInfo = `${qwenCodeLine}
+Runtime: Node.js v20.0.0 / npm 10.0.0
+IDE Client: VSCode
+OS: test-platform x64 (22.0.0)
+Auth: ${AuthType.USE_OPENAI} (https://api.openai.com/v1)
+Model: qwen3-coder-plus
+Session ID: test-session-id
+Sandbox: test
+Proxy: no proxy
+Memory Usage: 100 MB`;
     const expectedUrl =
       'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title=OpenAI%20bug&info=' +
-      encodeURIComponent(expectedInfo);
+      encodeURIComponent(`\n${expectedInfo}\n`);
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
diff --git a/packages/cli/src/ui/commands/bugCommand.ts b/packages/cli/src/ui/commands/bugCommand.ts
index 14cf37598..6bedbfebf 100644
--- a/packages/cli/src/ui/commands/bugCommand.ts
+++ b/packages/cli/src/ui/commands/bugCommand.ts
@@ -12,10 +12,7 @@ import {
 } from './types.js';
 import { MessageType } from '../types.js';
 import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
-import {
-  getSystemInfoFields,
-  getFieldValue,
-} from '../../utils/systemInfoFields.js';
+import { getSystemInfoFields } from '../../utils/systemInfoFields.js';
 import { t } from '../../i18n/index.js';
 
 export const bugCommand: SlashCommand = {
@@ -30,11 +27,9 @@ export const bugCommand: SlashCommand = {
 
     const fields = getSystemInfoFields(systemInfo);
 
-    // Generate bug report info using the same field configuration
-    let info = '\n';
-    for (const field of fields) {
-      info += `* **${field.label}:** ${getFieldValue(field, systemInfo)}\n`;
-    }
+    const info = fields
+      .map((field) => `${field.label}: ${field.value}`)
+      .join('\n');
 
     let bugReportUrl =
       'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title={title}&info={info}';
@@ -46,7 +41,7 @@ export const bugCommand: SlashCommand = {
 
     bugReportUrl = bugReportUrl
       .replace('{title}', encodeURIComponent(bugDescription))
-      .replace('{info}', encodeURIComponent(info));
+      .replace('{info}', encodeURIComponent(`\n${info}\n`));
 
     context.ui.addItem(
       {
diff --git a/packages/cli/src/ui/commands/languageCommand.test.ts b/packages/cli/src/ui/commands/languageCommand.test.ts
index 719b1780c..9234773eb 100644
--- a/packages/cli/src/ui/commands/languageCommand.test.ts
+++ b/packages/cli/src/ui/commands/languageCommand.test.ts
@@ -8,6 +8,7 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import * as fs from 'node:fs';
 import { type CommandContext, CommandKind } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
+import type { LoadedSettings } from '../../config/settings.js';
 
 // Mock i18n module
 vi.mock('../../i18n/index.js', () => ({
@@ -71,10 +72,8 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
 
 // Import modules after mocking
 import * as i18n from '../../i18n/index.js';
-import {
-  languageCommand,
-  initializeLlmOutputLanguage,
-} from './languageCommand.js';
+import { languageCommand } from './languageCommand.js';
+import { initializeLlmOutputLanguage } from '../../utils/languageUtils.js';
 
 describe('languageCommand', () => {
   let mockContext: CommandContext;
@@ -165,11 +164,13 @@ describe('languageCommand', () => {
       });
     });
 
-    it('should show LLM output language when set', async () => {
-      vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue(
-        '# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY',
-      );
+    it('should show LLM output language when explicitly set', async () => {
+      // Set the outputLanguage setting explicitly
+      mockContext.services.settings = {
+        ...mockContext.services.settings,
+        merged: { general: { outputLanguage: 'Chinese' } },
+        setValue: vi.fn(),
+      } as unknown as LoadedSettings;
 
       // Make t() function handle interpolation for this test
       vi.mocked(i18n.t).mockImplementation(
@@ -192,7 +193,7 @@ describe('languageCommand', () => {
         messageType: 'info',
         content: expect.stringContaining('Current UI language:'),
       });
-      // Verify it correctly parses "Chinese" from the template format
+      // Verify it shows "Chinese" for the explicitly set language
       expect(result).toEqual({
         type: 'message',
         messageType: 'info',
@@ -200,16 +201,14 @@ describe('languageCommand', () => {
       });
     });
 
-    it('should parse Unicode LLM output language from marker', async () => {
-      vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue(
-        [
-          '# ⚠️ CRITICAL: 中文 Output Language Rule - HIGHEST PRIORITY ⚠️',
-          '<!-- qwen-code:llm-output-language: 中文 -->',
-          '',
-          'Some other content...',
-        ].join('\n'),
-      );
+    it('should show auto-detected language when set to auto', async () => {
+      // Set the outputLanguage setting to 'auto'
+      mockContext.services.settings = {
+        ...mockContext.services.settings,
+        merged: { general: { outputLanguage: 'auto' } },
+        setValue: vi.fn(),
+      } as unknown as LoadedSettings;
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
 
       vi.mocked(i18n.t).mockImplementation(
         (key: string, params?: Record<string, string>) => {
@@ -226,10 +225,16 @@ describe('languageCommand', () => {
 
       const result = await languageCommand.action(mockContext, '');
 
+      // Verify it shows "Auto (detect from system) → Chinese"
       expect(result).toEqual({
         type: 'message',
         messageType: 'info',
-        content: expect.stringContaining('中文'),
+        content: expect.stringContaining('Auto (detect from system)'),
+      });
+      expect(result).toEqual({
+        type: 'message',
+        messageType: 'info',
+        content: expect.stringContaining('Chinese'),
       });
     });
   });
@@ -404,7 +409,7 @@ describe('languageCommand', () => {
       });
     });
 
-    it('should create LLM output language rule file', async () => {
+    it('should save LLM output language setting', async () => {
       if (!languageCommand.action) {
         throw new Error('The language command must have an action.');
       }
@@ -414,18 +419,16 @@ describe('languageCommand', () => {
         'output Chinese',
       );
 
-      expect(fs.mkdirSync).toHaveBeenCalled();
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('Chinese'),
-        'utf-8',
+      // Verify setting was saved (rule file is updated on restart)
+      expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith(
+        expect.anything(), // SettingScope.User
+        'general.outputLanguage',
+        'Chinese',
       );
       expect(result).toEqual({
         type: 'message',
         messageType: 'info',
-        content: expect.stringContaining(
-          'LLM output language rule file generated',
-        ),
+        content: expect.stringContaining('LLM output language set to'),
       });
     });
 
@@ -453,10 +456,11 @@ describe('languageCommand', () => {
 
       await languageCommand.action(mockContext, 'output ru');
 
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('Russian'),
-        'utf-8',
+      // Verify setting was saved with normalized value
+      expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith(
+        expect.anything(),
+        'general.outputLanguage',
+        'Russian',
       );
     });
 
@@ -467,28 +471,36 @@ describe('languageCommand', () => {
 
       await languageCommand.action(mockContext, 'output de');
 
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('German'),
-        'utf-8',
+      // Verify setting was saved with normalized value
+      expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith(
+        expect.anything(),
+        'general.outputLanguage',
+        'German',
       );
     });
 
-    it('should handle file write errors gracefully', async () => {
-      vi.mocked(fs.writeFileSync).mockImplementation(() => {
-        throw new Error('Permission denied');
-      });
-
+    it('should save setting without immediate rule file update', async () => {
+      // Even though rule file updates happen on restart, the setting should still be saved
       if (!languageCommand.action) {
         throw new Error('The language command must have an action.');
       }
 
-      const result = await languageCommand.action(mockContext, 'output German');
+      const result = await languageCommand.action(
+        mockContext,
+        'output Spanish',
+      );
 
+      // Verify setting was saved
+      expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith(
+        expect.anything(),
+        'general.outputLanguage',
+        'Spanish',
+      );
+      // Verify success message (no error about file generation)
       expect(result).toEqual({
         type: 'message',
-        messageType: 'error',
-        content: expect.stringContaining('Failed to generate'),
+        messageType: 'info',
+        content: expect.stringContaining('LLM output language set to'),
       });
     });
   });
@@ -586,24 +598,23 @@ describe('languageCommand', () => {
       expect(outputSubcommand?.kind).toBe(CommandKind.BUILT_IN);
     });
 
-    it('should have action that generates rule file', async () => {
+    it('should have action that saves setting', async () => {
       if (!outputSubcommand?.action) {
         throw new Error('Output subcommand must have an action.');
       }
 
-      // Ensure mocks are properly set for this test
-      vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
-      vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
-
       const result = await outputSubcommand.action(mockContext, 'French');
 
-      expect(fs.writeFileSync).toHaveBeenCalled();
+      // Verify setting was saved (rule file is updated on restart)
+      expect(mockContext.services.settings?.setValue).toHaveBeenCalledWith(
+        expect.anything(),
+        'general.outputLanguage',
+        'French',
+      );
       expect(result).toEqual({
         type: 'message',
         messageType: 'info',
-        content: expect.stringContaining(
-          'LLM output language rule file generated',
-        ),
+        content: expect.stringContaining('LLM output language set to'),
       });
     });
   });
@@ -688,6 +699,7 @@ describe('languageCommand', () => {
       vi.mocked(fs.existsSync).mockReturnValue(false);
       vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
       vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
+      vi.mocked(fs.readFileSync).mockImplementation(() => '');
     });
 
     it('should create file when it does not exist', () => {
@@ -704,14 +716,50 @@ describe('languageCommand', () => {
       );
     });
 
-    it('should NOT overwrite existing file', () => {
+    it('should NOT overwrite existing file when content matches resolved language', () => {
       vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en');
+      vi.mocked(fs.readFileSync).mockReturnValue(
+        `# Output language preference: English
+<!-- qwen-code:llm-output-language: English -->
+`,
+      );
 
       initializeLlmOutputLanguage();
 
       expect(fs.writeFileSync).not.toHaveBeenCalled();
     });
 
+    it('should overwrite existing file when output language setting differs', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(fs.readFileSync).mockReturnValue(
+        `# Output language preference: English
+<!-- qwen-code:llm-output-language: English -->
+`,
+      );
+
+      initializeLlmOutputLanguage('Japanese');
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Japanese'),
+        'utf-8',
+      );
+    });
+
+    it('should resolve auto setting to detected system language', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      initializeLlmOutputLanguage('auto');
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Chinese'),
+        'utf-8',
+      );
+    });
+
     it('should detect Chinese locale and create Chinese rule file', () => {
       vi.mocked(fs.existsSync).mockReturnValue(false);
       vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
diff --git a/packages/cli/src/ui/commands/languageCommand.ts b/packages/cli/src/ui/commands/languageCommand.ts
index fff4a693a..e4158ce5c 100644
--- a/packages/cli/src/ui/commands/languageCommand.ts
+++ b/packages/cli/src/ui/commands/languageCommand.ts
@@ -15,25 +15,40 @@ import { SettingScope } from '../../config/settings.js';
 import {
   setLanguageAsync,
   getCurrentLanguage,
-  detectSystemLanguage,
-  getLanguageNameFromLocale,
   type SupportedLanguage,
   t,
 } from '../../i18n/index.js';
+import { SUPPORTED_LANGUAGES } from '../../i18n/languages.js';
 import {
-  SUPPORTED_LANGUAGES,
-  type LanguageDefinition,
-} from '../../i18n/languages.js';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import { Storage } from '@qwen-code/qwen-code-core';
+  OUTPUT_LANGUAGE_AUTO,
+  isAutoLanguage,
+  resolveOutputLanguage,
+  updateOutputLanguageFile,
+} from '../../utils/languageUtils.js';
 
-const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = 'output-language.md';
-const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = 'qwen-code:llm-output-language:';
+/**
+ * Gets the current LLM output language setting and its resolved value.
+ * Returns an object with both the raw setting and the resolved language.
+ */
+function getCurrentOutputLanguage(context?: CommandContext): {
+  setting: string;
+  resolved: string;
+} {
+  const settingValue =
+    context?.services?.settings?.merged?.general?.outputLanguage ||
+    OUTPUT_LANGUAGE_AUTO;
+  const resolved = resolveOutputLanguage(settingValue);
+  return { setting: settingValue, resolved };
+}
 
+/**
+ * Parses user input to find a matching supported UI language.
+ * Accepts locale codes (e.g., "zh"), IDs (e.g., "zh-CN"), or full names (e.g., "Chinese").
+ */
 function parseUiLanguageArg(input: string): SupportedLanguage | null {
   const lowered = input.trim().toLowerCase();
   if (!lowered) return null;
+
   for (const lang of SUPPORTED_LANGUAGES) {
     if (
       lowered === lang.code ||
@@ -46,153 +61,22 @@ function parseUiLanguageArg(input: string): SupportedLanguage | null {
   return null;
 }
 
+/**
+ * Formats a UI language code for display (e.g., "zh" -> "Chinese（zh-CN）").
+ */
 function formatUiLanguageDisplay(lang: SupportedLanguage): string {
   const option = SUPPORTED_LANGUAGES.find((o) => o.code === lang);
   return option ? `${option.fullName}（${option.id}）` : lang;
 }
 
-function sanitizeLanguageForMarker(language: string): string {
-  // HTML comments cannot contain "--" or end markers like "-->" or "--!>" safely.
-  // Also avoid newlines to keep the marker single-line and robust to parsing.
-  return language
-    .replace(/[\r\n]/g, ' ')
-    .replace(/--!?>/g, '')
-    .replace(/--/g, '');
-}
-
 /**
- * Generates the LLM output language rule template based on the language name.
- */
-function generateLlmOutputLanguageRule(language: string): string {
-  const markerLanguage = sanitizeLanguageForMarker(language);
-  return `# Output language preference: ${language}
-<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${markerLanguage} -->
-
-## Goal
-Prefer responding in **${language}** for normal assistant messages and explanations.
-
-## Keep technical artifacts unchanged
-Do **not** translate or rewrite:
-- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
-- Exact quoted text from the user (keep quotes verbatim)
-
-## When a conflict exists
-If higher-priority instructions (system/developer) require a different behavior, follow them.
-
-## Tool / system outputs
-Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
-`;
-}
-
-/**
- * Gets the path to the LLM output language rule file.
- */
-function getLlmOutputLanguageRulePath(): string {
-  return path.join(
-    Storage.getGlobalQwenDir(),
-    LLM_OUTPUT_LANGUAGE_RULE_FILENAME,
-  );
-}
-
-/**
- * Normalizes a language input to its full English name.
- * If the input is a known locale code (e.g., "ru", "zh"), converts it to the full name.
- * Otherwise, returns the input as-is (e.g., "Japanese" stays "Japanese").
- */
-function normalizeLanguageName(language: string): string {
-  const lowered = language.toLowerCase();
-  // Check if it's a known locale code and convert to full name
-  const fullName = getLanguageNameFromLocale(lowered);
-  // If getLanguageNameFromLocale returned a different value, use it
-  // Otherwise, use the original input (preserves case for unknown languages)
-  if (fullName !== 'English' || lowered === 'en') {
-    return fullName;
-  }
-  return language;
-}
-
-function extractLlmOutputLanguageFromRuleFileContent(
-  content: string,
-): string | null {
-  // Preferred: machine-readable marker that supports Unicode and spaces.
-  // Example: <!-- qwen-code:llm-output-language: 中文 -->
-  const markerMatch = content.match(
-    new RegExp(
-      String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
-      'i',
-    ),
-  );
-  if (markerMatch?.[1]) {
-    const lang = markerMatch[1].trim();
-    if (lang) return lang;
-  }
-
-  // Backward compatibility: parse the heading line.
-  // Example: "# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY"
-  // Example: "# ⚠️ CRITICAL: 日本語 Output Language Rule - HIGHEST PRIORITY ⚠️"
-  const headingMatch = content.match(
-    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im,
-  );
-  if (headingMatch?.[1]) {
-    const lang = headingMatch[1].trim();
-    if (lang) return lang;
-  }
-
-  return null;
-}
-
-/**
- * Initializes the LLM output language rule file on first startup.
- * If the file already exists, it is not overwritten (respects user preference).
- */
-export function initializeLlmOutputLanguage(): void {
-  const filePath = getLlmOutputLanguageRulePath();
-
-  // Skip if file already exists (user preference)
-  if (fs.existsSync(filePath)) {
-    return;
-  }
-
-  // Detect system language and map to language name
-  const detectedLocale = detectSystemLanguage();
-  const languageName = getLanguageNameFromLocale(detectedLocale);
-
-  // Generate the rule file
-  const content = generateLlmOutputLanguageRule(languageName);
-
-  // Ensure directory exists
-  const dir = path.dirname(filePath);
-  fs.mkdirSync(dir, { recursive: true });
-
-  // Write file
-  fs.writeFileSync(filePath, content, 'utf-8');
-}
-
-/**
- * Gets the current LLM output language from the rule file if it exists.
- */
-function getCurrentLlmOutputLanguage(): string | null {
-  const filePath = getLlmOutputLanguageRulePath();
-  if (fs.existsSync(filePath)) {
-    try {
-      const content = fs.readFileSync(filePath, 'utf-8');
-      return extractLlmOutputLanguageFromRuleFileContent(content);
-    } catch {
-      // Ignore errors
-    }
-  }
-  return null;
-}
-
-/**
- * Sets the UI language and persists it to settings.
+ * Sets the UI language and persists it to user settings.
  */
 async function setUiLanguage(
   context: CommandContext,
   lang: SupportedLanguage,
 ): Promise<MessageActionReturn> {
   const { services } = context;
-  const { settings } = services;
 
   if (!services.config) {
     return {
@@ -202,19 +86,19 @@ async function setUiLanguage(
     };
   }
 
-  // Set language in i18n system (async to support JS translation files)
+  // Update i18n system
   await setLanguageAsync(lang);
 
-  // Persist to settings (user scope)
-  if (settings && typeof settings.setValue === 'function') {
+  // Persist to settings
+  if (services.settings?.setValue) {
     try {
-      settings.setValue(SettingScope.User, 'general.language', lang);
+      services.settings.setValue(SettingScope.User, 'general.language', lang);
     } catch (error) {
       console.warn('Failed to save language setting:', error);
     }
   }
 
-  // Reload commands to update their descriptions with the new language
+  // Reload commands to update localized descriptions
   context.ui.reloadCommands();
 
   return {
@@ -227,37 +111,51 @@ async function setUiLanguage(
 }
 
 /**
- * Generates the LLM output language rule file.
+ * Handles the /language output command, updating both the setting and the rule file.
+ * 'auto' is preserved in settings but resolved to the detected language for the rule file.
  */
-function generateLlmOutputLanguageRuleFile(
+async function setOutputLanguage(
+  context: CommandContext,
   language: string,
 ): Promise<MessageActionReturn> {
   try {
-    const filePath = getLlmOutputLanguageRulePath();
-    // Normalize locale codes (e.g., "ru" -> "Russian") to full language names
-    const normalizedLanguage = normalizeLanguageName(language);
-    const content = generateLlmOutputLanguageRule(normalizedLanguage);
+    const isAuto = isAutoLanguage(language);
+    const resolved = resolveOutputLanguage(language);
+    // Save 'auto' as-is to settings, or normalize other values
+    const settingValue = isAuto ? OUTPUT_LANGUAGE_AUTO : resolved;
 
-    // Ensure directory exists
-    const dir = path.dirname(filePath);
-    fs.mkdirSync(dir, { recursive: true });
+    // Update the rule file with the resolved language
+    updateOutputLanguageFile(settingValue);
 
-    // Write file (overwrite if exists)
-    fs.writeFileSync(filePath, content, 'utf-8');
+    // Save to settings
+    if (context.services.settings?.setValue) {
+      try {
+        context.services.settings.setValue(
+          SettingScope.User,
+          'general.outputLanguage',
+          settingValue,
+        );
+      } catch (error) {
+        console.warn('Failed to save output language setting:', error);
+      }
+    }
 
-    return Promise.resolve({
+    // Format display message
+    const displayLang = isAuto
+      ? `${t('Auto (detect from system)')} → ${resolved}`
+      : resolved;
+
+    return {
       type: 'message',
       messageType: 'info',
       content: [
-        t('LLM output language rule file generated at {{path}}', {
-          path: filePath,
-        }),
+        t('LLM output language set to {{lang}}', { lang: displayLang }),
         '',
         t('Please restart the application for the changes to take effect.'),
       ].join('\n'),
-    });
+    };
   } catch (error) {
-    return Promise.resolve({
+    return {
       type: 'message',
       messageType: 'error',
       content: t(
@@ -266,7 +164,7 @@ function generateLlmOutputLanguageRuleFile(
           error: error instanceof Error ? error.message : String(error),
         },
       ),
-    });
+    };
   }
 }
 
@@ -276,12 +174,12 @@ export const languageCommand: SlashCommand = {
     return t('View or change the language setting');
   },
   kind: CommandKind.BUILT_IN,
+
   action: async (
     context: CommandContext,
     args: string,
   ): Promise<SlashCommandActionReturn> => {
-    const { services } = context;
-    if (!services.config) {
+    if (!context.services.config) {
       return {
         type: 'message',
         messageType: 'error',
@@ -291,75 +189,83 @@ export const languageCommand: SlashCommand = {
 
     const trimmedArgs = args.trim();
 
-    // Handle subcommands if called directly via action (for tests/backward compatibility)
-    const parts = trimmedArgs.split(/\s+/);
-    const firstArg = parts[0].toLowerCase();
-    const subArgs = parts.slice(1).join(' ');
+    // Route to subcommands if specified
+    if (trimmedArgs) {
+      const [firstArg, ...rest] = trimmedArgs.split(/\s+/);
+      const subCommandName = firstArg.toLowerCase();
+      const subArgs = rest.join(' ');
 
-    if (firstArg === 'ui' || firstArg === 'output') {
-      const subCommand = languageCommand.subCommands?.find(
-        (s) => s.name === firstArg,
-      );
-      if (subCommand?.action) {
-        return subCommand.action(
-          context,
-          subArgs,
-        ) as Promise<SlashCommandActionReturn>;
+      if (subCommandName === 'ui' || subCommandName === 'output') {
+        const subCommand = languageCommand.subCommands?.find(
+          (s) => s.name === subCommandName,
+        );
+        if (subCommand?.action) {
+          return subCommand.action(
+            context,
+            subArgs,
+          ) as Promise<SlashCommandActionReturn>;
+        }
       }
+
+      // Backward compatibility: direct language code (e.g., /language zh)
+      const targetLang = parseUiLanguageArg(trimmedArgs);
+      if (targetLang) {
+        return setUiLanguage(context, targetLang);
+      }
+
+      // Unknown argument
+      return {
+        type: 'message',
+        messageType: 'error',
+        content: [
+          t('Invalid command. Available subcommands:'),
+          `  - /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`,
+          `  - /language output <language> - ${t('Set LLM output language')}`,
+        ].join('\n'),
+      };
     }
 
-    // If no arguments, show current language settings and usage
-    if (!trimmedArgs) {
-      const currentUiLang = getCurrentLanguage();
-      const currentLlmLang = getCurrentLlmOutputLanguage();
-      const message = [
+    // No arguments: show current status
+    const currentUiLang = getCurrentLanguage();
+    const { setting: outputSetting, resolved: outputResolved } =
+      getCurrentOutputLanguage(context);
+
+    // Format output language display: show "Auto → English" or just "English"
+    const outputLangDisplay = isAutoLanguage(outputSetting)
+      ? `${t('Auto (detect from system)')} → ${outputResolved}`
+      : outputResolved;
+
+    return {
+      type: 'message',
+      messageType: 'info',
+      content: [
         t('Current UI language: {{lang}}', {
           lang: formatUiLanguageDisplay(currentUiLang as SupportedLanguage),
         }),
-        currentLlmLang
-          ? t('Current LLM output language: {{lang}}', { lang: currentLlmLang })
-          : t('LLM output language not set'),
+        t('Current LLM output language: {{lang}}', { lang: outputLangDisplay }),
         '',
         t('Available subcommands:'),
         `  /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`,
         `  /language output <language> - ${t('Set LLM output language')}`,
-      ].join('\n');
-
-      return {
-        type: 'message',
-        messageType: 'info',
-        content: message,
-      };
-    }
-
-    // Handle backward compatibility for /language [lang]
-    const targetLang = parseUiLanguageArg(trimmedArgs);
-    if (targetLang) {
-      return setUiLanguage(context, targetLang);
-    }
-
-    return {
-      type: 'message',
-      messageType: 'error',
-      content: [
-        t('Invalid command. Available subcommands:'),
-        `  - /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`,
-        '  - /language output <language> - ' + t('Set LLM output language'),
       ].join('\n'),
     };
   },
+
   subCommands: [
+    // /language ui subcommand
     {
       name: 'ui',
       get description() {
         return t('Set UI language');
       },
       kind: CommandKind.BUILT_IN,
+
       action: async (
         context: CommandContext,
         args: string,
       ): Promise<MessageActionReturn> => {
         const trimmedArgs = args.trim();
+
         if (!trimmedArgs) {
           return {
             type: 'message',
@@ -396,19 +302,45 @@ export const languageCommand: SlashCommand = {
 
         return setUiLanguage(context, targetLang);
       },
-      subCommands: SUPPORTED_LANGUAGES.map(createUiLanguageSubCommand),
+
+      // Nested subcommands for each supported language (e.g., /language ui zh-CN)
+      subCommands: SUPPORTED_LANGUAGES.map(
+        (lang): SlashCommand => ({
+          name: lang.id,
+          get description() {
+            return t('Set UI language to {{name}}', { name: lang.fullName });
+          },
+          kind: CommandKind.BUILT_IN,
+          action: async (context, args) => {
+            if (args.trim()) {
+              return {
+                type: 'message',
+                messageType: 'error',
+                content: t(
+                  'Language subcommands do not accept additional arguments.',
+                ),
+              };
+            }
+            return setUiLanguage(context, lang.code);
+          },
+        }),
+      ),
     },
+
+    // /language output subcommand
     {
       name: 'output',
       get description() {
         return t('Set LLM output language');
       },
       kind: CommandKind.BUILT_IN,
+
       action: async (
         context: CommandContext,
         args: string,
       ): Promise<MessageActionReturn> => {
         const trimmedArgs = args.trim();
+
         if (!trimmedArgs) {
           return {
             type: 'message',
@@ -424,33 +356,8 @@ export const languageCommand: SlashCommand = {
           };
         }
 
-        return generateLlmOutputLanguageRuleFile(trimmedArgs);
+        return setOutputLanguage(context, trimmedArgs);
       },
     },
   ],
 };
-
-/**
- * Helper to create a UI language subcommand.
- */
-function createUiLanguageSubCommand(option: LanguageDefinition): SlashCommand {
-  return {
-    name: option.id,
-    get description() {
-      return t('Set UI language to {{name}}', { name: option.fullName });
-    },
-    kind: CommandKind.BUILT_IN,
-    action: async (context, args) => {
-      if (args.trim().length > 0) {
-        return {
-          type: 'message',
-          messageType: 'error',
-          content: t(
-            'Language subcommands do not accept additional arguments.',
-          ),
-        };
-      }
-      return setUiLanguage(context, option.code);
-    },
-  };
-}
diff --git a/packages/cli/src/ui/components/AboutBox.tsx b/packages/cli/src/ui/components/AboutBox.tsx
index e04fd42c8..70ef13711 100644
--- a/packages/cli/src/ui/components/AboutBox.tsx
+++ b/packages/cli/src/ui/components/AboutBox.tsx
@@ -8,16 +8,14 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import type { ExtendedSystemInfo } from '../../utils/systemInfo.js';
-import {
-  getSystemInfoFields,
-  getFieldValue,
-  type SystemInfoField,
-} from '../../utils/systemInfoFields.js';
+import { getSystemInfoFields } from '../../utils/systemInfoFields.js';
 import { t } from '../../i18n/index.js';
 
-type AboutBoxProps = ExtendedSystemInfo;
+type AboutBoxProps = ExtendedSystemInfo & {
+  width?: number;
+};
 
-export const AboutBox: React.FC<AboutBoxProps> = (props) => {
+export const AboutBox: React.FC<AboutBoxProps> = ({ width, ...props }) => {
   const fields = getSystemInfoFields(props);
 
   return (
@@ -26,25 +24,26 @@ export const AboutBox: React.FC<AboutBoxProps> = (props) => {
       borderColor={theme.border.default}
       flexDirection="column"
       padding={1}
-      marginY={1}
-      width="100%"
+      width={width}
     >
       <Box marginBottom={1}>
         <Text bold color={theme.text.accent}>
-          {t('About Qwen Code')}
+          {t('Status')}
         </Text>
       </Box>
-      {fields.map((field: SystemInfoField) => (
-        <Box key={field.key} flexDirection="row">
+      {fields.map((field) => (
+        <Box
+          key={field.label}
+          flexDirection="row"
+          marginTop={field.label === t('Auth') ? 1 : 0}
+        >
           <Box width="35%">
             <Text bold color={theme.text.link}>
               {field.label}
             </Text>
           </Box>
           <Box>
-            <Text color={theme.text.primary}>
-              {getFieldValue(field, props)}
-            </Text>
+            <Text color={theme.text.primary}>{field.value}</Text>
           </Box>
         </Box>
       ))}
diff --git a/packages/cli/src/ui/components/AppHeader.test.tsx b/packages/cli/src/ui/components/AppHeader.test.tsx
new file mode 100644
index 000000000..c125bd977
--- /dev/null
+++ b/packages/cli/src/ui/components/AppHeader.test.tsx
@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { render } from 'ink-testing-library';
+import { describe, expect, it, vi } from 'vitest';
+import { AppHeader } from './AppHeader.js';
+import { ConfigContext } from '../contexts/ConfigContext.js';
+import { SettingsContext } from '../contexts/SettingsContext.js';
+import { type UIState, UIStateContext } from '../contexts/UIStateContext.js';
+import { VimModeProvider } from '../contexts/VimModeContext.js';
+import * as useTerminalSize from '../hooks/useTerminalSize.js';
+import type { LoadedSettings } from '../../config/settings.js';
+
+vi.mock('../hooks/useTerminalSize.js');
+const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize);
+
+const createSettings = (options?: { hideTips?: boolean }): LoadedSettings =>
+  ({
+    merged: {
+      ui: {
+        hideTips: options?.hideTips ?? true,
+      },
+    },
+  }) as never;
+
+const createMockConfig = (overrides = {}) => ({
+  getContentGeneratorConfig: vi.fn(() => ({ authType: undefined })),
+  getModel: vi.fn(() => 'gemini-pro'),
+  getTargetDir: vi.fn(() => '/projects/qwen-code'),
+  getMcpServers: vi.fn(() => ({})),
+  getBlockedMcpServers: vi.fn(() => []),
+  getDebugMode: vi.fn(() => false),
+  getScreenReader: vi.fn(() => false),
+  ...overrides,
+});
+
+const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
+  ({
+    branchName: 'main',
+    nightly: false,
+    debugMessage: '',
+    sessionStats: {
+      lastPromptTokenCount: 0,
+    },
+    ...overrides,
+  }) as UIState;
+
+const renderWithProviders = (
+  uiState: UIState,
+  settings = createSettings(),
+  config = createMockConfig(),
+) => {
+  useTerminalSizeMock.mockReturnValue({ columns: 120, rows: 24 });
+  return render(
+    <ConfigContext.Provider value={config as never}>
+      <SettingsContext.Provider value={settings}>
+        <VimModeProvider settings={settings}>
+          <UIStateContext.Provider value={uiState}>
+            <AppHeader version="1.2.3" />
+          </UIStateContext.Provider>
+        </VimModeProvider>
+      </SettingsContext.Provider>
+    </ConfigContext.Provider>,
+  );
+};
+
+describe('<AppHeader />', () => {
+  it('shows the working directory', () => {
+    const { lastFrame } = renderWithProviders(createMockUIState());
+    expect(lastFrame()).toContain('/projects/qwen-code');
+  });
+
+  it('hides the header when screen reader is enabled', () => {
+    const { lastFrame } = renderWithProviders(
+      createMockUIState(),
+      createSettings(),
+      createMockConfig({ getScreenReader: vi.fn(() => true) }),
+    );
+    // When screen reader is enabled, header is not rendered
+    expect(lastFrame()).not.toContain('/projects/qwen-code');
+    expect(lastFrame()).not.toContain('Qwen Code');
+  });
+
+  it('shows the header with all info when banner is visible', () => {
+    const { lastFrame } = renderWithProviders(createMockUIState());
+    expect(lastFrame()).toContain('>_ Qwen Code');
+    expect(lastFrame()).toContain('gemini-pro');
+    expect(lastFrame()).toContain('/projects/qwen-code');
+  });
+});
diff --git a/packages/cli/src/ui/components/AppHeader.tsx b/packages/cli/src/ui/components/AppHeader.tsx
index 9b6c5fc3b..e37d4aef1 100644
--- a/packages/cli/src/ui/components/AppHeader.tsx
+++ b/packages/cli/src/ui/components/AppHeader.tsx
@@ -9,7 +9,6 @@ import { Header } from './Header.js';
 import { Tips } from './Tips.js';
 import { useSettings } from '../contexts/SettingsContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
 
 interface AppHeaderProps {
   version: string;
@@ -18,16 +17,25 @@ interface AppHeaderProps {
 export const AppHeader = ({ version }: AppHeaderProps) => {
   const settings = useSettings();
   const config = useConfig();
-  const { nightly } = useUIState();
+
+  const contentGeneratorConfig = config.getContentGeneratorConfig();
+  const authType = contentGeneratorConfig?.authType;
+  const model = config.getModel();
+  const targetDir = config.getTargetDir();
+  const showBanner = !config.getScreenReader();
+  const showTips = !(settings.merged.ui?.hideTips || config.getScreenReader());
 
   return (
     <Box flexDirection="column">
-      {!(settings.merged.ui?.hideBanner || config.getScreenReader()) && (
-        <Header version={version} nightly={nightly} />
-      )}
-      {!(settings.merged.ui?.hideTips || config.getScreenReader()) && (
-        <Tips config={config} />
+      {showBanner && (
+        <Header
+          version={version}
+          authType={authType}
+          model={model}
+          workingDirectory={targetDir}
+        />
       )}
+      {showTips && <Tips />}
     </Box>
   );
 };
diff --git a/packages/cli/src/ui/components/ApprovalModeDialog.tsx b/packages/cli/src/ui/components/ApprovalModeDialog.tsx
index d81b6f4c0..48293ffdc 100644
--- a/packages/cli/src/ui/components/ApprovalModeDialog.tsx
+++ b/packages/cli/src/ui/components/ApprovalModeDialog.tsx
@@ -54,7 +54,7 @@ export function ApprovalModeDialog({
 }: ApprovalModeDialogProps): React.JSX.Element {
   // Start with User scope by default
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.Workspace,
+    SettingScope.User,
   );
 
   // Track the currently highlighted approval mode
@@ -90,19 +90,17 @@ export function ApprovalModeDialog({
     setSelectedScope(scope);
   }, []);
 
-  const handleScopeSelect = useCallback(
-    (scope: SettingScope) => {
-      onSelect(highlightedMode, scope);
-    },
-    [onSelect, highlightedMode],
-  );
+  const handleScopeSelect = useCallback((scope: SettingScope) => {
+    setSelectedScope(scope);
+    setMode('mode');
+  }, []);
 
-  const [focusSection, setFocusSection] = useState<'mode' | 'scope'>('mode');
+  const [mode, setMode] = useState<'mode' | 'scope'>('mode');
 
   useKeypress(
     (key) => {
       if (key.name === 'tab') {
-        setFocusSection((prev) => (prev === 'mode' ? 'scope' : 'mode'));
+        setMode((prev) => (prev === 'mode' ? 'scope' : 'mode'));
       }
       if (key.name === 'escape') {
         onSelect(undefined, selectedScope);
@@ -127,59 +125,56 @@ export function ApprovalModeDialog({
     <Box
       borderStyle="round"
       borderColor={theme.border.default}
-      flexDirection="row"
+      flexDirection="column"
       padding={1}
       width="100%"
-      height="100%"
     >
-      <Box flexDirection="column" flexGrow={1}>
-        {/* Approval Mode Selection */}
-        <Text bold={focusSection === 'mode'} wrap="truncate">
-          {focusSection === 'mode' ? '> ' : '  '}
-          {t('Approval Mode')}{' '}
-          <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
-        </Text>
-        <Box height={1} />
-        <RadioButtonSelect
-          items={modeItems}
-          initialIndex={safeInitialModeIndex}
-          onSelect={handleModeSelect}
-          onHighlight={handleModeHighlight}
-          isFocused={focusSection === 'mode'}
-          maxItemsToShow={10}
-          showScrollArrows={false}
-          showNumbers={focusSection === 'mode'}
-        />
-
-        <Box height={1} />
-
-        {/* Scope Selection */}
-        <Box marginTop={1}>
-          <ScopeSelector
-            onSelect={handleScopeSelect}
-            onHighlight={handleScopeHighlight}
-            isFocused={focusSection === 'scope'}
-            initialScope={selectedScope}
-          />
-        </Box>
-
-        <Box height={1} />
-
-        {/* Warning when workspace setting will override user setting */}
-        {showWorkspacePriorityWarning && (
-          <>
-            <Text color={theme.status.warning} wrap="wrap">
-              ⚠{' '}
-              {t(
-                'Workspace approval mode exists and takes priority. User-level change will have no effect.',
-              )}
+      {mode === 'mode' ? (
+        <Box flexDirection="column" flexGrow={1}>
+          {/* Approval Mode Selection */}
+          <Text bold={mode === 'mode'} wrap="truncate">
+            {mode === 'mode' ? '> ' : '  '}
+            {t('Approval Mode')}{' '}
+            <Text color={theme.text.secondary}>
+              {otherScopeModifiedMessage}
             </Text>
-            <Box height={1} />
-          </>
-        )}
-
-        <Text color={theme.text.secondary}>
-          {t('(Use Enter to select, Tab to change focus)')}
+          </Text>
+          <Box height={1} />
+          <RadioButtonSelect
+            items={modeItems}
+            initialIndex={safeInitialModeIndex}
+            onSelect={handleModeSelect}
+            onHighlight={handleModeHighlight}
+            isFocused={mode === 'mode'}
+            maxItemsToShow={10}
+            showScrollArrows={false}
+            showNumbers={mode === 'mode'}
+          />
+          {/* Warning when workspace setting will override user setting */}
+          {showWorkspacePriorityWarning && (
+            <Box marginTop={1}>
+              <Text color={theme.status.warning} wrap="wrap">
+                ⚠{' '}
+                {t(
+                  'Workspace approval mode exists and takes priority. User-level change will have no effect.',
+                )}
+              </Text>
+            </Box>
+          )}
+        </Box>
+      ) : (
+        <ScopeSelector
+          onSelect={handleScopeSelect}
+          onHighlight={handleScopeHighlight}
+          isFocused={mode === 'scope'}
+          initialScope={selectedScope}
+        />
+      )}
+      <Box marginTop={1}>
+        <Text color={theme.text.secondary} wrap="truncate">
+          {mode === 'mode'
+            ? t('(Use Enter to select, Tab to configure scope)')
+            : t('(Use Enter to apply scope, Tab to go back)')}
         </Text>
       </Box>
     </Box>
diff --git a/packages/cli/src/ui/components/AsciiArt.ts b/packages/cli/src/ui/components/AsciiArt.ts
index 8a37a5df3..c70a38f4c 100644
--- a/packages/cli/src/ui/components/AsciiArt.ts
+++ b/packages/cli/src/ui/components/AsciiArt.ts
@@ -5,29 +5,10 @@
  */
 
 export const shortAsciiLogo = `
- ██████╗ ██╗    ██╗███████╗███╗   ██╗
+ ▄▄▄▄▄▄  ▄▄     ▄▄ ▄▄▄▄▄▄▄ ▄▄▄    ▄▄
 ██╔═══██╗██║    ██║██╔════╝████╗  ██║
 ██║   ██║██║ █╗ ██║█████╗  ██╔██╗ ██║
 ██║▄▄ ██║██║███╗██║██╔══╝  ██║╚██╗██║
 ╚██████╔╝╚███╔███╔╝███████╗██║ ╚████║
- ╚══▀▀═╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═══╝                                     
-`;
-export const longAsciiLogo = `
-██╗       ██████╗ ██╗    ██╗███████╗███╗   ██╗
-╚██╗     ██╔═══██╗██║    ██║██╔════╝████╗  ██║
- ╚██╗    ██║   ██║██║ █╗ ██║█████╗  ██╔██╗ ██║
- ██╔╝    ██║▄▄ ██║██║███╗██║██╔══╝  ██║╚██╗██║
-██╔╝     ╚██████╔╝╚███╔███╔╝███████╗██║ ╚████║
-╚═╝       ╚══▀▀═╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═══╝
-`;
-
-export const tinyAsciiLogo = `
- ███         █████████ 
-░░░███      ███░░░░░███
-  ░░░███   ███     ░░░ 
-    ░░░███░███         
-     ███░ ░███    █████
-   ███░   ░░███  ░░███ 
- ███░      ░░█████████ 
-░░░         ░░░░░░░░░  
+ ╚══▀▀═╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═══╝
 `;
diff --git a/packages/cli/src/ui/components/Composer.test.tsx b/packages/cli/src/ui/components/Composer.test.tsx
index d660d7040..a12855e4c 100644
--- a/packages/cli/src/ui/components/Composer.test.tsx
+++ b/packages/cli/src/ui/components/Composer.test.tsx
@@ -14,7 +14,6 @@ import {
   type UIActions,
 } from '../contexts/UIActionsContext.js';
 import { ConfigContext } from '../contexts/ConfigContext.js';
-import { SettingsContext } from '../contexts/SettingsContext.js';
 // Mock VimModeContext hook
 vi.mock('../contexts/VimModeContext.js', () => ({
   useVimMode: vi.fn(() => ({
@@ -146,92 +145,33 @@ const createMockConfig = (overrides = {}) => ({
   ...overrides,
 });
 
-const createMockSettings = (merged = {}) => ({
-  merged: {
-    hideFooter: false,
-    showMemoryUsage: false,
-    ...merged,
-  },
-});
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const renderComposer = (
   uiState: UIState,
-  settings = createMockSettings(),
   config = createMockConfig(),
   uiActions = createMockUIActions(),
 ) =>
   render(
     <ConfigContext.Provider value={config as any}>
-      <SettingsContext.Provider value={settings as any}>
-        <UIStateContext.Provider value={uiState}>
-          <UIActionsContext.Provider value={uiActions}>
-            <Composer />
-          </UIActionsContext.Provider>
-        </UIStateContext.Provider>
-      </SettingsContext.Provider>
+      <UIStateContext.Provider value={uiState}>
+        <UIActionsContext.Provider value={uiActions}>
+          <Composer />
+        </UIActionsContext.Provider>
+      </UIStateContext.Provider>
     </ConfigContext.Provider>,
   );
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
 describe('Composer', () => {
-  describe('Footer Display Settings', () => {
-    it('renders Footer by default when hideFooter is false', () => {
+  describe('Footer Display', () => {
+    it('renders Footer by default', () => {
       const uiState = createMockUIState();
-      const settings = createMockSettings({ hideFooter: false });
 
-      const { lastFrame } = renderComposer(uiState, settings);
+      const { lastFrame } = renderComposer(uiState);
 
-      // Smoke check that the Footer renders when enabled.
+      // Smoke check that the Footer renders
       expect(lastFrame()).toContain('Footer');
     });
-
-    it('does NOT render Footer when hideFooter is true', () => {
-      const uiState = createMockUIState();
-      const settings = createMockSettings({ hideFooter: true });
-
-      const { lastFrame } = renderComposer(uiState, settings);
-
-      // Check for content that only appears IN the Footer component itself
-      expect(lastFrame()).not.toContain('[NORMAL]'); // Vim mode indicator
-      expect(lastFrame()).not.toContain('(main'); // Branch name with parentheses
-    });
-
-    it('passes correct props to Footer including vim mode when enabled', async () => {
-      const uiState = createMockUIState({
-        branchName: 'feature-branch',
-        errorCount: 2,
-        sessionStats: {
-          sessionId: 'test-session',
-          sessionStartTime: new Date(),
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          metrics: {} as any,
-          lastPromptTokenCount: 150,
-          promptCount: 5,
-        },
-      });
-      const config = createMockConfig({
-        getModel: vi.fn(() => 'gemini-1.5-flash'),
-        getTargetDir: vi.fn(() => '/project/path'),
-        getDebugMode: vi.fn(() => true),
-      });
-      const settings = createMockSettings({
-        hideFooter: false,
-        showMemoryUsage: true,
-      });
-      // Mock vim mode for this test
-      const { useVimMode } = await import('../contexts/VimModeContext.js');
-      vi.mocked(useVimMode).mockReturnValueOnce({
-        vimEnabled: true,
-        vimMode: 'INSERT',
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } as any);
-
-      const { lastFrame } = renderComposer(uiState, settings, config);
-
-      expect(lastFrame()).toContain('Footer');
-      // Footer should be rendered with all the state passed through
-    });
   });
 
   describe('Loading Indicator', () => {
@@ -261,7 +201,7 @@ describe('Composer', () => {
         getAccessibility: vi.fn(() => ({ disableLoadingPhrases: true })),
       });
 
-      const { lastFrame } = renderComposer(uiState, undefined, config);
+      const { lastFrame } = renderComposer(uiState, config);
 
       const output = lastFrame();
       expect(output).toContain('LoadingIndicator');
@@ -318,7 +258,8 @@ describe('Composer', () => {
   });
 
   describe('Context and Status Display', () => {
-    it('shows ContextSummaryDisplay in normal state', () => {
+    // Note: ContextSummaryDisplay and status prompts are now rendered in Footer, not Composer
+    it('shows empty space in normal state (ContextSummaryDisplay moved to Footer)', () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: false,
         ctrlDPressedOnce: false,
@@ -327,37 +268,43 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('ContextSummaryDisplay');
+      // ContextSummaryDisplay is now in Footer, so we just verify normal state renders
+      expect(lastFrame()).toBeDefined();
     });
 
-    it('shows Ctrl+C exit prompt when ctrlCPressedOnce is true', () => {
+    // Note: Ctrl+C, Ctrl+D, and Escape prompts are now rendered in Footer component
+    // These are tested in Footer.test.tsx
+    it('renders Footer which handles Ctrl+C exit prompt', () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Ctrl+C again to exit');
+      // Ctrl+C prompt is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
 
-    it('shows Ctrl+D exit prompt when ctrlDPressedOnce is true', () => {
+    it('renders Footer which handles Ctrl+D exit prompt', () => {
       const uiState = createMockUIState({
         ctrlDPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Ctrl+D again to exit');
+      // Ctrl+D prompt is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
 
-    it('shows escape prompt when showEscapePrompt is true', () => {
+    it('renders Footer which handles escape prompt', () => {
       const uiState = createMockUIState({
         showEscapePrompt: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Esc again to clear');
+      // Escape prompt is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
   });
 
@@ -382,7 +329,9 @@ describe('Composer', () => {
       expect(lastFrame()).not.toContain('InputPrompt');
     });
 
-    it('shows AutoAcceptIndicator when approval mode is not default and shell mode is inactive', () => {
+    // Note: AutoAcceptIndicator and ShellModeIndicator are now rendered inside Footer component
+    // These are tested in Footer.test.tsx
+    it('renders Footer which contains AutoAcceptIndicator when approval mode is not default', () => {
       const uiState = createMockUIState({
         showAutoAcceptIndicator: ApprovalMode.YOLO,
         shellModeActive: false,
@@ -390,17 +339,19 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('AutoAcceptIndicator');
+      // AutoAcceptIndicator is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
 
-    it('shows ShellModeIndicator when shell mode is active', () => {
+    it('renders Footer which contains ShellModeIndicator when shell mode is active', () => {
       const uiState = createMockUIState({
         shellModeActive: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('ShellModeIndicator');
+      // ShellModeIndicator is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
   });
 
diff --git a/packages/cli/src/ui/components/Composer.tsx b/packages/cli/src/ui/components/Composer.tsx
index 9052e4f4d..50b04a1d2 100644
--- a/packages/cli/src/ui/components/Composer.tsx
+++ b/packages/cli/src/ui/components/Composer.tsx
@@ -4,26 +4,20 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import { useMemo } from 'react';
+import { Box, useIsScreenReaderEnabled } from 'ink';
+import { useCallback, useMemo, useState } from 'react';
 import { LoadingIndicator } from './LoadingIndicator.js';
-import { ContextSummaryDisplay } from './ContextSummaryDisplay.js';
-import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
-import { ShellModeIndicator } from './ShellModeIndicator.js';
 import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
 import { InputPrompt, calculatePromptWidths } from './InputPrompt.js';
 import { Footer } from './Footer.js';
 import { ShowMoreLines } from './ShowMoreLines.js';
 import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
+import { KeyboardShortcuts } from './KeyboardShortcuts.js';
 import { OverflowProvider } from '../contexts/OverflowContext.js';
-import { theme } from '../semantic-colors.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
 import { useUIState } from '../contexts/UIStateContext.js';
 import { useUIActions } from '../contexts/UIActionsContext.js';
 import { useVimMode } from '../contexts/VimModeContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { ApprovalMode } from '@qwen-code/qwen-code-core';
 import { StreamingState } from '../types.js';
 import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
 import { FeedbackDialog } from '../FeedbackDialog.js';
@@ -31,16 +25,26 @@ import { t } from '../../i18n/index.js';
 
 export const Composer = () => {
   const config = useConfig();
-  const settings = useSettings();
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   const uiState = useUIState();
   const uiActions = useUIActions();
   const { vimEnabled } = useVimMode();
   const terminalWidth = process.stdout.columns;
-  const isNarrow = isNarrowWidth(terminalWidth);
   const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
 
-  const { contextFileNames, showAutoAcceptIndicator } = uiState;
+  const { showAutoAcceptIndicator } = uiState;
+
+  // State for keyboard shortcuts display toggle
+  const [showShortcuts, setShowShortcuts] = useState(false);
+  const handleToggleShortcuts = useCallback(() => {
+    setShowShortcuts((prev) => !prev);
+  }, []);
+
+  // State for suggestions visibility
+  const [showSuggestions, setShowSuggestions] = useState(false);
+  const handleSuggestionsVisibilityChange = useCallback((visible: boolean) => {
+    setShowSuggestions(visible);
+  }, []);
 
   // Use the container width of InputPrompt for width of DetailedMessagesDisplay
   const { containerWidth } = useMemo(
@@ -49,7 +53,7 @@ export const Composer = () => {
   );
 
   return (
-    <Box flexDirection="column">
+    <Box flexDirection="column" marginTop={1}>
       {!uiState.embeddedShellFocused && (
         <LoadingIndicator
           thought={
@@ -71,55 +75,6 @@ export const Composer = () => {
 
       <QueuedMessageDisplay messageQueue={uiState.messageQueue} />
 
-      <Box
-        marginTop={1}
-        justifyContent={
-          settings.merged.ui?.hideContextSummary
-            ? 'flex-start'
-            : 'space-between'
-        }
-        width="100%"
-        flexDirection={isNarrow ? 'column' : 'row'}
-        alignItems={isNarrow ? 'flex-start' : 'center'}
-      >
-        <Box marginRight={1}>
-          {process.env['GEMINI_SYSTEM_MD'] && (
-            <Text color={theme.status.error}>|⌐■_■| </Text>
-          )}
-          {uiState.ctrlCPressedOnce ? (
-            <Text color={theme.status.warning}>
-              {t('Press Ctrl+C again to exit.')}
-            </Text>
-          ) : uiState.ctrlDPressedOnce ? (
-            <Text color={theme.status.warning}>
-              {t('Press Ctrl+D again to exit.')}
-            </Text>
-          ) : uiState.showEscapePrompt ? (
-            <Text color={theme.text.secondary}>
-              {t('Press Esc again to clear.')}
-            </Text>
-          ) : (
-            !settings.merged.ui?.hideContextSummary && (
-              <ContextSummaryDisplay
-                ideContext={uiState.ideContextState}
-                geminiMdFileCount={uiState.geminiMdFileCount}
-                contextFileNames={contextFileNames}
-                mcpServers={config.getMcpServers()}
-                blockedMcpServers={config.getBlockedMcpServers()}
-                showToolDescriptions={uiState.showToolDescriptions}
-              />
-            )
-          )}
-        </Box>
-        <Box paddingTop={isNarrow ? 1 : 0}>
-          {showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
-            !uiState.shellModeActive && (
-              <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
-            )}
-          {uiState.shellModeActive && <ShellModeIndicator />}
-        </Box>
-      </Box>
-
       {uiState.showErrorDetails && (
         <OverflowProvider>
           <Box flexDirection="column">
@@ -152,6 +107,9 @@ export const Composer = () => {
           setShellModeActive={uiActions.setShellModeActive}
           approvalMode={showAutoAcceptIndicator}
           onEscapePromptChange={uiActions.onEscapePromptChange}
+          onToggleShortcuts={handleToggleShortcuts}
+          showShortcuts={showShortcuts}
+          onSuggestionsVisibilityChange={handleSuggestionsVisibilityChange}
           focus={true}
           vimHandleInput={uiActions.vimHandleInput}
           isEmbeddedShellFocused={uiState.embeddedShellFocused}
@@ -163,7 +121,13 @@ export const Composer = () => {
         />
       )}
 
-      {!settings.merged.ui?.hideFooter && !isScreenReaderEnabled && <Footer />}
+      {/* Exclusive area: only one component visible at a time */}
+      {!showSuggestions &&
+        (showShortcuts ? (
+          <KeyboardShortcuts />
+        ) : (
+          !isScreenReaderEnabled && <Footer />
+        ))}
     </Box>
   );
 };
diff --git a/packages/cli/src/ui/components/ConsentPrompt.test.tsx b/packages/cli/src/ui/components/ConsentPrompt.test.tsx
index 4cbd2b1b8..da31af9aa 100644
--- a/packages/cli/src/ui/components/ConsentPrompt.test.tsx
+++ b/packages/cli/src/ui/components/ConsentPrompt.test.tsx
@@ -44,7 +44,7 @@ describe('ConsentPrompt', () => {
       {
         isPending: true,
         text: prompt,
-        terminalWidth,
+        contentWidth: terminalWidth,
       },
       undefined,
     );
diff --git a/packages/cli/src/ui/components/ConsentPrompt.tsx b/packages/cli/src/ui/components/ConsentPrompt.tsx
index efa6b136a..0fae2c295 100644
--- a/packages/cli/src/ui/components/ConsentPrompt.tsx
+++ b/packages/cli/src/ui/components/ConsentPrompt.tsx
@@ -32,7 +32,7 @@ export const ConsentPrompt = (props: ConsentPromptProps) => {
         <MarkdownDisplay
           isPending={true}
           text={prompt}
-          terminalWidth={terminalWidth}
+          contentWidth={terminalWidth}
         />
       ) : (
         prompt
diff --git a/packages/cli/src/ui/components/ContextUsageDisplay.tsx b/packages/cli/src/ui/components/ContextUsageDisplay.tsx
index 7e585bed4..d21a728e1 100644
--- a/packages/cli/src/ui/components/ContextUsageDisplay.tsx
+++ b/packages/cli/src/ui/components/ContextUsageDisplay.tsx
@@ -17,15 +17,19 @@ export const ContextUsageDisplay = ({
   model: string;
   terminalWidth: number;
 }) => {
-  const percentage = promptTokenCount / tokenLimit(model);
-  const percentageLeft = ((1 - percentage) * 100).toFixed(0);
+  if (promptTokenCount === 0) {
+    return null;
+  }
 
-  const label = terminalWidth < 100 ? '%' : '% context left';
+  const percentage = promptTokenCount / tokenLimit(model);
+  const percentageUsed = (percentage * 100).toFixed(1);
+
+  const label = terminalWidth < 100 ? '% used' : '% context used';
 
   return (
     <Text color={theme.text.secondary}>
-      ({percentageLeft}
-      {label})
+      {percentageUsed}
+      {label}
     </Text>
   );
 };
diff --git a/packages/cli/src/ui/components/DialogManager.tsx b/packages/cli/src/ui/components/DialogManager.tsx
index 6ff9f4aae..02b514b14 100644
--- a/packages/cli/src/ui/components/DialogManager.tsx
+++ b/packages/cli/src/ui/components/DialogManager.tsx
@@ -152,12 +152,38 @@ export const DialogManager = ({
       </Box>
     );
   }
+  if (uiState.isEditorDialogOpen) {
+    return (
+      <Box flexDirection="column">
+        {uiState.editorError && (
+          <Box marginBottom={1}>
+            <Text color={theme.status.error}>{uiState.editorError}</Text>
+          </Box>
+        )}
+        <EditorSettingsDialog
+          onSelect={uiActions.handleEditorSelect}
+          settings={settings}
+          onExit={uiActions.exitEditorDialog}
+        />
+      </Box>
+    );
+  }
   if (uiState.isSettingsDialogOpen) {
     return (
       <Box flexDirection="column">
         <SettingsDialog
           settings={settings}
-          onSelect={() => uiActions.closeSettingsDialog()}
+          onSelect={(settingName) => {
+            if (settingName === 'ui.theme') {
+              uiActions.openThemeDialog();
+              return;
+            }
+            if (settingName === 'general.preferredEditor') {
+              uiActions.openEditorDialog();
+              return;
+            }
+            uiActions.closeSettingsDialog();
+          }}
           onRestartRequest={() => process.exit(0)}
           availableTerminalHeight={terminalHeight - staticExtraHeight}
           config={config}
@@ -237,22 +263,6 @@ export const DialogManager = ({
       );
     }
   }
-  if (uiState.isEditorDialogOpen) {
-    return (
-      <Box flexDirection="column">
-        {uiState.editorError && (
-          <Box marginBottom={1}>
-            <Text color={theme.status.error}>{uiState.editorError}</Text>
-          </Box>
-        )}
-        <EditorSettingsDialog
-          onSelect={uiActions.handleEditorSelect}
-          settings={settings}
-          onExit={uiActions.exitEditorDialog}
-        />
-      </Box>
-    );
-  }
   if (uiState.isPermissionsDialogOpen) {
     return (
       <PermissionsModifyTrustDialog
diff --git a/packages/cli/src/ui/components/EditorSettingsDialog.tsx b/packages/cli/src/ui/components/EditorSettingsDialog.tsx
index 6926bf41d..cd77c230e 100644
--- a/packages/cli/src/ui/components/EditorSettingsDialog.tsx
+++ b/packages/cli/src/ui/components/EditorSettingsDialog.tsx
@@ -14,6 +14,7 @@ import {
   type EditorDisplay,
 } from '../editors/editorSettingsManager.js';
 import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { ScopeSelector } from './shared/ScopeSelector.js';
 import type { LoadedSettings } from '../../config/settings.js';
 import { SettingScope } from '../../config/settings.js';
 import type { EditorType } from '@qwen-code/qwen-code-core';
@@ -35,13 +36,12 @@ export function EditorSettingsDialog({
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
     SettingScope.User,
   );
-  const [focusedSection, setFocusedSection] = useState<'editor' | 'scope'>(
-    'editor',
-  );
+  const [mode, setMode] = useState<'editor' | 'scope'>('editor');
+
   useKeypress(
     (key) => {
       if (key.name === 'tab') {
-        setFocusedSection((prev) => (prev === 'editor' ? 'scope' : 'editor'));
+        setMode((prev) => (prev === 'editor' ? 'scope' : 'editor'));
       }
       if (key.name === 'escape') {
         onExit();
@@ -65,23 +65,6 @@ export function EditorSettingsDialog({
     editorIndex = 0;
   }
 
-  const scopeItems = [
-    {
-      get label() {
-        return t('User Settings');
-      },
-      value: SettingScope.User,
-      key: SettingScope.User,
-    },
-    {
-      get label() {
-        return t('Workspace Settings');
-      },
-      value: SettingScope.Workspace,
-      key: SettingScope.Workspace,
-    },
-  ];
-
   const handleEditorSelect = (editorType: EditorType | 'not_set') => {
     if (editorType === 'not_set') {
       onSelect(undefined, selectedScope);
@@ -92,7 +75,11 @@ export function EditorSettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     setSelectedScope(scope);
-    setFocusedSection('editor');
+    setMode('editor');
+  };
+
+  const handleScopeHighlight = (scope: SettingScope) => {
+    setSelectedScope(scope);
   };
 
   let otherScopeModifiedMessage = '';
@@ -131,54 +118,59 @@ export function EditorSettingsDialog({
       width="100%"
     >
       <Box flexDirection="column" width="45%" paddingRight={2}>
-        <Text bold={focusedSection === 'editor'}>
-          {focusedSection === 'editor' ? '> ' : '  '}Select Editor{' '}
-          <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
-        </Text>
-        <RadioButtonSelect
-          items={editorItems.map((item) => ({
-            label: item.name,
-            value: item.type,
-            disabled: item.disabled,
-            key: item.type,
-          }))}
-          initialIndex={editorIndex}
-          onSelect={handleEditorSelect}
-          isFocused={focusedSection === 'editor'}
-          key={selectedScope}
-        />
-
-        <Box marginTop={1} flexDirection="column">
-          <Text bold={focusedSection === 'scope'}>
-            {focusedSection === 'scope' ? '> ' : '  '}
-            {t('Apply To')}
-          </Text>
-          <RadioButtonSelect
-            items={scopeItems}
-            initialIndex={0}
+        {mode === 'editor' ? (
+          <Box flexDirection="column">
+            <Text bold={mode === 'editor'} wrap="truncate">
+              {mode === 'editor' ? '> ' : '  '}
+              {t('Select Editor')}{' '}
+              <Text color={theme.text.secondary}>
+                {otherScopeModifiedMessage}
+              </Text>
+            </Text>
+            <Box height={1} />
+            <RadioButtonSelect
+              items={editorItems.map((item) => ({
+                label: item.name,
+                value: item.type,
+                disabled: item.disabled,
+                key: item.type,
+              }))}
+              initialIndex={editorIndex}
+              onSelect={handleEditorSelect}
+              isFocused={mode === 'editor'}
+              key={selectedScope}
+            />
+          </Box>
+        ) : (
+          <ScopeSelector
             onSelect={handleScopeSelect}
-            isFocused={focusedSection === 'scope'}
+            onHighlight={handleScopeHighlight}
+            isFocused={mode === 'scope'}
+            initialScope={selectedScope}
           />
-        </Box>
+        )}
 
         <Box marginTop={1}>
-          <Text color={theme.text.secondary}>
-            (Use Enter to select, Tab to change focus)
+          <Text color={theme.text.secondary} wrap="truncate">
+            {mode === 'editor'
+              ? t('(Use Enter to select, Tab to configure scope)')
+              : t('(Use Enter to apply scope, Tab to go back)')}
           </Text>
         </Box>
       </Box>
 
       <Box flexDirection="column" width="55%" paddingLeft={2}>
         <Text bold color={theme.text.primary}>
-          Editor Preference
+          {t('Editor Preference')}
         </Text>
         <Box flexDirection="column" gap={1} marginTop={1}>
           <Text color={theme.text.secondary}>
-            These editors are currently supported. Please note that some editors
-            cannot be used in sandbox mode.
+            {t(
+              'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.',
+            )}
           </Text>
           <Text color={theme.text.secondary}>
-            Your preferred editor is:{' '}
+            {t('Your preferred editor is:')}{' '}
             <Text
               color={
                 mergedEditorName === 'None'
diff --git a/packages/cli/src/ui/components/Footer.test.tsx b/packages/cli/src/ui/components/Footer.test.tsx
index 3d9b91b8a..072b24c97 100644
--- a/packages/cli/src/ui/components/Footer.test.tsx
+++ b/packages/cli/src/ui/components/Footer.test.tsx
@@ -8,41 +8,23 @@ import { render } from 'ink-testing-library';
 import { describe, it, expect, vi } from 'vitest';
 import { Footer } from './Footer.js';
 import * as useTerminalSize from '../hooks/useTerminalSize.js';
-import { tildeifyPath } from '@qwen-code/qwen-code-core';
 import { type UIState, UIStateContext } from '../contexts/UIStateContext.js';
 import { ConfigContext } from '../contexts/ConfigContext.js';
-import { SettingsContext } from '../contexts/SettingsContext.js';
-import type { LoadedSettings } from '../../config/settings.js';
 import { VimModeProvider } from '../contexts/VimModeContext.js';
+import type { LoadedSettings } from '../../config/settings.js';
 
 vi.mock('../hooks/useTerminalSize.js');
 const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize);
 
-vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
-  return {
-    ...original,
-    shortenPath: (p: string, len: number) => {
-      if (p.length > len) {
-        return '...' + p.slice(p.length - len + 3);
-      }
-      return p;
-    },
-  };
-});
-
 const defaultProps = {
   model: 'gemini-pro',
-  targetDir:
-    '/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long',
-  branchName: 'main',
 };
 
 const createMockConfig = (overrides = {}) => ({
   getModel: vi.fn(() => defaultProps.model),
-  getTargetDir: vi.fn(() => defaultProps.targetDir),
   getDebugMode: vi.fn(() => false),
+  getMcpServers: vi.fn(() => ({})),
+  getBlockedMcpServers: vi.fn(() => []),
   ...overrides,
 });
 
@@ -51,46 +33,31 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
     sessionStats: {
       lastPromptTokenCount: 100,
     },
-    branchName: defaultProps.branchName,
+    geminiMdFileCount: 0,
+    contextFileNames: [],
+    showToolDescriptions: false,
+    ideContextState: undefined,
     ...overrides,
   }) as UIState;
 
-const createDefaultSettings = (
-  options: {
-    showMemoryUsage?: boolean;
-    hideCWD?: boolean;
-    hideSandboxStatus?: boolean;
-    hideModelInfo?: boolean;
-  } = {},
-): LoadedSettings =>
+const createMockSettings = (): LoadedSettings =>
   ({
     merged: {
-      ui: {
-        showMemoryUsage: options.showMemoryUsage,
-        footer: {
-          hideCWD: options.hideCWD,
-          hideSandboxStatus: options.hideSandboxStatus,
-          hideModelInfo: options.hideModelInfo,
-        },
+      general: {
+        vimMode: false,
       },
     },
-  }) as never;
+  }) as LoadedSettings;
 
-const renderWithWidth = (
-  width: number,
-  uiState: UIState,
-  settings: LoadedSettings = createDefaultSettings(),
-) => {
+const renderWithWidth = (width: number, uiState: UIState) => {
   useTerminalSizeMock.mockReturnValue({ columns: width, rows: 24 });
   return render(
     <ConfigContext.Provider value={createMockConfig() as never}>
-      <SettingsContext.Provider value={settings}>
-        <VimModeProvider settings={settings}>
-          <UIStateContext.Provider value={uiState}>
-            <Footer />
-          </UIStateContext.Provider>
-        </VimModeProvider>
-      </SettingsContext.Provider>
+      <VimModeProvider settings={createMockSettings()}>
+        <UIStateContext.Provider value={uiState}>
+          <Footer />
+        </UIStateContext.Provider>
+      </VimModeProvider>
     </ConfigContext.Provider>,
   );
 };
@@ -101,161 +68,28 @@ describe('<Footer />', () => {
     expect(lastFrame()).toBeDefined();
   });
 
-  describe('path display', () => {
-    it('should display a shortened path on a narrow terminal', () => {
-      const { lastFrame } = renderWithWidth(79, createMockUIState());
-      const tildePath = tildeifyPath(defaultProps.targetDir);
-      const pathLength = Math.max(20, Math.floor(79 * 0.25));
-      const expectedPath =
-        '...' + tildePath.slice(tildePath.length - pathLength + 3);
-      expect(lastFrame()).toContain(expectedPath);
-    });
-
-    it('should use wide layout at 80 columns', () => {
-      const { lastFrame } = renderWithWidth(80, createMockUIState());
-      const tildePath = tildeifyPath(defaultProps.targetDir);
-      const expectedPath =
-        '...' + tildePath.slice(tildePath.length - 80 * 0.25 + 3);
-      expect(lastFrame()).toContain(expectedPath);
-    });
-  });
-
-  it('displays the branch name when provided', () => {
+  it('does not display the working directory or branch name', () => {
     const { lastFrame } = renderWithWidth(120, createMockUIState());
-    expect(lastFrame()).toContain(`(${defaultProps.branchName}*)`);
+    expect(lastFrame()).not.toMatch(/\(.*\*\)/);
   });
 
-  it('does not display the branch name when not provided', () => {
-    const { lastFrame } = renderWithWidth(
-      120,
-      createMockUIState({
-        branchName: undefined,
-      }),
-    );
-    expect(lastFrame()).not.toContain(`(${defaultProps.branchName}*)`);
-  });
-
-  it('displays the model name and context percentage', () => {
+  it('displays the context percentage', () => {
     const { lastFrame } = renderWithWidth(120, createMockUIState());
-    expect(lastFrame()).toContain(defaultProps.model);
-    expect(lastFrame()).toMatch(/\(\d+% context left\)/);
+    expect(lastFrame()).toMatch(/\d+(\.\d+)?% context used/);
   });
 
-  it('displays the model name and abbreviated context percentage', () => {
+  it('displays the abbreviated context percentage on narrow terminal', () => {
     const { lastFrame } = renderWithWidth(99, createMockUIState());
-    expect(lastFrame()).toContain(defaultProps.model);
-    expect(lastFrame()).toMatch(/\(\d+%\)/);
+    expect(lastFrame()).toMatch(/\d+%/);
   });
 
-  describe('sandbox and trust info', () => {
-    it('should display untrusted when isTrustedFolder is false', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: false,
-        }),
-      );
-      expect(lastFrame()).toContain('untrusted');
-    });
-
-    it('should display custom sandbox info when SANDBOX env is set', () => {
-      vi.stubEnv('SANDBOX', 'gemini-cli-test-sandbox');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: undefined,
-        }),
-      );
-      expect(lastFrame()).toContain('test');
-      vi.unstubAllEnvs();
-    });
-
-    it('should display macOS Seatbelt info when SANDBOX is sandbox-exec', () => {
-      vi.stubEnv('SANDBOX', 'sandbox-exec');
-      vi.stubEnv('SEATBELT_PROFILE', 'test-profile');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: true,
-        }),
-      );
-      expect(lastFrame()).toMatch(/macOS Seatbelt.*\(test-profile\)/s);
-      vi.unstubAllEnvs();
-    });
-
-    it('should display "no sandbox" when SANDBOX is not set and folder is trusted', () => {
-      // Clear any SANDBOX env var that might be set.
-      vi.stubEnv('SANDBOX', '');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: true,
-        }),
-      );
-      expect(lastFrame()).toContain('no sandbox');
-      vi.unstubAllEnvs();
-    });
-
-    it('should prioritize untrusted message over sandbox info', () => {
-      vi.stubEnv('SANDBOX', 'gemini-cli-test-sandbox');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: false,
-        }),
-      );
-      expect(lastFrame()).toContain('untrusted');
-      expect(lastFrame()).not.toMatch(/test-sandbox/s);
-      vi.unstubAllEnvs();
-    });
-  });
-
-  describe('footer configuration filtering (golden snapshots)', () => {
-    it('renders complete footer with all sections visible (baseline)', () => {
+  describe('footer rendering (golden snapshots)', () => {
+    it('renders complete footer on wide terminal', () => {
       const { lastFrame } = renderWithWidth(120, createMockUIState());
       expect(lastFrame()).toMatchSnapshot('complete-footer-wide');
     });
 
-    it('renders footer with all optional sections hidden (minimal footer)', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState(),
-        createDefaultSettings({
-          hideCWD: true,
-          hideSandboxStatus: true,
-          hideModelInfo: true,
-        }),
-      );
-      expect(lastFrame()).toMatchSnapshot('footer-minimal');
-    });
-
-    it('renders footer with only model info hidden (partial filtering)', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState(),
-        createDefaultSettings({
-          hideCWD: false,
-          hideSandboxStatus: false,
-          hideModelInfo: true,
-        }),
-      );
-      expect(lastFrame()).toMatchSnapshot('footer-no-model');
-    });
-
-    it('renders footer with CWD and model info hidden to test alignment (only sandbox visible)', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState(),
-        createDefaultSettings({
-          hideCWD: true,
-          hideSandboxStatus: false,
-          hideModelInfo: true,
-        }),
-      );
-      expect(lastFrame()).toMatchSnapshot('footer-only-sandbox');
-    });
-
-    it('renders complete footer in narrow terminal (baseline narrow)', () => {
+    it('renders complete footer on narrow terminal', () => {
       const { lastFrame } = renderWithWidth(79, createMockUIState());
       expect(lastFrame()).toMatchSnapshot('complete-footer-narrow');
     });
diff --git a/packages/cli/src/ui/components/Footer.tsx b/packages/cli/src/ui/components/Footer.tsx
index 71f278df3..9bb55d431 100644
--- a/packages/cli/src/ui/components/Footer.tsx
+++ b/packages/cli/src/ui/components/Footer.tsx
@@ -7,159 +7,134 @@
 import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
-import { shortenPath, tildeifyPath } from '@qwen-code/qwen-code-core';
 import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
-import process from 'node:process';
-import Gradient from 'ink-gradient';
-import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
 import { ContextUsageDisplay } from './ContextUsageDisplay.js';
-import { DebugProfiler } from './DebugProfiler.js';
 import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
+import { ShellModeIndicator } from './ShellModeIndicator.js';
+import { isNarrowWidth } from '../utils/isNarrowWidth.js';
 
 import { useUIState } from '../contexts/UIStateContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
 import { useVimMode } from '../contexts/VimModeContext.js';
+import { ApprovalMode } from '@qwen-code/qwen-code-core';
+import { t } from '../../i18n/index.js';
 
 export const Footer: React.FC = () => {
   const uiState = useUIState();
   const config = useConfig();
-  const settings = useSettings();
   const { vimEnabled, vimMode } = useVimMode();
 
   const {
     model,
-    targetDir,
-    debugMode,
-    branchName,
-    debugMessage,
     errorCount,
     showErrorDetails,
     promptTokenCount,
-    nightly,
-    isTrustedFolder,
+    showAutoAcceptIndicator,
   } = {
     model: config.getModel(),
-    targetDir: config.getTargetDir(),
-    debugMode: config.getDebugMode(),
-    branchName: uiState.branchName,
-    debugMessage: uiState.debugMessage,
     errorCount: uiState.errorCount,
     showErrorDetails: uiState.showErrorDetails,
     promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
-    nightly: uiState.nightly,
-    isTrustedFolder: uiState.isTrustedFolder,
+    showAutoAcceptIndicator: uiState.showAutoAcceptIndicator,
   };
 
-  const showMemoryUsage =
-    config.getDebugMode() || settings.merged.ui?.showMemoryUsage || false;
-  const hideCWD = settings.merged.ui?.footer?.hideCWD || false;
-  const hideSandboxStatus =
-    settings.merged.ui?.footer?.hideSandboxStatus || false;
-  const hideModelInfo = settings.merged.ui?.footer?.hideModelInfo || false;
+  const showErrorIndicator = !showErrorDetails && errorCount > 0;
 
   const { columns: terminalWidth } = useTerminalSize();
+  const isNarrow = isNarrowWidth(terminalWidth);
 
-  const pathLength = Math.max(20, Math.floor(terminalWidth * 0.25));
-  const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
+  // Determine sandbox info from environment
+  const sandboxEnv = process.env['SANDBOX'];
+  const sandboxInfo = sandboxEnv
+    ? sandboxEnv === 'sandbox-exec'
+      ? 'seatbelt'
+      : sandboxEnv.startsWith('qwen-code')
+        ? 'docker'
+        : sandboxEnv
+    : null;
 
-  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
-  const displayVimMode = vimEnabled ? vimMode : undefined;
+  // Check if debug mode is enabled
+  const debugMode = config.getDebugMode();
+
+  // Left section should show exactly ONE thing at any time, in priority order.
+  const leftContent = uiState.ctrlCPressedOnce ? (
+    <Text color={theme.status.warning}>{t('Press Ctrl+C again to exit.')}</Text>
+  ) : uiState.ctrlDPressedOnce ? (
+    <Text color={theme.status.warning}>{t('Press Ctrl+D again to exit.')}</Text>
+  ) : uiState.showEscapePrompt ? (
+    <Text color={theme.text.secondary}>{t('Press Esc again to clear.')}</Text>
+  ) : vimEnabled && vimMode === 'INSERT' ? (
+    <Text color={theme.text.secondary}>-- INSERT --</Text>
+  ) : uiState.shellModeActive ? (
+    <ShellModeIndicator />
+  ) : showAutoAcceptIndicator !== undefined &&
+    showAutoAcceptIndicator !== ApprovalMode.DEFAULT ? (
+    <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
+  ) : (
+    <Text color={theme.text.secondary}>{t('? for shortcuts')}</Text>
+  );
+
+  const rightItems: Array<{ key: string; node: React.ReactNode }> = [];
+  if (sandboxInfo) {
+    rightItems.push({
+      key: 'sandbox',
+      node: <Text color={theme.status.success}>🔒 {sandboxInfo}</Text>,
+    });
+  }
+  if (debugMode) {
+    rightItems.push({
+      key: 'debug',
+      node: <Text color={theme.status.warning}>Debug Mode</Text>,
+    });
+  }
+  if (promptTokenCount > 0) {
+    rightItems.push({
+      key: 'context',
+      node: (
+        <Text color={theme.text.accent}>
+          <ContextUsageDisplay
+            promptTokenCount={promptTokenCount}
+            model={model}
+            terminalWidth={terminalWidth}
+          />
+        </Text>
+      ),
+    });
+  }
+  if (showErrorIndicator) {
+    rightItems.push({
+      key: 'errors',
+      node: <ConsoleSummaryDisplay errorCount={errorCount} />,
+    });
+  }
 
   return (
     <Box
-      justifyContent={justifyContent}
+      justifyContent="space-between"
       width="100%"
       flexDirection="row"
       alignItems="center"
     >
-      {(debugMode || displayVimMode || !hideCWD) && (
-        <Box>
-          {debugMode && <DebugProfiler />}
-          {displayVimMode && (
-            <Text color={theme.text.secondary}>[{displayVimMode}] </Text>
-          )}
-          {!hideCWD &&
-            (nightly ? (
-              <Gradient colors={theme.ui.gradient}>
-                <Text>
-                  {displayPath}
-                  {branchName && <Text> ({branchName}*)</Text>}
-                </Text>
-              </Gradient>
-            ) : (
-              <Text color={theme.text.link}>
-                {displayPath}
-                {branchName && (
-                  <Text color={theme.text.secondary}> ({branchName}*)</Text>
-                )}
-              </Text>
-            ))}
-          {debugMode && (
-            <Text color={theme.status.error}>
-              {' ' + (debugMessage || '--debug')}
-            </Text>
-          )}
-        </Box>
-      )}
+      {/* Left Section: Exactly one status line (exit prompts / mode indicator / default hint) */}
+      <Box
+        marginLeft={2}
+        justifyContent="flex-start"
+        flexDirection={isNarrow ? 'column' : 'row'}
+        alignItems={isNarrow ? 'flex-start' : 'center'}
+      >
+        {leftContent}
+      </Box>
 
-      {/* Middle Section: Centered Trust/Sandbox Info */}
-      {!hideSandboxStatus && (
-        <Box
-          flexGrow={1}
-          alignItems="center"
-          justifyContent="center"
-          display="flex"
-        >
-          {isTrustedFolder === false ? (
-            <Text color={theme.status.warning}>untrusted</Text>
-          ) : process.env['SANDBOX'] &&
-            process.env['SANDBOX'] !== 'sandbox-exec' ? (
-            <Text color="green">
-              {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
-            </Text>
-          ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
-            <Text color={theme.status.warning}>
-              macOS Seatbelt{' '}
-              <Text color={theme.text.secondary}>
-                ({process.env['SEATBELT_PROFILE']})
-              </Text>
-            </Text>
-          ) : (
-            <Text color={theme.status.error}>
-              no sandbox
-              {terminalWidth >= 100 && (
-                <Text color={theme.text.secondary}> (see /docs)</Text>
-              )}
-            </Text>
-          )}
-        </Box>
-      )}
-
-      {/* Right Section: Gemini Label and Console Summary */}
-      {!hideModelInfo && (
-        <Box alignItems="center" justifyContent="flex-end">
-          <Box alignItems="center">
-            <Text color={theme.text.accent}>
-              {model}{' '}
-              <ContextUsageDisplay
-                promptTokenCount={promptTokenCount}
-                model={model}
-                terminalWidth={terminalWidth}
-              />
-            </Text>
-            {showMemoryUsage && <MemoryUsageDisplay />}
+      {/* Right Section: Sandbox Info, Debug Mode, Context Usage, and Console Summary */}
+      <Box alignItems="center" justifyContent="flex-end" marginRight={2}>
+        {rightItems.map(({ key, node }, index) => (
+          <Box key={key} alignItems="center">
+            {index > 0 && <Text color={theme.text.secondary}> | </Text>}
+            {node}
           </Box>
-          <Box alignItems="center" paddingLeft={2}>
-            {!showErrorDetails && errorCount > 0 && (
-              <Box>
-                <Text color={theme.ui.symbol}>| </Text>
-                <ConsoleSummaryDisplay errorCount={errorCount} />
-              </Box>
-            )}
-          </Box>
-        </Box>
-      )}
+        ))}
+      </Box>
     </Box>
   );
 };
diff --git a/packages/cli/src/ui/components/Header.test.tsx b/packages/cli/src/ui/components/Header.test.tsx
index 95ed3f07a..1d3a4d7f1 100644
--- a/packages/cli/src/ui/components/Header.test.tsx
+++ b/packages/cli/src/ui/components/Header.test.tsx
@@ -6,39 +6,96 @@
 
 import { render } from 'ink-testing-library';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { AuthType } from '@qwen-code/qwen-code-core';
 import { Header } from './Header.js';
 import * as useTerminalSize from '../hooks/useTerminalSize.js';
-import { longAsciiLogo } from './AsciiArt.js';
 
 vi.mock('../hooks/useTerminalSize.js');
+const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize);
+
+const defaultProps = {
+  version: '1.0.0',
+  authType: AuthType.QWEN_OAUTH,
+  model: 'qwen-coder-plus',
+  workingDirectory: '/home/user/projects/test',
+};
 
 describe('<Header />', () => {
-  beforeEach(() => {});
-
-  it('renders the long logo on a wide terminal', () => {
-    vi.spyOn(useTerminalSize, 'useTerminalSize').mockReturnValue({
-      columns: 120,
-      rows: 20,
-    });
-    const { lastFrame } = render(<Header version="1.0.0" nightly={false} />);
-    expect(lastFrame()).toContain(longAsciiLogo);
+  beforeEach(() => {
+    // Default to wide terminal (shows both logo and info panel)
+    useTerminalSizeMock.mockReturnValue({ columns: 120, rows: 24 });
   });
 
-  it('renders custom ASCII art when provided', () => {
+  it('renders the ASCII logo on wide terminal', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Check that parts of the shortAsciiLogo are rendered
+    expect(lastFrame()).toContain('██╔═══██╗');
+  });
+
+  it('hides the ASCII logo on narrow terminal', () => {
+    useTerminalSizeMock.mockReturnValue({ columns: 60, rows: 24 });
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Should not contain the logo but still show the info panel
+    expect(lastFrame()).not.toContain('██╔═══██╗');
+    expect(lastFrame()).toContain('>_ Qwen Code');
+  });
+
+  it('renders custom ASCII art when provided on wide terminal', () => {
     const customArt = 'CUSTOM ART';
     const { lastFrame } = render(
-      <Header version="1.0.0" nightly={false} customAsciiArt={customArt} />,
+      <Header {...defaultProps} customAsciiArt={customArt} />,
     );
     expect(lastFrame()).toContain(customArt);
   });
 
-  it('displays the version number when nightly is true', () => {
-    const { lastFrame } = render(<Header version="1.0.0" nightly={true} />);
+  it('displays the version number', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
     expect(lastFrame()).toContain('v1.0.0');
   });
 
-  it('does not display the version number when nightly is false', () => {
-    const { lastFrame } = render(<Header version="1.0.0" nightly={false} />);
-    expect(lastFrame()).not.toContain('v1.0.0');
+  it('displays Qwen Code title with >_ prefix', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    expect(lastFrame()).toContain('>_ Qwen Code');
+  });
+
+  it('displays auth type and model', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    expect(lastFrame()).toContain('Qwen OAuth');
+    expect(lastFrame()).toContain('qwen-coder-plus');
+  });
+
+  it('displays working directory', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    expect(lastFrame()).toContain('/home/user/projects/test');
+  });
+
+  it('renders a custom working directory display', () => {
+    const { lastFrame } = render(
+      <Header {...defaultProps} workingDirectory="custom display" />,
+    );
+    expect(lastFrame()).toContain('custom display');
+  });
+
+  it('displays working directory without branch name', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Branch name is no longer shown in header
+    expect(lastFrame()).toContain('/home/user/projects/test');
+    expect(lastFrame()).not.toContain('(main*)');
+  });
+
+  it('formats home directory with tilde', () => {
+    const { lastFrame } = render(
+      <Header {...defaultProps} workingDirectory="/Users/testuser/projects" />,
+    );
+    // The actual home dir replacement depends on os.homedir()
+    // Just verify the path is shown
+    expect(lastFrame()).toContain('projects');
+  });
+
+  it('renders with border around info panel', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Check for border characters (round border style uses these)
+    expect(lastFrame()).toContain('╭');
+    expect(lastFrame()).toContain('╯');
   });
 });
diff --git a/packages/cli/src/ui/components/Header.tsx b/packages/cli/src/ui/components/Header.tsx
index 694752312..1e301457f 100644
--- a/packages/cli/src/ui/components/Header.tsx
+++ b/packages/cli/src/ui/components/Header.tsx
@@ -7,64 +7,175 @@
 import type React from 'react';
 import { Box, Text } from 'ink';
 import Gradient from 'ink-gradient';
+import { AuthType, shortenPath, tildeifyPath } from '@qwen-code/qwen-code-core';
 import { theme } from '../semantic-colors.js';
-import { shortAsciiLogo, longAsciiLogo, tinyAsciiLogo } from './AsciiArt.js';
-import { getAsciiArtWidth } from '../utils/textUtils.js';
+import { shortAsciiLogo } from './AsciiArt.js';
+import { getAsciiArtWidth, getCachedStringWidth } from '../utils/textUtils.js';
 import { useTerminalSize } from '../hooks/useTerminalSize.js';
 
 interface HeaderProps {
   customAsciiArt?: string; // For user-defined ASCII art
   version: string;
-  nightly: boolean;
+  authType?: AuthType;
+  model: string;
+  workingDirectory: string;
+}
+
+function titleizeAuthType(value: string): string {
+  return value
+    .split(/[-_]/g)
+    .filter(Boolean)
+    .map((part) => {
+      if (part.toLowerCase() === 'ai') {
+        return 'AI';
+      }
+      return part.charAt(0).toUpperCase() + part.slice(1);
+    })
+    .join(' ');
+}
+
+// Format auth type for display
+function formatAuthType(authType?: AuthType): string {
+  if (!authType) {
+    return 'Unknown';
+  }
+
+  switch (authType) {
+    case AuthType.QWEN_OAUTH:
+      return 'Qwen OAuth';
+    case AuthType.USE_OPENAI:
+      return 'OpenAI';
+    case AuthType.USE_GEMINI:
+      return 'Gemini';
+    case AuthType.USE_VERTEX_AI:
+      return 'Vertex AI';
+    case AuthType.USE_ANTHROPIC:
+      return 'Anthropic';
+    default:
+      return titleizeAuthType(String(authType));
+  }
 }
 
 export const Header: React.FC<HeaderProps> = ({
   customAsciiArt,
   version,
-  nightly,
+  authType,
+  model,
+  workingDirectory,
 }) => {
   const { columns: terminalWidth } = useTerminalSize();
-  let displayTitle;
-  const widthOfLongLogo = getAsciiArtWidth(longAsciiLogo);
-  const widthOfShortLogo = getAsciiArtWidth(shortAsciiLogo);
 
-  if (customAsciiArt) {
-    displayTitle = customAsciiArt;
-  } else if (terminalWidth >= widthOfLongLogo) {
-    displayTitle = longAsciiLogo;
-  } else if (terminalWidth >= widthOfShortLogo) {
-    displayTitle = shortAsciiLogo;
-  } else {
-    displayTitle = tinyAsciiLogo;
-  }
+  const displayLogo = customAsciiArt ?? shortAsciiLogo;
+  const logoWidth = getAsciiArtWidth(displayLogo);
+  const formattedAuthType = formatAuthType(authType);
 
-  const artWidth = getAsciiArtWidth(displayTitle);
+  // Calculate available space properly:
+  // First determine if logo can be shown, then use remaining space for path
+  const containerMarginX = 2; // marginLeft + marginRight on the outer container
+  const logoGap = 2; // Gap between logo and info panel
+  const infoPanelPaddingX = 1;
+  const infoPanelBorderWidth = 2; // left + right border
+  const infoPanelChromeWidth = infoPanelBorderWidth + infoPanelPaddingX * 2;
+  const minPathLength = 40; // Minimum readable path length
+  const minInfoPanelWidth = minPathLength + infoPanelChromeWidth;
+
+  const availableTerminalWidth = Math.max(
+    0,
+    terminalWidth - containerMarginX * 2,
+  );
+
+  // Check if we have enough space for logo + gap + minimum info panel
+  const showLogo =
+    availableTerminalWidth >= logoWidth + logoGap + minInfoPanelWidth;
+
+  // Calculate available width for info panel (use all remaining space)
+  // Cap at 60 when in two-column layout (with logo)
+  const maxInfoPanelWidth = 60;
+  const availableInfoPanelWidth = showLogo
+    ? Math.min(availableTerminalWidth - logoWidth - logoGap, maxInfoPanelWidth)
+    : availableTerminalWidth;
+
+  // Calculate max path length (subtract padding/borders from available space)
+  const maxPathLength = Math.max(
+    0,
+    availableInfoPanelWidth - infoPanelChromeWidth,
+  );
+
+  const infoPanelContentWidth = Math.max(
+    0,
+    availableInfoPanelWidth - infoPanelChromeWidth,
+  );
+  const authModelText = `${formattedAuthType} | ${model}`;
+  const authHintText = ' (/auth to change)';
+  const showAuthHint =
+    infoPanelContentWidth > 0 &&
+    getCachedStringWidth(authModelText + authHintText) <= infoPanelContentWidth;
+
+  // Now shorten the path to fit the available space
+  const tildeifiedPath = tildeifyPath(workingDirectory);
+  const shortenedPath = shortenPath(tildeifiedPath, Math.max(3, maxPathLength));
+  const displayPath =
+    maxPathLength <= 0
+      ? ''
+      : shortenedPath.length > maxPathLength
+        ? shortenedPath.slice(0, maxPathLength)
+        : shortenedPath;
+
+  // Use theme gradient colors if available, otherwise use text colors (excluding primary)
+  const gradientColors = theme.ui.gradient || [
+    theme.text.secondary,
+    theme.text.link,
+    theme.text.accent,
+  ];
 
   return (
     <Box
-      alignItems="flex-start"
-      width={artWidth}
-      flexShrink={0}
-      flexDirection="column"
+      flexDirection="row"
+      alignItems="center"
+      marginX={containerMarginX}
+      width={availableTerminalWidth}
     >
-      {theme.ui.gradient ? (
-        <Gradient colors={theme.ui.gradient}>
-          <Text>{displayTitle}</Text>
-        </Gradient>
-      ) : (
-        <Text>{displayTitle}</Text>
-      )}
-      {nightly && (
-        <Box width="100%" flexDirection="row" justifyContent="flex-end">
-          {theme.ui.gradient ? (
-            <Gradient colors={theme.ui.gradient}>
-              <Text>v{version}</Text>
+      {/* Left side: ASCII logo (only if enough space) */}
+      {showLogo && (
+        <>
+          <Box flexShrink={0}>
+            <Gradient colors={gradientColors}>
+              <Text>{displayLogo}</Text>
             </Gradient>
-          ) : (
-            <Text>v{version}</Text>
-          )}
-        </Box>
+          </Box>
+          {/* Fixed gap between logo and info panel */}
+          <Box width={logoGap} />
+        </>
       )}
+
+      {/* Right side: Info panel (flexible width, max 60 in two-column layout) */}
+      <Box
+        flexDirection="column"
+        borderStyle="round"
+        borderColor={theme.border.default}
+        paddingX={infoPanelPaddingX}
+        flexGrow={showLogo ? 0 : 1}
+        width={showLogo ? availableInfoPanelWidth : undefined}
+      >
+        {/* Title line: >_ Qwen Code (v{version}) */}
+        <Text>
+          <Text bold color={theme.text.accent}>
+            &gt;_ Qwen Code
+          </Text>
+          <Text color={theme.text.secondary}> (v{version})</Text>
+        </Text>
+        {/* Empty line for spacing */}
+        <Text> </Text>
+        {/* Auth and Model line */}
+        <Text>
+          <Text color={theme.text.secondary}>{authModelText}</Text>
+          {showAuthHint && (
+            <Text color={theme.text.secondary}>{authHintText}</Text>
+          )}
+        </Text>
+        {/* Directory line */}
+        <Text color={theme.text.secondary}>{displayPath}</Text>
+      </Box>
     </Box>
   );
 };
diff --git a/packages/cli/src/ui/components/Help.tsx b/packages/cli/src/ui/components/Help.tsx
index 35d2b59b4..6b51a6a8c 100644
--- a/packages/cli/src/ui/components/Help.tsx
+++ b/packages/cli/src/ui/components/Help.tsx
@@ -12,15 +12,16 @@ import { t } from '../../i18n/index.js';
 
 interface Help {
   commands: readonly SlashCommand[];
+  width?: number;
 }
 
-export const Help: React.FC<Help> = ({ commands }) => (
+export const Help: React.FC<Help> = ({ commands, width }) => (
   <Box
     flexDirection="column"
-    marginBottom={1}
     borderColor={theme.border.default}
     borderStyle="round"
     padding={1}
+    width={width}
   >
     {/* Basics */}
     <Text bold color={theme.text.primary}>
diff --git a/packages/cli/src/ui/components/HistoryItemDisplay.test.tsx b/packages/cli/src/ui/components/HistoryItemDisplay.test.tsx
index 2c92af578..7b4a22e80 100644
--- a/packages/cli/src/ui/components/HistoryItemDisplay.test.tsx
+++ b/packages/cli/src/ui/components/HistoryItemDisplay.test.tsx
@@ -96,7 +96,7 @@ describe('<HistoryItemDisplay />', () => {
     const { lastFrame } = renderWithProviders(
       <HistoryItemDisplay {...baseItem} item={item} />,
     );
-    expect(lastFrame()).toContain('About Qwen Code');
+    expect(lastFrame()).toContain('Status');
   });
 
   it('renders ModelStatsDisplay for "model_stats" type', () => {
diff --git a/packages/cli/src/ui/components/HistoryItemDisplay.tsx b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
index d1b247a64..a4fa9ee7c 100644
--- a/packages/cli/src/ui/components/HistoryItemDisplay.tsx
+++ b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
@@ -38,6 +38,7 @@ interface HistoryItemDisplayProps {
   item: HistoryItem;
   availableTerminalHeight?: number;
   terminalWidth: number;
+  mainAreaWidth?: number;
   isPending: boolean;
   isFocused?: boolean;
   commands?: readonly SlashCommand[];
@@ -50,6 +51,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
   item,
   availableTerminalHeight,
   terminalWidth,
+  mainAreaWidth,
   isPending,
   commands,
   isFocused = true,
@@ -58,9 +60,16 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
   availableTerminalHeightGemini,
 }) => {
   const itemForDisplay = useMemo(() => escapeAnsiCtrlCodes(item), [item]);
+  const contentWidth = terminalWidth - 4;
+  const boxWidth = mainAreaWidth || contentWidth;
 
   return (
-    <Box flexDirection="column" key={itemForDisplay.id}>
+    <Box
+      flexDirection="column"
+      key={itemForDisplay.id}
+      marginLeft={2}
+      marginRight={2}
+    >
       {/* Render standard message types */}
       {itemForDisplay.type === 'user' && (
         <UserMessage text={itemForDisplay.text} />
@@ -75,7 +84,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth}
         />
       )}
       {itemForDisplay.type === 'gemini_content' && (
@@ -85,7 +94,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth}
         />
       )}
       {itemForDisplay.type === 'gemini_thought' && (
@@ -95,7 +104,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth}
         />
       )}
       {itemForDisplay.type === 'gemini_thought_content' && (
@@ -105,7 +114,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth}
         />
       )}
       {itemForDisplay.type === 'info' && (
@@ -118,25 +127,32 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
         <ErrorMessage text={itemForDisplay.text} />
       )}
       {itemForDisplay.type === 'about' && (
-        <AboutBox {...itemForDisplay.systemInfo} />
+        <AboutBox {...itemForDisplay.systemInfo} width={boxWidth} />
       )}
       {itemForDisplay.type === 'help' && commands && (
-        <Help commands={commands} />
+        <Help commands={commands} width={boxWidth} />
       )}
       {itemForDisplay.type === 'stats' && (
-        <StatsDisplay duration={itemForDisplay.duration} />
+        <StatsDisplay duration={itemForDisplay.duration} width={boxWidth} />
+      )}
+      {itemForDisplay.type === 'model_stats' && (
+        <ModelStatsDisplay width={boxWidth} />
+      )}
+      {itemForDisplay.type === 'tool_stats' && (
+        <ToolStatsDisplay width={boxWidth} />
       )}
-      {itemForDisplay.type === 'model_stats' && <ModelStatsDisplay />}
-      {itemForDisplay.type === 'tool_stats' && <ToolStatsDisplay />}
       {itemForDisplay.type === 'quit' && (
-        <SessionSummaryDisplay duration={itemForDisplay.duration} />
+        <SessionSummaryDisplay
+          duration={itemForDisplay.duration}
+          width={boxWidth}
+        />
       )}
       {itemForDisplay.type === 'tool_group' && (
         <ToolGroupMessage
           toolCalls={itemForDisplay.tools}
           groupId={itemForDisplay.id}
           availableTerminalHeight={availableTerminalHeight}
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth}
           isFocused={isFocused}
           activeShellPtyId={activeShellPtyId}
           embeddedShellFocused={embeddedShellFocused}
@@ -149,7 +165,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
       {itemForDisplay.type === 'extensions_list' && <ExtensionsList />}
       {itemForDisplay.type === 'tools_list' && (
         <ToolsList
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth}
           tools={itemForDisplay.tools}
           showDescriptions={itemForDisplay.showDescriptions}
         />
diff --git a/packages/cli/src/ui/components/InputPrompt.tsx b/packages/cli/src/ui/components/InputPrompt.tsx
index 014ccdb31..1d46d03ab 100644
--- a/packages/cli/src/ui/components/InputPrompt.tsx
+++ b/packages/cli/src/ui/components/InputPrompt.tsx
@@ -54,6 +54,9 @@ export interface InputPromptProps {
   setShellModeActive: (value: boolean) => void;
   approvalMode: ApprovalMode;
   onEscapePromptChange?: (showPrompt: boolean) => void;
+  onToggleShortcuts?: () => void;
+  showShortcuts?: boolean;
+  onSuggestionsVisibilityChange?: (visible: boolean) => void;
   vimHandleInput?: (key: Key) => boolean;
   isEmbeddedShellFocused?: boolean;
 }
@@ -98,6 +101,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   setShellModeActive,
   approvalMode,
   onEscapePromptChange,
+  onToggleShortcuts,
+  showShortcuts,
+  onSuggestionsVisibilityChange,
   vimHandleInput,
   isEmbeddedShellFocused,
 }) => {
@@ -351,11 +357,31 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         buffer.text === '' &&
         !completion.showSuggestions
       ) {
+        // Hide shortcuts when toggling shell mode
+        if (showShortcuts && onToggleShortcuts) {
+          onToggleShortcuts();
+        }
         setShellModeActive(!shellModeActive);
         buffer.setText(''); // Clear the '!' from input
         return;
       }
 
+      // Toggle keyboard shortcuts display with "?" when buffer is empty
+      if (
+        key.sequence === '?' &&
+        buffer.text === '' &&
+        !completion.showSuggestions &&
+        onToggleShortcuts
+      ) {
+        onToggleShortcuts();
+        return;
+      }
+
+      // Hide shortcuts on any other key press
+      if (showShortcuts && onToggleShortcuts) {
+        onToggleShortcuts();
+      }
+
       if (keyMatchers[Command.ESCAPE](key)) {
         const cancelSearch = (
           setActive: (active: boolean) => void,
@@ -683,6 +709,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       recentPasteTime,
       commandSearchActive,
       commandSearchCompletion,
+      onToggleShortcuts,
+      showShortcuts,
       uiState,
     ],
   );
@@ -703,6 +731,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const activeCompletion = getActiveCompletion();
   const shouldShowSuggestions = activeCompletion.showSuggestions;
 
+  // Notify parent about suggestions visibility changes
+  useEffect(() => {
+    if (onSuggestionsVisibilityChange) {
+      onSuggestionsVisibilityChange(shouldShowSuggestions);
+    }
+  }, [shouldShowSuggestions, onSuggestionsVisibilityChange]);
+
   const showAutoAcceptStyling =
     !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
   const showYoloStyling =
@@ -735,7 +770,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         borderLeft={false}
         borderRight={false}
         borderColor={borderColor}
-        paddingX={1}
       >
         <Text
           color={statusColor ?? theme.text.accent}
@@ -866,7 +900,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         </Box>
       </Box>
       {shouldShowSuggestions && (
-        <Box paddingRight={2}>
+        <Box marginLeft={2} marginRight={2}>
           <SuggestionsDisplay
             suggestions={activeCompletion.suggestions}
             activeIndex={activeCompletion.activeSuggestionIndex}
diff --git a/packages/cli/src/ui/components/KeyboardShortcuts.tsx b/packages/cli/src/ui/components/KeyboardShortcuts.tsx
new file mode 100644
index 000000000..75ca5eca9
--- /dev/null
+++ b/packages/cli/src/ui/components/KeyboardShortcuts.tsx
@@ -0,0 +1,117 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type React from 'react';
+import { Box, Text } from 'ink';
+import { theme } from '../semantic-colors.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { t } from '../../i18n/index.js';
+
+interface Shortcut {
+  key: string;
+  description: string;
+}
+
+// Platform-specific key mappings
+const getNewlineKey = () =>
+  process.platform === 'win32' ? 'ctrl+enter' : 'ctrl+j';
+const getPasteKey = () => (process.platform === 'darwin' ? 'cmd+v' : 'ctrl+v');
+const getExternalEditorKey = () =>
+  process.platform === 'darwin' ? 'ctrl+x' : 'ctrl+x';
+
+// Generate shortcuts with translations (called at render time)
+const getShortcuts = (): Shortcut[] => [
+  { key: '!', description: t('for shell mode') },
+  { key: '/', description: t('for commands') },
+  { key: '@', description: t('for file paths') },
+  { key: 'esc esc', description: t('to clear input') },
+  { key: 'shift+tab', description: t('to cycle approvals') },
+  { key: 'ctrl+c', description: t('to quit') },
+  { key: getNewlineKey(), description: t('for newline') + ' ⏎' },
+  { key: 'ctrl+l', description: t('to clear screen') },
+  { key: 'ctrl+r', description: t('to search history') },
+  { key: getPasteKey(), description: t('to paste images') },
+  { key: getExternalEditorKey(), description: t('for external editor') },
+];
+
+const ShortcutItem: React.FC<{ shortcut: Shortcut }> = ({ shortcut }) => (
+  <Text color={theme.text.secondary}>
+    <Text color={theme.text.accent}>{shortcut.key}</Text> {shortcut.description}
+  </Text>
+);
+
+// Layout constants
+const COLUMN_GAP = 4;
+const MARGIN_LEFT = 2;
+const MARGIN_RIGHT = 2;
+
+// Column distribution for different layouts (3+4+4 for 3 cols, 6+5 for 2 cols)
+const COLUMN_SPLITS: Record<number, number[]> = {
+  3: [3, 4, 4],
+  2: [6, 5],
+  1: [11],
+};
+
+export const KeyboardShortcuts: React.FC = () => {
+  const { columns: terminalWidth } = useTerminalSize();
+  const shortcuts = getShortcuts();
+
+  // Helper to calculate width needed for a column layout
+  const getShortcutWidth = (shortcut: Shortcut) =>
+    shortcut.key.length + 1 + shortcut.description.length;
+
+  const calculateLayoutWidth = (splits: number[]): number => {
+    let startIndex = 0;
+    let totalWidth = 0;
+    splits.forEach((count, colIndex) => {
+      const columnItems = shortcuts.slice(startIndex, startIndex + count);
+      const columnWidth = Math.max(...columnItems.map(getShortcutWidth));
+      totalWidth += columnWidth;
+      if (colIndex < splits.length - 1) {
+        totalWidth += COLUMN_GAP;
+      }
+      startIndex += count;
+    });
+    return totalWidth;
+  };
+
+  // Calculate number of columns based on terminal width and actual content
+  const availableWidth = terminalWidth - MARGIN_LEFT - MARGIN_RIGHT;
+  const width3Col = calculateLayoutWidth(COLUMN_SPLITS[3]);
+  const width2Col = calculateLayoutWidth(COLUMN_SPLITS[2]);
+
+  const numColumns =
+    availableWidth >= width3Col ? 3 : availableWidth >= width2Col ? 2 : 1;
+
+  // Split shortcuts into columns using predefined distribution
+  const splits = COLUMN_SPLITS[numColumns];
+  const columns: Shortcut[][] = [];
+  let startIndex = 0;
+  for (const count of splits) {
+    columns.push(shortcuts.slice(startIndex, startIndex + count));
+    startIndex += count;
+  }
+
+  return (
+    <Box
+      flexDirection="row"
+      marginLeft={MARGIN_LEFT}
+      marginRight={MARGIN_RIGHT}
+    >
+      {columns.map((column, colIndex) => (
+        <Box
+          key={colIndex}
+          flexDirection="column"
+          marginRight={colIndex < numColumns - 1 ? COLUMN_GAP : 0}
+        >
+          {column.map((shortcut) => (
+            <ShortcutItem key={shortcut.key} shortcut={shortcut} />
+          ))}
+        </Box>
+      ))}
+    </Box>
+  );
+};
diff --git a/packages/cli/src/ui/components/MainContent.tsx b/packages/cli/src/ui/components/MainContent.tsx
index fc6c216fa..db66607dd 100644
--- a/packages/cli/src/ui/components/MainContent.tsx
+++ b/packages/cli/src/ui/components/MainContent.tsx
@@ -23,6 +23,7 @@ export const MainContent = () => {
   const uiState = useUIState();
   const {
     pendingHistoryItems,
+    terminalWidth,
     mainAreaWidth,
     staticAreaMaxItemHeight,
     availableTerminalHeight,
@@ -36,7 +37,8 @@ export const MainContent = () => {
           <AppHeader key="app-header" version={version} />,
           ...uiState.history.map((h) => (
             <HistoryItemDisplay
-              terminalWidth={mainAreaWidth}
+              terminalWidth={terminalWidth}
+              mainAreaWidth={mainAreaWidth}
               availableTerminalHeight={staticAreaMaxItemHeight}
               availableTerminalHeightGemini={MAX_GEMINI_MESSAGE_LINES}
               key={h.id}
@@ -57,7 +59,8 @@ export const MainContent = () => {
               availableTerminalHeight={
                 uiState.constrainHeight ? availableTerminalHeight : undefined
               }
-              terminalWidth={mainAreaWidth}
+              terminalWidth={terminalWidth}
+              mainAreaWidth={mainAreaWidth}
               item={{ ...item, id: 0 }}
               isPending={true}
               isFocused={!uiState.isEditorDialogOpen}
diff --git a/packages/cli/src/ui/components/ModelStatsDisplay.tsx b/packages/cli/src/ui/components/ModelStatsDisplay.tsx
index ce0a481e8..c34905981 100644
--- a/packages/cli/src/ui/components/ModelStatsDisplay.tsx
+++ b/packages/cli/src/ui/components/ModelStatsDisplay.tsx
@@ -50,7 +50,13 @@ const StatRow: React.FC<StatRowProps> = ({
   </Box>
 );
 
-export const ModelStatsDisplay: React.FC = () => {
+interface ModelStatsDisplayProps {
+  width?: number;
+}
+
+export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
+  width,
+}) => {
   const { stats } = useSessionStats();
   const { models } = stats.metrics;
   const activeModels = Object.entries(models).filter(
@@ -64,6 +70,7 @@ export const ModelStatsDisplay: React.FC = () => {
         borderColor={theme.border.default}
         paddingY={1}
         paddingX={2}
+        width={width}
       >
         <Text color={theme.text.primary}>
           {t('No API calls have been made in this session.')}
@@ -93,6 +100,7 @@ export const ModelStatsDisplay: React.FC = () => {
       flexDirection="column"
       paddingY={1}
       paddingX={2}
+      width={width}
     >
       <Text bold color={theme.text.accent}>
         {t('Model Stats For Nerds')}
diff --git a/packages/cli/src/ui/components/PlanSummaryDisplay.tsx b/packages/cli/src/ui/components/PlanSummaryDisplay.tsx
index 27b3b6254..c827b9d86 100644
--- a/packages/cli/src/ui/components/PlanSummaryDisplay.tsx
+++ b/packages/cli/src/ui/components/PlanSummaryDisplay.tsx
@@ -34,7 +34,7 @@ export const PlanSummaryDisplay: React.FC<PlanSummaryDisplayProps> = ({
         text={plan}
         isPending={false}
         availableTerminalHeight={availableHeight}
-        terminalWidth={childWidth}
+        contentWidth={childWidth}
       />
     </Box>
   );
diff --git a/packages/cli/src/ui/components/QuittingDisplay.tsx b/packages/cli/src/ui/components/QuittingDisplay.tsx
index ee81f9201..8295f0533 100644
--- a/packages/cli/src/ui/components/QuittingDisplay.tsx
+++ b/packages/cli/src/ui/components/QuittingDisplay.tsx
@@ -14,6 +14,7 @@ export const QuittingDisplay = () => {
   const { rows: terminalHeight, columns: terminalWidth } = useTerminalSize();
 
   const availableTerminalHeight = terminalHeight;
+  const { mainAreaWidth } = uiState;
 
   if (!uiState.quittingMessages) {
     return null;
@@ -28,6 +29,7 @@ export const QuittingDisplay = () => {
             uiState.constrainHeight ? availableTerminalHeight : undefined
           }
           terminalWidth={terminalWidth}
+          mainAreaWidth={mainAreaWidth}
           item={item}
           isPending={false}
         />
diff --git a/packages/cli/src/ui/components/SessionPicker.tsx b/packages/cli/src/ui/components/SessionPicker.tsx
index 9729d4c67..8c2703973 100644
--- a/packages/cli/src/ui/components/SessionPicker.tsx
+++ b/packages/cli/src/ui/components/SessionPicker.tsx
@@ -127,8 +127,8 @@ export function SessionPicker(props: SessionPickerProps) {
 
   const { columns: width, rows: height } = useTerminalSize();
 
-  // Calculate box width (width + 6 for border padding)
-  const boxWidth = width + 6;
+  // Calculate box width (marginX={2})
+  const boxWidth = width - 4;
   // Calculate visible items (same heuristic as before)
   // Reserved space: header (1), footer (1), separators (2), borders (2)
   const reservedLines = 6;
@@ -179,7 +179,7 @@ export function SessionPicker(props: SessionPickerProps) {
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(width - 2)}</Text>
+          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
         </Box>
 
         {/* Session list */}
@@ -212,7 +212,7 @@ export function SessionPicker(props: SessionPickerProps) {
                   isLast={visibleIndex === picker.visibleSessions.length - 1}
                   showScrollUp={picker.showScrollUp}
                   showScrollDown={picker.showScrollDown}
-                  maxPromptWidth={width}
+                  maxPromptWidth={boxWidth - 6}
                   prefixChars={PREFIX_CHARS}
                   boldSelectedPrefix={false}
                 />
@@ -223,7 +223,7 @@ export function SessionPicker(props: SessionPickerProps) {
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(width - 2)}</Text>
+          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
         </Box>
 
         {/* Footer */}
diff --git a/packages/cli/src/ui/components/SessionSummaryDisplay.tsx b/packages/cli/src/ui/components/SessionSummaryDisplay.tsx
index b43f18bcf..0c6a4ed00 100644
--- a/packages/cli/src/ui/components/SessionSummaryDisplay.tsx
+++ b/packages/cli/src/ui/components/SessionSummaryDisplay.tsx
@@ -14,10 +14,12 @@ import { t } from '../../i18n/index.js';
 
 interface SessionSummaryDisplayProps {
   duration: string;
+  width: number;
 }
 
 export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
   duration,
+  width,
 }) => {
   const config = useConfig();
   const { stats } = useSessionStats();
@@ -32,6 +34,7 @@ export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
       <StatsDisplay
         title={t('Agent powering down. Goodbye!')}
         duration={duration}
+        width={width}
       />
       {hasMessages && canResume && (
         <Box marginTop={1}>
diff --git a/packages/cli/src/ui/components/SettingsDialog.test.tsx b/packages/cli/src/ui/components/SettingsDialog.test.tsx
index 1f20b40c0..6a2c75995 100644
--- a/packages/cli/src/ui/components/SettingsDialog.test.tsx
+++ b/packages/cli/src/ui/components/SettingsDialog.test.tsx
@@ -28,12 +28,13 @@ import { LoadedSettings, SettingScope } from '../../config/settings.js';
 import { VimModeProvider } from '../contexts/VimModeContext.js';
 import { KeypressProvider } from '../contexts/KeypressContext.js';
 import { act } from 'react';
-import { saveModifiedSettings, TEST_ONLY } from '../../utils/settingsUtils.js';
 import {
-  getSettingsSchema,
-  type SettingDefinition,
-  type SettingsSchemaType,
-} from '../../config/settingsSchema.js';
+  getDialogSettingKeys,
+  getSettingDefinition,
+  saveModifiedSettings,
+  TEST_ONLY,
+} from '../../utils/settingsUtils.js';
+import { OUTPUT_LANGUAGE_AUTO } from '../../utils/languageUtils.js';
 
 // Mock the VimModeContext
 const mockToggleVimEnabled = vi.fn();
@@ -129,6 +130,14 @@ vi.mock('../../utils/settingsUtils.js', async () => {
   };
 });
 
+vi.mock('../../utils/languageUtils.js', async () => {
+  const actual = await vi.importActual('../../utils/languageUtils.js');
+  return {
+    ...actual,
+    updateOutputLanguageFile: vi.fn(),
+  };
+});
+
 // Helper function to simulate key presses (commented out for now)
 // const simulateKeyPress = async (keyData: Partial<Key> & { name: string }) => {
 //   if (currentKeypressHandler) {
@@ -210,8 +219,9 @@ describe('SettingsDialog', () => {
 
       const output = lastFrame();
       expect(output).toContain('Settings');
-      expect(output).toContain('Apply To');
-      expect(output).toContain('Use Enter to select, Tab to change focus');
+      // Scope selector is now in a separate view (Tab to switch)
+      expect(output).not.toContain('Apply To');
+      expect(output).toContain('(Use Enter to select, Tab to configure scope)');
     });
 
     it('should accept availableTerminalHeight prop without errors', () => {
@@ -231,7 +241,7 @@ describe('SettingsDialog', () => {
       const output = lastFrame();
       // Should still render properly with the height prop
       expect(output).toContain('Settings');
-      expect(output).toContain('Use Enter to select');
+      expect(output).toContain('Enter to select');
     });
 
     it('should show settings list with default values', () => {
@@ -281,7 +291,12 @@ describe('SettingsDialog', () => {
         stdin.write(TerminalKeys.DOWN_ARROW as string); // Down arrow
       });
 
-      expect(lastFrame()).toContain('● Disable Auto Update');
+      const secondKey = getDialogSettingKeys()[1];
+      expect(secondKey).toBeDefined();
+      const secondLabel = secondKey
+        ? (getSettingDefinition(secondKey)?.label ?? secondKey)
+        : '';
+      expect(lastFrame()).toContain(`● ${secondLabel}`);
 
       // The active index should have changed (tested indirectly through behavior)
       unmount();
@@ -342,7 +357,14 @@ describe('SettingsDialog', () => {
 
       await wait();
 
-      expect(lastFrame()).toContain('● Vision Model Preview');
+      const lastKey = getDialogSettingKeys().at(-1);
+      expect(lastKey).toBeDefined();
+
+      const lastLabel = lastKey
+        ? (getSettingDefinition(lastKey)?.label ?? lastKey)
+        : '';
+
+      expect(lastFrame()).toContain(`● ${lastLabel}`);
 
       unmount();
     });
@@ -362,17 +384,24 @@ describe('SettingsDialog', () => {
 
       const { stdin, unmount, lastFrame } = render(component);
 
-      // Wait for initial render and verify we're on Vim Mode (first setting)
+      // Wait for initial render and verify we're on Tool Approval Mode (first setting)
       await waitFor(() => {
-        expect(lastFrame()).toContain('● Vim Mode');
+        expect(lastFrame()).toContain('● Tool Approval Mode');
       });
 
-      // Navigate to Disable Auto Update setting and verify we're there
-      act(() => {
-        stdin.write(TerminalKeys.DOWN_ARROW as string);
-      });
+      const dialogKeys = getDialogSettingKeys();
+      const targetIndex = dialogKeys.indexOf('general.vimMode');
+      expect(targetIndex).toBeGreaterThan(0);
+
+      // Navigate to Vim Mode setting and verify we're there
+      for (let i = 0; i < targetIndex; i++) {
+        act(() => {
+          stdin.write(TerminalKeys.DOWN_ARROW as string);
+        });
+        await wait();
+      }
       await waitFor(() => {
-        expect(lastFrame()).toContain('● Disable Auto Update');
+        expect(lastFrame()).toContain('● Vim Mode');
       });
 
       // Toggle the setting
@@ -392,10 +421,10 @@ describe('SettingsDialog', () => {
       });
 
       expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalledWith(
-        new Set<string>(['general.disableAutoUpdate']),
+        new Set<string>(['general.vimMode']),
         {
           general: {
-            disableAutoUpdate: true,
+            vimMode: true,
           },
         },
         expect.any(LoadedSettings),
@@ -406,51 +435,10 @@ describe('SettingsDialog', () => {
     });
 
     describe('enum values', () => {
-      enum StringEnum {
-        FOO = 'foo',
-        BAR = 'bar',
-        BAZ = 'baz',
-      }
-
-      const SETTING: SettingDefinition = {
-        type: 'enum',
-        label: 'Theme',
-        options: [
-          {
-            label: 'Foo',
-            value: StringEnum.FOO,
-          },
-          {
-            label: 'Bar',
-            value: StringEnum.BAR,
-          },
-          {
-            label: 'Baz',
-            value: StringEnum.BAZ,
-          },
-        ],
-        category: 'UI',
-        requiresRestart: false,
-        default: StringEnum.BAR,
-        description: 'The color theme for the UI.',
-        showInDialog: true,
-      };
-
-      const FAKE_SCHEMA: SettingsSchemaType = {
-        ui: {
-          showInDialog: false,
-          properties: {
-            theme: {
-              ...SETTING,
-            },
-          },
-        },
-      } as unknown as SettingsSchemaType;
-
       it('toggles enum values with the enter key', async () => {
         vi.mocked(saveModifiedSettings).mockClear();
 
-        vi.mocked(getSettingsSchema).mockReturnValue(FAKE_SCHEMA);
+        // Use real schema - first setting "Tool Approval Mode" is an enum
         const settings = createMockSettings();
         const onSelect = vi.fn();
         const component = (
@@ -459,24 +447,30 @@ describe('SettingsDialog', () => {
           </KeypressProvider>
         );
 
-        const { stdin, unmount } = render(component);
+        const { stdin, unmount, lastFrame } = render(component);
 
-        // Press Enter to toggle current setting
-        stdin.write(TerminalKeys.DOWN_ARROW as string);
-        await wait();
-        stdin.write(TerminalKeys.ENTER as string);
+        // Verify we're on Tool Approval Mode (first setting, an enum)
+        await waitFor(() => {
+          expect(lastFrame()).toContain('● Tool Approval Mode');
+        });
+
+        // Press Enter to cycle the enum value
+        act(() => {
+          stdin.write(TerminalKeys.ENTER as string);
+        });
         await wait();
         await waitFor(() => {
           expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalled();
         });
 
+        // Tool Approval Mode cycles through enum values
         expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalledWith(
-          new Set<string>(['ui.theme']),
-          {
-            ui: {
-              theme: StringEnum.BAZ,
-            },
-          },
+          new Set<string>(['tools.approvalMode']),
+          expect.objectContaining({
+            tools: expect.objectContaining({
+              approvalMode: expect.any(String),
+            }),
+          }),
           expect.any(LoadedSettings),
           SettingScope.User,
         );
@@ -486,10 +480,10 @@ describe('SettingsDialog', () => {
 
       it('loops back when reaching the end of an enum', async () => {
         vi.mocked(saveModifiedSettings).mockClear();
-        vi.mocked(getSettingsSchema).mockReturnValue(FAKE_SCHEMA);
+        // Use Tool Approval Mode set to YOLO (last value) to test looping back to first
         const settings = createMockSettings({
-          ui: {
-            theme: StringEnum.BAZ,
+          tools: {
+            approvalMode: 'yolo', // Last enum value
           },
         });
         const onSelect = vi.fn();
@@ -499,24 +493,30 @@ describe('SettingsDialog', () => {
           </KeypressProvider>
         );
 
-        const { stdin, unmount } = render(component);
+        const { stdin, unmount, lastFrame } = render(component);
 
-        // Press Enter to toggle current setting
-        stdin.write(TerminalKeys.DOWN_ARROW as string);
-        await wait();
-        stdin.write(TerminalKeys.ENTER as string);
+        // Verify we're on Tool Approval Mode (first setting)
+        await waitFor(() => {
+          expect(lastFrame()).toContain('● Tool Approval Mode');
+        });
+
+        // Press Enter to cycle - should loop back to first value (Plan)
+        act(() => {
+          stdin.write(TerminalKeys.ENTER as string);
+        });
         await wait();
         await waitFor(() => {
           expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalled();
         });
 
+        // Should loop back to first enum value (Plan)
         expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalledWith(
-          new Set<string>(['ui.theme']),
-          {
-            ui: {
-              theme: StringEnum.FOO,
-            },
-          },
+          new Set<string>(['tools.approvalMode']),
+          expect.objectContaining({
+            tools: expect.objectContaining({
+              approvalMode: 'plan', // First enum value after YOLO
+            }),
+          }),
           expect.any(LoadedSettings),
           SettingScope.User,
         );
@@ -596,15 +596,15 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain('Tool Approval Mode');
       });
 
-      // The UI should show the settings section is active and scope section is inactive
-      expect(lastFrame()).toContain('● Vim Mode'); // Settings section active
-      expect(lastFrame()).toContain('  Apply To'); // Scope section inactive
+      // The UI should show settings mode is active (scope is in separate view)
+      expect(lastFrame()).toContain('● Tool Approval Mode'); // Settings section active
+      expect(lastFrame()).not.toContain('Apply To'); // Scope is in a separate view
 
-      // This test validates the initial state - scope selection behavior
-      // is complex due to keypress handling, so we focus on state validation
+      // This test validates the initial state - scope selection is now
+      // accessed via Tab key, not shown alongside settings
 
       unmount();
     });
@@ -668,12 +668,12 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Hide Window Title');
+        expect(lastFrame()).toContain('Tool Approval Mode');
       });
 
-      // Verify the dialog is rendered properly
+      // Verify the dialog is rendered properly (scope is in separate view)
       expect(lastFrame()).toContain('Settings');
-      expect(lastFrame()).toContain('Apply To');
+      expect(lastFrame()).not.toContain('Apply To'); // Scope is in a separate view
 
       // This test validates rendering - escape key behavior depends on complex
       // keypress handling that's difficult to test reliably in this environment
@@ -874,17 +874,40 @@ describe('SettingsDialog', () => {
       unmount();
     });
 
-    it('should clear restart prompt when switching scopes', async () => {
+    it('should keep restart prompt when switching scopes', async () => {
       const settings = createMockSettings();
       const onSelect = vi.fn();
 
-      const { unmount } = render(
+      const { stdin, lastFrame, unmount } = render(
         <KeypressProvider kittyProtocolEnabled={false}>
           <SettingsDialog settings={settings} onSelect={onSelect} />
         </KeypressProvider>,
       );
 
-      // Restart prompt should be cleared when switching scopes
+      // Trigger a restart-required setting change: navigate to "Language: UI" (2nd item) and toggle it.
+      stdin.write(TerminalKeys.DOWN_ARROW as string);
+      await wait();
+      stdin.write(TerminalKeys.ENTER as string);
+      await wait();
+
+      await waitFor(() => {
+        expect(lastFrame()).toContain(
+          'To see changes, Qwen Code must be restarted',
+        );
+      });
+
+      // Switch scopes; restart prompt should remain visible.
+      stdin.write(TerminalKeys.TAB as string);
+      await wait();
+      stdin.write('2');
+      await wait();
+
+      await waitFor(() => {
+        expect(lastFrame()).toContain(
+          'To see changes, Qwen Code must be restarted',
+        );
+      });
+
       unmount();
     });
   });
@@ -929,6 +952,66 @@ describe('SettingsDialog', () => {
     });
   });
 
+  describe('Output Language', () => {
+    it('treats empty output language as auto', async () => {
+      const settings = createMockSettings({
+        general: { outputLanguage: 'en' },
+      });
+
+      const { stdin, unmount, lastFrame } = render(
+        <KeypressProvider kittyProtocolEnabled={false}>
+          <SettingsDialog settings={settings} onSelect={() => {}} />
+        </KeypressProvider>,
+      );
+
+      await waitFor(() => {
+        expect(lastFrame()).toContain('Settings');
+      });
+
+      // Navigate to the output language setting, start editing, then commit empty.
+      // Avoid hard-coding the item index because schema-driven ordering can differ by platform.
+      const outputLanguageIndex = getDialogSettingKeys().indexOf(
+        'general.outputLanguage',
+      );
+      expect(outputLanguageIndex).toBeGreaterThanOrEqual(0);
+
+      const press = async (key: string) => {
+        act(() => {
+          stdin.write(key);
+        });
+        await wait();
+      };
+
+      for (let i = 0; i < outputLanguageIndex; i++) {
+        await press(TerminalKeys.DOWN_ARROW as string);
+      }
+      await press(TerminalKeys.ENTER as string);
+      await press(TerminalKeys.ENTER as string);
+
+      // Empty input should set 'auto' in settings (rule file is updated on restart)
+      await waitFor(() => {
+        const outputLanguageCall = vi
+          .mocked(saveModifiedSettings)
+          .mock.calls.find((call) =>
+            (call[0] as Set<string>).has('general.outputLanguage'),
+          );
+        expect(outputLanguageCall).toBeTruthy();
+      });
+
+      const outputLanguageCall = vi
+        .mocked(saveModifiedSettings)
+        .mock.calls.find((call) =>
+          (call[0] as Set<string>).has('general.outputLanguage'),
+        );
+      // Should save 'auto' to settings
+      expect(outputLanguageCall?.[1]).toMatchObject({
+        general: { outputLanguage: OUTPUT_LANGUAGE_AUTO },
+      });
+
+      unmount();
+    });
+  });
+
   describe('Keyboard Shortcuts Edge Cases', () => {
     it('should handle rapid key presses gracefully', async () => {
       const settings = createMockSettings();
@@ -1018,15 +1101,15 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain('Tool Approval Mode');
       });
 
-      // Verify initial state: settings section active, scope section inactive
-      expect(lastFrame()).toContain('● Vim Mode'); // Settings section active
-      expect(lastFrame()).toContain('  Apply To'); // Scope section inactive
+      // Verify initial state: settings mode active (scope is in separate view)
+      expect(lastFrame()).toContain('● Tool Approval Mode'); // Settings mode active
+      expect(lastFrame()).not.toContain('Apply To'); // Scope is in a separate view
 
       // This test validates the rendered UI structure for tab navigation
-      // Actual tab behavior testing is complex due to keypress handling
+      // Tab now switches between settings view and scope view
 
       unmount();
     });
@@ -1080,20 +1163,19 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain('Tool Approval Mode');
       });
 
-      // Verify the complete UI is rendered with all necessary sections
+      // Verify the complete UI is rendered (scope is in separate view)
       expect(lastFrame()).toContain('Settings'); // Title
-      expect(lastFrame()).toContain('● Vim Mode'); // Active setting
-      expect(lastFrame()).toContain('Apply To'); // Scope section
-      expect(lastFrame()).toContain('User Settings'); // Scope options (no numbers when settings focused)
+      expect(lastFrame()).toContain('● Tool Approval Mode'); // Active setting
+      expect(lastFrame()).not.toContain('Apply To'); // Scope is in a separate view (Tab to access)
       expect(lastFrame()).toContain(
-        '(Use Enter to select, Tab to change focus)',
+        '(Use Enter to select, Tab to configure scope)',
       ); // Help text
 
       // This test validates the complete UI structure is available for user workflow
-      // Individual interactions are tested in focused unit tests
+      // Scope selection is now accessed via Tab key (view switching like ThemeDialog)
 
       unmount();
     });
@@ -1275,7 +1357,6 @@ describe('SettingsDialog', () => {
         ui: {
           hideWindowTitle: true,
           hideTips: true,
-          showMemoryUsage: true,
           showLineNumbers: true,
           showCitations: true,
           accessibility: {
@@ -1324,7 +1405,6 @@ describe('SettingsDialog', () => {
           disableAutoUpdate: true,
         },
         ui: {
-          showMemoryUsage: true,
           hideWindowTitle: false,
         },
         tools: {
@@ -1373,9 +1453,7 @@ describe('SettingsDialog', () => {
             vimMode: true,
             disableAutoUpdate: false,
           },
-          ui: {
-            showMemoryUsage: true,
-          },
+          ui: {},
         },
       );
       const onSelect = vi.fn();
@@ -1436,7 +1514,6 @@ describe('SettingsDialog', () => {
             disableLoadingPhrases: true,
             screenReader: true,
           },
-          showMemoryUsage: true,
           showLineNumbers: true,
         },
         general: {
@@ -1517,7 +1594,6 @@ describe('SettingsDialog', () => {
         ui: {
           hideWindowTitle: false,
           hideTips: false,
-          showMemoryUsage: false,
           showLineNumbers: false,
           showCitations: false,
           accessibility: {
diff --git a/packages/cli/src/ui/components/SettingsDialog.tsx b/packages/cli/src/ui/components/SettingsDialog.tsx
index 45b0f5548..b3bd1c270 100644
--- a/packages/cli/src/ui/components/SettingsDialog.tsx
+++ b/packages/cli/src/ui/components/SettingsDialog.tsx
@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState, useEffect } from 'react';
+import type React from 'react';
+import { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import type { LoadedSettings, Settings } from '../../config/settings.js';
@@ -16,7 +17,6 @@ import {
   getDialogSettingKeys,
   setPendingSettingValue,
   getDisplayValue,
-  hasRestartRequiredSettings,
   saveModifiedSettings,
   getSettingDefinition,
   isDefaultValue,
@@ -27,6 +27,7 @@ import {
   getNestedValue,
   getEffectiveValue,
 } from '../../utils/settingsUtils.js';
+import { updateOutputLanguageFile } from '../../utils/languageUtils.js';
 import { useVimMode } from '../contexts/VimModeContext.js';
 import { type Config } from '@qwen-code/qwen-code-core';
 import { useKeypress } from '../hooks/useKeypress.js';
@@ -57,10 +58,8 @@ export function SettingsDialog({
   // Get vim mode context to sync vim mode changes
   const { vimEnabled, toggleVimEnabled } = useVimMode();
 
-  // Focus state: 'settings' or 'scope'
-  const [focusSection, setFocusSection] = useState<'settings' | 'scope'>(
-    'settings',
-  );
+  // Mode state: 'settings' or 'scope' (view switching like ThemeDialog)
+  const [mode, setMode] = useState<'settings' | 'scope'>('settings');
   // Scope selector state (User by default)
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
     SettingScope.User,
@@ -69,7 +68,6 @@ export function SettingsDialog({
   const [activeSettingIndex, setActiveSettingIndex] = useState(0);
   // Scroll offset for settings
   const [scrollOffset, setScrollOffset] = useState(0);
-  const [showRestartPrompt, setShowRestartPrompt] = useState(false);
 
   // Local pending settings state for the selected scope
   const [pendingSettings, setPendingSettings] = useState<Settings>(() =>
@@ -89,33 +87,33 @@ export function SettingsDialog({
   >(new Map());
 
   // Track restart-required settings across scope changes
-  const [_restartRequiredSettings, setRestartRequiredSettings] = useState<
+  const [restartRequiredSettings, setRestartRequiredSettings] = useState<
     Set<string>
   >(new Set());
 
+  const showRestartPrompt = restartRequiredSettings.size > 0;
+
   useEffect(() => {
     // Base settings for selected scope
     let updated = structuredClone(settings.forScope(selectedScope).settings);
     // Overlay globally pending (unsaved) changes so user sees their modifications in any scope
     const newModified = new Set<string>();
-    const newRestartRequired = new Set<string>();
     for (const [key, value] of globalPendingChanges.entries()) {
       const def = getSettingDefinition(key);
       if (def?.type === 'boolean' && typeof value === 'boolean') {
         updated = setPendingSettingValue(key, value, updated);
       } else if (
         (def?.type === 'number' && typeof value === 'number') ||
-        (def?.type === 'string' && typeof value === 'string')
+        (def?.type === 'string' && typeof value === 'string') ||
+        (def?.type === 'enum' &&
+          (typeof value === 'string' || typeof value === 'number'))
       ) {
         updated = setPendingSettingValueAny(key, value, updated);
       }
       newModified.add(key);
-      if (requiresRestart(key)) newRestartRequired.add(key);
     }
     setPendingSettings(updated);
     setModifiedSettings(newModified);
-    setRestartRequiredSettings(newRestartRequired);
-    setShowRestartPrompt(newRestartRequired.size > 0);
   }, [selectedScope, settings, globalPendingChanges]);
 
   const generateSettingsItems = () => {
@@ -156,10 +154,6 @@ export function SettingsDialog({
             );
           }
 
-          setPendingSettings((prev) =>
-            setPendingSettingValue(key, newValue as boolean, prev),
-          );
-
           if (!requiresRestart(key)) {
             const immediateSettings = new Set([key]);
             const immediateSettingsObject = setPendingSettingValueAny(
@@ -229,31 +223,22 @@ export function SettingsDialog({
               structuredClone(settings.forScope(selectedScope).settings),
             );
           } else {
-            // For restart-required settings, track as modified
-            setModifiedSettings((prev) => {
-              const updated = new Set(prev).add(key);
-              const needsRestart = hasRestartRequiredSettings(updated);
-              console.log(
-                `[DEBUG SettingsDialog] Modified settings:`,
-                Array.from(updated),
-                'Needs restart:',
-                needsRestart,
-              );
-              if (needsRestart) {
-                setShowRestartPrompt(true);
-                setRestartRequiredSettings((prevRestart) =>
-                  new Set(prevRestart).add(key),
-                );
-              }
-              return updated;
-            });
+            // For restart-required settings, save immediately but show restart prompt
+            const immediateSettings = new Set([key]);
+            const immediateSettingsObject = setPendingSettingValueAny(
+              key,
+              newValue,
+              {} as Settings,
+            );
+            saveModifiedSettings(
+              immediateSettings,
+              immediateSettingsObject,
+              settings,
+              selectedScope,
+            );
 
-            // Add/update pending change globally so it persists across scopes
-            setGlobalPendingChanges((prev) => {
-              const next = new Map(prev);
-              next.set(key, newValue as PendingValue);
-              return next;
-            });
+            // Mark as needing restart and show prompt
+            setRestartRequiredSettings((prev) => new Set(prev).add(key));
           }
         },
       };
@@ -296,7 +281,7 @@ export function SettingsDialog({
       return;
     }
 
-    let parsed: string | number;
+    let parsed: string | number | undefined;
     if (type === 'number') {
       const numParsed = Number(editBuffer.trim());
       if (Number.isNaN(numParsed)) {
@@ -309,19 +294,32 @@ export function SettingsDialog({
       parsed = numParsed;
     } else {
       // For strings, use the buffer as is.
-      parsed = editBuffer;
+      // Special handling for outputLanguage: empty input means 'auto'
+      if (key === 'general.outputLanguage') {
+        const trimmed = editBuffer.trim();
+        parsed = trimmed === '' ? 'auto' : trimmed;
+      } else {
+        parsed = editBuffer;
+      }
     }
 
     // Update pending
-    setPendingSettings((prev) => setPendingSettingValueAny(key, parsed, prev));
+    setPendingSettings((prev) =>
+      parsed === undefined
+        ? setPendingSettingValueAny(
+            key,
+            undefined as unknown as SettingsValue,
+            prev,
+          )
+        : setPendingSettingValueAny(key, parsed, prev),
+    );
 
     if (!requiresRestart(key)) {
       const immediateSettings = new Set([key]);
-      const immediateSettingsObject = setPendingSettingValueAny(
-        key,
-        parsed,
-        {} as Settings,
-      );
+      const immediateSettingsObject =
+        parsed === undefined
+          ? ({} as Settings)
+          : setPendingSettingValueAny(key, parsed, {} as Settings);
       saveModifiedSettings(
         immediateSettings,
         immediateSettingsObject,
@@ -349,25 +347,26 @@ export function SettingsDialog({
         return next;
       });
     } else {
-      // Mark as modified and needing restart
-      setModifiedSettings((prev) => {
-        const updated = new Set(prev).add(key);
-        const needsRestart = hasRestartRequiredSettings(updated);
-        if (needsRestart) {
-          setShowRestartPrompt(true);
-          setRestartRequiredSettings((prevRestart) =>
-            new Set(prevRestart).add(key),
-          );
-        }
-        return updated;
-      });
+      // For restart-required settings, save immediately but show restart prompt
+      const immediateSettings = new Set([key]);
+      const immediateSettingsObject =
+        parsed === undefined
+          ? ({} as Settings)
+          : setPendingSettingValueAny(key, parsed, {} as Settings);
+      saveModifiedSettings(
+        immediateSettings,
+        immediateSettingsObject,
+        settings,
+        selectedScope,
+      );
 
-      // Record pending change globally for persistence across scopes
-      setGlobalPendingChanges((prev) => {
-        const next = new Map(prev);
-        next.set(key, parsed as PendingValue);
-        return next;
-      });
+      // Update output language rule file immediately (no restart needed for LLM effect)
+      if (key === 'general.outputLanguage' && typeof parsed === 'string') {
+        updateOutputLanguageFile(parsed);
+      }
+
+      // Mark as needing restart and show prompt
+      setRestartRequiredSettings((prev) => new Set(prev).add(key));
     }
 
     setEditingKey(null);
@@ -381,15 +380,13 @@ export function SettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     handleScopeHighlight(scope);
-    setFocusSection('settings');
+    setMode('settings');
   };
 
   // Height constraint calculations similar to ThemeDialog
   const DIALOG_PADDING = 2;
   const SETTINGS_TITLE_HEIGHT = 2; // "Settings" title + spacing
   const SCROLL_ARROWS_HEIGHT = 2; // Up and down arrows
-  const SPACING_HEIGHT = 1; // Space between settings list and scope
-  const SCOPE_SELECTION_HEIGHT = 4; // Apply To section height
   const BOTTOM_HELP_TEXT_HEIGHT = 1; // Help text
   const RESTART_PROMPT_HEIGHT = showRestartPrompt ? 1 : 0;
 
@@ -397,71 +394,28 @@ export function SettingsDialog({
     availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
   currentAvailableTerminalHeight -= 2; // Top and bottom borders
 
-  // Start with basic fixed height (without scope selection)
-  let totalFixedHeight =
+  // Calculate fixed height (scope selection is now in a separate view, not included here)
+  const totalFixedHeight =
     DIALOG_PADDING +
     SETTINGS_TITLE_HEIGHT +
     SCROLL_ARROWS_HEIGHT +
-    SPACING_HEIGHT +
     BOTTOM_HELP_TEXT_HEIGHT +
     RESTART_PROMPT_HEIGHT;
 
   // Calculate how much space we have for settings
-  let availableHeightForSettings = Math.max(
+  const availableHeightForSettings = Math.max(
     1,
     currentAvailableTerminalHeight - totalFixedHeight,
   );
 
-  // Each setting item takes 2 lines (the setting row + spacing)
-  let maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
-
-  // Decide whether to show scope selection based on remaining space
-  let showScopeSelection = true;
-
-  // If we have limited height, prioritize showing more settings over scope selection
-  if (availableTerminalHeight && availableTerminalHeight < 25) {
-    // For very limited height, hide scope selection to show more settings
-    const totalWithScope = totalFixedHeight + SCOPE_SELECTION_HEIGHT;
-    const availableWithScope = Math.max(
-      1,
-      currentAvailableTerminalHeight - totalWithScope,
-    );
-    const maxItemsWithScope = Math.max(1, Math.floor(availableWithScope / 2));
-
-    // If hiding scope selection allows us to show significantly more settings, do it
-    if (maxVisibleItems > maxItemsWithScope + 1) {
-      showScopeSelection = false;
-    } else {
-      // Otherwise include scope selection and recalculate
-      totalFixedHeight += SCOPE_SELECTION_HEIGHT;
-      availableHeightForSettings = Math.max(
-        1,
-        currentAvailableTerminalHeight - totalFixedHeight,
-      );
-      maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
-    }
-  } else {
-    // For normal height, include scope selection
-    totalFixedHeight += SCOPE_SELECTION_HEIGHT;
-    availableHeightForSettings = Math.max(
-      1,
-      currentAvailableTerminalHeight - totalFixedHeight,
-    );
-    maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
-  }
+  // Each setting item takes 1 line
+  const maxVisibleItems = Math.max(1, availableHeightForSettings);
 
   // Use the calculated maxVisibleItems or fall back to the original maxItemsToShow
   const effectiveMaxItemsToShow = availableTerminalHeight
     ? Math.min(maxVisibleItems, items.length)
     : maxItemsToShow;
 
-  // Ensure focus stays on settings when scope selection is hidden
-  React.useEffect(() => {
-    if (!showScopeSelection && focusSection === 'scope') {
-      setFocusSection('settings');
-    }
-  }, [showScopeSelection, focusSection]);
-
   // Scroll logic for settings
   const visibleItems = items.slice(
     scrollOffset,
@@ -474,10 +428,10 @@ export function SettingsDialog({
   useKeypress(
     (key) => {
       const { name, ctrl } = key;
-      if (name === 'tab' && showScopeSelection) {
-        setFocusSection((prev) => (prev === 'settings' ? 'scope' : 'settings'));
+      if (name === 'tab') {
+        setMode((prev) => (prev === 'settings' ? 'scope' : 'settings'));
       }
-      if (focusSection === 'settings') {
+      if (mode === 'settings') {
         // If editing, capture input and control keys
         if (editingKey) {
           const definition = getSettingDefinition(editingKey);
@@ -599,6 +553,18 @@ export function SettingsDialog({
           }
         } else if (name === 'return' || name === 'space') {
           const currentItem = items[activeSettingIndex];
+          if (currentItem?.value === 'ui.theme') {
+            if (name === 'return') {
+              onSelect('ui.theme', selectedScope);
+            }
+            return;
+          }
+          if (currentItem?.value === 'general.preferredEditor') {
+            if (name === 'return') {
+              onSelect('general.preferredEditor', selectedScope);
+            }
+            return;
+          }
           if (
             currentItem?.type === 'number' ||
             currentItem?.type === 'string'
@@ -727,6 +693,9 @@ export function SettingsDialog({
                   return next;
                 });
               }
+              setRestartRequiredSettings((prev) =>
+                new Set(prev).add(currentSetting.value),
+              );
             }
           }
         }
@@ -756,7 +725,6 @@ export function SettingsDialog({
           });
         }
 
-        setShowRestartPrompt(false);
         setRestartRequiredSettings(new Set()); // Clear restart-required settings
         if (onRestartRequest) onRestartRequest();
       }
@@ -775,97 +743,95 @@ export function SettingsDialog({
     <Box
       borderStyle="round"
       borderColor={theme.border.default}
-      flexDirection="row"
+      flexDirection="column"
       padding={1}
       width="100%"
-      height="100%"
     >
-      <Box flexDirection="column" flexGrow={1}>
-        <Text bold={focusSection === 'settings'} wrap="truncate">
-          {focusSection === 'settings' ? '> ' : '  '}
-          {t('Settings')}
-        </Text>
-        <Box height={1} />
-        {showScrollUp && <Text color={theme.text.secondary}>▲</Text>}
-        {visibleItems.map((item, idx) => {
-          const isActive =
-            focusSection === 'settings' &&
-            activeSettingIndex === idx + scrollOffset;
+      {mode === 'settings' ? (
+        <Box flexDirection="column" flexGrow={1}>
+          <Text bold={mode === 'settings'} wrap="truncate">
+            {mode === 'settings' ? '> ' : '  '}
+            {t('Settings')}
+          </Text>
+          <Box height={1} />
+          {showScrollUp && <Text color={theme.text.secondary}>▲</Text>}
+          {visibleItems.map((item, idx) => {
+            const isActive =
+              mode === 'settings' && activeSettingIndex === idx + scrollOffset;
 
-          const scopeSettings = settings.forScope(selectedScope).settings;
-          const mergedSettings = settings.merged;
+            const scopeSettings = settings.forScope(selectedScope).settings;
+            const mergedSettings = settings.merged;
 
-          let displayValue: string;
-          if (editingKey === item.value) {
-            // Show edit buffer with advanced cursor highlighting
-            if (cursorVisible && editCursorPos < cpLen(editBuffer)) {
-              // Cursor is in the middle or at start of text
-              const beforeCursor = cpSlice(editBuffer, 0, editCursorPos);
-              const atCursor = cpSlice(
-                editBuffer,
-                editCursorPos,
-                editCursorPos + 1,
+            let displayValue: string;
+            if (editingKey === item.value) {
+              // Show edit buffer with advanced cursor highlighting
+              if (cursorVisible && editCursorPos < cpLen(editBuffer)) {
+                // Cursor is in the middle or at start of text
+                const beforeCursor = cpSlice(editBuffer, 0, editCursorPos);
+                const atCursor = cpSlice(
+                  editBuffer,
+                  editCursorPos,
+                  editCursorPos + 1,
+                );
+                const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
+                displayValue =
+                  beforeCursor + chalk.inverse(atCursor) + afterCursor;
+              } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
+                // Cursor is at the end - show inverted space
+                displayValue = editBuffer + chalk.inverse(' ');
+              } else {
+                // Cursor not visible
+                displayValue = editBuffer;
+              }
+            } else if (item.type === 'number' || item.type === 'string') {
+              // For numbers/strings, get the actual current value from pending settings
+              const path = item.value.split('.');
+              const currentValue = getNestedValue(pendingSettings, path);
+
+              const defaultValue = getDefaultValue(item.value);
+
+              if (currentValue !== undefined && currentValue !== null) {
+                displayValue = String(currentValue);
+              } else {
+                displayValue =
+                  defaultValue !== undefined && defaultValue !== null
+                    ? String(defaultValue)
+                    : '';
+              }
+
+              // Add * if value differs from default OR if currently being modified
+              const isModified = modifiedSettings.has(item.value);
+              const effectiveCurrentValue =
+                currentValue !== undefined && currentValue !== null
+                  ? currentValue
+                  : defaultValue;
+              const isDifferentFromDefault =
+                effectiveCurrentValue !== defaultValue;
+
+              if (isDifferentFromDefault || isModified) {
+                displayValue += '*';
+              }
+            } else {
+              // For booleans and other types, use existing logic
+              displayValue = getDisplayValue(
+                item.value,
+                scopeSettings,
+                mergedSettings,
+                modifiedSettings,
+                pendingSettings,
               );
-              const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
-              displayValue =
-                beforeCursor + chalk.inverse(atCursor) + afterCursor;
-            } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
-              // Cursor is at the end - show inverted space
-              displayValue = editBuffer + chalk.inverse(' ');
-            } else {
-              // Cursor not visible
-              displayValue = editBuffer;
             }
-          } else if (item.type === 'number' || item.type === 'string') {
-            // For numbers/strings, get the actual current value from pending settings
-            const path = item.value.split('.');
-            const currentValue = getNestedValue(pendingSettings, path);
+            const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
-            const defaultValue = getDefaultValue(item.value);
-
-            if (currentValue !== undefined && currentValue !== null) {
-              displayValue = String(currentValue);
-            } else {
-              displayValue =
-                defaultValue !== undefined && defaultValue !== null
-                  ? String(defaultValue)
-                  : '';
-            }
-
-            // Add * if value differs from default OR if currently being modified
-            const isModified = modifiedSettings.has(item.value);
-            const effectiveCurrentValue =
-              currentValue !== undefined && currentValue !== null
-                ? currentValue
-                : defaultValue;
-            const isDifferentFromDefault =
-              effectiveCurrentValue !== defaultValue;
-
-            if (isDifferentFromDefault || isModified) {
-              displayValue += '*';
-            }
-          } else {
-            // For booleans and other types, use existing logic
-            displayValue = getDisplayValue(
+            // Generate scope message for this setting
+            const scopeMessage = getScopeMessageForSetting(
               item.value,
-              scopeSettings,
-              mergedSettings,
-              modifiedSettings,
-              pendingSettings,
+              selectedScope,
+              settings,
             );
-          }
-          const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
-          // Generate scope message for this setting
-          const scopeMessage = getScopeMessageForSetting(
-            item.value,
-            selectedScope,
-            settings,
-          );
-
-          return (
-            <React.Fragment key={item.value}>
-              <Box flexDirection="row" alignItems="center">
+            return (
+              <Box key={item.value} flexDirection="row" alignItems="center">
                 <Box minWidth={2} flexShrink={0}>
                   <Text
                     color={
@@ -875,9 +841,10 @@ export function SettingsDialog({
                     {isActive ? '●' : ''}
                   </Text>
                 </Box>
-                <Box minWidth={50}>
+                <Box flexGrow={1} flexShrink={1}>
                   <Text
                     color={isActive ? theme.status.success : theme.text.primary}
+                    wrap="truncate"
                   >
                     {item.label}
                     {scopeMessage && (
@@ -885,53 +852,47 @@ export function SettingsDialog({
                     )}
                   </Text>
                 </Box>
-                <Box minWidth={3} />
-                <Text
-                  color={
-                    isActive
-                      ? theme.status.success
-                      : shouldBeGreyedOut
-                        ? theme.text.secondary
-                        : theme.text.primary
-                  }
-                >
-                  {displayValue}
-                </Text>
+                <Box marginLeft={1} flexShrink={0}>
+                  <Text
+                    color={
+                      isActive
+                        ? theme.status.success
+                        : shouldBeGreyedOut
+                          ? theme.text.secondary
+                          : theme.text.primary
+                    }
+                    wrap="truncate"
+                  >
+                    {displayValue}
+                  </Text>
+                </Box>
               </Box>
-              <Box height={1} />
-            </React.Fragment>
-          );
-        })}
-        {showScrollDown && <Text color={theme.text.secondary}>▼</Text>}
-
-        <Box height={1} />
-
-        {/* Scope Selection - conditionally visible based on height constraints */}
-        {showScopeSelection && (
-          <Box marginTop={1}>
-            <ScopeSelector
-              onSelect={handleScopeSelect}
-              onHighlight={handleScopeHighlight}
-              isFocused={focusSection === 'scope'}
-              initialScope={selectedScope}
-            />
-          </Box>
-        )}
-
-        <Box height={1} />
-        <Text color={theme.text.secondary}>
-          {t('(Use Enter to select{{tabText}})', {
-            tabText: showScopeSelection ? t(', Tab to change focus') : '',
+            );
           })}
+          {showScrollDown && <Text color={theme.text.secondary}>▼</Text>}
+        </Box>
+      ) : (
+        <ScopeSelector
+          onSelect={handleScopeSelect}
+          onHighlight={handleScopeHighlight}
+          isFocused={mode === 'scope'}
+          initialScope={selectedScope}
+        />
+      )}
+      <Box marginTop={1}>
+        <Text color={theme.text.secondary} wrap="truncate">
+          {mode === 'settings'
+            ? t('(Use Enter to select, Tab to configure scope)')
+            : t('(Use Enter to apply scope, Tab to go back)')}
         </Text>
-        {showRestartPrompt && (
-          <Text color={theme.status.warning}>
-            {t(
-              'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.',
-            )}
-          </Text>
-        )}
       </Box>
+      {showRestartPrompt && (
+        <Text color={theme.status.warning}>
+          {t(
+            'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.',
+          )}
+        </Text>
+      )}
     </Box>
   );
 }
diff --git a/packages/cli/src/ui/components/StatsDisplay.tsx b/packages/cli/src/ui/components/StatsDisplay.tsx
index a65119427..48ed58f18 100644
--- a/packages/cli/src/ui/components/StatsDisplay.tsx
+++ b/packages/cli/src/ui/components/StatsDisplay.tsx
@@ -160,11 +160,13 @@ const ModelUsageTable: React.FC<{
 interface StatsDisplayProps {
   duration: string;
   title?: string;
+  width?: number;
 }
 
 export const StatsDisplay: React.FC<StatsDisplayProps> = ({
   duration,
   title,
+  width,
 }) => {
   const { stats } = useSessionStats();
   const { metrics } = stats;
@@ -213,6 +215,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
       flexDirection="column"
       paddingY={1}
       paddingX={2}
+      width={width}
     >
       {renderTitle()}
       <Box height={1} />
diff --git a/packages/cli/src/ui/components/SuggestionsDisplay.tsx b/packages/cli/src/ui/components/SuggestionsDisplay.tsx
index 6bcac5c56..8b4ba9398 100644
--- a/packages/cli/src/ui/components/SuggestionsDisplay.tsx
+++ b/packages/cli/src/ui/components/SuggestionsDisplay.tsx
@@ -42,7 +42,7 @@ export function SuggestionsDisplay({
 }: SuggestionsDisplayProps) {
   if (isLoading) {
     return (
-      <Box paddingX={1} width={width}>
+      <Box width={width}>
         <Text color="gray">Loading suggestions...</Text>
       </Box>
     );
@@ -70,7 +70,7 @@ export function SuggestionsDisplay({
     mode === 'slash' ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
 
   return (
-    <Box flexDirection="column" paddingX={1} width={width}>
+    <Box flexDirection="column" width={width}>
       {scrollOffset > 0 && <Text color={theme.text.primary}>▲</Text>}
 
       {visibleSuggestions.map((suggestion, index) => {
diff --git a/packages/cli/src/ui/components/ThemeDialog.tsx b/packages/cli/src/ui/components/ThemeDialog.tsx
index a12fed797..3f93c84d7 100644
--- a/packages/cli/src/ui/components/ThemeDialog.tsx
+++ b/packages/cli/src/ui/components/ThemeDialog.tsx
@@ -258,7 +258,7 @@ def fibonacci(n):
 + print(f"Hello, {name}!")
 `}
                     availableTerminalHeight={diffHeight}
-                    terminalWidth={colorizeCodeWidth}
+                    contentWidth={colorizeCodeWidth}
                     theme={previewTheme}
                   />
                 </Box>
@@ -278,7 +278,7 @@ def fibonacci(n):
         <Text color={theme.text.secondary} wrap="truncate">
           {mode === 'theme'
             ? t('(Use Enter to select, Tab to configure scope)')
-            : t('(Use Enter to apply scope, Tab to select theme)')}
+            : t('(Use Enter to apply scope, Tab to go back)')}
         </Text>
       </Box>
     </Box>
diff --git a/packages/cli/src/ui/components/Tips.tsx b/packages/cli/src/ui/components/Tips.tsx
index c8537b559..62d82ba4c 100644
--- a/packages/cli/src/ui/components/Tips.tsx
+++ b/packages/cli/src/ui/components/Tips.tsx
@@ -4,42 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
+import { useMemo } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
-import { type Config } from '@qwen-code/qwen-code-core';
 import { t } from '../../i18n/index.js';
 
-interface TipsProps {
-  config: Config;
-}
+const startupTips = [
+  'Use /compress when the conversation gets long to summarize history and free up context.',
+  'Start a fresh idea with /clear or /new; the previous session stays available in history.',
+  'Use /bug to submit issues to the maintainers when something goes off.',
+  'Switch auth type quickly with /auth.',
+  'You can run any shell commands from Qwen Code using ! (e.g. !ls).',
+  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.',
+  'You can resume a previous conversation by running qwen --continue or qwen --resume.',
+  'You can switch permission mode quickly with Shift+Tab or /approval-mode.',
+] as const;
+
+export const Tips: React.FC = () => {
+  const selectedTip = useMemo(() => {
+    const randomIndex = Math.floor(Math.random() * startupTips.length);
+    return startupTips[randomIndex];
+  }, []);
 
-export const Tips: React.FC<TipsProps> = ({ config }) => {
-  const geminiMdFileCount = config.getGeminiMdFileCount();
   return (
-    <Box flexDirection="column">
-      <Text color={theme.text.primary}>{t('Tips for getting started:')}</Text>
-      <Text color={theme.text.primary}>
-        {t('1. Ask questions, edit files, or run commands.')}
-      </Text>
-      <Text color={theme.text.primary}>
-        {t('2. Be specific for the best results.')}
-      </Text>
-      {geminiMdFileCount === 0 && (
-        <Text color={theme.text.primary}>
-          3. Create{' '}
-          <Text bold color={theme.text.accent}>
-            QWEN.md
-          </Text>{' '}
-          {t('files to customize your interactions with Qwen Code.')}
-        </Text>
-      )}
-      <Text color={theme.text.primary}>
-        {geminiMdFileCount === 0 ? '4.' : '3.'}{' '}
-        <Text bold color={theme.text.accent}>
-          /help
-        </Text>{' '}
-        {t('for more information.')}
+    <Box marginLeft={2} marginRight={2}>
+      <Text color={theme.text.secondary}>
+        {t('Tips: ')}
+        {t(selectedTip)}
       </Text>
     </Box>
   );
diff --git a/packages/cli/src/ui/components/ToolStatsDisplay.tsx b/packages/cli/src/ui/components/ToolStatsDisplay.tsx
index f45dd9e8c..c48815eb1 100644
--- a/packages/cli/src/ui/components/ToolStatsDisplay.tsx
+++ b/packages/cli/src/ui/components/ToolStatsDisplay.tsx
@@ -53,7 +53,13 @@ const StatRow: React.FC<{
   );
 };
 
-export const ToolStatsDisplay: React.FC = () => {
+interface ToolStatsDisplayProps {
+  width?: number;
+}
+
+export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
+  width,
+}) => {
   const { stats } = useSessionStats();
   const { tools } = stats.metrics;
   const activeTools = Object.entries(tools.byName).filter(
@@ -67,6 +73,7 @@ export const ToolStatsDisplay: React.FC = () => {
         borderColor={theme.border.default}
         paddingY={1}
         paddingX={2}
+        width={width}
       >
         <Text color={theme.text.primary}>
           {t('No tool calls have been made in this session.')}
@@ -101,7 +108,7 @@ export const ToolStatsDisplay: React.FC = () => {
       flexDirection="column"
       paddingY={1}
       paddingX={2}
-      width={70}
+      width={width}
     >
       <Text bold color={theme.text.accent}>
         {t('Tool Stats For Nerds')}
diff --git a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
index 23b14903d..e22196178 100644
--- a/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap
@@ -1,11 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer in narrow terminal (baseline narrow) > complete-footer-narrow 1`] = `"...s/to/make/it/long (main*)                     no sandbox                      gemini-pro (100%)"`;
+exports[`<Footer /> > footer rendering (golden snapshots) > renders complete footer on narrow terminal > complete-footer-narrow 1`] = `"  ? for shortcuts                                                                        0.1% used"`;
 
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer with all sections visible (baseline) > complete-footer-wide 1`] = `"...directories/to/make/it/long (main*)    no sandbox (see /docs)    gemini-pro (100% context left)"`;
-
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with CWD and model info hidden to test alignment (only sandbox visible) > footer-only-sandbox 1`] = `"                                       no sandbox (see /docs)"`;
-
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with all optional sections hidden (minimal footer) > footer-minimal 1`] = `""`;
-
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with only model info hidden (partial filtering) > footer-no-model 1`] = `"...directories/to/make/it/long (main*)                    no sandbox (see /docs)"`;
+exports[`<Footer /> > footer rendering (golden snapshots) > renders complete footer on wide terminal > complete-footer-wide 1`] = `"  ? for shortcuts                                                                0.1% context used"`;
diff --git a/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap
index de25e153e..c22e5cace 100644
--- a/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/HistoryItemDisplay.test.tsx.snap
@@ -1,137 +1,137 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<HistoryItemDisplay /> > should render a full gemini item when using availableTerminalHeightGemini 1`] = `
-"✦ Example code block:
-    1 Line 1
-    2 Line 2
-    3 Line 3
-    4 Line 4
-    5 Line 5
-    6 Line 6
-    7 Line 7
-    8 Line 8
-    9 Line 9
-   10 Line 10
-   11 Line 11
-   12 Line 12
-   13 Line 13
-   14 Line 14
-   15 Line 15
-   16 Line 16
-   17 Line 17
-   18 Line 18
-   19 Line 19
-   20 Line 20
-   21 Line 21
-   22 Line 22
-   23 Line 23
-   24 Line 24
-   25 Line 25
-   26 Line 26
-   27 Line 27
-   28 Line 28
-   29 Line 29
-   30 Line 30
-   31 Line 31
-   32 Line 32
-   33 Line 33
-   34 Line 34
-   35 Line 35
-   36 Line 36
-   37 Line 37
-   38 Line 38
-   39 Line 39
-   40 Line 40
-   41 Line 41
-   42 Line 42
-   43 Line 43
-   44 Line 44
-   45 Line 45
-   46 Line 46
-   47 Line 47
-   48 Line 48
-   49 Line 49
-   50 Line 50"
+"  ✦ Example code block:
+      1 Line 1
+      2 Line 2
+      3 Line 3
+      4 Line 4
+      5 Line 5
+      6 Line 6
+      7 Line 7
+      8 Line 8
+      9 Line 9
+     10 Line 10
+     11 Line 11
+     12 Line 12
+     13 Line 13
+     14 Line 14
+     15 Line 15
+     16 Line 16
+     17 Line 17
+     18 Line 18
+     19 Line 19
+     20 Line 20
+     21 Line 21
+     22 Line 22
+     23 Line 23
+     24 Line 24
+     25 Line 25
+     26 Line 26
+     27 Line 27
+     28 Line 28
+     29 Line 29
+     30 Line 30
+     31 Line 31
+     32 Line 32
+     33 Line 33
+     34 Line 34
+     35 Line 35
+     36 Line 36
+     37 Line 37
+     38 Line 38
+     39 Line 39
+     40 Line 40
+     41 Line 41
+     42 Line 42
+     43 Line 43
+     44 Line 44
+     45 Line 45
+     46 Line 46
+     47 Line 47
+     48 Line 48
+     49 Line 49
+     50 Line 50"
 `;
 
 exports[`<HistoryItemDisplay /> > should render a full gemini_content item when using availableTerminalHeightGemini 1`] = `
-"  Example code block:
-    1 Line 1
-    2 Line 2
-    3 Line 3
-    4 Line 4
-    5 Line 5
-    6 Line 6
-    7 Line 7
-    8 Line 8
-    9 Line 9
-   10 Line 10
-   11 Line 11
-   12 Line 12
-   13 Line 13
-   14 Line 14
-   15 Line 15
-   16 Line 16
-   17 Line 17
-   18 Line 18
-   19 Line 19
-   20 Line 20
-   21 Line 21
-   22 Line 22
-   23 Line 23
-   24 Line 24
-   25 Line 25
-   26 Line 26
-   27 Line 27
-   28 Line 28
-   29 Line 29
-   30 Line 30
-   31 Line 31
-   32 Line 32
-   33 Line 33
-   34 Line 34
-   35 Line 35
-   36 Line 36
-   37 Line 37
-   38 Line 38
-   39 Line 39
-   40 Line 40
-   41 Line 41
-   42 Line 42
-   43 Line 43
-   44 Line 44
-   45 Line 45
-   46 Line 46
-   47 Line 47
-   48 Line 48
-   49 Line 49
-   50 Line 50"
+"    Example code block:
+      1 Line 1
+      2 Line 2
+      3 Line 3
+      4 Line 4
+      5 Line 5
+      6 Line 6
+      7 Line 7
+      8 Line 8
+      9 Line 9
+     10 Line 10
+     11 Line 11
+     12 Line 12
+     13 Line 13
+     14 Line 14
+     15 Line 15
+     16 Line 16
+     17 Line 17
+     18 Line 18
+     19 Line 19
+     20 Line 20
+     21 Line 21
+     22 Line 22
+     23 Line 23
+     24 Line 24
+     25 Line 25
+     26 Line 26
+     27 Line 27
+     28 Line 28
+     29 Line 29
+     30 Line 30
+     31 Line 31
+     32 Line 32
+     33 Line 33
+     34 Line 34
+     35 Line 35
+     36 Line 36
+     37 Line 37
+     38 Line 38
+     39 Line 39
+     40 Line 40
+     41 Line 41
+     42 Line 42
+     43 Line 43
+     44 Line 44
+     45 Line 45
+     46 Line 46
+     47 Line 47
+     48 Line 48
+     49 Line 49
+     50 Line 50"
 `;
 
 exports[`<HistoryItemDisplay /> > should render a truncated gemini item 1`] = `
-"✦ Example code block:
-   ... first 41 lines hidden ...
-   42 Line 42
-   43 Line 43
-   44 Line 44
-   45 Line 45
-   46 Line 46
-   47 Line 47
-   48 Line 48
-   49 Line 49
-   50 Line 50"
+"  ✦ Example code block:
+     ... first 41 lines hidden ...
+     42 Line 42
+     43 Line 43
+     44 Line 44
+     45 Line 45
+     46 Line 46
+     47 Line 47
+     48 Line 48
+     49 Line 49
+     50 Line 50"
 `;
 
 exports[`<HistoryItemDisplay /> > should render a truncated gemini_content item 1`] = `
-"  Example code block:
-   ... first 41 lines hidden ...
-   42 Line 42
-   43 Line 43
-   44 Line 44
-   45 Line 45
-   46 Line 46
-   47 Line 47
-   48 Line 48
-   49 Line 49
-   50 Line 50"
+"    Example code block:
+     ... first 41 lines hidden ...
+     42 Line 42
+     43 Line 43
+     44 Line 44
+     45 Line 45
+     46 Line 46
+     47 Line 47
+     48 Line 48
+     49 Line 49
+     50 Line 50"
 `;
diff --git a/packages/cli/src/ui/components/__snapshots__/InputPrompt.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/InputPrompt.test.tsx.snap
index efa14b8b6..4df29a062 100644
--- a/packages/cli/src/ui/components/__snapshots__/InputPrompt.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/InputPrompt.test.tsx.snap
@@ -20,38 +20,38 @@ exports[`InputPrompt > command search (Ctrl+R when not in shell) > expands and c
 
 exports[`InputPrompt > command search (Ctrl+R when not in shell) > renders match window and expanded view (snapshots) > command-search-collapsed-match 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
- (r:)  commit
+(r:)  commit
 ────────────────────────────────────────────────────────────────────────────────────────────────────
- git commit -m "feat: add search" in src/app"
+  git commit -m "feat: add search" in src/app"
 `;
 
 exports[`InputPrompt > command search (Ctrl+R when not in shell) > renders match window and expanded view (snapshots) > command-search-expanded-match 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
- (r:)  commit
+(r:)  commit
 ────────────────────────────────────────────────────────────────────────────────────────────────────
- git commit -m "feat: add search" in src/app"
+  git commit -m "feat: add search" in src/app"
 `;
 
 exports[`InputPrompt > snapshots > should not show inverted cursor when shell is focused 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
- >   Type your message or @path/to/file
+>   Type your message or @path/to/file
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > snapshots > should render correctly in shell mode 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
- !   Type your message or @path/to/file
+!   Type your message or @path/to/file
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > snapshots > should render correctly in yolo mode 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
- *   Type your message or @path/to/file
+*   Type your message or @path/to/file
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > snapshots > should render correctly when accepting edits 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
- >   Type your message or @path/to/file
+>   Type your message or @path/to/file
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
diff --git a/packages/cli/src/ui/components/__snapshots__/SettingsDialog.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/SettingsDialog.test.tsx.snap
index fbc2244b7..d6cf8d2f8 100644
--- a/packages/cli/src/ui/components/__snapshots__/SettingsDialog.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/SettingsDialog.test.tsx.snap
@@ -6,30 +6,17 @@ exports[`SettingsDialog > Snapshot Tests > should render default state correctly
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             false                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                 false │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -40,30 +27,17 @@ exports[`SettingsDialog > Snapshot Tests > should render focused on scope select
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             false                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                 false │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -74,30 +48,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with accessibility sett
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             true*                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                 true* │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -108,30 +69,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with all boolean settin
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             false*                                    │
-│                                                                                                  │
-│   Disable Auto Update                                  false*                                    │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false*                                    │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false*                                    │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                false* │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                     false* │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -142,30 +90,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with different scope se
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode (Modified in System)                        false                                     │
-│                                                                                                  │
-│   Disable Auto Update (Modified in System)             false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode (Modified in System)                                                            false │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -176,30 +111,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with different scope se
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode (Modified in Workspace)                     false                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging (Modified in Workspace)      false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode (Modified in Workspace)                                                         false │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -210,30 +132,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with file filtering set
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             false                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                 false │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -244,30 +153,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with mixed boolean and
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             false*                                    │
-│                                                                                                  │
-│   Disable Auto Update                                  true*                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false*                                    │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                false* │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -278,30 +174,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with tools and security
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             false                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  false                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              false                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    false                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                 false │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      false │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -312,30 +195,17 @@ exports[`SettingsDialog > Snapshot Tests > should render with various boolean se
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Vim Mode                                             true*                                     │
-│                                                                                                  │
-│   Disable Auto Update                                  true*                                     │
-│                                                                                                  │
-│   Debug Keystroke Logging                              true*                                     │
-│                                                                                                  │
-│   Language                                             Auto (detect from system)                 │
-│                                                                                                  │
-│   Terminal Bell                                        true                                      │
-│                                                                                                  │
-│   Output Format                                        Text                                      │
-│                                                                                                  │
-│   Hide Window Title                                    true*                                     │
-│                                                                                                  │
-│   Show Status in Title                                 false                                     │
-│                                                                                                  │
+│ ● Tool Approval Mode                                                                     Default │
+│   Language: UI                                                         Auto (detect from system) │
+│   Language: Model                                                                           auto │
+│   Theme                                                                                Qwen Dark │
+│   Vim Mode                                                                                 true* │
+│   Interactive Shell (PTY)                                                                  false │
+│   Preferred Editor                                                                               │
+│   Auto-connect to IDE                                                                      true* │
 │ ▼                                                                                                │
 │                                                                                                  │
-│                                                                                                  │
-│   Apply To                                                                                       │
-│ ● User Settings                                                                                  │
-│   Workspace Settings                                                                             │
-│                                                                                                  │
-│ (Use Enter to select, Tab to change focus)                                                       │
+│ (Use Enter to select, Tab to configure scope)                                                    │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
diff --git a/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
index 09787eca6..d254c32df 100644
--- a/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap
@@ -4,10 +4,11 @@ exports[`ThemeDialog Snapshots > should render correctly in scope selector mode
 "╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │                                                                                                  │
 │ > Apply To                                                                                       │
+│                                                                                                  │
 │ ● 1. User Settings                                                                               │
 │   2. Workspace Settings                                                                          │
 │                                                                                                  │
-│ (Use Enter to apply scope, Tab to select theme)                                                  │
+│ (Use Enter to apply scope, Tab to go back)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
diff --git a/packages/cli/src/ui/components/__snapshots__/ToolStatsDisplay.test.tsx.snap b/packages/cli/src/ui/components/__snapshots__/ToolStatsDisplay.test.tsx.snap
index 61fb3efca..0d549b8fb 100644
--- a/packages/cli/src/ui/components/__snapshots__/ToolStatsDisplay.test.tsx.snap
+++ b/packages/cli/src/ui/components/__snapshots__/ToolStatsDisplay.test.tsx.snap
@@ -1,85 +1,85 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<ToolStatsDisplay /> > should display stats for a single tool correctly 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  test-tool                       1         100.0%          100ms   │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                                   1   │
-│   » Accepted:                                                  1   │
-│   » Rejected:                                                  0   │
-│   » Modified:                                                  0   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                 100.0%   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  test-tool                       1         100.0%          100ms                                 │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                                   1                                 │
+│   » Accepted:                                                  1                                 │
+│   » Rejected:                                                  0                                 │
+│   » Modified:                                                  0                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                 100.0%                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should display stats for multiple tools correctly 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  tool-a                          2          50.0%          100ms   │
-│  tool-b                          1         100.0%          100ms   │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                                   3   │
-│   » Accepted:                                                  1   │
-│   » Rejected:                                                  1   │
-│   » Modified:                                                  1   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                  33.3%   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  tool-a                          2          50.0%          100ms                                 │
+│  tool-b                          1         100.0%          100ms                                 │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                                   3                                 │
+│   » Accepted:                                                  1                                 │
+│   » Rejected:                                                  1                                 │
+│   » Modified:                                                  1                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                  33.3%                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should handle large values without wrapping or overlapping 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  long-named-tool-for-testi99999999          88.9%            1ms   │
-│  ng-wrapping-and-such     9                                        │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                           222234566   │
-│   » Accepted:                                          123456789   │
-│   » Rejected:                                           98765432   │
-│   » Modified:                                              12345   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                  55.6%   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  long-named-tool-for-testi99999999          88.9%            1ms                                 │
+│  ng-wrapping-and-such     9                                                                      │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                           222234566                                 │
+│   » Accepted:                                          123456789                                 │
+│   » Rejected:                                           98765432                                 │
+│   » Modified:                                              12345                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                  55.6%                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should handle zero decisions gracefully 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  test-tool                       1         100.0%          100ms   │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                                   0   │
-│   » Accepted:                                                  0   │
-│   » Rejected:                                                  0   │
-│   » Modified:                                                  0   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                     --   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  test-tool                       1         100.0%          100ms                                 │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                                   0                                 │
+│   » Accepted:                                                  0                                 │
+│   » Rejected:                                                  0                                 │
+│   » Modified:                                                  0                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                     --                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should render "no tool calls" message when there are no active tools 1`] = `
diff --git a/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx b/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx
index 9629b94ba..6cc0fe61f 100644
--- a/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx
+++ b/packages/cli/src/ui/components/messages/DiffRenderer.test.tsx
@@ -35,7 +35,7 @@ index 0000000..e69de29
         <DiffRenderer
           diffContent={newFileDiffContent}
           filename="test.py"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -63,7 +63,7 @@ index 0000000..e69de29
         <DiffRenderer
           diffContent={newFileDiffContent}
           filename="test.unknown"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -88,7 +88,7 @@ index 0000000..e69de29
 `;
     render(
       <OverflowProvider>
-        <DiffRenderer diffContent={newFileDiffContent} terminalWidth={80} />
+        <DiffRenderer diffContent={newFileDiffContent} contentWidth={80} />
       </OverflowProvider>,
     );
     expect(mockColorizeCode).toHaveBeenCalledWith(
@@ -115,7 +115,7 @@ index 0000001..0000002 100644
         <DiffRenderer
           diffContent={existingFileDiffContent}
           filename="test.txt"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -145,7 +145,7 @@ index 1234567..1234567 100644
         <DiffRenderer
           diffContent={noChangeDiff}
           filename="file.txt"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -156,7 +156,7 @@ index 1234567..1234567 100644
   it('should handle empty diff content', () => {
     const { lastFrame } = render(
       <OverflowProvider>
-        <DiffRenderer diffContent="" terminalWidth={80} />
+        <DiffRenderer diffContent="" contentWidth={80} />
       </OverflowProvider>,
     );
     expect(lastFrame()).toContain('No diff content');
@@ -182,7 +182,7 @@ index 123..456 100644
         <DiffRenderer
           diffContent={diffWithGap}
           filename="file.txt"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -219,7 +219,7 @@ index abc..def 100644
         <DiffRenderer
           diffContent={diffWithSmallGap}
           filename="file.txt"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -291,7 +291,7 @@ index 123..789 100644
             <DiffRenderer
               diffContent={diffWithMultipleHunks}
               filename="multi.js"
-              terminalWidth={terminalWidth}
+              contentWidth={terminalWidth}
               availableTerminalHeight={height}
             />
           </OverflowProvider>,
@@ -323,7 +323,7 @@ fileDiff Index: file.txt
         <DiffRenderer
           diffContent={newFileDiff}
           filename="TEST"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
@@ -353,7 +353,7 @@ fileDiff Index: Dockerfile
         <DiffRenderer
           diffContent={newFileDiff}
           filename="Dockerfile"
-          terminalWidth={80}
+          contentWidth={80}
         />
       </OverflowProvider>,
     );
diff --git a/packages/cli/src/ui/components/messages/DiffRenderer.tsx b/packages/cli/src/ui/components/messages/DiffRenderer.tsx
index d962d683b..444bf8048 100644
--- a/packages/cli/src/ui/components/messages/DiffRenderer.tsx
+++ b/packages/cli/src/ui/components/messages/DiffRenderer.tsx
@@ -84,7 +84,7 @@ interface DiffRendererProps {
   filename?: string;
   tabWidth?: number;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
   theme?: Theme;
 }
 
@@ -95,7 +95,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   filename,
   tabWidth = DEFAULT_TAB_WIDTH,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
   theme,
 }) => {
   const screenReaderEnabled = useIsScreenReaderEnabled();
@@ -155,7 +155,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
       addedContent,
       language,
       availableTerminalHeight,
-      terminalWidth,
+      contentWidth,
       theme,
     );
   } else {
@@ -164,7 +164,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
       filename,
       tabWidth,
       availableTerminalHeight,
-      terminalWidth,
+      contentWidth,
     );
   }
 
@@ -176,7 +176,7 @@ const renderDiffContent = (
   filename: string | undefined,
   tabWidth = DEFAULT_TAB_WIDTH,
   availableTerminalHeight: number | undefined,
-  terminalWidth: number,
+  contentWidth: number,
 ) => {
   // 1. Normalize whitespace (replace tabs with spaces) *before* further processing
   const normalizedLines = parsedLines.map((line) => ({
@@ -238,7 +238,7 @@ const renderDiffContent = (
   return (
     <MaxSizedBox
       maxHeight={availableTerminalHeight}
-      maxWidth={terminalWidth}
+      maxWidth={contentWidth}
       key={key}
     >
       {displayableLines.reduce<React.ReactNode[]>((acc, line, index) => {
@@ -260,7 +260,7 @@ const renderDiffContent = (
           acc.push(
             <Box key={`gap-${index}`}>
               <Text wrap="truncate" color={semanticTheme.text.secondary}>
-                {'═'.repeat(terminalWidth)}
+                {'═'.repeat(contentWidth)}
               </Text>
             </Box>,
           );
diff --git a/packages/cli/src/ui/components/messages/ErrorMessage.tsx b/packages/cli/src/ui/components/messages/ErrorMessage.tsx
index 71794ee41..8e10a4fed 100644
--- a/packages/cli/src/ui/components/messages/ErrorMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ErrorMessage.tsx
@@ -17,7 +17,7 @@ export const ErrorMessage: React.FC<ErrorMessageProps> = ({ text }) => {
   const prefixWidth = prefix.length;
 
   return (
-    <Box flexDirection="row" marginBottom={1}>
+    <Box flexDirection="row">
       <Box width={prefixWidth}>
         <Text color={theme.status.error}>{prefix}</Text>
       </Box>
diff --git a/packages/cli/src/ui/components/messages/GeminiMessage.tsx b/packages/cli/src/ui/components/messages/GeminiMessage.tsx
index 389b5ac15..987cbf38a 100644
--- a/packages/cli/src/ui/components/messages/GeminiMessage.tsx
+++ b/packages/cli/src/ui/components/messages/GeminiMessage.tsx
@@ -14,14 +14,14 @@ interface GeminiMessageProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 export const GeminiMessage: React.FC<GeminiMessageProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
 }) => {
   const prefix = '✦ ';
   const prefixWidth = prefix.length;
@@ -38,7 +38,7 @@ export const GeminiMessage: React.FC<GeminiMessageProps> = ({
           text={text}
           isPending={isPending}
           availableTerminalHeight={availableTerminalHeight}
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth - prefixWidth}
         />
       </Box>
     </Box>
diff --git a/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx b/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx
index 05bdb75cf..29a82298f 100644
--- a/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx
+++ b/packages/cli/src/ui/components/messages/GeminiMessageContent.tsx
@@ -12,7 +12,7 @@ interface GeminiMessageContentProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 /*
@@ -25,7 +25,7 @@ export const GeminiMessageContent: React.FC<GeminiMessageContentProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
 }) => {
   const originalPrefix = '✦ ';
   const prefixWidth = originalPrefix.length;
@@ -36,7 +36,7 @@ export const GeminiMessageContent: React.FC<GeminiMessageContentProps> = ({
         text={text}
         isPending={isPending}
         availableTerminalHeight={availableTerminalHeight}
-        terminalWidth={terminalWidth}
+        contentWidth={contentWidth - prefixWidth}
       />
     </Box>
   );
diff --git a/packages/cli/src/ui/components/messages/GeminiThoughtMessage.tsx b/packages/cli/src/ui/components/messages/GeminiThoughtMessage.tsx
index 22571852c..b595c9d06 100644
--- a/packages/cli/src/ui/components/messages/GeminiThoughtMessage.tsx
+++ b/packages/cli/src/ui/components/messages/GeminiThoughtMessage.tsx
@@ -13,7 +13,7 @@ interface GeminiThoughtMessageProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 /**
@@ -24,13 +24,13 @@ export const GeminiThoughtMessage: React.FC<GeminiThoughtMessageProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
 }) => {
   const prefix = '✦ ';
   const prefixWidth = prefix.length;
 
   return (
-    <Box flexDirection="row" marginBottom={1}>
+    <Box flexDirection="row">
       <Box width={prefixWidth}>
         <Text color={theme.text.secondary}>{prefix}</Text>
       </Box>
@@ -39,7 +39,7 @@ export const GeminiThoughtMessage: React.FC<GeminiThoughtMessageProps> = ({
           text={text}
           isPending={isPending}
           availableTerminalHeight={availableTerminalHeight}
-          terminalWidth={terminalWidth}
+          contentWidth={contentWidth - prefixWidth}
           textColor={theme.text.secondary}
         />
       </Box>
diff --git a/packages/cli/src/ui/components/messages/GeminiThoughtMessageContent.tsx b/packages/cli/src/ui/components/messages/GeminiThoughtMessageContent.tsx
index f68dd3b5a..0f20c45d2 100644
--- a/packages/cli/src/ui/components/messages/GeminiThoughtMessageContent.tsx
+++ b/packages/cli/src/ui/components/messages/GeminiThoughtMessageContent.tsx
@@ -13,7 +13,7 @@ interface GeminiThoughtMessageContentProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 /**
@@ -22,17 +22,17 @@ interface GeminiThoughtMessageContentProps {
  */
 export const GeminiThoughtMessageContent: React.FC<
   GeminiThoughtMessageContentProps
-> = ({ text, isPending, availableTerminalHeight, terminalWidth }) => {
+> = ({ text, isPending, availableTerminalHeight, contentWidth }) => {
   const originalPrefix = '✦ ';
   const prefixWidth = originalPrefix.length;
 
   return (
-    <Box flexDirection="column" paddingLeft={prefixWidth} marginBottom={1}>
+    <Box flexDirection="column" paddingLeft={prefixWidth}>
       <MarkdownDisplay
         text={text}
         isPending={isPending}
         availableTerminalHeight={availableTerminalHeight}
-        terminalWidth={terminalWidth}
+        contentWidth={contentWidth - prefixWidth}
         textColor={theme.text.secondary}
       />
     </Box>
diff --git a/packages/cli/src/ui/components/messages/InfoMessage.tsx b/packages/cli/src/ui/components/messages/InfoMessage.tsx
index 1d132a898..fb03fbef1 100644
--- a/packages/cli/src/ui/components/messages/InfoMessage.tsx
+++ b/packages/cli/src/ui/components/messages/InfoMessage.tsx
@@ -23,7 +23,7 @@ export const InfoMessage: React.FC<InfoMessageProps> = ({ text }) => {
   const prefixWidth = prefix.length;
 
   return (
-    <Box flexDirection="row" marginBottom={1}>
+    <Box flexDirection="row">
       <Box width={prefixWidth}>
         <Text color={theme.status.warning}>{prefix}</Text>
       </Box>
diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx
index 423b6b28a..11daefa3b 100644
--- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx
+++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx
@@ -34,7 +34,7 @@ describe('ToolConfirmationMessage', () => {
         confirmationDetails={confirmationDetails}
         config={mockConfig}
         availableTerminalHeight={30}
-        terminalWidth={80}
+        contentWidth={80}
       />,
     );
 
@@ -58,7 +58,7 @@ describe('ToolConfirmationMessage', () => {
         confirmationDetails={confirmationDetails}
         config={mockConfig}
         availableTerminalHeight={30}
-        terminalWidth={80}
+        contentWidth={80}
       />,
     );
 
@@ -81,7 +81,7 @@ describe('ToolConfirmationMessage', () => {
         confirmationDetails={confirmationDetails}
         config={mockConfig}
         availableTerminalHeight={30}
-        terminalWidth={80}
+        contentWidth={80}
       />,
     );
 
@@ -162,7 +162,7 @@ describe('ToolConfirmationMessage', () => {
             confirmationDetails={details}
             config={mockConfig}
             availableTerminalHeight={30}
-            terminalWidth={80}
+            contentWidth={80}
           />,
         );
 
@@ -180,7 +180,7 @@ describe('ToolConfirmationMessage', () => {
             confirmationDetails={details}
             config={mockConfig}
             availableTerminalHeight={30}
-            terminalWidth={80}
+            contentWidth={80}
           />,
         );
 
@@ -212,7 +212,7 @@ describe('ToolConfirmationMessage', () => {
           confirmationDetails={editConfirmationDetails}
           config={mockConfig}
           availableTerminalHeight={30}
-          terminalWidth={80}
+          contentWidth={80}
         />,
         {
           settings: {
@@ -235,7 +235,7 @@ describe('ToolConfirmationMessage', () => {
           confirmationDetails={editConfirmationDetails}
           config={mockConfig}
           availableTerminalHeight={30}
-          terminalWidth={80}
+          contentWidth={80}
         />,
         {
           settings: {
diff --git a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
index 409345536..d8ded72a6 100644
--- a/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx
@@ -31,7 +31,7 @@ export interface ToolConfirmationMessageProps {
   config: Config;
   isFocused?: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
   compactMode?: boolean;
 }
 
@@ -42,11 +42,10 @@ export const ToolConfirmationMessage: React.FC<
   config,
   isFocused = true,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
   compactMode = false,
 }) => {
   const { onConfirm } = confirmationDetails;
-  const childWidth = terminalWidth - 2; // 2 for padding
 
   const settings = useSettings();
   const preferredEditor = settings.merged.general?.preferredEditor as
@@ -226,7 +225,7 @@ export const ToolConfirmationMessage: React.FC<
         diffContent={confirmationDetails.fileDiff}
         filename={confirmationDetails.fileName}
         availableTerminalHeight={availableBodyContentHeight()}
-        terminalWidth={childWidth}
+        contentWidth={contentWidth}
       />
     );
   } else if (confirmationDetails.type === 'exec') {
@@ -263,7 +262,7 @@ export const ToolConfirmationMessage: React.FC<
         <Box paddingX={1} marginLeft={1}>
           <MaxSizedBox
             maxHeight={bodyContentHeight}
-            maxWidth={Math.max(childWidth - 4, 1)}
+            maxWidth={Math.max(contentWidth, 1)}
           >
             <Box>
               <Text color={theme.text.link}>{executionProps.command}</Text>
@@ -298,7 +297,7 @@ export const ToolConfirmationMessage: React.FC<
           text={planProps.plan}
           isPending={false}
           availableTerminalHeight={availableBodyContentHeight()}
-          terminalWidth={childWidth}
+          contentWidth={contentWidth}
         />
       </Box>
     );
@@ -397,7 +396,7 @@ export const ToolConfirmationMessage: React.FC<
   }
 
   return (
-    <Box flexDirection="column" padding={1} width={childWidth}>
+    <Box flexDirection="column" padding={1} width={contentWidth}>
       {/* Body Content (Diff Renderer or Command Info) */}
       {/* No separate context display here anymore for edits */}
       <Box flexGrow={1} flexShrink={1} overflow="hidden" marginBottom={1}>
diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
index f1d5f6426..51ca0bea1 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx
@@ -83,7 +83,7 @@ describe('<ToolGroupMessage />', () => {
 
   const baseProps = {
     groupId: 1,
-    terminalWidth: 80,
+    contentWidth: 80,
     isFocused: true,
   };
 
@@ -244,7 +244,7 @@ describe('<ToolGroupMessage />', () => {
         <ToolGroupMessage
           {...baseProps}
           toolCalls={toolCalls}
-          terminalWidth={40}
+          contentWidth={40}
         />,
       );
       expect(lastFrame()).toMatchSnapshot();
diff --git a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
index 70d58fbc3..bbebc1361 100644
--- a/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
@@ -19,7 +19,7 @@ interface ToolGroupMessageProps {
   groupId: number;
   toolCalls: IndividualToolCallDisplay[];
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
   isFocused?: boolean;
   activeShellPtyId?: number | null;
   embeddedShellFocused?: boolean;
@@ -30,7 +30,7 @@ interface ToolGroupMessageProps {
 export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
   toolCalls,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
   isFocused = true,
   activeShellPtyId,
   embeddedShellFocused,
@@ -58,9 +58,8 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         : theme.border.default;
 
   const staticHeight = /* border */ 2 + /* marginBottom */ 1;
-  // This is a bit of a magic number, but it accounts for the border and
-  // marginLeft.
-  const innerWidth = terminalWidth - 4;
+  // account for border (2 chars) and padding (2 chars)
+  const innerWidth = contentWidth - 4;
 
   // only prompt for tool approval on the first 'confirming' tool in the list
   // note, after the CTA, this automatically moves over to the next 'confirming' tool
@@ -96,8 +95,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         Ink to render the border of the box incorrectly and span multiple lines and even
         cause tearing.
       */
-      width="100%"
-      marginLeft={1}
+      width={contentWidth}
       borderDimColor={
         hasPending && (!isShellCommand || !isEmbeddedShellFocused)
       }
@@ -112,7 +110,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
               <ToolMessage
                 {...tool}
                 availableTerminalHeight={availableTerminalHeightPerToolMessage}
-                terminalWidth={innerWidth}
+                contentWidth={innerWidth}
                 emphasis={
                   isConfirming
                     ? 'high'
@@ -135,7 +133,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                   availableTerminalHeight={
                     availableTerminalHeightPerToolMessage
                   }
-                  terminalWidth={innerWidth}
+                  contentWidth={innerWidth}
                 />
               )}
             {tool.outputFile && (
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx
index 883cdfb89..3e2aeb585 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.test.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.test.tsx
@@ -105,7 +105,7 @@ describe('<ToolMessage />', () => {
     description: 'A tool for testing',
     resultDisplay: 'Test result',
     status: ToolCallStatus.Success,
-    terminalWidth: 80,
+    contentWidth: 80,
     confirmationDetails: undefined,
     emphasis: 'medium',
     config: mockConfig,
@@ -241,7 +241,7 @@ describe('<ToolMessage />', () => {
       description: 'Delegate task to subagent',
       resultDisplay: subagentResultDisplay,
       status: ToolCallStatus.Executing,
-      terminalWidth: 80,
+      contentWidth: 80,
       callId: 'test-call-id-2',
       confirmationDetails: undefined,
       config: mockConfig,
diff --git a/packages/cli/src/ui/components/messages/ToolMessage.tsx b/packages/cli/src/ui/components/messages/ToolMessage.tsx
index 67e442544..40232387d 100644
--- a/packages/cli/src/ui/components/messages/ToolMessage.tsx
+++ b/packages/cli/src/ui/components/messages/ToolMessage.tsx
@@ -186,7 +186,7 @@ const StringResultRenderer: React.FC<{
           text={displayData}
           isPending={false}
           availableTerminalHeight={availableHeight}
-          terminalWidth={childWidth}
+          contentWidth={childWidth}
         />
       </Box>
     );
@@ -215,13 +215,13 @@ const DiffResultRenderer: React.FC<{
     diffContent={data.fileDiff}
     filename={data.fileName}
     availableTerminalHeight={availableHeight}
-    terminalWidth={childWidth}
+    contentWidth={childWidth}
   />
 );
 
 export interface ToolMessageProps extends IndividualToolCallDisplay {
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
   emphasis?: TextEmphasis;
   renderOutputAsMarkdown?: boolean;
   activeShellPtyId?: number | null;
@@ -235,7 +235,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   resultDisplay,
   status,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
   emphasis = 'medium',
   renderOutputAsMarkdown = true,
   activeShellPtyId,
@@ -291,6 +291,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
         MIN_LINES_SHOWN + 1, // enforce minimum lines shown
       )
     : undefined;
+  const innerWidth = contentWidth - STATUS_INDICATOR_WIDTH;
 
   // Long tool call response in MarkdownDisplay doesn't respect availableTerminalHeight properly,
   // we're forcing it to not render as markdown when the response is too long, it will fallback
@@ -299,8 +300,6 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
     renderOutputAsMarkdown = false;
   }
 
-  const childWidth = terminalWidth - 3; // account for padding.
-
   // Use the custom hook to determine the display type
   const displayRenderer = useResultDisplayRenderer(resultDisplay);
 
@@ -333,14 +332,14 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
               <PlanResultRenderer
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
-                childWidth={childWidth}
+                childWidth={innerWidth}
               />
             )}
             {displayRenderer.type === 'task' && config && (
               <SubagentExecutionRenderer
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
-                childWidth={childWidth}
+                childWidth={innerWidth}
                 config={config}
               />
             )}
@@ -348,7 +347,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
               <DiffResultRenderer
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
-                childWidth={childWidth}
+                childWidth={innerWidth}
               />
             )}
             {displayRenderer.type === 'ansi' && (
@@ -362,7 +361,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 data={displayRenderer.data}
                 renderAsMarkdown={renderOutputAsMarkdown}
                 availableHeight={availableHeight}
-                childWidth={childWidth}
+                childWidth={innerWidth}
               />
             )}
           </Box>
diff --git a/packages/cli/src/ui/components/messages/WarningMessage.tsx b/packages/cli/src/ui/components/messages/WarningMessage.tsx
index 8e1e9f1d1..4bc2c899c 100644
--- a/packages/cli/src/ui/components/messages/WarningMessage.tsx
+++ b/packages/cli/src/ui/components/messages/WarningMessage.tsx
@@ -18,7 +18,7 @@ export const WarningMessage: React.FC<WarningMessageProps> = ({ text }) => {
   const prefixWidth = 3;
 
   return (
-    <Box flexDirection="row" marginBottom={1}>
+    <Box flexDirection="row">
       <Box width={prefixWidth}>
         <Text color={Colors.AccentYellow}>{prefix}</Text>
       </Box>
diff --git a/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupMessage.test.tsx.snap b/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupMessage.test.tsx.snap
index ee798b671..4dbd1c399 100644
--- a/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupMessage.test.tsx.snap
+++ b/packages/cli/src/ui/components/messages/__snapshots__/ToolGroupMessage.test.tsx.snap
@@ -1,105 +1,108 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<ToolGroupMessage /> > Border Color Logic > uses gray border when all tools are successful and no shell commands 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-123]: ✓ test-tool - A tool for testing (medium)                                     │
- │                                                                                                  │
- │MockTool[tool-2]: ✓ another-tool - A tool for testing (medium)                                    │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-123]: ✓ test-tool - A tool for testing (medium)                 │
+│                                                                              │
+│MockTool[tool-2]: ✓ another-tool - A tool for testing (medium)                │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Border Color Logic > uses yellow border for shell commands even when successful 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-123]: ✓ run_shell_command - A tool for testing (medium)                             │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-123]: ✓ run_shell_command - A tool for testing (medium)         │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Border Color Logic > uses yellow border when tools are pending 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-123]: o test-tool - A tool for testing (medium)                                     │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-123]: o test-tool - A tool for testing (medium)                 │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Confirmation Handling > shows confirmation dialog for first confirming tool only 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-1]: ? first-confirm - A tool for testing (high)                                     │
- │MockConfirmation: Confirm first tool                                                              │
- │                                                                                                  │
- │MockTool[tool-2]: ? second-confirm - A tool for testing (low)                                     │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-1]: ? first-confirm - A tool for testing (high)                 │
+│MockConfirmation: Confirm first tool                                          │
+│                                                                              │
+│MockTool[tool-2]: ? second-confirm - A tool for testing (low)                 │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders empty tool calls array 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders mixed tool calls including shell command 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-1]: ✓ read_file - Read a file (medium)                                              │
- │                                                                                                  │
- │MockTool[tool-2]: ⊷ run_shell_command - Run command (medium)                                      │
- │                                                                                                  │
- │MockTool[tool-3]: o write_file - Write to file (medium)                                           │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-1]: ✓ read_file - Read a file (medium)                          │
+│                                                                              │
+│MockTool[tool-2]: ⊷ run_shell_command - Run command (medium)                  │
+│                                                                              │
+│MockTool[tool-3]: o write_file - Write to file (medium)                       │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders multiple tool calls with different statuses 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-1]: ✓ successful-tool - This tool succeeded (medium)                                │
- │                                                                                                  │
- │MockTool[tool-2]: o pending-tool - This tool is pending (medium)                                  │
- │                                                                                                  │
- │MockTool[tool-3]: x error-tool - This tool failed (medium)                                        │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-1]: ✓ successful-tool - This tool succeeded (medium)            │
+│                                                                              │
+│MockTool[tool-2]: o pending-tool - This tool is pending (medium)              │
+│                                                                              │
+│MockTool[tool-3]: x error-tool - This tool failed (medium)                    │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders shell command with yellow border 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[shell-1]: ✓ run_shell_command - Execute shell command (medium)                           │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[shell-1]: ✓ run_shell_command - Execute shell command (medium)       │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders single successful tool call 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-123]: ✓ test-tool - A tool for testing (medium)                                     │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-123]: ✓ test-tool - A tool for testing (medium)                 │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders tool call awaiting confirmation 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-confirm]: ? confirmation-tool - This tool needs confirmation (high)                 │
- │MockConfirmation: Are you sure you want to proceed?                                               │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-confirm]: ? confirmation-tool - This tool needs confirmation    │
+│(high)                                                                        │
+│MockConfirmation: Are you sure you want to proceed?                           │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders when not focused 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-123]: ✓ test-tool - A tool for testing (medium)                                     │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-123]: ✓ test-tool - A tool for testing (medium)                 │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders with limited terminal height 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-1]: ✓ tool-with-result - Tool with output (medium)                                  │
- │                                                                                                  │
- │MockTool[tool-2]: ✓ another-tool - Another tool (medium)                                          │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-1]: ✓ tool-with-result - Tool with output (medium)              │
+│                                                                              │
+│MockTool[tool-2]: ✓ another-tool - Another tool (medium)                      │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Golden Snapshots > renders with narrow terminal width 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-123]: ✓ very-long-tool-name-that-might-wrap - This is a very long description that  │
- │might cause wrapping issues (medium)                                                              │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────╮
+│MockTool[tool-123]: ✓                 │
+│very-long-tool-name-that-might-wrap - │
+│This is a very long description that  │
+│might cause wrapping issues (medium)  │
+╰──────────────────────────────────────╯"
 `;
 
 exports[`<ToolGroupMessage /> > Height Calculation > calculates available height correctly with multiple tools with results 1`] = `
-" ╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
- │MockTool[tool-1]: ✓ test-tool - A tool for testing (medium)                                       │
- │                                                                                                  │
- │MockTool[tool-2]: ✓ test-tool - A tool for testing (medium)                                       │
- │                                                                                                  │
- │MockTool[tool-3]: ✓ test-tool - A tool for testing (medium)                                       │
- ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────╮
+│MockTool[tool-1]: ✓ test-tool - A tool for testing (medium)                   │
+│                                                                              │
+│MockTool[tool-2]: ✓ test-tool - A tool for testing (medium)                   │
+│                                                                              │
+│MockTool[tool-3]: ✓ test-tool - A tool for testing (medium)                   │
+╰──────────────────────────────────────────────────────────────────────────────╯"
 `;
diff --git a/packages/cli/src/ui/components/shared/ScopeSelector.tsx b/packages/cli/src/ui/components/shared/ScopeSelector.tsx
index 04ff8080d..f5d265bfd 100644
--- a/packages/cli/src/ui/components/shared/ScopeSelector.tsx
+++ b/packages/cli/src/ui/components/shared/ScopeSelector.tsx
@@ -45,6 +45,7 @@ export function ScopeSelector({
         {isFocused ? '> ' : '  '}
         {t('Apply To')}
       </Text>
+      <Box height={1} />
       <RadioButtonSelect
         items={scopeItems}
         initialIndex={safeInitialIndex}
diff --git a/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx b/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
index a18705913..8f9fe2a6a 100644
--- a/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
+++ b/packages/cli/src/ui/components/subagents/runtime/AgentExecutionDisplay.tsx
@@ -172,7 +172,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
                   confirmationDetails={data.pendingConfirmation}
                   isFocused={true}
                   availableTerminalHeight={availableHeight}
-                  terminalWidth={childWidth}
+                  contentWidth={childWidth - 4}
                   compactMode={true}
                   config={config}
                 />
@@ -242,7 +242,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
             config={config}
             isFocused={true}
             availableTerminalHeight={availableHeight}
-            terminalWidth={childWidth}
+            contentWidth={childWidth - 4}
             compactMode={true}
           />
         </Box>
diff --git a/packages/cli/src/ui/components/views/ToolsList.test.tsx b/packages/cli/src/ui/components/views/ToolsList.test.tsx
index 553ba3d87..ae6acd120 100644
--- a/packages/cli/src/ui/components/views/ToolsList.test.tsx
+++ b/packages/cli/src/ui/components/views/ToolsList.test.tsx
@@ -33,11 +33,7 @@ const mockTools: ToolDefinition[] = [
 describe('<ToolsList />', () => {
   it('renders correctly with descriptions', () => {
     const { lastFrame } = render(
-      <ToolsList
-        tools={mockTools}
-        showDescriptions={true}
-        terminalWidth={40}
-      />,
+      <ToolsList tools={mockTools} showDescriptions={true} contentWidth={40} />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });
@@ -47,7 +43,7 @@ describe('<ToolsList />', () => {
       <ToolsList
         tools={mockTools}
         showDescriptions={false}
-        terminalWidth={40}
+        contentWidth={40}
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -55,7 +51,7 @@ describe('<ToolsList />', () => {
 
   it('renders correctly with no tools', () => {
     const { lastFrame } = render(
-      <ToolsList tools={[]} showDescriptions={true} terminalWidth={40} />,
+      <ToolsList tools={[]} showDescriptions={true} contentWidth={40} />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });
diff --git a/packages/cli/src/ui/components/views/ToolsList.tsx b/packages/cli/src/ui/components/views/ToolsList.tsx
index 061716e65..d397c1002 100644
--- a/packages/cli/src/ui/components/views/ToolsList.tsx
+++ b/packages/cli/src/ui/components/views/ToolsList.tsx
@@ -14,15 +14,15 @@ import { t } from '../../../i18n/index.js';
 interface ToolsListProps {
   tools: readonly ToolDefinition[];
   showDescriptions: boolean;
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 export const ToolsList: React.FC<ToolsListProps> = ({
   tools,
   showDescriptions,
-  terminalWidth,
+  contentWidth,
 }) => (
-  <Box flexDirection="column" marginBottom={1}>
+  <Box flexDirection="column">
     <Text bold color={theme.text.primary}>
       {t('Available Qwen Code CLI tools:')}
     </Text>
@@ -38,7 +38,7 @@ export const ToolsList: React.FC<ToolsListProps> = ({
             </Text>
             {showDescriptions && tool.description && (
               <MarkdownDisplay
-                terminalWidth={terminalWidth}
+                contentWidth={contentWidth}
                 text={tool.description}
                 isPending={false}
               />
diff --git a/packages/cli/src/ui/components/views/__snapshots__/ToolsList.test.tsx.snap b/packages/cli/src/ui/components/views/__snapshots__/ToolsList.test.tsx.snap
index 464fc31cc..d101710c0 100644
--- a/packages/cli/src/ui/components/views/__snapshots__/ToolsList.test.tsx.snap
+++ b/packages/cli/src/ui/components/views/__snapshots__/ToolsList.test.tsx.snap
@@ -11,15 +11,13 @@ exports[`<ToolsList /> > renders correctly with descriptions 1`] = `
        2. note use this tool wisely and be sure to consider how this tool interacts with word wrap.
        3. important this tool is awesome.
   - Test Tool Three (test-tool-three)
-    This is the third test tool.
-"
+    This is the third test tool."
 `;
 
 exports[`<ToolsList /> > renders correctly with no tools 1`] = `
 "Available Qwen Code CLI tools:
 
- No tools available
-"
+ No tools available"
 `;
 
 exports[`<ToolsList /> > renders correctly without descriptions 1`] = `
@@ -27,6 +25,5 @@ exports[`<ToolsList /> > renders correctly without descriptions 1`] = `
 
   - Test Tool One
   - Test Tool Two
-  - Test Tool Three
-"
+  - Test Tool Three"
 `;
diff --git a/packages/cli/src/ui/contexts/UIActionsContext.tsx b/packages/cli/src/ui/contexts/UIActionsContext.tsx
index 9a01a81fd..00259515d 100644
--- a/packages/cli/src/ui/contexts/UIActionsContext.tsx
+++ b/packages/cli/src/ui/contexts/UIActionsContext.tsx
@@ -19,6 +19,8 @@ import { type VisionSwitchOutcome } from '../components/ModelSwitchDialog.js';
 import { type OpenAICredentials } from '../components/OpenAIKeyPrompt.js';
 
 export interface UIActions {
+  openThemeDialog: () => void;
+  openEditorDialog: () => void;
   handleThemeSelect: (
     themeName: string | undefined,
     scope: SettingScope,
diff --git a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
index 332b6afe8..d9aafa2e2 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
+++ b/packages/cli/src/ui/hooks/useGeminiStream.test.tsx
@@ -212,7 +212,6 @@ describe('useGeminiStream', () => {
       geminiMdFileCount: 0,
       alwaysSkipModificationConfirmation: false,
       vertexai: false,
-      showMemoryUsage: false,
       contextFileName: undefined,
       getToolRegistry: vi.fn(
         () => ({ getToolSchemaList: vi.fn(() => []) }) as any,
diff --git a/packages/cli/src/ui/hooks/useTerminalSize.ts b/packages/cli/src/ui/hooks/useTerminalSize.ts
index f043a1180..9f08a5310 100644
--- a/packages/cli/src/ui/hooks/useTerminalSize.ts
+++ b/packages/cli/src/ui/hooks/useTerminalSize.ts
@@ -6,19 +6,21 @@
 
 import { useEffect, useState } from 'react';
 
-const TERMINAL_PADDING_X = 8;
-
+/**
+ * Returns the actual terminal size without any padding adjustments.
+ * Components should handle their own margins/padding as needed.
+ */
 export function useTerminalSize(): { columns: number; rows: number } {
   const [size, setSize] = useState({
-    columns: (process.stdout.columns || 60) - TERMINAL_PADDING_X,
-    rows: process.stdout.rows || 20,
+    columns: process.stdout.columns || 80,
+    rows: process.stdout.rows || 24,
   });
 
   useEffect(() => {
     function updateSize() {
       setSize({
-        columns: (process.stdout.columns || 60) - TERMINAL_PADDING_X,
-        rows: process.stdout.rows || 20,
+        columns: process.stdout.columns || 80,
+        rows: process.stdout.rows || 24,
       });
     }
 
diff --git a/packages/cli/src/ui/layouts/DefaultAppLayout.tsx b/packages/cli/src/ui/layouts/DefaultAppLayout.tsx
index 37a617250..5ddba3388 100644
--- a/packages/cli/src/ui/layouts/DefaultAppLayout.tsx
+++ b/packages/cli/src/ui/layouts/DefaultAppLayout.tsx
@@ -12,24 +12,26 @@ import { DialogManager } from '../components/DialogManager.js';
 import { Composer } from '../components/Composer.js';
 import { ExitWarning } from '../components/ExitWarning.js';
 import { useUIState } from '../contexts/UIStateContext.js';
+import { useTerminalSize } from '../hooks/useTerminalSize.js';
 
-export const DefaultAppLayout: React.FC<{ width?: string }> = ({
-  width = '90%',
-}) => {
+export const DefaultAppLayout: React.FC = () => {
   const uiState = useUIState();
+  const { columns: terminalWidth } = useTerminalSize();
 
   return (
-    <Box flexDirection="column" width={width}>
+    <Box flexDirection="column" width={terminalWidth}>
       <MainContent />
 
       <Box flexDirection="column" ref={uiState.mainControlsRef}>
         <Notifications />
 
         {uiState.dialogsVisible ? (
-          <DialogManager
-            terminalWidth={uiState.terminalWidth}
-            addItem={uiState.historyManager.addItem}
-          />
+          <Box marginX={2} flexDirection="column" width={uiState.mainAreaWidth}>
+            <DialogManager
+              terminalWidth={uiState.terminalWidth}
+              addItem={uiState.historyManager.addItem}
+            />
+          </Box>
         ) : (
           <Composer />
         )}
diff --git a/packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx b/packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx
index b25646bb3..b4967a5f4 100644
--- a/packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx
+++ b/packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx
@@ -25,10 +25,12 @@ export const ScreenReaderAppLayout: React.FC = () => {
         <MainContent />
       </Box>
       {uiState.dialogsVisible ? (
-        <DialogManager
-          terminalWidth={uiState.terminalWidth}
-          addItem={uiState.historyManager.addItem}
-        />
+        <Box marginX={2} flexDirection="column" width={uiState.mainAreaWidth}>
+          <DialogManager
+            terminalWidth={uiState.terminalWidth}
+            addItem={uiState.historyManager.addItem}
+          />
+        </Box>
       ) : (
         <Composer />
       )}
diff --git a/packages/cli/src/ui/utils/MarkdownDisplay.test.tsx b/packages/cli/src/ui/utils/MarkdownDisplay.test.tsx
index a2052f10e..7f2e8f1d9 100644
--- a/packages/cli/src/ui/utils/MarkdownDisplay.test.tsx
+++ b/packages/cli/src/ui/utils/MarkdownDisplay.test.tsx
@@ -12,7 +12,7 @@ import { renderWithProviders } from '../../test-utils/render.js';
 describe('<MarkdownDisplay />', () => {
   const baseProps = {
     isPending: false,
-    terminalWidth: 80,
+    contentWidth: 80,
     availableTerminalHeight: 40,
   };
 
diff --git a/packages/cli/src/ui/utils/MarkdownDisplay.tsx b/packages/cli/src/ui/utils/MarkdownDisplay.tsx
index b5e7dd5d6..b67b8fd61 100644
--- a/packages/cli/src/ui/utils/MarkdownDisplay.tsx
+++ b/packages/cli/src/ui/utils/MarkdownDisplay.tsx
@@ -16,7 +16,7 @@ interface MarkdownDisplayProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
   textColor?: string;
 }
 
@@ -31,7 +31,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
   textColor = theme.text.primary,
 }) => {
   if (!text) return <></>;
@@ -79,7 +79,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
             lang={codeBlockLang}
             isPending={isPending}
             availableTerminalHeight={availableTerminalHeight}
-            terminalWidth={terminalWidth}
+            contentWidth={contentWidth}
           />,
         );
         inCodeBlock = false;
@@ -144,7 +144,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
             key={`table-${contentBlocks.length}`}
             headers={tableHeaders}
             rows={tableRows}
-            terminalWidth={terminalWidth}
+            contentWidth={contentWidth}
           />,
         );
       }
@@ -266,7 +266,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         lang={codeBlockLang}
         isPending={isPending}
         availableTerminalHeight={availableTerminalHeight}
-        terminalWidth={terminalWidth}
+        contentWidth={contentWidth}
       />,
     );
   }
@@ -278,7 +278,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         key={`table-${contentBlocks.length}`}
         headers={tableHeaders}
         rows={tableRows}
-        terminalWidth={terminalWidth}
+        contentWidth={contentWidth}
       />,
     );
   }
@@ -293,7 +293,7 @@ interface RenderCodeBlockProps {
   lang: string | null;
   isPending: boolean;
   availableTerminalHeight?: number;
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
@@ -301,7 +301,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
   lang,
   isPending,
   availableTerminalHeight,
-  terminalWidth,
+  contentWidth,
 }) => {
   const settings = useSettings();
   const MIN_LINES_FOR_MESSAGE = 1; // Minimum lines to show before the "generating more" message
@@ -329,7 +329,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
         truncatedContent.join('\n'),
         lang,
         availableTerminalHeight,
-        terminalWidth - CODE_BLOCK_PREFIX_PADDING,
+        contentWidth - CODE_BLOCK_PREFIX_PADDING,
         undefined,
         settings,
       );
@@ -347,7 +347,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
     fullContent,
     lang,
     availableTerminalHeight,
-    terminalWidth - CODE_BLOCK_PREFIX_PADDING,
+    contentWidth - CODE_BLOCK_PREFIX_PADDING,
     undefined,
     settings,
   );
@@ -356,7 +356,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
     <Box
       paddingLeft={CODE_BLOCK_PREFIX_PADDING}
       flexDirection="column"
-      width={terminalWidth}
+      width={contentWidth}
       flexShrink={0}
     >
       {colorizedCode}
@@ -407,15 +407,15 @@ const RenderListItem = React.memo(RenderListItemInternal);
 interface RenderTableProps {
   headers: string[];
   rows: string[][];
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 const RenderTableInternal: React.FC<RenderTableProps> = ({
   headers,
   rows,
-  terminalWidth,
+  contentWidth,
 }) => (
-  <TableRenderer headers={headers} rows={rows} terminalWidth={terminalWidth} />
+  <TableRenderer headers={headers} rows={rows} contentWidth={contentWidth} />
 );
 
 const RenderTable = React.memo(RenderTableInternal);
diff --git a/packages/cli/src/ui/utils/TableRenderer.tsx b/packages/cli/src/ui/utils/TableRenderer.tsx
index 3c1af3817..e59da3c31 100644
--- a/packages/cli/src/ui/utils/TableRenderer.tsx
+++ b/packages/cli/src/ui/utils/TableRenderer.tsx
@@ -12,7 +12,7 @@ import { RenderInline, getPlainTextLength } from './InlineMarkdownRenderer.js';
 interface TableRendererProps {
   headers: string[];
   rows: string[][];
-  terminalWidth: number;
+  contentWidth: number;
 }
 
 /**
@@ -22,7 +22,7 @@ interface TableRendererProps {
 export const TableRenderer: React.FC<TableRendererProps> = ({
   headers,
   rows,
-  terminalWidth,
+  contentWidth,
 }) => {
   // Calculate column widths using actual display width after markdown processing
   const columnWidths = headers.map((header, index) => {
@@ -35,8 +35,7 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
 
   // Ensure table fits within terminal width
   const totalWidth = columnWidths.reduce((sum, width) => sum + width + 1, 1);
-  const scaleFactor =
-    totalWidth > terminalWidth ? terminalWidth / totalWidth : 1;
+  const scaleFactor = totalWidth > contentWidth ? contentWidth / totalWidth : 1;
   const adjustedWidths = columnWidths.map((width) =>
     Math.floor(width * scaleFactor),
   );
diff --git a/packages/cli/src/ui/utils/clipboardUtils.ts b/packages/cli/src/ui/utils/clipboardUtils.ts
index f6d2380b9..9ccca7b6c 100644
--- a/packages/cli/src/ui/utils/clipboardUtils.ts
+++ b/packages/cli/src/ui/utils/clipboardUtils.ts
@@ -8,6 +8,8 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { execCommand } from '@qwen-code/qwen-code-core';
 
+const MACOS_CLIPBOARD_TIMEOUT_MS = 1500;
+
 /**
  * Checks if the system clipboard contains an image (macOS only for now)
  * @returns true if clipboard contains an image
@@ -19,7 +21,13 @@ export async function clipboardHasImage(): Promise<boolean> {
 
   try {
     // Use osascript to check clipboard type
-    const { stdout } = await execCommand('osascript', ['-e', 'clipboard info']);
+    const { stdout } = await execCommand(
+      'osascript',
+      ['-e', 'clipboard info'],
+      {
+        timeout: MACOS_CLIPBOARD_TIMEOUT_MS,
+      },
+    );
     const imageRegex =
       /«class PNGf»|TIFF picture|JPEG picture|GIF picture|«class JPEG»|«class TIFF»/;
     return imageRegex.test(stdout);
@@ -80,7 +88,9 @@ export async function saveClipboardImage(
         end try
       `;
 
-      const { stdout } = await execCommand('osascript', ['-e', script]);
+      const { stdout } = await execCommand('osascript', ['-e', script], {
+        timeout: MACOS_CLIPBOARD_TIMEOUT_MS,
+      });
 
       if (stdout.trim() === 'success') {
         // Verify the file was created and has content
diff --git a/packages/cli/src/utils/languageUtils.test.ts b/packages/cli/src/utils/languageUtils.test.ts
new file mode 100644
index 000000000..a0f0ca717
--- /dev/null
+++ b/packages/cli/src/utils/languageUtils.test.ts
@@ -0,0 +1,383 @@
+/**
+ * @license
+ * Copyright 2025 Qwen team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+
+// Mock fs module
+vi.mock('node:fs', () => ({
+  existsSync: vi.fn(),
+  mkdirSync: vi.fn(),
+  writeFileSync: vi.fn(),
+  readFileSync: vi.fn(),
+}));
+
+// Mock i18n module
+vi.mock('../i18n/index.js', () => ({
+  detectSystemLanguage: vi.fn(),
+  getLanguageNameFromLocale: vi.fn((locale: string) => {
+    const map: Record<string, string> = {
+      en: 'English',
+      zh: 'Chinese',
+      ru: 'Russian',
+      de: 'German',
+      ja: 'Japanese',
+      ko: 'Korean',
+      fr: 'French',
+      es: 'Spanish',
+    };
+    return map[locale] || 'English';
+  }),
+}));
+
+// Mock @qwen-code/qwen-code-core
+vi.mock('@qwen-code/qwen-code-core', () => ({
+  Storage: {
+    getGlobalQwenDir: vi.fn(() => '/mock/home/.qwen'),
+  },
+}));
+
+import * as i18n from '../i18n/index.js';
+import {
+  OUTPUT_LANGUAGE_AUTO,
+  isAutoLanguage,
+  normalizeOutputLanguage,
+  resolveOutputLanguage,
+  writeOutputLanguageFile,
+  updateOutputLanguageFile,
+  initializeLlmOutputLanguage,
+} from './languageUtils.js';
+
+describe('languageUtils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  describe('OUTPUT_LANGUAGE_AUTO', () => {
+    it('should be "auto"', () => {
+      expect(OUTPUT_LANGUAGE_AUTO).toBe('auto');
+    });
+  });
+
+  describe('isAutoLanguage', () => {
+    it('should return true for "auto"', () => {
+      expect(isAutoLanguage('auto')).toBe(true);
+    });
+
+    it('should return true for "AUTO" (case insensitive)', () => {
+      expect(isAutoLanguage('AUTO')).toBe(true);
+    });
+
+    it('should return true for "Auto" (case insensitive)', () => {
+      expect(isAutoLanguage('Auto')).toBe(true);
+    });
+
+    it('should return true for undefined', () => {
+      expect(isAutoLanguage(undefined)).toBe(true);
+    });
+
+    it('should return true for null', () => {
+      expect(isAutoLanguage(null)).toBe(true);
+    });
+
+    it('should return true for empty string', () => {
+      expect(isAutoLanguage('')).toBe(true);
+    });
+
+    it('should return false for explicit language', () => {
+      expect(isAutoLanguage('Chinese')).toBe(false);
+    });
+
+    it('should return false for locale code', () => {
+      expect(isAutoLanguage('zh')).toBe(false);
+    });
+  });
+
+  describe('normalizeOutputLanguage', () => {
+    it('should convert "en" to "English"', () => {
+      expect(normalizeOutputLanguage('en')).toBe('English');
+    });
+
+    it('should convert "zh" to "Chinese"', () => {
+      expect(normalizeOutputLanguage('zh')).toBe('Chinese');
+    });
+
+    it('should convert "ru" to "Russian"', () => {
+      expect(normalizeOutputLanguage('ru')).toBe('Russian');
+    });
+
+    it('should convert "de" to "German"', () => {
+      expect(normalizeOutputLanguage('de')).toBe('German');
+    });
+
+    it('should convert "ja" to "Japanese"', () => {
+      expect(normalizeOutputLanguage('ja')).toBe('Japanese');
+    });
+
+    it('should be case insensitive for locale codes', () => {
+      expect(normalizeOutputLanguage('ZH')).toBe('Chinese');
+      expect(normalizeOutputLanguage('Ru')).toBe('Russian');
+    });
+
+    it('should preserve explicit language names as-is', () => {
+      expect(normalizeOutputLanguage('Japanese')).toBe('Japanese');
+      expect(normalizeOutputLanguage('French')).toBe('French');
+    });
+
+    it('should preserve unknown language names as-is', () => {
+      expect(normalizeOutputLanguage('CustomLanguage')).toBe('CustomLanguage');
+      expect(normalizeOutputLanguage('日本語')).toBe('日本語');
+    });
+  });
+
+  describe('resolveOutputLanguage', () => {
+    it('should resolve "auto" to detected system language', () => {
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      expect(resolveOutputLanguage('auto')).toBe('Chinese');
+      expect(i18n.detectSystemLanguage).toHaveBeenCalled();
+    });
+
+    it('should resolve undefined to detected system language', () => {
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('ru');
+
+      expect(resolveOutputLanguage(undefined)).toBe('Russian');
+    });
+
+    it('should resolve null to detected system language', () => {
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('de');
+
+      expect(resolveOutputLanguage(null)).toBe('German');
+    });
+
+    it('should normalize explicit locale codes', () => {
+      expect(resolveOutputLanguage('zh')).toBe('Chinese');
+      expect(i18n.detectSystemLanguage).not.toHaveBeenCalled();
+    });
+
+    it('should preserve explicit language names', () => {
+      expect(resolveOutputLanguage('Japanese')).toBe('Japanese');
+    });
+  });
+
+  describe('writeOutputLanguageFile', () => {
+    beforeEach(() => {
+      vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
+      vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
+    });
+
+    it('should create directory and write file', () => {
+      writeOutputLanguageFile('Chinese');
+
+      const globalDir = '/mock/home/.qwen';
+      const expectedDir = path.join(globalDir);
+      const expectedFilePath = path.join(globalDir, 'output-language.md');
+
+      expect(fs.mkdirSync).toHaveBeenCalledWith(expectedDir, {
+        recursive: true,
+      });
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expectedFilePath,
+        expect.any(String),
+        'utf-8',
+      );
+    });
+
+    it('should include language in file content', () => {
+      writeOutputLanguageFile('Japanese');
+
+      const writtenContent = vi.mocked(fs.writeFileSync).mock.calls[0][1];
+      expect(writtenContent).toContain('Japanese');
+      expect(writtenContent).toContain(
+        '# Output language preference: Japanese',
+      );
+    });
+
+    it('should include machine-readable marker', () => {
+      writeOutputLanguageFile('Chinese');
+
+      const writtenContent = vi.mocked(fs.writeFileSync).mock.calls[0][1];
+      expect(writtenContent).toContain(
+        '<!-- qwen-code:llm-output-language: Chinese -->',
+      );
+    });
+
+    it('should sanitize language for marker (remove dangerous characters)', () => {
+      writeOutputLanguageFile('Test--Language');
+
+      const writtenContent = vi.mocked(fs.writeFileSync).mock.calls[0][1];
+      // The marker should have -- removed, but the heading preserves original
+      expect(writtenContent).toContain(
+        '# Output language preference: Test--Language',
+      );
+      expect(writtenContent).toContain(
+        '<!-- qwen-code:llm-output-language: TestLanguage -->',
+      );
+    });
+  });
+
+  describe('updateOutputLanguageFile', () => {
+    beforeEach(() => {
+      vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
+      vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
+    });
+
+    it('should resolve "auto" and write resolved language', () => {
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      updateOutputLanguageFile('auto');
+
+      const writtenContent = vi.mocked(fs.writeFileSync).mock.calls[0][1];
+      expect(writtenContent).toContain('Chinese');
+    });
+
+    it('should normalize locale codes and write full name', () => {
+      updateOutputLanguageFile('ja');
+
+      const writtenContent = vi.mocked(fs.writeFileSync).mock.calls[0][1];
+      expect(writtenContent).toContain('Japanese');
+    });
+
+    it('should write explicit language names directly', () => {
+      updateOutputLanguageFile('French');
+
+      const writtenContent = vi.mocked(fs.writeFileSync).mock.calls[0][1];
+      expect(writtenContent).toContain('French');
+    });
+  });
+
+  describe('initializeLlmOutputLanguage', () => {
+    beforeEach(() => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
+      vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
+      vi.mocked(fs.readFileSync).mockReturnValue('');
+    });
+
+    it('should create file when it does not exist', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.mkdirSync).toHaveBeenCalled();
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('English'),
+        'utf-8',
+      );
+    });
+
+    it('should NOT overwrite file when content matches resolved language', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en');
+      vi.mocked(fs.readFileSync).mockReturnValue(
+        `# Output language preference: English
+<!-- qwen-code:llm-output-language: English -->
+`,
+      );
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
+
+    it('should overwrite file when language setting differs', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(fs.readFileSync).mockReturnValue(
+        `# Output language preference: English
+<!-- qwen-code:llm-output-language: English -->
+`,
+      );
+
+      initializeLlmOutputLanguage('Japanese');
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Japanese'),
+        'utf-8',
+      );
+    });
+
+    it('should resolve "auto" to detected system language', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      initializeLlmOutputLanguage('auto');
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Chinese'),
+        'utf-8',
+      );
+    });
+
+    it('should detect Chinese locale and create Chinese rule file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Chinese'),
+        'utf-8',
+      );
+    });
+
+    it('should detect Russian locale and create Russian rule file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('ru');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('Russian'),
+        'utf-8',
+      );
+    });
+
+    it('should detect German locale and create German rule file', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false);
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('de');
+
+      initializeLlmOutputLanguage();
+
+      expect(fs.writeFileSync).toHaveBeenCalledWith(
+        expect.stringContaining('output-language.md'),
+        expect.stringContaining('German'),
+        'utf-8',
+      );
+    });
+
+    it('should handle file read errors gracefully', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(fs.readFileSync).mockImplementation(() => {
+        throw new Error('Read error');
+      });
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en');
+
+      // Should not throw, and should create new file
+      expect(() => initializeLlmOutputLanguage()).not.toThrow();
+      expect(fs.writeFileSync).toHaveBeenCalled();
+    });
+
+    it('should parse legacy heading format', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(true);
+      vi.mocked(fs.readFileSync).mockReturnValue(
+        '# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY',
+      );
+      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
+
+      initializeLlmOutputLanguage();
+
+      // Should not overwrite since file already has Chinese
+      expect(fs.writeFileSync).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/packages/cli/src/utils/languageUtils.ts b/packages/cli/src/utils/languageUtils.ts
new file mode 100644
index 000000000..e9b61923d
--- /dev/null
+++ b/packages/cli/src/utils/languageUtils.ts
@@ -0,0 +1,190 @@
+/**
+ * @license
+ * Copyright 2025 Qwen team
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * Utilities for managing the LLM output language rule file.
+ * This file handles the creation and maintenance of ~/.qwen/output-language.md
+ * which instructs the LLM to respond in the user's preferred language.
+ */
+
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { Storage } from '@qwen-code/qwen-code-core';
+import {
+  detectSystemLanguage,
+  getLanguageNameFromLocale,
+} from '../i18n/index.js';
+
+const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = 'output-language.md';
+const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = 'qwen-code:llm-output-language:';
+
+/** Special value meaning "detect from system settings" */
+export const OUTPUT_LANGUAGE_AUTO = 'auto';
+
+/**
+ * Checks if a value represents the "auto" setting.
+ */
+export function isAutoLanguage(value: string | undefined | null): boolean {
+  return !value || value.toLowerCase() === OUTPUT_LANGUAGE_AUTO;
+}
+
+/**
+ * Normalizes a language input to its canonical form.
+ * Converts known locale codes (e.g., "zh", "ru") to full names (e.g., "Chinese", "Russian").
+ * Unknown inputs are returned as-is to support any language name.
+ */
+export function normalizeOutputLanguage(language: string): string {
+  const lowered = language.toLowerCase();
+  const fullName = getLanguageNameFromLocale(lowered);
+  // getLanguageNameFromLocale returns 'English' as default for unknown codes.
+  // Only use the result if it's a known code or explicitly 'en'.
+  if (fullName !== 'English' || lowered === 'en') {
+    return fullName;
+  }
+  return language;
+}
+
+/**
+ * Resolves the output language, converting 'auto' to the detected system language.
+ */
+export function resolveOutputLanguage(
+  value: string | undefined | null,
+): string {
+  if (isAutoLanguage(value)) {
+    const detectedLocale = detectSystemLanguage();
+    return getLanguageNameFromLocale(detectedLocale);
+  }
+  return normalizeOutputLanguage(value!);
+}
+
+/**
+ * Returns the path to the LLM output language rule file (~/.qwen/output-language.md).
+ */
+function getOutputLanguageFilePath(): string {
+  return path.join(
+    Storage.getGlobalQwenDir(),
+    LLM_OUTPUT_LANGUAGE_RULE_FILENAME,
+  );
+}
+
+/**
+ * Sanitizes a language string for use in an HTML comment marker.
+ * Removes characters that could break HTML comment syntax.
+ */
+function sanitizeForMarker(language: string): string {
+  return language
+    .replace(/[\r\n]/g, ' ')
+    .replace(/--!?>/g, '')
+    .replace(/--/g, '');
+}
+
+/**
+ * Generates the content for the LLM output language rule file.
+ */
+function generateOutputLanguageFileContent(language: string): string {
+  const safeLanguage = sanitizeForMarker(language);
+  return `# Output language preference: ${language}
+<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${safeLanguage} -->
+
+## Goal
+Prefer responding in **${language}** for normal assistant messages and explanations.
+
+## Keep technical artifacts unchanged
+Do **not** translate or rewrite:
+- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
+- Exact quoted text from the user (keep quotes verbatim)
+
+## When a conflict exists
+If higher-priority instructions (system/developer) require a different behavior, follow them.
+
+## Tool / system outputs
+Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
+`;
+}
+
+/**
+ * Extracts the language from the content of an output language rule file.
+ * Supports both the new marker format and legacy heading format.
+ */
+function parseOutputLanguageFromContent(content: string): string | null {
+  // Primary: machine-readable marker (e.g., <!-- qwen-code:llm-output-language: 中文 -->)
+  const markerRegex = new RegExp(
+    String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
+    'i',
+  );
+  const markerMatch = content.match(markerRegex);
+  if (markerMatch?.[1]?.trim()) {
+    return markerMatch[1].trim();
+  }
+
+  // Fallback: legacy heading format (e.g., # CRITICAL: Chinese Output Language Rule)
+  const headingMatch = content.match(
+    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im,
+  );
+  if (headingMatch?.[1]?.trim()) {
+    return headingMatch[1].trim();
+  }
+
+  return null;
+}
+
+/**
+ * Reads the current output language from the rule file.
+ * Returns null if the file doesn't exist or can't be parsed.
+ */
+function readOutputLanguageFromFile(): string | null {
+  const filePath = getOutputLanguageFilePath();
+  if (!fs.existsSync(filePath)) {
+    return null;
+  }
+  try {
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return parseOutputLanguageFromContent(content);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Writes the output language rule file with the given language.
+ */
+export function writeOutputLanguageFile(language: string): void {
+  const filePath = getOutputLanguageFilePath();
+  const content = generateOutputLanguageFileContent(language);
+  const dir = path.dirname(filePath);
+  fs.mkdirSync(dir, { recursive: true });
+  fs.writeFileSync(filePath, content, 'utf-8');
+}
+
+/**
+ * Updates the LLM output language rule file based on the setting value.
+ * Resolves 'auto' to the detected system language before writing.
+ */
+export function updateOutputLanguageFile(settingValue: string): void {
+  const resolved = resolveOutputLanguage(settingValue);
+  writeOutputLanguageFile(resolved);
+}
+
+/**
+ * Initializes the LLM output language rule file on application startup.
+ *
+ * @param outputLanguage - The output language setting value (e.g., 'auto', 'Chinese', etc.)
+ *
+ * Behavior:
+ * - Resolves the setting value ('auto' -> detected system language, or use as-is)
+ * - Ensures the rule file matches the resolved language
+ * - Creates the file if it doesn't exist
+ */
+export function initializeLlmOutputLanguage(outputLanguage?: string): void {
+  // Resolve 'auto' or undefined to the detected system language
+  const resolved = resolveOutputLanguage(outputLanguage);
+  const currentFileLanguage = readOutputLanguageFromFile();
+
+  // Only write if the file doesn't match the resolved language
+  if (currentFileLanguage !== resolved) {
+    writeOutputLanguageFile(resolved);
+  }
+}
diff --git a/packages/cli/src/utils/settingsUtils.test.ts b/packages/cli/src/utils/settingsUtils.test.ts
index ca1dc802c..109197be3 100644
--- a/packages/cli/src/utils/settingsUtils.test.ts
+++ b/packages/cli/src/utils/settingsUtils.test.ts
@@ -110,6 +110,7 @@ describe('SettingsUtils', () => {
             category: 'UI',
             default: false,
             requiresRestart: true,
+            showInDialog: true,
           },
           accessibility: {
             type: 'object',
diff --git a/packages/cli/src/utils/settingsUtils.ts b/packages/cli/src/utils/settingsUtils.ts
index dcc3f2b6c..fe3b6df8d 100644
--- a/packages/cli/src/utils/settingsUtils.ts
+++ b/packages/cli/src/utils/settingsUtils.ts
@@ -17,6 +17,7 @@ import type {
 } from '../config/settingsSchema.js';
 import { getSettingsSchema } from '../config/settingsSchema.js';
 import { t } from '../i18n/index.js';
+import { isAutoLanguage } from './languageUtils.js';
 
 // The schema is now nested, but many parts of the UI and logic work better
 // with a flattened structure and dot-notation keys. This section flattens the
@@ -249,12 +250,79 @@ export function getDialogSettingsByType(
 }
 
 /**
- * Get all setting keys that should be shown in the dialog
+ * Explicit display order for settings shown in the Settings Dialog.
+ * Settings are ordered by importance and logical grouping:
+ * 1. Workflow control (most impactful)
+ * 2. Localization
+ * 3. Editor/Shell experience
+ * 4. Display preferences
+ * 5. Git behavior
+ * 6. File filtering
+ * 7. System settings (rarely changed)
+ *
+ * New settings with showInDialog: true that are not listed here
+ * will appear at the end of the list.
+ */
+const SETTINGS_DIALOG_ORDER: readonly string[] = [
+  // Workflow Control - most impactful setting
+  'tools.approvalMode',
+
+  // Localization - users often set this first
+  'general.language',
+  'general.outputLanguage',
+
+  // Theme
+  'ui.theme',
+
+  // Editor/Shell Experience
+  'general.vimMode',
+  'tools.shell.enableInteractiveShell',
+
+  // Display Preferences
+  'general.preferredEditor',
+  'ide.enabled',
+  'ui.showLineNumbers',
+  'ui.hideTips',
+  'general.terminalBell',
+  'ui.enableWelcomeBack',
+
+  // Git Behavior
+  'general.gitCoAuthor',
+
+  // File Filtering
+  'context.fileFiltering.respectGitIgnore',
+  'context.fileFiltering.respectQwenIgnore',
+
+  // System Settings - rarely changed
+  'general.disableAutoUpdate',
+
+  // Privacy
+  'privacy.usageStatisticsEnabled',
+] as const;
+
+/**
+ * Get all setting keys that should be shown in the dialog, sorted by display order
  */
 export function getDialogSettingKeys(): string[] {
-  return Object.values(getFlattenedSchema())
-    .filter((definition) => definition.showInDialog !== false)
+  const dialogSettings = Object.values(getFlattenedSchema())
+    .filter((definition) => definition.showInDialog === true)
     .map((definition) => definition.key);
+
+  // Sort by explicit order; settings not in the order array appear at the end
+  return dialogSettings.sort((a, b) => {
+    const indexA = SETTINGS_DIALOG_ORDER.indexOf(a);
+    const indexB = SETTINGS_DIALOG_ORDER.indexOf(b);
+
+    // If both are in the order array, sort by their position
+    if (indexA !== -1 && indexB !== -1) {
+      return indexA - indexB;
+    }
+    // If only one is in the array, prioritize the one in the array
+    if (indexA !== -1) return -1;
+    if (indexB !== -1) return 1;
+    // If neither is in the array, maintain original order
+    return 0;
+  });
 }
 
 // ============================================================================
@@ -401,15 +469,21 @@ export function saveModifiedSettings(
       path,
     );
 
-    if (value === undefined) {
-      return;
-    }
-
     const existsInOriginalFile = settingExistsInScope(
       settingKey,
       loadedSettings.forScope(scope).settings,
     );
 
+    if (value === undefined) {
+      // Treat `undefined` as "unset" when the key exists in the scope file.
+      // LoadedSettings.setValue(..., undefined) is used elsewhere in the codebase
+      // to remove optional settings from disk.
+      if (existsInOriginalFile) {
+        loadedSettings.setValue(scope, settingKey, undefined);
+      }
+      return;
+    }
+
     const isDefaultValue = value === getDefaultValue(settingKey);
 
     if (existsInOriginalFile || !isDefaultValue) {
@@ -445,7 +519,10 @@ export function getDisplayValue(
 
   let valueString = String(value);
 
-  if (definition?.type === 'enum' && definition.options) {
+  // Special handling for outputLanguage 'auto' value
+  if (key === 'general.outputLanguage' && isAutoLanguage(value as string)) {
+    valueString = t('Auto (detect from system)');
+  } else if (definition?.type === 'enum' && definition.options) {
     const option = definition.options?.find((option) => option.value === value);
     if (option?.label) {
       valueString = t(option.label) || option.label;
diff --git a/packages/cli/src/utils/systemInfo.test.ts b/packages/cli/src/utils/systemInfo.test.ts
index 8d257605d..4f6bc8304 100644
--- a/packages/cli/src/utils/systemInfo.test.ts
+++ b/packages/cli/src/utils/systemInfo.test.ts
@@ -58,6 +58,7 @@ describe('systemInfo', () => {
           getIdeMode: vi.fn().mockReturnValue(true),
           getSessionId: vi.fn().mockReturnValue('test-session-id'),
           getAuthType: vi.fn().mockReturnValue('test-auth'),
+          getProxy: vi.fn().mockReturnValue(undefined),
           getContentGeneratorConfig: vi.fn().mockReturnValue({
             baseUrl: 'https://api.openai.com',
           }),
@@ -235,6 +236,7 @@ describe('systemInfo', () => {
         selectedAuthType: 'test-auth',
         ideClient: 'test-ide',
         sessionId: 'test-session-id',
+        proxy: undefined,
       });
     });
 
diff --git a/packages/cli/src/utils/systemInfo.ts b/packages/cli/src/utils/systemInfo.ts
index 1af3f41f5..564c5a08a 100644
--- a/packages/cli/src/utils/systemInfo.ts
+++ b/packages/cli/src/utils/systemInfo.ts
@@ -29,6 +29,7 @@ export interface SystemInfo {
   selectedAuthType: string;
   ideClient: string;
   sessionId: string;
+  proxy?: string;
 }
 
 /**
@@ -38,6 +39,7 @@ export interface ExtendedSystemInfo extends SystemInfo {
   memoryUsage: string;
   baseUrl?: string;
   gitCommit?: string;
+  proxy?: string;
 }
 
 /**
@@ -118,6 +120,7 @@ export async function getSystemInfo(
   const selectedAuthType = context.services.config?.getAuthType() || '';
   const ideClient = await getIdeClientName(context);
   const sessionId = context.services.config?.getSessionId() || 'unknown';
+  const proxy = context.services.config?.getProxy();
 
   return {
     cliVersion,
@@ -131,6 +134,7 @@ export async function getSystemInfo(
     selectedAuthType,
     ideClient,
     sessionId,
+    proxy,
   };
 }
 
diff --git a/packages/cli/src/utils/systemInfoFields.test.ts b/packages/cli/src/utils/systemInfoFields.test.ts
new file mode 100644
index 000000000..fb8624781
--- /dev/null
+++ b/packages/cli/src/utils/systemInfoFields.test.ts
@@ -0,0 +1,79 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, expect, it } from 'vitest';
+import { getSystemInfoFields } from './systemInfoFields.js';
+import type { ExtendedSystemInfo } from './systemInfo.js';
+
+describe('getAboutSystemInfoFields', () => {
+  it('orders sandbox/proxy after session id', () => {
+    const info: ExtendedSystemInfo = {
+      cliVersion: '1.0.0',
+      osPlatform: 'darwin',
+      osArch: 'arm64',
+      osRelease: '23.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'no sandbox',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: 'test-ide',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+      gitCommit: undefined,
+      proxy: 'http://user:pass@localhost:7890',
+    };
+
+    const fields = getSystemInfoFields(info);
+    const labels = fields.map((f) => f.label);
+
+    expect(labels).toEqual([
+      'Qwen Code',
+      'Runtime',
+      'IDE Client',
+      'OS',
+      'Auth',
+      'Model',
+      'Session ID',
+      'Sandbox',
+      'Proxy',
+      'Memory Usage',
+    ]);
+
+    expect(labels.indexOf('Session ID')).toBeLessThan(
+      labels.indexOf('Sandbox'),
+    );
+    expect(labels.indexOf('Session ID')).toBeLessThan(labels.indexOf('Proxy'));
+
+    const proxyField = fields.find((f) => f.label === 'Proxy');
+    expect(proxyField?.value).toBe('http://***:***@localhost:7890/');
+  });
+
+  it('always includes Proxy with "no proxy" when unset', () => {
+    const info: ExtendedSystemInfo = {
+      cliVersion: '1.0.0',
+      osPlatform: 'darwin',
+      osArch: 'arm64',
+      osRelease: '23.0.0',
+      nodeVersion: 'v20.0.0',
+      npmVersion: '10.0.0',
+      sandboxEnv: 'no sandbox',
+      modelVersion: 'test-model',
+      selectedAuthType: 'test-auth',
+      ideClient: 'test-ide',
+      sessionId: 'test-session-id',
+      memoryUsage: '100 MB',
+      baseUrl: undefined,
+      gitCommit: undefined,
+      proxy: undefined,
+    };
+
+    const fields = getSystemInfoFields(info);
+    const proxyField = fields.find((f) => f.label === 'Proxy');
+    expect(proxyField?.value).toBe('no proxy');
+  });
+});
diff --git a/packages/cli/src/utils/systemInfoFields.ts b/packages/cli/src/utils/systemInfoFields.ts
index 66308ac2d..ed43431f2 100644
--- a/packages/cli/src/utils/systemInfoFields.ts
+++ b/packages/cli/src/utils/systemInfoFields.ts
@@ -15,104 +15,108 @@ export interface SystemInfoField {
   key: keyof ExtendedSystemInfo;
 }
 
-/**
- * Unified field configuration for system information display.
- * This ensures consistent labeling between /about and /bug commands.
- */
+export interface SystemInfoDisplayField {
+  label: string;
+  value: string;
+}
+
 export function getSystemInfoFields(
   info: ExtendedSystemInfo,
-): SystemInfoField[] {
-  const allFields: SystemInfoField[] = [
-    {
-      label: t('CLI Version'),
-      key: 'cliVersion',
-    },
-    {
-      label: t('Git Commit'),
-      key: 'gitCommit',
-    },
-    {
-      label: t('Model'),
-      key: 'modelVersion',
-    },
-    {
-      label: t('Sandbox'),
-      key: 'sandboxEnv',
-    },
-    {
-      label: t('OS Platform'),
-      key: 'osPlatform',
-    },
-    {
-      label: t('OS Arch'),
-      key: 'osArch',
-    },
-    {
-      label: t('OS Release'),
-      key: 'osRelease',
-    },
-    {
-      label: t('Node.js Version'),
-      key: 'nodeVersion',
-    },
-    {
-      label: t('NPM Version'),
-      key: 'npmVersion',
-    },
-    {
-      label: t('Session ID'),
-      key: 'sessionId',
-    },
-    {
-      label: t('Auth Method'),
-      key: 'selectedAuthType',
-    },
-    {
-      label: t('Base URL'),
-      key: 'baseUrl',
-    },
-    {
-      label: t('Memory Usage'),
-      key: 'memoryUsage',
-    },
-    {
-      label: t('IDE Client'),
-      key: 'ideClient',
-    },
-  ];
+): SystemInfoDisplayField[] {
+  const fields: SystemInfoDisplayField[] = [];
 
-  // Filter out optional fields that are not present
-  return allFields.filter((field) => {
-    const value = info[field.key];
-    // Optional fields: only show if they exist and are non-empty
-    if (
-      field.key === 'baseUrl' ||
-      field.key === 'gitCommit' ||
-      field.key === 'ideClient'
-    ) {
-      return Boolean(value);
-    }
-    return true;
-  });
+  addField(fields, t('Qwen Code'), formatCliVersion(info));
+  addField(fields, t('Runtime'), formatRuntime(info));
+  addField(fields, t('IDE Client'), info.ideClient);
+  addField(fields, t('OS'), formatOs(info));
+  addField(fields, t('Auth'), formatAuth(info));
+  addField(fields, t('Model'), info.modelVersion);
+  addField(fields, t('Session ID'), info.sessionId);
+  addField(fields, t('Sandbox'), info.sandboxEnv);
+  addField(fields, t('Proxy'), formatProxy(info.proxy));
+  addField(fields, t('Memory Usage'), info.memoryUsage);
+
+  return fields;
 }
 
-/**
- * Get the value for a field from system info
- */
-export function getFieldValue(
-  field: SystemInfoField,
-  info: ExtendedSystemInfo,
-): string {
-  const value = info[field.key];
+function addField(
+  fields: SystemInfoDisplayField[],
+  label: string,
+  value: string,
+): void {
+  if (value) {
+    fields.push({ label, value });
+  }
+}
 
-  if (value === undefined || value === null) {
+function formatCliVersion(info: ExtendedSystemInfo): string {
+  if (!info.cliVersion) {
     return '';
   }
-
-  // Special formatting for selectedAuthType
-  if (field.key === 'selectedAuthType') {
-    return String(value).startsWith('oauth') ? 'OAuth' : String(value);
+  if (!info.gitCommit) {
+    return info.cliVersion;
   }
-
-  return String(value);
+  return `${info.cliVersion} (${info.gitCommit})`;
+}
+
+function formatRuntime(info: ExtendedSystemInfo): string {
+  if (!info.nodeVersion && !info.npmVersion) {
+    return '';
+  }
+  const node = info.nodeVersion ? `Node.js ${info.nodeVersion}` : '';
+  const npm = info.npmVersion ? `npm ${info.npmVersion}` : '';
+  return joinParts([node, npm], ' / ');
+}
+
+function formatOs(info: ExtendedSystemInfo): string {
+  return joinParts(
+    [info.osPlatform, info.osArch, formatOsRelease(info.osRelease)],
+    ' ',
+  ).trim();
+}
+
+function formatOsRelease(release: string): string {
+  if (!release) {
+    return '';
+  }
+  return `(${release})`;
+}
+
+function formatAuth(info: ExtendedSystemInfo): string {
+  if (!info.selectedAuthType) {
+    return '';
+  }
+  const authType = formatAuthType(info.selectedAuthType);
+  if (!info.baseUrl) {
+    return authType;
+  }
+  return `${authType} (${info.baseUrl})`;
+}
+
+function formatAuthType(authType: string): string {
+  return authType.startsWith('oauth') ? 'OAuth' : authType;
+}
+
+function formatProxy(proxy?: string): string {
+  if (!proxy) {
+    return 'no proxy';
+  }
+  return redactProxy(proxy);
+}
+
+function redactProxy(proxy: string): string {
+  try {
+    const url = new URL(proxy);
+    if (url.username || url.password) {
+      url.username = url.username ? '***' : '';
+      url.password = url.password ? '***' : '';
+    }
+    return url.toString();
+  } catch {
+    return proxy.replace(/\/\/[^/]*@/, '//***@');
+  }
+}
+
+function joinParts(parts: string[], separator: string): string {
+  return parts.filter((part) => part).join(separator);
 }
diff --git a/packages/core/src/config/config.test.ts b/packages/core/src/config/config.test.ts
index 449add116..acd1f7493 100644
--- a/packages/core/src/config/config.test.ts
+++ b/packages/core/src/config/config.test.ts
@@ -157,6 +157,25 @@ vi.mock('../services/gitService.js', () => {
   return { GitService: GitServiceMock };
 });
 
+vi.mock('../skills/skill-manager.js', () => {
+  const SkillManagerMock = vi.fn();
+  SkillManagerMock.prototype.startWatching = vi
+    .fn()
+    .mockResolvedValue(undefined);
+  SkillManagerMock.prototype.stopWatching = vi.fn();
+  return { SkillManager: SkillManagerMock };
+});
+
+vi.mock('../subagents/subagent-manager.js', () => {
+  const SubagentManagerMock = vi.fn();
+  SubagentManagerMock.prototype.loadSessionSubagents = vi.fn();
+  SubagentManagerMock.prototype.addChangeListener = vi
+    .fn()
+    .mockReturnValue(() => {});
+  SubagentManagerMock.prototype.listSubagents = vi.fn().mockResolvedValue([]);
+  return { SubagentManager: SubagentManagerMock };
+});
+
 vi.mock('../ide/ide-client.js', () => ({
   IdeClient: {
     getInstance: vi.fn().mockResolvedValue({
diff --git a/packages/core/src/config/config.ts b/packages/core/src/config/config.ts
index 54d8f795a..bf56ec9b4 100644
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -290,7 +290,6 @@ export interface ConfigParameters {
   userMemory?: string;
   geminiMdFileCount?: number;
   approvalMode?: ApprovalMode;
-  showMemoryUsage?: boolean;
   contextFileName?: string | string[];
   accessibility?: AccessibilitySettings;
   telemetry?: TelemetrySettings;
@@ -434,7 +433,6 @@ export class Config {
   private sdkMode: boolean;
   private geminiMdFileCount: number;
   private approvalMode: ApprovalMode;
-  private readonly showMemoryUsage: boolean;
   private readonly accessibility: AccessibilitySettings;
   private readonly telemetrySettings: TelemetrySettings;
   private readonly gitCoAuthor: GitCoAuthorSettings;
@@ -539,7 +537,6 @@ export class Config {
     this.userMemory = params.userMemory ?? '';
     this.geminiMdFileCount = params.geminiMdFileCount ?? 0;
     this.approvalMode = params.approvalMode ?? ApprovalMode.DEFAULT;
-    this.showMemoryUsage = params.showMemoryUsage ?? false;
     this.accessibility = params.accessibility ?? {};
     this.telemetrySettings = {
       enabled: params.telemetry?.enabled ?? false,
@@ -1086,10 +1083,6 @@ export class Config {
     this.approvalMode = mode;
   }
 
-  getShowMemoryUsage(): boolean {
-    return this.showMemoryUsage;
-  }
-
   getInputFormat(): 'text' | 'stream-json' {
     return this.inputFormat;
   }
diff --git a/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.test.ts b/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.test.ts
index 1df98c0cb..61652a774 100644
--- a/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.test.ts
+++ b/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.test.ts
@@ -164,17 +164,19 @@ describe('OpenAIContentGenerator (Refactored)', () => {
   });
 
   describe('shouldSuppressErrorLogging', () => {
-    it('should return false by default', () => {
-      // Create a test subclass to access the protected method
-      class TestGenerator extends OpenAIContentGenerator {
-        testShouldSuppressErrorLogging(
-          error: unknown,
-          request: GenerateContentParameters,
-        ): boolean {
-          return this.shouldSuppressErrorLogging(error, request);
-        }
+    // Create a test subclass to access the protected method
+    class TestGenerator extends OpenAIContentGenerator {
+      testShouldSuppressErrorLogging(
+        error: unknown,
+        request: GenerateContentParameters,
+      ): boolean {
+        return this.shouldSuppressErrorLogging(error, request);
       }
+    }
 
+    let testGenerator: TestGenerator;
+
+    beforeEach(() => {
       const contentGeneratorConfig = {
         model: 'gpt-4',
         apiKey: 'test-key',
@@ -206,12 +208,14 @@ describe('OpenAIContentGenerator (Refactored)', () => {
         getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
       };
 
-      const testGenerator = new TestGenerator(
+      testGenerator = new TestGenerator(
         contentGeneratorConfig,
         mockConfig,
         mockProvider,
       );
+    });
 
+    it('should return false for regular errors', () => {
       const request: GenerateContentParameters = {
         contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
         model: 'gpt-4',
@@ -225,8 +229,114 @@ describe('OpenAIContentGenerator (Refactored)', () => {
       expect(result).toBe(false);
     });
 
+    it('should return true for AbortError when signal is also aborted (user cancellation)', () => {
+      const abortController = new AbortController();
+      abortController.abort();
+
+      const request: GenerateContentParameters = {
+        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: 'gpt-4',
+        config: {
+          abortSignal: abortController.signal,
+        },
+      };
+
+      // Create an AbortError with aborted signal - this is user-initiated
+      const abortError = new Error('The operation was aborted');
+      abortError.name = 'AbortError';
+
+      const result = testGenerator.testShouldSuppressErrorLogging(
+        abortError,
+        request,
+      );
+
+      expect(result).toBe(true);
+    });
+
+    it('should return false for AbortError when signal is NOT aborted (network abort)', () => {
+      const abortController = new AbortController();
+      // Signal is NOT aborted - this simulates a network abort
+
+      const request: GenerateContentParameters = {
+        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: 'gpt-4',
+        config: {
+          abortSignal: abortController.signal,
+        },
+      };
+
+      // AbortError but signal not aborted - could be network issue
+      const abortError = new Error('The operation was aborted');
+      abortError.name = 'AbortError';
+
+      const result = testGenerator.testShouldSuppressErrorLogging(
+        abortError,
+        request,
+      );
+
+      expect(result).toBe(false);
+    });
+
+    it('should return false for AbortError without any signal', () => {
+      const request: GenerateContentParameters = {
+        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: 'gpt-4',
+      };
+
+      // AbortError but no signal at all - unknown source
+      const abortError = new Error('The operation was aborted');
+      abortError.name = 'AbortError';
+
+      const result = testGenerator.testShouldSuppressErrorLogging(
+        abortError,
+        request,
+      );
+
+      expect(result).toBe(false);
+    });
+
+    it('should return false for non-AbortError even when signal is aborted', () => {
+      const abortController = new AbortController();
+      abortController.abort();
+
+      const request: GenerateContentParameters = {
+        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: 'gpt-4',
+        config: {
+          abortSignal: abortController.signal,
+        },
+      };
+
+      // Regular error even though signal is aborted - should still be logged
+      const result = testGenerator.testShouldSuppressErrorLogging(
+        new Error('Network error'),
+        request,
+      );
+
+      expect(result).toBe(false);
+    });
+
+    it('should return false for errors with non-aborted signal', () => {
+      const abortController = new AbortController();
+
+      const request: GenerateContentParameters = {
+        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
+        model: 'gpt-4',
+        config: {
+          abortSignal: abortController.signal,
+        },
+      };
+
+      const result = testGenerator.testShouldSuppressErrorLogging(
+        new Error('Network error'),
+        request,
+      );
+
+      expect(result).toBe(false);
+    });
+
     it('should allow subclasses to override error suppression behavior', async () => {
-      class TestGenerator extends OpenAIContentGenerator {
+      class CustomTestGenerator extends OpenAIContentGenerator {
         testShouldSuppressErrorLogging(
           error: unknown,
           request: GenerateContentParameters,
@@ -273,7 +383,7 @@ describe('OpenAIContentGenerator (Refactored)', () => {
         getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
       };
 
-      const testGenerator = new TestGenerator(
+      const customGenerator = new CustomTestGenerator(
         contentGeneratorConfig,
         mockConfig,
         mockProvider,
@@ -284,7 +394,7 @@ describe('OpenAIContentGenerator (Refactored)', () => {
         model: 'gpt-4',
       };
 
-      const result = testGenerator.testShouldSuppressErrorLogging(
+      const result = customGenerator.testShouldSuppressErrorLogging(
         new Error('Test error'),
         request,
       );
diff --git a/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.ts b/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.ts
index 93b640331..2009b273c 100644
--- a/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.ts
+++ b/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.ts
@@ -14,6 +14,7 @@ import { ContentGenerationPipeline } from './pipeline.js';
 import { EnhancedErrorHandler } from './errorHandler.js';
 import { RequestTokenEstimator } from '../../utils/request-tokenizer/index.js';
 import type { ContentGeneratorConfig } from '../contentGenerator.js';
+import { isAbortError } from '../../utils/errors.js';
 
 export class OpenAIContentGenerator implements ContentGenerator {
   protected pipeline: ContentGenerationPipeline;
@@ -44,10 +45,21 @@ export class OpenAIContentGenerator implements ContentGenerator {
    * @returns true if error logging should be suppressed, false otherwise
    */
   protected shouldSuppressErrorLogging(
-    _error: unknown,
-    _request: GenerateContentParameters,
+    error: unknown,
+    request: GenerateContentParameters,
   ): boolean {
-    return false; // Default behavior: never suppress error logging
+    // Only suppress error logging for user-initiated cancellations.
+    // We check that BOTH:
+    // 1. The error is an AbortError
+    // 2. AND our abort signal was explicitly aborted (user-initiated)
+    //
+    // This ensures we don't suppress network-related abort errors that
+    // the user should be aware of.
+    if (isAbortError(error) && request.config?.abortSignal?.aborted) {
+      return true;
+    }
+
+    return false;
   }
 
   async generateContent(
diff --git a/packages/core/src/subagents/subagent.test.ts b/packages/core/src/subagents/subagent.test.ts
index a23e787ef..ed34a511d 100644
--- a/packages/core/src/subagents/subagent.test.ts
+++ b/packages/core/src/subagents/subagent.test.ts
@@ -88,6 +88,28 @@ vi.mock('../core/nonInteractiveToolExecutor.js');
 vi.mock('../ide/ide-client.js');
 vi.mock('../core/client.js');
 
+vi.mock('../skills/skill-manager.js', () => {
+  const SkillManagerMock = vi.fn();
+  SkillManagerMock.prototype.startWatching = vi
+    .fn()
+    .mockResolvedValue(undefined);
+  SkillManagerMock.prototype.stopWatching = vi.fn();
+  SkillManagerMock.prototype.addChangeListener = vi
+    .fn()
+    .mockReturnValue(() => {});
+  return { SkillManager: SkillManagerMock };
+});
+
+vi.mock('./subagent-manager.js', () => {
+  const SubagentManagerMock = vi.fn();
+  SubagentManagerMock.prototype.loadSessionSubagents = vi.fn();
+  SubagentManagerMock.prototype.addChangeListener = vi
+    .fn()
+    .mockReturnValue(() => {});
+  SubagentManagerMock.prototype.listSubagents = vi.fn().mockResolvedValue([]);
+  return { SubagentManager: SubagentManagerMock };
+});
+
 async function createMockConfig(
   toolRegistryMocks = {},
 ): Promise<{ config: Config; toolRegistry: ToolRegistry }> {
diff --git a/packages/core/src/utils/errors.test.ts b/packages/core/src/utils/errors.test.ts
new file mode 100644
index 000000000..c896142ec
--- /dev/null
+++ b/packages/core/src/utils/errors.test.ts
@@ -0,0 +1,91 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import { isAbortError, isNodeError } from './errors.js';
+
+describe('isAbortError', () => {
+  it('should return true for DOMException-style AbortError', () => {
+    const abortError = new Error('The operation was aborted');
+    abortError.name = 'AbortError';
+
+    expect(isAbortError(abortError)).toBe(true);
+  });
+
+  it('should return true for custom AbortError class', () => {
+    class AbortError extends Error {
+      constructor(message: string) {
+        super(message);
+        this.name = 'AbortError';
+      }
+    }
+
+    const error = new AbortError('Custom abort error');
+    expect(isAbortError(error)).toBe(true);
+  });
+
+  it('should return true for Node.js abort error (ABORT_ERR code)', () => {
+    const nodeAbortError = new Error(
+      'Request aborted',
+    ) as NodeJS.ErrnoException;
+    nodeAbortError.code = 'ABORT_ERR';
+
+    expect(isAbortError(nodeAbortError)).toBe(true);
+  });
+
+  it('should return false for regular errors', () => {
+    expect(isAbortError(new Error('Regular error'))).toBe(false);
+  });
+
+  it('should return false for null', () => {
+    expect(isAbortError(null)).toBe(false);
+  });
+
+  it('should return false for undefined', () => {
+    expect(isAbortError(undefined)).toBe(false);
+  });
+
+  it('should return false for non-object values', () => {
+    expect(isAbortError('string error')).toBe(false);
+    expect(isAbortError(123)).toBe(false);
+    expect(isAbortError(true)).toBe(false);
+  });
+
+  it('should return false for errors with different names', () => {
+    const timeoutError = new Error('Request timed out');
+    timeoutError.name = 'TimeoutError';
+
+    expect(isAbortError(timeoutError)).toBe(false);
+  });
+
+  it('should return false for errors with other error codes', () => {
+    const networkError = new Error('Network error') as NodeJS.ErrnoException;
+    networkError.code = 'ECONNREFUSED';
+
+    expect(isAbortError(networkError)).toBe(false);
+  });
+});
+
+describe('isNodeError', () => {
+  it('should return true for Error with code property', () => {
+    const nodeError = new Error('File not found') as NodeJS.ErrnoException;
+    nodeError.code = 'ENOENT';
+
+    expect(isNodeError(nodeError)).toBe(true);
+  });
+
+  it('should return false for Error without code property', () => {
+    const regularError = new Error('Regular error');
+
+    expect(isNodeError(regularError)).toBe(false);
+  });
+
+  it('should return false for non-Error objects', () => {
+    expect(isNodeError({ code: 'ENOENT' })).toBe(false);
+    expect(isNodeError('string')).toBe(false);
+    expect(isNodeError(null)).toBe(false);
+  });
+});
diff --git a/packages/core/src/utils/errors.ts b/packages/core/src/utils/errors.ts
index 030910ce8..b0ba031dd 100644
--- a/packages/core/src/utils/errors.ts
+++ b/packages/core/src/utils/errors.ts
@@ -14,6 +14,28 @@ export function isNodeError(error: unknown): error is NodeJS.ErrnoException {
   return error instanceof Error && 'code' in error;
 }
 
+/**
+ * Check if the error is an abort error (user cancellation).
+ * This handles both DOMException-style AbortError and Node.js abort errors.
+ */
+export function isAbortError(error: unknown): boolean {
+  if (!error || typeof error !== 'object') {
+    return false;
+  }
+
+  // Check for AbortError by name (standard DOMException and custom AbortError)
+  if (error instanceof Error && error.name === 'AbortError') {
+    return true;
+  }
+
+  // Check for Node.js abort error code
+  if (isNodeError(error) && error.code === 'ABORT_ERR') {
+    return true;
+  }
+
+  return false;
+}
+
 export function getErrorMessage(error: unknown): string {
   if (error instanceof Error) {
     return error.message;
diff --git a/packages/core/src/utils/paths.test.ts b/packages/core/src/utils/paths.test.ts
index 6359ba813..1c4ee0225 100644
--- a/packages/core/src/utils/paths.test.ts
+++ b/packages/core/src/utils/paths.test.ts
@@ -15,6 +15,8 @@ import {
   resolveAndValidatePath,
   unescapePath,
   isSubpath,
+  shortenPath,
+  tildeifyPath,
 } from './paths.js';
 import type { Config } from '../config/config.js';
 
@@ -596,3 +598,175 @@ describe('resolveAndValidatePath', () => {
     }
   });
 });
+
+describe('tildeifyPath', () => {
+  it('replaces home directory with tilde', () => {
+    const homeDir = os.homedir();
+    const result = tildeifyPath(`${homeDir}/documents/file.txt`);
+    expect(result).toBe('~/documents/file.txt');
+  });
+
+  it('returns path unchanged if it does not start with home directory', () => {
+    const result = tildeifyPath('/var/log/app.log');
+    expect(result).toBe('/var/log/app.log');
+  });
+
+  it('handles exact home directory path', () => {
+    const homeDir = os.homedir();
+    const result = tildeifyPath(homeDir);
+    expect(result).toBe('~');
+  });
+
+  it('handles paths with home directory in the middle', () => {
+    const homeDir = os.homedir();
+    const result = tildeifyPath(`/mnt/backup${homeDir}/data`);
+    // Should not replace home dir in the middle
+    expect(result).toBe(`/mnt/backup${homeDir}/data`);
+  });
+});
+
+describe('shortenPath', () => {
+  const sep = path.sep;
+  const sepForRegex = sep.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+  it('returns path unchanged if it is already short enough', () => {
+    expect(shortenPath('/short/path', 50)).toBe('/short/path');
+    expect(shortenPath('/a/b/c.txt', 100)).toBe('/a/b/c.txt');
+  });
+
+  it('returns path unchanged if length equals maxLen', () => {
+    const testPath = '/exact/length';
+    expect(shortenPath(testPath, testPath.length)).toBe(testPath);
+  });
+
+  it('shortens long paths by showing start and end with ellipsis in between', () => {
+    const longPath = `${sep}home${sep}user${sep}projects${sep}qwen-code${sep}packages${sep}core${sep}src${sep}file.ts`;
+    const result = shortenPath(longPath, 40);
+
+    // Should include root + first segment and ellipsis
+    expect(result).toContain(`${sep}home${sep}...${sep}`);
+    // Should end with file.ts
+    expect(result).toContain('file.ts');
+    // Should be within maxLen
+    expect(result.length).toBeLessThanOrEqual(40);
+  });
+
+  it('includes as many end segments as possible', () => {
+    const testPath = `${sep}home${sep}user${sep}workspace${sep}projects${sep}subdir${sep}file.txt`;
+    const result = shortenPath(testPath, 35);
+
+    // Should have: /home/.../subdir/file.txt (fitting as many end segments as possible)
+    expect(result).toContain('...');
+    expect(result).toContain('file.txt');
+    expect(result.length).toBeLessThanOrEqual(35);
+  });
+
+  it('shows all segments when they all fit after including ellipsis space', () => {
+    const testPath = `${sep}a${sep}b${sep}c${sep}d.txt`;
+    // This path is short, should not need ellipsis
+    const result = shortenPath(testPath, 50);
+    expect(result).toBe(testPath);
+    expect(result).not.toContain('...');
+  });
+
+  it('handles paths with single segment after root', () => {
+    const result = shortenPath(
+      '/verylongfilenamethatshouldbetruncated.txt',
+      20,
+    );
+    expect(result).toContain('...');
+    expect(result.length).toBeLessThanOrEqual(20);
+  });
+
+  it('handles paths with only root', () => {
+    expect(shortenPath('/', 10)).toBe('/');
+    expect(shortenPath('/', 1)).toBe('/');
+  });
+
+  it('handles very short maxLen values', () => {
+    const result = shortenPath('/home/user/file.txt', 5);
+    expect(result).toBe('/h...');
+    expect(result.length).toBe(5);
+  });
+
+  it('handles paths with two segments', () => {
+    const testPath = `${sep}home${sep}file.txt`;
+    const result = shortenPath(testPath, 10);
+
+    expect(result).toContain('...');
+    expect(result.length).toBeLessThanOrEqual(10);
+  });
+
+  it('preserves the root directory in shortened paths', () => {
+    const result = shortenPath(`${sep}a${sep}b${sep}c${sep}d${sep}e.txt`, 15);
+    expect(result.startsWith(sep)).toBe(true);
+  });
+
+  it('handles relative-looking paths correctly', () => {
+    // Note: shortenPath works with any string, but typically gets absolute paths
+    const result = shortenPath('very/long/relative/path/to/file.txt', 20);
+    expect(result).toContain('...');
+    expect(result.length).toBeLessThanOrEqual(20);
+  });
+
+  it('creates ellipsis only when segments are actually omitted', () => {
+    const shortPath = `${sep}a${sep}b${sep}c.txt`;
+    const result1 = shortenPath(shortPath, 100);
+    expect(result1).not.toContain('...');
+
+    const result2 = shortenPath(shortPath, 8);
+    expect(result2).toContain('...');
+  });
+
+  it('uses default maxLen of 80 when not specified', () => {
+    const longPath = Array(100).fill('a').join('');
+    const result = shortenPath(longPath);
+    expect(result.length).toBeLessThanOrEqual(80);
+  });
+
+  it('handles paths where even minimum representation is too long', () => {
+    const path1 = '/verylongdirectoryname/verylongfilename.txt';
+    const result = shortenPath(path1, 15);
+    // Should use simple truncation fallback
+    expect(result).toContain('...');
+    expect(result.length).toBeLessThanOrEqual(15);
+  });
+
+  it('correctly calculates length including ellipsis', () => {
+    const testPath = `${sep}home${sep}user${sep}workspace${sep}project${sep}src${sep}components${sep}app.tsx`;
+    const maxLen = 40;
+    const result = shortenPath(testPath, maxLen);
+
+    expect(result.length).toBeLessThanOrEqual(maxLen);
+    // If ellipsis is present, verify proper structure
+    if (result.includes('...')) {
+      const parts = result.split('...');
+      expect(parts.length).toBe(2);
+      expect(parts[0].length + 3 + parts[1].length).toBeLessThanOrEqual(maxLen);
+    }
+  });
+
+  it('maintains path separator consistency', () => {
+    const testPath = `${sep}a${sep}b${sep}c${sep}d${sep}e${sep}f.txt`;
+    const result = shortenPath(testPath, 20);
+
+    // All separators should be consistent
+    const separators = result.match(new RegExp(`\\${sep}`, 'g'));
+    if (separators) {
+      separators.forEach((s) => {
+        expect(s).toBe(sep);
+      });
+    }
+  });
+
+  it('example from documentation: /path/to/a/very/long/file.txt', () => {
+    const testPath = `${sep}path${sep}to${sep}a${sep}very${sep}long${sep}directory${sep}file.txt`;
+    const result = shortenPath(testPath, 35);
+
+    // Should show start and end with ellipsis
+    expect(result).toMatch(
+      new RegExp(`^${sepForRegex}path${sepForRegex}\\.\\.\\..+file\\.txt$`),
+    );
+    expect(result.length).toBeLessThanOrEqual(35);
+  });
+});
diff --git a/packages/core/src/utils/paths.ts b/packages/core/src/utils/paths.ts
index a4c220107..6b492c922 100644
--- a/packages/core/src/utils/paths.ts
+++ b/packages/core/src/utils/paths.ts
@@ -36,6 +36,7 @@ export function tildeifyPath(path: string): string {
 
 /**
  * Shortens a path string if it exceeds maxLen, prioritizing the start and end segments.
+ * Shows root + first segment + "..." + end segments when middle segments are omitted.
  * Example: /path/to/a/very/long/file.txt -> /path/.../long/file.txt
  */
 export function shortenPath(filePath: string, maxLen: number = 80): string {
@@ -43,65 +44,82 @@ export function shortenPath(filePath: string, maxLen: number = 80): string {
     return filePath;
   }
 
+  const separator = path.sep;
+  const ellipsis = '...';
+
+  // Simple fallback for very short maxLen
+  if (maxLen < 10) {
+    return filePath.substring(0, maxLen - 3) + ellipsis;
+  }
+
   const parsedPath = path.parse(filePath);
   const root = parsedPath.root;
-  const separator = path.sep;
-
-  // Get segments of the path *after* the root
   const relativePath = filePath.substring(root.length);
-  const segments = relativePath.split(separator).filter((s) => s !== ''); // Filter out empty segments
+  const segments = relativePath.split(separator).filter((s) => s !== '');
 
-  // Handle cases with no segments after root (e.g., "/", "C:\") or only one segment
-  if (segments.length <= 1) {
-    // Fall back to simple start/end truncation for very short paths or single segments
-    const keepLen = Math.floor((maxLen - 3) / 2);
-    // Ensure keepLen is not negative if maxLen is very small
-    if (keepLen <= 0) {
-      return filePath.substring(0, maxLen - 3) + '...';
+  // Handle edge cases: no segments or single segment
+  if (segments.length === 0) {
+    return root.length <= maxLen
+      ? root
+      : root.substring(0, maxLen - 3) + ellipsis;
+  }
+
+  if (segments.length === 1) {
+    const full = root + segments[0];
+    if (full.length <= maxLen) {
+      return full;
     }
+    const keepLen = Math.floor((maxLen - 3) / 2);
+    const start = full.substring(0, keepLen);
+    const end = full.substring(full.length - keepLen);
+    return `${start}${ellipsis}${end}`;
+  }
+
+  // For 2+ segments: build from start and end, insert "..." if there's a gap
+  const startPart = root + segments[0]; // Always include root and first segment
+
+  // Collect segments from the end, working backwards
+  const endSegments: string[] = [];
+
+  for (let i = segments.length - 1; i >= 1; i--) {
+    const segment = segments[i];
+
+    // Calculate what the total would be if we add this segment
+    const endPart = [segment, ...endSegments].join(separator);
+    const needsEllipsis = i > 1; // If we're not at segment[1], there's a gap
+
+    let candidateResult: string;
+    if (needsEllipsis) {
+      candidateResult = startPart + separator + ellipsis + separator + endPart;
+    } else {
+      candidateResult = startPart + separator + endPart;
+    }
+
+    if (candidateResult.length <= maxLen) {
+      endSegments.unshift(segment);
+
+      // If we've reached segment[1], we have all segments - return immediately
+      if (i === 1) {
+        return candidateResult;
+      }
+    } else {
+      break; // Can't add more segments
+    }
+  }
+
+  // Build final result
+  if (endSegments.length === 0) {
+    // Couldn't fit any end segments - use simple truncation
+    const keepLen = Math.floor((maxLen - 3) / 2);
     const start = filePath.substring(0, keepLen);
     const end = filePath.substring(filePath.length - keepLen);
-    return `${start}...${end}`;
+    return `${start}${ellipsis}${end}`;
   }
 
-  const firstDir = segments[0];
-  const lastSegment = segments[segments.length - 1];
-  const startComponent = root + firstDir;
-
-  const endPartSegments: string[] = [];
-  // Base length: separator + "..." + lastDir
-  let currentLength = separator.length + lastSegment.length;
-
-  // Iterate backwards through segments (excluding the first one)
-  for (let i = segments.length - 2; i >= 0; i--) {
-    const segment = segments[i];
-    // Length needed if we add this segment: current + separator + segment
-    const lengthWithSegment = currentLength + separator.length + segment.length;
-
-    if (lengthWithSegment <= maxLen) {
-      endPartSegments.unshift(segment); // Add to the beginning of the end part
-      currentLength = lengthWithSegment;
-    } else {
-      break;
-    }
-  }
-
-  let result = endPartSegments.join(separator) + separator + lastSegment;
-
-  if (currentLength > maxLen) {
-    return result;
-  }
-
-  // Construct the final path
-  result = startComponent + separator + result;
-
-  // As a final check, if the result is somehow still too long
-  // truncate the result string from the beginning, prefixing with "...".
-  if (result.length > maxLen) {
-    return '...' + result.substring(result.length - maxLen - 3);
-  }
-
-  return result;
+  // We have some end segments but not all - there's a gap, insert ellipsis
+  return (
+    startPart + separator + ellipsis + separator + endSegments.join(separator)
+  );
 }
 
 /**