fix: can not remove the mcp server when there is only one element

README.md

@@ -201,11 +201,6 @@ If you encounter issues, check the [troubleshooting guide](https://qwenlm.github
 
 To report a bug from within the CLI, run `/bug` and include a short title and repro steps.
 
-## Connect with Us
-
-- Discord: https://discord.gg/ycKBjdNd
-- Dingtalk: https://qr.dingtalk.com/action/joingroup?code=v1,k1,+FX6Gf/ZDlTahTIRi8AEQhIaBlqykA0j+eBKKdhLeAE=&_dt_no_comment=1&origin=1
-
 ## Acknowledgments
 
 This project is based on [Google Gemini CLI](https://github.com/google-gemini/gemini-cli). We acknowledge and appreciate the excellent work of the Gemini CLI team. Our main contribution focuses on parser-level adaptations to better support Qwen-Coder models.

docs/users/configuration/settings.md

@@ -74,6 +74,9 @@ 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`      |
@@ -271,6 +274,7 @@ 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
 
@@ -352,6 +356,7 @@ 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",
@@ -475,7 +480,7 @@ Arguments passed directly when running the CLI can override other configurations
 | `--telemetry-otlp-protocol`  |       | Sets the OTLP protocol for telemetry (`grpc` or `http`).                                                                                                                                |                                        | Defaults to `grpc`. See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `--telemetry-log-prompts`    |       | Enables logging of prompts for telemetry.                                                                                                                                               |                                        | See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--checkpointing`            |       | Enables [checkpointing](../features/checkpointing).                                                                                                                                     |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `--acp`                      |       | Enables ACP mode (Agent Client Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                            |                                        | Stable. Replaces the deprecated `--experimental-acp` flag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| `--acp`                      |       | Enables ACP mode (Agent Control Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                           |                                        | Stable. Replaces the deprecated `--experimental-acp` flag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `--experimental-skills`      |       | Enables experimental [Agent Skills](../features/skills) (registers the `skill` tool and loads Skills from `.qwen/skills/` and `~/.qwen/skills/`).                                       |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--extensions`               | `-e`  | Specifies a list of extensions to use for the session.                                                                                                                                  | Extension names                        | If not provided, all available extensions are used. Use the special term `qwen -e none` to disable all extensions. Example: `qwen -e my-extension -e my-other-extension`                                                                                                                                                                                                                                                                                                                                                                                        |
 | `--list-extensions`          | `-l`  | Lists all available extensions and exits.                                                                                                                                               |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |

docs/users/integration-jetbrains.md

@@ -1,11 +1,11 @@
 # JetBrains IDEs
 
-> JetBrains IDEs provide native support for AI coding assistants through the Agent Client Protocol (ACP). This integration allows you to use Qwen Code directly within your JetBrains IDE with real-time code suggestions.
+> JetBrains IDEs provide native support for AI coding assistants through the Agent Control Protocol (ACP). This integration allows you to use Qwen Code directly within your JetBrains IDE with real-time code suggestions.
 
 ### Features
 
 - **Native agent experience**: Integrated AI assistant panel within your JetBrains IDE
-- **Agent Client Protocol**: Full support for ACP enabling advanced IDE interactions
+- **Agent Control Protocol**: Full support for ACP enabling advanced IDE interactions
 - **Symbol management**: #-mention files to add them to the conversation context
 - **Conversation history**: Access to past conversations within the IDE
 
@@ -40,7 +40,7 @@
 
 4. The Qwen Code agent should now be available in the AI Assistant panel
 
-![Qwen Code in JetBrains AI Chat](https://img.alicdn.com/imgextra/i3/O1CN01ZxYel21y433Ci6eg0_!!6000000006524-2-tps-2774-1494.png)
+![Qwen Code in JetBrains AI Chat](./images/jetbrains-acp.png)
 
 ## Troubleshooting
 

docs/users/integration-vscode.md

@@ -22,7 +22,13 @@
 
 ### Installation
 
-Download and install the extension from the [Visual Studio Code Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion).
+1. Install Qwen Code CLI:
+
+   ```bash
+   npm install -g qwen-code
+   ```
+
+2. Download and install the extension from the [Visual Studio Code Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion).
 
 ## Troubleshooting
 

docs/users/integration-zed.md

@@ -1,6 +1,6 @@
 # Zed Editor
 
-> Zed Editor provides native support for AI coding assistants through the Agent Client Protocol (ACP). This integration allows you to use Qwen Code directly within Zed's interface with real-time code suggestions.
+> Zed Editor provides native support for AI coding assistants through the Agent Control Protocol (ACP). This integration allows you to use Qwen Code directly within Zed's interface with real-time code suggestions.
 
 ![Zed Editor Overview](https://img.alicdn.com/imgextra/i1/O1CN01aAhU311GwEoNh27FP_!!6000000000686-2-tps-3024-1898.png)
 
@@ -20,9 +20,9 @@
 
 1. Install Qwen Code CLI:
 
-```bash
-npm install -g @qwen-code/qwen-code
-```
+   ```bash
+   npm install -g qwen-code
+   ```
 
 2. Download and install [Zed Editor](https://zed.dev/)
 

docs/users/reference/keyboard-shortcuts.md

@@ -20,7 +20,6 @@ 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.                                                                                                          |
@@ -39,7 +38,6 @@ 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. |

integration-tests/sdk-typescript/permission-control.test.ts

@@ -831,7 +831,7 @@ describe('Permission Control (E2E)', () => {
         TEST_TIMEOUT,
       );
 
-      it.skip(
+      it(
         'should execute dangerous commands without confirmation',
         async () => {
           const q = query({

package-lock.json

@@ -18588,7 +18588,7 @@
     },
     "packages/sdk-typescript": {
       "name": "@qwen-code/sdk",
-      "version": "0.1.3",
+      "version": "0.1.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",

packages/cli/src/config/config.test.ts

@@ -553,6 +553,70 @@ 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 = [

packages/cli/src/config/config.ts

@@ -105,6 +105,7 @@ export interface CliArgs {
   prompt: string | undefined;
   promptInteractive: string | undefined;
   allFiles: boolean | undefined;
+  showMemoryUsage: boolean | undefined;
   yolo: boolean | undefined;
   approvalMode: string | undefined;
   telemetry: boolean | undefined;
@@ -297,6 +298,11 @@ 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',
@@ -492,6 +498,10 @@ 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.',
@@ -1004,6 +1014,8 @@ export async function loadCliConfig(
     userMemory: memoryContent,
     geminiMdFileCount: fileCount,
     approvalMode,
+    showMemoryUsage:
+      argv.showMemoryUsage || settings.ui?.showMemoryUsage || false,
     accessibility: {
       ...settings.ui?.accessibility,
       screenReader,

packages/cli/src/config/settings.test.ts

@@ -2260,7 +2260,7 @@ describe('Settings Loading and Merging', () => {
           disableAutoUpdate: true,
         },
         ui: {
-          hideTips: true,
+          hideBanner: true,
           customThemes: {
             myTheme: {},
           },
@@ -2283,7 +2283,7 @@ describe('Settings Loading and Merging', () => {
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
         disableAutoUpdate: true,
-        hideTips: true,
+        hideBanner: true,
         customThemes: {
           myTheme: {},
         },

packages/cli/src/config/settings.ts

@@ -90,6 +90,13 @@ 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',

packages/cli/src/config/settingsSchema.test.ts

@@ -157,6 +157,9 @@ 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,
       );
@@ -168,14 +171,17 @@ describe('SettingsSchema', () => {
       ).toBe(true);
       expect(
         getSettingsSchema().ui.properties.hideWindowTitle.showInDialog,
-      ).toBe(false);
+      ).toBe(true);
       expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe(
         true,
       );
+      expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe(
+        true,
+      );
       expect(
         getSettingsSchema().privacy.properties.usageStatisticsEnabled
           .showInDialog,
-      ).toBe(true);
+      ).toBe(false);
 
       // Check that advanced settings are hidden from dialog
       expect(getSettingsSchema().security.properties.auth.showInDialog).toBe(
@@ -188,7 +194,7 @@ describe('SettingsSchema', () => {
       expect(getSettingsSchema().telemetry.showInDialog).toBe(false);
 
       // Check that some settings are appropriately hidden
-      expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(true);
+      expect(getSettingsSchema().ui.properties.theme.showInDialog).toBe(false); // Changed to false
       expect(getSettingsSchema().ui.properties.customThemes.showInDialog).toBe(
         false,
       ); // Managed via theme editor
@@ -197,13 +203,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);
+      ).toBe(false); // Changed to false
       expect(
         getSettingsSchema().general.properties.preferredEditor.showInDialog,
-      ).toBe(true);
+      ).toBe(false); // Changed to false
       expect(
         getSettingsSchema().advanced.properties.autoConfigureMemory
           .showInDialog,
@@ -281,7 +287,7 @@ describe('SettingsSchema', () => {
       expect(
         getSettingsSchema().security.properties.folderTrust.properties.enabled
           .showInDialog,
-      ).toBe(false);
+      ).toBe(true);
     });
 
     it('should have debugKeystrokeLogging setting in schema', () => {
@@ -304,7 +310,7 @@ describe('SettingsSchema', () => {
       expect(
         getSettingsSchema().general.properties.debugKeystrokeLogging
           .showInDialog,
-      ).toBe(false);
+      ).toBe(true);
       expect(
         getSettingsSchema().general.properties.debugKeystrokeLogging
           .description,

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: true,
+        showInDialog: false,
       },
       vimMode: {
         type: 'boolean',
@@ -163,13 +163,13 @@ const SETTINGS_SCHEMA = {
       },
       gitCoAuthor: {
         type: 'boolean',
-        label: 'Add AI Co-Author to Commits',
+        label: 'Git Co-Author',
         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: true,
+        showInDialog: false,
       },
       checkpointing: {
         type: 'object',
@@ -198,13 +198,13 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Enable debug logging of keystrokes to the console.',
-        showInDialog: false,
+        showInDialog: true,
       },
       language: {
         type: 'enum',
         label: 'Language',
         category: 'General',
-        requiresRestart: true,
+        requiresRestart: false,
         default: 'auto',
         description:
           'The language for the user interface. Use "auto" to detect from system settings. ' +
@@ -221,7 +221,7 @@ const SETTINGS_SCHEMA = {
       },
       terminalBell: {
         type: 'boolean',
-        label: 'Terminal Bell Notification',
+        label: 'Terminal Bell',
         category: 'General',
         requiresRestart: false,
         default: true,
@@ -257,7 +257,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: 'text',
         description: 'The format of the CLI output.',
-        showInDialog: false,
+        showInDialog: true,
         options: [
           { value: 'text', label: 'Text' },
           { value: 'json', label: 'JSON' },
@@ -280,9 +280,9 @@ const SETTINGS_SCHEMA = {
         label: 'Theme',
         category: 'UI',
         requiresRestart: false,
-        default: 'Qwen Dark' as string,
+        default: undefined as string | undefined,
         description: 'The color theme for the UI.',
-        showInDialog: true,
+        showInDialog: false,
       },
       customThemes: {
         type: 'object',
@@ -300,7 +300,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: false,
         description: 'Hide the window title bar',
-        showInDialog: false,
+        showInDialog: true,
       },
       showStatusInTitle: {
         type: 'boolean',
@@ -310,7 +310,7 @@ const SETTINGS_SCHEMA = {
         default: false,
         description:
           'Show Qwen Code status and thoughts in the terminal window title',
-        showInDialog: false,
+        showInDialog: true,
       },
       hideTips: {
         type: 'boolean',
@@ -321,13 +321,89 @@ const SETTINGS_SCHEMA = {
         description: 'Hide helpful tips in the UI',
         showInDialog: true,
       },
-      showLineNumbers: {
+      hideBanner: {
         type: 'boolean',
-        label: 'Show Line Numbers in Code',
+        label: 'Hide Banner',
         category: 'UI',
         requiresRestart: false,
         default: false,
-        description: 'Show line numbers in the code output.',
+        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',
+        category: 'UI',
+        requiresRestart: false,
+        default: false,
+        description: 'Show line numbers in the chat.',
         showInDialog: true,
       },
       showCitations: {
@@ -337,7 +413,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Show citations for generated text in the chat.',
-        showInDialog: false,
+        showInDialog: true,
       },
       customWittyPhrases: {
         type: 'array',
@@ -350,7 +426,7 @@ const SETTINGS_SCHEMA = {
       },
       enableWelcomeBack: {
         type: 'boolean',
-        label: 'Show Welcome Back Dialog',
+        label: 'Enable Welcome Back',
         category: 'UI',
         requiresRestart: false,
         default: true,
@@ -374,7 +450,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Disable loading phrases for accessibility',
-            showInDialog: false,
+            showInDialog: true,
           },
           screenReader: {
             type: 'boolean',
@@ -384,7 +460,7 @@ const SETTINGS_SCHEMA = {
             default: undefined as boolean | undefined,
             description:
               'Render output in plain-text to be more screen reader accessible',
-            showInDialog: false,
+            showInDialog: true,
           },
         },
       },
@@ -402,7 +478,7 @@ const SETTINGS_SCHEMA = {
     properties: {
       enabled: {
         type: 'boolean',
-        label: 'Auto-connect to IDE',
+        label: 'IDE Mode',
         category: 'IDE',
         requiresRestart: true,
         default: false,
@@ -437,7 +513,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: true,
         description: 'Enable collection of usage statistics',
-        showInDialog: true,
+        showInDialog: false,
       },
     },
   },
@@ -478,7 +554,7 @@ const SETTINGS_SCHEMA = {
         default: -1,
         description:
           'Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.',
-        showInDialog: false,
+        showInDialog: true,
       },
       summarizeToolOutput: {
         type: 'object',
@@ -516,7 +592,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: true,
         description: 'Skip the next speaker check.',
-        showInDialog: false,
+        showInDialog: true,
       },
       skipLoopDetection: {
         type: 'boolean',
@@ -525,7 +601,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Disable all loop detection checks (streaming and LLM).',
-        showInDialog: false,
+        showInDialog: true,
       },
       skipStartupContext: {
         type: 'boolean',
@@ -535,7 +611,7 @@ const SETTINGS_SCHEMA = {
         default: false,
         description:
           'Avoid sending the workspace startup context at the beginning of each session.',
-        showInDialog: false,
+        showInDialog: true,
       },
       enableOpenAILogging: {
         type: 'boolean',
@@ -544,7 +620,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Enable OpenAI logging.',
-        showInDialog: false,
+        showInDialog: true,
       },
       openAILoggingDir: {
         type: 'string',
@@ -554,7 +630,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: false,
+        showInDialog: true,
       },
       generationConfig: {
         type: 'object',
@@ -574,7 +650,7 @@ const SETTINGS_SCHEMA = {
             description: 'Request timeout in milliseconds.',
             parentKey: 'generationConfig',
             childKey: 'timeout',
-            showInDialog: false,
+            showInDialog: true,
           },
           maxRetries: {
             type: 'number',
@@ -585,7 +661,7 @@ const SETTINGS_SCHEMA = {
             description: 'Maximum number of retries for failed requests.',
             parentKey: 'generationConfig',
             childKey: 'maxRetries',
-            showInDialog: false,
+            showInDialog: true,
           },
           disableCacheControl: {
             type: 'boolean',
@@ -596,7 +672,7 @@ const SETTINGS_SCHEMA = {
             description: 'Disable cache control for DashScope providers.',
             parentKey: 'generationConfig',
             childKey: 'disableCacheControl',
-            showInDialog: false,
+            showInDialog: true,
           },
           schemaCompliance: {
             type: 'enum',
@@ -608,7 +684,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: false,
+            showInDialog: true,
             options: [
               { value: 'auto', label: 'Auto (Default)' },
               { value: 'openapi_30', label: 'OpenAPI 3.0 Strict' },
@@ -653,7 +729,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: 200,
         description: 'Maximum number of directories to search for memory.',
-        showInDialog: false,
+        showInDialog: true,
       },
       includeDirectories: {
         type: 'array',
@@ -673,7 +749,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Whether to load memory files from include directories.',
-        showInDialog: false,
+        showInDialog: true,
       },
       fileFiltering: {
         type: 'object',
@@ -709,7 +785,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: true,
             description: 'Enable recursive file search functionality',
-            showInDialog: false,
+            showInDialog: true,
           },
           disableFuzzySearch: {
             type: 'boolean',
@@ -718,7 +794,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Disable fuzzy search when searching for files.',
-            showInDialog: false,
+            showInDialog: true,
           },
         },
       },
@@ -755,7 +831,7 @@ const SETTINGS_SCHEMA = {
         properties: {
           enableInteractiveShell: {
             type: 'boolean',
-            label: 'Interactive Shell (PTY)',
+            label: 'Enable Interactive Shell',
             category: 'Tools',
             requiresRestart: true,
             default: false,
@@ -780,10 +856,20 @@ const SETTINGS_SCHEMA = {
             requiresRestart: false,
             default: false,
             description: 'Show color in shell output.',
-            showInDialog: false,
+            showInDialog: true,
           },
         },
       },
+      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',
@@ -815,7 +901,7 @@ const SETTINGS_SCHEMA = {
       },
       approvalMode: {
         type: 'enum',
-        label: 'Tool Approval Mode',
+        label: 'Approval Mode',
         category: 'Tools',
         requiresRestart: false,
         default: ApprovalMode.DEFAULT,
@@ -829,16 +915,6 @@ 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',
@@ -865,7 +941,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.',
-        showInDialog: false,
+        showInDialog: true,
       },
       useBuiltinRipgrep: {
         type: 'boolean',
@@ -875,7 +951,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: false,
+        showInDialog: true,
       },
       enableToolOutputTruncation: {
         type: 'boolean',
@@ -884,7 +960,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: true,
         description: 'Enable truncation of large tool outputs.',
-        showInDialog: false,
+        showInDialog: true,
       },
       truncateToolOutputThreshold: {
         type: 'number',
@@ -894,7 +970,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: false,
+        showInDialog: true,
       },
       truncateToolOutputLines: {
         type: 'number',
@@ -903,7 +979,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
         description: 'The number of lines to keep when truncating tool output.',
-        showInDialog: false,
+        showInDialog: true,
       },
     },
   },
@@ -980,7 +1056,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Setting to track whether Folder trust is enabled.',
-            showInDialog: false,
+            showInDialog: true,
           },
         },
       },
@@ -1148,7 +1224,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: false,
+        showInDialog: true,
       },
       vlmSwitchMode: {
         type: 'string',
@@ -1216,3 +1292,9 @@ type InferSettings<T extends SettingsSchema> = {
 };
 
 export type Settings = InferSettings<SettingsSchemaType>;
+
+export interface FooterSettings {
+  hideCWD?: boolean;
+  hideSandboxStatus?: boolean;
+  hideModelInfo?: boolean;
+}

packages/cli/src/gemini.test.tsx

@@ -456,6 +456,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       promptInteractive: undefined,
       query: undefined,
       allFiles: undefined,
+      showMemoryUsage: undefined,
       yolo: undefined,
       approvalMode: undefined,
       telemetry: undefined,

packages/cli/src/i18n/locales/de.js

@@ -97,8 +97,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 go back)':
-    '(Enter zum Anwenden des Bereichs, Tab zum Zurückgehen)',
+  '(Use Enter to apply scope, Tab to select theme)':
+    '(Enter zum Anwenden des Bereichs, Tab zum Auswählen des Designs)',
   '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,6 +260,8 @@ 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.':
@@ -269,12 +271,6 @@ export default {
   // ============================================================================
   'Vim Mode': 'Vim-Modus',
   'Disable Auto Update': 'Automatische Updates deaktivieren',
-  'Add AI Co-Author to Commits': 'KI als Co-Autor zu Commits hinzufügen',
-  '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',
@@ -282,10 +278,17 @@ export default {
   'Hide Window Title': 'Fenstertitel ausblenden',
   'Show Status in Title': 'Status im Titel anzeigen',
   'Hide Tips': 'Tipps ausblenden',
-  'Show Line Numbers in Code': 'Zeilennummern im Code anzeigen',
+  '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 Citations': 'Quellenangaben anzeigen',
   'Custom Witty Phrases': 'Benutzerdefinierte Witzige Sprüche',
-  'Show Welcome Back Dialog': 'Willkommen-zurück-Dialog anzeigen',
+  'Enable Welcome Back': 'Willkommen-zurück aktivieren',
   'Disable Loading Phrases': 'Ladesprüche deaktivieren',
   'Screen Reader Mode': 'Bildschirmleser-Modus',
   'IDE Mode': 'IDE-Modus',
@@ -305,7 +308,7 @@ export default {
   'Respect .qwenignore': '.qwenignore beachten',
   'Enable Recursive File Search': 'Rekursive Dateisuche aktivieren',
   'Disable Fuzzy Search': 'Unscharfe Suche deaktivieren',
-  'Interactive Shell (PTY)': 'Interaktive Shell (PTY)',
+  'Enable Interactive Shell': 'Interaktive Shell aktivieren',
   'Show Color': 'Farbe anzeigen',
   'Auto Accept': 'Automatisch akzeptieren',
   'Use Ripgrep': 'Ripgrep verwenden',
@@ -341,11 +344,6 @@ 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':
@@ -436,7 +434,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': 'Werkzeug-Genehmigungsmodus',
+  'Approval Mode': 'Genehmigungsmodus',
   'Current approval mode: {{mode}}': 'Aktueller Genehmigungsmodus: {{mode}}',
   'Available approval modes:': 'Verfügbare Genehmigungsmodi:',
   'Approval mode changed to: {{mode}}':
@@ -478,6 +476,8 @@ 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',

packages/cli/src/i18n/locales/en.js

@@ -33,25 +33,6 @@ 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',
@@ -65,7 +46,6 @@ 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)':
@@ -118,8 +98,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 go back)':
-    '(Use Enter to apply scope, Tab to go back)',
+  '(Use Enter to apply scope, Tab to select theme)':
+    '(Use Enter to apply scope, Tab to select theme)',
   '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.',
@@ -277,6 +257,8 @@ 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.':
@@ -286,12 +268,6 @@ export default {
   // ============================================================================
   'Vim Mode': 'Vim Mode',
   'Disable Auto Update': 'Disable Auto Update',
-  'Add AI Co-Author to Commits': 'Add AI Co-Author to Commits',
-  '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',
@@ -299,10 +275,17 @@ export default {
   'Hide Window Title': 'Hide Window Title',
   'Show Status in Title': 'Show Status in Title',
   'Hide Tips': 'Hide Tips',
-  'Show Line Numbers in Code': 'Show Line Numbers in Code',
+  '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 Citations': 'Show Citations',
   'Custom Witty Phrases': 'Custom Witty Phrases',
-  'Show Welcome Back Dialog': 'Show Welcome Back Dialog',
+  'Enable Welcome Back': 'Enable Welcome Back',
   'Disable Loading Phrases': 'Disable Loading Phrases',
   'Screen Reader Mode': 'Screen Reader Mode',
   'IDE Mode': 'IDE Mode',
@@ -322,7 +305,7 @@ export default {
   'Respect .qwenignore': 'Respect .qwenignore',
   'Enable Recursive File Search': 'Enable Recursive File Search',
   'Disable Fuzzy Search': 'Disable Fuzzy Search',
-  'Interactive Shell (PTY)': 'Interactive Shell (PTY)',
+  'Enable Interactive Shell': 'Enable Interactive Shell',
   'Show Color': 'Show Color',
   'Auto Accept': 'Auto Accept',
   'Use Ripgrep': 'Use Ripgrep',
@@ -357,11 +340,6 @@ 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':
@@ -449,7 +427,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': 'Tool Approval Mode',
+  'Approval Mode': '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}}',
@@ -488,6 +466,8 @@ 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',
@@ -911,23 +891,14 @@ export default {
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  '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.',
+  '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.',
 
   // ============================================================================
   // Exit Screen / Stats

packages/cli/src/i18n/locales/ru.js

@@ -33,13 +33,6 @@ 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':
     'Закрыть диалоги, отменить запросы или выйти из приложения',
@@ -53,7 +46,6 @@ 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)':
@@ -68,19 +60,6 @@ export default {
   'submit a bug report': 'Отправка отчёта об ошибке',
   'About Qwen Code': 'Об Qwen Code',
 
-  // 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': 'внешний редактор',
-
   // ============================================================================
   // Поля системной информации
   // ============================================================================
@@ -121,8 +100,8 @@ export default {
   Preview: 'Предпросмотр',
   '(Use Enter to select, Tab to configure scope)':
     '(Enter для выбора, Tab для настройки области)',
-  '(Use Enter to apply scope, Tab to go back)':
-    '(Enter для применения области, Tab для возврата)',
+  '(Use Enter to apply scope, Tab to select theme)':
+    '(Enter для применения области, Tab для выбора темы)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Настройка темы недоступна из-за переменной окружения NO_COLOR.',
   'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.',
@@ -281,6 +260,8 @@ 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.':
@@ -290,12 +271,6 @@ export default {
   // ============================================================================
   'Vim Mode': 'Режим Vim',
   'Disable Auto Update': 'Отключить автообновление',
-  'Add AI Co-Author to Commits': 'Добавлять ИИ как соавтора в коммиты',
-  'Terminal Bell Notification': 'Звуковое уведомление терминала',
-  'Enable Usage Statistics': 'Включить сбор статистики использования',
-  Theme: 'Тема',
-  'Preferred Editor': 'Предпочтительный редактор',
-  'Auto-connect to IDE': 'Автоподключение к IDE',
   'Enable Prompt Completion': 'Включить автодополнение промптов',
   'Debug Keystroke Logging': 'Логирование нажатий клавиш для отладки',
   Language: 'Язык',
@@ -303,10 +278,17 @@ export default {
   'Hide Window Title': 'Скрыть заголовок окна',
   'Show Status in Title': 'Показывать статус в заголовке',
   'Hide Tips': 'Скрыть подсказки',
-  'Show Line Numbers in Code': 'Показывать номера строк в коде',
+  'Hide Banner': 'Скрыть баннер',
+  'Hide Context Summary': 'Скрыть сводку контекста',
+  'Hide CWD': 'Скрыть текущую директорию',
+  'Hide Sandbox Status': 'Скрыть статус песочницы',
+  'Hide Model Info': 'Скрыть информацию о модели',
+  'Hide Footer': 'Скрыть нижний колонтитул',
+  'Show Memory Usage': 'Показывать использование памяти',
+  'Show Line Numbers': 'Показывать номера строк',
   'Show Citations': 'Показывать цитаты',
   'Custom Witty Phrases': 'Пользовательские остроумные фразы',
-  'Show Welcome Back Dialog': 'Показывать диалог приветствия',
+  'Enable Welcome Back': 'Включить приветствие при возврате',
   'Disable Loading Phrases': 'Отключить фразы при загрузке',
   'Screen Reader Mode': 'Режим программы чтения с экрана',
   'IDE Mode': 'Режим IDE',
@@ -326,7 +308,7 @@ export default {
   'Respect .qwenignore': 'Учитывать .qwenignore',
   'Enable Recursive File Search': 'Включить рекурсивный поиск файлов',
   'Disable Fuzzy Search': 'Отключить нечеткий поиск',
-  'Interactive Shell (PTY)': 'Интерактивный терминал (PTY)',
+  'Enable Interactive Shell': 'Включить интерактивный терминал',
   'Show Color': 'Показывать цвета',
   'Auto Accept': 'Автоподтверждение',
   'Use Ripgrep': 'Использовать Ripgrep',
@@ -363,11 +345,6 @@ 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':
@@ -457,7 +434,7 @@ export default {
   // ============================================================================
   // Команды - Режим подтверждения
   // ============================================================================
-  'Tool Approval Mode': 'Режим подтверждения инструментов',
+  'Approval Mode': 'Режим подтверждения',
   'Current approval mode: {{mode}}': 'Текущий режим подтверждения: {{mode}}',
   'Available approval modes:': 'Доступные режимы подтверждения:',
   'Approval mode changed to: {{mode}}':
@@ -499,6 +476,8 @@ 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': 'Настройки рабочего пространства',

packages/cli/src/i18n/locales/zh.js

@@ -32,25 +32,6 @@ 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':
     '关闭对话框、取消请求或退出应用程序',
@@ -64,7 +45,6 @@ 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)':
@@ -117,8 +97,8 @@ export default {
   Preview: '预览',
   '(Use Enter to select, Tab to configure scope)':
     '（使用 Enter 选择，Tab 配置作用域）',
-  '(Use Enter to apply scope, Tab to go back)':
-    '（使用 Enter 应用作用域，Tab 返回）',
+  '(Use Enter to apply scope, Tab to select theme)':
+    '（使用 Enter 应用作用域，Tab 选择主题）',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     '由于 NO_COLOR 环境变量，主题配置不可用。',
   'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。',
@@ -268,6 +248,8 @@ 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.':
@@ -277,12 +259,6 @@ export default {
   // ============================================================================
   'Vim Mode': 'Vim 模式',
   'Disable Auto Update': '禁用自动更新',
-  'Add AI Co-Author to Commits': '在提交中添加 AI 协作者',
-  'Terminal Bell Notification': '终端响铃通知',
-  'Enable Usage Statistics': '启用使用统计',
-  Theme: '主题',
-  'Preferred Editor': '首选编辑器',
-  'Auto-connect to IDE': '自动连接到 IDE',
   'Enable Prompt Completion': '启用提示补全',
   'Debug Keystroke Logging': '调试按键记录',
   Language: '语言',
@@ -290,10 +266,17 @@ export default {
   'Hide Window Title': '隐藏窗口标题',
   'Show Status in Title': '在标题中显示状态',
   'Hide Tips': '隐藏提示',
-  'Show Line Numbers in Code': '在代码中显示行号',
+  'Hide Banner': '隐藏横幅',
+  'Hide Context Summary': '隐藏上下文摘要',
+  'Hide CWD': '隐藏当前工作目录',
+  'Hide Sandbox Status': '隐藏沙箱状态',
+  'Hide Model Info': '隐藏模型信息',
+  'Hide Footer': '隐藏页脚',
+  'Show Memory Usage': '显示内存使用',
+  'Show Line Numbers': '显示行号',
   'Show Citations': '显示引用',
   'Custom Witty Phrases': '自定义诙谐短语',
-  'Show Welcome Back Dialog': '显示欢迎回来对话框',
+  'Enable Welcome Back': '启用欢迎回来',
   'Disable Loading Phrases': '禁用加载短语',
   'Screen Reader Mode': '屏幕阅读器模式',
   'IDE Mode': 'IDE 模式',
@@ -312,7 +295,7 @@ export default {
   'Respect .qwenignore': '遵守 .qwenignore',
   'Enable Recursive File Search': '启用递归文件搜索',
   'Disable Fuzzy Search': '禁用模糊搜索',
-  'Interactive Shell (PTY)': '交互式 Shell (PTY)',
+  'Enable Interactive Shell': '启用交互式 Shell',
   'Show Color': '显示颜色',
   'Auto Accept': '自动接受',
   'Use Ripgrep': '使用 Ripgrep',
@@ -344,11 +327,6 @@ 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':
@@ -432,7 +410,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Tool Approval Mode': '工具审批模式',
+  'Approval Mode': '审批模式',
   'Current approval mode: {{mode}}': '当前审批模式：{{mode}}',
   'Available approval modes:': '可用的审批模式：',
   'Approval mode changed to: {{mode}}': '审批模式已更改为：{{mode}}',
@@ -466,6 +444,8 @@ 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': '工作区设置',
@@ -865,22 +845,13 @@ export default {
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  '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 可快速切换权限模式。',
+  '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.': '获取更多信息',
 
   // ============================================================================
   // Exit Screen / Stats

packages/cli/src/ui/App.tsx

@@ -5,15 +5,34 @@
  */
 
 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 />;
@@ -21,7 +40,11 @@ export const App = () => {
 
   return (
     <StreamingContext.Provider value={uiState.streamingState}>
-      {isScreenReaderEnabled ? <ScreenReaderAppLayout /> : <DefaultAppLayout />}
+      {isScreenReaderEnabled ? (
+        <ScreenReaderAppLayout />
+      ) : (
+        <DefaultAppLayout width={containerWidth} />
+      )}
     </StreamingContext.Provider>
   );
 };

packages/cli/src/ui/AppContainer.test.tsx

@@ -294,7 +294,10 @@ describe('AppContainer State Management', () => {
     // Mock LoadedSettings
     mockSettings = {
       merged: {
+        hideBanner: false,
+        hideFooter: false,
         hideTips: false,
+        showMemoryUsage: false,
         theme: 'default',
         ui: {
           showStatusInTitle: false,
@@ -442,7 +445,10 @@ 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;
 
@@ -457,6 +463,28 @@ 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', () => {

packages/cli/src/ui/AppContainer.tsx

@@ -271,8 +271,7 @@ export const AppContainer = (props: AppContainerProps) => {
       calculatePromptWidths(terminalWidth);
     return { inputWidth, suggestionsWidth };
   }, [terminalWidth]);
-  // Uniform width for bordered box components: accounts for margins and caps at 100
-  const mainAreaWidth = Math.min(terminalWidth - 4, 100);
+  const mainAreaWidth = Math.floor(terminalWidth * 0.9);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
 
   const isValidPath = useCallback((filePath: string): boolean => {
@@ -1388,8 +1387,6 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const uiActions: UIActions = useMemo(
     () => ({
-      openThemeDialog,
-      openEditorDialog,
       handleThemeSelect,
       handleThemeHighlight,
       handleApprovalModeSelect,
@@ -1427,8 +1424,6 @@ export const AppContainer = (props: AppContainerProps) => {
       handleResume,
     }),
     [
-      openThemeDialog,
-      openEditorDialog,
       handleThemeSelect,
       handleThemeHighlight,
       handleApprovalModeSelect,

packages/cli/src/ui/auth/useAuth.ts

@@ -83,26 +83,12 @@ export const useAuthCommand = (
     async (authType: AuthType, credentials?: OpenAICredentials) => {
       try {
         const authTypeScope = getPersistScopeForModelSelection(settings);
-
-        // Persist authType
         settings.setValue(
           authTypeScope,
           'security.auth.selectedType',
           authType,
         );
 
-        // Persist model from ContentGenerator config (handles fallback cases)
-        // This ensures that when syncAfterAuthRefresh falls back to default model,
-        // it gets persisted to settings.json
-        const contentGeneratorConfig = config.getContentGeneratorConfig();
-        if (contentGeneratorConfig?.model) {
-          settings.setValue(
-            authTypeScope,
-            'model.name',
-            contentGeneratorConfig.model,
-          );
-        }
-
         // Only update credentials if not switching to QWEN_OAUTH,
         // so that OpenAI credentials are preserved when switching to QWEN_OAUTH.
         if (authType !== AuthType.QWEN_OAUTH && credentials) {
@@ -120,6 +106,9 @@ export const useAuthCommand = (
               credentials.baseUrl,
             );
           }
+          if (credentials?.model != null) {
+            settings.setValue(authTypeScope, 'model.name', credentials.model);
+          }
         }
       } catch (error) {
         handleAuthFailure(error);

packages/cli/src/ui/components/AboutBox.tsx

@@ -15,11 +15,9 @@ import {
 } from '../../utils/systemInfoFields.js';
 import { t } from '../../i18n/index.js';
 
-type AboutBoxProps = ExtendedSystemInfo & {
-  width?: number;
-};
+type AboutBoxProps = ExtendedSystemInfo;
 
-export const AboutBox: React.FC<AboutBoxProps> = ({ width, ...props }) => {
+export const AboutBox: React.FC<AboutBoxProps> = (props) => {
   const fields = getSystemInfoFields(props);
 
   return (
@@ -28,7 +26,8 @@ export const AboutBox: React.FC<AboutBoxProps> = ({ width, ...props }) => {
       borderColor={theme.border.default}
       flexDirection="column"
       padding={1}
-      width={width}
+      marginY={1}
+      width="100%"
     >
       <Box marginBottom={1}>
         <Text bold color={theme.text.accent}>

packages/cli/src/ui/components/AppHeader.test.tsx

@@ -1,93 +0,0 @@
-/**
- * @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');
-  });
-});

packages/cli/src/ui/components/AppHeader.tsx

@@ -9,6 +9,7 @@ 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;
@@ -17,25 +18,16 @@ interface AppHeaderProps {
 export const AppHeader = ({ version }: AppHeaderProps) => {
   const settings = useSettings();
   const config = useConfig();
-
-  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());
+  const { nightly } = useUIState();
 
   return (
     <Box flexDirection="column">
-      {showBanner && (
-        <Header
-          version={version}
-          authType={authType}
-          model={model}
-          workingDirectory={targetDir}
-        />
+      {!(settings.merged.ui?.hideBanner || config.getScreenReader()) && (
+        <Header version={version} nightly={nightly} />
+      )}
+      {!(settings.merged.ui?.hideTips || config.getScreenReader()) && (
+        <Tips config={config} />
       )}
-      {showTips && <Tips />}
     </Box>
   );
 };

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.User,
+    SettingScope.Workspace,
   );
 
   // Track the currently highlighted approval mode
@@ -90,17 +90,19 @@ export function ApprovalModeDialog({
     setSelectedScope(scope);
   }, []);
 
-  const handleScopeSelect = useCallback((scope: SettingScope) => {
-    setSelectedScope(scope);
-    setMode('mode');
-  }, []);
+  const handleScopeSelect = useCallback(
+    (scope: SettingScope) => {
+      onSelect(highlightedMode, scope);
+    },
+    [onSelect, highlightedMode],
+  );
 
-  const [mode, setMode] = useState<'mode' | 'scope'>('mode');
+  const [focusSection, setFocusSection] = useState<'mode' | 'scope'>('mode');
 
   useKeypress(
     (key) => {
       if (key.name === 'tab') {
-        setMode((prev) => (prev === 'mode' ? 'scope' : 'mode'));
+        setFocusSection((prev) => (prev === 'mode' ? 'scope' : 'mode'));
       }
       if (key.name === 'escape') {
         onSelect(undefined, selectedScope);
@@ -125,56 +127,59 @@ export function ApprovalModeDialog({
     <Box
       borderStyle="round"
       borderColor={theme.border.default}
-      flexDirection="column"
+      flexDirection="row"
       padding={1}
       width="100%"
+      height="100%"
     >
-      {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>
-          </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 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 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)')}
+
+        <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.',
+              )}
+            </Text>
+            <Box height={1} />
+          </>
+        )}
+
+        <Text color={theme.text.secondary}>
+          {t('(Use Enter to select, Tab to change focus)')}
         </Text>
       </Box>
     </Box>

packages/cli/src/ui/components/AsciiArt.ts

@@ -5,10 +5,29 @@
  */
 
 export const shortAsciiLogo = `
- ▄▄▄▄▄▄  ▄▄     ▄▄ ▄▄▄▄▄▄▄ ▄▄▄    ▄▄
+ ██████╗ ██╗    ██╗███████╗███╗   ██╗
 ██╔═══██╗██║    ██║██╔════╝████╗  ██║
 ██║   ██║██║ █╗ ██║█████╗  ██╔██╗ ██║
 ██║▄▄ ██║██║███╗██║██╔══╝  ██║╚██╗██║
 ╚██████╔╝╚███╔███╔╝███████╗██║ ╚████║
- ╚══▀▀═╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═══╝
+ ╚══▀▀═╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═══╝                                     
+`;
+export const longAsciiLogo = `
+██╗       ██████╗ ██╗    ██╗███████╗███╗   ██╗
+╚██╗     ██╔═══██╗██║    ██║██╔════╝████╗  ██║
+ ╚██╗    ██║   ██║██║ █╗ ██║█████╗  ██╔██╗ ██║
+ ██╔╝    ██║▄▄ ██║██║███╗██║██╔══╝  ██║╚██╗██║
+██╔╝     ╚██████╔╝╚███╔███╔╝███████╗██║ ╚████║
+╚═╝       ╚══▀▀═╝  ╚══╝╚══╝ ╚══════╝╚═╝  ╚═══╝
+`;
+
+export const tinyAsciiLogo = `
+ ███         █████████ 
+░░░███      ███░░░░░███
+  ░░░███   ███     ░░░ 
+    ░░░███░███         
+     ███░ ░███    █████
+   ███░   ░░███  ░░███ 
+ ███░      ░░█████████ 
+░░░         ░░░░░░░░░  
 `;

packages/cli/src/ui/components/Composer.test.tsx

@@ -14,6 +14,7 @@ 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(() => ({
@@ -145,33 +146,92 @@ 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}>
-      <UIStateContext.Provider value={uiState}>
-        <UIActionsContext.Provider value={uiActions}>
-          <Composer />
-        </UIActionsContext.Provider>
-      </UIStateContext.Provider>
+      <SettingsContext.Provider value={settings as any}>
+        <UIStateContext.Provider value={uiState}>
+          <UIActionsContext.Provider value={uiActions}>
+            <Composer />
+          </UIActionsContext.Provider>
+        </UIStateContext.Provider>
+      </SettingsContext.Provider>
     </ConfigContext.Provider>,
   );
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
 describe('Composer', () => {
-  describe('Footer Display', () => {
-    it('renders Footer by default', () => {
+  describe('Footer Display Settings', () => {
+    it('renders Footer by default when hideFooter is false', () => {
       const uiState = createMockUIState();
+      const settings = createMockSettings({ hideFooter: false });
 
-      const { lastFrame } = renderComposer(uiState);
+      const { lastFrame } = renderComposer(uiState, settings);
 
-      // Smoke check that the Footer renders
+      // Smoke check that the Footer renders when enabled.
       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', () => {
@@ -201,7 +261,7 @@ describe('Composer', () => {
         getAccessibility: vi.fn(() => ({ disableLoadingPhrases: true })),
       });
 
-      const { lastFrame } = renderComposer(uiState, config);
+      const { lastFrame } = renderComposer(uiState, undefined, config);
 
       const output = lastFrame();
       expect(output).toContain('LoadingIndicator');
@@ -258,8 +318,7 @@ describe('Composer', () => {
   });
 
   describe('Context and Status Display', () => {
-    // Note: ContextSummaryDisplay and status prompts are now rendered in Footer, not Composer
-    it('shows empty space in normal state (ContextSummaryDisplay moved to Footer)', () => {
+    it('shows ContextSummaryDisplay in normal state', () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: false,
         ctrlDPressedOnce: false,
@@ -268,43 +327,37 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      // ContextSummaryDisplay is now in Footer, so we just verify normal state renders
-      expect(lastFrame()).toBeDefined();
+      expect(lastFrame()).toContain('ContextSummaryDisplay');
     });
 
-    // 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', () => {
+    it('shows Ctrl+C exit prompt when ctrlCPressedOnce is true', () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      // Ctrl+C prompt is now inside Footer, verify Footer renders
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain('Press Ctrl+C again to exit');
     });
 
-    it('renders Footer which handles Ctrl+D exit prompt', () => {
+    it('shows Ctrl+D exit prompt when ctrlDPressedOnce is true', () => {
       const uiState = createMockUIState({
         ctrlDPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      // Ctrl+D prompt is now inside Footer, verify Footer renders
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain('Press Ctrl+D again to exit');
     });
 
-    it('renders Footer which handles escape prompt', () => {
+    it('shows escape prompt when showEscapePrompt is true', () => {
       const uiState = createMockUIState({
         showEscapePrompt: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      // Escape prompt is now inside Footer, verify Footer renders
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain('Press Esc again to clear');
     });
   });
 
@@ -329,9 +382,7 @@ describe('Composer', () => {
       expect(lastFrame()).not.toContain('InputPrompt');
     });
 
-    // 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', () => {
+    it('shows AutoAcceptIndicator when approval mode is not default and shell mode is inactive', () => {
       const uiState = createMockUIState({
         showAutoAcceptIndicator: ApprovalMode.YOLO,
         shellModeActive: false,
@@ -339,19 +390,17 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      // AutoAcceptIndicator is now inside Footer, verify Footer renders
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain('AutoAcceptIndicator');
     });
 
-    it('renders Footer which contains ShellModeIndicator when shell mode is active', () => {
+    it('shows ShellModeIndicator when shell mode is active', () => {
       const uiState = createMockUIState({
         shellModeActive: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      // ShellModeIndicator is now inside Footer, verify Footer renders
-      expect(lastFrame()).toContain('Footer');
+      expect(lastFrame()).toContain('ShellModeIndicator');
     });
   });
 

packages/cli/src/ui/components/Composer.tsx

@@ -4,46 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, useIsScreenReaderEnabled } from 'ink';
-import { useCallback, useMemo, useState } from 'react';
+import { Box, Text, useIsScreenReaderEnabled } from 'ink';
+import { useMemo } 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 { 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 { 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);
-  }, []);
+  const { contextFileNames, showAutoAcceptIndicator } = uiState;
 
   // Use the container width of InputPrompt for width of DetailedMessagesDisplay
   const { containerWidth } = useMemo(
@@ -52,7 +48,7 @@ export const Composer = () => {
   );
 
   return (
-    <Box flexDirection="column" marginTop={1}>
+    <Box flexDirection="column">
       {!uiState.embeddedShellFocused && (
         <LoadingIndicator
           thought={
@@ -74,6 +70,55 @@ 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">
@@ -104,9 +149,6 @@ 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}
@@ -118,13 +160,7 @@ export const Composer = () => {
         />
       )}
 
-      {/* Exclusive area: only one component visible at a time */}
-      {!showSuggestions &&
-        (showShortcuts ? (
-          <KeyboardShortcuts />
-        ) : (
-          !isScreenReaderEnabled && <Footer />
-        ))}
+      {!settings.merged.ui?.hideFooter && !isScreenReaderEnabled && <Footer />}
     </Box>
   );
 };

packages/cli/src/ui/components/ConsentPrompt.test.tsx

@@ -44,7 +44,7 @@ describe('ConsentPrompt', () => {
       {
         isPending: true,
         text: prompt,
-        contentWidth: terminalWidth,
+        terminalWidth,
       },
       undefined,
     );

packages/cli/src/ui/components/ConsentPrompt.tsx

@@ -32,7 +32,7 @@ export const ConsentPrompt = (props: ConsentPromptProps) => {
         <MarkdownDisplay
           isPending={true}
           text={prompt}
-          contentWidth={terminalWidth}
+          terminalWidth={terminalWidth}
         />
       ) : (
         prompt

packages/cli/src/ui/components/ContextUsageDisplay.tsx

@@ -17,19 +17,15 @@ export const ContextUsageDisplay = ({
   model: string;
   terminalWidth: number;
 }) => {
-  if (promptTokenCount === 0) {
-    return null;
-  }
-
   const percentage = promptTokenCount / tokenLimit(model);
-  const percentageUsed = (percentage * 100).toFixed(1);
+  const percentageLeft = ((1 - percentage) * 100).toFixed(0);
 
-  const label = terminalWidth < 100 ? '% used' : '% context used';
+  const label = terminalWidth < 100 ? '%' : '% context left';
 
   return (
     <Text color={theme.text.secondary}>
-      {percentageUsed}
-      {label}
+      ({percentageLeft}
+      {label})
     </Text>
   );
 };

packages/cli/src/ui/components/DialogManager.tsx

@@ -152,38 +152,12 @@ 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={(settingName) => {
-            if (settingName === 'ui.theme') {
-              uiActions.openThemeDialog();
-              return;
-            }
-            if (settingName === 'general.preferredEditor') {
-              uiActions.openEditorDialog();
-              return;
-            }
-            uiActions.closeSettingsDialog();
-          }}
+          onSelect={() => uiActions.closeSettingsDialog()}
           onRestartRequest={() => process.exit(0)}
           availableTerminalHeight={terminalHeight - staticExtraHeight}
           config={config}
@@ -263,6 +237,22 @@ 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

packages/cli/src/ui/components/EditorSettingsDialog.tsx

@@ -14,7 +14,6 @@ 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';
@@ -36,12 +35,13 @@ export function EditorSettingsDialog({
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
     SettingScope.User,
   );
-  const [mode, setMode] = useState<'editor' | 'scope'>('editor');
-
+  const [focusedSection, setFocusedSection] = useState<'editor' | 'scope'>(
+    'editor',
+  );
   useKeypress(
     (key) => {
       if (key.name === 'tab') {
-        setMode((prev) => (prev === 'editor' ? 'scope' : 'editor'));
+        setFocusedSection((prev) => (prev === 'editor' ? 'scope' : 'editor'));
       }
       if (key.name === 'escape') {
         onExit();
@@ -65,6 +65,23 @@ 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);
@@ -75,11 +92,7 @@ export function EditorSettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     setSelectedScope(scope);
-    setMode('editor');
-  };
-
-  const handleScopeHighlight = (scope: SettingScope) => {
-    setSelectedScope(scope);
+    setFocusedSection('editor');
   };
 
   let otherScopeModifiedMessage = '';
@@ -118,59 +131,54 @@ export function EditorSettingsDialog({
       width="100%"
     >
       <Box flexDirection="column" width="45%" paddingRight={2}>
-        {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
+        <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}
             onSelect={handleScopeSelect}
-            onHighlight={handleScopeHighlight}
-            isFocused={mode === 'scope'}
-            initialScope={selectedScope}
+            isFocused={focusedSection === 'scope'}
           />
-        )}
+        </Box>
 
         <Box marginTop={1}>
-          <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 color={theme.text.secondary}>
+            (Use Enter to select, Tab to change focus)
           </Text>
         </Box>
       </Box>
 
       <Box flexDirection="column" width="55%" paddingLeft={2}>
         <Text bold color={theme.text.primary}>
-          {t('Editor Preference')}
+          Editor Preference
         </Text>
         <Box flexDirection="column" gap={1} marginTop={1}>
           <Text color={theme.text.secondary}>
-            {t(
-              '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.
           </Text>
           <Text color={theme.text.secondary}>
-            {t('Your preferred editor is:')}{' '}
+            Your preferred editor is:{' '}
             <Text
               color={
                 mergedEditorName === 'None'

packages/cli/src/ui/components/Footer.test.tsx

@@ -8,23 +8,41 @@ 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 { VimModeProvider } from '../contexts/VimModeContext.js';
+import { SettingsContext } from '../contexts/SettingsContext.js';
 import type { LoadedSettings } from '../../config/settings.js';
+import { VimModeProvider } from '../contexts/VimModeContext.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,
 });
 
@@ -33,31 +51,46 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
     sessionStats: {
       lastPromptTokenCount: 100,
     },
-    geminiMdFileCount: 0,
-    contextFileNames: [],
-    showToolDescriptions: false,
-    ideContextState: undefined,
+    branchName: defaultProps.branchName,
     ...overrides,
   }) as UIState;
 
-const createMockSettings = (): LoadedSettings =>
+const createDefaultSettings = (
+  options: {
+    showMemoryUsage?: boolean;
+    hideCWD?: boolean;
+    hideSandboxStatus?: boolean;
+    hideModelInfo?: boolean;
+  } = {},
+): LoadedSettings =>
   ({
     merged: {
-      general: {
-        vimMode: false,
+      ui: {
+        showMemoryUsage: options.showMemoryUsage,
+        footer: {
+          hideCWD: options.hideCWD,
+          hideSandboxStatus: options.hideSandboxStatus,
+          hideModelInfo: options.hideModelInfo,
+        },
       },
     },
-  }) as LoadedSettings;
+  }) as never;
 
-const renderWithWidth = (width: number, uiState: UIState) => {
+const renderWithWidth = (
+  width: number,
+  uiState: UIState,
+  settings: LoadedSettings = createDefaultSettings(),
+) => {
   useTerminalSizeMock.mockReturnValue({ columns: width, rows: 24 });
   return render(
     <ConfigContext.Provider value={createMockConfig() as never}>
-      <VimModeProvider settings={createMockSettings()}>
-        <UIStateContext.Provider value={uiState}>
-          <Footer />
-        </UIStateContext.Provider>
-      </VimModeProvider>
+      <SettingsContext.Provider value={settings}>
+        <VimModeProvider settings={settings}>
+          <UIStateContext.Provider value={uiState}>
+            <Footer />
+          </UIStateContext.Provider>
+        </VimModeProvider>
+      </SettingsContext.Provider>
     </ConfigContext.Provider>,
   );
 };
@@ -68,28 +101,161 @@ describe('<Footer />', () => {
     expect(lastFrame()).toBeDefined();
   });
 
-  it('does not display the working directory or branch name', () => {
-    const { lastFrame } = renderWithWidth(120, createMockUIState());
-    expect(lastFrame()).not.toMatch(/\(.*\*\)/);
+  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 context percentage', () => {
+  it('displays the branch name when provided', () => {
     const { lastFrame } = renderWithWidth(120, createMockUIState());
-    expect(lastFrame()).toMatch(/\d+(\.\d+)?% context used/);
+    expect(lastFrame()).toContain(`(${defaultProps.branchName}*)`);
   });
 
-  it('displays the abbreviated context percentage on narrow terminal', () => {
+  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', () => {
+    const { lastFrame } = renderWithWidth(120, createMockUIState());
+    expect(lastFrame()).toContain(defaultProps.model);
+    expect(lastFrame()).toMatch(/\(\d+% context left\)/);
+  });
+
+  it('displays the model name and abbreviated context percentage', () => {
     const { lastFrame } = renderWithWidth(99, createMockUIState());
-    expect(lastFrame()).toMatch(/\d+%/);
+    expect(lastFrame()).toContain(defaultProps.model);
+    expect(lastFrame()).toMatch(/\(\d+%\)/);
   });
 
-  describe('footer rendering (golden snapshots)', () => {
-    it('renders complete footer on wide terminal', () => {
+  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)', () => {
       const { lastFrame } = renderWithWidth(120, createMockUIState());
       expect(lastFrame()).toMatchSnapshot('complete-footer-wide');
     });
 
-    it('renders complete footer on narrow terminal', () => {
+    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)', () => {
       const { lastFrame } = renderWithWidth(79, createMockUIState());
       expect(lastFrame()).toMatchSnapshot('complete-footer-narrow');
     });

packages/cli/src/ui/components/Footer.tsx

@@ -7,134 +7,159 @@
 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,
-    showAutoAcceptIndicator,
+    nightly,
+    isTrustedFolder,
   } = {
     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,
-    showAutoAcceptIndicator: uiState.showAutoAcceptIndicator,
+    nightly: uiState.nightly,
+    isTrustedFolder: uiState.isTrustedFolder,
   };
 
-  const showErrorIndicator = !showErrorDetails && errorCount > 0;
+  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 { columns: terminalWidth } = useTerminalSize();
-  const isNarrow = isNarrowWidth(terminalWidth);
 
-  // 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 pathLength = Math.max(20, Math.floor(terminalWidth * 0.25));
+  const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
 
-  // 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} />,
-    });
-  }
+  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
+  const displayVimMode = vimEnabled ? vimMode : undefined;
 
   return (
     <Box
-      justifyContent="space-between"
+      justifyContent={justifyContent}
       width="100%"
       flexDirection="row"
       alignItems="center"
     >
-      {/* 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>
+      {(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>
+      )}
 
-      {/* 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}
+      {/* 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 />}
           </Box>
-        ))}
-      </Box>
+          <Box alignItems="center" paddingLeft={2}>
+            {!showErrorDetails && errorCount > 0 && (
+              <Box>
+                <Text color={theme.ui.symbol}>| </Text>
+                <ConsoleSummaryDisplay errorCount={errorCount} />
+              </Box>
+            )}
+          </Box>
+        </Box>
+      )}
     </Box>
   );
 };

packages/cli/src/ui/components/Header.test.tsx

@@ -6,96 +6,39 @@
 
 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(() => {
-    // Default to wide terminal (shows both logo and info panel)
-    useTerminalSizeMock.mockReturnValue({ columns: 120, rows: 24 });
+  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);
   });
 
-  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', () => {
+  it('renders custom ASCII art when provided', () => {
     const customArt = 'CUSTOM ART';
     const { lastFrame } = render(
-      <Header {...defaultProps} customAsciiArt={customArt} />,
+      <Header version="1.0.0" nightly={false} customAsciiArt={customArt} />,
     );
     expect(lastFrame()).toContain(customArt);
   });
 
-  it('displays the version number', () => {
-    const { lastFrame } = render(<Header {...defaultProps} />);
+  it('displays the version number when nightly is true', () => {
+    const { lastFrame } = render(<Header version="1.0.0" nightly={true} />);
     expect(lastFrame()).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('╯');
+  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');
   });
 });

packages/cli/src/ui/components/Header.tsx

@@ -7,175 +7,64 @@
 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 } from './AsciiArt.js';
-import { getAsciiArtWidth, getCachedStringWidth } from '../utils/textUtils.js';
+import { shortAsciiLogo, longAsciiLogo, tinyAsciiLogo } from './AsciiArt.js';
+import { getAsciiArtWidth } from '../utils/textUtils.js';
 import { useTerminalSize } from '../hooks/useTerminalSize.js';
 
 interface HeaderProps {
   customAsciiArt?: string; // For user-defined ASCII art
   version: string;
-  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));
-  }
+  nightly: boolean;
 }
 
 export const Header: React.FC<HeaderProps> = ({
   customAsciiArt,
   version,
-  authType,
-  model,
-  workingDirectory,
+  nightly,
 }) => {
   const { columns: terminalWidth } = useTerminalSize();
+  let displayTitle;
+  const widthOfLongLogo = getAsciiArtWidth(longAsciiLogo);
+  const widthOfShortLogo = getAsciiArtWidth(shortAsciiLogo);
 
-  const displayLogo = customAsciiArt ?? shortAsciiLogo;
-  const logoWidth = getAsciiArtWidth(displayLogo);
-  const formattedAuthType = formatAuthType(authType);
+  if (customAsciiArt) {
+    displayTitle = customAsciiArt;
+  } else if (terminalWidth >= widthOfLongLogo) {
+    displayTitle = longAsciiLogo;
+  } else if (terminalWidth >= widthOfShortLogo) {
+    displayTitle = shortAsciiLogo;
+  } else {
+    displayTitle = tinyAsciiLogo;
+  }
 
-  // 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,
-  ];
+  const artWidth = getAsciiArtWidth(displayTitle);
 
   return (
     <Box
-      flexDirection="row"
-      alignItems="center"
-      marginX={containerMarginX}
-      width={availableTerminalWidth}
+      alignItems="flex-start"
+      width={artWidth}
+      flexShrink={0}
+      flexDirection="column"
     >
-      {/* Left side: ASCII logo (only if enough space) */}
-      {showLogo && (
-        <>
-          <Box flexShrink={0}>
-            <Gradient colors={gradientColors}>
-              <Text>{displayLogo}</Text>
-            </Gradient>
-          </Box>
-          {/* Fixed gap between logo and info panel */}
-          <Box width={logoGap} />
-        </>
+      {theme.ui.gradient ? (
+        <Gradient colors={theme.ui.gradient}>
+          <Text>{displayTitle}</Text>
+        </Gradient>
+      ) : (
+        <Text>{displayTitle}</Text>
       )}
-
-      {/* 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>
+      {nightly && (
+        <Box width="100%" flexDirection="row" justifyContent="flex-end">
+          {theme.ui.gradient ? (
+            <Gradient colors={theme.ui.gradient}>
+              <Text>v{version}</Text>
+            </Gradient>
+          ) : (
+            <Text>v{version}</Text>
           )}
-        </Text>
-        {/* Directory line */}
-        <Text color={theme.text.secondary}>{displayPath}</Text>
-      </Box>
+        </Box>
+      )}
     </Box>
   );
 };

packages/cli/src/ui/components/Help.tsx

@@ -12,16 +12,15 @@ import { t } from '../../i18n/index.js';
 
 interface Help {
   commands: readonly SlashCommand[];
-  width?: number;
 }
 
-export const Help: React.FC<Help> = ({ commands, width }) => (
+export const Help: React.FC<Help> = ({ commands }) => (
   <Box
     flexDirection="column"
+    marginBottom={1}
     borderColor={theme.border.default}
     borderStyle="round"
     padding={1}
-    width={width}
   >
     {/* Basics */}
     <Text bold color={theme.text.primary}>

packages/cli/src/ui/components/HistoryItemDisplay.tsx

@@ -38,7 +38,6 @@ interface HistoryItemDisplayProps {
   item: HistoryItem;
   availableTerminalHeight?: number;
   terminalWidth: number;
-  mainAreaWidth?: number;
   isPending: boolean;
   isFocused?: boolean;
   commands?: readonly SlashCommand[];
@@ -51,7 +50,6 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
   item,
   availableTerminalHeight,
   terminalWidth,
-  mainAreaWidth,
   isPending,
   commands,
   isFocused = true,
@@ -60,16 +58,9 @@ 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}
-      marginLeft={2}
-      marginRight={2}
-    >
+    <Box flexDirection="column" key={itemForDisplay.id}>
       {/* Render standard message types */}
       {itemForDisplay.type === 'user' && (
         <UserMessage text={itemForDisplay.text} />
@@ -84,7 +75,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          contentWidth={contentWidth}
+          terminalWidth={terminalWidth}
         />
       )}
       {itemForDisplay.type === 'gemini_content' && (
@@ -94,7 +85,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          contentWidth={contentWidth}
+          terminalWidth={terminalWidth}
         />
       )}
       {itemForDisplay.type === 'gemini_thought' && (
@@ -104,7 +95,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          contentWidth={contentWidth}
+          terminalWidth={terminalWidth}
         />
       )}
       {itemForDisplay.type === 'gemini_thought_content' && (
@@ -114,7 +105,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           availableTerminalHeight={
             availableTerminalHeightGemini ?? availableTerminalHeight
           }
-          contentWidth={contentWidth}
+          terminalWidth={terminalWidth}
         />
       )}
       {itemForDisplay.type === 'info' && (
@@ -127,32 +118,25 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
         <ErrorMessage text={itemForDisplay.text} />
       )}
       {itemForDisplay.type === 'about' && (
-        <AboutBox {...itemForDisplay.systemInfo} width={boxWidth} />
+        <AboutBox {...itemForDisplay.systemInfo} />
       )}
       {itemForDisplay.type === 'help' && commands && (
-        <Help commands={commands} width={boxWidth} />
+        <Help commands={commands} />
       )}
       {itemForDisplay.type === 'stats' && (
-        <StatsDisplay duration={itemForDisplay.duration} width={boxWidth} />
-      )}
-      {itemForDisplay.type === 'model_stats' && (
-        <ModelStatsDisplay width={boxWidth} />
-      )}
-      {itemForDisplay.type === 'tool_stats' && (
-        <ToolStatsDisplay width={boxWidth} />
+        <StatsDisplay duration={itemForDisplay.duration} />
       )}
+      {itemForDisplay.type === 'model_stats' && <ModelStatsDisplay />}
+      {itemForDisplay.type === 'tool_stats' && <ToolStatsDisplay />}
       {itemForDisplay.type === 'quit' && (
-        <SessionSummaryDisplay
-          duration={itemForDisplay.duration}
-          width={boxWidth}
-        />
+        <SessionSummaryDisplay duration={itemForDisplay.duration} />
       )}
       {itemForDisplay.type === 'tool_group' && (
         <ToolGroupMessage
           toolCalls={itemForDisplay.tools}
           groupId={itemForDisplay.id}
           availableTerminalHeight={availableTerminalHeight}
-          contentWidth={contentWidth}
+          terminalWidth={terminalWidth}
           isFocused={isFocused}
           activeShellPtyId={activeShellPtyId}
           embeddedShellFocused={embeddedShellFocused}
@@ -165,7 +149,7 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
       {itemForDisplay.type === 'extensions_list' && <ExtensionsList />}
       {itemForDisplay.type === 'tools_list' && (
         <ToolsList
-          contentWidth={contentWidth}
+          terminalWidth={terminalWidth}
           tools={itemForDisplay.tools}
           showDescriptions={itemForDisplay.showDescriptions}
         />

packages/cli/src/ui/components/InputPrompt.tsx

@@ -52,9 +52,6 @@ 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;
 }
@@ -99,9 +96,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   setShellModeActive,
   approvalMode,
   onEscapePromptChange,
-  onToggleShortcuts,
-  showShortcuts,
-  onSuggestionsVisibilityChange,
   vimHandleInput,
   isEmbeddedShellFocused,
 }) => {
@@ -344,31 +338,11 @@ 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,
@@ -696,8 +670,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       recentPasteTime,
       commandSearchActive,
       commandSearchCompletion,
-      onToggleShortcuts,
-      showShortcuts,
     ],
   );
 
@@ -717,13 +689,6 @@ 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 =
@@ -756,6 +721,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         borderLeft={false}
         borderRight={false}
         borderColor={borderColor}
+        paddingX={1}
       >
         <Text
           color={statusColor ?? theme.text.accent}
@@ -886,7 +852,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         </Box>
       </Box>
       {shouldShowSuggestions && (
-        <Box marginLeft={2} marginRight={2}>
+        <Box paddingRight={2}>
           <SuggestionsDisplay
             suggestions={activeCompletion.suggestions}
             activeIndex={activeCompletion.activeSuggestionIndex}

packages/cli/src/ui/components/KeyboardShortcuts.tsx

@@ -1,118 +0,0 @@
-/**
- * @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.primary}>{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>
-  );
-};

packages/cli/src/ui/components/MainContent.tsx

@@ -23,7 +23,6 @@ export const MainContent = () => {
   const uiState = useUIState();
   const {
     pendingHistoryItems,
-    terminalWidth,
     mainAreaWidth,
     staticAreaMaxItemHeight,
     availableTerminalHeight,
@@ -37,8 +36,7 @@ export const MainContent = () => {
           <AppHeader key="app-header" version={version} />,
           ...uiState.history.map((h) => (
             <HistoryItemDisplay
-              terminalWidth={terminalWidth}
-              mainAreaWidth={mainAreaWidth}
+              terminalWidth={mainAreaWidth}
               availableTerminalHeight={staticAreaMaxItemHeight}
               availableTerminalHeightGemini={MAX_GEMINI_MESSAGE_LINES}
               key={h.id}
@@ -59,8 +57,7 @@ export const MainContent = () => {
               availableTerminalHeight={
                 uiState.constrainHeight ? availableTerminalHeight : undefined
               }
-              terminalWidth={terminalWidth}
-              mainAreaWidth={mainAreaWidth}
+              terminalWidth={mainAreaWidth}
               item={{ ...item, id: 0 }}
               isPending={true}
               isFocused={!uiState.isEditorDialogOpen}

packages/cli/src/ui/components/ModelStatsDisplay.tsx

@@ -50,13 +50,7 @@ const StatRow: React.FC<StatRowProps> = ({
   </Box>
 );
 
-interface ModelStatsDisplayProps {
-  width?: number;
-}
-
-export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
-  width,
-}) => {
+export const ModelStatsDisplay: React.FC = () => {
   const { stats } = useSessionStats();
   const { models } = stats.metrics;
   const activeModels = Object.entries(models).filter(
@@ -70,7 +64,6 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
         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.')}
@@ -100,7 +93,6 @@ export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
       flexDirection="column"
       paddingY={1}
       paddingX={2}
-      width={width}
     >
       <Text bold color={theme.text.accent}>
         {t('Model Stats For Nerds')}

packages/cli/src/ui/components/PlanSummaryDisplay.tsx

@@ -34,7 +34,7 @@ export const PlanSummaryDisplay: React.FC<PlanSummaryDisplayProps> = ({
         text={plan}
         isPending={false}
         availableTerminalHeight={availableHeight}
-        contentWidth={childWidth}
+        terminalWidth={childWidth}
       />
     </Box>
   );

packages/cli/src/ui/components/QuittingDisplay.tsx

@@ -14,7 +14,6 @@ export const QuittingDisplay = () => {
   const { rows: terminalHeight, columns: terminalWidth } = useTerminalSize();
 
   const availableTerminalHeight = terminalHeight;
-  const { mainAreaWidth } = uiState;
 
   if (!uiState.quittingMessages) {
     return null;
@@ -29,7 +28,6 @@ export const QuittingDisplay = () => {
             uiState.constrainHeight ? availableTerminalHeight : undefined
           }
           terminalWidth={terminalWidth}
-          mainAreaWidth={mainAreaWidth}
           item={item}
           isPending={false}
         />

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 (marginX={2})
-  const boxWidth = width - 4;
+  // Calculate box width (width + 6 for border padding)
+  const boxWidth = width + 6;
   // 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(boxWidth - 2)}</Text>
+          <Text color={theme.border.default}>{'─'.repeat(width - 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={boxWidth - 6}
+                  maxPromptWidth={width}
                   prefixChars={PREFIX_CHARS}
                   boldSelectedPrefix={false}
                 />
@@ -223,7 +223,7 @@ export function SessionPicker(props: SessionPickerProps) {
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
+          <Text color={theme.border.default}>{'─'.repeat(width - 2)}</Text>
         </Box>
 
         {/* Footer */}

packages/cli/src/ui/components/SessionSummaryDisplay.tsx

@@ -14,12 +14,10 @@ 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();
@@ -34,7 +32,6 @@ export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
       <StatsDisplay
         title={t('Agent powering down. Goodbye!')}
         duration={duration}
-        width={width}
       />
       {hasMessages && canResume && (
         <Box marginTop={1}>

packages/cli/src/ui/components/SettingsDialog.test.tsx

@@ -28,12 +28,12 @@ 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 {
-  getDialogSettingKeys,
-  getSettingDefinition,
-  saveModifiedSettings,
-  TEST_ONLY,
-} from '../../utils/settingsUtils.js';
+  getSettingsSchema,
+  type SettingDefinition,
+  type SettingsSchemaType,
+} from '../../config/settingsSchema.js';
 
 // Mock the VimModeContext
 const mockToggleVimEnabled = vi.fn();
@@ -210,9 +210,8 @@ describe('SettingsDialog', () => {
 
       const output = lastFrame();
       expect(output).toContain('Settings');
-      // 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)');
+      expect(output).toContain('Apply To');
+      expect(output).toContain('Use Enter to select, Tab to change focus');
     });
 
     it('should accept availableTerminalHeight prop without errors', () => {
@@ -232,7 +231,7 @@ describe('SettingsDialog', () => {
       const output = lastFrame();
       // Should still render properly with the height prop
       expect(output).toContain('Settings');
-      expect(output).toContain('Enter to select');
+      expect(output).toContain('Use Enter to select');
     });
 
     it('should show settings list with default values', () => {
@@ -282,7 +281,7 @@ describe('SettingsDialog', () => {
         stdin.write(TerminalKeys.DOWN_ARROW as string); // Down arrow
       });
 
-      expect(lastFrame()).toContain('● Language');
+      expect(lastFrame()).toContain('● Disable Auto Update');
 
       // The active index should have changed (tested indirectly through behavior)
       unmount();
@@ -343,14 +342,7 @@ describe('SettingsDialog', () => {
 
       await wait();
 
-      const lastKey = getDialogSettingKeys().at(-1);
-      expect(lastKey).toBeDefined();
-
-      const lastLabel = lastKey
-        ? (getSettingDefinition(lastKey)?.label ?? lastKey)
-        : '';
-
-      expect(lastFrame()).toContain(`● ${lastLabel}`);
+      expect(lastFrame()).toContain('● Vision Model Preview');
 
       unmount();
     });
@@ -370,23 +362,19 @@ describe('SettingsDialog', () => {
 
       const { stdin, unmount, lastFrame } = render(component);
 
-      // Wait for initial render and verify we're on Tool Approval Mode (first setting)
-      await waitFor(() => {
-        expect(lastFrame()).toContain('● Tool Approval Mode');
-      });
-
-      // Navigate to Vim Mode setting (third setting - a boolean) and verify we're there
-      act(() => {
-        stdin.write(TerminalKeys.DOWN_ARROW as string); // -> Language
-      });
-      await wait();
-      act(() => {
-        stdin.write(TerminalKeys.DOWN_ARROW as string); // -> Vim Mode
-      });
+      // Wait for initial render and verify we're on Vim Mode (first setting)
       await waitFor(() => {
         expect(lastFrame()).toContain('● Vim Mode');
       });
 
+      // Navigate to Disable Auto Update setting and verify we're there
+      act(() => {
+        stdin.write(TerminalKeys.DOWN_ARROW as string);
+      });
+      await waitFor(() => {
+        expect(lastFrame()).toContain('● Disable Auto Update');
+      });
+
       // Toggle the setting
       act(() => {
         stdin.write(TerminalKeys.ENTER as string);
@@ -404,10 +392,10 @@ describe('SettingsDialog', () => {
       });
 
       expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalledWith(
-        new Set<string>(['general.vimMode']),
+        new Set<string>(['general.disableAutoUpdate']),
         {
           general: {
-            vimMode: true,
+            disableAutoUpdate: true,
           },
         },
         expect.any(LoadedSettings),
@@ -418,10 +406,51 @@ 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();
 
-        // Use real schema - first setting "Tool Approval Mode" is an enum
+        vi.mocked(getSettingsSchema).mockReturnValue(FAKE_SCHEMA);
         const settings = createMockSettings();
         const onSelect = vi.fn();
         const component = (
@@ -430,30 +459,24 @@ describe('SettingsDialog', () => {
           </KeypressProvider>
         );
 
-        const { stdin, unmount, lastFrame } = render(component);
+        const { stdin, unmount } = render(component);
 
-        // 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);
-        });
+        // Press Enter to toggle current setting
+        stdin.write(TerminalKeys.DOWN_ARROW as string);
+        await wait();
+        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>(['tools.approvalMode']),
-          expect.objectContaining({
-            tools: expect.objectContaining({
-              approvalMode: expect.any(String),
-            }),
-          }),
+          new Set<string>(['ui.theme']),
+          {
+            ui: {
+              theme: StringEnum.BAZ,
+            },
+          },
           expect.any(LoadedSettings),
           SettingScope.User,
         );
@@ -463,10 +486,10 @@ describe('SettingsDialog', () => {
 
       it('loops back when reaching the end of an enum', async () => {
         vi.mocked(saveModifiedSettings).mockClear();
-        // Use Tool Approval Mode set to YOLO (last value) to test looping back to first
+        vi.mocked(getSettingsSchema).mockReturnValue(FAKE_SCHEMA);
         const settings = createMockSettings({
-          tools: {
-            approvalMode: 'yolo', // Last enum value
+          ui: {
+            theme: StringEnum.BAZ,
           },
         });
         const onSelect = vi.fn();
@@ -476,30 +499,24 @@ describe('SettingsDialog', () => {
           </KeypressProvider>
         );
 
-        const { stdin, unmount, lastFrame } = render(component);
+        const { stdin, unmount } = render(component);
 
-        // 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);
-        });
+        // Press Enter to toggle current setting
+        stdin.write(TerminalKeys.DOWN_ARROW as string);
+        await wait();
+        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>(['tools.approvalMode']),
-          expect.objectContaining({
-            tools: expect.objectContaining({
-              approvalMode: 'plan', // First enum value after YOLO
-            }),
-          }),
+          new Set<string>(['ui.theme']),
+          {
+            ui: {
+              theme: StringEnum.FOO,
+            },
+          },
           expect.any(LoadedSettings),
           SettingScope.User,
         );
@@ -582,12 +599,12 @@ describe('SettingsDialog', () => {
         expect(lastFrame()).toContain('Vim Mode');
       });
 
-      // 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
+      // 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
 
-      // This test validates the initial state - scope selection is now
-      // accessed via Tab key, not shown alongside settings
+      // This test validates the initial state - scope selection behavior
+      // is complex due to keypress handling, so we focus on state validation
 
       unmount();
     });
@@ -651,12 +668,12 @@ describe('SettingsDialog', () => {
 
       // Wait for initial render
       await waitFor(() => {
-        expect(lastFrame()).toContain('Vim Mode');
+        expect(lastFrame()).toContain('Hide Window Title');
       });
 
-      // Verify the dialog is rendered properly (scope is in separate view)
+      // Verify the dialog is rendered properly
       expect(lastFrame()).toContain('Settings');
-      expect(lastFrame()).not.toContain('Apply To'); // Scope is in a separate view
+      expect(lastFrame()).toContain('Apply To');
 
       // This test validates rendering - escape key behavior depends on complex
       // keypress handling that's difficult to test reliably in this environment
@@ -1004,12 +1021,12 @@ describe('SettingsDialog', () => {
         expect(lastFrame()).toContain('Vim Mode');
       });
 
-      // 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
+      // 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
 
       // This test validates the rendered UI structure for tab navigation
-      // Tab now switches between settings view and scope view
+      // Actual tab behavior testing is complex due to keypress handling
 
       unmount();
     });
@@ -1066,16 +1083,17 @@ describe('SettingsDialog', () => {
         expect(lastFrame()).toContain('Vim Mode');
       });
 
-      // Verify the complete UI is rendered (scope is in separate view)
+      // Verify the complete UI is rendered with all necessary sections
       expect(lastFrame()).toContain('Settings'); // Title
-      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('● 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(
-        '(Use Enter to select, Tab to configure scope)',
+        '(Use Enter to select, Tab to change focus)',
       ); // Help text
 
       // This test validates the complete UI structure is available for user workflow
-      // Scope selection is now accessed via Tab key (view switching like ThemeDialog)
+      // Individual interactions are tested in focused unit tests
 
       unmount();
     });
@@ -1257,6 +1275,7 @@ describe('SettingsDialog', () => {
         ui: {
           hideWindowTitle: true,
           hideTips: true,
+          showMemoryUsage: true,
           showLineNumbers: true,
           showCitations: true,
           accessibility: {
@@ -1305,6 +1324,7 @@ describe('SettingsDialog', () => {
           disableAutoUpdate: true,
         },
         ui: {
+          showMemoryUsage: true,
           hideWindowTitle: false,
         },
         tools: {
@@ -1355,7 +1375,9 @@ describe('SettingsDialog', () => {
             vimMode: true,
             disableAutoUpdate: false,
           },
-          ui: {},
+          ui: {
+            showMemoryUsage: true,
+          },
         },
       );
       const onSelect = vi.fn();
@@ -1416,6 +1438,7 @@ describe('SettingsDialog', () => {
             disableLoadingPhrases: true,
             screenReader: true,
           },
+          showMemoryUsage: true,
           showLineNumbers: true,
         },
         general: {
@@ -1497,6 +1520,7 @@ describe('SettingsDialog', () => {
         ui: {
           hideWindowTitle: false,
           hideTips: false,
+          showMemoryUsage: false,
           showLineNumbers: false,
           showCitations: false,
           accessibility: {

packages/cli/src/ui/components/SettingsDialog.tsx

@@ -4,8 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
-import { useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import type { LoadedSettings, Settings } from '../../config/settings.js';
@@ -58,8 +57,10 @@ export function SettingsDialog({
   // Get vim mode context to sync vim mode changes
   const { vimEnabled, toggleVimEnabled } = useVimMode();
 
-  // Mode state: 'settings' or 'scope' (view switching like ThemeDialog)
-  const [mode, setMode] = useState<'settings' | 'scope'>('settings');
+  // Focus state: 'settings' or 'scope'
+  const [focusSection, setFocusSection] = useState<'settings' | 'scope'>(
+    'settings',
+  );
   // Scope selector state (User by default)
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
     SettingScope.User,
@@ -104,9 +105,7 @@ export function SettingsDialog({
         updated = setPendingSettingValue(key, value, updated);
       } else if (
         (def?.type === 'number' && typeof value === 'number') ||
-        (def?.type === 'string' && typeof value === 'string') ||
-        (def?.type === 'enum' &&
-          (typeof value === 'string' || typeof value === 'number'))
+        (def?.type === 'string' && typeof value === 'string')
       ) {
         updated = setPendingSettingValueAny(key, value, updated);
       }
@@ -157,6 +156,10 @@ export function SettingsDialog({
             );
           }
 
+          setPendingSettings((prev) =>
+            setPendingSettingValue(key, newValue as boolean, prev),
+          );
+
           if (!requiresRestart(key)) {
             const immediateSettings = new Set([key]);
             const immediateSettingsObject = setPendingSettingValueAny(
@@ -378,13 +381,15 @@ export function SettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     handleScopeHighlight(scope);
-    setMode('settings');
+    setFocusSection('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;
 
@@ -392,28 +397,71 @@ export function SettingsDialog({
     availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
   currentAvailableTerminalHeight -= 2; // Top and bottom borders
 
-  // Calculate fixed height (scope selection is now in a separate view, not included here)
-  const totalFixedHeight =
+  // Start with basic fixed height (without scope selection)
+  let 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
-  const availableHeightForSettings = Math.max(
+  let availableHeightForSettings = Math.max(
     1,
     currentAvailableTerminalHeight - totalFixedHeight,
   );
 
-  // Each setting item takes 1 line
-  const maxVisibleItems = Math.max(1, availableHeightForSettings);
+  // 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));
+  }
 
   // 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,
@@ -426,10 +474,10 @@ export function SettingsDialog({
   useKeypress(
     (key) => {
       const { name, ctrl } = key;
-      if (name === 'tab') {
-        setMode((prev) => (prev === 'settings' ? 'scope' : 'settings'));
+      if (name === 'tab' && showScopeSelection) {
+        setFocusSection((prev) => (prev === 'settings' ? 'scope' : 'settings'));
       }
-      if (mode === 'settings') {
+      if (focusSection === 'settings') {
         // If editing, capture input and control keys
         if (editingKey) {
           const definition = getSettingDefinition(editingKey);
@@ -551,18 +599,6 @@ 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'
@@ -739,95 +775,97 @@ export function SettingsDialog({
     <Box
       borderStyle="round"
       borderColor={theme.border.default}
-      flexDirection="column"
+      flexDirection="row"
       padding={1}
       width="100%"
+      height="100%"
     >
-      {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;
+      <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;
 
-            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,
-                );
-                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,
+          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;
             }
-            const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
+          } 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);
 
-            // Generate scope message for this setting
-            const scopeMessage = getScopeMessageForSetting(
+            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,
-              selectedScope,
-              settings,
+              scopeSettings,
+              mergedSettings,
+              modifiedSettings,
+              pendingSettings,
             );
+          }
+          const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
-            return (
-              <Box key={item.value} flexDirection="row" alignItems="center">
+          // Generate scope message for this setting
+          const scopeMessage = getScopeMessageForSetting(
+            item.value,
+            selectedScope,
+            settings,
+          );
+
+          return (
+            <React.Fragment key={item.value}>
+              <Box flexDirection="row" alignItems="center">
                 <Box minWidth={2} flexShrink={0}>
                   <Text
                     color={
@@ -860,32 +898,40 @@ export function SettingsDialog({
                   {displayValue}
                 </Text>
               </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>
   );
 }

packages/cli/src/ui/components/StatsDisplay.tsx

@@ -160,13 +160,11 @@ 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;
@@ -215,7 +213,6 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
       flexDirection="column"
       paddingY={1}
       paddingX={2}
-      width={width}
     >
       {renderTitle()}
       <Box height={1} />

packages/cli/src/ui/components/SuggestionsDisplay.tsx

@@ -42,7 +42,7 @@ export function SuggestionsDisplay({
 }: SuggestionsDisplayProps) {
   if (isLoading) {
     return (
-      <Box width={width}>
+      <Box paddingX={1} 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" width={width}>
+    <Box flexDirection="column" paddingX={1} width={width}>
       {scrollOffset > 0 && <Text color={theme.text.primary}>▲</Text>}
 
       {visibleSuggestions.map((suggestion, index) => {

packages/cli/src/ui/components/ThemeDialog.tsx

@@ -258,7 +258,7 @@ def fibonacci(n):
 + print(f"Hello, {name}!")
 `}
                     availableTerminalHeight={diffHeight}
-                    contentWidth={colorizeCodeWidth}
+                    terminalWidth={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 go back)')}
+            : t('(Use Enter to apply scope, Tab to select theme)')}
         </Text>
       </Box>
     </Box>

packages/cli/src/ui/components/Tips.tsx

@@ -4,33 +4,42 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { useMemo } from 'react';
+import type React 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';
 
-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];
-  }, []);
+interface TipsProps {
+  config: Config;
+}
 
