Merge branch 'main' into feat/cli-welcome-screen

feat: add user feedback dialog

docs/users/configuration/auth.md

@@ -5,11 +5,13 @@ Qwen Code supports two authentication methods. Pick the one that matches how you
 - **Qwen OAuth (recommended)**: sign in with your `qwen.ai` account in a browser.
 - **OpenAI-compatible API**: use an API key (OpenAI or any OpenAI-compatible provider / endpoint).
 
+![](https://img.alicdn.com/imgextra/i2/O1CN01IxI1bt1sNO543AVTT_!!6000000005754-0-tps-1958-822.jpg)
+
 ## Option 1: Qwen OAuth (recommended & free) 👍
 
-Use this if you want the simplest setup and you’re using Qwen models.
+Use this if you want the simplest setup and you're using Qwen models.
 
-- **How it works**: on first start, Qwen Code opens a browser login page. After you finish, credentials are cached locally so you usually won’t need to log in again.
+- **How it works**: on first start, Qwen Code opens a browser login page. After you finish, credentials are cached locally so you usually won't need to log in again.
 - **Requirements**: a `qwen.ai` account + internet access (at least for the first login).
 - **Benefits**: no API key management, automatic credential refresh.
 - **Cost & quota**: free, with a quota of **60 requests/minute** and **2,000 requests/day**.
@@ -24,15 +26,54 @@ qwen
 
 Use this if you want to use OpenAI models or any provider that exposes an OpenAI-compatible API (e.g. OpenAI, Azure OpenAI, OpenRouter, ModelScope, Alibaba Cloud Bailian, or a self-hosted compatible endpoint).
 
-### Quick start (interactive, recommended for local use)
+### Recommended: Coding Plan (subscription-based) 🚀
 
-When you choose the OpenAI-compatible option in the CLI, it will prompt you for:
+Use this if you want predictable costs with higher usage quotas for the qwen3-coder-plus model.
 
-- **API key**
-- **Base URL** (default: `https://api.openai.com/v1`)
-- **Model** (default: `gpt-4o`)
+> [!IMPORTANT]
+>
+> Coding Plan is only available for users in China mainland (Beijing region).
 
-> **Note:** the CLI may display the key in plain text for verification. Make sure your terminal is not being recorded or shared.
+- **How it works**: subscribe to the Coding Plan with a fixed monthly fee, then configure Qwen Code to use the dedicated endpoint and your subscription API key.
+- **Requirements**: an active Coding Plan subscription from [Alibaba Cloud Bailian](https://bailian.console.aliyun.com/cn-beijing/?tab=globalset#/efm/coding_plan).
+- **Benefits**: higher usage quotas, predictable monthly costs, access to latest qwen3-coder-plus model.
+- **Cost & quota**: varies by plan (see table below).
+
+#### Coding Plan Pricing & Quotas
+
+| Feature             | Lite Basic Plan       | Pro Advanced Plan     |
+| :------------------ | :-------------------- | :-------------------- |
+| **Price**           | ¥40/month             | ¥200/month            |
+| **5-Hour Limit**    | Up to 1,200 requests  | Up to 6,000 requests  |
+| **Weekly Limit**    | Up to 9,000 requests  | Up to 45,000 requests |
+| **Monthly Limit**   | Up to 18,000 requests | Up to 90,000 requests |
+| **Supported Model** | qwen3-coder-plus      | qwen3-coder-plus      |
+
+#### Quick Setup for Coding Plan
+
+When you select the OpenAI-compatible option in the CLI, enter these values:
+
+- **API key**: `sk-sp-xxxxx`
+- **Base URL**: `https://coding.dashscope.aliyuncs.com/v1`
+- **Model**: `qwen3-coder-plus`
+
+> **Note**: Coding Plan API keys have the format `sk-sp-xxxxx`, which is different from standard Alibaba Cloud API keys.
+
+#### Configure via Environment Variables
+
+Set these environment variables to use Coding Plan:
+
+```bash
+export OPENAI_API_KEY="your-coding-plan-api-key"  # Format: sk-sp-xxxxx
+export OPENAI_BASE_URL="https://coding.dashscope.aliyuncs.com/v1"
+export OPENAI_MODEL="qwen3-coder-plus"
+```
+
+For more details about Coding Plan, including subscription options and troubleshooting, see the [full Coding Plan documentation](https://bailian.console.aliyun.com/cn-beijing/?tab=doc#/doc/?type=model&url=3005961).
+
+### Other OpenAI-compatible Providers
+
+If you are using other providers (OpenAI, Azure, local LLMs, etc.), use the following configuration methods.
 
 ### Configure via command-line arguments
 

docs/users/configuration/settings.md

@@ -74,9 +74,6 @@ Settings are organized into categories. All settings should be placed within the
 | `ui.customThemes`                        | object           | Custom theme definitions.                                                                                                                                                                                                                                                                                                                                                                                           | `{}`        |
 | `ui.hideWindowTitle`                     | boolean          | Hide the window title bar.                                                                                                                                                                                                                                                                                                                                                                                          | `false`     |
 | `ui.hideTips`                            | boolean          | Hide helpful tips in the UI.                                                                                                                                                                                                                                                                                                                                                                                        | `false`     |
-| `ui.hideBanner`                          | boolean          | Hide the application banner.                                                                                                                                                                                                                                                                                                                                                                                        | `false`     |
-| `ui.hideFooter`                          | boolean          | Hide the footer from the UI.                                                                                                                                                                                                                                                                                                                                                                                        | `false`     |
-| `ui.showMemoryUsage`                     | boolean          | Display memory usage information in the UI.                                                                                                                                                                                                                                                                                                                                                                         | `false`     |
 | `ui.showLineNumbers`                     | boolean          | Show line numbers in code blocks in the CLI output.                                                                                                                                                                                                                                                                                                                                                                 | `true`      |
 | `ui.showCitations`                       | boolean          | Show citations for generated text in the chat.                                                                                                                                                                                                                                                                                                                                                                      | `true`      |
 | `enableWelcomeBack`                      | boolean          | Show welcome back dialog when returning to a project with conversation history. When enabled, Qwen Code will automatically detect if you're returning to a project with a previously generated project summary (`.qwen/PROJECT_SUMMARY.md`) and show a dialog allowing you to continue your previous conversation or start fresh. This feature integrates with the `/summary` command and quit confirmation dialog. | `true`      |
@@ -241,7 +238,6 @@ Per-field precedence for `generationConfig`:
 | ------------------------------------------------- | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
 | `context.fileName`                                | string or array of strings | The name of the context file(s).                                                                                                                                                                                                                                                                                                                                      | `undefined` |
 | `context.importFormat`                            | string                     | The format to use when importing memory.                                                                                                                                                                                                                                                                                                                              | `undefined` |
-| `context.discoveryMaxDirs`                        | number                     | Maximum number of directories to search for memory.                                                                                                                                                                                                                                                                                                                   | `200`       |
 | `context.includeDirectories`                      | array                      | Additional directories to include in the workspace context. Specifies an array of additional absolute or relative paths to include in the workspace context. Missing directories will be skipped with a warning by default. Paths can use `~` to refer to the user's home directory. This setting can be combined with the `--include-directories` command-line flag. | `[]`        |
 | `context.loadFromIncludeDirectories`              | boolean                    | Controls the behavior of the `/memory refresh` command. If set to `true`, `QWEN.md` files should be loaded from all directories that are added. If set to `false`, `QWEN.md` should only be loaded from the current directory.                                                                                                                                        | `false`     |
 | `context.fileFiltering.respectGitIgnore`          | boolean                    | Respect .gitignore files when searching.                                                                                                                                                                                                                                                                                                                              | `true`      |
@@ -274,7 +270,6 @@ If you are experiencing performance issues with file searching (e.g., with `@` c
 | `tools.enableToolOutputTruncation`   | boolean           | Enable truncation of large tool outputs.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `true`      | Requires restart: Yes                                                                                                                                                                                                                                |
 | `tools.truncateToolOutputThreshold`  | number            | Truncate tool output if it is larger than this many characters. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `25000`     | Requires restart: Yes                                                                                                                                                                                                                                |
 | `tools.truncateToolOutputLines`      | number            | Maximum lines or entries kept when truncating tool output. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `1000`      | Requires restart: Yes                                                                                                                                                                                                                                |
-| `tools.autoAccept`                   | boolean           | Controls whether the CLI automatically accepts and executes tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation. If set to `true`, the CLI will bypass the confirmation prompt for tools deemed safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `false`     |                                                                                                                                                                                                                                                      |
 
 #### mcp
 
@@ -311,6 +306,12 @@ If you are experiencing performance issues with file searching (e.g., with `@` c
 >
 > **Note about advanced.tavilyApiKey:** This is a legacy configuration format. For Qwen OAuth users, DashScope provider is automatically available without any configuration. For other authentication types, configure Tavily or Google providers using the new `webSearch` configuration format.
 
+#### experimental
+
+| Setting               | Type    | Description                      | Default |
+| --------------------- | ------- | -------------------------------- | ------- |
+| `experimental.skills` | boolean | Enable experimental Agent Skills | `false` |
+
 #### mcpServers
 
 Configures connections to one or more Model-Context Protocol (MCP) servers for discovering and using custom tools. Qwen Code attempts to connect to each configured MCP server to discover available tools. If multiple MCP servers expose a tool with the same name, the tool names will be prefixed with the server alias you defined in the configuration (e.g., `serverAlias__actualToolName`) to avoid conflicts. Note that the system might strip certain schema properties from MCP tool definitions for compatibility. At least one of `command`, `url`, or `httpUrl` must be provided. If multiple are specified, the order of precedence is `httpUrl`, then `url`, then `command`.
@@ -356,7 +357,6 @@ Here is an example of a `settings.json` file with the nested structure, new as o
   },
   "ui": {
     "theme": "GitHub",
-    "hideBanner": true,
     "hideTips": false,
     "customWittyPhrases": [
       "You forget a thousand things every day. Make sure this is one of 'em",
@@ -529,16 +529,13 @@ Here's a conceptual example of what a context file at the root of a TypeScript p
 
 This example demonstrates how you can provide general project context, specific coding conventions, and even notes about particular files or components. The more relevant and precise your context files are, the better the AI can assist you. Project-specific context files are highly encouraged to establish conventions and context.
 
-- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated hierarchical memory system by loading context files (e.g., `QWEN.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
+- **Hierarchical Loading and Precedence:** The CLI implements a hierarchical memory system by loading context files (e.g., `QWEN.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
   1. **Global Context File:**
      - Location: `~/.qwen/<configured-context-filename>` (e.g., `~/.qwen/QWEN.md` in your user home directory).
      - Scope: Provides default instructions for all your projects.
   2. **Project Root & Ancestors Context Files:**
      - Location: The CLI searches for the configured context file in the current working directory and then in each parent directory up to either the project root (identified by a `.git` folder) or your home directory.
      - Scope: Provides context relevant to the entire project or a significant portion of it.
-  3. **Sub-directory Context Files (Contextual/Local):**
-     - Location: The CLI also scans for the configured context file in subdirectories _below_ the current working directory (respecting common ignore patterns like `node_modules`, `.git`, etc.). The breadth of this search is limited to 200 directories by default, but can be configured with the `context.discoveryMaxDirs` setting in your `settings.json` file.
-     - Scope: Allows for highly specific instructions relevant to a particular component, module, or subsection of your project.
 - **Concatenation & UI Indication:** The contents of all found context files are concatenated (with separators indicating their origin and path) and provided as part of the system prompt. The CLI footer displays the count of loaded context files, giving you a quick visual cue about the active instructional context.
 - **Importing Content:** You can modularize your context files by importing other Markdown files using the `@path/to/file.md` syntax. For more details, see the [Memory Import Processor documentation](../configuration/memory).
 - **Commands for Memory Management:**

docs/users/features/skills.md

@@ -11,12 +11,29 @@ This guide shows you how to create, use, and manage Agent Skills in **Qwen Code*
 ## Prerequisites
 
 - Qwen Code (recent version)
-- Run with the experimental flag enabled:
+
+## How to enable
+
+### Via CLI flag
 
 ```bash
 qwen --experimental-skills
 ```
 
+### Via settings.json
+
+Add to your `~/.qwen/settings.json` or project's `.qwen/settings.json`:
+
+```json
+{
+  "tools": {
+    "experimental": {
+      "skills": true
+    }
+  }
+}
+```
+
 - Basic familiarity with Qwen Code ([Quickstart](../quickstart.md))
 
 ## What are Agent Skills?

docs/users/reference/keyboard-shortcuts.md

@@ -20,6 +20,7 @@ This document lists the available keyboard shortcuts in Qwen Code.
 | Shortcut                                           | Description                                                                                                                         |
 | -------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
 | `!`                                                | Toggle shell mode when the input is empty.                                                                                          |
+| `?`                                                | Toggle keyboard shortcuts display when the input is empty.                                                                          |
 | `\` (at end of line) + `Enter`                     | Insert a newline.                                                                                                                   |
 | `Down Arrow`                                       | Navigate down through the input history.                                                                                            |
 | `Enter`                                            | Submit the current prompt.                                                                                                          |
@@ -38,6 +39,7 @@ This document lists the available keyboard shortcuts in Qwen Code.
 | `Ctrl+Left Arrow` / `Meta+Left Arrow` / `Meta+B`   | Move the cursor one word to the left.                                                                                               |
 | `Ctrl+N`                                           | Navigate down through the input history.                                                                                            |
 | `Ctrl+P`                                           | Navigate up through the input history.                                                                                              |
+| `Ctrl+R`                                           | Reverse search through input/shell history.                                                                                         |
 | `Ctrl+Right Arrow` / `Meta+Right Arrow` / `Meta+F` | Move the cursor one word to the right.                                                                                              |
 | `Ctrl+U`                                           | Delete from the cursor to the beginning of the line.                                                                                |
 | `Ctrl+V`                                           | Paste clipboard content. If the clipboard contains an image, it will be saved and a reference to it will be inserted in the prompt. |

eslint.config.js

@@ -26,7 +26,6 @@ export default tseslint.config(
       'dist/**',
       'docs-site/.next/**',
       'docs-site/out/**',
-      'packages/cli/src/services/insight-page/**',
     ],
   },
   eslint.configs.recommended,

integration-tests/acp-integration.test.ts

@@ -311,9 +311,9 @@ function setupAcpTest(
     }
   });
 
-  it('returns modes on initialize and allows setting approval mode', async () => {
+  it('returns modes on initialize and allows setting mode and model', async () => {
     const rig = new TestRig();
-    rig.setup('acp approval mode');
+    rig.setup('acp mode and model');
 
     const { sendRequest, cleanup, stderr } = setupAcpTest(rig);
 
@@ -366,8 +366,14 @@ function setupAcpTest(
       const newSession = (await sendRequest('session/new', {
         cwd: rig.testDir!,
         mcpServers: [],
-      })) as { sessionId: string };
+      })) as {
+        sessionId: string;
+        models: {
+          availableModels: Array<{ modelId: string }>;
+        };
+      };
       expect(newSession.sessionId).toBeTruthy();
+      expect(newSession.models.availableModels.length).toBeGreaterThan(0);
 
       // Test 4: Set approval mode to 'yolo'
       const setModeResult = (await sendRequest('session/set_mode', {
@@ -392,6 +398,15 @@ function setupAcpTest(
       })) as { modeId: string };
       expect(setModeResult3).toBeDefined();
       expect(setModeResult3.modeId).toBe('default');
+
+      // Test 7: Set model using first available model
+      const firstModel = newSession.models.availableModels[0];
+      const setModelResult = (await sendRequest('session/set_model', {
+        sessionId: newSession.sessionId,
+        modelId: firstModel.modelId,
+      })) as { modelId: string };
+      expect(setModelResult).toBeDefined();
+      expect(setModelResult.modelId).toBeTruthy();
     } catch (e) {
       if (stderr.length) {
         console.error('Agent stderr:', stderr.join(''));

package.json

@@ -125,7 +125,7 @@
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
       "prettier --write",
-      "eslint --fix --max-warnings 0 --no-warn-ignored"
+      "eslint --fix --max-warnings 0"
     ],
     "*.{json,md}": [
       "prettier --write"

packages/cli/src/acp-integration/acp.ts

@@ -70,6 +70,13 @@ export class AgentSideConnection implements Client {
           const validatedParams = schema.setModeRequestSchema.parse(params);
           return agent.setMode(validatedParams);
         }
+        case schema.AGENT_METHODS.session_set_model: {
+          if (!agent.setModel) {
+            throw RequestError.methodNotFound();
+          }
+          const validatedParams = schema.setModelRequestSchema.parse(params);
+          return agent.setModel(validatedParams);
+        }
         default:
           throw RequestError.methodNotFound(method);
       }
@@ -408,4 +415,5 @@ export interface Agent {
   prompt(params: schema.PromptRequest): Promise<schema.PromptResponse>;
   cancel(params: schema.CancelNotification): Promise<void>;
   setMode?(params: schema.SetModeRequest): Promise<schema.SetModeResponse>;
+  setModel?(params: schema.SetModelRequest): Promise<schema.SetModelResponse>;
 }

packages/cli/src/acp-integration/acpAgent.ts

@@ -165,30 +165,11 @@ class GeminiAgent {
     this.setupFileSystem(config);
 
     const session = await this.createAndStoreSession(config);
-    const configuredModel = (
-      config.getModel() ||
-      this.config.getModel() ||
-      ''
-    ).trim();
-    const modelId = configuredModel || 'default';
-    const modelName = configuredModel || modelId;
+    const availableModels = this.buildAvailableModels(config);
 
     return {
       sessionId: session.getId(),
-      models: {
-        currentModelId: modelId,
-        availableModels: [
-          {
-            modelId,
-            name: modelName,
-            description: null,
-            _meta: {
-              contextLimit: tokenLimit(modelId),
-            },
-          },
-        ],
-        _meta: null,
-      },
+      models: availableModels,
     };
   }
 
@@ -305,15 +286,29 @@ class GeminiAgent {
   async setMode(params: acp.SetModeRequest): Promise<acp.SetModeResponse> {
     const session = this.sessions.get(params.sessionId);
     if (!session) {
-      throw new Error(`Session not found: ${params.sessionId}`);
+      throw acp.RequestError.invalidParams(
+        `Session not found for id: ${params.sessionId}`,
+      );
     }
     return session.setMode(params);
   }
 
+  async setModel(params: acp.SetModelRequest): Promise<acp.SetModelResponse> {
+    const session = this.sessions.get(params.sessionId);
+    if (!session) {
+      throw acp.RequestError.invalidParams(
+        `Session not found for id: ${params.sessionId}`,
+      );
+    }
+    return session.setModel(params);
+  }
+
   private async ensureAuthenticated(config: Config): Promise<void> {
     const selectedType = this.settings.merged.security?.auth?.selectedType;
     if (!selectedType) {
-      throw acp.RequestError.authRequired('No Selected Type');
+      throw acp.RequestError.authRequired(
+        'Use Qwen Code CLI to authenticate first.',
+      );
     }
 
     try {
@@ -382,4 +377,43 @@ class GeminiAgent {
 
     return session;
   }
+
+  private buildAvailableModels(
+    config: Config,
+  ): acp.NewSessionResponse['models'] {
+    const currentModelId = (
+      config.getModel() ||
+      this.config.getModel() ||
+      ''
+    ).trim();
+    const availableModels = config.getAvailableModels();
+
+    const mappedAvailableModels = availableModels.map((model) => ({
+      modelId: model.id,
+      name: model.label,
+      description: model.description ?? null,
+      _meta: {
+        contextLimit: tokenLimit(model.id),
+      },
+    }));
+
+    if (
+      currentModelId &&
+      !mappedAvailableModels.some((model) => model.modelId === currentModelId)
+    ) {
+      mappedAvailableModels.unshift({
+        modelId: currentModelId,
+        name: currentModelId,
+        description: null,
+        _meta: {
+          contextLimit: tokenLimit(currentModelId),
+        },
+      });
+    }
+
+    return {
+      currentModelId,
+      availableModels: mappedAvailableModels,
+    };
+  }
 }

packages/cli/src/acp-integration/schema.ts

@@ -15,6 +15,7 @@ export const AGENT_METHODS = {
   session_prompt: 'session/prompt',
   session_list: 'session/list',
   session_set_mode: 'session/set_mode',
+  session_set_model: 'session/set_model',
 };
 
 export const CLIENT_METHODS = {
@@ -266,6 +267,18 @@ export const modelInfoSchema = z.object({
   name: z.string(),
 });
 
+export const setModelRequestSchema = z.object({
+  sessionId: z.string(),
+  modelId: z.string(),
+});
+
+export const setModelResponseSchema = z.object({
+  modelId: z.string(),
+});
+
+export type SetModelRequest = z.infer<typeof setModelRequestSchema>;
+export type SetModelResponse = z.infer<typeof setModelResponseSchema>;
+
 export const sessionModelStateSchema = z.object({
   _meta: acpMetaSchema,
   availableModels: z.array(modelInfoSchema),
@@ -592,6 +605,7 @@ export const agentResponseSchema = z.union([
   promptResponseSchema,
   listSessionsResponseSchema,
   setModeResponseSchema,
+  setModelResponseSchema,
 ]);
 
 export const requestPermissionRequestSchema = z.object({
@@ -624,6 +638,7 @@ export const agentRequestSchema = z.union([
   promptRequestSchema,
   listSessionsRequestSchema,
   setModeRequestSchema,
+  setModelRequestSchema,
 ]);
 
 export const agentNotificationSchema = sessionNotificationSchema;

packages/cli/src/acp-integration/session/Session.test.ts

@@ -0,0 +1,174 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { Session } from './Session.js';
+import type { Config, GeminiChat } from '@qwen-code/qwen-code-core';
+import { ApprovalMode } from '@qwen-code/qwen-code-core';
+import type * as acp from '../acp.js';
+import type { LoadedSettings } from '../../config/settings.js';
+import * as nonInteractiveCliCommands from '../../nonInteractiveCliCommands.js';
+
+vi.mock('../../nonInteractiveCliCommands.js', () => ({
+  getAvailableCommands: vi.fn(),
+  handleSlashCommand: vi.fn(),
+}));
+
+describe('Session', () => {
+  let mockChat: GeminiChat;
+  let mockConfig: Config;
+  let mockClient: acp.Client;
+  let mockSettings: LoadedSettings;
+  let session: Session;
+  let currentModel: string;
+  let setModelSpy: ReturnType<typeof vi.fn>;
+  let getAvailableCommandsSpy: ReturnType<typeof vi.fn>;
+
+  beforeEach(() => {
+    currentModel = 'qwen3-code-plus';
+    setModelSpy = vi.fn().mockImplementation(async (modelId: string) => {
+      currentModel = modelId;
+    });
+
+    mockChat = {
+      sendMessageStream: vi.fn(),
+      addHistory: vi.fn(),
+    } as unknown as GeminiChat;
+
+    mockConfig = {
+      setApprovalMode: vi.fn(),
+      setModel: setModelSpy,
+      getModel: vi.fn().mockImplementation(() => currentModel),
+    } as unknown as Config;
+
+    mockClient = {
+      sessionUpdate: vi.fn().mockResolvedValue(undefined),
+      requestPermission: vi.fn().mockResolvedValue({
+        outcome: { outcome: 'selected', optionId: 'proceed_once' },
+      }),
+      sendCustomNotification: vi.fn().mockResolvedValue(undefined),
+    } as unknown as acp.Client;
+
+    mockSettings = {
+      merged: {},
+    } as LoadedSettings;
+
+    getAvailableCommandsSpy = vi.mocked(nonInteractiveCliCommands)
+      .getAvailableCommands as unknown as ReturnType<typeof vi.fn>;
+    getAvailableCommandsSpy.mockResolvedValue([]);
+
+    session = new Session(
+      'test-session-id',
+      mockChat,
+      mockConfig,
+      mockClient,
+      mockSettings,
+    );
+  });
+
+  describe('setMode', () => {
+    it.each([
+      ['plan', ApprovalMode.PLAN],
+      ['default', ApprovalMode.DEFAULT],
+      ['auto-edit', ApprovalMode.AUTO_EDIT],
+      ['yolo', ApprovalMode.YOLO],
+    ] as const)('maps %s mode', async (modeId, expected) => {
+      const result = await session.setMode({
+        sessionId: 'test-session-id',
+        modeId,
+      });
+
+      expect(mockConfig.setApprovalMode).toHaveBeenCalledWith(expected);
+      expect(result).toEqual({ modeId });
+    });
+  });
+
+  describe('setModel', () => {
+    it('sets model via config and returns current model', async () => {
+      const result = await session.setModel({
+        sessionId: 'test-session-id',
+        modelId: '  qwen3-coder-plus  ',
+      });
+
+      expect(mockConfig.setModel).toHaveBeenCalledWith('qwen3-coder-plus', {
+        reason: 'user_request_acp',
+        context: 'session/set_model',
+      });
+      expect(mockConfig.getModel).toHaveBeenCalled();
+      expect(result).toEqual({ modelId: 'qwen3-coder-plus' });
+    });
+
+    it('rejects empty/whitespace model IDs', async () => {
+      await expect(
+        session.setModel({
+          sessionId: 'test-session-id',
+          modelId: '   ',
+        }),
+      ).rejects.toThrow('Invalid params');
+
+      expect(mockConfig.setModel).not.toHaveBeenCalled();
+    });
+
+    it('propagates errors from config.setModel', async () => {
+      const configError = new Error('Invalid model');
+      setModelSpy.mockRejectedValueOnce(configError);
+
+      await expect(
+        session.setModel({
+          sessionId: 'test-session-id',
+          modelId: 'invalid-model',
+        }),
+      ).rejects.toThrow('Invalid model');
+    });
+  });
+
+  describe('sendAvailableCommandsUpdate', () => {
+    it('sends available_commands_update from getAvailableCommands()', async () => {
+      getAvailableCommandsSpy.mockResolvedValueOnce([
+        {
+          name: 'init',
+          description: 'Initialize project context',
+        },
+      ]);
+
+      await session.sendAvailableCommandsUpdate();
+
+      expect(getAvailableCommandsSpy).toHaveBeenCalledWith(
+        mockConfig,
+        expect.any(AbortSignal),
+      );
+      expect(mockClient.sessionUpdate).toHaveBeenCalledWith({
+        sessionId: 'test-session-id',
+        update: {
+          sessionUpdate: 'available_commands_update',
+          availableCommands: [
+            {
+              name: 'init',
+              description: 'Initialize project context',
+              input: null,
+            },
+          ],
+        },
+      });
+    });
+
+    it('swallows errors and does not throw', async () => {
+      const consoleErrorSpy = vi
+        .spyOn(console, 'error')
+        .mockImplementation(() => undefined);
+      getAvailableCommandsSpy.mockRejectedValueOnce(
+        new Error('Command discovery failed'),
+      );
+
+      await expect(
+        session.sendAvailableCommandsUpdate(),
+      ).resolves.toBeUndefined();
+      expect(mockClient.sessionUpdate).not.toHaveBeenCalled();
+      expect(consoleErrorSpy).toHaveBeenCalled();
+      consoleErrorSpy.mockRestore();
+    });
+  });
+});

packages/cli/src/acp-integration/session/Session.ts

@@ -52,6 +52,8 @@ import type {
   AvailableCommandsUpdate,
   SetModeRequest,
   SetModeResponse,
+  SetModelRequest,
+  SetModelResponse,
   ApprovalModeValue,
   CurrentModeUpdate,
 } from '../schema.js';
@@ -348,6 +350,31 @@ export class Session implements SessionContext {
     return { modeId: params.modeId };
   }
 
+  /**
+   * Sets the model for the current session.
+   * Validates the model ID and switches the model via Config.
+   */
+  async setModel(params: SetModelRequest): Promise<SetModelResponse> {
+    const modelId = params.modelId.trim();
+
+    if (!modelId) {
+      throw acp.RequestError.invalidParams('modelId cannot be empty');
+    }
+
+    // Attempt to set the model using config
+    await this.config.setModel(modelId, {
+      reason: 'user_request_acp',
+      context: 'session/set_model',
+    });
+
+    // Get updated model info
+    const currentModel = this.config.getModel();
+
+    return {
+      modelId: currentModel,
+    };
+  }
+
   /**
    * Sends a current_mode_update notification to the client.
    * Called after the agent switches modes (e.g., from exit_plan_mode tool).

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

@@ -553,70 +553,6 @@ describe('loadCliConfig', () => {
     expect(config.getIncludePartialMessages()).toBe(true);
   });
 
-  it('should set showMemoryUsage to true when --show-memory-usage flag is present', async () => {
-    process.argv = ['node', 'script.js', '--show-memory-usage'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = {};
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(true);
-  });
-
-  it('should set showMemoryUsage to false when --memory flag is not present', async () => {
-    process.argv = ['node', 'script.js'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = {};
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(false);
-  });
-
-  it('should set showMemoryUsage to false by default from settings if CLI flag is not present', async () => {
-    process.argv = ['node', 'script.js'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = { ui: { showMemoryUsage: false } };
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(false);
-  });
-
-  it('should prioritize CLI flag over settings for showMemoryUsage (CLI true, settings false)', async () => {
-    process.argv = ['node', 'script.js', '--show-memory-usage'];
-    const argv = await parseArguments({} as Settings);
-    const settings: Settings = { ui: { showMemoryUsage: false } };
-    const config = await loadCliConfig(
-      settings,
-      [],
-      new ExtensionEnablementManager(
-        ExtensionStorage.getUserExtensionsDir(),
-        argv.extensions,
-      ),
-      argv,
-    );
-    expect(config.getShowMemoryUsage()).toBe(true);
-  });
-
   describe('Proxy configuration', () => {
     const originalProxyEnv: { [key: string]: string | undefined } = {};
     const proxyEnvVars = [
@@ -1196,11 +1132,6 @@ describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
       ],
       true,
       'tree',
-      {
-        respectGitIgnore: false,
-        respectQwenIgnore: true,
-      },
-      undefined, // maxDirs
     );
   });
 

packages/cli/src/config/config.ts

@@ -9,7 +9,6 @@ import {
   AuthType,
   Config,
   DEFAULT_QWEN_EMBEDDING_MODEL,
-  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
   FileDiscoveryService,
   getCurrentGeminiMdFilename,
   loadServerHierarchicalMemory,
@@ -22,7 +21,6 @@ import {
   isToolEnabled,
   SessionService,
   type ResumedSessionData,
-  type FileFilteringOptions,
   type MCPServerConfig,
   type ToolName,
   EditTool,
@@ -105,7 +103,6 @@ export interface CliArgs {
   prompt: string | undefined;
   promptInteractive: string | undefined;
   allFiles: boolean | undefined;
-  showMemoryUsage: boolean | undefined;
   yolo: boolean | undefined;
   approvalMode: string | undefined;
   telemetry: boolean | undefined;
@@ -298,11 +295,6 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           description: 'Include ALL files in context?',
           default: false,
         })
-        .option('show-memory-usage', {
-          type: 'boolean',
-          description: 'Show memory usage in status bar',
-          default: false,
-        })
         .option('yolo', {
           alias: 'y',
           type: 'boolean',
@@ -334,7 +326,14 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
         .option('experimental-skills', {
           type: 'boolean',
           description: 'Enable experimental Skills feature',
-          default: false,
+          default: (() => {
+            const legacySkills = (
+              settings as Settings & {
+                tools?: { experimental?: { skills?: boolean } };
+              }
+            ).tools?.experimental?.skills;
+            return settings.experimental?.skills ?? legacySkills ?? false;
+          })(),
         })
         .option('channel', {
           type: 'string',
@@ -498,10 +497,6 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           ],
           description: 'Authentication type',
         })
-        .deprecateOption(
-          'show-memory-usage',
-          'Use the "ui.showMemoryUsage" setting in settings.json instead. This flag will be removed in a future version.',
-        )
         .deprecateOption(
           'sandbox-image',
           'Use the "tools.sandbox" setting in settings.json instead. This flag will be removed in a future version.',
@@ -643,7 +638,6 @@ export async function loadHierarchicalGeminiMemory(
   extensionContextFilePaths: string[] = [],
   folderTrust: boolean,
   memoryImportFormat: 'flat' | 'tree' = 'tree',
-  fileFilteringOptions?: FileFilteringOptions,
 ): Promise<{ memoryContent: string; fileCount: number }> {
   // FIX: Use real, canonical paths for a reliable comparison to handle symlinks.
   const realCwd = fs.realpathSync(path.resolve(currentWorkingDirectory));
@@ -669,8 +663,6 @@ export async function loadHierarchicalGeminiMemory(
     extensionContextFilePaths,
     folderTrust,
     memoryImportFormat,
-    fileFilteringOptions,
-    settings.context?.discoveryMaxDirs,
   );
 }
 
@@ -740,11 +732,6 @@ export async function loadCliConfig(
 
   const fileService = new FileDiscoveryService(cwd);
 
-  const fileFiltering = {
-    ...DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
-    ...settings.context?.fileFiltering,
-  };
-
   const includeDirectories = (settings.context?.includeDirectories || [])
     .map(resolvePath)
     .concat((argv.includeDirectories || []).map(resolvePath));
@@ -761,7 +748,6 @@ export async function loadCliConfig(
     extensionContextFilePaths,
     trustedFolder,
     memoryImportFormat,
-    fileFiltering,
   );
 
   let mcpServers = mergeMcpServers(settings, activeExtensions);
@@ -1013,8 +999,6 @@ 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/keyBindings.ts

@@ -122,9 +122,10 @@ export const defaultKeyBindings: KeyBindingConfig = {
 
   // Auto-completion
   [Command.ACCEPT_SUGGESTION]: [{ key: 'tab' }, { key: 'return', ctrl: false }],
-  // Completion navigation (arrow or Ctrl+P/N)
-  [Command.COMPLETION_UP]: [{ key: 'up' }, { key: 'p', ctrl: true }],
-  [Command.COMPLETION_DOWN]: [{ key: 'down' }, { key: 'n', ctrl: true }],
+  // Completion navigation uses only arrow keys
+  // Ctrl+P/N are reserved for history navigation (HISTORY_UP/DOWN)
+  [Command.COMPLETION_UP]: [{ key: 'up' }],
+  [Command.COMPLETION_DOWN]: [{ key: 'down' }],
 
   // Text input
   // Must also exclude shift to allow shift+enter for newline

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

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

packages/cli/src/config/settings.ts

@@ -90,13 +90,6 @@ const MIGRATION_MAP: Record<string, string> = {
   hideWindowTitle: 'ui.hideWindowTitle',
   showStatusInTitle: 'ui.showStatusInTitle',
   hideTips: 'ui.hideTips',
-  hideBanner: 'ui.hideBanner',
-  hideFooter: 'ui.hideFooter',
-  hideCWD: 'ui.footer.hideCWD',
-  hideSandboxStatus: 'ui.footer.hideSandboxStatus',
-  hideModelInfo: 'ui.footer.hideModelInfo',
-  hideContextSummary: 'ui.hideContextSummary',
-  showMemoryUsage: 'ui.showMemoryUsage',
   showLineNumbers: 'ui.showLineNumbers',
   showCitations: 'ui.showCitations',
   ideMode: 'ide.enabled',
@@ -106,7 +99,6 @@ const MIGRATION_MAP: Record<string, string> = {
   mcpServers: 'mcpServers',
   mcpServerCommand: 'mcp.serverCommand',
   memoryImportFormat: 'context.importFormat',
-  memoryDiscoveryMaxDirs: 'context.discoveryMaxDirs',
   model: 'model.name',
   preferredEditor: 'general.preferredEditor',
   sandbox: 'tools.sandbox',
@@ -922,6 +914,21 @@ export function migrateDeprecatedSettings(
 
       loadedSettings.setValue(scope, 'extensions', newExtensionsValue);
     }
+
+    const legacySkills = (
+      settings as Settings & {
+        tools?: { experimental?: { skills?: boolean } };
+      }
+    ).tools?.experimental?.skills;
+    if (
+      legacySkills !== undefined &&
+      settings.experimental?.skills === undefined
+    ) {
+      console.log(
+        `Migrating deprecated tools.experimental.skills setting from ${scope} settings...`,
+      );
+      loadedSettings.setValue(scope, 'experimental.skills', legacySkills);
+    }
   };
 
   processScope(SettingScope.User);

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

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

packages/cli/src/config/settingsSchema.ts

@@ -132,7 +132,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: undefined as string | undefined,
         description: 'The preferred editor to open files in.',
-        showInDialog: false,
+        showInDialog: true,
       },
       vimMode: {
         type: 'boolean',
@@ -163,13 +163,13 @@ const SETTINGS_SCHEMA = {
       },
       gitCoAuthor: {
         type: 'boolean',
-        label: 'Git Co-Author',
+        label: 'Add AI Co-Author to Commits',
         category: 'General',
         requiresRestart: false,
         default: true,
         description:
           'Automatically add a Co-authored-by trailer to git commit messages when commits are made through Qwen Code.',
-        showInDialog: false,
+        showInDialog: true,
       },
       checkpointing: {
         type: 'object',
@@ -198,13 +198,13 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Enable debug logging of keystrokes to the console.',
-        showInDialog: true,
+        showInDialog: false,
       },
       language: {
         type: 'enum',
         label: 'Language',
         category: 'General',
-        requiresRestart: false,
+        requiresRestart: true,
         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',
+        label: 'Terminal Bell Notification',
         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: true,
+        showInDialog: false,
         options: [
           { value: 'text', label: 'Text' },
           { value: 'json', label: 'JSON' },
@@ -280,9 +280,9 @@ const SETTINGS_SCHEMA = {
         label: 'Theme',
         category: 'UI',
         requiresRestart: false,
-        default: undefined as string | undefined,
+        default: 'Qwen Dark' as string,
         description: 'The color theme for the UI.',
-        showInDialog: false,
+        showInDialog: true,
       },
       customThemes: {
         type: 'object',
@@ -300,7 +300,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: false,
         description: 'Hide the window title bar',
-        showInDialog: true,
+        showInDialog: false,
       },
       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: true,
+        showInDialog: false,
       },
       hideTips: {
         type: 'boolean',
@@ -321,89 +321,13 @@ const SETTINGS_SCHEMA = {
         description: 'Hide helpful tips in the UI',
         showInDialog: true,
       },
-      hideBanner: {
-        type: 'boolean',
-        label: 'Hide Banner',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description: 'Hide the application banner',
-        showInDialog: true,
-      },
-      hideContextSummary: {
-        type: 'boolean',
-        label: 'Hide Context Summary',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Hide the context summary (QWEN.md, MCP servers) above the input.',
-        showInDialog: true,
-      },
-      footer: {
-        type: 'object',
-        label: 'Footer',
-        category: 'UI',
-        requiresRestart: false,
-        default: {},
-        description: 'Settings for the footer.',
-        showInDialog: false,
-        properties: {
-          hideCWD: {
-            type: 'boolean',
-            label: 'Hide CWD',
-            category: 'UI',
-            requiresRestart: false,
-            default: false,
-            description:
-              'Hide the current working directory path in the footer.',
-            showInDialog: true,
-          },
-          hideSandboxStatus: {
-            type: 'boolean',
-            label: 'Hide Sandbox Status',
-            category: 'UI',
-            requiresRestart: false,
-            default: false,
-            description: 'Hide the sandbox status indicator in the footer.',
-            showInDialog: true,
-          },
-          hideModelInfo: {
-            type: 'boolean',
-            label: 'Hide Model Info',
-            category: 'UI',
-            requiresRestart: false,
-            default: false,
-            description: 'Hide the model name and context usage in the footer.',
-            showInDialog: true,
-          },
-        },
-      },
-      hideFooter: {
-        type: 'boolean',
-        label: 'Hide Footer',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description: 'Hide the footer from the UI',
-        showInDialog: true,
-      },
-      showMemoryUsage: {
-        type: 'boolean',
-        label: 'Show Memory Usage',
-        category: 'UI',
-        requiresRestart: false,
-        default: false,
-        description: 'Display memory usage information in the UI',
-        showInDialog: true,
-      },
       showLineNumbers: {
         type: 'boolean',
-        label: 'Show Line Numbers',
+        label: 'Show Line Numbers in Code',
         category: 'UI',
         requiresRestart: false,
         default: false,
-        description: 'Show line numbers in the chat.',
+        description: 'Show line numbers in the code output.',
         showInDialog: true,
       },
       showCitations: {
@@ -413,7 +337,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Show citations for generated text in the chat.',
-        showInDialog: true,
+        showInDialog: false,
       },
       customWittyPhrases: {
         type: 'array',
@@ -426,7 +350,7 @@ const SETTINGS_SCHEMA = {
       },
       enableWelcomeBack: {
         type: 'boolean',
-        label: 'Enable Welcome Back',
+        label: 'Show Welcome Back Dialog',
         category: 'UI',
         requiresRestart: false,
         default: true,
@@ -434,6 +358,16 @@ const SETTINGS_SCHEMA = {
           'Show welcome back dialog when returning to a project with conversation history.',
         showInDialog: true,
       },
+      enableUserFeedback: {
+        type: 'boolean',
+        label: 'Enable User Feedback',
+        category: 'UI',
+        requiresRestart: false,
+        default: true,
+        description:
+          'Show optional feedback dialog after conversations to help improve Qwen performance.',
+        showInDialog: true,
+      },
       accessibility: {
         type: 'object',
         label: 'Accessibility',
@@ -450,7 +384,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Disable loading phrases for accessibility',
-            showInDialog: true,
+            showInDialog: false,
           },
           screenReader: {
             type: 'boolean',
@@ -460,10 +394,19 @@ const SETTINGS_SCHEMA = {
             default: undefined as boolean | undefined,
             description:
               'Render output in plain-text to be more screen reader accessible',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
+      feedbackLastShownTimestamp: {
+        type: 'number',
+        label: 'Feedback Last Shown Timestamp',
+        category: 'UI',
+        requiresRestart: false,
+        default: 0,
+        description: 'The last time the feedback dialog was shown.',
+        showInDialog: false,
+      },
     },
   },
 
@@ -478,7 +421,7 @@ const SETTINGS_SCHEMA = {
     properties: {
       enabled: {
         type: 'boolean',
-        label: 'IDE Mode',
+        label: 'Auto-connect to IDE',
         category: 'IDE',
         requiresRestart: true,
         default: false,
@@ -513,7 +456,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: true,
         description: 'Enable collection of usage statistics',
-        showInDialog: false,
+        showInDialog: true,
       },
     },
   },
@@ -554,7 +497,7 @@ const SETTINGS_SCHEMA = {
         default: -1,
         description:
           'Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.',
-        showInDialog: true,
+        showInDialog: false,
       },
       summarizeToolOutput: {
         type: 'object',
@@ -592,7 +535,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: true,
         description: 'Skip the next speaker check.',
-        showInDialog: true,
+        showInDialog: false,
       },
       skipLoopDetection: {
         type: 'boolean',
@@ -601,7 +544,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Disable all loop detection checks (streaming and LLM).',
-        showInDialog: true,
+        showInDialog: false,
       },
       skipStartupContext: {
         type: 'boolean',
@@ -611,7 +554,7 @@ const SETTINGS_SCHEMA = {
         default: false,
         description:
           'Avoid sending the workspace startup context at the beginning of each session.',
-        showInDialog: true,
+        showInDialog: false,
       },
       enableOpenAILogging: {
         type: 'boolean',
@@ -620,7 +563,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Enable OpenAI logging.',
-        showInDialog: true,
+        showInDialog: false,
       },
       openAILoggingDir: {
         type: 'string',
@@ -630,7 +573,7 @@ const SETTINGS_SCHEMA = {
         default: undefined as string | undefined,
         description:
           'Custom directory path for OpenAI API logs. If not specified, defaults to logs/openai in the current working directory.',
-        showInDialog: true,
+        showInDialog: false,
       },
       generationConfig: {
         type: 'object',
@@ -650,7 +593,7 @@ const SETTINGS_SCHEMA = {
             description: 'Request timeout in milliseconds.',
             parentKey: 'generationConfig',
             childKey: 'timeout',
-            showInDialog: true,
+            showInDialog: false,
           },
           maxRetries: {
             type: 'number',
@@ -661,7 +604,7 @@ const SETTINGS_SCHEMA = {
             description: 'Maximum number of retries for failed requests.',
             parentKey: 'generationConfig',
             childKey: 'maxRetries',
-            showInDialog: true,
+            showInDialog: false,
           },
           disableCacheControl: {
             type: 'boolean',
@@ -672,7 +615,7 @@ const SETTINGS_SCHEMA = {
             description: 'Disable cache control for DashScope providers.',
             parentKey: 'generationConfig',
             childKey: 'disableCacheControl',
-            showInDialog: true,
+            showInDialog: false,
           },
           schemaCompliance: {
             type: 'enum',
@@ -684,7 +627,7 @@ const SETTINGS_SCHEMA = {
               'The compliance mode for tool schemas sent to the model. Use "openapi_30" for strict OpenAPI 3.0 compatibility (e.g., for Gemini).',
             parentKey: 'generationConfig',
             childKey: 'schemaCompliance',
-            showInDialog: true,
+            showInDialog: false,
             options: [
               { value: 'auto', label: 'Auto (Default)' },
               { value: 'openapi_30', label: 'OpenAPI 3.0 Strict' },
@@ -722,15 +665,6 @@ const SETTINGS_SCHEMA = {
         description: 'The format to use when importing memory.',
         showInDialog: false,
       },
-      discoveryMaxDirs: {
-        type: 'number',
-        label: 'Memory Discovery Max Dirs',
-        category: 'Context',
-        requiresRestart: false,
-        default: 200,
-        description: 'Maximum number of directories to search for memory.',
-        showInDialog: true,
-      },
       includeDirectories: {
         type: 'array',
         label: 'Include Directories',
@@ -749,7 +683,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: false,
         default: false,
         description: 'Whether to load memory files from include directories.',
-        showInDialog: true,
+        showInDialog: false,
       },
       fileFiltering: {
         type: 'object',
@@ -785,7 +719,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: true,
             description: 'Enable recursive file search functionality',
-            showInDialog: true,
+            showInDialog: false,
           },
           disableFuzzySearch: {
             type: 'boolean',
@@ -794,7 +728,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Disable fuzzy search when searching for files.',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
@@ -831,7 +765,7 @@ const SETTINGS_SCHEMA = {
         properties: {
           enableInteractiveShell: {
             type: 'boolean',
-            label: 'Enable Interactive Shell',
+            label: 'Interactive Shell (PTY)',
             category: 'Tools',
             requiresRestart: true,
             default: false,
@@ -856,20 +790,10 @@ const SETTINGS_SCHEMA = {
             requiresRestart: false,
             default: false,
             description: 'Show color in shell output.',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
-      autoAccept: {
-        type: 'boolean',
-        label: 'Auto Accept',
-        category: 'Tools',
-        requiresRestart: false,
-        default: false,
-        description:
-          'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations).',
-        showInDialog: true,
-      },
       core: {
         type: 'array',
         label: 'Core Tools',
@@ -901,7 +825,7 @@ const SETTINGS_SCHEMA = {
       },
       approvalMode: {
         type: 'enum',
-        label: 'Approval Mode',
+        label: 'Tool Approval Mode',
         category: 'Tools',
         requiresRestart: false,
         default: ApprovalMode.DEFAULT,
@@ -915,6 +839,16 @@ const SETTINGS_SCHEMA = {
           { value: ApprovalMode.YOLO, label: 'YOLO' },
         ],
       },
+      autoAccept: {
+        type: 'boolean',
+        label: 'Auto Accept',
+        category: 'Tools',
+        requiresRestart: false,
+        default: false,
+        description:
+          'Automatically accept and execute tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation.',
+        showInDialog: false,
+      },
       discoveryCommand: {
         type: 'string',
         label: 'Tool Discovery Command',
@@ -941,7 +875,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Use ripgrep for file content search instead of the fallback implementation. Provides faster search performance.',
-        showInDialog: true,
+        showInDialog: false,
       },
       useBuiltinRipgrep: {
         type: 'boolean',
@@ -951,7 +885,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Use the bundled ripgrep binary. When set to false, the system-level "rg" command will be used instead. This setting is only effective when useRipgrep is true.',
-        showInDialog: true,
+        showInDialog: false,
       },
       enableToolOutputTruncation: {
         type: 'boolean',
@@ -960,7 +894,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: true,
         description: 'Enable truncation of large tool outputs.',
-        showInDialog: true,
+        showInDialog: false,
       },
       truncateToolOutputThreshold: {
         type: 'number',
@@ -970,7 +904,7 @@ const SETTINGS_SCHEMA = {
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
         description:
           'Truncate tool output if it is larger than this many characters. Set to -1 to disable.',
-        showInDialog: true,
+        showInDialog: false,
       },
       truncateToolOutputLines: {
         type: 'number',
@@ -979,7 +913,7 @@ const SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
         description: 'The number of lines to keep when truncating tool output.',
-        showInDialog: true,
+        showInDialog: false,
       },
     },
   },
@@ -1056,7 +990,7 @@ const SETTINGS_SCHEMA = {
             requiresRestart: true,
             default: false,
             description: 'Setting to track whether Folder trust is enabled.',
-            showInDialog: true,
+            showInDialog: false,
           },
         },
       },
@@ -1207,6 +1141,16 @@ const SETTINGS_SCHEMA = {
     description: 'Setting to enable experimental features',
     showInDialog: false,
     properties: {
+      skills: {
+        type: 'boolean',
+        label: 'Skills',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: false,
+        description:
+          'Enable experimental Agent Skills feature. When enabled, Qwen Code can use Skills from .qwen/skills/ and ~/.qwen/skills/.',
+        showInDialog: true,
+      },
       extensionManagement: {
         type: 'boolean',
         label: 'Extension Management',
@@ -1224,7 +1168,7 @@ const SETTINGS_SCHEMA = {
         default: true,
         description:
           'Enable vision model support and auto-switching functionality. When disabled, vision models like qwen-vl-max-latest will be hidden and auto-switching will not occur.',
-        showInDialog: true,
+        showInDialog: false,
       },
       vlmSwitchMode: {
         type: 'string',
@@ -1292,9 +1236,3 @@ 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,7 +456,6 @@ 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

@@ -60,10 +60,15 @@ export default {
   'show version info': 'Versionsinformationen anzeigen',
   'submit a bug report': 'Fehlerbericht einreichen',
   'About Qwen Code': 'Über Qwen Code',
+  Status: 'Status',
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: 'Laufzeit',
+  OS: 'Betriebssystem',
+  Auth: 'Authentifizierung',
   'CLI Version': 'CLI-Version',
   'Git Commit': 'Git-Commit',
   Model: 'Modell',
@@ -76,6 +81,7 @@ export default {
   'Session ID': 'Sitzungs-ID',
   'Auth Method': 'Authentifizierungsmethode',
   'Base URL': 'Basis-URL',
+  Proxy: 'Proxy',
   'Memory Usage': 'Speichernutzung',
   'IDE Client': 'IDE-Client',
 
@@ -97,8 +103,8 @@ export default {
   Preview: 'Vorschau',
   '(Use Enter to select, Tab to configure scope)':
     '(Enter zum Auswählen, Tab zum Konfigurieren des Bereichs)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Enter zum Anwenden des Bereichs, Tab zum Auswählen des Designs)',
+  '(Use Enter to apply scope, Tab to go back)':
+    '(Enter zum Anwenden des Bereichs, Tab zum Zurückgehen)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Design-Konfiguration aufgrund der NO_COLOR-Umgebungsvariable nicht verfügbar.',
   'Theme "{{themeName}}" not found.': 'Design "{{themeName}}" nicht gefunden.',
@@ -260,8 +266,6 @@ export default {
   'View and edit Qwen Code settings':
     'Qwen Code Einstellungen anzeigen und bearbeiten',
   Settings: 'Einstellungen',
-  '(Use Enter to select{{tabText}})': '(Enter zum Auswählen{{tabText}})',
-  ', Tab to change focus': ', Tab zum Fokuswechsel',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'Um Änderungen zu sehen, muss Qwen Code neu gestartet werden. Drücken Sie r, um jetzt zu beenden und Änderungen anzuwenden.',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -271,6 +275,12 @@ 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',
@@ -278,17 +288,17 @@ export default {
   'Hide Window Title': 'Fenstertitel ausblenden',
   'Show Status in Title': 'Status im Titel anzeigen',
   'Hide Tips': 'Tipps ausblenden',
-  'Hide Banner': 'Banner ausblenden',
-  'Hide Context Summary': 'Kontextzusammenfassung ausblenden',
-  'Hide CWD': 'Arbeitsverzeichnis ausblenden',
-  'Hide Sandbox Status': 'Sandbox-Status ausblenden',
-  'Hide Model Info': 'Modellinformationen ausblenden',
-  'Hide Footer': 'Fußzeile ausblenden',
-  'Show Memory Usage': 'Speichernutzung anzeigen',
-  'Show Line Numbers': 'Zeilennummern anzeigen',
+  'Show Line Numbers in Code': 'Zeilennummern im Code anzeigen',
   'Show Citations': 'Quellenangaben anzeigen',
   'Custom Witty Phrases': 'Benutzerdefinierte Witzige Sprüche',
-  'Enable Welcome Back': 'Willkommen-zurück aktivieren',
+  'Show Welcome Back Dialog': 'Willkommen-zurück-Dialog anzeigen',
+  'Enable User Feedback': 'Benutzerfeedback aktivieren',
+  'How is Qwen doing this session? (optional)':
+    'Wie macht sich Qwen in dieser Sitzung? (optional)',
+  Bad: 'Schlecht',
+  Good: 'Gut',
+  'Not Sure Yet': 'Noch nicht sicher',
+  'Any other key': 'Beliebige andere Taste',
   'Disable Loading Phrases': 'Ladesprüche deaktivieren',
   'Screen Reader Mode': 'Bildschirmleser-Modus',
   'IDE Mode': 'IDE-Modus',
@@ -308,7 +318,7 @@ export default {
   'Respect .qwenignore': '.qwenignore beachten',
   'Enable Recursive File Search': 'Rekursive Dateisuche aktivieren',
   'Disable Fuzzy Search': 'Unscharfe Suche deaktivieren',
-  'Enable Interactive Shell': 'Interaktive Shell aktivieren',
+  'Interactive Shell (PTY)': 'Interaktive Shell (PTY)',
   'Show Color': 'Farbe anzeigen',
   'Auto Accept': 'Automatisch akzeptieren',
   'Use Ripgrep': 'Ripgrep verwenden',
@@ -344,6 +354,11 @@ export default {
   'Show all directories in the workspace':
     'Alle Verzeichnisse im Arbeitsbereich anzeigen',
   'set external editor preference': 'Externen Editor festlegen',
+  'Select Editor': 'Editor auswählen',
+  'Editor Preference': 'Editor-Einstellung',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    'Diese Editoren werden derzeit unterstützt. Bitte beachten Sie, dass einige Editoren nicht im Sandbox-Modus verwendet werden können.',
+  'Your preferred editor is:': 'Ihr bevorzugter Editor ist:',
   'Manage extensions': 'Erweiterungen verwalten',
   'List active extensions': 'Aktive Erweiterungen auflisten',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -434,7 +449,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Approval Mode': 'Genehmigungsmodus',
+  'Tool Approval Mode': 'Werkzeug-Genehmigungsmodus',
   'Current approval mode: {{mode}}': 'Aktueller Genehmigungsmodus: {{mode}}',
   'Available approval modes:': 'Verfügbare Genehmigungsmodi:',
   'Approval mode changed to: {{mode}}':
@@ -476,8 +491,6 @@ export default {
   'Automatically approve all tools': 'Alle Werkzeuge automatisch genehmigen',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     'Arbeitsbereich-Genehmigungsmodus existiert und hat Vorrang. Benutzerebene-Änderung hat keine Wirkung.',
-  '(Use Enter to select, Tab to change focus)':
-    '(Enter zum Auswählen, Tab zum Fokuswechsel)',
   'Apply To': 'Anwenden auf',
   'User Settings': 'Benutzereinstellungen',
   'Workspace Settings': 'Arbeitsbereich-Einstellungen',

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

@@ -33,6 +33,25 @@ export default {
   'Model Context Protocol command (from external servers)':
     'Model Context Protocol command (from external servers)',
   'Keyboard Shortcuts:': 'Keyboard Shortcuts:',
+  'Toggle this help display': 'Toggle this help display',
+  'Toggle shell mode': 'Toggle shell mode',
+  'Open command menu': 'Open command menu',
+  'Add file context': 'Add file context',
+  'Accept suggestion / Autocomplete': 'Accept suggestion / Autocomplete',
+  'Reverse search history': 'Reverse search history',
+  'Press ? again to close': 'Press ? again to close',
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': 'for shell mode',
+  'for commands': 'for commands',
+  'for file paths': 'for file paths',
+  'to clear input': 'to clear input',
+  'to cycle approvals': 'to cycle approvals',
+  'to quit': 'to quit',
+  'for newline': 'for newline',
+  'to clear screen': 'to clear screen',
+  'to search history': 'to search history',
+  'to paste images': 'to paste images',
+  'for external editor': 'for external editor',
   'Jump through words in the input': 'Jump through words in the input',
   'Close dialogs, cancel requests, or quit application':
     'Close dialogs, cancel requests, or quit application',
@@ -46,6 +65,7 @@ export default {
   'Connecting to MCP servers... ({{connected}}/{{total}})':
     'Connecting to MCP servers... ({{connected}}/{{total}})',
   'Type your message or @path/to/file': 'Type your message or @path/to/file',
+  '? for shortcuts': '? for shortcuts',
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.",
   'Cancel operation / Clear input (double press)':
@@ -59,10 +79,15 @@ export default {
   'show version info': 'show version info',
   'submit a bug report': 'submit a bug report',
   'About Qwen Code': 'About Qwen Code',
+  Status: 'Status',
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: 'Runtime',
+  OS: 'OS',
+  Auth: 'Auth',
   'CLI Version': 'CLI Version',
   'Git Commit': 'Git Commit',
   Model: 'Model',
@@ -75,6 +100,7 @@ export default {
   'Session ID': 'Session ID',
   'Auth Method': 'Auth Method',
   'Base URL': 'Base URL',
+  Proxy: 'Proxy',
   'Memory Usage': 'Memory Usage',
   'IDE Client': 'IDE Client',
 
@@ -98,8 +124,8 @@ export default {
   Preview: 'Preview',
   '(Use Enter to select, Tab to configure scope)':
     '(Use Enter to select, Tab to configure scope)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Use Enter to apply scope, Tab to select theme)',
+  '(Use Enter to apply scope, Tab to go back)':
+    '(Use Enter to apply scope, Tab to go back)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Theme configuration unavailable due to NO_COLOR env variable.',
   'Theme "{{themeName}}" not found.': 'Theme "{{themeName}}" not found.',
@@ -257,8 +283,6 @@ export default {
   // ============================================================================
   'View and edit Qwen Code settings': 'View and edit Qwen Code settings',
   Settings: 'Settings',
-  '(Use Enter to select{{tabText}})': '(Use Enter to select{{tabText}})',
-  ', Tab to change focus': ', Tab to change focus',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -268,6 +292,12 @@ 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',
@@ -275,17 +305,17 @@ export default {
   'Hide Window Title': 'Hide Window Title',
   'Show Status in Title': 'Show Status in Title',
   'Hide Tips': 'Hide Tips',
-  'Hide Banner': 'Hide Banner',
-  'Hide Context Summary': 'Hide Context Summary',
-  'Hide CWD': 'Hide CWD',
-  'Hide Sandbox Status': 'Hide Sandbox Status',
-  'Hide Model Info': 'Hide Model Info',
-  'Hide Footer': 'Hide Footer',
-  'Show Memory Usage': 'Show Memory Usage',
-  'Show Line Numbers': 'Show Line Numbers',
+  'Show Line Numbers in Code': 'Show Line Numbers in Code',
   'Show Citations': 'Show Citations',
   'Custom Witty Phrases': 'Custom Witty Phrases',
-  'Enable Welcome Back': 'Enable Welcome Back',
+  'Show Welcome Back Dialog': 'Show Welcome Back Dialog',
+  'Enable User Feedback': 'Enable User Feedback',
+  'How is Qwen doing this session? (optional)':
+    'How is Qwen doing this session? (optional)',
+  Bad: 'Bad',
+  Good: 'Good',
+  'Not Sure Yet': 'Not Sure Yet',
+  'Any other key': 'Any other key',
   'Disable Loading Phrases': 'Disable Loading Phrases',
   'Screen Reader Mode': 'Screen Reader Mode',
   'IDE Mode': 'IDE Mode',
@@ -305,7 +335,7 @@ export default {
   'Respect .qwenignore': 'Respect .qwenignore',
   'Enable Recursive File Search': 'Enable Recursive File Search',
   'Disable Fuzzy Search': 'Disable Fuzzy Search',
-  'Enable Interactive Shell': 'Enable Interactive Shell',
+  'Interactive Shell (PTY)': 'Interactive Shell (PTY)',
   'Show Color': 'Show Color',
   'Auto Accept': 'Auto Accept',
   'Use Ripgrep': 'Use Ripgrep',
@@ -340,6 +370,11 @@ export default {
   'Show all directories in the workspace':
     'Show all directories in the workspace',
   'set external editor preference': 'set external editor preference',
+  'Select Editor': 'Select Editor',
+  'Editor Preference': 'Editor Preference',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.',
+  'Your preferred editor is:': 'Your preferred editor is:',
   'Manage extensions': 'Manage extensions',
   'List active extensions': 'List active extensions',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -427,7 +462,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Approval Mode': 'Approval Mode',
+  'Tool Approval Mode': 'Tool Approval Mode',
   'Current approval mode: {{mode}}': 'Current approval mode: {{mode}}',
   'Available approval modes:': 'Available approval modes:',
   'Approval mode changed to: {{mode}}': 'Approval mode changed to: {{mode}}',
@@ -466,8 +501,6 @@ export default {
   'Automatically approve all tools': 'Automatically approve all tools',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     'Workspace approval mode exists and takes priority. User-level change will have no effect.',
-  '(Use Enter to select, Tab to change focus)':
-    '(Use Enter to select, Tab to change focus)',
   'Apply To': 'Apply To',
   'User Settings': 'User Settings',
   'Workspace Settings': 'Workspace Settings',
@@ -891,14 +924,23 @@ export default {
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips for getting started:': 'Tips for getting started:',
-  '1. Ask questions, edit files, or run commands.':
-    '1. Ask questions, edit files, or run commands.',
-  '2. Be specific for the best results.':
-    '2. Be specific for the best results.',
-  'files to customize your interactions with Qwen Code.':
-    'files to customize your interactions with Qwen Code.',
-  'for more information.': 'for more information.',
+  'Tips:': 'Tips:',
+  'Use /compress when the conversation gets long to summarize history and free up context.':
+    'Use /compress when the conversation gets long to summarize history and free up context.',
+  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
+    'Start a fresh idea with /clear or /new; the previous session stays available in history.',
+  'Use /bug to submit issues to the maintainers when something goes off.':
+    'Use /bug to submit issues to the maintainers when something goes off.',
+  'Switch auth type quickly with /auth.':
+    'Switch auth type quickly with /auth.',
+  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
+    'You can run any shell commands from Qwen Code using ! (e.g. !ls).',
+  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
+    'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.',
+  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
+    'You can resume a previous conversation by running qwen --continue or qwen --resume.',
+  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
+    'You can switch permission mode quickly with Shift+Tab or /approval-mode.',
 
   // ============================================================================
   // Exit Screen / Stats

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

@@ -33,6 +33,13 @@ export default {
   'Model Context Protocol command (from external servers)':
     'Команда Model Context Protocol (из внешних серверов)',
   'Keyboard Shortcuts:': 'Горячие клавиши:',
+  'Toggle this help display': 'Показать/скрыть эту справку',
+  'Toggle shell mode': 'Переключить режим оболочки',
+  'Open command menu': 'Открыть меню команд',
+  'Add file context': 'Добавить файл в контекст',
+  'Accept suggestion / Autocomplete': 'Принять подсказку / Автодополнение',
+  'Reverse search history': 'Обратный поиск по истории',
+  'Press ? again to close': 'Нажмите ? ещё раз, чтобы закрыть',
   'Jump through words in the input': 'Переход по словам во вводе',
   'Close dialogs, cancel requests, or quit application':
     'Закрыть диалоги, отменить запросы или выйти из приложения',
@@ -46,6 +53,7 @@ export default {
   'Connecting to MCP servers... ({{connected}}/{{total}})':
     'Подключение к MCP-серверам... ({{connected}}/{{total}})',
   'Type your message or @path/to/file': 'Введите сообщение или @путь/к/файлу',
+  '? for shortcuts': '? — горячие клавиши',
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "Нажмите 'i' для режима ВСТАВКА и 'Esc' для ОБЫЧНОГО режима.",
   'Cancel operation / Clear input (double press)':
@@ -59,10 +67,28 @@ export default {
   'show version info': 'Просмотр информации о версии',
   'submit a bug report': 'Отправка отчёта об ошибке',
   'About Qwen Code': 'Об Qwen Code',
+  Status: 'Статус',
+
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': 'режим оболочки',
+  'for commands': 'меню команд',
+  'for file paths': 'пути к файлам',
+  'to clear input': 'очистить ввод',
+  'to cycle approvals': 'переключить режим',
+  'to quit': 'выход',
+  'for newline': 'новая строка',
+  'to clear screen': 'очистить экран',
+  'to search history': 'поиск в истории',
+  'to paste images': 'вставить изображения',
+  'for external editor': 'внешний редактор',
 
   // ============================================================================
   // Поля системной информации
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: 'Среда выполнения',
+  OS: 'ОС',
+  Auth: 'Аутентификация',
   'CLI Version': 'Версия CLI',
   'Git Commit': 'Git-коммит',
   Model: 'Модель',
@@ -75,6 +101,7 @@ export default {
   'Session ID': 'ID сессии',
   'Auth Method': 'Метод авторизации',
   'Base URL': 'Базовый URL',
+  Proxy: 'Прокси',
   'Memory Usage': 'Использование памяти',
   'IDE Client': 'Клиент IDE',
 
@@ -100,8 +127,8 @@ export default {
   Preview: 'Предпросмотр',
   '(Use Enter to select, Tab to configure scope)':
     '(Enter для выбора, Tab для настройки области)',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '(Enter для применения области, Tab для выбора темы)',
+  '(Use Enter to apply scope, Tab to go back)':
+    '(Enter для применения области, Tab для возврата)',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     'Настройка темы недоступна из-за переменной окружения NO_COLOR.',
   'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.',
@@ -260,8 +287,6 @@ export default {
   // ============================================================================
   'View and edit Qwen Code settings': 'Просмотр и изменение настроек Qwen Code',
   Settings: 'Настройки',
-  '(Use Enter to select{{tabText}})': '(Enter для выбора{{tabText}})',
-  ', Tab to change focus': ', Tab для смены фокуса',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'Для применения изменений необходимо перезапустить Qwen Code. Нажмите r для выхода и применения изменений.',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -271,6 +296,12 @@ 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: 'Язык',
@@ -278,17 +309,17 @@ export default {
   'Hide Window Title': 'Скрыть заголовок окна',
   'Show Status in Title': 'Показывать статус в заголовке',
   'Hide Tips': 'Скрыть подсказки',
-  'Hide Banner': 'Скрыть баннер',
-  'Hide Context Summary': 'Скрыть сводку контекста',
-  'Hide CWD': 'Скрыть текущую директорию',
-  'Hide Sandbox Status': 'Скрыть статус песочницы',
-  'Hide Model Info': 'Скрыть информацию о модели',
-  'Hide Footer': 'Скрыть нижний колонтитул',
-  'Show Memory Usage': 'Показывать использование памяти',
-  'Show Line Numbers': 'Показывать номера строк',
+  'Show Line Numbers in Code': 'Показывать номера строк в коде',
   'Show Citations': 'Показывать цитаты',
   'Custom Witty Phrases': 'Пользовательские остроумные фразы',
-  'Enable Welcome Back': 'Включить приветствие при возврате',
+  'Show Welcome Back Dialog': 'Показывать диалог приветствия',
+  'Enable User Feedback': 'Включить отзывы пользователей',
+  'How is Qwen doing this session? (optional)':
+    'Как дела у Qwen в этой сессии? (необязательно)',
+  Bad: 'Плохо',
+  Good: 'Хорошо',
+  'Not Sure Yet': 'Пока не уверен',
+  'Any other key': 'Любая другая клавиша',
   'Disable Loading Phrases': 'Отключить фразы при загрузке',
   'Screen Reader Mode': 'Режим программы чтения с экрана',
   'IDE Mode': 'Режим IDE',
@@ -308,7 +339,7 @@ export default {
   'Respect .qwenignore': 'Учитывать .qwenignore',
   'Enable Recursive File Search': 'Включить рекурсивный поиск файлов',
   'Disable Fuzzy Search': 'Отключить нечеткий поиск',
-  'Enable Interactive Shell': 'Включить интерактивный терминал',
+  'Interactive Shell (PTY)': 'Интерактивный терминал (PTY)',
   'Show Color': 'Показывать цвета',
   'Auto Accept': 'Автоподтверждение',
   'Use Ripgrep': 'Использовать Ripgrep',
@@ -345,6 +376,11 @@ export default {
     'Показать все директории в рабочем пространстве',
   'set external editor preference':
     'Установка предпочитаемого внешнего редактора',
+  'Select Editor': 'Выбрать редактор',
+  'Editor Preference': 'Настройка редактора',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    'В настоящее время поддерживаются следующие редакторы. Обратите внимание, что некоторые редакторы нельзя использовать в режиме песочницы.',
+  'Your preferred editor is:': 'Ваш предпочитаемый редактор:',
   'Manage extensions': 'Управление расширениями',
   'List active extensions': 'Показать активные расширения',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -434,7 +470,7 @@ export default {
   // ============================================================================
   // Команды - Режим подтверждения
   // ============================================================================
-  'Approval Mode': 'Режим подтверждения',
+  'Tool Approval Mode': 'Режим подтверждения инструментов',
   'Current approval mode: {{mode}}': 'Текущий режим подтверждения: {{mode}}',
   'Available approval modes:': 'Доступные режимы подтверждения:',
   'Approval mode changed to: {{mode}}':
@@ -476,8 +512,6 @@ export default {
     'Автоматически подтверждать все инструменты',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     'Режим подтверждения рабочего пространства существует и имеет приоритет. Изменение на уровне пользователя не будет иметь эффекта.',
-  '(Use Enter to select, Tab to change focus)':
-    '(Enter для выбора, Tab для смены фокуса)',
   'Apply To': 'Применить к',
   'User Settings': 'Настройки пользователя',
   'Workspace Settings': 'Настройки рабочего пространства',

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

@@ -32,6 +32,25 @@ export default {
   'Model Context Protocol command (from external servers)':
     '模型上下文协议命令（来自外部服务器）',
   'Keyboard Shortcuts:': '键盘快捷键：',
+  'Toggle this help display': '切换此帮助显示',
+  'Toggle shell mode': '切换命令行模式',
+  'Open command menu': '打开命令菜单',
+  'Add file context': '添加文件上下文',
+  'Accept suggestion / Autocomplete': '接受建议 / 自动补全',
+  'Reverse search history': '反向搜索历史',
+  'Press ? again to close': '再次按 ? 关闭',
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': '命令行模式',
+  'for commands': '命令菜单',
+  'for file paths': '文件路径',
+  'to clear input': '清空输入',
+  'to cycle approvals': '切换审批模式',
+  'to quit': '退出',
+  'for newline': '换行',
+  'to clear screen': '清屏',
+  'to search history': '搜索历史',
+  'to paste images': '粘贴图片',
+  'for external editor': '外部编辑器',
   'Jump through words in the input': '在输入中按单词跳转',
   'Close dialogs, cancel requests, or quit application':
     '关闭对话框、取消请求或退出应用程序',
@@ -45,6 +64,7 @@ export default {
   'Connecting to MCP servers... ({{connected}}/{{total}})':
     '正在连接到 MCP 服务器... ({{connected}}/{{total}})',
   'Type your message or @path/to/file': '输入您的消息或 @ 文件路径',
+  '? for shortcuts': '按 ? 查看快捷键',
   "Press 'i' for INSERT mode and 'Esc' for NORMAL mode.":
     "按 'i' 进入插入模式，按 'Esc' 进入普通模式",
   'Cancel operation / Clear input (double press)':
@@ -58,10 +78,15 @@ export default {
   'show version info': '显示版本信息',
   'submit a bug report': '提交错误报告',
   'About Qwen Code': '关于 Qwen Code',
+  Status: '状态',
 
   // ============================================================================
   // System Information Fields
   // ============================================================================
+  'Qwen Code': 'Qwen Code',
+  Runtime: '运行环境',
+  OS: '操作系统',
+  Auth: '认证',
   'CLI Version': 'CLI 版本',
   'Git Commit': 'Git 提交',
   Model: '模型',
@@ -74,6 +99,7 @@ export default {
   'Session ID': '会话 ID',
   'Auth Method': '认证方式',
   'Base URL': '基础 URL',
+  Proxy: '代理',
   'Memory Usage': '内存使用',
   'IDE Client': 'IDE 客户端',
 
@@ -97,8 +123,8 @@ export default {
   Preview: '预览',
   '(Use Enter to select, Tab to configure scope)':
     '（使用 Enter 选择，Tab 配置作用域）',
-  '(Use Enter to apply scope, Tab to select theme)':
-    '（使用 Enter 应用作用域，Tab 选择主题）',
+  '(Use Enter to apply scope, Tab to go back)':
+    '（使用 Enter 应用作用域，Tab 返回）',
   'Theme configuration unavailable due to NO_COLOR env variable.':
     '由于 NO_COLOR 环境变量，主题配置不可用。',
   'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。',
@@ -248,8 +274,6 @@ export default {
   // ============================================================================
   'View and edit Qwen Code settings': '查看和编辑 Qwen Code 设置',
   Settings: '设置',
-  '(Use Enter to select{{tabText}})': '（使用 Enter 选择{{tabText}}）',
-  ', Tab to change focus': '，Tab 切换焦点',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     '要查看更改，必须重启 Qwen Code。按 r 退出并立即应用更改。',
   'The command "/{{command}}" is not supported in non-interactive mode.':
@@ -259,6 +283,12 @@ 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: '语言',
@@ -266,17 +296,16 @@ export default {
   'Hide Window Title': '隐藏窗口标题',
   'Show Status in Title': '在标题中显示状态',
   'Hide Tips': '隐藏提示',
-  'Hide Banner': '隐藏横幅',
-  'Hide Context Summary': '隐藏上下文摘要',
-  'Hide CWD': '隐藏当前工作目录',
-  'Hide Sandbox Status': '隐藏沙箱状态',
-  'Hide Model Info': '隐藏模型信息',
-  'Hide Footer': '隐藏页脚',
-  'Show Memory Usage': '显示内存使用',
-  'Show Line Numbers': '显示行号',
+  'Show Line Numbers in Code': '在代码中显示行号',
   'Show Citations': '显示引用',
   'Custom Witty Phrases': '自定义诙谐短语',
-  'Enable Welcome Back': '启用欢迎回来',
+  'Show Welcome Back Dialog': '显示欢迎回来对话框',
+  'Enable User Feedback': '启用用户反馈',
+  'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）',
+  Bad: '不满意',
+  Good: '满意',
+  'Not Sure Yet': '暂不评价',
+  'Any other key': '任意其他键',
   'Disable Loading Phrases': '禁用加载短语',
   'Screen Reader Mode': '屏幕阅读器模式',
   'IDE Mode': 'IDE 模式',
@@ -295,7 +324,7 @@ export default {
   'Respect .qwenignore': '遵守 .qwenignore',
   'Enable Recursive File Search': '启用递归文件搜索',
   'Disable Fuzzy Search': '禁用模糊搜索',
-  'Enable Interactive Shell': '启用交互式 Shell',
+  'Interactive Shell (PTY)': '交互式 Shell (PTY)',
   'Show Color': '显示颜色',
   'Auto Accept': '自动接受',
   'Use Ripgrep': '使用 Ripgrep',
@@ -327,6 +356,11 @@ export default {
     '将目录添加到工作区。使用逗号分隔多个路径',
   'Show all directories in the workspace': '显示工作区中的所有目录',
   'set external editor preference': '设置外部编辑器首选项',
+  'Select Editor': '选择编辑器',
+  'Editor Preference': '编辑器首选项',
+  'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.':
+    '当前支持以下编辑器。请注意，某些编辑器无法在沙箱模式下使用。',
+  'Your preferred editor is:': '您的首选编辑器是：',
   'Manage extensions': '管理扩展',
   'List active extensions': '列出活动扩展',
   'Update extensions. Usage: update <extension-names>|--all':
@@ -410,7 +444,7 @@ export default {
   // ============================================================================
   // Commands - Approval Mode
   // ============================================================================
-  'Approval Mode': '审批模式',
+  'Tool Approval Mode': '工具审批模式',
   'Current approval mode: {{mode}}': '当前审批模式：{{mode}}',
   'Available approval modes:': '可用的审批模式：',
   'Approval mode changed to: {{mode}}': '审批模式已更改为：{{mode}}',
@@ -444,8 +478,6 @@ export default {
   'Automatically approve all tools': '自动批准所有工具',
   'Workspace approval mode exists and takes priority. User-level change will have no effect.':
     '工作区审批模式已存在并具有优先级。用户级别的更改将无效。',
-  '(Use Enter to select, Tab to change focus)':
-    '（使用 Enter 选择，Tab 切换焦点）',
   'Apply To': '应用于',
   'User Settings': '用户设置',
   'Workspace Settings': '工作区设置',
@@ -845,13 +877,22 @@ export default {
   // ============================================================================
   // Startup Tips
   // ============================================================================
-  'Tips for getting started:': '入门提示：',
-  '1. Ask questions, edit files, or run commands.':
-    '1. 提问、编辑文件或运行命令',
-  '2. Be specific for the best results.': '2. 具体描述以获得最佳结果',
-  'files to customize your interactions with Qwen Code.':
-    '文件以自定义您与 Qwen Code 的交互',
-  'for more information.': '获取更多信息',
+  'Tips:': '提示：',
+  'Use /compress when the conversation gets long to summarize history and free up context.':
+    '对话变长时用 /compress，总结历史并释放上下文。',
+  'Start a fresh idea with /clear or /new; the previous session stays available in history.':
+    '用 /clear 或 /new 开启新思路；之前的会话会保留在历史记录中。',
+  'Use /bug to submit issues to the maintainers when something goes off.':
+    '遇到问题时，用 /bug 将问题提交给维护者。',
+  'Switch auth type quickly with /auth.': '用 /auth 快速切换认证方式。',
+  'You can run any shell commands from Qwen Code using ! (e.g. !ls).':
+    '在 Qwen Code 中使用 ! 可运行任意 shell 命令（例如 !ls）。',
+  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.':
+    '输入 / 打开命令弹窗；按 Tab 自动补全斜杠命令和保存的提示词。',
+  'You can resume a previous conversation by running qwen --continue or qwen --resume.':
+    '运行 qwen --continue 或 qwen --resume 可继续之前的会话。',
+  'You can switch permission mode quickly with Shift+Tab or /approval-mode.':
+    '按 Shift+Tab 或输入 /approval-mode 可快速切换权限模式。',
 
   // ============================================================================
   // Exit Screen / Stats
@@ -873,11 +914,11 @@ export default {
   'Session Stats': '会话统计',
   'Model Usage': '模型使用情况',
   Reqs: '请求数',
-  'Input Tokens': '输入令牌',
-  'Output Tokens': '输出令牌',
+  'Input Tokens': '输入 token 数',
+  'Output Tokens': '输出 token 数',
   'Savings Highlight:': '节省亮点：',
   'of input tokens were served from the cache, reducing costs.':
-    '的输入令牌来自缓存，降低了成本',
+    '从缓存载入 token ，降低了成本',
   'Tip: For a full token breakdown, run `/stats model`.':
     '提示：要查看完整的令牌明细，请运行 `/stats model`',
   'Model Stats For Nerds': '模型统计（技术细节）',

packages/cli/src/services/BuiltinCommandLoader.test.ts

@@ -8,7 +8,8 @@ vi.mock('../ui/commands/aboutCommand.js', async () => {
   const { CommandKind } = await import('../ui/commands/types.js');
   return {
     aboutCommand: {
-      name: 'about',
+      name: 'status',
+      altNames: ['about'],
       description: 'About the CLI',
       kind: CommandKind.BUILT_IN,
     },
@@ -127,8 +128,8 @@ describe('BuiltinCommandLoader', () => {
     expect(ideCmd).toBeDefined();
 
     // Other commands should still be present.
-    const aboutCmd = commands.find((c) => c.name === 'about');
-    expect(aboutCmd).toBeDefined();
+    const statusCmd = commands.find((c) => c.name === 'status');
+    expect(statusCmd).toBeDefined();
   });
 
   it('should handle a null config gracefully when calling factories', async () => {
@@ -143,9 +144,9 @@ describe('BuiltinCommandLoader', () => {
     const loader = new BuiltinCommandLoader(mockConfig);
     const commands = await loader.loadCommands(new AbortController().signal);
 
-    const aboutCmd = commands.find((c) => c.name === 'about');
-    expect(aboutCmd).toBeDefined();
-    expect(aboutCmd?.kind).toBe(CommandKind.BUILT_IN);
+    const statusCmd = commands.find((c) => c.name === 'status');
+    expect(statusCmd).toBeDefined();
+    expect(statusCmd?.kind).toBe(CommandKind.BUILT_IN);
 
     const approvalModeCmd = commands.find((c) => c.name === 'approval-mode');
     expect(approvalModeCmd).toBeDefined();

packages/cli/src/services/BuiltinCommandLoader.ts

@@ -39,7 +39,6 @@ import { themeCommand } from '../ui/commands/themeCommand.js';
 import { toolsCommand } from '../ui/commands/toolsCommand.js';
 import { vimCommand } from '../ui/commands/vimCommand.js';
 import { setupGithubCommand } from '../ui/commands/setupGithubCommand.js';
-import { insightCommand } from '../ui/commands/insightCommand.js';
 
 /**
  * Loads the core, hard-coded slash commands that are an integral part
@@ -89,7 +88,6 @@ export class BuiltinCommandLoader implements ICommandLoader {
       vimCommand,
       setupGithubCommand,
       terminalSetupCommand,
-      insightCommand,
     ];
 
     return allDefinitions.filter((cmd): cmd is SlashCommand => cmd !== null);

packages/cli/src/services/insight-page/README.md

@@ -1,120 +0,0 @@
-# Qwen Code Insights Page
-
-A React-based visualization dashboard for displaying coding activity insights and statistics.
-
-## Development
-
-This application consists of two parts:
-
-1. **Backend (Express Server)**: Serves API endpoints and processes chat history data
-2. **Frontend (Vite + React)**: Development server with HMR
-
-### Running in Development Mode
-
-You need to run both the backend and frontend servers:
-
-**Terminal 1 - Backend Server (Port 3001):**
-
-```bash
-pnpm dev:server
-```
-
-**Terminal 2 - Frontend Dev Server (Port 3000):**
-
-```bash
-pnpm dev
-```
-
-Then open <http://localhost:3000> in your browser.
-
-The Vite dev server will proxy `/api` requests to the backend server at port 3001.
-
-### Building for Production
-
-```bash
-pnpm build
-```
-
-This compiles TypeScript and builds the React application. The output will be in the `dist/` directory.
-
-In production, the Express server serves both the static files and API endpoints from a single port.
-
-## Architecture
-
-- **Frontend**: React + TypeScript + Vite + Chart.js
-- **Backend**: Express + Node.js
-- **Data Source**: JSONL chat history files from `~/.qwen/projects/*/chats/`
-
-## Original Vite Template Info
-
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
-
-Currently, two official plugins are available:
-
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
-
-## React Compiler
-
-The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
-
-## Expanding the ESLint configuration
-
-If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
-
-```js
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-
-      // Remove tseslint.configs.recommended and replace with this
-      tseslint.configs.recommendedTypeChecked,
-      // Alternatively, use this for stricter rules
-      tseslint.configs.strictTypeChecked,
-      // Optionally, add this for stylistic rules
-      tseslint.configs.stylisticTypeChecked,
-
-      // Other configs...
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-]);
-```
-
-You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
-
-```js
-// eslint.config.js
-import reactX from 'eslint-plugin-react-x';
-import reactDom from 'eslint-plugin-react-dom';
-
-export default defineConfig([
-  globalIgnores(['dist']),
-  {
-    files: ['**/*.{ts,tsx}'],
-    extends: [
-      // Other configs...
-      // Enable lint rules for React
-      reactX.configs['recommended-typescript'],
-      // Enable lint rules for React DOM
-      reactDom.configs.recommended,
-    ],
-    languageOptions: {
-      parserOptions: {
-        project: ['./tsconfig.node.json', './tsconfig.app.json'],
-        tsconfigRootDir: import.meta.dirname,
-      },
-      // other options...
-    },
-  },
-]);
-```

packages/cli/src/services/insight-page/index.html

@@ -1,13 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/qwen.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Qwen Code Insight</title>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>

packages/cli/src/services/insight-page/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "insight-page",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "dev:server": "BASE_DIR=$HOME/.qwen/projects PORT=3001 tsx ../insightServer.ts",
-    "build": "tsc -b && vite build",
-    "lint": "eslint .",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "@uiw/react-heat-map": "^2.3.3",
-    "chart.js": "^4.5.1",
-    "html2canvas": "^1.4.1",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "@types/node": "^24.10.1",
-    "@types/react": "^19.2.5",
-    "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^5.1.1",
-    "autoprefixer": "^10.4.20",
-    "eslint": "^9.39.1",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.4.24",
-    "globals": "^16.5.0",
-    "postcss": "^8.4.49",
-    "tailwindcss": "^3.4.17",
-    "typescript": "~5.9.3",
-    "typescript-eslint": "^8.46.4",
-    "vite": "npm:rolldown-vite@7.2.5"
-  },
-  "pnpm": {
-    "overrides": {
-      "vite": "npm:rolldown-vite@7.2.5"
-    }
-  }
-}

packages/cli/src/services/insight-page/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};

packages/cli/src/services/insight-page/src/App.tsx

@@ -1,395 +0,0 @@
-import { useEffect, useRef, useState, type CSSProperties } from 'react';
-import {
-  Chart,
-  LineController,
-  LineElement,
-  BarController,
-  BarElement,
-  CategoryScale,
-  LinearScale,
-  PointElement,
-  Legend,
-  Title,
-  Tooltip,
-} from 'chart.js';
-import type { ChartConfiguration } from 'chart.js';
-import HeatMap from '@uiw/react-heat-map';
-import html2canvas from 'html2canvas';
-
-// Register Chart.js components
-Chart.register(
-  LineController,
-  LineElement,
-  BarController,
-  BarElement,
-  CategoryScale,
-  LinearScale,
-  PointElement,
-  Legend,
-  Title,
-  Tooltip,
-);
-
-interface UsageMetadata {
-  input: number;
-  output: number;
-  total: number;
-}
-
-interface InsightData {
-  heatmap: { [date: string]: number };
-  tokenUsage: { [date: string]: UsageMetadata };
-  currentStreak: number;
-  longestStreak: number;
-  longestWorkDate: string | null;
-  longestWorkDuration: number;
-  activeHours: { [hour: number]: number };
-  latestActiveTime: string | null;
-  achievements: Array<{
-    id: string;
-    name: string;
-    description: string;
-  }>;
-}
-
-function App() {
-  const [insights, setInsights] = useState<InsightData | null>(null);
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const hourChartRef = useRef<HTMLCanvasElement>(null);
-  const hourChartInstance = useRef<Chart | null>(null);
-  const containerRef = useRef<HTMLDivElement>(null);
-
-  // Load insights data
-  useEffect(() => {
-    const loadInsights = async () => {
-      try {
-        setLoading(true);
-        const response = await fetch('/api/insights');
-        if (!response.ok) {
-          throw new Error('Failed to fetch insights');
-        }
-        const data: InsightData = await response.json();
-        setInsights(data);
-        setError(null);
-      } catch (err) {
-        setError((err as Error).message);
-        setInsights(null);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    loadInsights();
-  }, []);
-
-  // Create hour chart when insights change
-  useEffect(() => {
-    if (!insights || !hourChartRef.current) return;
-
-    // Destroy existing chart if it exists
-    if (hourChartInstance.current) {
-      hourChartInstance.current.destroy();
-    }
-
-    const labels = Array.from({ length: 24 }, (_, i) => `${i}:00`);
-    const data = labels.map((_, i) => insights.activeHours[i] || 0);
-
-    const ctx = hourChartRef.current.getContext('2d');
-    if (!ctx) return;
-
-    hourChartInstance.current = new Chart(ctx, {
-      type: 'bar',
-      data: {
-        labels,
-        datasets: [
-          {
-            label: 'Activity per Hour',
-            data,
-            backgroundColor: 'rgba(52, 152, 219, 0.7)',
-            borderColor: 'rgba(52, 152, 219, 1)',
-            borderWidth: 1,
-          },
-        ],
-      },
-      options: {
-        indexAxis: 'y',
-        responsive: true,
-        maintainAspectRatio: false,
-        scales: {
-          x: {
-            beginAtZero: true,
-          },
-        },
-        plugins: {
-          legend: {
-            display: false,
-          },
-        },
-      } as ChartConfiguration['options'],
-    });
-  }, [insights]);
-
-  const handleExport = async () => {
-    if (!containerRef.current) return;
-
-    try {
-      const button = document.getElementById('export-btn') as HTMLButtonElement;
-      button.style.display = 'none';
-
-      const canvas = await html2canvas(containerRef.current, {
-        scale: 2,
-        useCORS: true,
-        logging: false,
-      });
-
-      const imgData = canvas.toDataURL('image/png');
-      const link = document.createElement('a');
-      link.href = imgData;
-      link.download = `qwen-insights-${new Date().toISOString().slice(0, 10)}.png`;
-      link.click();
-
-      button.style.display = 'block';
-    } catch (err) {
-      console.error('Error capturing image:', err);
-      alert('Failed to export image. Please try again.');
-    }
-  };
-
-  if (loading) {
-    return (
-      <div className="flex min-h-screen items-center justify-center bg-gradient-to-br from-slate-50 via-white to-slate-100">
-        <div className="glass-card px-8 py-6 text-center">
-          <h2 className="text-xl font-semibold text-slate-900">
-            Loading insights...
-          </h2>
-          <p className="mt-2 text-sm text-slate-600">
-            Fetching your coding patterns
-          </p>
-        </div>
-      </div>
-    );
-  }
-
-  if (error || !insights) {
-    return (
-      <div className="flex min-h-screen items-center justify-center bg-gradient-to-br from-slate-50 via-white to-slate-100">
-        <div className="glass-card px-8 py-6 text-center">
-          <h2 className="text-xl font-semibold text-rose-700">
-            Error loading insights
-          </h2>
-          <p className="mt-2 text-sm text-slate-600">
-            {error || 'Please try again later.'}
-          </p>
-        </div>
-      </div>
-    );
-  }
-
-  // Prepare heatmap data for react-heat-map
-  const heatmapData = Object.entries(insights.heatmap).map(([date, count]) => ({
-    date,
-    count,
-  }));
-
-  const cardClass = 'glass-card p-6';
-  const sectionTitleClass =
-    'text-lg font-semibold tracking-tight text-slate-900';
-  const captionClass = 'text-sm font-medium text-slate-500';
-
-  return (
-    <div className="min-h-screen" ref={containerRef}>
-      <div className="mx-auto max-w-6xl px-6 py-10 md:py-12">
-        <header className="mb-8 space-y-3 text-center">
-          <p className="text-xs font-semibold uppercase tracking-[0.2em] text-slate-500">
-            Insights
-          </p>
-          <h1 className="text-3xl font-semibold text-slate-900 md:text-4xl">
-            Qwen Code Insights
-          </h1>
-          <p className="text-sm text-slate-600">
-            Your personalized coding journey and patterns
-          </p>
-        </header>
-
-        <div className="grid gap-4 md:grid-cols-3 md:gap-6">
-          <div className={`${cardClass} h-full`}>
-            <div className="flex items-start justify-between">
-              <div>
-                <p className={captionClass}>Current Streak</p>
-                <p className="mt-1 text-4xl font-bold text-slate-900">
-                  {insights.currentStreak}
-                  <span className="ml-2 text-base font-semibold text-slate-500">
-                    days
-                  </span>
-                </p>
-              </div>
-              <span className="rounded-full bg-emerald-50 px-4 py-2 text-sm font-semibold text-emerald-700">
-                Longest {insights.longestStreak}d
-              </span>
-            </div>
-          </div>
-
-          <div className={`${cardClass} h-full`}>
-            <div className="flex items-center justify-between">
-              <h3 className={sectionTitleClass}>Active Hours</h3>
-              <span className="rounded-full bg-slate-100 px-3 py-1 text-xs font-semibold text-slate-600">
-                24h
-              </span>
-            </div>
-            <div className="mt-4 h-56 w-full">
-              <canvas ref={hourChartRef}></canvas>
-            </div>
-          </div>
-
-          <div className={`${cardClass} h-full space-y-3`}>
-            <h3 className={sectionTitleClass}>Work Session</h3>
-            <div className="grid grid-cols-2 gap-3 text-sm text-slate-700">
-              <div className="rounded-xl bg-slate-50 px-3 py-2">
-                <p className="text-xs font-semibold uppercase tracking-wide text-slate-500">
-                  Longest
-                </p>
-                <p className="mt-1 text-lg font-semibold text-slate-900">
-                  {insights.longestWorkDuration}m
-                </p>
-              </div>
-              <div className="rounded-xl bg-slate-50 px-3 py-2">
-                <p className="text-xs font-semibold uppercase tracking-wide text-slate-500">
-                  Date
-                </p>
-                <p className="mt-1 text-lg font-semibold text-slate-900">
-                  {insights.longestWorkDate || '-'}
-                </p>
-              </div>
-              <div className="col-span-2 rounded-xl bg-slate-50 px-3 py-2">
-                <p className="text-xs font-semibold uppercase tracking-wide text-slate-500">
-                  Last Active
-                </p>
-                <p className="mt-1 text-lg font-semibold text-slate-900">
-                  {insights.latestActiveTime || '-'}
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div className={`${cardClass} mt-4 space-y-4 md:mt-6`}>
-          <div className="flex items-center justify-between">
-            <h3 className={sectionTitleClass}>Activity Heatmap</h3>
-            <span className="text-xs font-semibold text-slate-500">
-              Past year
-            </span>
-          </div>
-          <div className="overflow-x-auto">
-            <div className="min-w-[720px] rounded-xl border border-slate-100 bg-white/70 p-4 shadow-inner shadow-slate-100">
-              <HeatMap
-                value={heatmapData}
-                width={1000}
-                style={{ color: '#0f172a' } satisfies CSSProperties}
-                startDate={
-                  new Date(new Date().setFullYear(new Date().getFullYear() - 1))
-                }
-                endDate={new Date()}
-                rectSize={14}
-                legendCellSize={12}
-                rectProps={{
-                  rx: 2,
-                }}
-                panelColors={{
-                  0: '#e2e8f0',
-                  2: '#a5d8ff',
-                  4: '#74c0fc',
-                  10: '#339af0',
-                  20: '#1c7ed6',
-                }}
-              />
-            </div>
-          </div>
-        </div>
-
-        <div className={`${cardClass} mt-4 md:mt-6`}>
-          <div className="space-y-3">
-            <h3 className={sectionTitleClass}>Token Usage</h3>
-            <div className="grid grid-cols-3 gap-3">
-              <div className="rounded-xl bg-slate-50 px-4 py-3">
-                <p className="text-xs font-semibold uppercase tracking-wide text-slate-500">
-                  Input
-                </p>
-                <p className="mt-1 text-2xl font-bold text-slate-900">
-                  {Object.values(insights.tokenUsage)
-                    .reduce((acc, usage) => acc + usage.input, 0)
-                    .toLocaleString()}
-                </p>
-              </div>
-              <div className="rounded-xl bg-slate-50 px-4 py-3">
-                <p className="text-xs font-semibold uppercase tracking-wide text-slate-500">
-                  Output
-                </p>
-                <p className="mt-1 text-2xl font-bold text-slate-900">
-                  {Object.values(insights.tokenUsage)
-                    .reduce((acc, usage) => acc + usage.output, 0)
-                    .toLocaleString()}
-                </p>
-              </div>
-              <div className="rounded-xl bg-slate-50 px-4 py-3">
-                <p className="text-xs font-semibold uppercase tracking-wide text-slate-500">
-                  Total
-                </p>
-                <p className="mt-1 text-2xl font-bold text-slate-900">
-                  {Object.values(insights.tokenUsage)
-                    .reduce((acc, usage) => acc + usage.total, 0)
-                    .toLocaleString()}
-                </p>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div className={`${cardClass} mt-4 space-y-4 md:mt-6`}>
-          <div className="flex items-center justify-between">
-            <h3 className={sectionTitleClass}>Achievements</h3>
-            <span className="text-xs font-semibold text-slate-500">
-              {insights.achievements.length} total
-            </span>
-          </div>
-          {insights.achievements.length === 0 ? (
-            <p className="text-sm text-slate-600">
-              No achievements yet. Keep coding!
-            </p>
-          ) : (
-            <div className="divide-y divide-slate-200">
-              {insights.achievements.map((achievement) => (
-                <div
-                  key={achievement.id}
-                  className="flex flex-col gap-1 py-3 text-left"
-                >
-                  <span className="text-base font-semibold text-slate-900">
-                    {achievement.name}
-                  </span>
-                  <p className="text-sm text-slate-600">
-                    {achievement.description}
-                  </p>
-                </div>
-              ))}
-            </div>
-          )}
-        </div>
-
-        <div className="mt-6 flex justify-center">
-          <button
-            id="export-btn"
-            className="group inline-flex items-center gap-2 rounded-full bg-slate-900 px-5 py-3 text-sm font-semibold text-white shadow-soft transition focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-slate-400 hover:-translate-y-[1px] hover:shadow-lg active:translate-y-[1px]"
-            onClick={handleExport}
-          >
-            Export as Image
-            <span className="text-slate-200 transition group-hover:translate-x-0.5">
-              →
-            </span>
-          </button>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default App;

packages/cli/src/services/insight-page/src/index.css

@@ -1,15 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-@layer base {
-  body {
-    @apply min-h-screen bg-gradient-to-br from-slate-50 via-white to-slate-100 text-slate-900 antialiased;
-  }
-}
-
-@layer components {
-  .glass-card {
-    @apply rounded-2xl border border-slate-200 bg-white/80 shadow-soft backdrop-blur;
-  }
-}

packages/cli/src/services/insight-page/src/main.tsx

@@ -1,10 +0,0 @@
-import { StrictMode } from 'react';
-import { createRoot } from 'react-dom/client';
-import './index.css';
-import App from './App.tsx';
-
-createRoot(document.getElementById('root')!).render(
-  <StrictMode>
-    <App />
-  </StrictMode>,
-);

packages/cli/src/services/insight-page/tailwind.config.ts

@@ -1,18 +0,0 @@
-import type { Config } from 'tailwindcss';
-
-const config: Config = {
-  content: ['./index.html', './src/**/*.{ts,tsx}'],
-  theme: {
-    extend: {
-      boxShadow: {
-        soft: '0 10px 40px rgba(15, 23, 42, 0.08)',
-      },
-      borderRadius: {
-        xl: '1.25rem',
-      },
-    },
-  },
-  plugins: [],
-};
-
-export default config;

packages/cli/src/services/insight-page/tsconfig.app.json

@@ -1,28 +0,0 @@
-{
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
-    "target": "ES2022",
-    "useDefineForClassFields": true,
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "types": ["vite/client"],
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-    "jsx": "react-jsx",
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true
-  },
-  "include": ["src"]
-}

packages/cli/src/services/insight-page/tsconfig.json

@@ -1,7 +0,0 @@
-{
-  "files": [],
-  "references": [
-    { "path": "./tsconfig.app.json" },
-    { "path": "./tsconfig.node.json" }
-  ]
-}

packages/cli/src/services/insight-page/tsconfig.node.json

@@ -1,26 +0,0 @@
-{
-  "compilerOptions": {
-    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
-    "target": "ES2023",
-    "lib": ["ES2023"],
-    "module": "ESNext",
-    "types": ["node"],
-    "skipLibCheck": true,
-
-    /* Bundler mode */
-    "moduleResolution": "bundler",
-    "allowImportingTsExtensions": true,
-    "verbatimModuleSyntax": true,
-    "moduleDetection": "force",
-    "noEmit": true,
-
-    /* Linting */
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "erasableSyntaxOnly": true,
-    "noFallthroughCasesInSwitch": true,
-    "noUncheckedSideEffectImports": true
-  },
-  "include": ["vite.config.ts"]
-}

packages/cli/src/services/insight-page/views/index.html

@@ -1,14 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/qwen.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>insight-page</title>
-    <script type="module" crossorigin src="/assets/index-D7obW1Jn.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CV6J1oXz.css">
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>

packages/cli/src/services/insight-page/vite.config.ts

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react';
-
-// https://vite.dev/config/
-export default defineConfig({
-  plugins: [react()],
-  build: {
-    outDir: 'views',
-  },
-  server: {
-    port: 3000,
-    proxy: {
-      '/api': {
-        target: 'http://localhost:3001',
-        changeOrigin: true,
-      },
-    },
-  },
-});

packages/cli/src/services/insightServer.ts

@@ -1,404 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Code
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import express from 'express';
-import fs from 'fs/promises';
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import type { ChatRecord } from '@qwen-code/qwen-code-core';
-import { read } from '@qwen-code/qwen-code-core/src/utils/jsonl-utils.js';
-
-interface StreakData {
-  currentStreak: number;
-  longestStreak: number;
-  dates: string[];
-}
-
-// For heat map data
-interface HeatMapData {
-  [date: string]: number;
-}
-
-// For token usage data
-interface TokenUsageData {
-  [date: string]: {
-    input: number;
-    output: number;
-    total: number;
-  };
-}
-
-// For achievement data
-interface AchievementData {
-  id: string;
-  name: string;
-  description: string;
-}
-
-// For the final insight data
-interface InsightData {
-  heatmap: HeatMapData;
-  tokenUsage: TokenUsageData;
-  currentStreak: number;
-  longestStreak: number;
-  longestWorkDate: string | null;
-  longestWorkDuration: number; // in minutes
-  activeHours: { [hour: number]: number };
-  latestActiveTime: string | null;
-  achievements: AchievementData[];
-}
-
-function debugLog(message: string) {
-  const timestamp = new Date().toISOString();
-  const logMessage = `[${timestamp}] ${message}\n`;
-  console.log(logMessage);
-}
-
-debugLog('Insight server starting...');
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const app = express();
-const PORT = process.env['PORT'];
-const BASE_DIR = process.env['BASE_DIR'];
-
-if (!BASE_DIR) {
-  debugLog('BASE_DIR environment variable is required');
-  process.exit(1);
-}
-
-// Serve static assets from the views/assets directory
-app.use(
-  '/assets',
-  express.static(path.join(__dirname, 'insight-page', 'views', 'assets')),
-);
-
-app.get('/', (_req, res) => {
-  res.sendFile(path.join(__dirname, 'insight-page', 'views', 'index.html'));
-});
-
-// API endpoint to get insight data
-app.get('/api/insights', async (_req, res) => {
-  try {
-    debugLog('Received request for insights data');
-    const insights = await generateInsights(BASE_DIR);
-    res.json(insights);
-  } catch (error) {
-    debugLog(`Error generating insights: ${error}`);
-    res.status(500).json({ error: 'Failed to generate insights' });
-  }
-});
-
-// Process chat files from all projects in the base directory and generate insights
-async function generateInsights(baseDir: string): Promise<InsightData> {
-  // Initialize data structures
-  const heatmap: HeatMapData = {};
-  const tokenUsage: TokenUsageData = {};
-  const activeHours: { [hour: number]: number } = {};
-  const sessionStartTimes: { [sessionId: string]: Date } = {};
-  const sessionEndTimes: { [sessionId: string]: Date } = {};
-
-  try {
-    // Get all project directories in the base directory
-    const projectDirs = await fs.readdir(baseDir);
-
-    // Process each project directory
-    for (const projectDir of projectDirs) {
-      const projectPath = path.join(baseDir, projectDir);
-      const stats = await fs.stat(projectPath);
-
-      // Only process if it's a directory
-      if (stats.isDirectory()) {
-        const chatsDir = path.join(projectPath, 'chats');
-
-        let chatFiles: string[] = [];
-        try {
-          // Get all chat files in the chats directory
-          const files = await fs.readdir(chatsDir);
-          chatFiles = files.filter((file) => file.endsWith('.jsonl'));
-        } catch (error) {
-          if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-            debugLog(
-              `Error reading chats directory for project ${projectDir}: ${error}`,
-            );
-          }
-          // Continue to next project if chats directory doesn't exist
-          continue;
-        }
-
-        // Process each chat file in this project
-        for (const file of chatFiles) {
-          const filePath = path.join(chatsDir, file);
-          const records = await read<ChatRecord>(filePath);
-
-          // Process each record
-          for (const record of records) {
-            const timestamp = new Date(record.timestamp);
-            const dateKey = formatDate(timestamp);
-            const hour = timestamp.getHours();
-
-            // Update heatmap (count of interactions per day)
-            heatmap[dateKey] = (heatmap[dateKey] || 0) + 1;
-
-            // Update active hours
-            activeHours[hour] = (activeHours[hour] || 0) + 1;
-
-            // Update token usage
-            if (record.usageMetadata) {
-              const usage = tokenUsage[dateKey] || {
-                input: 0,
-                output: 0,
-                total: 0,
-              };
-
-              usage.input += record.usageMetadata.promptTokenCount || 0;
-              usage.output += record.usageMetadata.candidatesTokenCount || 0;
-              usage.total += record.usageMetadata.totalTokenCount || 0;
-
-              tokenUsage[dateKey] = usage;
-            }
-
-            // Track session times
-            if (!sessionStartTimes[record.sessionId]) {
-              sessionStartTimes[record.sessionId] = timestamp;
-            }
-            sessionEndTimes[record.sessionId] = timestamp;
-          }
-        }
-      }
-    }
-  } catch (error) {
-    if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
-      // Base directory doesn't exist, return empty insights
-      debugLog(`Base directory does not exist: ${baseDir}`);
-    } else {
-      debugLog(`Error reading base directory: ${error}`);
-    }
-  }
-
-  // Calculate streak data
-  const streakData = calculateStreaks(Object.keys(heatmap));
-
-  // Calculate longest work session
-  let longestWorkDuration = 0;
-  let longestWorkDate: string | null = null;
-  for (const sessionId in sessionStartTimes) {
-    const start = sessionStartTimes[sessionId];
-    const end = sessionEndTimes[sessionId];
-    const durationMinutes = Math.round(
-      (end.getTime() - start.getTime()) / (1000 * 60),
-    );
-
-    if (durationMinutes > longestWorkDuration) {
-      longestWorkDuration = durationMinutes;
-      longestWorkDate = formatDate(start);
-    }
-  }
-
-  // Calculate latest active time
-  let latestActiveTime: string | null = null;
-  let latestTimestamp = new Date(0);
-  for (const dateStr in heatmap) {
-    const date = new Date(dateStr);
-    if (date > latestTimestamp) {
-      latestTimestamp = date;
-      latestActiveTime = date.toLocaleTimeString([], {
-        hour: '2-digit',
-        minute: '2-digit',
-      });
-    }
-  }
-
-  // Calculate achievements
-  const achievements = calculateAchievements(activeHours, heatmap, tokenUsage);
-
-  return {
-    heatmap,
-    tokenUsage,
-    currentStreak: streakData.currentStreak,
-    longestStreak: streakData.longestStreak,
-    longestWorkDate,
-    longestWorkDuration,
-    activeHours,
-    latestActiveTime,
-    achievements,
-  };
-}
-
-// Helper function to format date as YYYY-MM-DD
-function formatDate(date: Date): string {
-  return date.toISOString().split('T')[0];
-}
-
-// Calculate streaks from activity dates
-function calculateStreaks(dates: string[]): StreakData {
-  if (dates.length === 0) {
-    return { currentStreak: 0, longestStreak: 0, dates: [] };
-  }
-
-  // Convert string dates to Date objects and sort them
-  const dateObjects = dates.map((dateStr) => new Date(dateStr));
-  dateObjects.sort((a, b) => a.getTime() - b.getTime());
-
-  let currentStreak = 1;
-  let maxStreak = 1;
-  let currentDate = new Date(dateObjects[0]);
-  currentDate.setHours(0, 0, 0, 0); // Normalize to start of day
-
-  for (let i = 1; i < dateObjects.length; i++) {
-    const nextDate = new Date(dateObjects[i]);
-    nextDate.setHours(0, 0, 0, 0); // Normalize to start of day
-
-    // Calculate difference in days
-    const diffDays = Math.floor(
-      (nextDate.getTime() - currentDate.getTime()) / (1000 * 60 * 60 * 24),
-    );
-
-    if (diffDays === 1) {
-      // Consecutive day
-      currentStreak++;
-      maxStreak = Math.max(maxStreak, currentStreak);
-    } else if (diffDays > 1) {
-      // Gap in streak
-      currentStreak = 1;
-    }
-    // If diffDays === 0, same day, so streak continues
-
-    currentDate = nextDate;
-  }
-
-  // Check if the streak is still ongoing (if last activity was yesterday or today)
-  const today = new Date();
-  today.setHours(0, 0, 0, 0);
-  const yesterday = new Date(today);
-  yesterday.setDate(yesterday.getDate() - 1);
-
-  if (
-    currentDate.getTime() === today.getTime() ||
-    currentDate.getTime() === yesterday.getTime()
-  ) {
-    // The streak might still be active, so we don't reset it
-  }
-
-  return {
-    currentStreak,
-    longestStreak: maxStreak,
-    dates,
-  };
-}
-
-// Calculate achievements based on user behavior
-function calculateAchievements(
-  activeHours: { [hour: number]: number },
-  heatmap: HeatMapData,
-  _tokenUsage: TokenUsageData,
-): AchievementData[] {
-  const achievements: AchievementData[] = [];
-
-  // Total activities
-  const totalActivities = Object.values(heatmap).reduce(
-    (sum, count) => sum + count,
-    0,
-  );
-
-  // Total tokens used - commented out since it's not currently used
-  // const totalTokens = Object.values(tokenUsage).reduce((sum, usage) => sum + usage.total, 0);
-
-  // Total sessions
-  const totalSessions = Object.keys(heatmap).length;
-
-  // Calculate percentage of activity per hour
-  const totalHourlyActivity = Object.values(activeHours).reduce(
-    (sum, count) => sum + count,
-    0,
-  );
-  if (totalHourlyActivity > 0) {
-    // Midnight debugger: 20% of sessions happen between 12AM-5AM
-    const midnightActivity =
-      (activeHours[0] || 0) +
-      (activeHours[1] || 0) +
-      (activeHours[2] || 0) +
-      (activeHours[3] || 0) +
-      (activeHours[4] || 0) +
-      (activeHours[5] || 0);
-
-    if (midnightActivity / totalHourlyActivity >= 0.2) {
-      achievements.push({
-        id: 'midnight-debugger',
-        name: 'Midnight Debugger',
-        description: '20% of your sessions happen between 12AM-5AM',
-      });
-    }
-
-    // Morning coder: 20% of sessions happen between 6AM-9AM
-    const morningActivity =
-      (activeHours[6] || 0) +
-      (activeHours[7] || 0) +
-      (activeHours[8] || 0) +
-      (activeHours[9] || 0);
-
-    if (morningActivity / totalHourlyActivity >= 0.2) {
-      achievements.push({
-        id: 'morning-coder',
-        name: 'Morning Coder',
-        description: '20% of your sessions happen between 6AM-9AM',
-      });
-    }
-  }
-
-  // Patient king: average conversation length >= 10 exchanges
-  if (totalSessions > 0) {
-    const avgExchanges = totalActivities / totalSessions;
-    if (avgExchanges >= 10) {
-      achievements.push({
-        id: 'patient-king',
-        name: 'Patient King',
-        description: 'Your average conversation length is 10+ exchanges',
-      });
-    }
-  }
-
-  // Quick finisher: 70% of sessions have <= 2 exchanges
-  let quickSessions = 0;
-  // Since we don't have per-session exchange counts easily available,
-  // we'll estimate based on the distribution of activities
-  if (totalSessions > 0) {
-    // This is a simplified calculation - in a real implementation,
-    // we'd need to count exchanges per session
-    const avgPerSession = totalActivities / totalSessions;
-    if (avgPerSession <= 2) {
-      // Estimate based on low average
-      quickSessions = Math.floor(totalSessions * 0.7);
-    }
-
-    if (quickSessions / totalSessions >= 0.7) {
-      achievements.push({
-        id: 'quick-finisher',
-        name: 'Quick Finisher',
-        description: '70% of your sessions end in 2 exchanges or fewer',
-      });
-    }
-  }
-
-  // Explorer: for users with insufficient data or default
-  if (achievements.length === 0) {
-    achievements.push({
-      id: 'explorer',
-      name: 'Explorer',
-      description: 'Getting started with Qwen Code',
-    });
-  }
-
-  return achievements;
-}
-
-// Start the server
-app.listen(PORT, () => {
-  debugLog(`Server running at http://localhost:${PORT}/`);
-  debugLog(`Analyzing projects in: ${BASE_DIR}`);
-  debugLog('Server is running. Press Ctrl+C to stop.');
-});

packages/cli/src/ui/App.tsx

@@ -5,34 +5,15 @@
  */
 
 import { useIsScreenReaderEnabled } from 'ink';
-import { useTerminalSize } from './hooks/useTerminalSize.js';
-import { lerp } from '../utils/math.js';
 import { useUIState } from './contexts/UIStateContext.js';
 import { StreamingContext } from './contexts/StreamingContext.js';
 import { QuittingDisplay } from './components/QuittingDisplay.js';
 import { ScreenReaderAppLayout } from './layouts/ScreenReaderAppLayout.js';
 import { DefaultAppLayout } from './layouts/DefaultAppLayout.js';
 
-const getContainerWidth = (terminalWidth: number): string => {
-  if (terminalWidth <= 80) {
-    return '98%';
-  }
-  if (terminalWidth >= 132) {
-    return '90%';
-  }
-
-  // Linearly interpolate between 80 columns (98%) and 132 columns (90%).
-  const t = (terminalWidth - 80) / (132 - 80);
-  const percentage = lerp(98, 90, t);
-
-  return `${Math.round(percentage)}%`;
-};
-
 export const App = () => {
   const uiState = useUIState();
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
-  const { columns } = useTerminalSize();
-  const containerWidth = getContainerWidth(columns);
 
   if (uiState.quittingMessages) {
     return <QuittingDisplay />;
@@ -40,11 +21,7 @@ export const App = () => {
 
   return (
     <StreamingContext.Provider value={uiState.streamingState}>
-      {isScreenReaderEnabled ? (
-        <ScreenReaderAppLayout />
-      ) : (
-        <DefaultAppLayout width={containerWidth} />
-      )}
+      {isScreenReaderEnabled ? <ScreenReaderAppLayout /> : <DefaultAppLayout />}
     </StreamingContext.Provider>
   );
 };

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

@@ -294,10 +294,7 @@ describe('AppContainer State Management', () => {
     // Mock LoadedSettings
     mockSettings = {
       merged: {
-        hideBanner: false,
-        hideFooter: false,
         hideTips: false,
-        showMemoryUsage: false,
         theme: 'default',
         ui: {
           showStatusInTitle: false,
@@ -445,10 +442,7 @@ describe('AppContainer State Management', () => {
     it('handles settings with all display options disabled', () => {
       const settingsAllHidden = {
         merged: {
-          hideBanner: true,
-          hideFooter: true,
           hideTips: true,
-          showMemoryUsage: false,
         },
       } as unknown as LoadedSettings;
 
@@ -463,28 +457,6 @@ describe('AppContainer State Management', () => {
         );
       }).not.toThrow();
     });
-
-    it('handles settings with memory usage enabled', () => {
-      const settingsWithMemory = {
-        merged: {
-          hideBanner: false,
-          hideFooter: false,
-          hideTips: false,
-          showMemoryUsage: true,
-        },
-      } as unknown as LoadedSettings;
-
-      expect(() => {
-        render(
-          <AppContainer
-            config={mockConfig}
-            settings={settingsWithMemory}
-            version="1.0.0"
-            initializationResult={mockInitResult}
-          />,
-        );
-      }).not.toThrow();
-    });
   });
 
   describe('Version Handling', () => {

packages/cli/src/ui/AppContainer.tsx

@@ -45,6 +45,7 @@ import process from 'node:process';
 import { useHistory } from './hooks/useHistoryManager.js';
 import { useMemoryMonitor } from './hooks/useMemoryMonitor.js';
 import { useThemeCommand } from './hooks/useThemeCommand.js';
+import { useFeedbackDialog } from './hooks/useFeedbackDialog.js';
 import { useAuthCommand } from './auth/useAuth.js';
 import { useEditorSettings } from './hooks/useEditorSettings.js';
 import { useSettingsCommand } from './hooks/useSettingsCommand.js';
@@ -271,7 +272,8 @@ export const AppContainer = (props: AppContainerProps) => {
       calculatePromptWidths(terminalWidth);
     return { inputWidth, suggestionsWidth };
   }, [terminalWidth]);
-  const mainAreaWidth = Math.floor(terminalWidth * 0.9);
+  // Uniform width for bordered box components: accounts for margins and caps at 100
+  const mainAreaWidth = Math.min(terminalWidth - 4, 100);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
 
   const isValidPath = useCallback((filePath: string): boolean => {
@@ -575,7 +577,6 @@ export const AppContainer = (props: AppContainerProps) => {
         config.getExtensionContextFilePaths(),
         config.isTrustedFolder(),
         settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
-        config.getFileFilteringOptions(),
       );
 
       config.setUserMemory(memoryContent);
@@ -1196,6 +1197,19 @@ export const AppContainer = (props: AppContainerProps) => {
     isApprovalModeDialogOpen ||
     isResumeDialogOpen;
 
+  const {
+    isFeedbackDialogOpen,
+    openFeedbackDialog,
+    closeFeedbackDialog,
+    submitFeedback,
+  } = useFeedbackDialog({
+    config,
+    settings,
+    streamingState,
+    history: historyManager.history,
+    sessionStats,
+  });
+
   const pendingHistoryItems = useMemo(
     () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems],
@@ -1292,6 +1306,8 @@ export const AppContainer = (props: AppContainerProps) => {
       // Subagent dialogs
       isSubagentCreateDialogOpen,
       isAgentsManagerDialogOpen,
+      // Feedback dialog
+      isFeedbackDialogOpen,
     }),
     [
       isThemeDialogOpen,
@@ -1382,11 +1398,15 @@ export const AppContainer = (props: AppContainerProps) => {
       // Subagent dialogs
       isSubagentCreateDialogOpen,
       isAgentsManagerDialogOpen,
+      // Feedback dialog
+      isFeedbackDialogOpen,
     ],
   );
 
   const uiActions: UIActions = useMemo(
     () => ({
+      openThemeDialog,
+      openEditorDialog,
       handleThemeSelect,
       handleThemeHighlight,
       handleApprovalModeSelect,
@@ -1422,8 +1442,14 @@ export const AppContainer = (props: AppContainerProps) => {
       openResumeDialog,
       closeResumeDialog,
       handleResume,
+      // Feedback dialog
+      openFeedbackDialog,
+      closeFeedbackDialog,
+      submitFeedback,
     }),
     [
+      openThemeDialog,
+      openEditorDialog,
       handleThemeSelect,
       handleThemeHighlight,
       handleApprovalModeSelect,
@@ -1457,6 +1483,10 @@ export const AppContainer = (props: AppContainerProps) => {
       openResumeDialog,
       closeResumeDialog,
       handleResume,
+      // Feedback dialog
+      openFeedbackDialog,
+      closeFeedbackDialog,
+      submitFeedback,
     ],
   );
 

packages/cli/src/ui/FeedbackDialog.tsx

@@ -0,0 +1,61 @@
+import { Box, Text } from 'ink';
+import type React from 'react';
+import { t } from '../i18n/index.js';
+import { useUIActions } from './contexts/UIActionsContext.js';
+import { useUIState } from './contexts/UIStateContext.js';
+import { useKeypress } from './hooks/useKeypress.js';
+
+const FEEDBACK_OPTIONS = {
+  GOOD: 1,
+  BAD: 2,
+  NOT_SURE: 3,
+} as const;
+
+const FEEDBACK_OPTION_KEYS = {
+  [FEEDBACK_OPTIONS.GOOD]: '1',
+  [FEEDBACK_OPTIONS.BAD]: '2',
+  [FEEDBACK_OPTIONS.NOT_SURE]: 'any',
+} as const;
+
+export const FEEDBACK_DIALOG_KEYS = ['1', '2'] as const;
+
+export const FeedbackDialog: React.FC = () => {
+  const uiState = useUIState();
+  const uiActions = useUIActions();
+
+  useKeypress(
+    (key) => {
+      if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]) {
+        uiActions.submitFeedback(FEEDBACK_OPTIONS.GOOD);
+      } else if (key.name === FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]) {
+        uiActions.submitFeedback(FEEDBACK_OPTIONS.BAD);
+      } else {
+        uiActions.submitFeedback(FEEDBACK_OPTIONS.NOT_SURE);
+      }
+
+      uiActions.closeFeedbackDialog();
+    },
+    { isActive: uiState.isFeedbackDialogOpen },
+  );
+
+  return (
+    <Box flexDirection="column" marginY={1}>
+      <Box>
+        <Text color="cyan">● </Text>
+        <Text bold>{t('How is Qwen doing this session? (optional)')}</Text>
+      </Box>
+      <Box marginTop={1}>
+        <Text color="cyan">
+          {FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.GOOD]}:{' '}
+        </Text>
+        <Text>{t('Good')}</Text>
+        <Text> </Text>
+        <Text color="cyan">{FEEDBACK_OPTION_KEYS[FEEDBACK_OPTIONS.BAD]}: </Text>
+        <Text>{t('Bad')}</Text>
+        <Text> </Text>
+        <Text color="cyan">{t('Any other key')}: </Text>
+        <Text>{t('Not Sure Yet')}</Text>
+      </Box>
+    </Box>
+  );
+};

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

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config, ModelProvidersConfig } from '@qwen-code/qwen-code-core';
+import type {
+  Config,
+  ContentGeneratorConfig,
+  ModelProvidersConfig,
+} from '@qwen-code/qwen-code-core';
 import {
   AuthEvent,
   AuthType,
@@ -214,11 +218,19 @@ export const useAuthCommand = (
 
       if (authType === AuthType.USE_OPENAI) {
         if (credentials) {
-          config.updateCredentials({
-            apiKey: credentials.apiKey,
-            baseUrl: credentials.baseUrl,
-            model: credentials.model,
-          });
+          // Pass settings.model.generationConfig to updateCredentials so it can be merged
+          // after clearing provider-sourced config. This ensures settings.json generationConfig
+          // fields (e.g., samplingParams, timeout) are preserved.
+          const settingsGenerationConfig = settings.merged.model
+            ?.generationConfig as Partial<ContentGeneratorConfig> | undefined;
+          config.updateCredentials(
+            {
+              apiKey: credentials.apiKey,
+              baseUrl: credentials.baseUrl,
+              model: credentials.model,
+            },
+            settingsGenerationConfig,
+          );
           await performAuth(authType, credentials);
         }
         return;
@@ -226,7 +238,13 @@ export const useAuthCommand = (
 
       await performAuth(authType);
     },
-    [config, performAuth, isProviderManagedModel, onAuthError],
+    [
+      config,
+      performAuth,
+      isProviderManagedModel,
+      onAuthError,
+      settings.merged.model?.generationConfig,
+    ],
   );
 
   const openAuthDialog = useCallback(() => {

packages/cli/src/ui/commands/aboutCommand.test.ts

@@ -64,7 +64,8 @@ describe('aboutCommand', () => {
   });
 
   it('should have the correct name and description', () => {
-    expect(aboutCommand.name).toBe('about');
+    expect(aboutCommand.name).toBe('status');
+    expect(aboutCommand.altNames).toEqual(['about']);
     expect(aboutCommand.description).toBe('show version info');
   });
 

packages/cli/src/ui/commands/aboutCommand.ts

@@ -11,7 +11,8 @@ import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
 import { t } from '../../i18n/index.js';
 
 export const aboutCommand: SlashCommand = {
-  name: 'about',
+  name: 'status',
+  altNames: ['about'],
   get description() {
     return t('show version info');
   },

packages/cli/src/ui/commands/bugCommand.test.ts

@@ -56,27 +56,22 @@ describe('bugCommand', () => {
     if (!bugCommand.action) throw new Error('Action is not defined');
     await bugCommand.action(mockContext, 'A test bug');
 
-    const gitCommitLine =
+    const qwenCodeLine =
       GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
-        : '';
-    const expectedInfo = `
-* **CLI Version:** 0.1.0
-${gitCommitLine}* **Model:** qwen3-coder-plus
-* **Sandbox:** test
-* **OS Platform:** test-platform
-* **OS Arch:** x64
-* **OS Release:** 22.0.0
-* **Node.js Version:** v20.0.0
-* **NPM Version:** 10.0.0
-* **Session ID:** test-session-id
-* **Auth Method:** 
-* **Memory Usage:** 100 MB
-* **IDE Client:** VSCode
-`;
+        ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})`
+        : 'Qwen Code: 0.1.0';
+    const expectedInfo = `${qwenCodeLine}
+Runtime: Node.js v20.0.0 / npm 10.0.0
+IDE Client: VSCode
+OS: test-platform x64 (22.0.0)
+Model: qwen3-coder-plus
+Session ID: test-session-id
+Sandbox: test
+Proxy: no proxy
+Memory Usage: 100 MB`;
     const expectedUrl =
       'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title=A%20test%20bug&info=' +
-      encodeURIComponent(expectedInfo);
+      encodeURIComponent(`\n${expectedInfo}\n`);
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
@@ -95,27 +90,22 @@ ${gitCommitLine}* **Model:** qwen3-coder-plus
     if (!bugCommand.action) throw new Error('Action is not defined');
     await bugCommand.action(mockContext, 'A custom bug');
 
-    const gitCommitLine =
+    const qwenCodeLine =
       GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
-        : '';
-    const expectedInfo = `
-* **CLI Version:** 0.1.0
-${gitCommitLine}* **Model:** qwen3-coder-plus
-* **Sandbox:** test
-* **OS Platform:** test-platform
-* **OS Arch:** x64
-* **OS Release:** 22.0.0
-* **Node.js Version:** v20.0.0
-* **NPM Version:** 10.0.0
-* **Session ID:** test-session-id
-* **Auth Method:** 
-* **Memory Usage:** 100 MB
-* **IDE Client:** VSCode
-`;
+        ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})`
+        : 'Qwen Code: 0.1.0';
+    const expectedInfo = `${qwenCodeLine}
+Runtime: Node.js v20.0.0 / npm 10.0.0
+IDE Client: VSCode
+OS: test-platform x64 (22.0.0)
+Model: qwen3-coder-plus
+Session ID: test-session-id
+Sandbox: test
+Proxy: no proxy
+Memory Usage: 100 MB`;
     const expectedUrl = customTemplate
       .replace('{title}', encodeURIComponent('A custom bug'))
-      .replace('{info}', encodeURIComponent(expectedInfo));
+      .replace('{info}', encodeURIComponent(`\n${expectedInfo}\n`));
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });
@@ -152,28 +142,23 @@ ${gitCommitLine}* **Model:** qwen3-coder-plus
     if (!bugCommand.action) throw new Error('Action is not defined');
     await bugCommand.action(mockContext, 'OpenAI bug');
 
-    const gitCommitLine =
+    const qwenCodeLine =
       GIT_COMMIT_INFO && !['N/A'].includes(GIT_COMMIT_INFO)
-        ? `* **Git Commit:** ${GIT_COMMIT_INFO}\n`
-        : '';
-    const expectedInfo = `
-* **CLI Version:** 0.1.0
-${gitCommitLine}* **Model:** qwen3-coder-plus
-* **Sandbox:** test
-* **OS Platform:** test-platform
-* **OS Arch:** x64
-* **OS Release:** 22.0.0
-* **Node.js Version:** v20.0.0
-* **NPM Version:** 10.0.0
-* **Session ID:** test-session-id
-* **Auth Method:** ${AuthType.USE_OPENAI}
-* **Base URL:** https://api.openai.com/v1
-* **Memory Usage:** 100 MB
-* **IDE Client:** VSCode
-`;
+        ? `Qwen Code: 0.1.0 (${GIT_COMMIT_INFO})`
+        : 'Qwen Code: 0.1.0';
+    const expectedInfo = `${qwenCodeLine}
+Runtime: Node.js v20.0.0 / npm 10.0.0
+IDE Client: VSCode
+OS: test-platform x64 (22.0.0)
+Auth: ${AuthType.USE_OPENAI} (https://api.openai.com/v1)
+Model: qwen3-coder-plus
+Session ID: test-session-id
+Sandbox: test
+Proxy: no proxy
+Memory Usage: 100 MB`;
     const expectedUrl =
       'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title=OpenAI%20bug&info=' +
-      encodeURIComponent(expectedInfo);
+      encodeURIComponent(`\n${expectedInfo}\n`);
 
     expect(open).toHaveBeenCalledWith(expectedUrl);
   });

packages/cli/src/ui/commands/bugCommand.ts

@@ -12,10 +12,7 @@ import {
 } from './types.js';
 import { MessageType } from '../types.js';
 import { getExtendedSystemInfo } from '../../utils/systemInfo.js';
-import {
-  getSystemInfoFields,
-  getFieldValue,
-} from '../../utils/systemInfoFields.js';
+import { getSystemInfoFields } from '../../utils/systemInfoFields.js';
 import { t } from '../../i18n/index.js';
 
 export const bugCommand: SlashCommand = {
@@ -30,11 +27,9 @@ export const bugCommand: SlashCommand = {
 
     const fields = getSystemInfoFields(systemInfo);
 
-    // Generate bug report info using the same field configuration
-    let info = '\n';
-    for (const field of fields) {
-      info += `* **${field.label}:** ${getFieldValue(field, systemInfo)}\n`;
-    }
+    const info = fields
+      .map((field) => `${field.label}: ${field.value}`)
+      .join('\n');
 
     let bugReportUrl =
       'https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&title={title}&info={info}';
@@ -46,7 +41,7 @@ export const bugCommand: SlashCommand = {
 
     bugReportUrl = bugReportUrl
       .replace('{title}', encodeURIComponent(bugDescription))
-      .replace('{info}', encodeURIComponent(info));
+      .replace('{info}', encodeURIComponent(`\n${info}\n`));
 
     context.ui.addItem(
       {

packages/cli/src/ui/commands/directoryCommand.test.tsx

@@ -54,9 +54,7 @@ describe('directoryCommand', () => {
       services: {
         config: mockConfig,
         settings: {
-          merged: {
-            memoryDiscoveryMaxDirs: 1000,
-          },
+          merged: {},
         },
       },
       ui: {

packages/cli/src/ui/commands/directoryCommand.tsx

@@ -119,8 +119,6 @@ export const directoryCommand: SlashCommand = {
                 config.getFolderTrust(),
                 context.services.settings.merged.context?.importFormat ||
                   'tree', // Use setting or default to 'tree'
-                config.getFileFilteringOptions(),
-                context.services.settings.merged.context?.discoveryMaxDirs,
               );
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);

packages/cli/src/ui/commands/insightCommand.ts

@@ -1,190 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Code
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type { CommandContext, SlashCommand } from './types.js';
-import { CommandKind } from './types.js';
-import { MessageType } from '../types.js';
-import { t } from '../../i18n/index.js';
-import { spawn } from 'child_process';
-import { join } from 'path';
-import os from 'os';
-import { registerCleanup } from '../../utils/cleanup.js';
-import net from 'net';
-
-// Track the insight server subprocess so we can terminate it on quit
-let insightServerProcess: import('child_process').ChildProcess | null = null;
-
-// Find an available port starting from a default port
-async function findAvailablePort(startingPort: number = 3000): Promise<number> {
-  return new Promise((resolve, reject) => {
-    let port = startingPort;
-
-    const checkPort = () => {
-      const server = net.createServer();
-
-      server.listen(port, () => {
-        server.once('close', () => {
-          resolve(port);
-        });
-        server.close();
-      });
-
-      server.on('error', (err: NodeJS.ErrnoException) => {
-        if (err.code === 'EADDRINUSE') {
-          port++; // Try next port
-          checkPort();
-        } else {
-          reject(err);
-        }
-      });
-    };
-
-    checkPort();
-  });
-}
-
-export const insightCommand: SlashCommand = {
-  name: 'insight',
-  get description() {
-    return t(
-      'generate personalized programming insights from your chat history',
-    );
-  },
-  kind: CommandKind.BUILT_IN,
-  action: async (context: CommandContext) => {
-    try {
-      context.ui.setDebugMessage(t('Starting insight server...'));
-
-      // If there's an existing insight server process, terminate it first
-      if (insightServerProcess && !insightServerProcess.killed) {
-        insightServerProcess.kill();
-        insightServerProcess = null;
-      }
-
-      // Find an available port
-      const availablePort = await findAvailablePort(3000);
-
-      const projectsDir = join(os.homedir(), '.qwen', 'projects');
-
-      // Path to the insight server script
-      const insightScriptPath = join(
-        process.cwd(),
-        'packages',
-        'cli',
-        'src',
-        'services',
-        'insightServer.ts',
-      );
-
-      // Spawn the insight server process
-      const serverProcess = spawn('npx', ['tsx', insightScriptPath], {
-        stdio: 'pipe',
-        env: {
-          ...process.env,
-          NODE_ENV: 'production',
-          BASE_DIR: projectsDir,
-          PORT: String(availablePort),
-        },
-      });
-
-      // Store the server process for cleanup
-      insightServerProcess = serverProcess;
-
-      // Register cleanup function to terminate the server process on quit
-      registerCleanup(() => {
-        if (insightServerProcess && !insightServerProcess.killed) {
-          insightServerProcess.kill();
-          insightServerProcess = null;
-        }
-      });
-
-      serverProcess.stderr.on('data', (data) => {
-        // Forward error output to parent process stderr
-        process.stderr.write(`Insight server error: ${data}`);
-
-        context.ui.addItem(
-          {
-            type: MessageType.ERROR,
-            text: `Insight server error: ${data.toString()}`,
-          },
-          Date.now(),
-        );
-      });
-
-      serverProcess.on('close', (code) => {
-        console.log(`Insight server process exited with code ${code}`);
-        context.ui.setDebugMessage(t('Insight server stopped.'));
-        // Reset the reference when the process closes
-        if (insightServerProcess === serverProcess) {
-          insightServerProcess = null;
-        }
-      });
-
-      const url = `http://localhost:${availablePort}`;
-
-      // Open browser automatically
-      const openBrowser = async () => {
-        try {
-          const { exec } = await import('child_process');
-          const { promisify } = await import('util');
-          const execAsync = promisify(exec);
-
-          switch (process.platform) {
-            case 'darwin': // macOS
-              await execAsync(`open ${url}`);
-              break;
-            case 'win32': // Windows
-              await execAsync(`start ${url}`);
-              break;
-            default: // Linux and others
-              await execAsync(`xdg-open ${url}`);
-          }
-
-          context.ui.addItem(
-            {
-              type: MessageType.INFO,
-              text: `Insight server started. Visit: ${url}`,
-            },
-            Date.now(),
-          );
-        } catch (err) {
-          console.error('Failed to open browser automatically:', err);
-          context.ui.addItem(
-            {
-              type: MessageType.INFO,
-              text: `Insight server started. Please visit: ${url}`,
-            },
-            Date.now(),
-          );
-        }
-      };
-
-      // Wait for the server to start (give it some time to bind to the port)
-      setTimeout(openBrowser, 1000);
-
-      // Inform the user that the server is running
-      context.ui.addItem(
-        {
-          type: MessageType.INFO,
-          text: t(
-            'Insight server started. Check your browser for the visualization.',
-          ),
-        },
-        Date.now(),
-      );
-    } catch (error) {
-      context.ui.addItem(
-        {
-          type: MessageType.ERROR,
-          text: t('Failed to start insight server: {{error}}', {
-            error: (error as Error).message,
-          }),
-        },
-        Date.now(),
-      );
-    }
-  },
-};

packages/cli/src/ui/commands/memoryCommand.test.ts

@@ -299,9 +299,7 @@ describe('memoryCommand', () => {
         services: {
           config: mockConfig,
           settings: {
-            merged: {
-              memoryDiscoveryMaxDirs: 1000,
-            },
+            merged: {},
           } as LoadedSettings,
         },
       });

packages/cli/src/ui/commands/memoryCommand.ts

@@ -315,8 +315,6 @@ export const memoryCommand: SlashCommand = {
                 config.getFolderTrust(),
                 context.services.settings.merged.context?.importFormat ||
                   'tree', // Use setting or default to 'tree'
-                config.getFileFilteringOptions(),
-                context.services.settings.merged.context?.discoveryMaxDirs,
               );
             config.setUserMemory(memoryContent);
             config.setGeminiMdFileCount(fileCount);

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

@@ -8,16 +8,14 @@ import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import type { ExtendedSystemInfo } from '../../utils/systemInfo.js';
-import {
-  getSystemInfoFields,
-  getFieldValue,
-  type SystemInfoField,
-} from '../../utils/systemInfoFields.js';
+import { getSystemInfoFields } from '../../utils/systemInfoFields.js';
 import { t } from '../../i18n/index.js';
 
-type AboutBoxProps = ExtendedSystemInfo;
+type AboutBoxProps = ExtendedSystemInfo & {
+  width?: number;
+};
 
-export const AboutBox: React.FC<AboutBoxProps> = (props) => {
+export const AboutBox: React.FC<AboutBoxProps> = ({ width, ...props }) => {
   const fields = getSystemInfoFields(props);
 
   return (
@@ -26,25 +24,26 @@ export const AboutBox: React.FC<AboutBoxProps> = (props) => {
       borderColor={theme.border.default}
       flexDirection="column"
       padding={1}
-      marginY={1}
-      width="100%"
+      width={width}
     >
       <Box marginBottom={1}>
         <Text bold color={theme.text.accent}>
-          {t('About Qwen Code')}
+          {t('Status')}
         </Text>
       </Box>
-      {fields.map((field: SystemInfoField) => (
-        <Box key={field.key} flexDirection="row">
+      {fields.map((field) => (
+        <Box
+          key={field.label}
+          flexDirection="row"
+          marginTop={field.label === t('Auth') ? 1 : 0}
+        >
           <Box width="35%">
             <Text bold color={theme.text.link}>
               {field.label}
             </Text>
           </Box>
           <Box>
-            <Text color={theme.text.primary}>
-              {getFieldValue(field, props)}
-            </Text>
+            <Text color={theme.text.primary}>{field.value}</Text>
           </Box>
         </Box>
       ))}

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

@@ -0,0 +1,93 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { render } from 'ink-testing-library';
+import { describe, expect, it, vi } from 'vitest';
+import { AppHeader } from './AppHeader.js';
+import { ConfigContext } from '../contexts/ConfigContext.js';
+import { SettingsContext } from '../contexts/SettingsContext.js';
+import { type UIState, UIStateContext } from '../contexts/UIStateContext.js';
+import { VimModeProvider } from '../contexts/VimModeContext.js';
+import * as useTerminalSize from '../hooks/useTerminalSize.js';
+import type { LoadedSettings } from '../../config/settings.js';
+
+vi.mock('../hooks/useTerminalSize.js');
+const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize);
+
+const createSettings = (options?: { hideTips?: boolean }): LoadedSettings =>
+  ({
+    merged: {
+      ui: {
+        hideTips: options?.hideTips ?? true,
+      },
+    },
+  }) as never;
+
+const createMockConfig = (overrides = {}) => ({
+  getContentGeneratorConfig: vi.fn(() => ({ authType: undefined })),
+  getModel: vi.fn(() => 'gemini-pro'),
+  getTargetDir: vi.fn(() => '/projects/qwen-code'),
+  getMcpServers: vi.fn(() => ({})),
+  getBlockedMcpServers: vi.fn(() => []),
+  getDebugMode: vi.fn(() => false),
+  getScreenReader: vi.fn(() => false),
+  ...overrides,
+});
+
+const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
+  ({
+    branchName: 'main',
+    nightly: false,
+    debugMessage: '',
+    sessionStats: {
+      lastPromptTokenCount: 0,
+    },
+    ...overrides,
+  }) as UIState;
+
+const renderWithProviders = (
+  uiState: UIState,
+  settings = createSettings(),
+  config = createMockConfig(),
+) => {
+  useTerminalSizeMock.mockReturnValue({ columns: 120, rows: 24 });
+  return render(
+    <ConfigContext.Provider value={config as never}>
+      <SettingsContext.Provider value={settings}>
+        <VimModeProvider settings={settings}>
+          <UIStateContext.Provider value={uiState}>
+            <AppHeader version="1.2.3" />
+          </UIStateContext.Provider>
+        </VimModeProvider>
+      </SettingsContext.Provider>
+    </ConfigContext.Provider>,
+  );
+};
+
+describe('<AppHeader />', () => {
+  it('shows the working directory', () => {
+    const { lastFrame } = renderWithProviders(createMockUIState());
+    expect(lastFrame()).toContain('/projects/qwen-code');
+  });
+
+  it('hides the header when screen reader is enabled', () => {
+    const { lastFrame } = renderWithProviders(
+      createMockUIState(),
+      createSettings(),
+      createMockConfig({ getScreenReader: vi.fn(() => true) }),
+    );
+    // When screen reader is enabled, header is not rendered
+    expect(lastFrame()).not.toContain('/projects/qwen-code');
+    expect(lastFrame()).not.toContain('Qwen Code');
+  });
+
+  it('shows the header with all info when banner is visible', () => {
+    const { lastFrame } = renderWithProviders(createMockUIState());
+    expect(lastFrame()).toContain('>_ Qwen Code');
+    expect(lastFrame()).toContain('gemini-pro');
+    expect(lastFrame()).toContain('/projects/qwen-code');
+  });
+});

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

@@ -9,7 +9,6 @@ import { Header } from './Header.js';
 import { Tips } from './Tips.js';
 import { useSettings } from '../contexts/SettingsContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import { useUIState } from '../contexts/UIStateContext.js';
 
 interface AppHeaderProps {
   version: string;
@@ -18,16 +17,25 @@ interface AppHeaderProps {
 export const AppHeader = ({ version }: AppHeaderProps) => {
   const settings = useSettings();
   const config = useConfig();
-  const { nightly } = useUIState();
+
+  const contentGeneratorConfig = config.getContentGeneratorConfig();
+  const authType = contentGeneratorConfig?.authType;
+  const model = config.getModel();
+  const targetDir = config.getTargetDir();
+  const showBanner = !config.getScreenReader();
+  const showTips = !(settings.merged.ui?.hideTips || config.getScreenReader());
 
   return (
     <Box flexDirection="column">
-      {!(settings.merged.ui?.hideBanner || config.getScreenReader()) && (
-        <Header version={version} nightly={nightly} />
-      )}
-      {!(settings.merged.ui?.hideTips || config.getScreenReader()) && (
-        <Tips config={config} />
+      {showBanner && (
+        <Header
+          version={version}
+          authType={authType}
+          model={model}
+          workingDirectory={targetDir}
+        />
       )}
+      {showTips && <Tips />}
     </Box>
   );
 };

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

@@ -54,7 +54,7 @@ export function ApprovalModeDialog({
 }: ApprovalModeDialogProps): React.JSX.Element {
   // Start with User scope by default
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.Workspace,
+    SettingScope.User,
   );
 
   // Track the currently highlighted approval mode
@@ -90,19 +90,17 @@ export function ApprovalModeDialog({
     setSelectedScope(scope);
   }, []);
 
-  const handleScopeSelect = useCallback(
-    (scope: SettingScope) => {
-      onSelect(highlightedMode, scope);
-    },
-    [onSelect, highlightedMode],
-  );
+  const handleScopeSelect = useCallback((scope: SettingScope) => {
+    setSelectedScope(scope);
+    setMode('mode');
+  }, []);
 
-  const [focusSection, setFocusSection] = useState<'mode' | 'scope'>('mode');
+  const [mode, setMode] = useState<'mode' | 'scope'>('mode');
 
   useKeypress(
     (key) => {
       if (key.name === 'tab') {
-        setFocusSection((prev) => (prev === 'mode' ? 'scope' : 'mode'));
+        setMode((prev) => (prev === 'mode' ? 'scope' : 'mode'));
       }
       if (key.name === 'escape') {
         onSelect(undefined, selectedScope);
@@ -127,59 +125,56 @@ export function ApprovalModeDialog({
     <Box
       borderStyle="round"
       borderColor={theme.border.default}
-      flexDirection="row"
+      flexDirection="column"
       padding={1}
       width="100%"
-      height="100%"
     >
-      <Box flexDirection="column" flexGrow={1}>
-        {/* Approval Mode Selection */}
-        <Text bold={focusSection === 'mode'} wrap="truncate">
-          {focusSection === 'mode' ? '> ' : '  '}
-          {t('Approval Mode')}{' '}
-          <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
-        </Text>
-        <Box height={1} />
-        <RadioButtonSelect
-          items={modeItems}
-          initialIndex={safeInitialModeIndex}
-          onSelect={handleModeSelect}
-          onHighlight={handleModeHighlight}
-          isFocused={focusSection === 'mode'}
-          maxItemsToShow={10}
-          showScrollArrows={false}
-          showNumbers={focusSection === 'mode'}
-        />
-
-        <Box height={1} />
-
-        {/* Scope Selection */}
-        <Box marginTop={1}>
-          <ScopeSelector
-            onSelect={handleScopeSelect}
-            onHighlight={handleScopeHighlight}
-            isFocused={focusSection === 'scope'}
-            initialScope={selectedScope}
-          />
-        </Box>
-
-        <Box height={1} />
-
-        {/* Warning when workspace setting will override user setting */}
-        {showWorkspacePriorityWarning && (
-          <>
-            <Text color={theme.status.warning} wrap="wrap">
-              ⚠{' '}
-              {t(
-                'Workspace approval mode exists and takes priority. User-level change will have no effect.',
-              )}
+      {mode === 'mode' ? (
+        <Box flexDirection="column" flexGrow={1}>
+          {/* Approval Mode Selection */}
+          <Text bold={mode === 'mode'} wrap="truncate">
+            {mode === 'mode' ? '> ' : '  '}
+            {t('Approval Mode')}{' '}
+            <Text color={theme.text.secondary}>
+              {otherScopeModifiedMessage}
             </Text>
-            <Box height={1} />
-          </>
-        )}
-
-        <Text color={theme.text.secondary}>
-          {t('(Use Enter to select, Tab to change focus)')}
+          </Text>
+          <Box height={1} />
+          <RadioButtonSelect
+            items={modeItems}
+            initialIndex={safeInitialModeIndex}
+            onSelect={handleModeSelect}
+            onHighlight={handleModeHighlight}
+            isFocused={mode === 'mode'}
+            maxItemsToShow={10}
+            showScrollArrows={false}
+            showNumbers={mode === 'mode'}
+          />
+          {/* Warning when workspace setting will override user setting */}
+          {showWorkspacePriorityWarning && (
+            <Box marginTop={1}>
+              <Text color={theme.status.warning} wrap="wrap">
+                ⚠{' '}
+                {t(
+                  'Workspace approval mode exists and takes priority. User-level change will have no effect.',
+                )}
+              </Text>
+            </Box>
+          )}
+        </Box>
+      ) : (
+        <ScopeSelector
+          onSelect={handleScopeSelect}
+          onHighlight={handleScopeHighlight}
+          isFocused={mode === 'scope'}
+          initialScope={selectedScope}
+        />
+      )}
+      <Box marginTop={1}>
+        <Text color={theme.text.secondary} wrap="truncate">
+          {mode === 'mode'
+            ? t('(Use Enter to select, Tab to configure scope)')
+            : t('(Use Enter to apply scope, Tab to go back)')}
         </Text>
       </Box>
     </Box>

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

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

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

@@ -14,7 +14,6 @@ import {
   type UIActions,
 } from '../contexts/UIActionsContext.js';
 import { ConfigContext } from '../contexts/ConfigContext.js';
-import { SettingsContext } from '../contexts/SettingsContext.js';
 // Mock VimModeContext hook
 vi.mock('../contexts/VimModeContext.js', () => ({
   useVimMode: vi.fn(() => ({
@@ -146,92 +145,33 @@ const createMockConfig = (overrides = {}) => ({
   ...overrides,
 });
 
-const createMockSettings = (merged = {}) => ({
-  merged: {
-    hideFooter: false,
-    showMemoryUsage: false,
-    ...merged,
-  },
-});
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const renderComposer = (
   uiState: UIState,
-  settings = createMockSettings(),
   config = createMockConfig(),
   uiActions = createMockUIActions(),
 ) =>
   render(
     <ConfigContext.Provider value={config as any}>
-      <SettingsContext.Provider value={settings as any}>
-        <UIStateContext.Provider value={uiState}>
-          <UIActionsContext.Provider value={uiActions}>
-            <Composer />
-          </UIActionsContext.Provider>
-        </UIStateContext.Provider>
-      </SettingsContext.Provider>
+      <UIStateContext.Provider value={uiState}>
+        <UIActionsContext.Provider value={uiActions}>
+          <Composer />
+        </UIActionsContext.Provider>
+      </UIStateContext.Provider>
     </ConfigContext.Provider>,
   );
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
 describe('Composer', () => {
-  describe('Footer Display Settings', () => {
-    it('renders Footer by default when hideFooter is false', () => {
+  describe('Footer Display', () => {
+    it('renders Footer by default', () => {
       const uiState = createMockUIState();
-      const settings = createMockSettings({ hideFooter: false });
 
-      const { lastFrame } = renderComposer(uiState, settings);
+      const { lastFrame } = renderComposer(uiState);
 
-      // Smoke check that the Footer renders when enabled.
+      // Smoke check that the Footer renders
       expect(lastFrame()).toContain('Footer');
     });
-
-    it('does NOT render Footer when hideFooter is true', () => {
-      const uiState = createMockUIState();
-      const settings = createMockSettings({ hideFooter: true });
-
-      const { lastFrame } = renderComposer(uiState, settings);
-
-      // Check for content that only appears IN the Footer component itself
-      expect(lastFrame()).not.toContain('[NORMAL]'); // Vim mode indicator
-      expect(lastFrame()).not.toContain('(main'); // Branch name with parentheses
-    });
-
-    it('passes correct props to Footer including vim mode when enabled', async () => {
-      const uiState = createMockUIState({
-        branchName: 'feature-branch',
-        errorCount: 2,
-        sessionStats: {
-          sessionId: 'test-session',
-          sessionStartTime: new Date(),
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          metrics: {} as any,
-          lastPromptTokenCount: 150,
-          promptCount: 5,
-        },
-      });
-      const config = createMockConfig({
-        getModel: vi.fn(() => 'gemini-1.5-flash'),
-        getTargetDir: vi.fn(() => '/project/path'),
-        getDebugMode: vi.fn(() => true),
-      });
-      const settings = createMockSettings({
-        hideFooter: false,
-        showMemoryUsage: true,
-      });
-      // Mock vim mode for this test
-      const { useVimMode } = await import('../contexts/VimModeContext.js');
-      vi.mocked(useVimMode).mockReturnValueOnce({
-        vimEnabled: true,
-        vimMode: 'INSERT',
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      } as any);
-
-      const { lastFrame } = renderComposer(uiState, settings, config);
-
-      expect(lastFrame()).toContain('Footer');
-      // Footer should be rendered with all the state passed through
-    });
   });
 
   describe('Loading Indicator', () => {
@@ -261,7 +201,7 @@ describe('Composer', () => {
         getAccessibility: vi.fn(() => ({ disableLoadingPhrases: true })),
       });
 
-      const { lastFrame } = renderComposer(uiState, undefined, config);
+      const { lastFrame } = renderComposer(uiState, config);
 
       const output = lastFrame();
       expect(output).toContain('LoadingIndicator');
@@ -318,7 +258,8 @@ describe('Composer', () => {
   });
 
   describe('Context and Status Display', () => {
-    it('shows ContextSummaryDisplay in normal state', () => {
+    // Note: ContextSummaryDisplay and status prompts are now rendered in Footer, not Composer
+    it('shows empty space in normal state (ContextSummaryDisplay moved to Footer)', () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: false,
         ctrlDPressedOnce: false,
@@ -327,37 +268,43 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('ContextSummaryDisplay');
+      // ContextSummaryDisplay is now in Footer, so we just verify normal state renders
+      expect(lastFrame()).toBeDefined();
     });
 
-    it('shows Ctrl+C exit prompt when ctrlCPressedOnce is true', () => {
+    // Note: Ctrl+C, Ctrl+D, and Escape prompts are now rendered in Footer component
+    // These are tested in Footer.test.tsx
+    it('renders Footer which handles Ctrl+C exit prompt', () => {
       const uiState = createMockUIState({
         ctrlCPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Ctrl+C again to exit');
+      // Ctrl+C prompt is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
 
-    it('shows Ctrl+D exit prompt when ctrlDPressedOnce is true', () => {
+    it('renders Footer which handles Ctrl+D exit prompt', () => {
       const uiState = createMockUIState({
         ctrlDPressedOnce: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Ctrl+D again to exit');
+      // Ctrl+D prompt is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
 
-    it('shows escape prompt when showEscapePrompt is true', () => {
+    it('renders Footer which handles escape prompt', () => {
       const uiState = createMockUIState({
         showEscapePrompt: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('Press Esc again to clear');
+      // Escape prompt is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
   });
 
@@ -382,7 +329,9 @@ describe('Composer', () => {
       expect(lastFrame()).not.toContain('InputPrompt');
     });
 
-    it('shows AutoAcceptIndicator when approval mode is not default and shell mode is inactive', () => {
+    // Note: AutoAcceptIndicator and ShellModeIndicator are now rendered inside Footer component
+    // These are tested in Footer.test.tsx
+    it('renders Footer which contains AutoAcceptIndicator when approval mode is not default', () => {
       const uiState = createMockUIState({
         showAutoAcceptIndicator: ApprovalMode.YOLO,
         shellModeActive: false,
@@ -390,17 +339,19 @@ describe('Composer', () => {
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('AutoAcceptIndicator');
+      // AutoAcceptIndicator is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
 
-    it('shows ShellModeIndicator when shell mode is active', () => {
+    it('renders Footer which contains ShellModeIndicator when shell mode is active', () => {
       const uiState = createMockUIState({
         shellModeActive: true,
       });
 
       const { lastFrame } = renderComposer(uiState);
 
-      expect(lastFrame()).toContain('ShellModeIndicator');
+      // ShellModeIndicator is now inside Footer, verify Footer renders
+      expect(lastFrame()).toContain('Footer');
     });
   });
 

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

@@ -4,42 +4,47 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { Box, Text, useIsScreenReaderEnabled } from 'ink';
-import { useMemo } from 'react';
+import { Box, useIsScreenReaderEnabled } from 'ink';
+import { useCallback, useMemo, useState } from 'react';
 import { LoadingIndicator } from './LoadingIndicator.js';
-import { ContextSummaryDisplay } from './ContextSummaryDisplay.js';
-import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
-import { ShellModeIndicator } from './ShellModeIndicator.js';
 import { DetailedMessagesDisplay } from './DetailedMessagesDisplay.js';
 import { InputPrompt, calculatePromptWidths } from './InputPrompt.js';
 import { Footer } from './Footer.js';
 import { ShowMoreLines } from './ShowMoreLines.js';
 import { QueuedMessageDisplay } from './QueuedMessageDisplay.js';
+import { KeyboardShortcuts } from './KeyboardShortcuts.js';
 import { OverflowProvider } from '../contexts/OverflowContext.js';
-import { theme } from '../semantic-colors.js';
-import { isNarrowWidth } from '../utils/isNarrowWidth.js';
 import { useUIState } from '../contexts/UIStateContext.js';
 import { useUIActions } from '../contexts/UIActionsContext.js';
 import { useVimMode } from '../contexts/VimModeContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
-import { ApprovalMode } from '@qwen-code/qwen-code-core';
 import { StreamingState } from '../types.js';
 import { ConfigInitDisplay } from '../components/ConfigInitDisplay.js';
+import { FeedbackDialog } from '../FeedbackDialog.js';
 import { t } from '../../i18n/index.js';
 
 export const Composer = () => {
   const config = useConfig();
-  const settings = useSettings();
   const isScreenReaderEnabled = useIsScreenReaderEnabled();
   const uiState = useUIState();
   const uiActions = useUIActions();
   const { vimEnabled } = useVimMode();
   const terminalWidth = process.stdout.columns;
-  const isNarrow = isNarrowWidth(terminalWidth);
   const debugConsoleMaxHeight = Math.floor(Math.max(terminalWidth * 0.2, 5));
 
-  const { contextFileNames, showAutoAcceptIndicator } = uiState;
+  const { showAutoAcceptIndicator } = uiState;
+
+  // State for keyboard shortcuts display toggle
+  const [showShortcuts, setShowShortcuts] = useState(false);
+  const handleToggleShortcuts = useCallback(() => {
+    setShowShortcuts((prev) => !prev);
+  }, []);
+
+  // State for suggestions visibility
+  const [showSuggestions, setShowSuggestions] = useState(false);
+  const handleSuggestionsVisibilityChange = useCallback((visible: boolean) => {
+    setShowSuggestions(visible);
+  }, []);
 
   // Use the container width of InputPrompt for width of DetailedMessagesDisplay
   const { containerWidth } = useMemo(
@@ -48,7 +53,7 @@ export const Composer = () => {
   );
 
   return (
-    <Box flexDirection="column">
+    <Box flexDirection="column" marginTop={1}>
       {!uiState.embeddedShellFocused && (
         <LoadingIndicator
           thought={
@@ -70,55 +75,6 @@ export const Composer = () => {
 
       <QueuedMessageDisplay messageQueue={uiState.messageQueue} />
 
-      <Box
-        marginTop={1}
-        justifyContent={
-          settings.merged.ui?.hideContextSummary
-            ? 'flex-start'
-            : 'space-between'
-        }
-        width="100%"
-        flexDirection={isNarrow ? 'column' : 'row'}
-        alignItems={isNarrow ? 'flex-start' : 'center'}
-      >
-        <Box marginRight={1}>
-          {process.env['GEMINI_SYSTEM_MD'] && (
-            <Text color={theme.status.error}>|⌐■_■| </Text>
-          )}
-          {uiState.ctrlCPressedOnce ? (
-            <Text color={theme.status.warning}>
-              {t('Press Ctrl+C again to exit.')}
-            </Text>
-          ) : uiState.ctrlDPressedOnce ? (
-            <Text color={theme.status.warning}>
-              {t('Press Ctrl+D again to exit.')}
-            </Text>
-          ) : uiState.showEscapePrompt ? (
-            <Text color={theme.text.secondary}>
-              {t('Press Esc again to clear.')}
-            </Text>
-          ) : (
-            !settings.merged.ui?.hideContextSummary && (
-              <ContextSummaryDisplay
-                ideContext={uiState.ideContextState}
-                geminiMdFileCount={uiState.geminiMdFileCount}
-                contextFileNames={contextFileNames}
-                mcpServers={config.getMcpServers()}
-                blockedMcpServers={config.getBlockedMcpServers()}
-                showToolDescriptions={uiState.showToolDescriptions}
-              />
-            )
-          )}
-        </Box>
-        <Box paddingTop={isNarrow ? 1 : 0}>
-          {showAutoAcceptIndicator !== ApprovalMode.DEFAULT &&
-            !uiState.shellModeActive && (
-              <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
-            )}
-          {uiState.shellModeActive && <ShellModeIndicator />}
-        </Box>
-      </Box>
-
       {uiState.showErrorDetails && (
         <OverflowProvider>
           <Box flexDirection="column">
@@ -134,6 +90,8 @@ export const Composer = () => {
         </OverflowProvider>
       )}
 
+      {uiState.isFeedbackDialogOpen && <FeedbackDialog />}
+
       {uiState.isInputActive && (
         <InputPrompt
           buffer={uiState.buffer}
@@ -149,6 +107,9 @@ export const Composer = () => {
           setShellModeActive={uiActions.setShellModeActive}
           approvalMode={showAutoAcceptIndicator}
           onEscapePromptChange={uiActions.onEscapePromptChange}
+          onToggleShortcuts={handleToggleShortcuts}
+          showShortcuts={showShortcuts}
+          onSuggestionsVisibilityChange={handleSuggestionsVisibilityChange}
           focus={true}
           vimHandleInput={uiActions.vimHandleInput}
           isEmbeddedShellFocused={uiState.embeddedShellFocused}
@@ -160,7 +121,13 @@ export const Composer = () => {
         />
       )}
 
-      {!settings.merged.ui?.hideFooter && !isScreenReaderEnabled && <Footer />}
+      {/* Exclusive area: only one component visible at a time */}
+      {!showSuggestions &&
+        (showShortcuts ? (
+          <KeyboardShortcuts />
+        ) : (
+          !isScreenReaderEnabled && <Footer />
+        ))}
     </Box>
   );
 };

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

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

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

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

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

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

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

@@ -152,12 +152,38 @@ export const DialogManager = ({
       </Box>
     );
   }
+  if (uiState.isEditorDialogOpen) {
+    return (
+      <Box flexDirection="column">
+        {uiState.editorError && (
+          <Box marginBottom={1}>
+            <Text color={theme.status.error}>{uiState.editorError}</Text>
+          </Box>
+        )}
+        <EditorSettingsDialog
+          onSelect={uiActions.handleEditorSelect}
+          settings={settings}
+          onExit={uiActions.exitEditorDialog}
+        />
+      </Box>
+    );
+  }
   if (uiState.isSettingsDialogOpen) {
     return (
       <Box flexDirection="column">
         <SettingsDialog
           settings={settings}
-          onSelect={() => uiActions.closeSettingsDialog()}
+          onSelect={(settingName) => {
+            if (settingName === 'ui.theme') {
+              uiActions.openThemeDialog();
+              return;
+            }
+            if (settingName === 'general.preferredEditor') {
+              uiActions.openEditorDialog();
+              return;
+            }
+            uiActions.closeSettingsDialog();
+          }}
           onRestartRequest={() => process.exit(0)}
           availableTerminalHeight={terminalHeight - staticExtraHeight}
           config={config}
@@ -237,22 +263,6 @@ export const DialogManager = ({
       );
     }
   }
-  if (uiState.isEditorDialogOpen) {
-    return (
-      <Box flexDirection="column">
-        {uiState.editorError && (
-          <Box marginBottom={1}>
-            <Text color={theme.status.error}>{uiState.editorError}</Text>
-          </Box>
-        )}
-        <EditorSettingsDialog
-          onSelect={uiActions.handleEditorSelect}
-          settings={settings}
-          onExit={uiActions.exitEditorDialog}
-        />
-      </Box>
-    );
-  }
   if (uiState.isPermissionsDialogOpen) {
     return (
       <PermissionsModifyTrustDialog

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

@@ -14,6 +14,7 @@ import {
   type EditorDisplay,
 } from '../editors/editorSettingsManager.js';
 import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { ScopeSelector } from './shared/ScopeSelector.js';
 import type { LoadedSettings } from '../../config/settings.js';
 import { SettingScope } from '../../config/settings.js';
 import type { EditorType } from '@qwen-code/qwen-code-core';
@@ -35,13 +36,12 @@ export function EditorSettingsDialog({
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
     SettingScope.User,
   );
-  const [focusedSection, setFocusedSection] = useState<'editor' | 'scope'>(
-    'editor',
-  );
+  const [mode, setMode] = useState<'editor' | 'scope'>('editor');
+
   useKeypress(
     (key) => {
       if (key.name === 'tab') {
-        setFocusedSection((prev) => (prev === 'editor' ? 'scope' : 'editor'));
+        setMode((prev) => (prev === 'editor' ? 'scope' : 'editor'));
       }
       if (key.name === 'escape') {
         onExit();
@@ -65,23 +65,6 @@ export function EditorSettingsDialog({
     editorIndex = 0;
   }
 
-  const scopeItems = [
-    {
-      get label() {
-        return t('User Settings');
-      },
-      value: SettingScope.User,
-      key: SettingScope.User,
-    },
-    {
-      get label() {
-        return t('Workspace Settings');
-      },
-      value: SettingScope.Workspace,
-      key: SettingScope.Workspace,
-    },
-  ];
-
   const handleEditorSelect = (editorType: EditorType | 'not_set') => {
     if (editorType === 'not_set') {
       onSelect(undefined, selectedScope);
@@ -92,7 +75,11 @@ export function EditorSettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     setSelectedScope(scope);
-    setFocusedSection('editor');
+    setMode('editor');
+  };
+
+  const handleScopeHighlight = (scope: SettingScope) => {
+    setSelectedScope(scope);
   };
 
   let otherScopeModifiedMessage = '';
@@ -131,54 +118,59 @@ export function EditorSettingsDialog({
       width="100%"
     >
       <Box flexDirection="column" width="45%" paddingRight={2}>
-        <Text bold={focusedSection === 'editor'}>
-          {focusedSection === 'editor' ? '> ' : '  '}Select Editor{' '}
-          <Text color={theme.text.secondary}>{otherScopeModifiedMessage}</Text>
-        </Text>
-        <RadioButtonSelect
-          items={editorItems.map((item) => ({
-            label: item.name,
-            value: item.type,
-            disabled: item.disabled,
-            key: item.type,
-          }))}
-          initialIndex={editorIndex}
-          onSelect={handleEditorSelect}
-          isFocused={focusedSection === 'editor'}
-          key={selectedScope}
-        />
-
-        <Box marginTop={1} flexDirection="column">
-          <Text bold={focusedSection === 'scope'}>
-            {focusedSection === 'scope' ? '> ' : '  '}
-            {t('Apply To')}
-          </Text>
-          <RadioButtonSelect
-            items={scopeItems}
-            initialIndex={0}
+        {mode === 'editor' ? (
+          <Box flexDirection="column">
+            <Text bold={mode === 'editor'} wrap="truncate">
+              {mode === 'editor' ? '> ' : '  '}
+              {t('Select Editor')}{' '}
+              <Text color={theme.text.secondary}>
+                {otherScopeModifiedMessage}
+              </Text>
+            </Text>
+            <Box height={1} />
+            <RadioButtonSelect
+              items={editorItems.map((item) => ({
+                label: item.name,
+                value: item.type,
+                disabled: item.disabled,
+                key: item.type,
+              }))}
+              initialIndex={editorIndex}
+              onSelect={handleEditorSelect}
+              isFocused={mode === 'editor'}
+              key={selectedScope}
+            />
+          </Box>
+        ) : (
+          <ScopeSelector
             onSelect={handleScopeSelect}
-            isFocused={focusedSection === 'scope'}
+            onHighlight={handleScopeHighlight}
+            isFocused={mode === 'scope'}
+            initialScope={selectedScope}
           />
-        </Box>
+        )}
 
         <Box marginTop={1}>
-          <Text color={theme.text.secondary}>
-            (Use Enter to select, Tab to change focus)
+          <Text color={theme.text.secondary} wrap="truncate">
+            {mode === 'editor'
+              ? t('(Use Enter to select, Tab to configure scope)')
+              : t('(Use Enter to apply scope, Tab to go back)')}
           </Text>
         </Box>
       </Box>
 
       <Box flexDirection="column" width="55%" paddingLeft={2}>
         <Text bold color={theme.text.primary}>
-          Editor Preference
+          {t('Editor Preference')}
         </Text>
         <Box flexDirection="column" gap={1} marginTop={1}>
           <Text color={theme.text.secondary}>
-            These editors are currently supported. Please note that some editors
-            cannot be used in sandbox mode.
+            {t(
+              'These editors are currently supported. Please note that some editors cannot be used in sandbox mode.',
+            )}
           </Text>
           <Text color={theme.text.secondary}>
-            Your preferred editor is:{' '}
+            {t('Your preferred editor is:')}{' '}
             <Text
               color={
                 mergedEditorName === 'None'

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

@@ -8,41 +8,23 @@ import { render } from 'ink-testing-library';
 import { describe, it, expect, vi } from 'vitest';
 import { Footer } from './Footer.js';
 import * as useTerminalSize from '../hooks/useTerminalSize.js';
-import { tildeifyPath } from '@qwen-code/qwen-code-core';
 import { type UIState, UIStateContext } from '../contexts/UIStateContext.js';
 import { ConfigContext } from '../contexts/ConfigContext.js';
-import { SettingsContext } from '../contexts/SettingsContext.js';
-import type { LoadedSettings } from '../../config/settings.js';
 import { VimModeProvider } from '../contexts/VimModeContext.js';
+import type { LoadedSettings } from '../../config/settings.js';
 
 vi.mock('../hooks/useTerminalSize.js');
 const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize);
 
-vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const original =
-    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
-  return {
-    ...original,
-    shortenPath: (p: string, len: number) => {
-      if (p.length > len) {
-        return '...' + p.slice(p.length - len + 3);
-      }
-      return p;
-    },
-  };
-});
-
 const defaultProps = {
   model: 'gemini-pro',
-  targetDir:
-    '/Users/test/project/foo/bar/and/some/more/directories/to/make/it/long',
-  branchName: 'main',
 };
 
 const createMockConfig = (overrides = {}) => ({
   getModel: vi.fn(() => defaultProps.model),
-  getTargetDir: vi.fn(() => defaultProps.targetDir),
   getDebugMode: vi.fn(() => false),
+  getMcpServers: vi.fn(() => ({})),
+  getBlockedMcpServers: vi.fn(() => []),
   ...overrides,
 });
 
@@ -51,46 +33,31 @@ const createMockUIState = (overrides: Partial<UIState> = {}): UIState =>
     sessionStats: {
       lastPromptTokenCount: 100,
     },
-    branchName: defaultProps.branchName,
+    geminiMdFileCount: 0,
+    contextFileNames: [],
+    showToolDescriptions: false,
+    ideContextState: undefined,
     ...overrides,
   }) as UIState;
 
-const createDefaultSettings = (
-  options: {
-    showMemoryUsage?: boolean;
-    hideCWD?: boolean;
-    hideSandboxStatus?: boolean;
-    hideModelInfo?: boolean;
-  } = {},
-): LoadedSettings =>
+const createMockSettings = (): LoadedSettings =>
   ({
     merged: {
-      ui: {
-        showMemoryUsage: options.showMemoryUsage,
-        footer: {
-          hideCWD: options.hideCWD,
-          hideSandboxStatus: options.hideSandboxStatus,
-          hideModelInfo: options.hideModelInfo,
-        },
+      general: {
+        vimMode: false,
       },
     },
-  }) as never;
+  }) as LoadedSettings;
 
-const renderWithWidth = (
-  width: number,
-  uiState: UIState,
-  settings: LoadedSettings = createDefaultSettings(),
-) => {
+const renderWithWidth = (width: number, uiState: UIState) => {
   useTerminalSizeMock.mockReturnValue({ columns: width, rows: 24 });
   return render(
     <ConfigContext.Provider value={createMockConfig() as never}>
-      <SettingsContext.Provider value={settings}>
-        <VimModeProvider settings={settings}>
-          <UIStateContext.Provider value={uiState}>
-            <Footer />
-          </UIStateContext.Provider>
-        </VimModeProvider>
-      </SettingsContext.Provider>
+      <VimModeProvider settings={createMockSettings()}>
+        <UIStateContext.Provider value={uiState}>
+          <Footer />
+        </UIStateContext.Provider>
+      </VimModeProvider>
     </ConfigContext.Provider>,
   );
 };
@@ -101,161 +68,28 @@ describe('<Footer />', () => {
     expect(lastFrame()).toBeDefined();
   });
 
-  describe('path display', () => {
-    it('should display a shortened path on a narrow terminal', () => {
-      const { lastFrame } = renderWithWidth(79, createMockUIState());
-      const tildePath = tildeifyPath(defaultProps.targetDir);
-      const pathLength = Math.max(20, Math.floor(79 * 0.25));
-      const expectedPath =
-        '...' + tildePath.slice(tildePath.length - pathLength + 3);
-      expect(lastFrame()).toContain(expectedPath);
-    });
-
-    it('should use wide layout at 80 columns', () => {
-      const { lastFrame } = renderWithWidth(80, createMockUIState());
-      const tildePath = tildeifyPath(defaultProps.targetDir);
-      const expectedPath =
-        '...' + tildePath.slice(tildePath.length - 80 * 0.25 + 3);
-      expect(lastFrame()).toContain(expectedPath);
-    });
-  });
-
-  it('displays the branch name when provided', () => {
+  it('does not display the working directory or branch name', () => {
     const { lastFrame } = renderWithWidth(120, createMockUIState());
-    expect(lastFrame()).toContain(`(${defaultProps.branchName}*)`);
+    expect(lastFrame()).not.toMatch(/\(.*\*\)/);
   });
 
-  it('does not display the branch name when not provided', () => {
-    const { lastFrame } = renderWithWidth(
-      120,
-      createMockUIState({
-        branchName: undefined,
-      }),
-    );
-    expect(lastFrame()).not.toContain(`(${defaultProps.branchName}*)`);
-  });
-
-  it('displays the model name and context percentage', () => {
+  it('displays the context percentage', () => {
     const { lastFrame } = renderWithWidth(120, createMockUIState());
-    expect(lastFrame()).toContain(defaultProps.model);
-    expect(lastFrame()).toMatch(/\(\d+% context left\)/);
+    expect(lastFrame()).toMatch(/\d+(\.\d+)?% context used/);
   });
 
-  it('displays the model name and abbreviated context percentage', () => {
+  it('displays the abbreviated context percentage on narrow terminal', () => {
     const { lastFrame } = renderWithWidth(99, createMockUIState());
-    expect(lastFrame()).toContain(defaultProps.model);
-    expect(lastFrame()).toMatch(/\(\d+%\)/);
+    expect(lastFrame()).toMatch(/\d+%/);
   });
 
-  describe('sandbox and trust info', () => {
-    it('should display untrusted when isTrustedFolder is false', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: false,
-        }),
-      );
-      expect(lastFrame()).toContain('untrusted');
-    });
-
-    it('should display custom sandbox info when SANDBOX env is set', () => {
-      vi.stubEnv('SANDBOX', 'gemini-cli-test-sandbox');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: undefined,
-        }),
-      );
-      expect(lastFrame()).toContain('test');
-      vi.unstubAllEnvs();
-    });
-
-    it('should display macOS Seatbelt info when SANDBOX is sandbox-exec', () => {
-      vi.stubEnv('SANDBOX', 'sandbox-exec');
-      vi.stubEnv('SEATBELT_PROFILE', 'test-profile');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: true,
-        }),
-      );
-      expect(lastFrame()).toMatch(/macOS Seatbelt.*\(test-profile\)/s);
-      vi.unstubAllEnvs();
-    });
-
-    it('should display "no sandbox" when SANDBOX is not set and folder is trusted', () => {
-      // Clear any SANDBOX env var that might be set.
-      vi.stubEnv('SANDBOX', '');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: true,
-        }),
-      );
-      expect(lastFrame()).toContain('no sandbox');
-      vi.unstubAllEnvs();
-    });
-
-    it('should prioritize untrusted message over sandbox info', () => {
-      vi.stubEnv('SANDBOX', 'gemini-cli-test-sandbox');
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState({
-          isTrustedFolder: false,
-        }),
-      );
-      expect(lastFrame()).toContain('untrusted');
-      expect(lastFrame()).not.toMatch(/test-sandbox/s);
-      vi.unstubAllEnvs();
-    });
-  });
-
-  describe('footer configuration filtering (golden snapshots)', () => {
-    it('renders complete footer with all sections visible (baseline)', () => {
+  describe('footer rendering (golden snapshots)', () => {
+    it('renders complete footer on wide terminal', () => {
       const { lastFrame } = renderWithWidth(120, createMockUIState());
       expect(lastFrame()).toMatchSnapshot('complete-footer-wide');
     });
 
-    it('renders footer with all optional sections hidden (minimal footer)', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState(),
-        createDefaultSettings({
-          hideCWD: true,
-          hideSandboxStatus: true,
-          hideModelInfo: true,
-        }),
-      );
-      expect(lastFrame()).toMatchSnapshot('footer-minimal');
-    });
-
-    it('renders footer with only model info hidden (partial filtering)', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState(),
-        createDefaultSettings({
-          hideCWD: false,
-          hideSandboxStatus: false,
-          hideModelInfo: true,
-        }),
-      );
-      expect(lastFrame()).toMatchSnapshot('footer-no-model');
-    });
-
-    it('renders footer with CWD and model info hidden to test alignment (only sandbox visible)', () => {
-      const { lastFrame } = renderWithWidth(
-        120,
-        createMockUIState(),
-        createDefaultSettings({
-          hideCWD: true,
-          hideSandboxStatus: false,
-          hideModelInfo: true,
-        }),
-      );
-      expect(lastFrame()).toMatchSnapshot('footer-only-sandbox');
-    });
-
-    it('renders complete footer in narrow terminal (baseline narrow)', () => {
+    it('renders complete footer on narrow terminal', () => {
       const { lastFrame } = renderWithWidth(79, createMockUIState());
       expect(lastFrame()).toMatchSnapshot('complete-footer-narrow');
     });

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

@@ -7,159 +7,134 @@
 import type React from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
-import { shortenPath, tildeifyPath } from '@qwen-code/qwen-code-core';
 import { ConsoleSummaryDisplay } from './ConsoleSummaryDisplay.js';
-import process from 'node:process';
-import Gradient from 'ink-gradient';
-import { MemoryUsageDisplay } from './MemoryUsageDisplay.js';
 import { ContextUsageDisplay } from './ContextUsageDisplay.js';
-import { DebugProfiler } from './DebugProfiler.js';
 import { useTerminalSize } from '../hooks/useTerminalSize.js';
+import { AutoAcceptIndicator } from './AutoAcceptIndicator.js';
+import { ShellModeIndicator } from './ShellModeIndicator.js';
+import { isNarrowWidth } from '../utils/isNarrowWidth.js';
 
 import { useUIState } from '../contexts/UIStateContext.js';
 import { useConfig } from '../contexts/ConfigContext.js';
-import { useSettings } from '../contexts/SettingsContext.js';
 import { useVimMode } from '../contexts/VimModeContext.js';
+import { ApprovalMode } from '@qwen-code/qwen-code-core';
+import { t } from '../../i18n/index.js';
 
 export const Footer: React.FC = () => {
   const uiState = useUIState();
   const config = useConfig();
-  const settings = useSettings();
   const { vimEnabled, vimMode } = useVimMode();
 
   const {
     model,
-    targetDir,
-    debugMode,
-    branchName,
-    debugMessage,
     errorCount,
     showErrorDetails,
     promptTokenCount,
-    nightly,
-    isTrustedFolder,
+    showAutoAcceptIndicator,
   } = {
     model: config.getModel(),
-    targetDir: config.getTargetDir(),
-    debugMode: config.getDebugMode(),
-    branchName: uiState.branchName,
-    debugMessage: uiState.debugMessage,
     errorCount: uiState.errorCount,
     showErrorDetails: uiState.showErrorDetails,
     promptTokenCount: uiState.sessionStats.lastPromptTokenCount,
-    nightly: uiState.nightly,
-    isTrustedFolder: uiState.isTrustedFolder,
+    showAutoAcceptIndicator: uiState.showAutoAcceptIndicator,
   };
 
-  const showMemoryUsage =
-    config.getDebugMode() || settings.merged.ui?.showMemoryUsage || false;
-  const hideCWD = settings.merged.ui?.footer?.hideCWD || false;
-  const hideSandboxStatus =
-    settings.merged.ui?.footer?.hideSandboxStatus || false;
-  const hideModelInfo = settings.merged.ui?.footer?.hideModelInfo || false;
+  const showErrorIndicator = !showErrorDetails && errorCount > 0;
 
   const { columns: terminalWidth } = useTerminalSize();
+  const isNarrow = isNarrowWidth(terminalWidth);
 
-  const pathLength = Math.max(20, Math.floor(terminalWidth * 0.25));
-  const displayPath = shortenPath(tildeifyPath(targetDir), pathLength);
+  // Determine sandbox info from environment
+  const sandboxEnv = process.env['SANDBOX'];
+  const sandboxInfo = sandboxEnv
+    ? sandboxEnv === 'sandbox-exec'
+      ? 'seatbelt'
+      : sandboxEnv.startsWith('qwen-code')
+        ? 'docker'
+        : sandboxEnv
+    : null;
 
-  const justifyContent = hideCWD && hideModelInfo ? 'center' : 'space-between';
-  const displayVimMode = vimEnabled ? vimMode : undefined;
+  // Check if debug mode is enabled
+  const debugMode = config.getDebugMode();
+
+  // Left section should show exactly ONE thing at any time, in priority order.
+  const leftContent = uiState.ctrlCPressedOnce ? (
+    <Text color={theme.status.warning}>{t('Press Ctrl+C again to exit.')}</Text>
+  ) : uiState.ctrlDPressedOnce ? (
+    <Text color={theme.status.warning}>{t('Press Ctrl+D again to exit.')}</Text>
+  ) : uiState.showEscapePrompt ? (
+    <Text color={theme.text.secondary}>{t('Press Esc again to clear.')}</Text>
+  ) : vimEnabled && vimMode === 'INSERT' ? (
+    <Text color={theme.text.secondary}>-- INSERT --</Text>
+  ) : uiState.shellModeActive ? (
+    <ShellModeIndicator />
+  ) : showAutoAcceptIndicator !== undefined &&
+    showAutoAcceptIndicator !== ApprovalMode.DEFAULT ? (
+    <AutoAcceptIndicator approvalMode={showAutoAcceptIndicator} />
+  ) : (
+    <Text color={theme.text.secondary}>{t('? for shortcuts')}</Text>
+  );
+
+  const rightItems: Array<{ key: string; node: React.ReactNode }> = [];
+  if (sandboxInfo) {
+    rightItems.push({
+      key: 'sandbox',
+      node: <Text color={theme.status.success}>🔒 {sandboxInfo}</Text>,
+    });
+  }
+  if (debugMode) {
+    rightItems.push({
+      key: 'debug',
+      node: <Text color={theme.status.warning}>Debug Mode</Text>,
+    });
+  }
+  if (promptTokenCount > 0) {
+    rightItems.push({
+      key: 'context',
+      node: (
+        <Text color={theme.text.accent}>
+          <ContextUsageDisplay
+            promptTokenCount={promptTokenCount}
+            model={model}
+            terminalWidth={terminalWidth}
+          />
+        </Text>
+      ),
+    });
+  }
+  if (showErrorIndicator) {
+    rightItems.push({
+      key: 'errors',
+      node: <ConsoleSummaryDisplay errorCount={errorCount} />,
+    });
+  }
 
   return (
     <Box
-      justifyContent={justifyContent}
+      justifyContent="space-between"
       width="100%"
       flexDirection="row"
       alignItems="center"
     >
-      {(debugMode || displayVimMode || !hideCWD) && (
-        <Box>
-          {debugMode && <DebugProfiler />}
-          {displayVimMode && (
-            <Text color={theme.text.secondary}>[{displayVimMode}] </Text>
-          )}
-          {!hideCWD &&
-            (nightly ? (
-              <Gradient colors={theme.ui.gradient}>
-                <Text>
-                  {displayPath}
-                  {branchName && <Text> ({branchName}*)</Text>}
-                </Text>
-              </Gradient>
-            ) : (
-              <Text color={theme.text.link}>
-                {displayPath}
-                {branchName && (
-                  <Text color={theme.text.secondary}> ({branchName}*)</Text>
-                )}
-              </Text>
-            ))}
-          {debugMode && (
-            <Text color={theme.status.error}>
-              {' ' + (debugMessage || '--debug')}
-            </Text>
-          )}
-        </Box>
-      )}
+      {/* Left Section: Exactly one status line (exit prompts / mode indicator / default hint) */}
+      <Box
+        marginLeft={2}
+        justifyContent="flex-start"
+        flexDirection={isNarrow ? 'column' : 'row'}
+        alignItems={isNarrow ? 'flex-start' : 'center'}
+      >
+        {leftContent}
+      </Box>
 
-      {/* Middle Section: Centered Trust/Sandbox Info */}
-      {!hideSandboxStatus && (
-        <Box
-          flexGrow={1}
-          alignItems="center"
-          justifyContent="center"
-          display="flex"
-        >
-          {isTrustedFolder === false ? (
-            <Text color={theme.status.warning}>untrusted</Text>
-          ) : process.env['SANDBOX'] &&
-            process.env['SANDBOX'] !== 'sandbox-exec' ? (
-            <Text color="green">
-              {process.env['SANDBOX'].replace(/^gemini-(?:cli-)?/, '')}
-            </Text>
-          ) : process.env['SANDBOX'] === 'sandbox-exec' ? (
-            <Text color={theme.status.warning}>
-              macOS Seatbelt{' '}
-              <Text color={theme.text.secondary}>
-                ({process.env['SEATBELT_PROFILE']})
-              </Text>
-            </Text>
-          ) : (
-            <Text color={theme.status.error}>
-              no sandbox
-              {terminalWidth >= 100 && (
-                <Text color={theme.text.secondary}> (see /docs)</Text>
-              )}
-            </Text>
-          )}
-        </Box>
-      )}
-
-      {/* Right Section: Gemini Label and Console Summary */}
-      {!hideModelInfo && (
-        <Box alignItems="center" justifyContent="flex-end">
-          <Box alignItems="center">
-            <Text color={theme.text.accent}>
-              {model}{' '}
-              <ContextUsageDisplay
-                promptTokenCount={promptTokenCount}
-                model={model}
-                terminalWidth={terminalWidth}
-              />
-            </Text>
-            {showMemoryUsage && <MemoryUsageDisplay />}
+      {/* Right Section: Sandbox Info, Debug Mode, Context Usage, and Console Summary */}
+      <Box alignItems="center" justifyContent="flex-end" marginRight={2}>
+        {rightItems.map(({ key, node }, index) => (
+          <Box key={key} alignItems="center">
+            {index > 0 && <Text color={theme.text.secondary}> | </Text>}
+            {node}
           </Box>
-          <Box alignItems="center" paddingLeft={2}>
-            {!showErrorDetails && errorCount > 0 && (
-              <Box>
-                <Text color={theme.ui.symbol}>| </Text>
-                <ConsoleSummaryDisplay errorCount={errorCount} />
-              </Box>
-            )}
-          </Box>
-        </Box>
-      )}
+        ))}
+      </Box>
     </Box>
   );
 };

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

@@ -6,39 +6,96 @@
 
 import { render } from 'ink-testing-library';
 import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { AuthType } from '@qwen-code/qwen-code-core';
 import { Header } from './Header.js';
 import * as useTerminalSize from '../hooks/useTerminalSize.js';
-import { longAsciiLogo } from './AsciiArt.js';
 
 vi.mock('../hooks/useTerminalSize.js');
+const useTerminalSizeMock = vi.mocked(useTerminalSize.useTerminalSize);
+
+const defaultProps = {
+  version: '1.0.0',
+  authType: AuthType.QWEN_OAUTH,
+  model: 'qwen-coder-plus',
+  workingDirectory: '/home/user/projects/test',
+};
 
 describe('<Header />', () => {
-  beforeEach(() => {});
-
-  it('renders the long logo on a wide terminal', () => {
-    vi.spyOn(useTerminalSize, 'useTerminalSize').mockReturnValue({
-      columns: 120,
-      rows: 20,
-    });
-    const { lastFrame } = render(<Header version="1.0.0" nightly={false} />);
-    expect(lastFrame()).toContain(longAsciiLogo);
+  beforeEach(() => {
+    // Default to wide terminal (shows both logo and info panel)
+    useTerminalSizeMock.mockReturnValue({ columns: 120, rows: 24 });
   });
 
-  it('renders custom ASCII art when provided', () => {
+  it('renders the ASCII logo on wide terminal', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Check that parts of the shortAsciiLogo are rendered
+    expect(lastFrame()).toContain('██╔═══██╗');
+  });
+
+  it('hides the ASCII logo on narrow terminal', () => {
+    useTerminalSizeMock.mockReturnValue({ columns: 60, rows: 24 });
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Should not contain the logo but still show the info panel
+    expect(lastFrame()).not.toContain('██╔═══██╗');
+    expect(lastFrame()).toContain('>_ Qwen Code');
+  });
+
+  it('renders custom ASCII art when provided on wide terminal', () => {
     const customArt = 'CUSTOM ART';
     const { lastFrame } = render(
-      <Header version="1.0.0" nightly={false} customAsciiArt={customArt} />,
+      <Header {...defaultProps} customAsciiArt={customArt} />,
     );
     expect(lastFrame()).toContain(customArt);
   });
 
-  it('displays the version number when nightly is true', () => {
-    const { lastFrame } = render(<Header version="1.0.0" nightly={true} />);
+  it('displays the version number', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
     expect(lastFrame()).toContain('v1.0.0');
   });
 
-  it('does not display the version number when nightly is false', () => {
-    const { lastFrame } = render(<Header version="1.0.0" nightly={false} />);
-    expect(lastFrame()).not.toContain('v1.0.0');
+  it('displays Qwen Code title with >_ prefix', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    expect(lastFrame()).toContain('>_ Qwen Code');
+  });
+
+  it('displays auth type and model', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    expect(lastFrame()).toContain('Qwen OAuth');
+    expect(lastFrame()).toContain('qwen-coder-plus');
+  });
+
+  it('displays working directory', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    expect(lastFrame()).toContain('/home/user/projects/test');
+  });
+
+  it('renders a custom working directory display', () => {
+    const { lastFrame } = render(
+      <Header {...defaultProps} workingDirectory="custom display" />,
+    );
+    expect(lastFrame()).toContain('custom display');
+  });
+
+  it('displays working directory without branch name', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Branch name is no longer shown in header
+    expect(lastFrame()).toContain('/home/user/projects/test');
+    expect(lastFrame()).not.toContain('(main*)');
+  });
+
+  it('formats home directory with tilde', () => {
+    const { lastFrame } = render(
+      <Header {...defaultProps} workingDirectory="/Users/testuser/projects" />,
+    );
+    // The actual home dir replacement depends on os.homedir()
+    // Just verify the path is shown
+    expect(lastFrame()).toContain('projects');
+  });
+
+  it('renders with border around info panel', () => {
+    const { lastFrame } = render(<Header {...defaultProps} />);
+    // Check for border characters (round border style uses these)
+    expect(lastFrame()).toContain('╭');
+    expect(lastFrame()).toContain('╯');
   });
 });

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

@@ -7,64 +7,175 @@
 import type React from 'react';
 import { Box, Text } from 'ink';
 import Gradient from 'ink-gradient';
+import { AuthType, shortenPath, tildeifyPath } from '@qwen-code/qwen-code-core';
 import { theme } from '../semantic-colors.js';
-import { shortAsciiLogo, longAsciiLogo, tinyAsciiLogo } from './AsciiArt.js';
-import { getAsciiArtWidth } from '../utils/textUtils.js';
+import { shortAsciiLogo } from './AsciiArt.js';
+import { getAsciiArtWidth, getCachedStringWidth } from '../utils/textUtils.js';
 import { useTerminalSize } from '../hooks/useTerminalSize.js';
 
 interface HeaderProps {
   customAsciiArt?: string; // For user-defined ASCII art
   version: string;
-  nightly: boolean;
+  authType?: AuthType;
+  model: string;
+  workingDirectory: string;
+}
+
+function titleizeAuthType(value: string): string {
+  return value
+    .split(/[-_]/g)
+    .filter(Boolean)
+    .map((part) => {
+      if (part.toLowerCase() === 'ai') {
+        return 'AI';
+      }
+      return part.charAt(0).toUpperCase() + part.slice(1);
+    })
+    .join(' ');
+}
+
+// Format auth type for display
+function formatAuthType(authType?: AuthType): string {
+  if (!authType) {
+    return 'Unknown';
+  }
+
+  switch (authType) {
+    case AuthType.QWEN_OAUTH:
+      return 'Qwen OAuth';
+    case AuthType.USE_OPENAI:
+      return 'OpenAI';
+    case AuthType.USE_GEMINI:
+      return 'Gemini';
+    case AuthType.USE_VERTEX_AI:
+      return 'Vertex AI';
+    case AuthType.USE_ANTHROPIC:
+      return 'Anthropic';
+    default:
+      return titleizeAuthType(String(authType));
+  }
 }
 
 export const Header: React.FC<HeaderProps> = ({
   customAsciiArt,
   version,
-  nightly,
+  authType,
+  model,
+  workingDirectory,
 }) => {
   const { columns: terminalWidth } = useTerminalSize();
-  let displayTitle;
-  const widthOfLongLogo = getAsciiArtWidth(longAsciiLogo);
-  const widthOfShortLogo = getAsciiArtWidth(shortAsciiLogo);
 
-  if (customAsciiArt) {
-    displayTitle = customAsciiArt;
-  } else if (terminalWidth >= widthOfLongLogo) {
-    displayTitle = longAsciiLogo;
-  } else if (terminalWidth >= widthOfShortLogo) {
-    displayTitle = shortAsciiLogo;
-  } else {
-    displayTitle = tinyAsciiLogo;
-  }
+  const displayLogo = customAsciiArt ?? shortAsciiLogo;
+  const logoWidth = getAsciiArtWidth(displayLogo);
+  const formattedAuthType = formatAuthType(authType);
 
-  const artWidth = getAsciiArtWidth(displayTitle);
+  // Calculate available space properly:
+  // First determine if logo can be shown, then use remaining space for path
+  const containerMarginX = 2; // marginLeft + marginRight on the outer container
+  const logoGap = 2; // Gap between logo and info panel
+  const infoPanelPaddingX = 1;
+  const infoPanelBorderWidth = 2; // left + right border
+  const infoPanelChromeWidth = infoPanelBorderWidth + infoPanelPaddingX * 2;
+  const minPathLength = 40; // Minimum readable path length
+  const minInfoPanelWidth = minPathLength + infoPanelChromeWidth;
+
+  const availableTerminalWidth = Math.max(
+    0,
+    terminalWidth - containerMarginX * 2,
+  );
+
+  // Check if we have enough space for logo + gap + minimum info panel
+  const showLogo =
+    availableTerminalWidth >= logoWidth + logoGap + minInfoPanelWidth;
+
+  // Calculate available width for info panel (use all remaining space)
+  // Cap at 60 when in two-column layout (with logo)
+  const maxInfoPanelWidth = 60;
+  const availableInfoPanelWidth = showLogo
+    ? Math.min(availableTerminalWidth - logoWidth - logoGap, maxInfoPanelWidth)
+    : availableTerminalWidth;
+
+  // Calculate max path length (subtract padding/borders from available space)
+  const maxPathLength = Math.max(
+    0,
+    availableInfoPanelWidth - infoPanelChromeWidth,
+  );
+
+  const infoPanelContentWidth = Math.max(
+    0,
+    availableInfoPanelWidth - infoPanelChromeWidth,
+  );
+  const authModelText = `${formattedAuthType} | ${model}`;
+  const authHintText = ' (/auth to change)';
+  const showAuthHint =
+    infoPanelContentWidth > 0 &&
+    getCachedStringWidth(authModelText + authHintText) <= infoPanelContentWidth;
+
+  // Now shorten the path to fit the available space
+  const tildeifiedPath = tildeifyPath(workingDirectory);
+  const shortenedPath = shortenPath(tildeifiedPath, Math.max(3, maxPathLength));
+  const displayPath =
+    maxPathLength <= 0
+      ? ''
+      : shortenedPath.length > maxPathLength
+        ? shortenedPath.slice(0, maxPathLength)
+        : shortenedPath;
+
+  // Use theme gradient colors if available, otherwise use text colors (excluding primary)
+  const gradientColors = theme.ui.gradient || [
+    theme.text.secondary,
+    theme.text.link,
+    theme.text.accent,
+  ];
 
   return (
     <Box
-      alignItems="flex-start"
-      width={artWidth}
-      flexShrink={0}
-      flexDirection="column"
+      flexDirection="row"
+      alignItems="center"
+      marginX={containerMarginX}
+      width={availableTerminalWidth}
     >
-      {theme.ui.gradient ? (
-        <Gradient colors={theme.ui.gradient}>
-          <Text>{displayTitle}</Text>
-        </Gradient>
-      ) : (
-        <Text>{displayTitle}</Text>
-      )}
-      {nightly && (
-        <Box width="100%" flexDirection="row" justifyContent="flex-end">
-          {theme.ui.gradient ? (
-            <Gradient colors={theme.ui.gradient}>
-              <Text>v{version}</Text>
+      {/* Left side: ASCII logo (only if enough space) */}
+      {showLogo && (
+        <>
+          <Box flexShrink={0}>
+            <Gradient colors={gradientColors}>
+              <Text>{displayLogo}</Text>
             </Gradient>
-          ) : (
-            <Text>v{version}</Text>
-          )}
-        </Box>
+          </Box>
+          {/* Fixed gap between logo and info panel */}
+          <Box width={logoGap} />
+        </>
       )}
+
+      {/* Right side: Info panel (flexible width, max 60 in two-column layout) */}
+      <Box
+        flexDirection="column"
+        borderStyle="round"
+        borderColor={theme.border.default}
+        paddingX={infoPanelPaddingX}
+        flexGrow={showLogo ? 0 : 1}
+        width={showLogo ? availableInfoPanelWidth : undefined}
+      >
+        {/* Title line: >_ Qwen Code (v{version}) */}
+        <Text>
+          <Text bold color={theme.text.accent}>
+            &gt;_ Qwen Code
+          </Text>
+          <Text color={theme.text.secondary}> (v{version})</Text>
+        </Text>
+        {/* Empty line for spacing */}
+        <Text> </Text>
+        {/* Auth and Model line */}
+        <Text>
+          <Text color={theme.text.secondary}>{authModelText}</Text>
+          {showAuthHint && (
+            <Text color={theme.text.secondary}>{authHintText}</Text>
+          )}
+        </Text>
+        {/* Directory line */}
+        <Text color={theme.text.secondary}>{displayPath}</Text>
+      </Box>
     </Box>
   );
 };

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

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

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

@@ -96,7 +96,7 @@ describe('<HistoryItemDisplay />', () => {
     const { lastFrame } = renderWithProviders(
       <HistoryItemDisplay {...baseItem} item={item} />,
     );
-    expect(lastFrame()).toContain('About Qwen Code');
+    expect(lastFrame()).toContain('Status');
   });
 
   it('renders ModelStatsDisplay for "model_stats" type', () => {

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

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

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

@@ -33,6 +33,9 @@ vi.mock('../hooks/useCommandCompletion.js');
 vi.mock('../hooks/useInputHistory.js');
 vi.mock('../hooks/useReverseSearchCompletion.js');
 vi.mock('../utils/clipboardUtils.js');
+vi.mock('../contexts/UIStateContext.js', () => ({
+  useUIState: vi.fn(() => ({ isFeedbackDialogOpen: false })),
+}));
 
 const mockSlashCommands: SlashCommand[] = [
   {
@@ -278,7 +281,7 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  it('should call completion.navigateUp for both up arrow and Ctrl+P when suggestions are showing', async () => {
+  it('should call completion.navigateUp for up arrow when suggestions are showing', async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
@@ -293,19 +296,22 @@ describe('InputPrompt', () => {
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
     await wait();
 
-    // Test up arrow
+    // Test up arrow for completion navigation
     stdin.write('\u001B[A'); // Up arrow
     await wait();
+    expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(1);
+    expect(mockCommandCompletion.navigateDown).not.toHaveBeenCalled();
 
+    // Ctrl+P should navigate history, not completion
     stdin.write('\u0010'); // Ctrl+P
     await wait();
-    expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(2);
-    expect(mockCommandCompletion.navigateDown).not.toHaveBeenCalled();
+    expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(1);
+    expect(mockInputHistory.navigateUp).toHaveBeenCalled();
 
     unmount();
   });
 
-  it('should call completion.navigateDown for both down arrow and Ctrl+N when suggestions are showing', async () => {
+  it('should call completion.navigateDown for down arrow when suggestions are showing', async () => {
     mockedUseCommandCompletion.mockReturnValue({
       ...mockCommandCompletion,
       showSuggestions: true,
@@ -319,14 +325,17 @@ describe('InputPrompt', () => {
     const { stdin, unmount } = renderWithProviders(<InputPrompt {...props} />);
     await wait();
 
-    // Test down arrow
+    // Test down arrow for completion navigation
     stdin.write('\u001B[B'); // Down arrow
     await wait();
+    expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(1);
+    expect(mockCommandCompletion.navigateUp).not.toHaveBeenCalled();
 
+    // Ctrl+N should navigate history, not completion
     stdin.write('\u000E'); // Ctrl+N
     await wait();
-    expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(2);
-    expect(mockCommandCompletion.navigateUp).not.toHaveBeenCalled();
+    expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(1);
+    expect(mockInputHistory.navigateDown).toHaveBeenCalled();
 
     unmount();
   });
@@ -764,6 +773,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -791,6 +802,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -818,6 +831,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -845,6 +860,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -872,6 +889,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -900,6 +919,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -927,6 +948,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -955,6 +978,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -983,6 +1008,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -1011,6 +1038,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -1039,6 +1068,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -1069,6 +1100,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -1097,6 +1130,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();
@@ -1127,6 +1162,8 @@ describe('InputPrompt', () => {
         mockCommandContext,
         false,
         expect.any(Object),
+        // active parameter: completion enabled when not just navigated history
+        true,
       );
 
       unmount();

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

@@ -36,6 +36,8 @@ import {
 import * as path from 'node:path';
 import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
 import { useShellFocusState } from '../contexts/ShellFocusContext.js';
+import { useUIState } from '../contexts/UIStateContext.js';
+import { FEEDBACK_DIALOG_KEYS } from '../FeedbackDialog.js';
 export interface InputPromptProps {
   buffer: TextBuffer;
   onSubmit: (value: string) => void;
@@ -52,6 +54,9 @@ export interface InputPromptProps {
   setShellModeActive: (value: boolean) => void;
   approvalMode: ApprovalMode;
   onEscapePromptChange?: (showPrompt: boolean) => void;
+  onToggleShortcuts?: () => void;
+  showShortcuts?: boolean;
+  onSuggestionsVisibilityChange?: (visible: boolean) => void;
   vimHandleInput?: (key: Key) => boolean;
   isEmbeddedShellFocused?: boolean;
 }
@@ -96,10 +101,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   setShellModeActive,
   approvalMode,
   onEscapePromptChange,
+  onToggleShortcuts,
+  showShortcuts,
+  onSuggestionsVisibilityChange,
   vimHandleInput,
   isEmbeddedShellFocused,
 }) => {
   const isShellFocused = useShellFocusState();
+  const uiState = useUIState();
   const [justNavigatedHistory, setJustNavigatedHistory] = useState(false);
   const [escPressCount, setEscPressCount] = useState(0);
   const [showEscapePrompt, setShowEscapePrompt] = useState(false);
@@ -135,6 +144,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     commandContext,
     reverseSearchActive,
     config,
+    // Suppress completion when history navigation just occurred
+    !justNavigatedHistory,
   );
 
   const reverseSearchCompletion = useReverseSearchCompletion(
@@ -219,9 +230,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const inputHistory = useInputHistory({
     userMessages,
     onSubmit: handleSubmitAndClear,
-    isActive:
-      (!completion.showSuggestions || completion.suggestions.length === 1) &&
-      !shellModeActive,
+    // History navigation (Ctrl+P/N) now always works since completion navigation
+    // only uses arrow keys. Only disable in shell mode.
+    isActive: !shellModeActive,
     currentQuery: buffer.text,
     onChange: customSetTextAndResetCompletionSignal,
   });
@@ -326,6 +337,14 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         return;
       }
 
+      // Intercept feedback dialog option keys (1, 2) when dialog is open
+      if (
+        uiState.isFeedbackDialogOpen &&
+        (FEEDBACK_DIALOG_KEYS as readonly string[]).includes(key.name)
+      ) {
+        return;
+      }
+
       // Reset ESC count and hide prompt on any non-ESC key
       if (key.name !== 'escape') {
         if (escPressCount > 0 || showEscapePrompt) {
@@ -338,11 +357,31 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         buffer.text === '' &&
         !completion.showSuggestions
       ) {
+        // Hide shortcuts when toggling shell mode
+        if (showShortcuts && onToggleShortcuts) {
+          onToggleShortcuts();
+        }
         setShellModeActive(!shellModeActive);
         buffer.setText(''); // Clear the '!' from input
         return;
       }
 
+      // Toggle keyboard shortcuts display with "?" when buffer is empty
+      if (
+        key.sequence === '?' &&
+        buffer.text === '' &&
+        !completion.showSuggestions &&
+        onToggleShortcuts
+      ) {
+        onToggleShortcuts();
+        return;
+      }
+
+      // Hide shortcuts on any other key press
+      if (showShortcuts && onToggleShortcuts) {
+        onToggleShortcuts();
+      }
+
       if (keyMatchers[Command.ESCAPE](key)) {
         const cancelSearch = (
           setActive: (active: boolean) => void,
@@ -670,6 +709,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       recentPasteTime,
       commandSearchActive,
       commandSearchCompletion,
+      onToggleShortcuts,
+      showShortcuts,
+      uiState,
     ],
   );
 
@@ -689,6 +731,13 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   const activeCompletion = getActiveCompletion();
   const shouldShowSuggestions = activeCompletion.showSuggestions;
 
+  // Notify parent about suggestions visibility changes
+  useEffect(() => {
+    if (onSuggestionsVisibilityChange) {
+      onSuggestionsVisibilityChange(shouldShowSuggestions);
+    }
+  }, [shouldShowSuggestions, onSuggestionsVisibilityChange]);
+
   const showAutoAcceptStyling =
     !shellModeActive && approvalMode === ApprovalMode.AUTO_EDIT;
   const showYoloStyling =
@@ -721,7 +770,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         borderLeft={false}
         borderRight={false}
         borderColor={borderColor}
-        paddingX={1}
       >
         <Text
           color={statusColor ?? theme.text.accent}
@@ -852,7 +900,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         </Box>
       </Box>
       {shouldShowSuggestions && (
-        <Box paddingRight={2}>
+        <Box marginLeft={2} marginRight={2}>
           <SuggestionsDisplay
             suggestions={activeCompletion.suggestions}
             activeIndex={activeCompletion.activeSuggestionIndex}

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

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

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

@@ -275,7 +275,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
         persistModelSelection(settings, effectiveModelId);
         persistAuthTypeSelection(settings, effectiveAuthType);
 
-        const baseUrl = after?.baseUrl ?? '(default)';
+        const baseUrl = after?.baseUrl ?? t('(default)');
         const maskedKey = maskApiKey(after?.apiKey);
         uiState?.historyManager.addItem(
           {
@@ -322,7 +322,7 @@ export function ModelDialog({ onClose }: ModelDialogProps): React.JSX.Element {
             <>
               <ConfigRow
                 label="Base URL"
-                value={effectiveConfig?.baseUrl ?? ''}
+                value={effectiveConfig?.baseUrl ?? t('(default)')}
                 badge={formatSourceBadge(sources['baseUrl'])}
               />
               <ConfigRow

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

@@ -50,7 +50,13 @@ const StatRow: React.FC<StatRowProps> = ({
   </Box>
 );
 
-export const ModelStatsDisplay: React.FC = () => {
+interface ModelStatsDisplayProps {
+  width?: number;
+}
+
+export const ModelStatsDisplay: React.FC<ModelStatsDisplayProps> = ({
+  width,
+}) => {
   const { stats } = useSessionStats();
   const { models } = stats.metrics;
   const activeModels = Object.entries(models).filter(
@@ -64,6 +70,7 @@ export const ModelStatsDisplay: React.FC = () => {
         borderColor={theme.border.default}
         paddingY={1}
         paddingX={2}
+        width={width}
       >
         <Text color={theme.text.primary}>
           {t('No API calls have been made in this session.')}
@@ -93,6 +100,7 @@ export const ModelStatsDisplay: React.FC = () => {
       flexDirection="column"
       paddingY={1}
       paddingX={2}
+      width={width}
     >
       <Text bold color={theme.text.accent}>
         {t('Model Stats For Nerds')}

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

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

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

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

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

@@ -127,8 +127,8 @@ export function SessionPicker(props: SessionPickerProps) {
 
   const { columns: width, rows: height } = useTerminalSize();
 
-  // Calculate box width (width + 6 for border padding)
-  const boxWidth = width + 6;
+  // Calculate box width (marginX={2})
+  const boxWidth = width - 4;
   // Calculate visible items (same heuristic as before)
   // Reserved space: header (1), footer (1), separators (2), borders (2)
   const reservedLines = 6;
@@ -179,7 +179,7 @@ export function SessionPicker(props: SessionPickerProps) {
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(width - 2)}</Text>
+          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
         </Box>
 
         {/* Session list */}
@@ -212,7 +212,7 @@ export function SessionPicker(props: SessionPickerProps) {
                   isLast={visibleIndex === picker.visibleSessions.length - 1}
                   showScrollUp={picker.showScrollUp}
                   showScrollDown={picker.showScrollDown}
-                  maxPromptWidth={width}
+                  maxPromptWidth={boxWidth - 6}
                   prefixChars={PREFIX_CHARS}
                   boldSelectedPrefix={false}
                 />
@@ -223,7 +223,7 @@ export function SessionPicker(props: SessionPickerProps) {
 
         {/* Separator */}
         <Box>
-          <Text color={theme.border.default}>{'─'.repeat(width - 2)}</Text>
+          <Text color={theme.border.default}>{'─'.repeat(boxWidth - 2)}</Text>
         </Box>
 
         {/* Footer */}

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

@@ -14,10 +14,12 @@ import { t } from '../../i18n/index.js';
 
 interface SessionSummaryDisplayProps {
   duration: string;
+  width: number;
 }
 
 export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
   duration,
+  width,
 }) => {
   const config = useConfig();
   const { stats } = useSessionStats();
@@ -32,6 +34,7 @@ export const SessionSummaryDisplay: React.FC<SessionSummaryDisplayProps> = ({
       <StatsDisplay
         title={t('Agent powering down. Goodbye!')}
         duration={duration}
+        width={width}
       />
       {hasMessages && canResume && (
         <Box marginTop={1}>

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

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

@@ -4,7 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import React, { useState, useEffect } from 'react';
+import type React from 'react';
+import { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
 import type { LoadedSettings, Settings } from '../../config/settings.js';
@@ -57,10 +58,8 @@ export function SettingsDialog({
   // Get vim mode context to sync vim mode changes
   const { vimEnabled, toggleVimEnabled } = useVimMode();
 
-  // Focus state: 'settings' or 'scope'
-  const [focusSection, setFocusSection] = useState<'settings' | 'scope'>(
-    'settings',
-  );
+  // Mode state: 'settings' or 'scope' (view switching like ThemeDialog)
+  const [mode, setMode] = useState<'settings' | 'scope'>('settings');
   // Scope selector state (User by default)
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
     SettingScope.User,
@@ -105,7 +104,9 @@ export function SettingsDialog({
         updated = setPendingSettingValue(key, value, updated);
       } else if (
         (def?.type === 'number' && typeof value === 'number') ||
-        (def?.type === 'string' && typeof value === 'string')
+        (def?.type === 'string' && typeof value === 'string') ||
+        (def?.type === 'enum' &&
+          (typeof value === 'string' || typeof value === 'number'))
       ) {
         updated = setPendingSettingValueAny(key, value, updated);
       }
@@ -156,10 +157,6 @@ export function SettingsDialog({
             );
           }
 
-          setPendingSettings((prev) =>
-            setPendingSettingValue(key, newValue as boolean, prev),
-          );
-
           if (!requiresRestart(key)) {
             const immediateSettings = new Set([key]);
             const immediateSettingsObject = setPendingSettingValueAny(
@@ -381,15 +378,13 @@ export function SettingsDialog({
 
   const handleScopeSelect = (scope: SettingScope) => {
     handleScopeHighlight(scope);
-    setFocusSection('settings');
+    setMode('settings');
   };
 
   // Height constraint calculations similar to ThemeDialog
   const DIALOG_PADDING = 2;
   const SETTINGS_TITLE_HEIGHT = 2; // "Settings" title + spacing
   const SCROLL_ARROWS_HEIGHT = 2; // Up and down arrows
-  const SPACING_HEIGHT = 1; // Space between settings list and scope
-  const SCOPE_SELECTION_HEIGHT = 4; // Apply To section height
   const BOTTOM_HELP_TEXT_HEIGHT = 1; // Help text
   const RESTART_PROMPT_HEIGHT = showRestartPrompt ? 1 : 0;
 
@@ -397,71 +392,28 @@ export function SettingsDialog({
     availableTerminalHeight ?? Number.MAX_SAFE_INTEGER;
   currentAvailableTerminalHeight -= 2; // Top and bottom borders
 
-  // Start with basic fixed height (without scope selection)
-  let totalFixedHeight =
+  // Calculate fixed height (scope selection is now in a separate view, not included here)
+  const totalFixedHeight =
     DIALOG_PADDING +
     SETTINGS_TITLE_HEIGHT +
     SCROLL_ARROWS_HEIGHT +
-    SPACING_HEIGHT +
     BOTTOM_HELP_TEXT_HEIGHT +
     RESTART_PROMPT_HEIGHT;
 
   // Calculate how much space we have for settings
-  let availableHeightForSettings = Math.max(
+  const availableHeightForSettings = Math.max(
     1,
     currentAvailableTerminalHeight - totalFixedHeight,
   );
 
-  // Each setting item takes 2 lines (the setting row + spacing)
-  let maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
-
-  // Decide whether to show scope selection based on remaining space
-  let showScopeSelection = true;
-
-  // If we have limited height, prioritize showing more settings over scope selection
-  if (availableTerminalHeight && availableTerminalHeight < 25) {
-    // For very limited height, hide scope selection to show more settings
-    const totalWithScope = totalFixedHeight + SCOPE_SELECTION_HEIGHT;
-    const availableWithScope = Math.max(
-      1,
-      currentAvailableTerminalHeight - totalWithScope,
-    );
-    const maxItemsWithScope = Math.max(1, Math.floor(availableWithScope / 2));
-
-    // If hiding scope selection allows us to show significantly more settings, do it
-    if (maxVisibleItems > maxItemsWithScope + 1) {
-      showScopeSelection = false;
-    } else {
-      // Otherwise include scope selection and recalculate
-      totalFixedHeight += SCOPE_SELECTION_HEIGHT;
-      availableHeightForSettings = Math.max(
-        1,
-        currentAvailableTerminalHeight - totalFixedHeight,
-      );
-      maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
-    }
-  } else {
-    // For normal height, include scope selection
-    totalFixedHeight += SCOPE_SELECTION_HEIGHT;
-    availableHeightForSettings = Math.max(
-      1,
-      currentAvailableTerminalHeight - totalFixedHeight,
-    );
-    maxVisibleItems = Math.max(1, Math.floor(availableHeightForSettings / 2));
-  }
+  // Each setting item takes 1 line
+  const maxVisibleItems = Math.max(1, availableHeightForSettings);
 
   // Use the calculated maxVisibleItems or fall back to the original maxItemsToShow
   const effectiveMaxItemsToShow = availableTerminalHeight
     ? Math.min(maxVisibleItems, items.length)
     : maxItemsToShow;
 
-  // Ensure focus stays on settings when scope selection is hidden
-  React.useEffect(() => {
-    if (!showScopeSelection && focusSection === 'scope') {
-      setFocusSection('settings');
-    }
-  }, [showScopeSelection, focusSection]);
-
   // Scroll logic for settings
   const visibleItems = items.slice(
     scrollOffset,
@@ -474,10 +426,10 @@ export function SettingsDialog({
   useKeypress(
     (key) => {
       const { name, ctrl } = key;
-      if (name === 'tab' && showScopeSelection) {
-        setFocusSection((prev) => (prev === 'settings' ? 'scope' : 'settings'));
+      if (name === 'tab') {
+        setMode((prev) => (prev === 'settings' ? 'scope' : 'settings'));
       }
-      if (focusSection === 'settings') {
+      if (mode === 'settings') {
         // If editing, capture input and control keys
         if (editingKey) {
           const definition = getSettingDefinition(editingKey);
@@ -599,6 +551,18 @@ export function SettingsDialog({
           }
         } else if (name === 'return' || name === 'space') {
           const currentItem = items[activeSettingIndex];
+          if (currentItem?.value === 'ui.theme') {
+            if (name === 'return') {
+              onSelect('ui.theme', selectedScope);
+            }
+            return;
+          }
+          if (currentItem?.value === 'general.preferredEditor') {
+            if (name === 'return') {
+              onSelect('general.preferredEditor', selectedScope);
+            }
+            return;
+          }
           if (
             currentItem?.type === 'number' ||
             currentItem?.type === 'string'
@@ -775,97 +739,95 @@ export function SettingsDialog({
     <Box
       borderStyle="round"
       borderColor={theme.border.default}
-      flexDirection="row"
+      flexDirection="column"
       padding={1}
       width="100%"
-      height="100%"
     >
-      <Box flexDirection="column" flexGrow={1}>
-        <Text bold={focusSection === 'settings'} wrap="truncate">
-          {focusSection === 'settings' ? '> ' : '  '}
-          {t('Settings')}
-        </Text>
-        <Box height={1} />
-        {showScrollUp && <Text color={theme.text.secondary}>▲</Text>}
-        {visibleItems.map((item, idx) => {
-          const isActive =
-            focusSection === 'settings' &&
-            activeSettingIndex === idx + scrollOffset;
+      {mode === 'settings' ? (
+        <Box flexDirection="column" flexGrow={1}>
+          <Text bold={mode === 'settings'} wrap="truncate">
+            {mode === 'settings' ? '> ' : '  '}
+            {t('Settings')}
+          </Text>
+          <Box height={1} />
+          {showScrollUp && <Text color={theme.text.secondary}>▲</Text>}
+          {visibleItems.map((item, idx) => {
+            const isActive =
+              mode === 'settings' && activeSettingIndex === idx + scrollOffset;
 
-          const scopeSettings = settings.forScope(selectedScope).settings;
-          const mergedSettings = settings.merged;
+            const scopeSettings = settings.forScope(selectedScope).settings;
+            const mergedSettings = settings.merged;
 
-          let displayValue: string;
-          if (editingKey === item.value) {
-            // Show edit buffer with advanced cursor highlighting
-            if (cursorVisible && editCursorPos < cpLen(editBuffer)) {
-              // Cursor is in the middle or at start of text
-              const beforeCursor = cpSlice(editBuffer, 0, editCursorPos);
-              const atCursor = cpSlice(
-                editBuffer,
-                editCursorPos,
-                editCursorPos + 1,
+            let displayValue: string;
+            if (editingKey === item.value) {
+              // Show edit buffer with advanced cursor highlighting
+              if (cursorVisible && editCursorPos < cpLen(editBuffer)) {
+                // Cursor is in the middle or at start of text
+                const beforeCursor = cpSlice(editBuffer, 0, editCursorPos);
+                const atCursor = cpSlice(
+                  editBuffer,
+                  editCursorPos,
+                  editCursorPos + 1,
+                );
+                const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
+                displayValue =
+                  beforeCursor + chalk.inverse(atCursor) + afterCursor;
+              } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
+                // Cursor is at the end - show inverted space
+                displayValue = editBuffer + chalk.inverse(' ');
+              } else {
+                // Cursor not visible
+                displayValue = editBuffer;
+              }
+            } else if (item.type === 'number' || item.type === 'string') {
+              // For numbers/strings, get the actual current value from pending settings
+              const path = item.value.split('.');
+              const currentValue = getNestedValue(pendingSettings, path);
+
+              const defaultValue = getDefaultValue(item.value);
+
+              if (currentValue !== undefined && currentValue !== null) {
+                displayValue = String(currentValue);
+              } else {
+                displayValue =
+                  defaultValue !== undefined && defaultValue !== null
+                    ? String(defaultValue)
+                    : '';
+              }
+
+              // Add * if value differs from default OR if currently being modified
+              const isModified = modifiedSettings.has(item.value);
+              const effectiveCurrentValue =
+                currentValue !== undefined && currentValue !== null
+                  ? currentValue
+                  : defaultValue;
+              const isDifferentFromDefault =
+                effectiveCurrentValue !== defaultValue;
+
+              if (isDifferentFromDefault || isModified) {
+                displayValue += '*';
+              }
+            } else {
+              // For booleans and other types, use existing logic
+              displayValue = getDisplayValue(
+                item.value,
+                scopeSettings,
+                mergedSettings,
+                modifiedSettings,
+                pendingSettings,
               );
-              const afterCursor = cpSlice(editBuffer, editCursorPos + 1);
-              displayValue =
-                beforeCursor + chalk.inverse(atCursor) + afterCursor;
-            } else if (cursorVisible && editCursorPos >= cpLen(editBuffer)) {
-              // Cursor is at the end - show inverted space
-              displayValue = editBuffer + chalk.inverse(' ');
-            } else {
-              // Cursor not visible
-              displayValue = editBuffer;
             }
-          } else if (item.type === 'number' || item.type === 'string') {
-            // For numbers/strings, get the actual current value from pending settings
-            const path = item.value.split('.');
-            const currentValue = getNestedValue(pendingSettings, path);
+            const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
-            const defaultValue = getDefaultValue(item.value);
-
-            if (currentValue !== undefined && currentValue !== null) {
-              displayValue = String(currentValue);
-            } else {
-              displayValue =
-                defaultValue !== undefined && defaultValue !== null
-                  ? String(defaultValue)
-                  : '';
-            }
-
-            // Add * if value differs from default OR if currently being modified
-            const isModified = modifiedSettings.has(item.value);
-            const effectiveCurrentValue =
-              currentValue !== undefined && currentValue !== null
-                ? currentValue
-                : defaultValue;
-            const isDifferentFromDefault =
-              effectiveCurrentValue !== defaultValue;
-
-            if (isDifferentFromDefault || isModified) {
-              displayValue += '*';
-            }
-          } else {
-            // For booleans and other types, use existing logic
-            displayValue = getDisplayValue(
+            // Generate scope message for this setting
+            const scopeMessage = getScopeMessageForSetting(
               item.value,
-              scopeSettings,
-              mergedSettings,
-              modifiedSettings,
-              pendingSettings,
+              selectedScope,
+              settings,
             );
-          }
-          const shouldBeGreyedOut = isDefaultValue(item.value, scopeSettings);
 
-          // Generate scope message for this setting
-          const scopeMessage = getScopeMessageForSetting(
-            item.value,
-            selectedScope,
-            settings,
-          );
-
-          return (
-            <React.Fragment key={item.value}>
-              <Box flexDirection="row" alignItems="center">
+            return (
+              <Box key={item.value} flexDirection="row" alignItems="center">
                 <Box minWidth={2} flexShrink={0}>
                   <Text
                     color={
@@ -898,40 +860,32 @@ 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,11 +160,13 @@ const ModelUsageTable: React.FC<{
 interface StatsDisplayProps {
   duration: string;
   title?: string;
+  width?: number;
 }
 
 export const StatsDisplay: React.FC<StatsDisplayProps> = ({
   duration,
   title,
+  width,
 }) => {
   const { stats } = useSessionStats();
   const { metrics } = stats;
@@ -213,6 +215,7 @@ export const StatsDisplay: React.FC<StatsDisplayProps> = ({
       flexDirection="column"
       paddingY={1}
       paddingX={2}
+      width={width}
     >
       {renderTitle()}
       <Box height={1} />

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

@@ -42,7 +42,7 @@ export function SuggestionsDisplay({
 }: SuggestionsDisplayProps) {
   if (isLoading) {
     return (
-      <Box paddingX={1} width={width}>
+      <Box width={width}>
         <Text color="gray">Loading suggestions...</Text>
       </Box>
     );
@@ -70,7 +70,7 @@ export function SuggestionsDisplay({
     mode === 'slash' ? Math.min(maxLabelLength, Math.floor(width * 0.5)) : 0;
 
   return (
-    <Box flexDirection="column" paddingX={1} width={width}>
+    <Box flexDirection="column" width={width}>
       {scrollOffset > 0 && <Text color={theme.text.primary}>▲</Text>}
 
       {visibleSuggestions.map((suggestion, index) => {

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

@@ -258,7 +258,7 @@ def fibonacci(n):
 + print(f"Hello, {name}!")
 `}
                     availableTerminalHeight={diffHeight}
-                    terminalWidth={colorizeCodeWidth}
+                    contentWidth={colorizeCodeWidth}
                     theme={previewTheme}
                   />
                 </Box>
@@ -278,7 +278,7 @@ def fibonacci(n):
         <Text color={theme.text.secondary} wrap="truncate">
           {mode === 'theme'
             ? t('(Use Enter to select, Tab to configure scope)')
-            : t('(Use Enter to apply scope, Tab to select theme)')}
+            : t('(Use Enter to apply scope, Tab to go back)')}
         </Text>
       </Box>
     </Box>

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

@@ -4,42 +4,33 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type React from 'react';
+import { useMemo } from 'react';
 import { Box, Text } from 'ink';
 import { theme } from '../semantic-colors.js';
-import { type Config } from '@qwen-code/qwen-code-core';
 import { t } from '../../i18n/index.js';
 
-interface TipsProps {
-  config: Config;
-}
+const startupTips = [
+  'Use /compress when the conversation gets long to summarize history and free up context.',
+  'Start a fresh idea with /clear or /new; the previous session stays available in history.',
+  'Use /bug to submit issues to the maintainers when something goes off.',
+  'Switch auth type quickly with /auth.',
+  'You can run any shell commands from Qwen Code using ! (e.g. !ls).',
+  'Type / to open the command popup; Tab autocompletes slash commands and saved prompts.',
+  'You can resume a previous conversation by running qwen --continue or qwen --resume.',
+  'You can switch permission mode quickly with Shift+Tab or /approval-mode.',
+] as const;
+
+export const Tips: React.FC = () => {
+  const selectedTip = useMemo(() => {
+    const randomIndex = Math.floor(Math.random() * startupTips.length);
+    return startupTips[randomIndex];
+  }, []);
 
-export const Tips: React.FC<TipsProps> = ({ config }) => {
-  const geminiMdFileCount = config.getGeminiMdFileCount();
   return (
-    <Box flexDirection="column">
-      <Text color={theme.text.primary}>{t('Tips for getting started:')}</Text>
-      <Text color={theme.text.primary}>
-        {t('1. Ask questions, edit files, or run commands.')}
-      </Text>
-      <Text color={theme.text.primary}>
-        {t('2. Be specific for the best results.')}
-      </Text>
-      {geminiMdFileCount === 0 && (
-        <Text color={theme.text.primary}>
-          3. Create{' '}
-          <Text bold color={theme.text.accent}>
-            QWEN.md
-          </Text>{' '}
-          {t('files to customize your interactions with Qwen Code.')}
-        </Text>
-      )}
-      <Text color={theme.text.primary}>
-        {geminiMdFileCount === 0 ? '4.' : '3.'}{' '}
-        <Text bold color={theme.text.accent}>
-          /help
-        </Text>{' '}
-        {t('for more information.')}
+    <Box marginLeft={2} marginRight={2}>
+      <Text color={theme.text.secondary}>
+        {t('Tips: ')}
+        {t(selectedTip)}
       </Text>
     </Box>
   );

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

@@ -53,7 +53,13 @@ const StatRow: React.FC<{
   );
 };
 
-export const ToolStatsDisplay: React.FC = () => {
+interface ToolStatsDisplayProps {
+  width?: number;
+}
+
+export const ToolStatsDisplay: React.FC<ToolStatsDisplayProps> = ({
+  width,
+}) => {
   const { stats } = useSessionStats();
   const { tools } = stats.metrics;
   const activeTools = Object.entries(tools.byName).filter(
@@ -67,6 +73,7 @@ export const ToolStatsDisplay: React.FC = () => {
         borderColor={theme.border.default}
         paddingY={1}
         paddingX={2}
+        width={width}
       >
         <Text color={theme.text.primary}>
           {t('No tool calls have been made in this session.')}
@@ -101,7 +108,7 @@ export const ToolStatsDisplay: React.FC = () => {
       flexDirection="column"
       paddingY={1}
       paddingX={2}
-      width={70}
+      width={width}
     >
       <Text bold color={theme.text.accent}>
         {t('Tool Stats For Nerds')}

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

@@ -1,11 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer in narrow terminal (baseline narrow) > complete-footer-narrow 1`] = `"...s/to/make/it/long (main*)                     no sandbox                      gemini-pro (100%)"`;
+exports[`<Footer /> > footer rendering (golden snapshots) > renders complete footer on narrow terminal > complete-footer-narrow 1`] = `"  ? for shortcuts                                                                        0.1% used"`;
 
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders complete footer with all sections visible (baseline) > complete-footer-wide 1`] = `"...directories/to/make/it/long (main*)    no sandbox (see /docs)    gemini-pro (100% context left)"`;
-
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with CWD and model info hidden to test alignment (only sandbox visible) > footer-only-sandbox 1`] = `"                                       no sandbox (see /docs)"`;
-
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with all optional sections hidden (minimal footer) > footer-minimal 1`] = `""`;
-
-exports[`<Footer /> > footer configuration filtering (golden snapshots) > renders footer with only model info hidden (partial filtering) > footer-no-model 1`] = `"...directories/to/make/it/long (main*)                    no sandbox (see /docs)"`;
+exports[`<Footer /> > footer rendering (golden snapshots) > renders complete footer on wide terminal > complete-footer-wide 1`] = `"  ? for shortcuts                                                                0.1% context used"`;

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

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

@@ -4,10 +4,11 @@ exports[`ThemeDialog Snapshots > should render correctly in scope selector mode
 "╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
 │                                                                                                  │
 │ > Apply To                                                                                       │
+│                                                                                                  │
 │ ● 1. User Settings                                                                               │
 │   2. Workspace Settings                                                                          │
 │                                                                                                  │
-│ (Use Enter to apply scope, Tab to select theme)                                                  │
+│ (Use Enter to apply scope, Tab to go back)                                                       │
 │                                                                                                  │
 ╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;