+export const Tips: React.FC<TipsProps> = ({ config }) => {
+  const geminiMdFileCount = config.getGeminiMdFileCount();
   return (
-    <Box marginLeft={2} marginRight={2}>
-      <Text color={theme.text.secondary}>
-        {t('Tips: ')}
-        {t(selectedTip)}
+    <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.')}
       </Text>
     </Box>
   );

packages/cli/src/ui/components/ToolStatsDisplay.tsx

@@ -53,13 +53,7 @@ const StatRow: React.FC<{
   );
 };
 
-interface ToolStatsDisplayProps {
-  width?: number;
-}
-
-export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
-  width,
-}) => {
+export const ToolStatsDisplay: React.FC = () => {
   const { stats } = useSessionStats();
   const { tools } = stats.metrics;
   const activeTools = Object.entries(tools.byName).filter(
@@ -73,7 +67,6 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
         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.')}
@@ -108,7 +101,7 @@ export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
       flexDirection="column"
       paddingY={1}
       paddingX={2}
-      width={width}
+      width={70}
     >
       <Text bold color={theme.text.accent}>
         {t('Tool Stats For Nerds')}

packages/cli/src/ui/components/__snapshots__/Footer.test.tsx.snap

@@ -1,5 +1,11 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-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 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 wide terminal > complete-footer-wide 1`] = `"  ? for shortcuts                                                                0.1% context 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)"`;

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"
 `;

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
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;

packages/cli/src/ui/components/__snapshots__/SettingsDialog.test.tsx.snap

@@ -6,17 +6,30 @@ exports[`SettingsDialog > Snapshot Tests > should render default state correctly
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             false                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             false                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -27,17 +40,30 @@ exports[`SettingsDialog > Snapshot Tests > should render focused on scope select
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             false                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             false                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -48,17 +74,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with accessibility sett
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             true*                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             true*                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            true*                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -69,17 +108,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with all boolean settin
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             false*                                    │
+│                                                                                                  │
+│   Disable Auto Update                                  false*                                    │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false*                                    │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             false*                                    │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false*                                    │
-│   Show Line Numbers in Code                            false*                                    │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false*                                    │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -90,17 +142,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with different scope se
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode (Modified in System)                        false                                     │
+│                                                                                                  │
+│   Disable Auto Update (Modified in System)             false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode (Modified in System)                        false                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -111,17 +176,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with different scope se
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode (Modified in Workspace)                     false                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging (Modified in Workspace)      false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode (Modified in Workspace)                     false                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -132,17 +210,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with file filtering set
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             false                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             false                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -153,17 +244,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with mixed boolean and
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             false*                                    │
+│                                                                                                  │
+│   Disable Auto Update                                  true*                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             false*                                    │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false*                                    │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -174,17 +278,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with tools and security
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             false                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  false                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              false                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             false                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  false                                     │
-│   Show Line Numbers in Code                            false                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    false                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
@@ -195,17 +312,30 @@ exports[`SettingsDialog > Snapshot Tests > should render with various boolean se
 │ > Settings                                                                                       │
 │                                                                                                  │
 │ ▲                                                                                                │
-│ ● Tool Approval Mode                                   Default                                   │
+│ ● Vim Mode                                             true*                                     │
+│                                                                                                  │
+│   Disable Auto Update                                  true*                                     │
+│                                                                                                  │
+│   Debug Keystroke Logging                              true*                                     │
+│                                                                                                  │
 │   Language                                             Auto (detect from system)                 │
-│   Vim Mode                                             true*                                     │
-│   Interactive Shell (PTY)                              false                                     │
-│   Theme                                                Qwen Dark                                 │
-│   Preferred Editor                                                                               │
-│   Auto-connect to IDE                                  true*                                     │
-│   Show Line Numbers in Code                            true*                                     │
+│                                                                                                  │
+│   Terminal Bell                                        true                                      │
+│                                                                                                  │
+│   Output Format                                        Text                                      │
+│                                                                                                  │
+│   Hide Window Title                                    true*                                     │
+│                                                                                                  │
+│   Show Status in Title                                 false                                     │
+│                                                                                                  │
 │ ▼                                                                                                │
 │                                                                                                  │
-│ (Use Enter to select, Tab to configure scope)                                                    │
+│                                                                                                  │
+│   Apply To                                                                                       │
+│ ● User Settings                                                                                  │
+│   Workspace Settings                                                                             │
+│                                                                                                  │
+│ (Use Enter to select, Tab to change focus)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;

packages/cli/src/ui/components/__snapshots__/ThemeDialog.test.tsx.snap

@@ -4,11 +4,10 @@ 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 go back)                                                       │
+│ (Use Enter to apply scope, Tab to select theme)                                                  │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;

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`] = `

packages/cli/src/ui/components/messages/DiffRenderer.test.tsx

@@ -35,7 +35,7 @@ index 0000000..e69de29
         <DiffRenderer
           diffContent={newFileDiffContent}
           filename="test.py"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -63,7 +63,7 @@ index 0000000..e69de29
         <DiffRenderer
           diffContent={newFileDiffContent}
           filename="test.unknown"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -88,7 +88,7 @@ index 0000000..e69de29
 `;
     render(
       <OverflowProvider>
-        <DiffRenderer diffContent={newFileDiffContent} contentWidth={80} />
+        <DiffRenderer diffContent={newFileDiffContent} terminalWidth={80} />
       </OverflowProvider>,
     );
     expect(mockColorizeCode).toHaveBeenCalledWith(
@@ -115,7 +115,7 @@ index 0000001..0000002 100644
         <DiffRenderer
           diffContent={existingFileDiffContent}
           filename="test.txt"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -145,7 +145,7 @@ index 1234567..1234567 100644
         <DiffRenderer
           diffContent={noChangeDiff}
           filename="file.txt"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -156,7 +156,7 @@ index 1234567..1234567 100644
   it('should handle empty diff content', () => {
     const { lastFrame } = render(
       <OverflowProvider>
-        <DiffRenderer diffContent="" contentWidth={80} />
+        <DiffRenderer diffContent="" terminalWidth={80} />
       </OverflowProvider>,
     );
     expect(lastFrame()).toContain('No diff content');
@@ -182,7 +182,7 @@ index 123..456 100644
         <DiffRenderer
           diffContent={diffWithGap}
           filename="file.txt"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -219,7 +219,7 @@ index abc..def 100644
         <DiffRenderer
           diffContent={diffWithSmallGap}
           filename="file.txt"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -291,7 +291,7 @@ index 123..789 100644
             <DiffRenderer
               diffContent={diffWithMultipleHunks}
               filename="multi.js"
-              contentWidth={terminalWidth}
+              terminalWidth={terminalWidth}
               availableTerminalHeight={height}
             />
           </OverflowProvider>,
@@ -323,7 +323,7 @@ fileDiff Index: file.txt
         <DiffRenderer
           diffContent={newFileDiff}
           filename="TEST"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );
@@ -353,7 +353,7 @@ fileDiff Index: Dockerfile
         <DiffRenderer
           diffContent={newFileDiff}
           filename="Dockerfile"
-          contentWidth={80}
+          terminalWidth={80}
         />
       </OverflowProvider>,
     );

packages/cli/src/ui/components/messages/DiffRenderer.tsx

@@ -84,7 +84,7 @@ interface DiffRendererProps {
   filename?: string;
   tabWidth?: number;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
   theme?: Theme;
 }
 
@@ -95,7 +95,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
   filename,
   tabWidth = DEFAULT_TAB_WIDTH,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
   theme,
 }) => {
   const screenReaderEnabled = useIsScreenReaderEnabled();
@@ -155,7 +155,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
       addedContent,
       language,
       availableTerminalHeight,
-      contentWidth,
+      terminalWidth,
       theme,
     );
   } else {
@@ -164,7 +164,7 @@ export const DiffRenderer: React.FC<DiffRendererProps> = ({
       filename,
       tabWidth,
       availableTerminalHeight,
-      contentWidth,
+      terminalWidth,
     );
   }
 
@@ -176,7 +176,7 @@ const renderDiffContent = (
   filename: string | undefined,
   tabWidth = DEFAULT_TAB_WIDTH,
   availableTerminalHeight: number | undefined,
-  contentWidth: number,
+  terminalWidth: 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={contentWidth}
+      maxWidth={terminalWidth}
       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(contentWidth)}
+                {'═'.repeat(terminalWidth)}
               </Text>
             </Box>,
           );

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">
+    <Box flexDirection="row" marginBottom={1}>
       <Box width={prefixWidth}>
         <Text color={theme.status.error}>{prefix}</Text>
       </Box>

packages/cli/src/ui/components/messages/GeminiMessage.tsx

@@ -14,14 +14,14 @@ interface GeminiMessageProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 export const GeminiMessage: React.FC<GeminiMessageProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
 }) => {
   const prefix = '✦ ';
   const prefixWidth = prefix.length;
@@ -38,7 +38,7 @@ export const GeminiMessage: React.FC<GeminiMessageProps> = ({
           text={text}
           isPending={isPending}
           availableTerminalHeight={availableTerminalHeight}
-          contentWidth={contentWidth - prefixWidth}
+          terminalWidth={terminalWidth}
         />
       </Box>
     </Box>

packages/cli/src/ui/components/messages/GeminiMessageContent.tsx

@@ -12,7 +12,7 @@ interface GeminiMessageContentProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 /*
@@ -25,7 +25,7 @@ export const GeminiMessageContent: React.FC<GeminiMessageContentProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
 }) => {
   const originalPrefix = '✦ ';
   const prefixWidth = originalPrefix.length;
@@ -36,7 +36,7 @@ export const GeminiMessageContent: React.FC<GeminiMessageContentProps> = ({
         text={text}
         isPending={isPending}
         availableTerminalHeight={availableTerminalHeight}
-        contentWidth={contentWidth - prefixWidth}
+        terminalWidth={terminalWidth}
       />
     </Box>
   );

packages/cli/src/ui/components/messages/GeminiThoughtMessage.tsx

@@ -13,7 +13,7 @@ interface GeminiThoughtMessageProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 /**
@@ -24,13 +24,13 @@ export const GeminiThoughtMessage: React.FC<GeminiThoughtMessageProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
 }) => {
   const prefix = '✦ ';
   const prefixWidth = prefix.length;
 
   return (
-    <Box flexDirection="row">
+    <Box flexDirection="row" marginBottom={1}>
       <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}
-          contentWidth={contentWidth - prefixWidth}
+          terminalWidth={terminalWidth}
           textColor={theme.text.secondary}
         />
       </Box>

packages/cli/src/ui/components/messages/GeminiThoughtMessageContent.tsx

@@ -13,7 +13,7 @@ interface GeminiThoughtMessageContentProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 /**
@@ -22,17 +22,17 @@ interface GeminiThoughtMessageContentProps {
  */
 export const GeminiThoughtMessageContent: React.FC<
   GeminiThoughtMessageContentProps
-> = ({ text, isPending, availableTerminalHeight, contentWidth }) => {
+> = ({ text, isPending, availableTerminalHeight, terminalWidth }) => {
   const originalPrefix = '✦ ';
   const prefixWidth = originalPrefix.length;
 
   return (
-    <Box flexDirection="column" paddingLeft={prefixWidth}>
+    <Box flexDirection="column" paddingLeft={prefixWidth} marginBottom={1}>
       <MarkdownDisplay
         text={text}
         isPending={isPending}
         availableTerminalHeight={availableTerminalHeight}
-        contentWidth={contentWidth - prefixWidth}
+        terminalWidth={terminalWidth}
         textColor={theme.text.secondary}
       />
     </Box>

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">
+    <Box flexDirection="row" marginBottom={1}>
       <Box width={prefixWidth}>
         <Text color={theme.status.warning}>{prefix}</Text>
       </Box>

packages/cli/src/ui/components/messages/ToolConfirmationMessage.test.tsx

@@ -34,7 +34,7 @@ describe('ToolConfirmationMessage', () => {
         confirmationDetails={confirmationDetails}
         config={mockConfig}
         availableTerminalHeight={30}
-        contentWidth={80}
+        terminalWidth={80}
       />,
     );
 
@@ -58,7 +58,7 @@ describe('ToolConfirmationMessage', () => {
         confirmationDetails={confirmationDetails}
         config={mockConfig}
         availableTerminalHeight={30}
-        contentWidth={80}
+        terminalWidth={80}
       />,
     );
 
@@ -81,7 +81,7 @@ describe('ToolConfirmationMessage', () => {
         confirmationDetails={confirmationDetails}
         config={mockConfig}
         availableTerminalHeight={30}
-        contentWidth={80}
+        terminalWidth={80}
       />,
     );
 
@@ -162,7 +162,7 @@ describe('ToolConfirmationMessage', () => {
             confirmationDetails={details}
             config={mockConfig}
             availableTerminalHeight={30}
-            contentWidth={80}
+            terminalWidth={80}
           />,
         );
 
@@ -180,7 +180,7 @@ describe('ToolConfirmationMessage', () => {
             confirmationDetails={details}
             config={mockConfig}
             availableTerminalHeight={30}
-            contentWidth={80}
+            terminalWidth={80}
           />,
         );
 
@@ -212,7 +212,7 @@ describe('ToolConfirmationMessage', () => {
           confirmationDetails={editConfirmationDetails}
           config={mockConfig}
           availableTerminalHeight={30}
-          contentWidth={80}
+          terminalWidth={80}
         />,
         {
           settings: {
@@ -235,7 +235,7 @@ describe('ToolConfirmationMessage', () => {
           confirmationDetails={editConfirmationDetails}
           config={mockConfig}
           availableTerminalHeight={30}
-          contentWidth={80}
+          terminalWidth={80}
         />,
         {
           settings: {

packages/cli/src/ui/components/messages/ToolConfirmationMessage.tsx

@@ -31,7 +31,7 @@ export interface ToolConfirmationMessageProps {
   config: Config;
   isFocused?: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
   compactMode?: boolean;
 }
 
@@ -42,10 +42,11 @@ export const ToolConfirmationMessage: React.FC<
   config,
   isFocused = true,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
   compactMode = false,
 }) => {
   const { onConfirm } = confirmationDetails;
+  const childWidth = terminalWidth - 2; // 2 for padding
 
   const settings = useSettings();
   const preferredEditor = settings.merged.general?.preferredEditor as
@@ -225,7 +226,7 @@ export const ToolConfirmationMessage: React.FC<
         diffContent={confirmationDetails.fileDiff}
         filename={confirmationDetails.fileName}
         availableTerminalHeight={availableBodyContentHeight()}
-        contentWidth={contentWidth}
+        terminalWidth={childWidth}
       />
     );
   } else if (confirmationDetails.type === 'exec') {
@@ -262,7 +263,7 @@ export const ToolConfirmationMessage: React.FC<
         <Box paddingX={1} marginLeft={1}>
           <MaxSizedBox
             maxHeight={bodyContentHeight}
-            maxWidth={Math.max(contentWidth, 1)}
+            maxWidth={Math.max(childWidth - 4, 1)}
           >
             <Box>
               <Text color={theme.text.link}>{executionProps.command}</Text>
@@ -297,7 +298,7 @@ export const ToolConfirmationMessage: React.FC<
           text={planProps.plan}
           isPending={false}
           availableTerminalHeight={availableBodyContentHeight()}
-          contentWidth={contentWidth}
+          terminalWidth={childWidth}
         />
       </Box>
     );
@@ -396,7 +397,7 @@ export const ToolConfirmationMessage: React.FC<
   }
 
   return (
-    <Box flexDirection="column" padding={1} width={contentWidth}>
+    <Box flexDirection="column" padding={1} width={childWidth}>
       {/* Body Content (Diff Renderer or Command Info) */}
       {/* No separate context display here anymore for edits */}
       <Box flexGrow={1} flexShrink={1} overflow="hidden" marginBottom={1}>

packages/cli/src/ui/components/messages/ToolGroupMessage.test.tsx

@@ -83,7 +83,7 @@ describe('<ToolGroupMessage />', () => {
 
   const baseProps = {
     groupId: 1,
-    contentWidth: 80,
+    terminalWidth: 80,
     isFocused: true,
   };
 
@@ -244,7 +244,7 @@ describe('<ToolGroupMessage />', () => {
         <ToolGroupMessage
           {...baseProps}
           toolCalls={toolCalls}
-          contentWidth={40}
+          terminalWidth={40}
         />,
       );
       expect(lastFrame()).toMatchSnapshot();

packages/cli/src/ui/components/messages/ToolGroupMessage.tsx

@@ -19,7 +19,7 @@ interface ToolGroupMessageProps {
   groupId: number;
   toolCalls: IndividualToolCallDisplay[];
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
   isFocused?: boolean;
   activeShellPtyId?: number | null;
   embeddedShellFocused?: boolean;
@@ -30,7 +30,7 @@ interface ToolGroupMessageProps {
 export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
   toolCalls,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
   isFocused = true,
   activeShellPtyId,
   embeddedShellFocused,
@@ -58,8 +58,9 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         : theme.border.default;
 
   const staticHeight = /* border */ 2 + /* marginBottom */ 1;
-  // account for border (2 chars) and padding (2 chars)
-  const innerWidth = contentWidth - 4;
+  // This is a bit of a magic number, but it accounts for the border and
+  // marginLeft.
+  const innerWidth = terminalWidth - 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
@@ -95,7 +96,8 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
         Ink to render the border of the box incorrectly and span multiple lines and even
         cause tearing.
       */
-      width={contentWidth}
+      width="100%"
+      marginLeft={1}
       borderDimColor={
         hasPending && (!isShellCommand || !isEmbeddedShellFocused)
       }
@@ -110,7 +112,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
               <ToolMessage
                 {...tool}
                 availableTerminalHeight={availableTerminalHeightPerToolMessage}
-                contentWidth={innerWidth}
+                terminalWidth={innerWidth}
                 emphasis={
                   isConfirming
                     ? 'high'
@@ -133,7 +135,7 @@ export const ToolGroupMessage: React.FC<ToolGroupMessageProps> = ({
                   availableTerminalHeight={
                     availableTerminalHeightPerToolMessage
                   }
-                  contentWidth={innerWidth}
+                  terminalWidth={innerWidth}
                 />
               )}
             {tool.outputFile && (

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,
-    contentWidth: 80,
+    terminalWidth: 80,
     confirmationDetails: undefined,
     emphasis: 'medium',
     config: mockConfig,
@@ -241,7 +241,7 @@ describe('<ToolMessage />', () => {
       description: 'Delegate task to subagent',
       resultDisplay: subagentResultDisplay,
       status: ToolCallStatus.Executing,
-      contentWidth: 80,
+      terminalWidth: 80,
       callId: 'test-call-id-2',
       confirmationDetails: undefined,
       config: mockConfig,

packages/cli/src/ui/components/messages/ToolMessage.tsx

@@ -186,7 +186,7 @@ const StringResultRenderer: React.FC<{
           text={displayData}
           isPending={false}
           availableTerminalHeight={availableHeight}
-          contentWidth={childWidth}
+          terminalWidth={childWidth}
         />
       </Box>
     );
@@ -215,13 +215,13 @@ const DiffResultRenderer: React.FC<{
     diffContent={data.fileDiff}
     filename={data.fileName}
     availableTerminalHeight={availableHeight}
-    contentWidth={childWidth}
+    terminalWidth={childWidth}
   />
 );
 
 export interface ToolMessageProps extends IndividualToolCallDisplay {
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
   emphasis?: TextEmphasis;
   renderOutputAsMarkdown?: boolean;
   activeShellPtyId?: number | null;
@@ -235,7 +235,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
   resultDisplay,
   status,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
   emphasis = 'medium',
   renderOutputAsMarkdown = true,
   activeShellPtyId,
@@ -291,7 +291,6 @@ 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
@@ -300,6 +299,8 @@ 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);
 
@@ -332,14 +333,14 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
               <PlanResultRenderer
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
-                childWidth={innerWidth}
+                childWidth={childWidth}
               />
             )}
             {displayRenderer.type === 'task' && config && (
               <SubagentExecutionRenderer
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
-                childWidth={innerWidth}
+                childWidth={childWidth}
                 config={config}
               />
             )}
@@ -347,7 +348,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
               <DiffResultRenderer
                 data={displayRenderer.data}
                 availableHeight={availableHeight}
-                childWidth={innerWidth}
+                childWidth={childWidth}
               />
             )}
             {displayRenderer.type === 'ansi' && (
@@ -361,7 +362,7 @@ export const ToolMessage: React.FC<ToolMessageProps> = ({
                 data={displayRenderer.data}
                 renderAsMarkdown={renderOutputAsMarkdown}
                 availableHeight={availableHeight}
-                childWidth={innerWidth}
+                childWidth={childWidth}
               />
             )}
           </Box>

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">
+    <Box flexDirection="row" marginBottom={1}>
       <Box width={prefixWidth}>
         <Text color={Colors.AccentYellow}>{prefix}</Text>
       </Box>

packages/cli/src/ui/components/messages/__snapshots__/ToolGroupMessage.test.tsx.snap

@@ -1,108 +1,105 @@
 // 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)                                       │
+ ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;

packages/cli/src/ui/components/shared/ScopeSelector.tsx

@@ -45,7 +45,6 @@ export function ScopeSelector({
         {isFocused ? '> ' : '  '}
         {t('Apply To')}
       </Text>
-      <Box height={1} />
       <RadioButtonSelect
         items={scopeItems}
         initialIndex={safeInitialIndex}

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}
-                  contentWidth={childWidth - 4}
+                  terminalWidth={childWidth}
                   compactMode={true}
                   config={config}
                 />
@@ -242,7 +242,7 @@ export const AgentExecutionDisplay: React.FC<AgentExecutionDisplayProps> = ({
             config={config}
             isFocused={true}
             availableTerminalHeight={availableHeight}
-            contentWidth={childWidth - 4}
+            terminalWidth={childWidth}
             compactMode={true}
           />
         </Box>

packages/cli/src/ui/components/views/ToolsList.test.tsx

@@ -33,7 +33,11 @@ const mockTools: ToolDefinition[] = [
 describe('<ToolsList />', () => {
   it('renders correctly with descriptions', () => {
     const { lastFrame } = render(
-      <ToolsList tools={mockTools} showDescriptions={true} contentWidth={40} />,
+      <ToolsList
+        tools={mockTools}
+        showDescriptions={true}
+        terminalWidth={40}
+      />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });
@@ -43,7 +47,7 @@ describe('<ToolsList />', () => {
       <ToolsList
         tools={mockTools}
         showDescriptions={false}
-        contentWidth={40}
+        terminalWidth={40}
       />,
     );
     expect(lastFrame()).toMatchSnapshot();
@@ -51,7 +55,7 @@ describe('<ToolsList />', () => {
 
   it('renders correctly with no tools', () => {
     const { lastFrame } = render(
-      <ToolsList tools={[]} showDescriptions={true} contentWidth={40} />,
+      <ToolsList tools={[]} showDescriptions={true} terminalWidth={40} />,
     );
     expect(lastFrame()).toMatchSnapshot();
   });

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;
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 export const ToolsList: React.FC<ToolsListProps> = ({
   tools,
   showDescriptions,
-  contentWidth,
+  terminalWidth,
 }) => (
-  <Box flexDirection="column">
+  <Box flexDirection="column" marginBottom={1}>
     <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
-                contentWidth={contentWidth}
+                terminalWidth={terminalWidth}
                 text={tool.description}
                 isPending={false}
               />

packages/cli/src/ui/components/views/__snapshots__/ToolsList.test.tsx.snap

@@ -11,13 +11,15 @@ 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`] = `
@@ -25,5 +27,6 @@ exports[`<ToolsList /> > renders correctly without descriptions 1`] = `
 
   - Test Tool One
   - Test Tool Two
-  - Test Tool Three"
+  - Test Tool Three
+"
 `;

packages/cli/src/ui/contexts/UIActionsContext.tsx

@@ -19,8 +19,6 @@ 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,

packages/cli/src/ui/hooks/useGeminiStream.test.tsx

@@ -212,6 +212,7 @@ describe('useGeminiStream', () => {
       geminiMdFileCount: 0,
       alwaysSkipModificationConfirmation: false,
       vertexai: false,
+      showMemoryUsage: false,
       contextFileName: undefined,
       getToolRegistry: vi.fn(
         () => ({ getToolSchemaList: vi.fn(() => []) }) as any,

packages/cli/src/ui/hooks/useTerminalSize.ts

@@ -6,21 +6,19 @@
 
 import { useEffect, useState } from 'react';
 
-/**
- * Returns the actual terminal size without any padding adjustments.
- * Components should handle their own margins/padding as needed.
- */
+const TERMINAL_PADDING_X = 8;
+
 export function useTerminalSize(): { columns: number; rows: number } {
   const [size, setSize] = useState({
-    columns: process.stdout.columns || 80,
-    rows: process.stdout.rows || 24,
+    columns: (process.stdout.columns || 60) - TERMINAL_PADDING_X,
+    rows: process.stdout.rows || 20,
   });
 
   useEffect(() => {
     function updateSize() {
       setSize({
-        columns: process.stdout.columns || 80,
-        rows: process.stdout.rows || 24,
+        columns: (process.stdout.columns || 60) - TERMINAL_PADDING_X,
+        rows: process.stdout.rows || 20,
       });
     }
 

packages/cli/src/ui/layouts/DefaultAppLayout.tsx

@@ -12,26 +12,24 @@ 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 = () => {
+export const DefaultAppLayout: React.FC<{ width?: string }> = ({
+  width = '90%',
+}) => {
   const uiState = useUIState();
-  const { columns: terminalWidth } = useTerminalSize();
 
   return (
-    <Box flexDirection="column" width={terminalWidth}>
+    <Box flexDirection="column" width={width}>
       <MainContent />
 
       <Box flexDirection="column" ref={uiState.mainControlsRef}>
         <Notifications />
 
         {uiState.dialogsVisible ? (
-          <Box marginX={2} flexDirection="column" width={uiState.mainAreaWidth}>
-            <DialogManager
-              terminalWidth={uiState.terminalWidth}
-              addItem={uiState.historyManager.addItem}
-            />
-          </Box>
+          <DialogManager
+            terminalWidth={uiState.terminalWidth}
+            addItem={uiState.historyManager.addItem}
+          />
         ) : (
           <Composer />
         )}

packages/cli/src/ui/layouts/ScreenReaderAppLayout.tsx

@@ -25,12 +25,10 @@ export const ScreenReaderAppLayout: React.FC = () => {
         <MainContent />
       </Box>
       {uiState.dialogsVisible ? (
-        <Box marginX={2} flexDirection="column" width={uiState.mainAreaWidth}>
-          <DialogManager
-            terminalWidth={uiState.terminalWidth}
-            addItem={uiState.historyManager.addItem}
-          />
-        </Box>
+        <DialogManager
+          terminalWidth={uiState.terminalWidth}
+          addItem={uiState.historyManager.addItem}
+        />
       ) : (
         <Composer />
       )}

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,
-    contentWidth: 80,
+    terminalWidth: 80,
     availableTerminalHeight: 40,
   };
 

packages/cli/src/ui/utils/MarkdownDisplay.tsx

@@ -16,7 +16,7 @@ interface MarkdownDisplayProps {
   text: string;
   isPending: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
   textColor?: string;
 }
 
@@ -31,7 +31,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
   text,
   isPending,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
   textColor = theme.text.primary,
 }) => {
   if (!text) return <></>;
@@ -79,7 +79,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
             lang={codeBlockLang}
             isPending={isPending}
             availableTerminalHeight={availableTerminalHeight}
-            contentWidth={contentWidth}
+            terminalWidth={terminalWidth}
           />,
         );
         inCodeBlock = false;
@@ -144,7 +144,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
             key={`table-${contentBlocks.length}`}
             headers={tableHeaders}
             rows={tableRows}
-            contentWidth={contentWidth}
+            terminalWidth={terminalWidth}
           />,
         );
       }
@@ -266,7 +266,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         lang={codeBlockLang}
         isPending={isPending}
         availableTerminalHeight={availableTerminalHeight}
-        contentWidth={contentWidth}
+        terminalWidth={terminalWidth}
       />,
     );
   }
@@ -278,7 +278,7 @@ const MarkdownDisplayInternal: React.FC<MarkdownDisplayProps> = ({
         key={`table-${contentBlocks.length}`}
         headers={tableHeaders}
         rows={tableRows}
-        contentWidth={contentWidth}
+        terminalWidth={terminalWidth}
       />,
     );
   }
@@ -293,7 +293,7 @@ interface RenderCodeBlockProps {
   lang: string | null;
   isPending: boolean;
   availableTerminalHeight?: number;
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
@@ -301,7 +301,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
   lang,
   isPending,
   availableTerminalHeight,
-  contentWidth,
+  terminalWidth,
 }) => {
   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,
-        contentWidth - CODE_BLOCK_PREFIX_PADDING,
+        terminalWidth - CODE_BLOCK_PREFIX_PADDING,
         undefined,
         settings,
       );
@@ -347,7 +347,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
     fullContent,
     lang,
     availableTerminalHeight,
-    contentWidth - CODE_BLOCK_PREFIX_PADDING,
+    terminalWidth - CODE_BLOCK_PREFIX_PADDING,
     undefined,
     settings,
   );
@@ -356,7 +356,7 @@ const RenderCodeBlockInternal: React.FC<RenderCodeBlockProps> = ({
     <Box
       paddingLeft={CODE_BLOCK_PREFIX_PADDING}
       flexDirection="column"
-      width={contentWidth}
+      width={terminalWidth}
       flexShrink={0}
     >
       {colorizedCode}
@@ -407,15 +407,15 @@ const RenderListItem = React.memo(RenderListItemInternal);
 interface RenderTableProps {
   headers: string[];
   rows: string[][];
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 const RenderTableInternal: React.FC<RenderTableProps> = ({
   headers,
   rows,
-  contentWidth,
+  terminalWidth,
 }) => (
-  <TableRenderer headers={headers} rows={rows} contentWidth={contentWidth} />
+  <TableRenderer headers={headers} rows={rows} terminalWidth={terminalWidth} />
 );
 
 const RenderTable = React.memo(RenderTableInternal);

packages/cli/src/ui/utils/TableRenderer.tsx

@@ -12,7 +12,7 @@ import { RenderInline, getPlainTextLength } from './InlineMarkdownRenderer.js';
 interface TableRendererProps {
   headers: string[];
   rows: string[][];
-  contentWidth: number;
+  terminalWidth: number;
 }
 
 /**
@@ -22,7 +22,7 @@ interface TableRendererProps {
 export const TableRenderer: React.FC<TableRendererProps> = ({
   headers,
   rows,
-  contentWidth,
+  terminalWidth,
 }) => {
   // Calculate column widths using actual display width after markdown processing
   const columnWidths = headers.map((header, index) => {
@@ -35,7 +35,8 @@ 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 > contentWidth ? contentWidth / totalWidth : 1;
+  const scaleFactor =
+    totalWidth > terminalWidth ? terminalWidth / totalWidth : 1;
   const adjustedWidths = columnWidths.map((width) =>
     Math.floor(width * scaleFactor),
   );

packages/cli/src/utils/commentJson.test.ts

@@ -8,7 +8,10 @@ import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { updateSettingsFilePreservingFormat } from './commentJson.js';
+import {
+  updateSettingsFilePreservingFormat,
+  applyUpdates,
+} from './commentJson.js';
 
 describe('commentJson', () => {
   let tempDir: string;
@@ -180,3 +183,18 @@ describe('commentJson', () => {
     });
   });
 });
+
+describe('applyUpdates', () => {
+  it('should apply updates correctly', () => {
+    const original = { a: 1, b: { c: 2 } };
+    const updates = { b: { c: 3 } };
+    const result = applyUpdates(original, updates);
+    expect(result).toEqual({ a: 1, b: { c: 3 } });
+  });
+  it('should apply updates correctly when empty', () => {
+    const original = { a: 1, b: { c: 2 } };
+    const updates = { b: {} };
+    const result = applyUpdates(original, updates);
+    expect(result).toEqual({ a: 1, b: {} });
+  });
+});

packages/cli/src/utils/commentJson.ts

@@ -38,7 +38,7 @@ export function updateSettingsFilePreservingFormat(
   fs.writeFileSync(filePath, updatedContent, 'utf-8');
 }
 
-function applyUpdates(
+export function applyUpdates(
   current: Record<string, unknown>,
   updates: Record<string, unknown>,
 ): Record<string, unknown> {
@@ -50,6 +50,7 @@ function applyUpdates(
       typeof value === 'object' &&
       value !== null &&
       !Array.isArray(value) &&
+      Object.keys(value).length > 0 &&
       typeof result[key] === 'object' &&
       result[key] !== null &&
       !Array.isArray(result[key])

packages/cli/src/utils/modelConfigUtils.ts

@@ -120,7 +120,7 @@ export function resolveCliGenerationConfig(
 
   // Log warnings if any
   for (const warning of resolved.warnings) {
-    console.warn(warning);
+    console.warn(`[modelProviderUtils] ${warning}`);
   }
 
   // Resolve OpenAI logging config (CLI-specific, not part of core resolver)

packages/cli/src/utils/settingsUtils.test.ts

@@ -110,7 +110,6 @@ describe('SettingsUtils', () => {
             category: 'UI',
             default: false,
             requiresRestart: true,
-            showInDialog: true,
           },
           accessibility: {
             type: 'object',

packages/cli/src/utils/settingsUtils.ts

@@ -249,76 +249,12 @@ export function getDialogSettingsByType(
 }
 
 /**
- * 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',
-
-  // Editor/Shell Experience
-  'general.vimMode',
-  'tools.shell.enableInteractiveShell',
-
-  // Display Preferences
-  'ui.theme',
-  '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
+ * Get all setting keys that should be shown in the dialog
  */
 export function getDialogSettingKeys(): string[] {
-  const dialogSettings = Object.values(getFlattenedSchema())
-    .filter((definition) => definition.showInDialog === true)
+  return Object.values(getFlattenedSchema())
+    .filter((definition) => definition.showInDialog !== false)
     .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;
-  });
 }
 
 // ============================================================================

packages/core/src/config/config.test.ts

@@ -157,25 +157,6 @@ 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({

packages/core/src/config/config.ts

@@ -290,6 +290,7 @@ export interface ConfigParameters {
   userMemory?: string;
   geminiMdFileCount?: number;
   approvalMode?: ApprovalMode;
+  showMemoryUsage?: boolean;
   contextFileName?: string | string[];
   accessibility?: AccessibilitySettings;
   telemetry?: TelemetrySettings;
@@ -433,6 +434,7 @@ 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;
@@ -537,6 +539,7 @@ 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,
@@ -1078,6 +1081,10 @@ export class Config {
     this.approvalMode = mode;
   }
 
+  getShowMemoryUsage(): boolean {
+    return this.showMemoryUsage;
+  }
+
   getInputFormat(): 'text' | 'stream-json' {
     return this.inputFormat;
   }

packages/core/src/core/openaiContentGenerator/openaiContentGenerator.test.ts

@@ -173,19 +173,17 @@ describe('OpenAIContentGenerator (Refactored)', () => {
   });
 
   describe('shouldSuppressErrorLogging', () => {
-    // Create a test subclass to access the protected method
-    class TestGenerator extends OpenAIContentGenerator {
-      testShouldSuppressErrorLogging(
-        error: unknown,
-        request: GenerateContentParameters,
-      ): boolean {
-        return this.shouldSuppressErrorLogging(error, request);
+    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);
+        }
       }
-    }
 
-    let testGenerator: TestGenerator;
-
-    beforeEach(() => {
       const contentGeneratorConfig = {
         model: 'gpt-4',
         apiKey: 'test-key',
@@ -217,14 +215,12 @@ describe('OpenAIContentGenerator (Refactored)', () => {
         getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
       };
 
-      testGenerator = new TestGenerator(
+      const 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',
@@ -238,114 +234,8 @@ 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 CustomTestGenerator extends OpenAIContentGenerator {
+      class TestGenerator extends OpenAIContentGenerator {
         testShouldSuppressErrorLogging(
           error: unknown,
           request: GenerateContentParameters,
@@ -392,7 +282,7 @@ describe('OpenAIContentGenerator (Refactored)', () => {
         getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
       };
 
-      const customGenerator = new CustomTestGenerator(
+      const testGenerator = new TestGenerator(
         contentGeneratorConfig,
         mockConfig,
         mockProvider,
@@ -403,7 +293,7 @@ describe('OpenAIContentGenerator (Refactored)', () => {
         model: 'gpt-4',
       };
 
-      const result = customGenerator.testShouldSuppressErrorLogging(
+      const result = testGenerator.testShouldSuppressErrorLogging(
         new Error('Test error'),
         request,
       );