update header display for narrow screen

fix: docs

README.md

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

docs/users/configuration/settings.md

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

docs/users/integration-jetbrains.md

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

docs/users/integration-vscode.md

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

docs/users/integration-zed.md

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

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. |

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

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

package-lock.json

@@ -3875,17 +3875,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/prompts": {
-      "version": "2.4.9",
-      "resolved": "https://registry.npmjs.org/@types/prompts/-/prompts-2.4.9.tgz",
-      "integrity": "sha512-qTxFi6Buiu8+50/+3DGIWLHM6QuWsEKugJnnP6iv2Mc4ncxE4A/OJkjuVOA+5X0X1S/nq5VJRa8Lu+nwcvbrKA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "kleur": "^3.0.3"
-      }
-    },
     "node_modules/@types/prop-types": {
       "version": "15.7.15",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
@@ -10992,15 +10981,6 @@
         "json-buffer": "3.0.1"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/ky": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/ky/-/ky-1.8.1.tgz",
@@ -13410,19 +13390,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/prompts": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
-      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
-      "license": "MIT",
-      "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/prop-types": {
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
@@ -14780,12 +14747,6 @@
         "url": "https://github.com/steveukx/git-js?sponsor=1"
       }
     },
-    "node_modules/sisteransi": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
-      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "license": "MIT"
-    },
     "node_modules/slash": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
@@ -17371,7 +17332,6 @@
         "ink-spinner": "^5.0.0",
         "lowlight": "^3.3.0",
         "open": "^10.1.2",
-        "prompts": "^2.4.2",
         "qrcode-terminal": "^0.12.0",
         "react": "^19.1.0",
         "read-package-up": "^11.0.0",
@@ -17400,7 +17360,6 @@
         "@types/diff": "^7.0.2",
         "@types/dotenv": "^6.1.1",
         "@types/node": "^20.11.24",
-        "@types/prompts": "^2.4.9",
         "@types/react": "^19.1.8",
         "@types/react-dom": "^19.1.6",
         "@types/semver": "^7.7.0",
@@ -18629,7 +18588,7 @@
     },
     "packages/sdk-typescript": {
       "name": "@qwen-code/sdk",
-      "version": "0.1.2",
+      "version": "0.1.3",
       "license": "Apache-2.0",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",

packages/cli/package.json

@@ -46,7 +46,6 @@
     "comment-json": "^4.2.5",
     "diff": "^7.0.0",
     "dotenv": "^17.1.0",
-    "prompts": "^2.4.2",
     "fzf": "^0.5.2",
     "glob": "^10.5.0",
     "highlight.js": "^11.11.1",
@@ -80,7 +79,6 @@
     "@types/command-exists": "^1.2.3",
     "@types/diff": "^7.0.2",
     "@types/dotenv": "^6.1.1",
-    "@types/prompts": "^2.4.9",
     "@types/node": "^20.11.24",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",

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

@@ -27,8 +27,10 @@ import { Readable, Writable } from 'node:stream';
 import type { LoadedSettings } from '../config/settings.js';
 import { SettingScope } from '../config/settings.js';
 import { z } from 'zod';
+import { ExtensionStorage, type Extension } from '../config/extension.js';
 import type { CliArgs } from '../config/config.js';
 import { loadCliConfig } from '../config/config.js';
+import { ExtensionEnablementManager } from '../config/extensions/extensionEnablement.js';
 
 // Import the modular Session class
 import { Session } from './session/Session.js';
@@ -36,6 +38,7 @@ import { Session } from './session/Session.js';
 export async function runAcpAgent(
   config: Config,
   settings: LoadedSettings,
+  extensions: Extension[],
   argv: CliArgs,
 ) {
   const stdout = Writable.toWeb(process.stdout) as WritableStream;
@@ -48,7 +51,8 @@ export async function runAcpAgent(
   console.debug = console.error;
 
   new acp.AgentSideConnection(
-    (client: acp.Client) => new GeminiAgent(config, settings, argv, client),
+    (client: acp.Client) =>
+      new GeminiAgent(config, settings, extensions, argv, client),
     stdout,
     stdin,
   );
@@ -61,6 +65,7 @@ class GeminiAgent {
   constructor(
     private config: Config,
     private settings: LoadedSettings,
+    private extensions: Extension[],
     private argv: CliArgs,
     private client: acp.Client,
   ) {}
@@ -210,7 +215,16 @@ class GeminiAgent {
       continue: false,
     };
 
-    const config = await loadCliConfig(settings, argvForSession, cwd);
+    const config = await loadCliConfig(
+      settings,
+      this.extensions,
+      new ExtensionEnablementManager(
+        ExtensionStorage.getUserExtensionsDir(),
+        this.argv.extensions,
+      ),
+      argvForSession,
+      cwd,
+    );
 
     await config.initialize();
     return config;

packages/cli/src/commands/extensions/consent.ts

@@ -1,87 +0,0 @@
-import type { ConfirmationRequest } from '../../ui/types.js';
-
-/**
- * Requests consent from the user to perform an action, by reading a Y/n
- * character from stdin.
- *
- * This should not be called from interactive mode as it will break the CLI.
- *
- * @param consentDescription The description of the thing they will be consenting to.
- * @returns boolean, whether they consented or not.
- */
-export async function requestConsentNonInteractive(
-  consentDescription: string,
-): Promise<boolean> {
-  console.info(consentDescription);
-  const result = await promptForConsentNonInteractive(
-    'Do you want to continue? [Y/n]: ',
-  );
-  return result;
-}
-
-/**
- * Requests consent from the user to perform an action, in interactive mode.
- *
- * This should not be called from non-interactive mode as it will not work.
- *
- * @param consentDescription The description of the thing they will be consenting to.
- * @param addExtensionUpdateConfirmationRequest A function to actually add a prompt to the UI.
- * @returns boolean, whether they consented or not.
- */
-export async function requestConsentInteractive(
-  consentDescription: string,
-  addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
-): Promise<boolean> {
-  return promptForConsentInteractive(
-    consentDescription + '\n\nDo you want to continue?',
-    addExtensionUpdateConfirmationRequest,
-  );
-}
-
-/**
- * Asks users a prompt and awaits for a y/n response on stdin.
- *
- * This should not be called from interactive mode as it will break the CLI.
- *
- * @param prompt A yes/no prompt to ask the user
- * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter.
- */
-async function promptForConsentNonInteractive(
-  prompt: string,
-): Promise<boolean> {
-  const readline = await import('node:readline');
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  return new Promise((resolve) => {
-    rl.question(prompt, (answer) => {
-      rl.close();
-      resolve(['y', ''].includes(answer.trim().toLowerCase()));
-    });
-  });
-}
-
-/**
- * Asks users an interactive yes/no prompt.
- *
- * This should not be called from non-interactive mode as it will break the CLI.
- *
- * @param prompt A markdown prompt to ask the user
- * @param addExtensionUpdateConfirmationRequest Function to update the UI state with the confirmation request.
- * @returns Whether or not the user answers yes.
- */
-async function promptForConsentInteractive(
-  prompt: string,
-  addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
-): Promise<boolean> {
-  return new Promise<boolean>((resolve) => {
-    addExtensionUpdateConfirmationRequest({
-      prompt,
-      onConfirm: (resolvedConfirmed) => {
-        resolve(resolvedConfirmed);
-      },
-    });
-  });
-}

packages/cli/src/commands/extensions/disable.ts

@@ -5,22 +5,21 @@
  */
 
 import { type CommandModule } from 'yargs';
+import { disableExtension } from '../../config/extension.js';
 import { SettingScope } from '../../config/settings.js';
 import { getErrorMessage } from '../../utils/errors.js';
-import { getExtensionManager } from './utils.js';
 
 interface DisableArgs {
   name: string;
   scope?: string;
 }
 
-export async function handleDisable(args: DisableArgs) {
-  const extensionManager = await getExtensionManager();
+export function handleDisable(args: DisableArgs) {
   try {
     if (args.scope?.toLowerCase() === 'workspace') {
-      extensionManager.disableExtension(args.name, SettingScope.Workspace);
+      disableExtension(args.name, SettingScope.Workspace);
     } else {
-      extensionManager.disableExtension(args.name, SettingScope.User);
+      disableExtension(args.name, SettingScope.User);
     }
     console.log(
       `Extension "${args.name}" successfully disabled for scope "${args.scope}".`,
@@ -62,8 +61,8 @@ export const disableCommand: CommandModule = {
         }
         return true;
       }),
-  handler: async (argv) => {
-    await handleDisable({
+  handler: (argv) => {
+    handleDisable({
       name: argv['name'] as string,
       scope: argv['scope'] as string,
     });

packages/cli/src/commands/extensions/enable.ts

@@ -6,22 +6,20 @@
 
 import { type CommandModule } from 'yargs';
 import { FatalConfigError, getErrorMessage } from '@qwen-code/qwen-code-core';
+import { enableExtension } from '../../config/extension.js';
 import { SettingScope } from '../../config/settings.js';
-import { getExtensionManager } from './utils.js';
 
 interface EnableArgs {
   name: string;
   scope?: string;
 }
 
-export async function handleEnable(args: EnableArgs) {
-  const extensionManager = await getExtensionManager();
-
+export function handleEnable(args: EnableArgs) {
   try {
     if (args.scope?.toLowerCase() === 'workspace') {
-      extensionManager.enableExtension(args.name, SettingScope.Workspace);
+      enableExtension(args.name, SettingScope.Workspace);
     } else {
-      extensionManager.enableExtension(args.name, SettingScope.User);
+      enableExtension(args.name, SettingScope.User);
     }
     if (args.scope) {
       console.log(
@@ -68,8 +66,8 @@ export const enableCommand: CommandModule = {
         }
         return true;
       }),
-  handler: async (argv) => {
-    await handleEnable({
+  handler: (argv) => {
+    handleEnable({
       name: argv['name'] as string,
       scope: argv['scope'] as string,
     });

packages/cli/src/commands/extensions/examples/custom-commands/commands/fs/grep-code.toml

@@ -1,3 +1,6 @@
+prompt = """
 Please summarize the findings for the pattern `{{args}}`.
 
 Search Results:
+!{grep -r {{args}} .}
+"""

packages/cli/src/commands/extensions/install.ts

@@ -5,64 +5,58 @@
  */
 
 import type { CommandModule } from 'yargs';
-
 import {
-  ExtensionManager,
-  parseInstallSource,
-} from '@qwen-code/qwen-code-core';
+  installExtension,
+  requestConsentNonInteractive,
+} from '../../config/extension.js';
+import type { ExtensionInstallMetadata } from '@qwen-code/qwen-code-core';
 import { getErrorMessage } from '../../utils/errors.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import { loadSettings } from '../../config/settings.js';
-import { requestConsentNonInteractive } from './consent.js';
+import { stat } from 'node:fs/promises';
 
 interface InstallArgs {
   source: string;
   ref?: string;
   autoUpdate?: boolean;
-  allowPreRelease?: boolean;
-  consent?: boolean;
 }
 
 export async function handleInstall(args: InstallArgs) {
   try {
-    const installMetadata = await parseInstallSource(args.source);
-
+    let installMetadata: ExtensionInstallMetadata;
+    const { source } = args;
     if (
-      installMetadata.type !== 'git' &&
-      installMetadata.type !== 'github-release'
+      source.startsWith('http://') ||
+      source.startsWith('https://') ||
+      source.startsWith('git@') ||
+      source.startsWith('sso://')
     ) {
+      installMetadata = {
+        source,
+        type: 'git',
+        ref: args.ref,
+        autoUpdate: args.autoUpdate,
+      };
+    } else {
       if (args.ref || args.autoUpdate) {
         throw new Error(
-          '--ref and --auto-update are not applicable for marketplace extensions.',
+          '--ref and --auto-update are not applicable for local extensions.',
         );
       }
+      try {
+        await stat(source);
+        installMetadata = {
+          source,
+          type: 'local',
+        };
+      } catch {
+        throw new Error('Install source not found.');
+      }
     }
 
-    const requestConsent = args.consent
-      ? () => Promise.resolve(true)
-      : requestConsentNonInteractive;
-    const workspaceDir = process.cwd();
-    const extensionManager = new ExtensionManager({
-      workspaceDir,
-      isWorkspaceTrusted: !!isWorkspaceTrusted(
-        loadSettings(workspaceDir).merged,
-      ),
-      requestConsent,
-    });
-    await extensionManager.refreshCache();
-
-    const extension = await extensionManager.installExtension(
-      {
-        ...installMetadata,
-        ref: args.ref,
-        autoUpdate: args.autoUpdate,
-        allowPreRelease: args.allowPreRelease,
-      },
-      requestConsent,
-    );
-    console.log(
-      `Extension "${extension.name}" installed successfully and enabled.`,
+    const name = await installExtension(
+      installMetadata,
+      requestConsentNonInteractive,
     );
+    console.log(`Extension "${name}" installed successfully and enabled.`);
   } catch (error) {
     console.error(getErrorMessage(error));
     process.exit(1);
@@ -71,13 +65,11 @@ export async function handleInstall(args: InstallArgs) {
 
 export const installCommand: CommandModule = {
   command: 'install <source>',
-  describe:
-    'Installs an extension from a git repository URL, local path, or claude marketplace (marketplace-url:plugin-name).',
+  describe: 'Installs an extension from a git repository URL or a local path.',
   builder: (yargs) =>
     yargs
       .positional('source', {
-        describe:
-          'The github URL, local path, or marketplace source (marketplace-url:plugin-name) of the extension to install.',
+        describe: 'The github URL or local path of the extension to install.',
         type: 'string',
         demandOption: true,
       })
@@ -89,16 +81,6 @@ export const installCommand: CommandModule = {
         describe: 'Enable auto-update for this extension.',
         type: 'boolean',
       })
-      .option('pre-release', {
-        describe: 'Enable pre-release versions for this extension.',
-        type: 'boolean',
-      })
-      .option('consent', {
-        describe:
-          'Acknowledge the security risks of installing an extension and skip the confirmation prompt.',
-        type: 'boolean',
-        default: false,
-      })
       .check((argv) => {
         if (!argv.source) {
           throw new Error('The source argument must be provided.');
@@ -110,8 +92,6 @@ export const installCommand: CommandModule = {
       source: argv['source'] as string,
       ref: argv['ref'] as string | undefined,
       autoUpdate: argv['auto-update'] as boolean | undefined,
-      allowPreRelease: argv['pre-release'] as boolean | undefined,
-      consent: argv['consent'] as boolean | undefined,
     });
   },
 };

packages/cli/src/commands/extensions/link.ts

@@ -5,10 +5,13 @@
  */
 
 import type { CommandModule } from 'yargs';
-import { type ExtensionInstallMetadata } from '@qwen-code/qwen-code-core';
+import {
+  installExtension,
+  requestConsentNonInteractive,
+} from '../../config/extension.js';
+import type { ExtensionInstallMetadata } from '@qwen-code/qwen-code-core';
+
 import { getErrorMessage } from '../../utils/errors.js';
-import { requestConsentNonInteractive } from './consent.js';
-import { getExtensionManager } from './utils.js';
 
 interface InstallArgs {
   path: string;
@@ -20,14 +23,12 @@ export async function handleLink(args: InstallArgs) {
       source: args.path,
       type: 'link',
     };
-    const extensionManager = await getExtensionManager();
-
-    const extension = await extensionManager.installExtension(
+    const extensionName = await installExtension(
       installMetadata,
       requestConsentNonInteractive,
     );
     console.log(
-      `Extension "${extension.name}" linked successfully and enabled.`,
+      `Extension "${extensionName}" linked successfully and enabled.`,
     );
   } catch (error) {
     console.error(getErrorMessage(error));

packages/cli/src/commands/extensions/list.ts

@@ -5,23 +5,19 @@
  */
 
 import type { CommandModule } from 'yargs';
+import { loadUserExtensions, toOutputString } from '../../config/extension.js';
 import { getErrorMessage } from '../../utils/errors.js';
-import { getExtensionManager } from './utils.js';
 
 export async function handleList() {
   try {
-    const extensionManager = await getExtensionManager();
-    const extensions = extensionManager.getLoadedExtensions();
-
+    const extensions = loadUserExtensions();
     if (extensions.length === 0) {
       console.log('No extensions installed.');
       return;
     }
     console.log(
       extensions
-        .map((extension, _): string =>
-          extensionManager.toOutputString(extension, process.cwd()),
-        )
+        .map((extension, _): string => toOutputString(extension, process.cwd()))
         .join('\n\n'),
     );
   } catch (error) {

packages/cli/src/commands/extensions/uninstall.ts

@@ -5,11 +5,8 @@
  */
 
 import type { CommandModule } from 'yargs';
+import { uninstallExtension } from '../../config/extension.js';
 import { getErrorMessage } from '../../utils/errors.js';
-import { ExtensionManager } from '@qwen-code/qwen-code-core';
-import { requestConsentNonInteractive } from './consent.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import { loadSettings } from '../../config/settings.js';
 
 interface UninstallArgs {
   name: string; // can be extension name or source URL.
@@ -17,16 +14,7 @@ interface UninstallArgs {
 
 export async function handleUninstall(args: UninstallArgs) {
   try {
-    const workspaceDir = process.cwd();
-    const extensionManager = new ExtensionManager({
-      workspaceDir,
-      requestConsent: requestConsentNonInteractive,
-      isWorkspaceTrusted: !!isWorkspaceTrusted(
-        loadSettings(workspaceDir).merged,
-      ),
-    });
-    await extensionManager.refreshCache();
-    await extensionManager.uninstallExtension(args.name, false);
+    await uninstallExtension(args.name);
     console.log(`Extension "${args.name}" successfully uninstalled.`);
   } catch (error) {
     console.error(getErrorMessage(error));

packages/cli/src/commands/extensions/update.ts

@@ -5,13 +5,22 @@
  */
 
 import type { CommandModule } from 'yargs';
+import {
+  loadExtensions,
+  annotateActiveExtensions,
+  ExtensionStorage,
+  requestConsentNonInteractive,
+} from '../../config/extension.js';
+import {
+  updateAllUpdatableExtensions,
+  type ExtensionUpdateInfo,
+  checkForAllExtensionUpdates,
+  updateExtension,
+} from '../../config/extensions/update.js';
+import { checkForExtensionUpdate } from '../../config/extensions/github.js';
 import { getErrorMessage } from '../../utils/errors.js';
 import { ExtensionUpdateState } from '../../ui/state/extensions.js';
-import {
-  checkForExtensionUpdate,
-  type ExtensionUpdateInfo,
-} from '@qwen-code/qwen-code-core';
-import { getExtensionManager } from './utils.js';
+import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
 
 interface UpdateArgs {
   name?: string;
@@ -22,9 +31,19 @@ const updateOutput = (info: ExtensionUpdateInfo) =>
   `Extension "${info.name}" successfully updated: ${info.originalVersion} → ${info.updatedVersion}.`;
 
 export async function handleUpdate(args: UpdateArgs) {
-  const extensionManager = await getExtensionManager();
-  const extensions = extensionManager.getLoadedExtensions();
-
+  const workingDir = process.cwd();
+  const extensionEnablementManager = new ExtensionEnablementManager(
+    ExtensionStorage.getUserExtensionsDir(),
+    // Force enable named extensions, otherwise we will only update the enabled
+    // ones.
+    args.name ? [args.name] : [],
+  );
+  const allExtensions = loadExtensions(extensionEnablementManager);
+  const extensions = annotateActiveExtensions(
+    allExtensions,
+    workingDir,
+    extensionEnablementManager,
+  );
   if (args.name) {
     try {
       const extension = extensions.find(
@@ -34,23 +53,25 @@ export async function handleUpdate(args: UpdateArgs) {
         console.log(`Extension "${args.name}" not found.`);
         return;
       }
+      let updateState: ExtensionUpdateState | undefined;
       if (!extension.installMetadata) {
         console.log(
           `Unable to install extension "${args.name}" due to missing install metadata`,
         );
         return;
       }
-      const updateState = await checkForExtensionUpdate(
-        extension,
-        extensionManager,
-      );
+      await checkForExtensionUpdate(extension, (newState) => {
+        updateState = newState;
+      });
       if (updateState !== ExtensionUpdateState.UPDATE_AVAILABLE) {
         console.log(`Extension "${args.name}" is already up to date.`);
         return;
       }
       // TODO(chrstnb): we should list extensions if the requested extension is not installed.
-      const updatedExtensionInfo = (await extensionManager.updateExtension(
+      const updatedExtensionInfo = (await updateExtension(
         extension,
+        workingDir,
+        requestConsentNonInteractive,
         updateState,
         () => {},
       ))!;
@@ -71,15 +92,18 @@ export async function handleUpdate(args: UpdateArgs) {
   if (args.all) {
     try {
       const extensionState = new Map();
-      await extensionManager.checkForAllExtensionUpdates(
-        (extensionName, state) => {
-          extensionState.set(extensionName, {
-            status: state,
+      await checkForAllExtensionUpdates(extensions, (action) => {
+        if (action.type === 'SET_STATE') {
+          extensionState.set(action.payload.name, {
+            status: action.payload.state,
             processed: true, // No need to process as we will force the update.
           });
-        },
-      );
-      let updateInfos = await extensionManager.updateAllUpdatableExtensions(
+        }
+      });
+      let updateInfos = await updateAllUpdatableExtensions(
+        workingDir,
+        requestConsentNonInteractive,
+        extensions,
         extensionState,
         () => {},
       );

packages/cli/src/commands/extensions/utils.ts

@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { ExtensionManager } from '@qwen-code/qwen-code-core';
-import { loadSettings } from '../../config/settings.js';
-import { requestConsentNonInteractive } from './consent.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-
-export async function getExtensionManager(): Promise<ExtensionManager> {
-  const workspaceDir = process.cwd();
-  const extensionManager = new ExtensionManager({
-    workspaceDir,
-    requestConsent: requestConsentNonInteractive,
-    isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged),
-  });
-  await extensionManager.refreshCache();
-  return extensionManager;
-}

packages/cli/src/commands/mcp/list.test.ts

@@ -7,8 +7,7 @@
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { listMcpServers } from './list.js';
 import { loadSettings } from '../../config/settings.js';
-import { loadExtensions } from '../../config/extension.js';
-import { ExtensionStorage } from '../../config/extensions/storage.js';
+import { ExtensionStorage, loadExtensions } from '../../config/extension.js';
 import { createTransport } from '@qwen-code/qwen-code-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 

packages/cli/src/commands/mcp/list.ts

@@ -8,13 +8,10 @@
 import type { CommandModule } from 'yargs';
 import { loadSettings } from '../../config/settings.js';
 import type { MCPServerConfig } from '@qwen-code/qwen-code-core';
-import {
-  MCPServerStatus,
-  createTransport,
-  ExtensionManager,
-} from '@qwen-code/qwen-code-core';
+import { MCPServerStatus, createTransport } from '@qwen-code/qwen-code-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
+import { ExtensionStorage, loadExtensions } from '../../config/extension.js';
+import { ExtensionEnablementManager } from '../../config/extensions/extensionEnablement.js';
 
 const COLOR_GREEN = '\u001b[32m';
 const COLOR_YELLOW = '\u001b[33m';
@@ -25,27 +22,22 @@ async function getMcpServersFromConfig(): Promise<
   Record<string, MCPServerConfig>
 > {
   const settings = loadSettings();
-  const extensionManager = new ExtensionManager({
-    isWorkspaceTrusted: !!isWorkspaceTrusted(settings.merged),
-    telemetrySettings: settings.merged.telemetry,
-  });
-  await extensionManager.refreshCache();
-  const extensions = extensionManager.getLoadedExtensions();
+  const extensions = loadExtensions(
+    new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+  );
   const mcpServers = { ...(settings.merged.mcpServers || {}) };
   for (const extension of extensions) {
-    if (extension.isActive) {
-      Object.entries(extension.config.mcpServers || {}).forEach(
-        ([key, server]) => {
-          if (mcpServers[key]) {
-            return;
-          }
-          mcpServers[key] = {
-            ...server,
-            extensionName: extension.config.name,
-          };
-        },
-      );
-    }
+    Object.entries(extension.config.mcpServers || {}).forEach(
+      ([key, server]) => {
+        if (mcpServers[key]) {
+          return;
+        }
+        mcpServers[key] = {
+          ...server,
+          extensionName: extension.config.name,
+        };
+      },
+    );
   }
   return mcpServers;
 }

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

@@ -16,8 +16,7 @@ import {
 } from '@qwen-code/qwen-code-core';
 import { loadCliConfig, parseArguments, type CliArgs } from './config.js';
 import type { Settings } from './settings.js';
-import type { Extension } from './extension.js';
-import { ExtensionStorage } from './extensions/storage.js';
+import { ExtensionStorage, type Extension } from './extension.js';
 import * as ServerConfig from '@qwen-code/qwen-code-core';
 import { isWorkspaceTrusted } from './trustedFolders.js';
 import { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
@@ -554,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 = [

packages/cli/src/config/config.ts

@@ -9,6 +9,7 @@ import {
   AuthType,
   Config,
   DEFAULT_QWEN_EMBEDDING_MODEL,
+  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
   FileDiscoveryService,
   getCurrentGeminiMdFilename,
   loadServerHierarchicalMemory,
@@ -22,6 +23,7 @@ import {
   SessionService,
   type ResumedSessionData,
   type FileFilteringOptions,
+  type MCPServerConfig,
   type ToolName,
   EditTool,
   ShellTool,
@@ -41,11 +43,14 @@ import { homedir } from 'node:os';
 
 import { resolvePath } from '../utils/resolvePath.js';
 import { getCliVersion } from '../utils/version.js';
+import type { Extension } from './extension.js';
+import { annotateActiveExtensions } from './extension.js';
 import { loadSandboxConfig } from './sandboxConfig.js';
 import { appEvents } from '../utils/events.js';
 import { mcpCommand } from '../commands/mcp.js';
 
 import { isWorkspaceTrusted } from './trustedFolders.js';
+import type { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
 import { buildWebSearchConfig } from './webSearch.js';
 
 // Simple console logger for now - replace with actual logger if available
@@ -100,7 +105,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;
@@ -164,7 +168,7 @@ function normalizeOutputFormat(
   return OutputFormat.TEXT;
 }
 
-export async function parseArguments(): Promise<CliArgs> {
+export async function parseArguments(settings: Settings): Promise<CliArgs> {
   let rawArgv = hideBin(process.argv);
 
   // hack: if the first argument is the CLI entry point, remove it
@@ -293,11 +297,6 @@ export async function parseArguments(): 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',
@@ -493,10 +492,6 @@ export async function parseArguments(): 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.',
@@ -555,9 +550,11 @@ export async function parseArguments(): Promise<CliArgs> {
         }),
     )
     // Register MCP subcommands
-    .command(mcpCommand)
-    // Register Extension subcommands
-    .command(extensionsCommand);
+    .command(mcpCommand);
+
+  if (settings?.experimental?.extensionManagement ?? true) {
+    yargsInstance.command(extensionsCommand);
+  }
 
   yargsInstance
     .version(await getCliVersion()) // This will enable the --version flag based on package.json
@@ -632,11 +629,11 @@ export async function loadHierarchicalGeminiMemory(
   includeDirectoriesToReadGemini: readonly string[] = [],
   debugMode: boolean,
   fileService: FileDiscoveryService,
+  settings: Settings,
   extensionContextFilePaths: string[] = [],
   folderTrust: boolean,
   memoryImportFormat: 'flat' | 'tree' = 'tree',
   fileFilteringOptions?: FileFilteringOptions,
-  maxDirs: number = 200,
 ): Promise<{ memoryContent: string; fileCount: number }> {
   // FIX: Use real, canonical paths for a reliable comparison to handle symlinks.
   const realCwd = fs.realpathSync(path.resolve(currentWorkingDirectory));
@@ -663,7 +660,7 @@ export async function loadHierarchicalGeminiMemory(
     folderTrust,
     memoryImportFormat,
     fileFilteringOptions,
-    maxDirs,
+    settings.context?.discoveryMaxDirs,
   );
 }
 
@@ -678,17 +675,30 @@ export function isDebugMode(argv: CliArgs): boolean {
 
 export async function loadCliConfig(
   settings: Settings,
+  extensions: Extension[],
+  extensionEnablementManager: ExtensionEnablementManager,
   argv: CliArgs,
   cwd: string = process.cwd(),
-  overrideExtensions?: string[],
 ): Promise<Config> {
   const debugMode = isDebugMode(argv);
 
+  const memoryImportFormat = settings.context?.importFormat || 'tree';
+
   const ideMode = settings.ide?.enabled ?? false;
 
   const folderTrust = settings.security?.folderTrust?.enabled ?? false;
   const trustedFolder = isWorkspaceTrusted(settings)?.isTrusted ?? true;
 
+  const allExtensions = annotateActiveExtensions(
+    extensions,
+    cwd,
+    extensionEnablementManager,
+  );
+
+  const activeExtensions = extensions.filter(
+    (_, i) => allExtensions[i].isActive,
+  );
+
   // Set the context filename in the server's memoryTool module BEFORE loading memory
   // TODO(b/343434939): This is a bit of a hack. The contextFileName should ideally be passed
   // directly to the Config constructor in core, and have core handle setGeminiMdFilename.
@@ -700,27 +710,51 @@ export async function loadCliConfig(
     setServerGeminiMdFilename(getCurrentGeminiMdFilename());
   }
 
+  const extensionContextFilePaths = activeExtensions.flatMap(
+    (e) => e.contextFiles,
+  );
+
   // Automatically load output-language.md if it exists
-  let outputLanguageFilePath: string | undefined = path.join(
+  const outputLanguageFilePath = path.join(
     Storage.getGlobalQwenDir(),
     'output-language.md',
   );
   if (fs.existsSync(outputLanguageFilePath)) {
+    extensionContextFilePaths.push(outputLanguageFilePath);
     if (debugMode) {
       logger.debug(
         `Found output-language.md, adding to context files: ${outputLanguageFilePath}`,
       );
     }
-  } else {
-    outputLanguageFilePath = undefined;
   }
 
   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));
 
+  // Call the (now wrapper) loadHierarchicalGeminiMemory which calls the server's version
+  const { memoryContent, fileCount } = await loadHierarchicalGeminiMemory(
+    cwd,
+    settings.context?.loadMemoryFromIncludeDirectories
+      ? includeDirectories
+      : [],
+    debugMode,
+    fileService,
+    settings,
+    extensionContextFilePaths,
+    trustedFolder,
+    memoryImportFormat,
+    fileFiltering,
+  );
+
+  let mcpServers = mergeMcpServers(settings, activeExtensions);
   const question = argv.promptInteractive || argv.prompt || '';
   const inputFormat: InputFormat =
     (argv.inputFormat as InputFormat | undefined) ?? InputFormat.TEXT;
@@ -859,18 +893,38 @@ export async function loadCliConfig(
 
   const excludeTools = mergeExcludeTools(
     settings,
+    activeExtensions,
     extraExcludes.length > 0 ? extraExcludes : undefined,
     argv.excludeTools,
   );
+  const blockedMcpServers: Array<{ name: string; extensionName: string }> = [];
 
-  const allowedMcpServers = argv.allowedMcpServerNames
-    ? new Set(argv.allowedMcpServerNames.filter(Boolean))
-    : settings.mcp?.allowed
-      ? new Set(settings.mcp.allowed.filter(Boolean))
-      : undefined;
-  const excludedMcpServers = settings.mcp?.excluded
-    ? new Set(settings.mcp.excluded.filter(Boolean))
-    : undefined;
+  if (!argv.allowedMcpServerNames) {
+    if (settings.mcp?.allowed) {
+      mcpServers = allowedMcpServers(
+        mcpServers,
+        settings.mcp.allowed,
+        blockedMcpServers,
+      );
+    }
+
+    if (settings.mcp?.excluded) {
+      const excludedNames = new Set(settings.mcp.excluded.filter(Boolean));
+      if (excludedNames.size > 0) {
+        mcpServers = Object.fromEntries(
+          Object.entries(mcpServers).filter(([key]) => !excludedNames.has(key)),
+        );
+      }
+    }
+  }
+
+  if (argv.allowedMcpServerNames) {
+    mcpServers = allowedMcpServers(
+      mcpServers,
+      argv.allowedMcpServerNames,
+      blockedMcpServers,
+    );
+  }
 
   const selectedAuthType =
     (argv.authType as AuthType | undefined) ||
@@ -937,8 +991,6 @@ export async function loadCliConfig(
     includeDirectories,
     loadMemoryFromIncludeDirectories:
       settings.context?.loadMemoryFromIncludeDirectories || false,
-    importFormat: settings.context?.importFormat || 'tree',
-    discoveryMaxDirs: settings.context?.discoveryMaxDirs || 200,
     debugMode,
     question,
     fullContext: argv.allFiles || false,
@@ -948,16 +1000,10 @@ export async function loadCliConfig(
     toolDiscoveryCommand: settings.tools?.discoveryCommand,
     toolCallCommand: settings.tools?.callCommand,
     mcpServerCommand: settings.mcp?.serverCommand,
-    mcpServers: settings.mcpServers || {},
-    allowedMcpServers: allowedMcpServers
-      ? Array.from(allowedMcpServers)
-      : undefined,
-    excludedMcpServers: excludedMcpServers
-      ? Array.from(excludedMcpServers)
-      : undefined,
+    mcpServers,
+    userMemory: memoryContent,
+    geminiMdFileCount: fileCount,
     approvalMode,
-    showMemoryUsage:
-      argv.showMemoryUsage || settings.ui?.showMemoryUsage || false,
     accessibility: {
       ...settings.ui?.accessibility,
       screenReader,
@@ -977,14 +1023,15 @@ export async function loadCliConfig(
     fileDiscoveryService: fileService,
     bugCommand: settings.advanced?.bugCommand,
     model: resolvedModel,
-    outputLanguageFilePath,
+    extensionContextFilePaths,
     sessionTokenLimit: settings.model?.sessionTokenLimit ?? -1,
     maxSessionTurns:
       argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
     experimentalZedIntegration: argv.acp || argv.experimentalAcp || false,
     experimentalSkills: argv.experimentalSkills || false,
     listExtensions: argv.listExtensions || false,
-    overrideExtensions: overrideExtensions || argv.extensions,
+    extensions: allExtensions,
+    blockedMcpServers,
     noBrowser: !!process.env['NO_BROWSER'],
     authType: selectedAuthType,
     inputFormat,
@@ -1026,8 +1073,61 @@ export async function loadCliConfig(
   });
 }
 
+function allowedMcpServers(
+  mcpServers: { [x: string]: MCPServerConfig },
+  allowMCPServers: string[],
+  blockedMcpServers: Array<{ name: string; extensionName: string }>,
+) {
+  const allowedNames = new Set(allowMCPServers.filter(Boolean));
+  if (allowedNames.size > 0) {
+    mcpServers = Object.fromEntries(
+      Object.entries(mcpServers).filter(([key, server]) => {
+        const isAllowed = allowedNames.has(key);
+        if (!isAllowed) {
+          blockedMcpServers.push({
+            name: key,
+            extensionName: server.extensionName || '',
+          });
+        }
+        return isAllowed;
+      }),
+    );
+  } else {
+    blockedMcpServers.push(
+      ...Object.entries(mcpServers).map(([key, server]) => ({
+        name: key,
+        extensionName: server.extensionName || '',
+      })),
+    );
+    mcpServers = {};
+  }
+  return mcpServers;
+}
+
+function mergeMcpServers(settings: Settings, extensions: Extension[]) {
+  const mcpServers = { ...(settings.mcpServers || {}) };
+  for (const extension of extensions) {
+    Object.entries(extension.config.mcpServers || {}).forEach(
+      ([key, server]) => {
+        if (mcpServers[key]) {
+          logger.warn(
+            `Skipping extension MCP config for server with key "${key}" as it already exists.`,
+          );
+          return;
+        }
+        mcpServers[key] = {
+          ...server,
+          extensionName: extension.config.name,
+        };
+      },
+    );
+  }
+  return mcpServers;
+}
+
 function mergeExcludeTools(
   settings: Settings,
+  extensions: Extension[],
   extraExcludes?: string[] | undefined,
   cliExcludeTools?: string[] | undefined,
 ): string[] {
@@ -1036,5 +1136,10 @@ function mergeExcludeTools(
     ...(settings.tools?.exclude || []),
     ...(extraExcludes || []),
   ]);
+  for (const extension of extensions) {
+    for (const tool of extension.config.excludeTools || []) {
+      allExcludeTools.add(tool);
+    }
+  }
   return [...allExcludeTools];
 }

packages/cli/src/config/extension.ts

@@ -0,0 +1,786 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type {
+  MCPServerConfig,
+  GeminiCLIExtension,
+  ExtensionInstallMetadata,
+} from '@qwen-code/qwen-code-core';
+import {
+  QWEN_DIR,
+  Storage,
+  Config,
+  ExtensionInstallEvent,
+  ExtensionUninstallEvent,
+  ExtensionDisableEvent,
+  ExtensionEnableEvent,
+  logExtensionEnable,
+  logExtensionInstallEvent,
+  logExtensionUninstall,
+  logExtensionDisable,
+} from '@qwen-code/qwen-code-core';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as os from 'node:os';
+import { SettingScope, loadSettings } from '../config/settings.js';
+import { getErrorMessage } from '../utils/errors.js';
+import { recursivelyHydrateStrings } from './extensions/variables.js';
+import { isWorkspaceTrusted } from './trustedFolders.js';
+import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
+import {
+  cloneFromGit,
+  downloadFromGitHubRelease,
+} from './extensions/github.js';
+import type { LoadExtensionContext } from './extensions/variableSchema.js';
+import { ExtensionEnablementManager } from './extensions/extensionEnablement.js';
+import chalk from 'chalk';
+import type { ConfirmationRequest } from '../ui/types.js';
+
+export const EXTENSIONS_DIRECTORY_NAME = path.join(QWEN_DIR, 'extensions');
+
+export const EXTENSIONS_CONFIG_FILENAME = 'qwen-extension.json';
+export const INSTALL_METADATA_FILENAME = '.qwen-extension-install.json';
+
+export interface Extension {
+  path: string;
+  config: ExtensionConfig;
+  contextFiles: string[];
+  installMetadata?: ExtensionInstallMetadata | undefined;
+}
+
+export interface ExtensionConfig {
+  name: string;
+  version: string;
+  mcpServers?: Record<string, MCPServerConfig>;
+  contextFileName?: string | string[];
+  excludeTools?: string[];
+}
+
+export interface ExtensionUpdateInfo {
+  name: string;
+  originalVersion: string;
+  updatedVersion: string;
+}
+
+export class ExtensionStorage {
+  private readonly extensionName: string;
+
+  constructor(extensionName: string) {
+    this.extensionName = extensionName;
+  }
+
+  getExtensionDir(): string {
+    return path.join(
+      ExtensionStorage.getUserExtensionsDir(),
+      this.extensionName,
+    );
+  }
+
+  getConfigPath(): string {
+    return path.join(this.getExtensionDir(), EXTENSIONS_CONFIG_FILENAME);
+  }
+
+  static getUserExtensionsDir(): string {
+    const storage = new Storage(os.homedir());
+    return storage.getExtensionsDir();
+  }
+
+  static async createTmpDir(): Promise<string> {
+    return await fs.promises.mkdtemp(path.join(os.tmpdir(), 'qwen-extension'));
+  }
+}
+
+export function getWorkspaceExtensions(workspaceDir: string): Extension[] {
+  // If the workspace dir is the user extensions dir, there are no workspace extensions.
+  if (path.resolve(workspaceDir) === path.resolve(os.homedir())) {
+    return [];
+  }
+  return loadExtensionsFromDir(workspaceDir);
+}
+
+export async function copyExtension(
+  source: string,
+  destination: string,
+): Promise<void> {
+  await fs.promises.cp(source, destination, { recursive: true });
+}
+
+export async function performWorkspaceExtensionMigration(
+  extensions: Extension[],
+  requestConsent: (consent: string) => Promise<boolean>,
+): Promise<string[]> {
+  const failedInstallNames: string[] = [];
+
+  for (const extension of extensions) {
+    try {
+      const installMetadata: ExtensionInstallMetadata = {
+        source: extension.path,
+        type: 'local',
+      };
+      await installExtension(installMetadata, requestConsent);
+    } catch (_) {
+      failedInstallNames.push(extension.config.name);
+    }
+  }
+  return failedInstallNames;
+}
+
+function getTelemetryConfig(cwd: string) {
+  const settings = loadSettings(cwd);
+  const config = new Config({
+    telemetry: settings.merged.telemetry,
+    interactive: false,
+    targetDir: cwd,
+    cwd,
+    model: '',
+    debugMode: false,
+  });
+  return config;
+}
+
+export function loadExtensions(
+  extensionEnablementManager: ExtensionEnablementManager,
+  workspaceDir: string = process.cwd(),
+): Extension[] {
+  const settings = loadSettings(workspaceDir).merged;
+  const allExtensions = [...loadUserExtensions()];
+
+  if (
+    (isWorkspaceTrusted(settings) ?? true) &&
+    // Default management setting to true
+    !(settings.experimental?.extensionManagement ?? true)
+  ) {
+    allExtensions.push(...getWorkspaceExtensions(workspaceDir));
+  }
+
+  const uniqueExtensions = new Map<string, Extension>();
+
+  for (const extension of allExtensions) {
+    if (
+      !uniqueExtensions.has(extension.config.name) &&
+      extensionEnablementManager.isEnabled(extension.config.name, workspaceDir)
+    ) {
+      uniqueExtensions.set(extension.config.name, extension);
+    }
+  }
+
+  return Array.from(uniqueExtensions.values());
+}
+
+export function loadUserExtensions(): Extension[] {
+  const userExtensions = loadExtensionsFromDir(os.homedir());
+
+  const uniqueExtensions = new Map<string, Extension>();
+  for (const extension of userExtensions) {
+    if (!uniqueExtensions.has(extension.config.name)) {
+      uniqueExtensions.set(extension.config.name, extension);
+    }
+  }
+
+  return Array.from(uniqueExtensions.values());
+}
+
+export function loadExtensionsFromDir(dir: string): Extension[] {
+  const storage = new Storage(dir);
+  const extensionsDir = storage.getExtensionsDir();
+  if (!fs.existsSync(extensionsDir)) {
+    return [];
+  }
+
+  const extensions: Extension[] = [];
+  for (const subdir of fs.readdirSync(extensionsDir)) {
+    const extensionDir = path.join(extensionsDir, subdir);
+
+    const extension = loadExtension({ extensionDir, workspaceDir: dir });
+    if (extension != null) {
+      extensions.push(extension);
+    }
+  }
+  return extensions;
+}
+
+export function loadExtension(context: LoadExtensionContext): Extension | null {
+  const { extensionDir, workspaceDir } = context;
+  if (!fs.statSync(extensionDir).isDirectory()) {
+    return null;
+  }
+
+  const installMetadata = loadInstallMetadata(extensionDir);
+  let effectiveExtensionPath = extensionDir;
+
+  if (installMetadata?.type === 'link') {
+    effectiveExtensionPath = installMetadata.source;
+  }
+
+  try {
+    let config = loadExtensionConfig({
+      extensionDir: effectiveExtensionPath,
+      workspaceDir,
+    });
+
+    config = resolveEnvVarsInObject(config);
+
+    if (config.mcpServers) {
+      config.mcpServers = Object.fromEntries(
+        Object.entries(config.mcpServers).map(([key, value]) => [
+          key,
+          filterMcpConfig(value),
+        ]),
+      );
+    }
+
+    const contextFiles = getContextFileNames(config)
+      .map((contextFileName) =>
+        path.join(effectiveExtensionPath, contextFileName),
+      )
+      .filter((contextFilePath) => fs.existsSync(contextFilePath));
+
+    return {
+      path: effectiveExtensionPath,
+      config,
+      contextFiles,
+      installMetadata,
+    };
+  } catch (e) {
+    console.error(
+      `Warning: Skipping extension in ${effectiveExtensionPath}: ${getErrorMessage(
+        e,
+      )}`,
+    );
+    return null;
+  }
+}
+
+export function loadExtensionByName(
+  name: string,
+  workspaceDir: string = process.cwd(),
+): Extension | null {
+  const userExtensionsDir = ExtensionStorage.getUserExtensionsDir();
+  if (!fs.existsSync(userExtensionsDir)) {
+    return null;
+  }
+
+  for (const subdir of fs.readdirSync(userExtensionsDir)) {
+    const extensionDir = path.join(userExtensionsDir, subdir);
+    if (!fs.statSync(extensionDir).isDirectory()) {
+      continue;
+    }
+    const extension = loadExtension({ extensionDir, workspaceDir });
+    if (
+      extension &&
+      extension.config.name.toLowerCase() === name.toLowerCase()
+    ) {
+      return extension;
+    }
+  }
+
+  return null;
+}
+
+function filterMcpConfig(original: MCPServerConfig): MCPServerConfig {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { trust, ...rest } = original;
+  return Object.freeze(rest);
+}
+
+export function loadInstallMetadata(
+  extensionDir: string,
+): ExtensionInstallMetadata | undefined {
+  const metadataFilePath = path.join(extensionDir, INSTALL_METADATA_FILENAME);
+  try {
+    const configContent = fs.readFileSync(metadataFilePath, 'utf-8');
+    const metadata = JSON.parse(configContent) as ExtensionInstallMetadata;
+    return metadata;
+  } catch (_e) {
+    return undefined;
+  }
+}
+
+function getContextFileNames(config: ExtensionConfig): string[] {
+  if (!config.contextFileName) {
+    return ['QWEN.md'];
+  } else if (!Array.isArray(config.contextFileName)) {
+    return [config.contextFileName];
+  }
+  return config.contextFileName;
+}
+
+/**
+ * Returns an annotated list of extensions. If an extension is listed in enabledExtensionNames, it will be active.
+ * If enabledExtensionNames is empty, an extension is active unless it is disabled.
+ * @param extensions The base list of extensions.
+ * @param enabledExtensionNames The names of explicitly enabled extensions.
+ * @param workspaceDir The current workspace directory.
+ */
+export function annotateActiveExtensions(
+  extensions: Extension[],
+  workspaceDir: string,
+  manager: ExtensionEnablementManager,
+): GeminiCLIExtension[] {
+  manager.validateExtensionOverrides(extensions);
+  return extensions.map((extension) => ({
+    name: extension.config.name,
+    version: extension.config.version,
+    isActive: manager.isEnabled(extension.config.name, workspaceDir),
+    path: extension.path,
+    installMetadata: extension.installMetadata,
+  }));
+}
+
+/**
+ * Requests consent from the user to perform an action, by reading a Y/n
+ * character from stdin.
+ *
+ * This should not be called from interactive mode as it will break the CLI.
+ *
+ * @param consentDescription The description of the thing they will be consenting to.
+ * @returns boolean, whether they consented or not.
+ */
+export async function requestConsentNonInteractive(
+  consentDescription: string,
+): Promise<boolean> {
+  console.info(consentDescription);
+  const result = await promptForConsentNonInteractive(
+    'Do you want to continue? [Y/n]: ',
+  );
+  return result;
+}
+
+/**
+ * Requests consent from the user to perform an action, in interactive mode.
+ *
+ * This should not be called from non-interactive mode as it will not work.
+ *
+ * @param consentDescription The description of the thing they will be consenting to.
+ * @param setExtensionUpdateConfirmationRequest A function to actually add a prompt to the UI.
+ * @returns boolean, whether they consented or not.
+ */
+export async function requestConsentInteractive(
+  consentDescription: string,
+  addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
+): Promise<boolean> {
+  return await promptForConsentInteractive(
+    consentDescription + '\n\nDo you want to continue?',
+    addExtensionUpdateConfirmationRequest,
+  );
+}
+
+/**
+ * Asks users a prompt and awaits for a y/n response on stdin.
+ *
+ * This should not be called from interactive mode as it will break the CLI.
+ *
+ * @param prompt A yes/no prompt to ask the user
+ * @returns Whether or not the user answers 'y' (yes). Defaults to 'yes' on enter.
+ */
+async function promptForConsentNonInteractive(
+  prompt: string,
+): Promise<boolean> {
+  const readline = await import('node:readline');
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    rl.question(prompt, (answer) => {
+      rl.close();
+      resolve(['y', ''].includes(answer.trim().toLowerCase()));
+    });
+  });
+}
+
+/**
+ * Asks users an interactive yes/no prompt.
+ *
+ * This should not be called from non-interactive mode as it will break the CLI.
+ *
+ * @param prompt A markdown prompt to ask the user
+ * @param setExtensionUpdateConfirmationRequest Function to update the UI state with the confirmation request.
+ * @returns Whether or not the user answers yes.
+ */
+async function promptForConsentInteractive(
+  prompt: string,
+  addExtensionUpdateConfirmationRequest: (value: ConfirmationRequest) => void,
+): Promise<boolean> {
+  return await new Promise<boolean>((resolve) => {
+    addExtensionUpdateConfirmationRequest({
+      prompt,
+      onConfirm: (resolvedConfirmed) => {
+        resolve(resolvedConfirmed);
+      },
+    });
+  });
+}
+
+export async function installExtension(
+  installMetadata: ExtensionInstallMetadata,
+  requestConsent: (consent: string) => Promise<boolean>,
+  cwd: string = process.cwd(),
+  previousExtensionConfig?: ExtensionConfig,
+): Promise<string> {
+  const telemetryConfig = getTelemetryConfig(cwd);
+  let newExtensionConfig: ExtensionConfig | null = null;
+  let localSourcePath: string | undefined;
+
+  try {
+    const settings = loadSettings(cwd).merged;
+    if (!isWorkspaceTrusted(settings)) {
+      throw new Error(
+        `Could not install extension from untrusted folder at ${installMetadata.source}`,
+      );
+    }
+
+    const extensionsDir = ExtensionStorage.getUserExtensionsDir();
+    await fs.promises.mkdir(extensionsDir, { recursive: true });
+
+    if (
+      !path.isAbsolute(installMetadata.source) &&
+      (installMetadata.type === 'local' || installMetadata.type === 'link')
+    ) {
+      installMetadata.source = path.resolve(cwd, installMetadata.source);
+    }
+
+    let tempDir: string | undefined;
+
+    if (
+      installMetadata.type === 'git' ||
+      installMetadata.type === 'github-release'
+    ) {
+      tempDir = await ExtensionStorage.createTmpDir();
+      try {
+        const result = await downloadFromGitHubRelease(
+          installMetadata,
+          tempDir,
+        );
+        installMetadata.type = result.type;
+        installMetadata.releaseTag = result.tagName;
+      } catch (_error) {
+        await cloneFromGit(installMetadata, tempDir);
+        installMetadata.type = 'git';
+      }
+      localSourcePath = tempDir;
+    } else if (
+      installMetadata.type === 'local' ||
+      installMetadata.type === 'link'
+    ) {
+      localSourcePath = installMetadata.source;
+    } else {
+      throw new Error(`Unsupported install type: ${installMetadata.type}`);
+    }
+
+    try {
+      newExtensionConfig = loadExtensionConfig({
+        extensionDir: localSourcePath,
+        workspaceDir: cwd,
+      });
+
+      const newExtensionName = newExtensionConfig.name;
+      const extensionStorage = new ExtensionStorage(newExtensionName);
+      const destinationPath = extensionStorage.getExtensionDir();
+
+      const installedExtensions = loadUserExtensions();
+      if (
+        installedExtensions.some(
+          (installed) => installed.config.name === newExtensionName,
+        )
+      ) {
+        throw new Error(
+          `Extension "${newExtensionName}" is already installed. Please uninstall it first.`,
+        );
+      }
+      await maybeRequestConsentOrFail(
+        newExtensionConfig,
+        requestConsent,
+        previousExtensionConfig,
+      );
+      await fs.promises.mkdir(destinationPath, { recursive: true });
+
+      if (
+        installMetadata.type === 'local' ||
+        installMetadata.type === 'git' ||
+        installMetadata.type === 'github-release'
+      ) {
+        await copyExtension(localSourcePath, destinationPath);
+      }
+
+      const metadataString = JSON.stringify(installMetadata, null, 2);
+      const metadataPath = path.join(
+        destinationPath,
+        INSTALL_METADATA_FILENAME,
+      );
+      await fs.promises.writeFile(metadataPath, metadataString);
+    } finally {
+      if (tempDir) {
+        await fs.promises.rm(tempDir, { recursive: true, force: true });
+      }
+    }
+
+    logExtensionInstallEvent(
+      telemetryConfig,
+      new ExtensionInstallEvent(
+        newExtensionConfig!.name,
+        newExtensionConfig!.version,
+        installMetadata.source,
+        'success',
+      ),
+    );
+
+    enableExtension(newExtensionConfig!.name, SettingScope.User);
+    return newExtensionConfig!.name;
+  } catch (error) {
+    // Attempt to load config from the source path even if installation fails
+    // to get the name and version for logging.
+    if (!newExtensionConfig && localSourcePath) {
+      try {
+        newExtensionConfig = loadExtensionConfig({
+          extensionDir: localSourcePath,
+          workspaceDir: cwd,
+        });
+      } catch {
+        // Ignore error, this is just for logging.
+      }
+    }
+    logExtensionInstallEvent(
+      telemetryConfig,
+      new ExtensionInstallEvent(
+        newExtensionConfig?.name ?? '',
+        newExtensionConfig?.version ?? '',
+        installMetadata.source,
+        'error',
+      ),
+    );
+    throw error;
+  }
+}
+
+/**
+ * Builds a consent string for installing an extension based on it's
+ * extensionConfig.
+ */
+function extensionConsentString(extensionConfig: ExtensionConfig): string {
+  const output: string[] = [];
+  const mcpServerEntries = Object.entries(extensionConfig.mcpServers || {});
+  output.push(`Installing extension "${extensionConfig.name}".`);
+  output.push(
+    '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**',
+  );
+
+  if (mcpServerEntries.length) {
+    output.push('This extension will run the following MCP servers:');
+    for (const [key, mcpServer] of mcpServerEntries) {
+      const isLocal = !!mcpServer.command;
+      const source =
+        mcpServer.httpUrl ??
+        `${mcpServer.command || ''}${mcpServer.args ? ' ' + mcpServer.args.join(' ') : ''}`;
+      output.push(`  * ${key} (${isLocal ? 'local' : 'remote'}): ${source}`);
+    }
+  }
+  if (extensionConfig.contextFileName) {
+    output.push(
+      `This extension will append info to your QWEN.md context using ${extensionConfig.contextFileName}`,
+    );
+  }
+  if (extensionConfig.excludeTools) {
+    output.push(
+      `This extension will exclude the following core tools: ${extensionConfig.excludeTools}`,
+    );
+  }
+  return output.join('\n');
+}
+
+/**
+ * Requests consent from the user to install an extension (extensionConfig), if
+ * there is any difference between the consent string for `extensionConfig` and
+ * `previousExtensionConfig`.
+ *
+ * Always requests consent if previousExtensionConfig is null.
+ *
+ * Throws if the user does not consent.
+ */
+async function maybeRequestConsentOrFail(
+  extensionConfig: ExtensionConfig,
+  requestConsent: (consent: string) => Promise<boolean>,
+  previousExtensionConfig?: ExtensionConfig,
+) {
+  const extensionConsent = extensionConsentString(extensionConfig);
+  if (previousExtensionConfig) {
+    const previousExtensionConsent = extensionConsentString(
+      previousExtensionConfig,
+    );
+    if (previousExtensionConsent === extensionConsent) {
+      return;
+    }
+  }
+  if (!(await requestConsent(extensionConsent))) {
+    throw new Error(`Installation cancelled for "${extensionConfig.name}".`);
+  }
+}
+
+export function validateName(name: string) {
+  if (!/^[a-zA-Z0-9-]+$/.test(name)) {
+    throw new Error(
+      `Invalid extension name: "${name}". Only letters (a-z, A-Z), numbers (0-9), and dashes (-) are allowed.`,
+    );
+  }
+}
+
+export function loadExtensionConfig(
+  context: LoadExtensionContext,
+): ExtensionConfig {
+  const { extensionDir, workspaceDir } = context;
+  const configFilePath = path.join(extensionDir, EXTENSIONS_CONFIG_FILENAME);
+  if (!fs.existsSync(configFilePath)) {
+    throw new Error(`Configuration file not found at ${configFilePath}`);
+  }
+  try {
+    const configContent = fs.readFileSync(configFilePath, 'utf-8');
+    const config = recursivelyHydrateStrings(JSON.parse(configContent), {
+      extensionPath: extensionDir,
+      workspacePath: workspaceDir,
+      '/': path.sep,
+      pathSeparator: path.sep,
+    }) as unknown as ExtensionConfig;
+    if (!config.name || !config.version) {
+      throw new Error(
+        `Invalid configuration in ${configFilePath}: missing ${!config.name ? '"name"' : '"version"'}`,
+      );
+    }
+    validateName(config.name);
+    return config;
+  } catch (e) {
+    throw new Error(
+      `Failed to load extension config from ${configFilePath}: ${getErrorMessage(
+        e,
+      )}`,
+    );
+  }
+}
+
+export async function uninstallExtension(
+  extensionIdentifier: string,
+  cwd: string = process.cwd(),
+): Promise<void> {
+  const telemetryConfig = getTelemetryConfig(cwd);
+  const installedExtensions = loadUserExtensions();
+  const extensionName = installedExtensions.find(
+    (installed) =>
+      installed.config.name.toLowerCase() ===
+        extensionIdentifier.toLowerCase() ||
+      installed.installMetadata?.source.toLowerCase() ===
+        extensionIdentifier.toLowerCase(),
+  )?.config.name;
+  if (!extensionName) {
+    throw new Error(`Extension not found.`);
+  }
+  const manager = new ExtensionEnablementManager(
+    ExtensionStorage.getUserExtensionsDir(),
+    [extensionName],
+  );
+  manager.remove(extensionName);
+  const storage = new ExtensionStorage(extensionName);
+
+  await fs.promises.rm(storage.getExtensionDir(), {
+    recursive: true,
+    force: true,
+  });
+  logExtensionUninstall(
+    telemetryConfig,
+    new ExtensionUninstallEvent(extensionName, 'success'),
+  );
+}
+
+export function toOutputString(
+  extension: Extension,
+  workspaceDir: string,
+): string {
+  const manager = new ExtensionEnablementManager(
+    ExtensionStorage.getUserExtensionsDir(),
+  );
+  const userEnabled = manager.isEnabled(extension.config.name, os.homedir());
+  const workspaceEnabled = manager.isEnabled(
+    extension.config.name,
+    workspaceDir,
+  );
+
+  const status = workspaceEnabled ? chalk.green('✓') : chalk.red('✗');
+  let output = `${status} ${extension.config.name} (${extension.config.version})`;
+  output += `\n Path: ${extension.path}`;
+  if (extension.installMetadata) {
+    output += `\n Source: ${extension.installMetadata.source} (Type: ${extension.installMetadata.type})`;
+    if (extension.installMetadata.ref) {
+      output += `\n Ref: ${extension.installMetadata.ref}`;
+    }
+    if (extension.installMetadata.releaseTag) {
+      output += `\n Release tag: ${extension.installMetadata.releaseTag}`;
+    }
+  }
+  output += `\n Enabled (User): ${userEnabled}`;
+  output += `\n Enabled (Workspace): ${workspaceEnabled}`;
+  if (extension.contextFiles.length > 0) {
+    output += `\n Context files:`;
+    extension.contextFiles.forEach((contextFile) => {
+      output += `\n  ${contextFile}`;
+    });
+  }
+  if (extension.config.mcpServers) {
+    output += `\n MCP servers:`;
+    Object.keys(extension.config.mcpServers).forEach((key) => {
+      output += `\n  ${key}`;
+    });
+  }
+  if (extension.config.excludeTools) {
+    output += `\n Excluded tools:`;
+    extension.config.excludeTools.forEach((tool) => {
+      output += `\n  ${tool}`;
+    });
+  }
+  return output;
+}
+
+export function disableExtension(
+  name: string,
+  scope: SettingScope,
+  cwd: string = process.cwd(),
+) {
+  const config = getTelemetryConfig(cwd);
+  if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) {
+    throw new Error('System and SystemDefaults scopes are not supported.');
+  }
+  const extension = loadExtensionByName(name, cwd);
+  if (!extension) {
+    throw new Error(`Extension with name ${name} does not exist.`);
+  }
+
+  const manager = new ExtensionEnablementManager(
+    ExtensionStorage.getUserExtensionsDir(),
+    [name],
+  );
+  const scopePath = scope === SettingScope.Workspace ? cwd : os.homedir();
+  manager.disable(name, true, scopePath);
+  logExtensionDisable(config, new ExtensionDisableEvent(name, scope));
+}
+
+export function enableExtension(
+  name: string,
+  scope: SettingScope,
+  cwd: string = process.cwd(),
+) {
+  if (scope === SettingScope.System || scope === SettingScope.SystemDefaults) {
+    throw new Error('System and SystemDefaults scopes are not supported.');
+  }
+  const extension = loadExtensionByName(name, cwd);
+  if (!extension) {
+    throw new Error(`Extension with name ${name} does not exist.`);
+  }
+  const manager = new ExtensionEnablementManager(
+    ExtensionStorage.getUserExtensionsDir(),
+  );
+  const scopePath = scope === SettingScope.Workspace ? cwd : os.homedir();
+  manager.enable(name, true, scopePath);
+  const config = getTelemetryConfig(cwd);
+  logExtensionEnable(config, new ExtensionEnableEvent(name, scope));
+}

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

@@ -0,0 +1,424 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { ExtensionEnablementManager, Override } from './extensionEnablement.js';
+import type { Extension } from '../extension.js';
+
+// Helper to create a temporary directory for testing
+function createTestDir() {
+  const dirPath = fs.mkdtempSync(path.join(os.tmpdir(), 'gemini-test-'));
+  return {
+    path: dirPath,
+    cleanup: () => fs.rmSync(dirPath, { recursive: true, force: true }),
+  };
+}
+
+let testDir: { path: string; cleanup: () => void };
+let configDir: string;
+let manager: ExtensionEnablementManager;
+
+describe('ExtensionEnablementManager', () => {
+  beforeEach(() => {
+    testDir = createTestDir();
+    configDir = path.join(testDir.path, '.gemini');
+    manager = new ExtensionEnablementManager(configDir);
+  });
+
+  afterEach(() => {
+    testDir.cleanup();
+    // Reset the singleton instance for test isolation
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (ExtensionEnablementManager as any).instance = undefined;
+  });
+
+  describe('isEnabled', () => {
+    it('should return true if extension is not configured', () => {
+      expect(manager.isEnabled('ext-test', '/any/path')).toBe(true);
+    });
+
+    it('should return true if no overrides match', () => {
+      manager.disable('ext-test', false, '/another/path');
+      expect(manager.isEnabled('ext-test', '/any/path')).toBe(true);
+    });
+
+    it('should enable a path based on an override rule', () => {
+      manager.disable('ext-test', true, '/');
+      manager.enable('ext-test', true, '/home/user/projects/');
+      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
+        true,
+      );
+    });
+
+    it('should disable a path based on a disable override rule', () => {
+      manager.enable('ext-test', true, '/');
+      manager.disable('ext-test', true, '/home/user/projects/');
+      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
+        false,
+      );
+    });
+
+    it('should respect the last matching rule (enable wins)', () => {
+      manager.disable('ext-test', true, '/home/user/projects/');
+      manager.enable('ext-test', false, '/home/user/projects/my-app');
+      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
+        true,
+      );
+    });
+
+    it('should respect the last matching rule (disable wins)', () => {
+      manager.enable('ext-test', true, '/home/user/projects/');
+      manager.disable('ext-test', false, '/home/user/projects/my-app');
+      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
+        false,
+      );
+    });
+
+    it('should handle', () => {
+      manager.enable('ext-test', true, '/home/user/projects');
+      manager.disable('ext-test', false, '/home/user/projects/my-app');
+      expect(manager.isEnabled('ext-test', '/home/user/projects/my-app')).toBe(
+        false,
+      );
+      expect(
+        manager.isEnabled('ext-test', '/home/user/projects/something-else'),
+      ).toBe(true);
+    });
+  });
+
+  describe('includeSubdirs', () => {
+    it('should add a glob when enabling with includeSubdirs', () => {
+      manager.enable('ext-test', true, '/path/to/dir');
+      const config = manager.readConfig();
+      expect(config['ext-test'].overrides).toContain('/path/to/dir/*');
+    });
+
+    it('should not add a glob when enabling without includeSubdirs', () => {
+      manager.enable('ext-test', false, '/path/to/dir');
+      const config = manager.readConfig();
+      expect(config['ext-test'].overrides).toContain('/path/to/dir/');
+      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
+    });
+
+    it('should add a glob when disabling with includeSubdirs', () => {
+      manager.disable('ext-test', true, '/path/to/dir');
+      const config = manager.readConfig();
+      expect(config['ext-test'].overrides).toContain('!/path/to/dir/*');
+    });
+
+    it('should remove conflicting glob rule when enabling without subdirs', () => {
+      manager.enable('ext-test', true, '/path/to/dir'); // Adds /path/to/dir*
+      manager.enable('ext-test', false, '/path/to/dir'); // Should remove the glob
+      const config = manager.readConfig();
+      expect(config['ext-test'].overrides).toContain('/path/to/dir/');
+      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
+    });
+
+    it('should remove conflicting non-glob rule when enabling with subdirs', () => {
+      manager.enable('ext-test', false, '/path/to/dir'); // Adds /path/to/dir
+      manager.enable('ext-test', true, '/path/to/dir'); // Should remove the non-glob
+      const config = manager.readConfig();
+      expect(config['ext-test'].overrides).toContain('/path/to/dir/*');
+      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/');
+    });
+
+    it('should remove conflicting rules when disabling', () => {
+      manager.enable('ext-test', true, '/path/to/dir'); // enabled with glob
+      manager.disable('ext-test', false, '/path/to/dir'); // disabled without
+      const config = manager.readConfig();
+      expect(config['ext-test'].overrides).toContain('!/path/to/dir/');
+      expect(config['ext-test'].overrides).not.toContain('/path/to/dir/*');
+    });
+
+    it('should correctly evaluate isEnabled with subdirs', () => {
+      manager.disable('ext-test', true, '/');
+      manager.enable('ext-test', true, '/path/to/dir');
+      expect(manager.isEnabled('ext-test', '/path/to/dir/')).toBe(true);
+      expect(manager.isEnabled('ext-test', '/path/to/dir/sub/')).toBe(true);
+      expect(manager.isEnabled('ext-test', '/path/to/another/')).toBe(false);
+    });
+
+    it('should correctly evaluate isEnabled without subdirs', () => {
+      manager.disable('ext-test', true, '/*');
+      manager.enable('ext-test', false, '/path/to/dir');
+      expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(true);
+      expect(manager.isEnabled('ext-test', '/path/to/dir/sub')).toBe(false);
+    });
+  });
+
+  describe('pruning child rules', () => {
+    it('should remove child rules when enabling a parent with subdirs', () => {
+      // Pre-existing rules for children
+      manager.enable('ext-test', false, '/path/to/dir/subdir1');
+      manager.disable('ext-test', true, '/path/to/dir/subdir2');
+      manager.enable('ext-test', false, '/path/to/another/dir');
+
+      // Enable the parent directory
+      manager.enable('ext-test', true, '/path/to/dir');
+
+      const config = manager.readConfig();
+      const overrides = config['ext-test'].overrides;
+
+      // The new parent rule should be present
+      expect(overrides).toContain(`/path/to/dir/*`);
+
+      // Child rules should be removed
+      expect(overrides).not.toContain('/path/to/dir/subdir1/');
+      expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`);
+
+      // Unrelated rules should remain
+      expect(overrides).toContain('/path/to/another/dir/');
+    });
+
+    it('should remove child rules when disabling a parent with subdirs', () => {
+      // Pre-existing rules for children
+      manager.enable('ext-test', false, '/path/to/dir/subdir1');
+      manager.disable('ext-test', true, '/path/to/dir/subdir2');
+      manager.enable('ext-test', false, '/path/to/another/dir');
+
+      // Disable the parent directory
+      manager.disable('ext-test', true, '/path/to/dir');
+
+      const config = manager.readConfig();
+      const overrides = config['ext-test'].overrides;
+
+      // The new parent rule should be present
+      expect(overrides).toContain(`!/path/to/dir/*`);
+
+      // Child rules should be removed
+      expect(overrides).not.toContain('/path/to/dir/subdir1/');
+      expect(overrides).not.toContain(`!/path/to/dir/subdir2/*`);
+
+      // Unrelated rules should remain
+      expect(overrides).toContain('/path/to/another/dir/');
+    });
+
+    it('should not remove child rules if includeSubdirs is false', () => {
+      manager.enable('ext-test', false, '/path/to/dir/subdir1');
+      manager.enable('ext-test', false, '/path/to/dir'); // Not including subdirs
+
+      const config = manager.readConfig();
+      const overrides = config['ext-test'].overrides;
+
+      expect(overrides).toContain('/path/to/dir/subdir1/');
+      expect(overrides).toContain('/path/to/dir/');
+    });
+  });
+
+  it('should enable a path based on an enable override', () => {
+    manager.disable('ext-test', true, '/Users/chrstn');
+    manager.enable('ext-test', true, '/Users/chrstn/gemini-cli');
+
+    expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe(
+      true,
+    );
+  });
+
+  it('should ignore subdirs', () => {
+    manager.disable('ext-test', false, '/Users/chrstn');
+    expect(manager.isEnabled('ext-test', '/Users/chrstn/gemini-cli')).toBe(
+      true,
+    );
+  });
+
+  describe('extension overrides (-e <name>)', () => {
+    beforeEach(() => {
+      manager = new ExtensionEnablementManager(configDir, ['ext-test']);
+    });
+
+    it('can enable extensions, case-insensitive', () => {
+      manager.disable('ext-test', true, '/');
+      expect(manager.isEnabled('ext-test', '/')).toBe(true);
+      expect(manager.isEnabled('Ext-Test', '/')).toBe(true);
+      // Double check that it would have been disabled otherwise
+      expect(
+        new ExtensionEnablementManager(configDir).isEnabled('ext-test', '/'),
+      ).toBe(false);
+    });
+
+    it('disable all other extensions', () => {
+      manager = new ExtensionEnablementManager(configDir, ['ext-test']);
+      manager.enable('ext-test-2', true, '/');
+      expect(manager.isEnabled('ext-test-2', '/')).toBe(false);
+      // Double check that it would have been enabled otherwise
+      expect(
+        new ExtensionEnablementManager(configDir).isEnabled('ext-test-2', '/'),
+      ).toBe(true);
+    });
+
+    it('none disables all extensions', () => {
+      manager = new ExtensionEnablementManager(configDir, ['none']);
+      manager.enable('ext-test', true, '/');
+      expect(manager.isEnabled('ext-test', '/path/to/dir')).toBe(false);
+      // Double check that it would have been enabled otherwise
+      expect(
+        new ExtensionEnablementManager(configDir).isEnabled('ext-test', '/'),
+      ).toBe(true);
+    });
+  });
+
+  describe('validateExtensionOverrides', () => {
+    let consoleErrorSpy: ReturnType<typeof vi.spyOn>;
+
+    beforeEach(() => {
+      consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+    });
+
+    afterEach(() => {
+      consoleErrorSpy.mockRestore();
+    });
+
+    it('should not log an error if enabledExtensionNamesOverride is empty', () => {
+      const manager = new ExtensionEnablementManager(configDir, []);
+      manager.validateExtensionOverrides([]);
+      expect(consoleErrorSpy).not.toHaveBeenCalled();
+    });
+
+    it('should not log an error if all enabledExtensionNamesOverride are valid', () => {
+      const manager = new ExtensionEnablementManager(configDir, [
+        'ext-one',
+        'ext-two',
+      ]);
+      const extensions = [
+        { config: { name: 'ext-one' } },
+        { config: { name: 'ext-two' } },
+      ] as Extension[];
+      manager.validateExtensionOverrides(extensions);
+      expect(consoleErrorSpy).not.toHaveBeenCalled();
+    });
+
+    it('should log an error for each invalid extension name in enabledExtensionNamesOverride', () => {
+      const manager = new ExtensionEnablementManager(configDir, [
+        'ext-one',
+        'ext-invalid',
+        'ext-another-invalid',
+      ]);
+      const extensions = [
+        { config: { name: 'ext-one' } },
+        { config: { name: 'ext-two' } },
+      ] as Extension[];
+      manager.validateExtensionOverrides(extensions);
+      expect(consoleErrorSpy).toHaveBeenCalledTimes(2);
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        'Extension not found: ext-invalid',
+      );
+      expect(consoleErrorSpy).toHaveBeenCalledWith(
+        'Extension not found: ext-another-invalid',
+      );
+    });
+
+    it('should not log an error if "none" is in enabledExtensionNamesOverride', () => {
+      const manager = new ExtensionEnablementManager(configDir, ['none']);
+      manager.validateExtensionOverrides([]);
+      expect(consoleErrorSpy).not.toHaveBeenCalled();
+    });
+  });
+});
+
+describe('Override', () => {
+  it('should create an override from input', () => {
+    const override = Override.fromInput('/path/to/dir', true);
+    expect(override.baseRule).toBe(`/path/to/dir/`);
+    expect(override.isDisable).toBe(false);
+    expect(override.includeSubdirs).toBe(true);
+  });
+
+  it('should create a disable override from input', () => {
+    const override = Override.fromInput('!/path/to/dir', false);
+    expect(override.baseRule).toBe(`/path/to/dir/`);
+    expect(override.isDisable).toBe(true);
+    expect(override.includeSubdirs).toBe(false);
+  });
+
+  it('should create an override from a file rule', () => {
+    const override = Override.fromFileRule('/path/to/dir');
+    expect(override.baseRule).toBe('/path/to/dir');
+    expect(override.isDisable).toBe(false);
+    expect(override.includeSubdirs).toBe(false);
+  });
+
+  it('should create a disable override from a file rule', () => {
+    const override = Override.fromFileRule('!/path/to/dir/');
+    expect(override.isDisable).toBe(true);
+    expect(override.baseRule).toBe('/path/to/dir/');
+    expect(override.includeSubdirs).toBe(false);
+  });
+
+  it('should create an override with subdirs from a file rule', () => {
+    const override = Override.fromFileRule('/path/to/dir/*');
+    expect(override.baseRule).toBe('/path/to/dir/');
+    expect(override.isDisable).toBe(false);
+    expect(override.includeSubdirs).toBe(true);
+  });
+
+  it('should correctly identify conflicting overrides', () => {
+    const override1 = Override.fromInput('/path/to/dir', true);
+    const override2 = Override.fromInput('/path/to/dir', false);
+    expect(override1.conflictsWith(override2)).toBe(true);
+  });
+
+  it('should correctly identify non-conflicting overrides', () => {
+    const override1 = Override.fromInput('/path/to/dir', true);
+    const override2 = Override.fromInput('/path/to/another/dir', true);
+    expect(override1.conflictsWith(override2)).toBe(false);
+  });
+
+  it('should correctly identify equal overrides', () => {
+    const override1 = Override.fromInput('/path/to/dir', true);
+    const override2 = Override.fromInput('/path/to/dir', true);
+    expect(override1.isEqualTo(override2)).toBe(true);
+  });
+
+  it('should correctly identify unequal overrides', () => {
+    const override1 = Override.fromInput('/path/to/dir', true);
+    const override2 = Override.fromInput('!/path/to/dir', true);
+    expect(override1.isEqualTo(override2)).toBe(false);
+  });
+
+  it('should generate the correct regex', () => {
+    const override = Override.fromInput('/path/to/dir', true);
+    const regex = override.asRegex();
+    expect(regex.test('/path/to/dir/')).toBe(true);
+    expect(regex.test('/path/to/dir/subdir')).toBe(true);
+    expect(regex.test('/path/to/another/dir')).toBe(false);
+  });
+
+  it('should correctly identify child overrides', () => {
+    const parent = Override.fromInput('/path/to/dir', true);
+    const child = Override.fromInput('/path/to/dir/subdir', false);
+    expect(child.isChildOf(parent)).toBe(true);
+  });
+
+  it('should correctly identify child overrides with glob', () => {
+    const parent = Override.fromInput('/path/to/dir/*', true);
+    const child = Override.fromInput('/path/to/dir/subdir', false);
+    expect(child.isChildOf(parent)).toBe(true);
+  });
+
+  it('should correctly identify non-child overrides', () => {
+    const parent = Override.fromInput('/path/to/dir', true);
+    const other = Override.fromInput('/path/to/another/dir', false);
+    expect(other.isChildOf(parent)).toBe(false);
+  });
+
+  it('should generate the correct output string', () => {
+    const override = Override.fromInput('/path/to/dir', true);
+    expect(override.output()).toBe(`/path/to/dir/*`);
+  });
+
+  it('should generate the correct output string for a disable override', () => {
+    const override = Override.fromInput('!/path/to/dir', false);
+    expect(override.output()).toBe(`!/path/to/dir/`);
+  });
+
+  it('should disable a path based on a disable override rule', () => {
+    const override = Override.fromInput('!/path/to/dir', false);
+    expect(override.output()).toBe(`!/path/to/dir/`);
+  });
+});

packages/cli/src/config/extensions/extensionEnablement.ts

@@ -0,0 +1,239 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import fs from 'node:fs';
+import path from 'node:path';
+import { type Extension } from '../extension.js';
+
+export interface ExtensionEnablementConfig {
+  overrides: string[];
+}
+
+export interface AllExtensionsEnablementConfig {
+  [extensionName: string]: ExtensionEnablementConfig;
+}
+
+export class Override {
+  constructor(
+    public baseRule: string,
+    public isDisable: boolean,
+    public includeSubdirs: boolean,
+  ) {}
+
+  static fromInput(inputRule: string, includeSubdirs: boolean): Override {
+    const isDisable = inputRule.startsWith('!');
+    let baseRule = isDisable ? inputRule.substring(1) : inputRule;
+    baseRule = ensureLeadingAndTrailingSlash(baseRule);
+    return new Override(baseRule, isDisable, includeSubdirs);
+  }
+
+  static fromFileRule(fileRule: string): Override {
+    const isDisable = fileRule.startsWith('!');
+    let baseRule = isDisable ? fileRule.substring(1) : fileRule;
+    const includeSubdirs = baseRule.endsWith('*');
+    baseRule = includeSubdirs
+      ? baseRule.substring(0, baseRule.length - 1)
+      : baseRule;
+    return new Override(baseRule, isDisable, includeSubdirs);
+  }
+
+  conflictsWith(other: Override): boolean {
+    if (this.baseRule === other.baseRule) {
+      return (
+        this.includeSubdirs !== other.includeSubdirs ||
+        this.isDisable !== other.isDisable
+      );
+    }
+    return false;
+  }
+
+  isEqualTo(other: Override): boolean {
+    return (
+      this.baseRule === other.baseRule &&
+      this.includeSubdirs === other.includeSubdirs &&
+      this.isDisable === other.isDisable
+    );
+  }
+
+  asRegex(): RegExp {
+    return globToRegex(`${this.baseRule}${this.includeSubdirs ? '*' : ''}`);
+  }
+
+  isChildOf(parent: Override) {
+    if (!parent.includeSubdirs) {
+      return false;
+    }
+    return parent.asRegex().test(this.baseRule);
+  }
+
+  output(): string {
+    return `${this.isDisable ? '!' : ''}${this.baseRule}${this.includeSubdirs ? '*' : ''}`;
+  }
+
+  matchesPath(path: string) {
+    return this.asRegex().test(path);
+  }
+}
+
+const ensureLeadingAndTrailingSlash = function (dirPath: string): string {
+  // Normalize separators to forward slashes for consistent matching across platforms.
+  let result = dirPath.replace(/\\/g, '/');
+  if (result.charAt(0) !== '/') {
+    result = '/' + result;
+  }
+  if (result.charAt(result.length - 1) !== '/') {
+    result = result + '/';
+  }
+  return result;
+};
+
+/**
+ * Converts a glob pattern to a RegExp object.
+ * This is a simplified implementation that supports `*`.
+ *
+ * @param glob The glob pattern to convert.
+ * @returns A RegExp object.
+ */
+function globToRegex(glob: string): RegExp {
+  const regexString = glob
+    .replace(/[.+?^${}()|[\]\\]/g, '\\$&') // Escape special regex characters
+    .replace(/(\/?)\*/g, '($1.*)?'); // Convert * to optional group
+
+  return new RegExp(`^${regexString}$`);
+}
+
+export class ExtensionEnablementManager {
+  private configFilePath: string;
+  private configDir: string;
+  // If non-empty, this overrides all other extension configuration and enables
+  // only the ones in this list.
+  private enabledExtensionNamesOverride: string[];
+
+  constructor(configDir: string, enabledExtensionNames?: string[]) {
+    this.configDir = configDir;
+    this.configFilePath = path.join(configDir, 'extension-enablement.json');
+    this.enabledExtensionNamesOverride =
+      enabledExtensionNames?.map((name) => name.toLowerCase()) ?? [];
+  }
+
+  validateExtensionOverrides(extensions: Extension[]) {
+    for (const name of this.enabledExtensionNamesOverride) {
+      if (name === 'none') continue;
+      if (
+        !extensions.some(
+          (ext) => ext.config.name.toLowerCase() === name.toLowerCase(),
+        )
+      ) {
+        console.error(`Extension not found: ${name}`);
+      }
+    }
+  }
+
+  /**
+   * Determines if an extension is enabled based on its name and the current
+   * path. The last matching rule in the overrides list wins.
+   *
+   * @param extensionName The name of the extension.
+   * @param currentPath The absolute path of the current working directory.
+   * @returns True if the extension is enabled, false otherwise.
+   */
+  isEnabled(extensionName: string, currentPath: string): boolean {
+    // If we have a single override called 'none', this disables all extensions.
+    // Typically, this comes from the user passing `-e none`.
+    if (
+      this.enabledExtensionNamesOverride.length === 1 &&
+      this.enabledExtensionNamesOverride[0] === 'none'
+    ) {
+      return false;
+    }
+
+    // If we have explicit overrides, only enable those extensions.
+    if (this.enabledExtensionNamesOverride.length > 0) {
+      // When checking against overrides ONLY, we use a case insensitive match.
+      // The override names are already lowercased in the constructor.
+      return this.enabledExtensionNamesOverride.includes(
+        extensionName.toLocaleLowerCase(),
+      );
+    }
+
+    // Otherwise, we use the configuration settings
+    const config = this.readConfig();
+    const extensionConfig = config[extensionName];
+    // Extensions are enabled by default.
+    let enabled = true;
+    const allOverrides = extensionConfig?.overrides ?? [];
+    for (const rule of allOverrides) {
+      const override = Override.fromFileRule(rule);
+      if (override.matchesPath(ensureLeadingAndTrailingSlash(currentPath))) {
+        enabled = !override.isDisable;
+      }
+    }
+    return enabled;
+  }
+
+  readConfig(): AllExtensionsEnablementConfig {
+    try {
+      const content = fs.readFileSync(this.configFilePath, 'utf-8');
+      return JSON.parse(content);
+    } catch (error) {
+      if (
+        error instanceof Error &&
+        'code' in error &&
+        error.code === 'ENOENT'
+      ) {
+        return {};
+      }
+      console.error('Error reading extension enablement config:', error);
+      return {};
+    }
+  }
+
+  writeConfig(config: AllExtensionsEnablementConfig): void {
+    fs.mkdirSync(this.configDir, { recursive: true });
+    fs.writeFileSync(this.configFilePath, JSON.stringify(config, null, 2));
+  }
+
+  enable(
+    extensionName: string,
+    includeSubdirs: boolean,
+    scopePath: string,
+  ): void {
+    const config = this.readConfig();
+    if (!config[extensionName]) {
+      config[extensionName] = { overrides: [] };
+    }
+    const override = Override.fromInput(scopePath, includeSubdirs);
+    const overrides = config[extensionName].overrides.filter((rule) => {
+      const fileOverride = Override.fromFileRule(rule);
+      if (
+        fileOverride.conflictsWith(override) ||
+        fileOverride.isEqualTo(override)
+      ) {
+        return false; // Remove conflicts and equivalent values.
+      }
+      return !fileOverride.isChildOf(override);
+    });
+    overrides.push(override.output());
+    config[extensionName].overrides = overrides;
+    this.writeConfig(config);
+  }
+
+  disable(
+    extensionName: string,
+    includeSubdirs: boolean,
+    scopePath: string,
+  ): void {
+    this.enable(extensionName, includeSubdirs, `!${scopePath}`);
+  }
+
+  remove(extensionName: string): void {
+    const config = this.readConfig();
+    if (config[extensionName]) {
+      delete config[extensionName];
+      this.writeConfig(config);
+    }
+  }
+}

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

@@ -13,17 +13,14 @@ import {
   parseGitHubRepoForReleases,
 } from './github.js';
 import { simpleGit, type SimpleGit } from 'simple-git';
+import { ExtensionUpdateState } from '../../ui/state/extensions.js';
 import * as os from 'node:os';
 import * as fs from 'node:fs/promises';
 import * as fsSync from 'node:fs';
 import * as path from 'node:path';
 import * as tar from 'tar';
 import * as archiver from 'archiver';
-import {
-  ExtensionUpdateState,
-  type Extension,
-  type ExtensionManager,
-} from './extensionManager.js';
+import type { GeminiCLIExtension } from '@qwen-code/qwen-code-core';
 
 const mockPlatform = vi.hoisted(() => vi.fn());
 const mockArch = vi.hoisted(() => vi.fn());
@@ -126,170 +123,119 @@ describe('git extension helpers', () => {
       revparse: vi.fn(),
     };
 
-    const mockExtensionManager = {
-      loadExtensionConfig: vi.fn(),
-    } as unknown as ExtensionManager;
-
     beforeEach(() => {
       vi.mocked(simpleGit).mockReturnValue(mockGit as unknown as SimpleGit);
     });
 
-    function createExtension(overrides: Partial<Extension> = {}): Extension {
-      return {
-        id: 'test-id',
+    it('should return NOT_UPDATABLE for non-git extensions', async () => {
+      const extension: GeminiCLIExtension = {
         name: 'test',
         path: '/ext',
         version: '1.0.0',
         isActive: true,
-        config: { name: 'test', version: '1.0.0' },
-        contextFiles: [],
-        ...overrides,
-      };
-    }
-
-    it('should return NOT_UPDATABLE for non-git extensions', async () => {
-      const extension = createExtension({
         installMetadata: {
           type: 'link',
           source: '',
         },
-      });
-      const result = await checkForExtensionUpdate(
+      };
+      let result: ExtensionUpdateState | undefined = undefined;
+      await checkForExtensionUpdate(
         extension,
-        mockExtensionManager,
+        (newState) => (result = newState),
       );
       expect(result).toBe(ExtensionUpdateState.NOT_UPDATABLE);
     });
 
     it('should return ERROR if no remotes found', async () => {
-      const extension = createExtension({
+      const extension: GeminiCLIExtension = {
+        name: 'test',
+        path: '/ext',
+        version: '1.0.0',
+        isActive: true,
         installMetadata: {
           type: 'git',
           source: '',
         },
-      });
+      };
       mockGit.getRemotes.mockResolvedValue([]);
-      const result = await checkForExtensionUpdate(
+      let result: ExtensionUpdateState | undefined = undefined;
+      await checkForExtensionUpdate(
         extension,
-        mockExtensionManager,
+        (newState) => (result = newState),
       );
       expect(result).toBe(ExtensionUpdateState.ERROR);
     });
 
     it('should return UPDATE_AVAILABLE when remote hash is different', async () => {
-      const extension = createExtension({
+      const extension: GeminiCLIExtension = {
+        name: 'test',
+        path: '/ext',
+        version: '1.0.0',
+        isActive: true,
         installMetadata: {
           type: 'git',
           source: 'my/ext',
         },
-      });
+      };
       mockGit.getRemotes.mockResolvedValue([
         { name: 'origin', refs: { fetch: 'http://my-repo.com' } },
       ]);
       mockGit.listRemote.mockResolvedValue('remote-hash\tHEAD');
       mockGit.revparse.mockResolvedValue('local-hash');
 
-      const result = await checkForExtensionUpdate(
+      let result: ExtensionUpdateState | undefined = undefined;
+      await checkForExtensionUpdate(
         extension,
-        mockExtensionManager,
+        (newState) => (result = newState),
       );
       expect(result).toBe(ExtensionUpdateState.UPDATE_AVAILABLE);
     });
 
     it('should return UP_TO_DATE when remote and local hashes are the same', async () => {
-      const extension = createExtension({
+      const extension: GeminiCLIExtension = {
+        name: 'test',
+        path: '/ext',
+        version: '1.0.0',
+        isActive: true,
         installMetadata: {
           type: 'git',
           source: 'my/ext',
         },
-      });
+      };
       mockGit.getRemotes.mockResolvedValue([
         { name: 'origin', refs: { fetch: 'http://my-repo.com' } },
       ]);
       mockGit.listRemote.mockResolvedValue('same-hash\tHEAD');
       mockGit.revparse.mockResolvedValue('same-hash');
 
-      const result = await checkForExtensionUpdate(
+      let result: ExtensionUpdateState | undefined = undefined;
+      await checkForExtensionUpdate(
         extension,
-        mockExtensionManager,
+        (newState) => (result = newState),
       );
       expect(result).toBe(ExtensionUpdateState.UP_TO_DATE);
     });
 
     it('should return ERROR on git error', async () => {
-      const extension = createExtension({
+      const extension: GeminiCLIExtension = {
+        name: 'test',
+        path: '/ext',
+        version: '1.0.0',
+        isActive: true,
         installMetadata: {
           type: 'git',
           source: 'my/ext',
         },
-      });
+      };
       mockGit.getRemotes.mockRejectedValue(new Error('git error'));
 
-      const result = await checkForExtensionUpdate(
+      let result: ExtensionUpdateState | undefined = undefined;
+      await checkForExtensionUpdate(
         extension,
-        mockExtensionManager,
+        (newState) => (result = newState),
       );
       expect(result).toBe(ExtensionUpdateState.ERROR);
     });
-
-    it('should return UPDATE_AVAILABLE for local extension with different version', async () => {
-      const extension = createExtension({
-        version: '1.0.0',
-        installMetadata: {
-          type: 'local',
-          source: '/path/to/source',
-        },
-      });
-
-      const mockManager = {
-        loadExtensionConfig: vi.fn().mockReturnValue({
-          name: 'test',
-          version: '2.0.0',
-        }),
-      } as unknown as ExtensionManager;
-
-      const result = await checkForExtensionUpdate(extension, mockManager);
-      expect(result).toBe(ExtensionUpdateState.UPDATE_AVAILABLE);
-    });
-
-    it('should return UP_TO_DATE for local extension with same version', async () => {
-      const extension = createExtension({
-        version: '1.0.0',
-        installMetadata: {
-          type: 'local',
-          source: '/path/to/source',
-        },
-      });
-
-      const mockManager = {
-        loadExtensionConfig: vi.fn().mockReturnValue({
-          name: 'test',
-          version: '1.0.0',
-        }),
-      } as unknown as ExtensionManager;
-
-      const result = await checkForExtensionUpdate(extension, mockManager);
-      expect(result).toBe(ExtensionUpdateState.UP_TO_DATE);
-    });
-
-    it('should return NOT_UPDATABLE for local extension when source cannot be loaded', async () => {
-      const extension = createExtension({
-        version: '1.0.0',
-        installMetadata: {
-          type: 'local',
-          source: '/path/to/source',
-        },
-      });
-
-      const mockManager = {
-        loadExtensionConfig: vi.fn().mockImplementation(() => {
-          throw new Error('Cannot load config');
-        }),
-      } as unknown as ExtensionManager;
-
-      const result = await checkForExtensionUpdate(extension, mockManager);
-      expect(result).toBe(ExtensionUpdateState.NOT_UPDATABLE);
-    });
   });
 
   describe('findReleaseAsset', () => {

packages/cli/src/config/extensions/github.ts

@@ -5,38 +5,19 @@
  */
 
 import { simpleGit } from 'simple-git';
-import { getErrorMessage } from '../utils/errors.js';
+import { getErrorMessage } from '../../utils/errors.js';
+import type {
+  ExtensionInstallMetadata,
+  GeminiCLIExtension,
+} from '@qwen-code/qwen-code-core';
+import { ExtensionUpdateState } from '../../ui/state/extensions.js';
 import * as os from 'node:os';
 import * as https from 'node:https';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
-import { EXTENSIONS_CONFIG_FILENAME } from './variables.js';
+import { EXTENSIONS_CONFIG_FILENAME, loadExtension } from '../extension.js';
 import * as tar from 'tar';
 import extract from 'extract-zip';
-import {
-  ExtensionUpdateState,
-  type Extension,
-  type ExtensionConfig,
-  type ExtensionManager,
-} from './extensionManager.js';
-import type { ExtensionInstallMetadata } from '../config/config.js';
-
-interface GithubReleaseData {
-  assets: Asset[];
-  tag_name: string;
-  tarball_url?: string;
-  zipball_url?: string;
-}
-
-interface Asset {
-  name: string;
-  browser_download_url: string;
-}
-
-export interface GitHubDownloadResult {
-  tagName: string;
-  type: 'git' | 'github-release';
-}
 
 function getGitHubToken(): string | undefined {
   return process.env['GITHUB_TOKEN'];
@@ -134,40 +115,38 @@ async function fetchReleaseFromGithub(
 }
 
 export async function checkForExtensionUpdate(
-  extension: Extension,
-  extensionManager: ExtensionManager,
-): Promise<ExtensionUpdateState> {
+  extension: GeminiCLIExtension,
+  setExtensionUpdateState: (updateState: ExtensionUpdateState) => void,
+  cwd: string = process.cwd(),
+): Promise<void> {
+  setExtensionUpdateState(ExtensionUpdateState.CHECKING_FOR_UPDATES);
   const installMetadata = extension.installMetadata;
   if (installMetadata?.type === 'local') {
-    let latestConfig: ExtensionConfig | undefined;
-    try {
-      latestConfig = extensionManager.loadExtensionConfig({
-        extensionDir: installMetadata.source,
-      });
-    } catch (e) {
-      console.error(
-        `Failed to check for update for local extension "${extension.name}". Could not load extension from source path: ${installMetadata.source}. Error: ${getErrorMessage(e)}`,
-      );
-      return ExtensionUpdateState.NOT_UPDATABLE;
-    }
-
-    if (!latestConfig) {
+    const newExtension = loadExtension({
+      extensionDir: installMetadata.source,
+      workspaceDir: cwd,
+    });
+    if (!newExtension) {
       console.error(
         `Failed to check for update for local extension "${extension.name}". Could not load extension from source path: ${installMetadata.source}`,
       );
-      return ExtensionUpdateState.NOT_UPDATABLE;
+      setExtensionUpdateState(ExtensionUpdateState.ERROR);
+      return;
     }
-    if (latestConfig.version !== extension.version) {
-      return ExtensionUpdateState.UPDATE_AVAILABLE;
+    if (newExtension.config.version !== extension.version) {
+      setExtensionUpdateState(ExtensionUpdateState.UPDATE_AVAILABLE);
+      return;
     }
-    return ExtensionUpdateState.UP_TO_DATE;
+    setExtensionUpdateState(ExtensionUpdateState.UP_TO_DATE);
+    return;
   }
   if (
     !installMetadata ||
     (installMetadata.type !== 'git' &&
       installMetadata.type !== 'github-release')
   ) {
-    return ExtensionUpdateState.NOT_UPDATABLE;
+    setExtensionUpdateState(ExtensionUpdateState.NOT_UPDATABLE);
+    return;
   }
   try {
     if (installMetadata.type === 'git') {
@@ -175,12 +154,14 @@ export async function checkForExtensionUpdate(
       const remotes = await git.getRemotes(true);
       if (remotes.length === 0) {
         console.error('No git remotes found.');
-        return ExtensionUpdateState.ERROR;
+        setExtensionUpdateState(ExtensionUpdateState.ERROR);
+        return;
       }
       const remoteUrl = remotes[0].refs.fetch;
       if (!remoteUrl) {
         console.error(`No fetch URL found for git remote ${remotes[0].name}.`);
-        return ExtensionUpdateState.ERROR;
+        setExtensionUpdateState(ExtensionUpdateState.ERROR);
+        return;
       }
 
       // Determine the ref to check on the remote.
@@ -190,7 +171,8 @@ export async function checkForExtensionUpdate(
 
       if (typeof lsRemoteOutput !== 'string' || lsRemoteOutput.trim() === '') {
         console.error(`Git ref ${refToCheck} not found.`);
-        return ExtensionUpdateState.ERROR;
+        setExtensionUpdateState(ExtensionUpdateState.ERROR);
+        return;
       }
 
       const remoteHash = lsRemoteOutput.split('\t')[0];
@@ -200,17 +182,21 @@ export async function checkForExtensionUpdate(
         console.error(
           `Unable to parse hash from git ls-remote output "${lsRemoteOutput}"`,
         );
-        return ExtensionUpdateState.ERROR;
+        setExtensionUpdateState(ExtensionUpdateState.ERROR);
+        return;
       }
       if (remoteHash === localHash) {
-        return ExtensionUpdateState.UP_TO_DATE;
+        setExtensionUpdateState(ExtensionUpdateState.UP_TO_DATE);
+        return;
       }
-      return ExtensionUpdateState.UPDATE_AVAILABLE;
+      setExtensionUpdateState(ExtensionUpdateState.UPDATE_AVAILABLE);
+      return;
     } else {
       const { source, releaseTag } = installMetadata;
       if (!source) {
         console.error(`No "source" provided for extension.`);
-        return ExtensionUpdateState.ERROR;
+        setExtensionUpdateState(ExtensionUpdateState.ERROR);
+        return;
       }
       const { owner, repo } = parseGitHubRepoForReleases(source);
 
@@ -220,28 +206,30 @@ export async function checkForExtensionUpdate(
         installMetadata.ref,
       );
       if (releaseData.tag_name !== releaseTag) {
-        return ExtensionUpdateState.UPDATE_AVAILABLE;
+        setExtensionUpdateState(ExtensionUpdateState.UPDATE_AVAILABLE);
+        return;
       }
-      return ExtensionUpdateState.UP_TO_DATE;
+      setExtensionUpdateState(ExtensionUpdateState.UP_TO_DATE);
+      return;
     }
   } catch (error) {
     console.error(
       `Failed to check for updates for extension "${installMetadata.source}": ${getErrorMessage(error)}`,
     );
-    return ExtensionUpdateState.ERROR;
+    setExtensionUpdateState(ExtensionUpdateState.ERROR);
+    return;
   }
 }
-
+export interface GitHubDownloadResult {
+  tagName: string;
+  type: 'git' | 'github-release';
+}
 export async function downloadFromGitHubRelease(
   installMetadata: ExtensionInstallMetadata,
   destination: string,
 ): Promise<GitHubDownloadResult> {
-  const { source, ref, marketplace, type } = installMetadata;
-  const { owner, repo } = parseGitHubRepoForReleases(
-    type === 'marketplace' && marketplace
-      ? marketplace.marketplaceSource
-      : source,
-  );
+  const { source, ref } = installMetadata;
+  const { owner, repo } = parseGitHubRepoForReleases(source);
 
   try {
     const releaseData = await fetchReleaseFromGithub(owner, repo, ref);
@@ -288,47 +276,28 @@ export async function downloadFromGitHubRelease(
     // For regular github releases, the repository is put inside of a top level
     // directory. In this case we should see exactly two file in the destination
     // dir, the archive and the directory. If we see that, validate that the
-    // dir has a qwen extension configuration file (or gemini-extension.json
-    // which will be converted later) and then move all files from the directory
-    // up one level into the destination directory.
+    // dir has a qwen extension configuration file and then move all files
+    // from the directory up one level into the destination directory.
     const entries = await fs.promises.readdir(destination, {
       withFileTypes: true,
     });
     if (entries.length === 2) {
       const lonelyDir = entries.find((entry) => entry.isDirectory());
-      if (lonelyDir) {
-        const hasQwenConfig = fs.existsSync(
+      if (
+        lonelyDir &&
+        fs.existsSync(
           path.join(destination, lonelyDir.name, EXTENSIONS_CONFIG_FILENAME),
-        );
-        const hasGeminiConfig = fs.existsSync(
-          path.join(destination, lonelyDir.name, 'gemini-extension.json'),
-        );
-        const hasMarketplaceConfig = fs.existsSync(
-          path.join(
-            destination,
-            lonelyDir.name,
-            '.claude-plugin/marketplace.json',
-          ),
-        );
-        const hasClaudePluginConfig = fs.existsSync(
-          path.join(destination, lonelyDir.name, '.claude-plugin/plugin.json'),
-        );
-        if (
-          hasQwenConfig ||
-          hasGeminiConfig ||
-          hasMarketplaceConfig ||
-          hasClaudePluginConfig
-        ) {
-          const dirPathToExtract = path.join(destination, lonelyDir.name);
-          const extractedDirFiles = await fs.promises.readdir(dirPathToExtract);
-          for (const file of extractedDirFiles) {
-            await fs.promises.rename(
-              path.join(dirPathToExtract, file),
-              path.join(destination, file),
-            );
-          }
-          await fs.promises.rmdir(dirPathToExtract);
+        )
+      ) {
+        const dirPathToExtract = path.join(destination, lonelyDir.name);
+        const extractedDirFiles = await fs.promises.readdir(dirPathToExtract);
+        for (const file of extractedDirFiles) {
+          await fs.promises.rename(
+            path.join(dirPathToExtract, file),
+            path.join(destination, file),
+          );
         }
+        await fs.promises.rmdir(dirPathToExtract);
       }
     }
 
@@ -344,6 +313,18 @@ export async function downloadFromGitHubRelease(
   }
 }
 
+interface GithubReleaseData {
+  assets: Asset[];
+  tag_name: string;
+  tarball_url?: string;
+  zipball_url?: string;
+}
+
+interface Asset {
+  name: string;
+  browser_download_url: string;
+}
+
 export function findReleaseAsset(assets: Asset[]): Asset | undefined {
   const platform = os.platform();
   const arch = os.arch();

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

@@ -0,0 +1,468 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { vi } from 'vitest';
+import * as fs from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+import {
+  EXTENSIONS_CONFIG_FILENAME,
+  ExtensionStorage,
+  INSTALL_METADATA_FILENAME,
+  annotateActiveExtensions,
+  loadExtension,
+} from '../extension.js';
+import { checkForAllExtensionUpdates, updateExtension } from './update.js';
+import { QWEN_DIR } from '@qwen-code/qwen-code-core';
+import { isWorkspaceTrusted } from '../trustedFolders.js';
+import { ExtensionUpdateState } from '../../ui/state/extensions.js';
+import { createExtension } from '../../test-utils/createExtension.js';
+import { ExtensionEnablementManager } from './extensionEnablement.js';
+
+const mockGit = {
+  clone: vi.fn(),
+  getRemotes: vi.fn(),
+  fetch: vi.fn(),
+  checkout: vi.fn(),
+  listRemote: vi.fn(),
+  revparse: vi.fn(),
+  // Not a part of the actual API, but we need to use this to do the correct
+  // file system interactions.
+  path: vi.fn(),
+};
+
+vi.mock('simple-git', () => ({
+  simpleGit: vi.fn((path: string) => {
+    mockGit.path.mockReturnValue(path);
+    return mockGit;
+  }),
+}));
+
+vi.mock('../extensions/github.js', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('../extensions/github.js')>();
+  return {
+    ...actual,
+    downloadFromGitHubRelease: vi
+      .fn()
+      .mockRejectedValue(new Error('Mocked GitHub release download failure')),
+  };
+});
+
+vi.mock('os', async (importOriginal) => {
+  const mockedOs = await importOriginal<typeof os>();
+  return {
+    ...mockedOs,
+    homedir: vi.fn(),
+  };
+});
+
+vi.mock('../trustedFolders.js', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('../trustedFolders.js')>();
+  return {
+    ...actual,
+    isWorkspaceTrusted: vi.fn(),
+  };
+});
+
+const mockLogExtensionInstallEvent = vi.hoisted(() => vi.fn());
+const mockLogExtensionUninstall = vi.hoisted(() => vi.fn());
+
+vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
+  const actual =
+    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
+  return {
+    ...actual,
+    logExtensionInstallEvent: mockLogExtensionInstallEvent,
+    logExtensionUninstall: mockLogExtensionUninstall,
+    ExtensionInstallEvent: vi.fn(),
+    ExtensionUninstallEvent: vi.fn(),
+  };
+});
+
+describe('update tests', () => {
+  let tempHomeDir: string;
+  let tempWorkspaceDir: string;
+  let userExtensionsDir: string;
+
+  beforeEach(() => {
+    tempHomeDir = fs.mkdtempSync(
+      path.join(os.tmpdir(), 'qwen-code-test-home-'),
+    );
+    tempWorkspaceDir = fs.mkdtempSync(
+      path.join(tempHomeDir, 'qwen-code-test-workspace-'),
+    );
+    vi.mocked(os.homedir).mockReturnValue(tempHomeDir);
+    userExtensionsDir = path.join(tempHomeDir, QWEN_DIR, 'extensions');
+    // Clean up before each test
+    fs.rmSync(userExtensionsDir, { recursive: true, force: true });
+    fs.mkdirSync(userExtensionsDir, { recursive: true });
+    vi.mocked(isWorkspaceTrusted).mockReturnValue({
+      isTrusted: true,
+      source: 'file',
+    });
+    vi.spyOn(process, 'cwd').mockReturnValue(tempWorkspaceDir);
+    Object.values(mockGit).forEach((fn) => fn.mockReset());
+  });
+
+  afterEach(() => {
+    fs.rmSync(tempHomeDir, { recursive: true, force: true });
+    fs.rmSync(tempWorkspaceDir, { recursive: true, force: true });
+  });
+
+  describe('updateExtension', () => {
+    it('should update a git-installed extension', async () => {
+      const gitUrl = 'https://github.com/google/gemini-extensions.git';
+      const extensionName = 'qwen-extensions';
+      const targetExtDir = path.join(userExtensionsDir, extensionName);
+      const metadataPath = path.join(targetExtDir, INSTALL_METADATA_FILENAME);
+
+      fs.mkdirSync(targetExtDir, { recursive: true });
+      fs.writeFileSync(
+        path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME),
+        JSON.stringify({ name: extensionName, version: '1.0.0' }),
+      );
+      fs.writeFileSync(
+        metadataPath,
+        JSON.stringify({ source: gitUrl, type: 'git' }),
+      );
+
+      mockGit.clone.mockImplementation(async (_, destination) => {
+        fs.mkdirSync(path.join(mockGit.path(), destination), {
+          recursive: true,
+        });
+        fs.writeFileSync(
+          path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME),
+          JSON.stringify({ name: extensionName, version: '1.1.0' }),
+        );
+      });
+      mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir: targetExtDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+      const updateInfo = await updateExtension(
+        extension,
+        tempHomeDir,
+        async (_) => true,
+        ExtensionUpdateState.UPDATE_AVAILABLE,
+        () => {},
+      );
+
+      expect(updateInfo).toEqual({
+        name: 'qwen-extensions',
+        originalVersion: '1.0.0',
+        updatedVersion: '1.1.0',
+      });
+
+      const updatedConfig = JSON.parse(
+        fs.readFileSync(
+          path.join(targetExtDir, EXTENSIONS_CONFIG_FILENAME),
+          'utf-8',
+        ),
+      );
+      expect(updatedConfig.version).toBe('1.1.0');
+    });
+
+    it('should call setExtensionUpdateState with UPDATING and then UPDATED_NEEDS_RESTART on success', async () => {
+      const extensionName = 'test-extension';
+      const extensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: extensionName,
+        version: '1.0.0',
+        installMetadata: {
+          source: 'https://some.git/repo',
+          type: 'git',
+        },
+      });
+
+      mockGit.clone.mockImplementation(async (_, destination) => {
+        fs.mkdirSync(path.join(mockGit.path(), destination), {
+          recursive: true,
+        });
+        fs.writeFileSync(
+          path.join(mockGit.path(), destination, EXTENSIONS_CONFIG_FILENAME),
+          JSON.stringify({ name: extensionName, version: '1.1.0' }),
+        );
+      });
+      mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
+
+      const dispatch = vi.fn();
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+      await updateExtension(
+        extension,
+        tempHomeDir,
+        async (_) => true,
+        ExtensionUpdateState.UPDATE_AVAILABLE,
+        dispatch,
+      );
+
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: extensionName,
+          state: ExtensionUpdateState.UPDATING,
+        },
+      });
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: extensionName,
+          state: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
+        },
+      });
+    });
+
+    it('should call setExtensionUpdateState with ERROR on failure', async () => {
+      const extensionName = 'test-extension';
+      const extensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: extensionName,
+        version: '1.0.0',
+        installMetadata: {
+          source: 'https://some.git/repo',
+          type: 'git',
+        },
+      });
+
+      mockGit.clone.mockRejectedValue(new Error('Git clone failed'));
+      mockGit.getRemotes.mockResolvedValue([{ name: 'origin' }]);
+
+      const dispatch = vi.fn();
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+      await expect(
+        updateExtension(
+          extension,
+          tempHomeDir,
+          async (_) => true,
+          ExtensionUpdateState.UPDATE_AVAILABLE,
+          dispatch,
+        ),
+      ).rejects.toThrow();
+
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: extensionName,
+          state: ExtensionUpdateState.UPDATING,
+        },
+      });
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: extensionName,
+          state: ExtensionUpdateState.ERROR,
+        },
+      });
+    });
+  });
+
+  describe('checkForAllExtensionUpdates', () => {
+    it('should return UpdateAvailable for a git extension with updates', async () => {
+      const extensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: 'test-extension',
+        version: '1.0.0',
+        installMetadata: {
+          source: 'https://some.git/repo',
+          type: 'git',
+        },
+      });
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+
+      mockGit.getRemotes.mockResolvedValue([
+        { name: 'origin', refs: { fetch: 'https://some.git/repo' } },
+      ]);
+      mockGit.listRemote.mockResolvedValue('remoteHash	HEAD');
+      mockGit.revparse.mockResolvedValue('localHash');
+
+      const dispatch = vi.fn();
+      await checkForAllExtensionUpdates([extension], dispatch);
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: 'test-extension',
+          state: ExtensionUpdateState.UPDATE_AVAILABLE,
+        },
+      });
+    });
+
+    it('should return UpToDate for a git extension with no updates', async () => {
+      const extensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: 'test-extension',
+        version: '1.0.0',
+        installMetadata: {
+          source: 'https://some.git/repo',
+          type: 'git',
+        },
+      });
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+
+      mockGit.getRemotes.mockResolvedValue([
+        { name: 'origin', refs: { fetch: 'https://some.git/repo' } },
+      ]);
+      mockGit.listRemote.mockResolvedValue('sameHash	HEAD');
+      mockGit.revparse.mockResolvedValue('sameHash');
+
+      const dispatch = vi.fn();
+      await checkForAllExtensionUpdates([extension], dispatch);
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: 'test-extension',
+          state: ExtensionUpdateState.UP_TO_DATE,
+        },
+      });
+    });
+
+    it('should return UpToDate for a local extension with no updates', async () => {
+      const localExtensionSourcePath = path.join(tempHomeDir, 'local-source');
+      const sourceExtensionDir = createExtension({
+        extensionsDir: localExtensionSourcePath,
+        name: 'my-local-ext',
+        version: '1.0.0',
+      });
+
+      const installedExtensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: 'local-extension',
+        version: '1.0.0',
+        installMetadata: { source: sourceExtensionDir, type: 'local' },
+      });
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir: installedExtensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+      const dispatch = vi.fn();
+      await checkForAllExtensionUpdates([extension], dispatch);
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: 'local-extension',
+          state: ExtensionUpdateState.UP_TO_DATE,
+        },
+      });
+    });
+
+    it('should return UpdateAvailable for a local extension with updates', async () => {
+      const localExtensionSourcePath = path.join(tempHomeDir, 'local-source');
+      const sourceExtensionDir = createExtension({
+        extensionsDir: localExtensionSourcePath,
+        name: 'my-local-ext',
+        version: '1.1.0',
+      });
+
+      const installedExtensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: 'local-extension',
+        version: '1.0.0',
+        installMetadata: { source: sourceExtensionDir, type: 'local' },
+      });
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir: installedExtensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+      const dispatch = vi.fn();
+      await checkForAllExtensionUpdates([extension], dispatch);
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: 'local-extension',
+          state: ExtensionUpdateState.UPDATE_AVAILABLE,
+        },
+      });
+    });
+
+    it('should return Error when git check fails', async () => {
+      const extensionDir = createExtension({
+        extensionsDir: userExtensionsDir,
+        name: 'error-extension',
+        version: '1.0.0',
+        installMetadata: {
+          source: 'https://some.git/repo',
+          type: 'git',
+        },
+      });
+      const extension = annotateActiveExtensions(
+        [
+          loadExtension({
+            extensionDir,
+            workspaceDir: tempWorkspaceDir,
+          })!,
+        ],
+        process.cwd(),
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+      )[0];
+
+      mockGit.getRemotes.mockRejectedValue(new Error('Git error'));
+
+      const dispatch = vi.fn();
+      await checkForAllExtensionUpdates([extension], dispatch);
+      expect(dispatch).toHaveBeenCalledWith({
+        type: 'SET_STATE',
+        payload: {
+          name: 'error-extension',
+          state: ExtensionUpdateState.ERROR,
+        },
+      });
+    });
+  });
+});

packages/cli/src/config/extensions/update.ts

@@ -0,0 +1,182 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {
+  type ExtensionUpdateAction,
+  ExtensionUpdateState,
+  type ExtensionUpdateStatus,
+} from '../../ui/state/extensions.js';
+import {
+  copyExtension,
+  installExtension,
+  uninstallExtension,
+  loadExtension,
+  loadInstallMetadata,
+  ExtensionStorage,
+  loadExtensionConfig,
+} from '../extension.js';
+import { checkForExtensionUpdate } from './github.js';
+import type { GeminiCLIExtension } from '@qwen-code/qwen-code-core';
+import * as fs from 'node:fs';
+import { getErrorMessage } from '../../utils/errors.js';
+
+export interface ExtensionUpdateInfo {
+  name: string;
+  originalVersion: string;
+  updatedVersion: string;
+}
+
+export async function updateExtension(
+  extension: GeminiCLIExtension,
+  cwd: string = process.cwd(),
+  requestConsent: (consent: string) => Promise<boolean>,
+  currentState: ExtensionUpdateState,
+  dispatchExtensionStateUpdate: (action: ExtensionUpdateAction) => void,
+): Promise<ExtensionUpdateInfo | undefined> {
+  if (currentState === ExtensionUpdateState.UPDATING) {
+    return undefined;
+  }
+  dispatchExtensionStateUpdate({
+    type: 'SET_STATE',
+    payload: { name: extension.name, state: ExtensionUpdateState.UPDATING },
+  });
+  const installMetadata = loadInstallMetadata(extension.path);
+
+  if (!installMetadata?.type) {
+    dispatchExtensionStateUpdate({
+      type: 'SET_STATE',
+      payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
+    });
+    throw new Error(
+      `Extension ${extension.name} cannot be updated, type is unknown.`,
+    );
+  }
+  if (installMetadata?.type === 'link') {
+    dispatchExtensionStateUpdate({
+      type: 'SET_STATE',
+      payload: { name: extension.name, state: ExtensionUpdateState.UP_TO_DATE },
+    });
+    throw new Error(`Extension is linked so does not need to be updated`);
+  }
+  const originalVersion = extension.version;
+
+  const tempDir = await ExtensionStorage.createTmpDir();
+  try {
+    await copyExtension(extension.path, tempDir);
+    const previousExtensionConfig = await loadExtensionConfig({
+      extensionDir: extension.path,
+      workspaceDir: cwd,
+    });
+    await uninstallExtension(extension.name, cwd);
+    await installExtension(
+      installMetadata,
+      requestConsent,
+      cwd,
+      previousExtensionConfig,
+    );
+
+    const updatedExtensionStorage = new ExtensionStorage(extension.name);
+    const updatedExtension = loadExtension({
+      extensionDir: updatedExtensionStorage.getExtensionDir(),
+      workspaceDir: cwd,
+    });
+    if (!updatedExtension) {
+      dispatchExtensionStateUpdate({
+        type: 'SET_STATE',
+        payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
+      });
+      throw new Error('Updated extension not found after installation.');
+    }
+    const updatedVersion = updatedExtension.config.version;
+    dispatchExtensionStateUpdate({
+      type: 'SET_STATE',
+      payload: {
+        name: extension.name,
+        state: ExtensionUpdateState.UPDATED_NEEDS_RESTART,
+      },
+    });
+    return {
+      name: extension.name,
+      originalVersion,
+      updatedVersion,
+    };
+  } catch (e) {
+    console.error(
+      `Error updating extension, rolling back. ${getErrorMessage(e)}`,
+    );
+    dispatchExtensionStateUpdate({
+      type: 'SET_STATE',
+      payload: { name: extension.name, state: ExtensionUpdateState.ERROR },
+    });
+    await copyExtension(tempDir, extension.path);
+    throw e;
+  } finally {
+    await fs.promises.rm(tempDir, { recursive: true, force: true });
+  }
+}
+
+export async function updateAllUpdatableExtensions(
+  cwd: string = process.cwd(),
+  requestConsent: (consent: string) => Promise<boolean>,
+  extensions: GeminiCLIExtension[],
+  extensionsState: Map<string, ExtensionUpdateStatus>,
+  dispatch: (action: ExtensionUpdateAction) => void,
+): Promise<ExtensionUpdateInfo[]> {
+  return (
+    await Promise.all(
+      extensions
+        .filter(
+          (extension) =>
+            extensionsState.get(extension.name)?.status ===
+            ExtensionUpdateState.UPDATE_AVAILABLE,
+        )
+        .map((extension) =>
+          updateExtension(
+            extension,
+            cwd,
+            requestConsent,
+            extensionsState.get(extension.name)!.status,
+            dispatch,
+          ),
+        ),
+    )
+  ).filter((updateInfo) => !!updateInfo);
+}
+
+export interface ExtensionUpdateCheckResult {
+  state: ExtensionUpdateState;
+  error?: string;
+}
+
+export async function checkForAllExtensionUpdates(
+  extensions: GeminiCLIExtension[],
+  dispatch: (action: ExtensionUpdateAction) => void,
+): Promise<void> {
+  dispatch({ type: 'BATCH_CHECK_START' });
+  const promises: Array<Promise<void>> = [];
+  for (const extension of extensions) {
+    if (!extension.installMetadata) {
+      dispatch({
+        type: 'SET_STATE',
+        payload: {
+          name: extension.name,
+          state: ExtensionUpdateState.NOT_UPDATABLE,
+        },
+      });
+      continue;
+    }
+    promises.push(
+      checkForExtensionUpdate(extension, (updatedState) => {
+        dispatch({
+          type: 'SET_STATE',
+          payload: { name: extension.name, state: updatedState },
+        });
+      }),
+    );
+  }
+  await Promise.all(promises);
+  dispatch({ type: 'BATCH_CHECK_END' });
+}

packages/cli/src/config/extensions/variableSchema.ts

@@ -17,7 +17,7 @@ export interface VariableSchema {
 
 export interface LoadExtensionContext {
   extensionDir: string;
-  workspaceDir?: string;
+  workspaceDir: string;
 }
 
 const PATH_SEPARATOR_DEFINITION = {
@@ -30,10 +30,6 @@ export const VARIABLE_SCHEMA = {
     type: 'string',
     description: 'The path of the extension in the filesystem.',
   },
-  CLAUDE_PLUGIN_ROOT: {
-    type: 'string',
-    description: 'The path of the extension in the filesystem.',
-  },
   workspacePath: {
     type: 'string',
     description: 'The absolute path of the current workspace.',

packages/cli/src/config/extensions/variables.ts

@@ -5,13 +5,6 @@
  */
 
 import { type VariableSchema, VARIABLE_SCHEMA } from './variableSchema.js';
-import path from 'node:path';
-import { QWEN_DIR } from '../config/storage.js';
-
-export const EXTENSIONS_DIRECTORY_NAME = path.join(QWEN_DIR, 'extensions');
-export const EXTENSIONS_CONFIG_FILENAME = 'qwen-extension.json';
-export const INSTALL_METADATA_FILENAME = '.qwen-extension-install.json';
-export const EXTENSION_SETTINGS_FILENAME = '.env';
 
 export type JsonObject = { [key: string]: JsonValue };
 export type JsonArray = JsonValue[];

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

@@ -51,6 +51,7 @@ import {
 import * as fs from 'node:fs'; // fs will be mocked separately
 import stripJsonComments from 'strip-json-comments'; // Will be mocked separately
 import { isWorkspaceTrusted } from './trustedFolders.js';
+import { disableExtension } from './extension.js';
 
 // These imports will get the versions from the vi.mock('./settings.js', ...) factory.
 import {
@@ -64,6 +65,8 @@ import {
   needsMigration,
   type Settings,
   loadEnvironment,
+  migrateDeprecatedSettings,
+  SettingScope,
   SETTINGS_VERSION,
   SETTINGS_VERSION_KEY,
 } from './settings.js';
@@ -2257,7 +2260,7 @@ describe('Settings Loading and Merging', () => {
           disableAutoUpdate: true,
         },
         ui: {
-          hideBanner: true,
+          hideTips: true,
           customThemes: {
             myTheme: {},
           },
@@ -2280,7 +2283,7 @@ describe('Settings Loading and Merging', () => {
       const v1Settings = migrateSettingsToV1(v2Settings);
       expect(v1Settings).toEqual({
         disableAutoUpdate: true,
-        hideBanner: true,
+        hideTips: true,
         customThemes: {
           myTheme: {},
         },
@@ -2727,4 +2730,122 @@ describe('Settings Loading and Merging', () => {
       });
     });
   });
+
+  describe('migrateDeprecatedSettings', () => {
+    let mockFsExistsSync: Mocked<typeof fs.existsSync>;
+    let mockFsReadFileSync: Mocked<typeof fs.readFileSync>;
+    let mockDisableExtension: Mocked<typeof disableExtension>;
+
+    beforeEach(() => {
+      vi.resetAllMocks();
+
+      mockFsExistsSync = vi.mocked(fs.existsSync);
+      mockFsReadFileSync = vi.mocked(fs.readFileSync);
+      mockDisableExtension = vi.mocked(disableExtension);
+
+      (mockFsExistsSync as Mock).mockReturnValue(true);
+      vi.mocked(isWorkspaceTrusted).mockReturnValue(true);
+    });
+
+    afterEach(() => {
+      vi.restoreAllMocks();
+    });
+
+    it('should migrate disabled extensions from user and workspace settings', () => {
+      const userSettingsContent = {
+        extensions: {
+          disabled: ['user-ext-1', 'shared-ext'],
+        },
+      };
+      const workspaceSettingsContent = {
+        extensions: {
+          disabled: ['workspace-ext-1', 'shared-ext'],
+        },
+      };
+
+      (mockFsReadFileSync as Mock).mockImplementation(
+        (p: fs.PathOrFileDescriptor) => {
+          if (p === USER_SETTINGS_PATH)
+            return JSON.stringify(userSettingsContent);
+          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
+            return JSON.stringify(workspaceSettingsContent);
+          return '{}';
+        },
+      );
+
+      const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR);
+      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
+
+      migrateDeprecatedSettings(loadedSettings, MOCK_WORKSPACE_DIR);
+
+      // Check user settings migration
+      expect(mockDisableExtension).toHaveBeenCalledWith(
+        'user-ext-1',
+        SettingScope.User,
+        MOCK_WORKSPACE_DIR,
+      );
+      expect(mockDisableExtension).toHaveBeenCalledWith(
+        'shared-ext',
+        SettingScope.User,
+        MOCK_WORKSPACE_DIR,
+      );
+
+      // Check workspace settings migration
+      expect(mockDisableExtension).toHaveBeenCalledWith(
+        'workspace-ext-1',
+        SettingScope.Workspace,
+        MOCK_WORKSPACE_DIR,
+      );
+      expect(mockDisableExtension).toHaveBeenCalledWith(
+        'shared-ext',
+        SettingScope.Workspace,
+        MOCK_WORKSPACE_DIR,
+      );
+
+      // Check that setValue was called to remove the deprecated setting
+      expect(setValueSpy).toHaveBeenCalledWith(
+        SettingScope.User,
+        'extensions',
+        {
+          disabled: undefined,
+        },
+      );
+      expect(setValueSpy).toHaveBeenCalledWith(
+        SettingScope.Workspace,
+        'extensions',
+        {
+          disabled: undefined,
+        },
+      );
+    });
+
+    it('should not do anything if there are no deprecated settings', () => {
+      const userSettingsContent = {
+        extensions: {
+          enabled: ['user-ext-1'],
+        },
+      };
+      const workspaceSettingsContent = {
+        someOtherSetting: 'value',
+      };
+
+      (mockFsReadFileSync as Mock).mockImplementation(
+        (p: fs.PathOrFileDescriptor) => {
+          if (p === USER_SETTINGS_PATH)
+            return JSON.stringify(userSettingsContent);
+          if (p === MOCK_WORKSPACE_SETTINGS_PATH)
+            return JSON.stringify(workspaceSettingsContent);
+          return '{}';
+        },
+      );
+
+      const loadedSettings = loadSettings(MOCK_WORKSPACE_DIR);
+      const setValueSpy = vi.spyOn(loadedSettings, 'setValue');
+
+      migrateDeprecatedSettings(loadedSettings, MOCK_WORKSPACE_DIR);
+
+      expect(mockDisableExtension).not.toHaveBeenCalled();
+      expect(setValueSpy).not.toHaveBeenCalled();
+    });
+  });
 });

packages/cli/src/config/settings.ts

@@ -30,6 +30,7 @@ import {
 import { resolveEnvVarsInObject } from '../utils/envVarResolver.js';
 import { customDeepMerge, type MergeableObject } from '../utils/deepMerge.js';
 import { updateSettingsFilePreservingFormat } from '../utils/commentJson.js';
+import { disableExtension } from './extension.js';
 
 function getMergeStrategyForPath(path: string[]): MergeStrategy | undefined {
   let current: SettingDefinition | undefined = undefined;
@@ -80,6 +81,7 @@ const MIGRATION_MAP: Record<string, string> = {
   excludeTools: 'tools.exclude',
   excludeMCPServers: 'mcp.excluded',
   excludedProjectEnvVars: 'advanced.excludedEnvVars',
+  extensionManagement: 'experimental.extensionManagement',
   extensions: 'extensions',
   fileFiltering: 'context.fileFiltering',
   folderTrustFeature: 'security.folderTrust.featureEnabled',
@@ -88,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',
@@ -901,6 +896,31 @@ export function loadSettings(
   );
 }
 
+export function migrateDeprecatedSettings(
+  loadedSettings: LoadedSettings,
+  workspaceDir: string = process.cwd(),
+): void {
+  const processScope = (scope: SettingScope) => {
+    const settings = loadedSettings.forScope(scope).settings;
+    if (settings.extensions?.disabled) {
+      console.log(
+        `Migrating deprecated extensions.disabled settings from ${scope} settings...`,
+      );
+      for (const extension of settings.extensions.disabled ?? []) {
+        disableExtension(extension, scope, workspaceDir);
+      }
+
+      const newExtensionsValue = { ...settings.extensions };
+      newExtensionsValue.disabled = undefined;
+
+      loadedSettings.setValue(scope, 'extensions', newExtensionsValue);
+    }
+  };
+
+  processScope(SettingScope.User);
+  processScope(SettingScope.Workspace);
+}
+
 export function saveSettings(settingsFile: SettingsFile): void {
   try {
     // Ensure the directory exists

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,
       );
@@ -175,9 +172,6 @@ describe('SettingsSchema', () => {
       expect(getSettingsSchema().ui.properties.hideTips.showInDialog).toBe(
         true,
       );
-      expect(getSettingsSchema().ui.properties.hideBanner.showInDialog).toBe(
-        true,
-      );
       expect(
         getSettingsSchema().privacy.properties.usageStatisticsEnabled
           .showInDialog,

packages/cli/src/config/settingsSchema.ts

@@ -321,82 +321,6 @@ 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',
@@ -1207,6 +1131,15 @@ const SETTINGS_SCHEMA = {
     description: 'Setting to enable experimental features',
     showInDialog: false,
     properties: {
+      extensionManagement: {
+        type: 'boolean',
+        label: 'Extension Management',
+        category: 'Experimental',
+        requiresRestart: true,
+        default: true,
+        description: 'Enable extension management features.',
+        showInDialog: false,
+      },
       visionModelPreview: {
         type: 'boolean',
         label: 'Vision Model Preview',
@@ -1229,6 +1162,39 @@ const SETTINGS_SCHEMA = {
       },
     },
   },
+
+  extensions: {
+    type: 'object',
+    label: 'Extensions',
+    category: 'Extensions',
+    requiresRestart: true,
+    default: {},
+    description: 'Settings for extensions.',
+    showInDialog: false,
+    properties: {
+      disabled: {
+        type: 'array',
+        label: 'Disabled Extensions',
+        category: 'Extensions',
+        requiresRestart: true,
+        default: [] as string[],
+        description: 'List of disabled extensions.',
+        showInDialog: false,
+        mergeStrategy: MergeStrategy.UNION,
+      },
+      workspacesWithMigrationNudge: {
+        type: 'array',
+        label: 'Workspaces with Migration Nudge',
+        category: 'Extensions',
+        requiresRestart: false,
+        default: [] as string[],
+        description:
+          'List of workspaces for which the migration nudge has been shown.',
+        showInDialog: false,
+        mergeStrategy: MergeStrategy.UNION,
+      },
+    },
+  },
 } as const satisfies SettingsSchema;
 
 export type SettingsSchemaType = typeof SETTINGS_SCHEMA;
@@ -1250,9 +1216,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

@@ -271,6 +271,7 @@ describe('gemini.tsx main function', () => {
     );
     const { loadSettings } = await import('./config/settings.js');
     const cleanupModule = await import('./utils/cleanup.js');
+    const extensionModule = await import('./config/extension.js');
     const validatorModule = await import('./validateNonInterActiveAuth.js');
     const streamJsonModule = await import('./nonInteractive/session.js');
     const initializerModule = await import('./core/initializer.js');
@@ -283,6 +284,11 @@ describe('gemini.tsx main function', () => {
     vi.mocked(cleanupModule.registerCleanup).mockImplementation(() => {});
     const runExitCleanupMock = vi.mocked(cleanupModule.runExitCleanup);
     runExitCleanupMock.mockResolvedValue(undefined);
+    vi.spyOn(extensionModule, 'loadExtensions').mockReturnValue([]);
+    vi.spyOn(
+      extensionModule.ExtensionStorage,
+      'getUserExtensionsDir',
+    ).mockReturnValue('/tmp/extensions');
     vi.spyOn(initializerModule, 'initializeApp').mockResolvedValue({
       authError: null,
       themeError: null,
@@ -450,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/gemini.tsx

@@ -15,8 +15,13 @@ import React from 'react';
 import { validateAuthMethod } from './config/auth.js';
 import * as cliConfig from './config/config.js';
 import { loadCliConfig, parseArguments } from './config/config.js';
+import { ExtensionStorage, loadExtensions } from './config/extension.js';
 import type { DnsResolutionOrder, LoadedSettings } from './config/settings.js';
-import { getSettingsWarnings, loadSettings } from './config/settings.js';
+import {
+  getSettingsWarnings,
+  loadSettings,
+  migrateDeprecatedSettings,
+} from './config/settings.js';
 import {
   initializeApp,
   type InitializationResult,
@@ -102,6 +107,7 @@ function getNodeMemoryArgs(isDebugMode: boolean): string[] {
   return [];
 }
 
+import { ExtensionEnablementManager } from './config/extensions/extensionEnablement.js';
 import { loadSandboxConfig } from './config/sandboxConfig.js';
 import { runAcpAgent } from './acp-integration/acpAgent.js';
 
@@ -200,9 +206,10 @@ export async function startInteractiveUI(
 export async function main() {
   setupUnhandledRejectionHandler();
   const settings = loadSettings();
+  migrateDeprecatedSettings(settings);
   await cleanupCheckpoints();
 
-  let argv = await parseArguments();
+  let argv = await parseArguments(settings.merged);
 
   // Check for invalid input combinations early to prevent crashes
   if (argv.promptInteractive && !process.stdin.isTTY) {
@@ -244,9 +251,9 @@ export async function main() {
     if (sandboxConfig) {
       const partialConfig = await loadCliConfig(
         settings.merged,
-        argv,
-        undefined,
         [],
+        new ExtensionEnablementManager(ExtensionStorage.getUserExtensionsDir()),
+        argv,
       );
 
       if (!settings.merged.security?.auth?.useExternal) {
@@ -328,22 +335,26 @@ export async function main() {
   // to run Gemini CLI. It is now safe to perform expensive initialization that
   // may have side effects.
   {
+    const extensionEnablementManager = new ExtensionEnablementManager(
+      ExtensionStorage.getUserExtensionsDir(),
+      argv.extensions,
+    );
+    const extensions = loadExtensions(extensionEnablementManager);
     const config = await loadCliConfig(
       settings.merged,
+      extensions,
+      extensionEnablementManager,
       argv,
-      process.cwd(),
-      argv.extensions,
     );
     registerCleanup(() => config.shutdown());
 
-    // FIXME: list extensions after the config initialize
-    // if (config.getListExtensions()) {
-    //   console.log('Installed extensions:');
-    //   for (const extension of extensions) {
-    //     console.log(`- ${extension.config.name}`);
-    //   }
-    //   process.exit(0);
-    // }
+    if (config.getListExtensions()) {
+      console.log('Installed extensions:');
+      for (const extension of extensions) {
+        console.log(`- ${extension.config.name}`);
+      }
+      process.exit(0);
+    }
 
     // Setup unified ConsolePatcher based on interactive mode
     const isInteractive = config.isInteractive();
@@ -389,7 +400,7 @@ export async function main() {
     }
 
     if (config.getExperimentalZedIntegration()) {
-      return runAcpAgent(config, settings, argv);
+      return runAcpAgent(config, settings, extensions, argv);
     }
 
     let input = config.getQuestion();

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

@@ -278,13 +278,6 @@ 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 Citations': 'Quellenangaben anzeigen',
   'Custom Witty Phrases': 'Benutzerdefinierte Witzige Sprüche',

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)':
@@ -275,13 +295,6 @@ 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 Citations': 'Show Citations',
   'Custom Witty Phrases': 'Custom Witty Phrases',
@@ -891,14 +904,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)':
@@ -60,6 +68,19 @@ export default {
   'submit a bug report': 'Отправка отчёта об ошибке',
   'About Qwen Code': 'Об Qwen Code',
 
+  // Keyboard shortcuts panel descriptions
+  'for shell mode': 'режим оболочки',
+  'for commands': 'меню команд',
+  'for file paths': 'пути к файлам',
+  'to clear input': 'очистить ввод',
+  'to cycle approvals': 'переключить режим',
+  'to quit': 'выход',
+  'for newline': 'новая строка',
+  'to clear screen': 'очистить экран',
+  'to search history': 'поиск в истории',
+  'to paste images': 'вставить изображения',
+  'for external editor': 'внешний редактор',
+
   // ============================================================================
   // Поля системной информации
   // ============================================================================
@@ -278,13 +299,6 @@ 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 Citations': 'Показывать цитаты',
   'Custom Witty Phrases': 'Пользовательские остроумные фразы',

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)':
@@ -266,13 +286,6 @@ 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 Citations': '显示引用',
   'Custom Witty Phrases': '自定义诙谐短语',
@@ -845,13 +858,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

packages/cli/src/services/FileCommandLoader-extension.test.ts

@@ -1,327 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as os from 'node:os';
-import { FileCommandLoader } from './FileCommandLoader.js';
-import type { Config } from '@qwen-code/qwen-code-core';
-import { Storage } from '@qwen-code/qwen-code-core';
-
-describe('FileCommandLoader - Extension Commands Support', () => {
-  let tempDir: string;
-  let mockConfig: Partial<Config>;
-
-  beforeEach(async () => {
-    tempDir = await fs.promises.mkdtemp(
-      path.join(os.tmpdir(), 'file-command-loader-ext-test-'),
-    );
-
-    mockConfig = {
-      getFolderTrustFeature: () => false,
-      getFolderTrust: () => true,
-      getProjectRoot: () => tempDir,
-      storage: new Storage(tempDir),
-      getExtensions: () => [],
-    };
-  });
-
-  afterEach(async () => {
-    await fs.promises.rm(tempDir, { recursive: true, force: true });
-  });
-
-  it('should load commands from extension with config.commands path', async () => {
-    // Setup extension structure
-    const extensionDir = path.join(tempDir, '.qwen', 'extensions', 'test-ext');
-    const customCommandsDir = path.join(extensionDir, 'custom-cmds');
-    await fs.promises.mkdir(customCommandsDir, { recursive: true });
-
-    // Create extension config with custom commands path
-    const extensionConfig = {
-      name: 'test-ext',
-      version: '1.0.0',
-      commands: 'custom-cmds',
-    };
-    await fs.promises.writeFile(
-      path.join(extensionDir, 'qwen-extension.json'),
-      JSON.stringify(extensionConfig),
-    );
-
-    // Create a test command in custom directory
-    const commandContent =
-      '---\ndescription: Test command from extension\n---\nDo something';
-    await fs.promises.writeFile(
-      path.join(customCommandsDir, 'test.md'),
-      commandContent,
-    );
-
-    // Mock config to return the extension
-    mockConfig.getExtensions = () => [
-      {
-        id: 'test-ext',
-        config: extensionConfig,
-        name: 'test-ext',
-        version: '1.0.0',
-        isActive: true,
-        path: extensionDir,
-        contextFiles: [],
-      },
-    ];
-
-    const loader = new FileCommandLoader(mockConfig as Config);
-    const commands = await loader.loadCommands(new AbortController().signal);
-
-    expect(commands).toHaveLength(1);
-    expect(commands[0].name).toBe('test-ext:test');
-    expect(commands[0].description).toBe(
-      '[test-ext] Test command from extension',
-    );
-  });
-
-  it('should load commands from extension with multiple commands paths', async () => {
-    // Setup extension structure
-    const extensionDir = path.join(tempDir, '.qwen', 'extensions', 'multi-ext');
-    const cmdsDir1 = path.join(extensionDir, 'commands1');
-    const cmdsDir2 = path.join(extensionDir, 'commands2');
-    await fs.promises.mkdir(cmdsDir1, { recursive: true });
-    await fs.promises.mkdir(cmdsDir2, { recursive: true });
-
-    // Create extension config with multiple commands paths
-    const extensionConfig = {
-      name: 'multi-ext',
-      version: '1.0.0',
-      commands: ['commands1', 'commands2'],
-    };
-    await fs.promises.writeFile(
-      path.join(extensionDir, 'qwen-extension.json'),
-      JSON.stringify(extensionConfig),
-    );
-
-    // Create test commands in both directories
-    await fs.promises.writeFile(
-      path.join(cmdsDir1, 'cmd1.md'),
-      '---\n---\nCommand 1',
-    );
-    await fs.promises.writeFile(
-      path.join(cmdsDir2, 'cmd2.md'),
-      '---\n---\nCommand 2',
-    );
-
-    // Mock config to return the extension
-    mockConfig.getExtensions = () => [
-      {
-        id: 'multi-ext',
-        config: extensionConfig,
-        contextFiles: [],
-        name: 'multi-ext',
-        version: '1.0.0',
-        isActive: true,
-        path: extensionDir,
-      },
-    ];
-
-    const loader = new FileCommandLoader(mockConfig as Config);
-    const commands = await loader.loadCommands(new AbortController().signal);
-
-    expect(commands).toHaveLength(2);
-    const commandNames = commands.map((c) => c.name).sort();
-    expect(commandNames).toEqual(['multi-ext:cmd1', 'multi-ext:cmd2']);
-  });
-
-  it('should fallback to default "commands" directory when config.commands not specified', async () => {
-    // Setup extension structure with default commands directory
-    const extensionDir = path.join(
-      tempDir,
-      '.qwen',
-      'extensions',
-      'default-ext',
-    );
-    const defaultCommandsDir = path.join(extensionDir, 'commands');
-    await fs.promises.mkdir(defaultCommandsDir, { recursive: true });
-
-    // Create extension config without commands field
-    const extensionConfig = {
-      name: 'default-ext',
-      version: '1.0.0',
-    };
-    await fs.promises.writeFile(
-      path.join(extensionDir, 'qwen-extension.json'),
-      JSON.stringify(extensionConfig),
-    );
-
-    // Create a test command in default directory
-    await fs.promises.writeFile(
-      path.join(defaultCommandsDir, 'default.md'),
-      '---\n---\nDefault command',
-    );
-
-    // Mock config to return the extension
-    mockConfig.getExtensions = () => [
-      {
-        id: 'default-ext',
-        config: extensionConfig,
-        contextFiles: [],
-        name: 'default-ext',
-        version: '1.0.0',
-        isActive: true,
-        path: extensionDir,
-      },
-    ];
-
-    const loader = new FileCommandLoader(mockConfig as Config);
-    const commands = await loader.loadCommands(new AbortController().signal);
-
-    expect(commands).toHaveLength(1);
-    expect(commands[0].name).toBe('default-ext:default');
-  });
-
-  it('should handle extension without commands directory gracefully', async () => {
-    // Setup extension structure without commands directory
-    const extensionDir = path.join(
-      tempDir,
-      '.qwen',
-      'extensions',
-      'no-cmds-ext',
-    );
-    await fs.promises.mkdir(extensionDir, { recursive: true });
-
-    // Create extension config
-    const extensionConfig = {
-      name: 'no-cmds-ext',
-      version: '1.0.0',
-    };
-    await fs.promises.writeFile(
-      path.join(extensionDir, 'qwen-extension.json'),
-      JSON.stringify(extensionConfig),
-    );
-
-    // Mock config to return the extension
-    mockConfig.getExtensions = () => [
-      {
-        id: 'no-cmds-ext',
-        config: extensionConfig,
-        contextFiles: [],
-        name: 'no-cmds-ext',
-        version: '1.0.0',
-        isActive: true,
-        path: extensionDir,
-      },
-    ];
-
-    const loader = new FileCommandLoader(mockConfig as Config);
-    const commands = await loader.loadCommands(new AbortController().signal);
-
-    // Should not throw and return empty array
-    expect(commands).toHaveLength(0);
-  });
-
-  it('should prefix extension commands with extension name', async () => {
-    // Setup extension
-    const extensionDir = path.join(
-      tempDir,
-      '.qwen',
-      'extensions',
-      'prefix-ext',
-    );
-    const commandsDir = path.join(extensionDir, 'commands');
-    await fs.promises.mkdir(commandsDir, { recursive: true });
-
-    const extensionConfig = {
-      name: 'prefix-ext',
-      version: '1.0.0',
-    };
-    await fs.promises.writeFile(
-      path.join(extensionDir, 'qwen-extension.json'),
-      JSON.stringify(extensionConfig),
-    );
-
-    await fs.promises.writeFile(
-      path.join(commandsDir, 'mycommand.md'),
-      '---\n---\nMy command',
-    );
-
-    mockConfig.getExtensions = () => [
-      {
-        id: 'prefix-ext',
-        config: extensionConfig,
-        contextFiles: [],
-        name: 'prefix-ext',
-        version: '1.0.0',
-        isActive: true,
-        path: extensionDir,
-      },
-    ];
-
-    const loader = new FileCommandLoader(mockConfig as Config);
-    const commands = await loader.loadCommands(new AbortController().signal);
-
-    expect(commands).toHaveLength(1);
-    expect(commands[0].name).toBe('prefix-ext:mycommand');
-  });
-
-  it('should load commands from multiple extensions in alphabetical order', async () => {
-    // Setup two extensions
-    const ext1Dir = path.join(tempDir, '.qwen', 'extensions', 'ext-b');
-    const ext2Dir = path.join(tempDir, '.qwen', 'extensions', 'ext-a');
-
-    await fs.promises.mkdir(path.join(ext1Dir, 'commands'), {
-      recursive: true,
-    });
-    await fs.promises.mkdir(path.join(ext2Dir, 'commands'), {
-      recursive: true,
-    });
-
-    // Extension B
-    await fs.promises.writeFile(
-      path.join(ext1Dir, 'qwen-extension.json'),
-      JSON.stringify({ name: 'ext-b', version: '1.0.0' }),
-    );
-    await fs.promises.writeFile(
-      path.join(ext1Dir, 'commands', 'cmd.md'),
-      '---\n---\nCommand B',
-    );
-
-    // Extension A
-    await fs.promises.writeFile(
-      path.join(ext2Dir, 'qwen-extension.json'),
-      JSON.stringify({ name: 'ext-a', version: '1.0.0' }),
-    );
-    await fs.promises.writeFile(
-      path.join(ext2Dir, 'commands', 'cmd.md'),
-      '---\n---\nCommand A',
-    );
-
-    mockConfig.getExtensions = () => [
-      {
-        id: 'ext-b',
-        config: { name: 'ext-b', version: '1.0.0' },
-        contextFiles: [],
-        name: 'ext-b',
-        version: '1.0.0',
-        isActive: true,
-        path: ext1Dir,
-      },
-      {
-        id: 'ext-a',
-        config: { name: 'ext-a', version: '1.0.0' },
-        contextFiles: [],
-        name: 'ext-a',
-        version: '1.0.0',
-        isActive: true,
-        path: ext2Dir,
-      },
-    ];
-
-    const loader = new FileCommandLoader(mockConfig as Config);
-    const commands = await loader.loadCommands(new AbortController().signal);
-
-    expect(commands).toHaveLength(2);
-    // Extensions are sorted alphabetically, so ext-a comes before ext-b
-    expect(commands[0].name).toBe('ext-a:cmd');
-    expect(commands[1].name).toBe('ext-b:cmd');
-  });
-});

packages/cli/src/services/FileCommandLoader-markdown.test.ts

@@ -1,117 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import { FileCommandLoader } from './FileCommandLoader.js';
-
-describe('FileCommandLoader - Markdown support', () => {
-  let tempDir: string;
-
-  beforeAll(async () => {
-    // Create a temporary directory for test commands
-    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'qwen-md-test-'));
-  });
-
-  afterAll(async () => {
-    // Clean up
-    await fs.rm(tempDir, { recursive: true, force: true });
-  });
-
-  it('should load markdown commands with frontmatter', async () => {
-    // Create a test markdown command file
-    const mdContent = `---
-description: Test markdown command
----
-
-This is a test prompt from markdown.`;
-
-    const commandPath = path.join(tempDir, 'test-command.md');
-    await fs.writeFile(commandPath, mdContent, 'utf-8');
-
-    // Create loader with temp dir as command source
-    const loader = new FileCommandLoader(null);
-
-    // Mock the getCommandDirectories to return our temp dir
-    const originalMethod = loader['getCommandDirectories'];
-    loader['getCommandDirectories'] = () => [{ path: tempDir }];
-
-    try {
-      const commands = await loader.loadCommands(new AbortController().signal);
-
-      expect(commands).toHaveLength(1);
-      expect(commands[0].name).toBe('test-command');
-      expect(commands[0].description).toBe('Test markdown command');
-    } finally {
-      // Restore original method
-      loader['getCommandDirectories'] = originalMethod;
-    }
-  });
-
-  it('should load markdown commands without frontmatter', async () => {
-    // Create a test markdown command file without frontmatter
-    const mdContent = 'This is a simple prompt without frontmatter.';
-
-    const commandPath = path.join(tempDir, 'simple-command.md');
-    await fs.writeFile(commandPath, mdContent, 'utf-8');
-
-    const loader = new FileCommandLoader(null);
-    const originalMethod = loader['getCommandDirectories'];
-    loader['getCommandDirectories'] = () => [{ path: tempDir }];
-
-    try {
-      const commands = await loader.loadCommands(new AbortController().signal);
-
-      const simpleCommand = commands.find(
-        (cmd) => cmd.name === 'simple-command',
-      );
-      expect(simpleCommand).toBeDefined();
-      expect(simpleCommand?.description).toContain('Custom command from');
-    } finally {
-      loader['getCommandDirectories'] = originalMethod;
-    }
-  });
-
-  it('should load both toml and markdown commands', async () => {
-    // Create both TOML and Markdown files
-    const tomlContent = `prompt = "TOML prompt"
-description = "TOML command"`;
-
-    const mdContent = `---
-description: Markdown command
----
-
-Markdown prompt`;
-
-    await fs.writeFile(
-      path.join(tempDir, 'toml-cmd.toml'),
-      tomlContent,
-      'utf-8',
-    );
-    await fs.writeFile(path.join(tempDir, 'md-cmd.md'), mdContent, 'utf-8');
-
-    const loader = new FileCommandLoader(null);
-    const originalMethod = loader['getCommandDirectories'];
-    loader['getCommandDirectories'] = () => [{ path: tempDir }];
-
-    try {
-      const commands = await loader.loadCommands(new AbortController().signal);
-
-      const tomlCommand = commands.find((cmd) => cmd.name === 'toml-cmd');
-      const mdCommand = commands.find((cmd) => cmd.name === 'md-cmd');
-
-      expect(tomlCommand).toBeDefined();
-      expect(tomlCommand?.description).toBe('TOML command');
-
-      expect(mdCommand).toBeDefined();
-      expect(mdCommand?.description).toBe('Markdown command');
-    } finally {
-      loader['getCommandDirectories'] = originalMethod;
-    }
-  });
-});

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

@@ -568,9 +568,9 @@ describe('FileCommandLoader', () => {
 
       expect(commands).toHaveLength(3);
       const commandNames = commands.map((cmd) => cmd.name);
-      expect(commandNames).toEqual(['user', 'project', 'test-ext:ext']);
+      expect(commandNames).toEqual(['user', 'project', 'ext']);
 
-      const extCommand = commands.find((cmd) => cmd.name === 'test-ext:ext');
+      const extCommand = commands.find((cmd) => cmd.name === 'ext');
       expect(extCommand?.extensionName).toBe('test-ext');
       expect(extCommand?.description).toMatch(/^\[test-ext\]/);
     });
@@ -656,14 +656,14 @@ describe('FileCommandLoader', () => {
         expect(result1.content).toEqual([{ text: 'Project deploy command' }]);
       }
 
-      expect(commands[2].name).toBe('test-ext:deploy');
+      expect(commands[2].name).toBe('deploy');
       expect(commands[2].extensionName).toBe('test-ext');
       expect(commands[2].description).toMatch(/^\[test-ext\]/);
       const result2 = await commands[2].action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/test-ext:deploy',
-            name: 'test-ext:deploy',
+            raw: '/deploy',
+            name: 'deploy',
             args: '',
           },
         }),
@@ -729,7 +729,7 @@ describe('FileCommandLoader', () => {
       const commands = await loader.loadCommands(signal);
 
       expect(commands).toHaveLength(1);
-      expect(commands[0].name).toBe('active-ext:active');
+      expect(commands[0].name).toBe('active');
       expect(commands[0].extensionName).toBe('active-ext');
       expect(commands[0].description).toMatch(/^\[active-ext\]/);
     });
@@ -803,17 +803,17 @@ describe('FileCommandLoader', () => {
       expect(commands).toHaveLength(3);
 
       const commandNames = commands.map((cmd) => cmd.name).sort();
-      expect(commandNames).toEqual(['a:b:c', 'a:b:d:e', 'a:simple']);
+      expect(commandNames).toEqual(['b:c', 'b:d:e', 'simple']);
 
-      const nestedCmd = commands.find((cmd) => cmd.name === 'a:b:c');
+      const nestedCmd = commands.find((cmd) => cmd.name === 'b:c');
       expect(nestedCmd?.extensionName).toBe('a');
       expect(nestedCmd?.description).toMatch(/^\[a\]/);
       expect(nestedCmd).toBeDefined();
       const result = await nestedCmd!.action?.(
         createMockCommandContext({
           invocation: {
-            raw: '/a:b:c',
-            name: 'a:b:c',
+            raw: '/b:c',
+            name: 'b:c',
             args: '',
           },
         }),

packages/cli/src/services/FileCommandLoader.ts

@@ -5,23 +5,34 @@
  */
 
 import { promises as fs } from 'node:fs';
-import * as fsSync from 'node:fs';
 import path from 'node:path';
 import toml from '@iarna/toml';
 import { glob } from 'glob';
 import { z } from 'zod';
 import type { Config } from '@qwen-code/qwen-code-core';
-import { EXTENSIONS_CONFIG_FILENAME, Storage } from '@qwen-code/qwen-code-core';
+import { Storage } from '@qwen-code/qwen-code-core';
 import type { ICommandLoader } from './types.js';
+import type {
+  CommandContext,
+  SlashCommand,
+  SlashCommandActionReturn,
+} from '../ui/commands/types.js';
+import { CommandKind } from '../ui/commands/types.js';
+import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
+import type {
+  IPromptProcessor,
+  PromptPipelineContent,
+} from './prompt-processors/types.js';
 import {
-  parseMarkdownCommand,
-  MarkdownCommandDefSchema,
-} from './markdown-command-parser.js';
+  SHORTHAND_ARGS_PLACEHOLDER,
+  SHELL_INJECTION_TRIGGER,
+  AT_FILE_INJECTION_TRIGGER,
+} from './prompt-processors/types.js';
 import {
-  createSlashCommandFromDefinition,
-  type CommandDefinition,
-} from './command-factory.js';
-import type { SlashCommand } from '../ui/commands/types.js';
+  ConfirmationRequiredError,
+  ShellProcessor,
+} from './prompt-processors/shellProcessor.js';
+import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
 
 interface CommandDirectory {
   path: string;
@@ -85,12 +96,7 @@ export class FileCommandLoader implements ICommandLoader {
     const commandDirs = this.getCommandDirectories();
     for (const dirInfo of commandDirs) {
       try {
-        // Scan both .toml and .md files
-        const tomlFiles = await glob('**/*.toml', {
-          ...globOptions,
-          cwd: dirInfo.path,
-        });
-        const mdFiles = await glob('**/*.md', {
+        const files = await glob('**/*.toml', {
           ...globOptions,
           cwd: dirInfo.path,
         });
@@ -99,28 +105,18 @@ export class FileCommandLoader implements ICommandLoader {
           return [];
         }
 
-        // Process TOML files
-        const tomlCommandPromises = tomlFiles.map((file) =>
-          this.parseAndAdaptTomlFile(
+        const commandPromises = files.map((file) =>
+          this.parseAndAdaptFile(
             path.join(dirInfo.path, file),
             dirInfo.path,
             dirInfo.extensionName,
           ),
         );
 
-        // Process Markdown files
-        const mdCommandPromises = mdFiles.map((file) =>
-          this.parseAndAdaptMarkdownFile(
-            path.join(dirInfo.path, file),
-            dirInfo.path,
-            dirInfo.extensionName,
-          ),
+        const commands = (await Promise.all(commandPromises)).filter(
+          (cmd): cmd is SlashCommand => cmd !== null,
         );
 
-        const commands = (
-          await Promise.all([...tomlCommandPromises, ...mdCommandPromises])
-        ).filter((cmd): cmd is SlashCommand => cmd !== null);
-
         // Add all commands without deduplication
         allCommands.push(...commands);
       } catch (error) {
@@ -163,73 +159,17 @@ export class FileCommandLoader implements ICommandLoader {
         .filter((ext) => ext.isActive)
         .sort((a, b) => a.name.localeCompare(b.name)); // Sort alphabetically for deterministic loading
 
-      // Collect command directories from each extension
-      for (const ext of activeExtensions) {
-        // Get commands paths from extension config
-        const commandsPaths = this.getExtensionCommandsPaths(ext);
+      const extensionCommandDirs = activeExtensions.map((ext) => ({
+        path: path.join(ext.path, 'commands'),
+        extensionName: ext.name,
+      }));
 
-        for (const cmdPath of commandsPaths) {
-          dirs.push({
-            path: cmdPath,
-            extensionName: ext.name,
-          });
-        }
-      }
+      dirs.push(...extensionCommandDirs);
     }
 
     return dirs;
   }
 
-  /**
-   * Get commands paths from an extension.
-   * Returns paths from config.commands if specified, otherwise defaults to 'commands' directory.
-   */
-  private getExtensionCommandsPaths(ext: {
-    path: string;
-    name: string;
-  }): string[] {
-    // Try to get extension config
-    try {
-      const configPath = path.join(ext.path, EXTENSIONS_CONFIG_FILENAME);
-      if (fsSync.existsSync(configPath)) {
-        const configContent = fsSync.readFileSync(configPath, 'utf-8');
-        const config = JSON.parse(configContent);
-
-        if (config.commands) {
-          const commandsArray = Array.isArray(config.commands)
-            ? config.commands
-            : [config.commands];
-
-          return commandsArray
-            .map((cmdPath: string) =>
-              path.isAbsolute(cmdPath) ? cmdPath : path.join(ext.path, cmdPath),
-            )
-            .filter((cmdPath: string) => {
-              try {
-                return fsSync.existsSync(cmdPath);
-              } catch {
-                return false;
-              }
-            });
-        }
-      }
-    } catch (error) {
-      console.warn(`Failed to read extension config for ${ext.name}:`, error);
-    }
-
-    // Default fallback: use 'commands' directory
-    const defaultPath = path.join(ext.path, 'commands');
-    try {
-      if (fsSync.existsSync(defaultPath)) {
-        return [defaultPath];
-      }
-    } catch {
-      // Ignore
-    }
-
-    return [];
-  }
-
   /**
    * Parses a single .toml file and transforms it into a SlashCommand object.
    * @param filePath The absolute path to the .toml file.
@@ -237,7 +177,7 @@ export class FileCommandLoader implements ICommandLoader {
    * @param extensionName Optional extension name to prefix commands with.
    * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
    */
-  private async parseAndAdaptTomlFile(
+  private async parseAndAdaptFile(
     filePath: string,
     baseDir: string,
     extensionName?: string,
@@ -276,79 +216,104 @@ export class FileCommandLoader implements ICommandLoader {
 
     const validDef = validationResult.data;
 
-    // Use factory to create command
-    return createSlashCommandFromDefinition(
-      filePath,
-      baseDir,
-      validDef,
-      extensionName,
-      '.toml',
+    const relativePathWithExt = path.relative(baseDir, filePath);
+    const relativePath = relativePathWithExt.substring(
+      0,
+      relativePathWithExt.length - 5, // length of '.toml'
     );
-  }
+    const baseCommandName = relativePath
+      .split(path.sep)
+      // Sanitize each path segment to prevent ambiguity. Since ':' is our
+      // namespace separator, we replace any literal colons in filenames
+      // with underscores to avoid naming conflicts.
+      .map((segment) => segment.replaceAll(':', '_'))
+      .join(':');
 
-  /**
-   * Parses a single .md file and transforms it into a SlashCommand object.
-   * @param filePath The absolute path to the .md file.
-   * @param baseDir The root command directory for name calculation.
-   * @param extensionName Optional extension name to prefix commands with.
-   * @returns A promise resolving to a SlashCommand, or null if the file is invalid.
-   */
-  private async parseAndAdaptMarkdownFile(
-    filePath: string,
-    baseDir: string,
-    extensionName?: string,
-  ): Promise<SlashCommand | null> {
-    let fileContent: string;
-    try {
-      fileContent = await fs.readFile(filePath, 'utf-8');
-    } catch (error: unknown) {
-      console.error(
-        `[FileCommandLoader] Failed to read file ${filePath}:`,
-        error instanceof Error ? error.message : String(error),
-      );
-      return null;
+    // Add extension name tag for extension commands
+    const defaultDescription = `Custom command from ${path.basename(filePath)}`;
+    let description = validDef.description || defaultDescription;
+    if (extensionName) {
+      description = `[${extensionName}] ${description}`;
     }
 
-    let parsed: ReturnType<typeof parseMarkdownCommand>;
-    try {
-      parsed = parseMarkdownCommand(fileContent);
-    } catch (error: unknown) {
-      console.error(
-        `[FileCommandLoader] Failed to parse Markdown file ${filePath}:`,
-        error instanceof Error ? error.message : String(error),
-      );
-      return null;
+    const processors: IPromptProcessor[] = [];
+    const usesArgs = validDef.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
+    const usesShellInjection = validDef.prompt.includes(
+      SHELL_INJECTION_TRIGGER,
+    );
+    const usesAtFileInjection = validDef.prompt.includes(
+      AT_FILE_INJECTION_TRIGGER,
+    );
+
+    // 1. @-File Injection (Security First).
+    // This runs first to ensure we're not executing shell commands that
+    // could dynamically generate malicious @-paths.
+    if (usesAtFileInjection) {
+      processors.push(new AtFileProcessor(baseCommandName));
     }
 
-    const validationResult = MarkdownCommandDefSchema.safeParse(parsed);
-
-    if (!validationResult.success) {
-      console.error(
-        `[FileCommandLoader] Skipping invalid command file: ${filePath}. Validation errors:`,
-        validationResult.error.flatten(),
-      );
-      return null;
+    // 2. Argument and Shell Injection.
+    // This runs after file content has been safely injected.
+    if (usesShellInjection || usesArgs) {
+      processors.push(new ShellProcessor(baseCommandName));
     }
 
-    const validDef = validationResult.data;
+    // 3. Default Argument Handling.
+    // Appends the raw invocation if no explicit {{args}} are used.
+    if (!usesArgs) {
+      processors.push(new DefaultArgumentProcessor());
+    }
 
-    // Convert to CommandDefinition format
-    const definition: CommandDefinition = {
-      prompt: validDef.prompt,
-      description:
-        validDef.frontmatter?.description &&
-        typeof validDef.frontmatter.description === 'string'
-          ? validDef.frontmatter.description
-          : undefined,
+    return {
+      name: baseCommandName,
+      description,
+      kind: CommandKind.FILE,
+      extensionName,
+      action: async (
+        context: CommandContext,
+        _args: string,
+      ): Promise<SlashCommandActionReturn> => {
+        if (!context.invocation) {
+          console.error(
+            `[FileCommandLoader] Critical error: Command '${baseCommandName}' was executed without invocation context.`,
+          );
+          return {
+            type: 'submit_prompt',
+            content: [{ text: validDef.prompt }], // Fallback to unprocessed prompt
+          };
+        }
+
+        try {
+          let processedContent: PromptPipelineContent = [
+            { text: validDef.prompt },
+          ];
+          for (const processor of processors) {
+            processedContent = await processor.process(
+              processedContent,
+              context,
+            );
+          }
+
+          return {
+            type: 'submit_prompt',
+            content: processedContent,
+          };
+        } catch (e) {
+          // Check if it's our specific error type
+          if (e instanceof ConfirmationRequiredError) {
+            // Halt and request confirmation from the UI layer.
+            return {
+              type: 'confirm_shell_commands',
+              commandsToConfirm: e.commandsToConfirm,
+              originalInvocation: {
+                raw: context.invocation.raw,
+              },
+            };
+          }
+          // Re-throw other errors to be handled by the global error handler.
+          throw e;
+        }
+      },
     };
-
-    // Use factory to create command
-    return createSlashCommandFromDefinition(
-      filePath,
-      baseDir,
-      definition,
-      extensionName,
-      '.md',
-    );
   }
 }

packages/cli/src/services/command-factory.ts

@@ -1,159 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * This file contains helper functions for FileCommandLoader to create SlashCommand
- * objects from parsed command definitions (TOML or Markdown).
- */
-
-import path from 'node:path';
-import type {
-  CommandContext,
-  SlashCommand,
-  SlashCommandActionReturn,
-} from '../ui/commands/types.js';
-import { CommandKind } from '../ui/commands/types.js';
-import { DefaultArgumentProcessor } from './prompt-processors/argumentProcessor.js';
-import type {
-  IPromptProcessor,
-  PromptPipelineContent,
-} from './prompt-processors/types.js';
-import {
-  SHORTHAND_ARGS_PLACEHOLDER,
-  SHELL_INJECTION_TRIGGER,
-  AT_FILE_INJECTION_TRIGGER,
-} from './prompt-processors/types.js';
-import {
-  ConfirmationRequiredError,
-  ShellProcessor,
-} from './prompt-processors/shellProcessor.js';
-import { AtFileProcessor } from './prompt-processors/atFileProcessor.js';
-
-export interface CommandDefinition {
-  prompt: string;
-  description?: string;
-}
-
-/**
- * Creates a SlashCommand from a parsed command definition.
- * This function is used by both TOML and Markdown command loaders.
- *
- * @param filePath The absolute path to the command file
- * @param baseDir The root command directory for name calculation
- * @param definition The parsed command definition (prompt and optional description)
- * @param extensionName Optional extension name to prefix commands with
- * @param fileExtension The file extension (e.g., '.toml' or '.md')
- * @returns A SlashCommand object
- */
-export function createSlashCommandFromDefinition(
-  filePath: string,
-  baseDir: string,
-  definition: CommandDefinition,
-  extensionName: string | undefined,
-  fileExtension: string,
-): SlashCommand {
-  const relativePathWithExt = path.relative(baseDir, filePath);
-  const relativePath = relativePathWithExt.substring(
-    0,
-    relativePathWithExt.length - fileExtension.length,
-  );
-  const baseCommandName = relativePath
-    .split(path.sep)
-    // Sanitize each path segment to prevent ambiguity. Since ':' is our
-    // namespace separator, we replace any literal colons in filenames
-    // with underscores to avoid naming conflicts.
-    .map((segment) => segment.replaceAll(':', '_'))
-    .join(':');
-
-  // Prefix command name with extension name if provided
-  const commandName = extensionName
-    ? `${extensionName}:${baseCommandName}`
-    : baseCommandName;
-
-  // Add extension name tag for extension commands
-  const defaultDescription = `Custom command from ${path.basename(filePath)}`;
-  let description = definition.description || defaultDescription;
-  if (extensionName) {
-    description = `[${extensionName}] ${description}`;
-  }
-
-  const processors: IPromptProcessor[] = [];
-  const usesArgs = definition.prompt.includes(SHORTHAND_ARGS_PLACEHOLDER);
-  const usesShellInjection = definition.prompt.includes(
-    SHELL_INJECTION_TRIGGER,
-  );
-  const usesAtFileInjection = definition.prompt.includes(
-    AT_FILE_INJECTION_TRIGGER,
-  );
-
-  // 1. @-File Injection (Security First).
-  // This runs first to ensure we're not executing shell commands that
-  // could dynamically generate malicious @-paths.
-  if (usesAtFileInjection) {
-    processors.push(new AtFileProcessor(baseCommandName));
-  }
-
-  // 2. Argument and Shell Injection.
-  // This runs after file content has been safely injected.
-  if (usesShellInjection || usesArgs) {
-    processors.push(new ShellProcessor(baseCommandName));
-  }
-
-  // 3. Default Argument Handling.
-  // Appends the raw invocation if no explicit {{args}} are used.
-  if (!usesArgs) {
-    processors.push(new DefaultArgumentProcessor());
-  }
-
-  return {
-    name: commandName,
-    description,
-    kind: CommandKind.FILE,
-    extensionName,
-    action: async (
-      context: CommandContext,
-      _args: string,
-    ): Promise<SlashCommandActionReturn> => {
-      if (!context.invocation) {
-        console.error(
-          `[FileCommandLoader] Critical error: Command '${commandName}' was executed without invocation context.`,
-        );
-        return {
-          type: 'submit_prompt',
-          content: [{ text: definition.prompt }], // Fallback to unprocessed prompt
-        };
-      }
-
-      try {
-        let processedContent: PromptPipelineContent = [
-          { text: definition.prompt },
-        ];
-        for (const processor of processors) {
-          processedContent = await processor.process(processedContent, context);
-        }
-
-        return {
-          type: 'submit_prompt',
-          content: processedContent,
-        };
-      } catch (e) {
-        // Check if it's our specific error type
-        if (e instanceof ConfirmationRequiredError) {
-          // Halt and request confirmation from the UI layer.
-          return {
-            type: 'confirm_shell_commands',
-            commandsToConfirm: e.commandsToConfirm,
-            originalInvocation: {
-              raw: context.invocation.raw,
-            },
-          };
-        }
-        // Re-throw other errors to be handled by the global error handler.
-        throw e;
-      }
-    },
-  };
-}

packages/cli/src/services/command-migration-tool.test.ts

@@ -1,253 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import os from 'node:os';
-import {
-  detectTomlCommands,
-  migrateTomlCommands,
-  generateMigrationPrompt,
-} from './command-migration-tool.js';
-
-describe('command-migration-tool', () => {
-  let tempDir: string;
-
-  beforeEach(async () => {
-    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'qwen-migration-test-'));
-  });
-
-  afterEach(async () => {
-    await fs.rm(tempDir, { recursive: true, force: true });
-  });
-
-  describe('detectTomlCommands', () => {
-    it('should detect TOML files in directory', async () => {
-      // Create some TOML files
-      await fs.writeFile(
-        path.join(tempDir, 'cmd1.toml'),
-        'prompt = "test"',
-        'utf-8',
-      );
-      await fs.writeFile(
-        path.join(tempDir, 'cmd2.toml'),
-        'prompt = "test"',
-        'utf-8',
-      );
-
-      const tomlFiles = await detectTomlCommands(tempDir);
-
-      expect(tomlFiles).toHaveLength(2);
-      expect(tomlFiles).toContain('cmd1.toml');
-      expect(tomlFiles).toContain('cmd2.toml');
-    });
-
-    it('should detect TOML files in subdirectories', async () => {
-      const subdir = path.join(tempDir, 'subdir');
-      await fs.mkdir(subdir);
-      await fs.writeFile(
-        path.join(subdir, 'nested.toml'),
-        'prompt = "test"',
-        'utf-8',
-      );
-
-      const tomlFiles = await detectTomlCommands(tempDir);
-
-      expect(tomlFiles).toContain('subdir/nested.toml');
-    });
-
-    it('should return empty array for non-existent directory', async () => {
-      const nonExistent = path.join(tempDir, 'does-not-exist');
-
-      const tomlFiles = await detectTomlCommands(nonExistent);
-
-      expect(tomlFiles).toEqual([]);
-    });
-
-    it('should not detect non-TOML files', async () => {
-      await fs.writeFile(path.join(tempDir, 'file.txt'), 'text', 'utf-8');
-      await fs.writeFile(path.join(tempDir, 'file.md'), 'markdown', 'utf-8');
-
-      const tomlFiles = await detectTomlCommands(tempDir);
-
-      expect(tomlFiles).toHaveLength(0);
-    });
-  });
-
-  describe('migrateTomlCommands', () => {
-    it('should migrate TOML file to Markdown', async () => {
-      const tomlContent = `prompt = "Test prompt"
-description = "Test description"`;
-
-      await fs.writeFile(path.join(tempDir, 'test.toml'), tomlContent, 'utf-8');
-
-      const result = await migrateTomlCommands({
-        commandDir: tempDir,
-        createBackup: true,
-        deleteOriginal: false,
-      });
-
-      expect(result.success).toBe(true);
-      expect(result.convertedFiles).toContain('test.toml');
-      expect(result.failedFiles).toHaveLength(0);
-
-      // Check Markdown file was created
-      const mdPath = path.join(tempDir, 'test.md');
-      const mdContent = await fs.readFile(mdPath, 'utf-8');
-      expect(mdContent).toContain('description: Test description');
-      expect(mdContent).toContain('Test prompt');
-
-      // Check backup was created (original renamed to .toml.backup)
-      const backupPath = path.join(tempDir, 'test.toml.backup');
-      const backupExists = await fs
-        .access(backupPath)
-        .then(() => true)
-        .catch(() => false);
-      expect(backupExists).toBe(true);
-
-      // Original .toml file should not exist (renamed to .backup)
-      const tomlExists = await fs
-        .access(path.join(tempDir, 'test.toml'))
-        .then(() => true)
-        .catch(() => false);
-      expect(tomlExists).toBe(false);
-    });
-
-    it('should delete original TOML when deleteOriginal is true', async () => {
-      await fs.writeFile(
-        path.join(tempDir, 'delete-me.toml'),
-        'prompt = "Test"',
-        'utf-8',
-      );
-
-      await migrateTomlCommands({
-        commandDir: tempDir,
-        createBackup: false,
-        deleteOriginal: true,
-      });
-
-      // Original should be deleted
-      const tomlExists = await fs
-        .access(path.join(tempDir, 'delete-me.toml'))
-        .then(() => true)
-        .catch(() => false);
-      expect(tomlExists).toBe(false);
-
-      // Markdown should exist
-      const mdExists = await fs
-        .access(path.join(tempDir, 'delete-me.md'))
-        .then(() => true)
-        .catch(() => false);
-      expect(mdExists).toBe(true);
-
-      // Backup should not exist (createBackup was false)
-      const backupExists = await fs
-        .access(path.join(tempDir, 'delete-me.toml.backup'))
-        .then(() => true)
-        .catch(() => false);
-      expect(backupExists).toBe(false);
-    });
-
-    it('should fail if Markdown file already exists', async () => {
-      await fs.writeFile(
-        path.join(tempDir, 'existing.toml'),
-        'prompt = "Test"',
-        'utf-8',
-      );
-      await fs.writeFile(
-        path.join(tempDir, 'existing.md'),
-        'Already exists',
-        'utf-8',
-      );
-
-      const result = await migrateTomlCommands({
-        commandDir: tempDir,
-        createBackup: false,
-      });
-
-      expect(result.success).toBe(false);
-      expect(result.failedFiles).toHaveLength(1);
-      expect(result.failedFiles[0].file).toBe('existing.toml');
-      expect(result.failedFiles[0].error).toContain('already exists');
-    });
-
-    it('should handle migration without backup', async () => {
-      await fs.writeFile(
-        path.join(tempDir, 'no-backup.toml'),
-        'prompt = "Test"',
-        'utf-8',
-      );
-
-      const result = await migrateTomlCommands({
-        commandDir: tempDir,
-        createBackup: false,
-        deleteOriginal: false,
-      });
-
-      expect(result.success).toBe(true);
-
-      // Original TOML file should still exist (no backup, no delete)
-      const tomlExists = await fs
-        .access(path.join(tempDir, 'no-backup.toml'))
-        .then(() => true)
-        .catch(() => false);
-      expect(tomlExists).toBe(true);
-
-      // Backup should not exist
-      const backupExists = await fs
-        .access(path.join(tempDir, 'no-backup.toml.backup'))
-        .then(() => true)
-        .catch(() => false);
-      expect(backupExists).toBe(false);
-    });
-
-    it('should return success with empty results for no TOML files', async () => {
-      const result = await migrateTomlCommands({
-        commandDir: tempDir,
-      });
-
-      expect(result.success).toBe(true);
-      expect(result.convertedFiles).toHaveLength(0);
-      expect(result.failedFiles).toHaveLength(0);
-    });
-  });
-
-  describe('generateMigrationPrompt', () => {
-    it('should generate prompt for few files', () => {
-      const files = ['cmd1.toml', 'cmd2.toml'];
-
-      const prompt = generateMigrationPrompt(files);
-
-      expect(prompt).toContain('Found 2 command files');
-      expect(prompt).toContain('cmd1.toml');
-      expect(prompt).toContain('cmd2.toml');
-      expect(prompt).toContain('qwen-code migrate-commands');
-    });
-
-    it('should truncate file list for many files', () => {
-      const files = Array.from({ length: 10 }, (_, i) => `cmd${i}.toml`);
-
-      const prompt = generateMigrationPrompt(files);
-
-      expect(prompt).toContain('Found 10 command files');
-      expect(prompt).toContain('... and 7 more');
-    });
-
-    it('should return empty string for no files', () => {
-      const prompt = generateMigrationPrompt([]);
-
-      expect(prompt).toBe('');
-    });
-
-    it('should use singular form for single file', () => {
-      const prompt = generateMigrationPrompt(['single.toml']);
-
-      expect(prompt).toContain('Found 1 command file');
-      // Don't check for plural since "files" appears in other parts of the message
-    });
-  });
-});

packages/cli/src/services/command-migration-tool.ts

@@ -1,169 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Tool for migrating TOML commands to Markdown format.
- */
-
-import { promises as fs } from 'node:fs';
-import path from 'node:path';
-import { glob } from 'glob';
-import { convertTomlToMarkdown } from '@qwen-code/qwen-code-core';
-
-export interface MigrationResult {
-  success: boolean;
-  convertedFiles: string[];
-  failedFiles: Array<{ file: string; error: string }>;
-}
-
-export interface MigrationOptions {
-  /** Directory containing command files */
-  commandDir: string;
-  /** Whether to create backups (default: true) */
-  createBackup?: boolean;
-  /** Whether to delete original TOML files after migration (default: false) */
-  deleteOriginal?: boolean;
-}
-
-/**
- * Scans a directory for TOML command files.
- * @param commandDir Directory to scan
- * @returns Array of TOML file paths (relative to commandDir)
- */
-export async function detectTomlCommands(
-  commandDir: string,
-): Promise<string[]> {
-  try {
-    await fs.access(commandDir);
-  } catch {
-    // Directory doesn't exist
-    return [];
-  }
-
-  const tomlFiles = await glob('**/*.toml', {
-    cwd: commandDir,
-    nodir: true,
-    dot: false,
-  });
-
-  return tomlFiles;
-}
-
-/**
- * Migrates TOML command files to Markdown format.
- * @param options Migration options
- * @returns Migration result with details
- */
-export async function migrateTomlCommands(
-  options: MigrationOptions,
-): Promise<MigrationResult> {
-  const { commandDir, createBackup = true, deleteOriginal = false } = options;
-
-  const result: MigrationResult = {
-    success: true,
-    convertedFiles: [],
-    failedFiles: [],
-  };
-
-  // Detect TOML files
-  const tomlFiles = await detectTomlCommands(commandDir);
-
-  if (tomlFiles.length === 0) {
-    return result;
-  }
-
-  // Process each TOML file
-  for (const relativeFile of tomlFiles) {
-    const tomlPath = path.join(commandDir, relativeFile);
-
-    try {
-      // Read TOML file
-      const tomlContent = await fs.readFile(tomlPath, 'utf-8');
-
-      // Convert to Markdown
-      const markdownContent = convertTomlToMarkdown(tomlContent);
-
-      // Generate Markdown file path (same location, .md extension)
-      const markdownPath = tomlPath.replace(/\.toml$/, '.md');
-
-      // Check if Markdown file already exists
-      try {
-        await fs.access(markdownPath);
-        throw new Error(
-          `Markdown file already exists: ${path.basename(markdownPath)}`,
-        );
-      } catch (error) {
-        if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-          throw error;
-        }
-        // File doesn't exist, continue
-      }
-
-      // Write Markdown file
-      await fs.writeFile(markdownPath, markdownContent, 'utf-8');
-
-      // Backup original if requested (rename to .toml.backup)
-      if (createBackup) {
-        const backupPath = `${tomlPath}.backup`;
-        await fs.rename(tomlPath, backupPath);
-      } else if (deleteOriginal) {
-        // Delete original if requested and no backup
-        await fs.unlink(tomlPath);
-      }
-
-      result.convertedFiles.push(relativeFile);
-    } catch (error) {
-      result.success = false;
-      result.failedFiles.push({
-        file: relativeFile,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    }
-  }
-
-  return result;
-}
-
-/**
- * Generates a migration report message.
- * @param tomlFiles List of TOML files found
- * @returns Human-readable migration prompt message
- */
-export function generateMigrationPrompt(tomlFiles: string[]): string {
-  if (tomlFiles.length === 0) {
-    return '';
-  }
-
-  const count = tomlFiles.length;
-  const fileList =
-    tomlFiles.length <= 5
-      ? tomlFiles.map((f) => `  - ${f}`).join('\n')
-      : `  - ${tomlFiles.slice(0, 3).join('\n  - ')}\n  - ... and ${tomlFiles.length - 3} more`;
-
-  return `
-⚠️  TOML Command Format Deprecation Notice
-
-Found ${count} command file${count > 1 ? 's' : ''} in TOML format:
-${fileList}
-
-The TOML format for commands is being deprecated in favor of Markdown format.
-Markdown format is more readable and easier to edit.
-
-You can migrate these files automatically using:
-  qwen-code migrate-commands
-
-Or manually convert each file:
-  - TOML: prompt = "..." / description = "..."
-  - Markdown: YAML frontmatter + content
-
-The migration tool will:
-  ✓ Convert TOML files to Markdown
-  ✓ Create backups of original files
-  ✓ Preserve all command functionality
-
-TOML format will continue to work for now, but migration is recommended.
-`.trim();
-}

packages/cli/src/services/markdown-command-parser.test.ts

@@ -1,144 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import {
-  parseMarkdownCommand,
-  MarkdownCommandDefSchema,
-} from './markdown-command-parser.js';
-
-describe('parseMarkdownCommand', () => {
-  it('should parse markdown with YAML frontmatter', () => {
-    const content = `---
-description: Test command
----
-
-This is the prompt content.`;
-
-    const result = parseMarkdownCommand(content);
-
-    expect(result).toEqual({
-      frontmatter: {
-        description: 'Test command',
-      },
-      prompt: 'This is the prompt content.',
-    });
-  });
-
-  it('should parse markdown without frontmatter', () => {
-    const content = 'This is just a prompt without frontmatter.';
-
-    const result = parseMarkdownCommand(content);
-
-    expect(result).toEqual({
-      prompt: 'This is just a prompt without frontmatter.',
-    });
-  });
-
-  it('should handle multi-line prompts', () => {
-    const content = `---
-description: Multi-line test
----
-
-First line of prompt.
-Second line of prompt.
-Third line of prompt.`;
-
-    const result = parseMarkdownCommand(content);
-
-    expect(result.prompt).toBe(
-      'First line of prompt.\nSecond line of prompt.\nThird line of prompt.',
-    );
-  });
-
-  it('should trim whitespace from prompt', () => {
-    const content = `---
-description: Whitespace test
----
-
-  Prompt with leading and trailing spaces  
-`;
-
-    const result = parseMarkdownCommand(content);
-
-    expect(result.prompt).toBe('Prompt with leading and trailing spaces');
-  });
-
-  it('should handle empty frontmatter', () => {
-    const content = `---
----
-
-Prompt content after empty frontmatter.`;
-
-    const result = parseMarkdownCommand(content);
-
-    // Empty YAML frontmatter returns undefined, not {}
-    expect(result.frontmatter).toBeUndefined();
-    expect(result.prompt).toBe('Prompt content after empty frontmatter.');
-  });
-
-  it('should handle invalid YAML frontmatter gracefully', () => {
-    // The YAML parser we use is quite tolerant, so most "invalid" YAML
-    // actually parses successfully. This test verifies that behavior.
-    const content = `---
-description: test
----
-
-Prompt content.`;
-
-    const result = parseMarkdownCommand(content);
-
-    expect(result.frontmatter).toBeDefined();
-    expect(result.prompt).toBe('Prompt content.');
-  });
-});
-
-describe('MarkdownCommandDefSchema', () => {
-  it('should validate valid markdown command def', () => {
-    const validDef = {
-      frontmatter: {
-        description: 'Test description',
-      },
-      prompt: 'Test prompt',
-    };
-
-    const result = MarkdownCommandDefSchema.safeParse(validDef);
-
-    expect(result.success).toBe(true);
-  });
-
-  it('should validate markdown command def without frontmatter', () => {
-    const validDef = {
-      prompt: 'Test prompt',
-    };
-
-    const result = MarkdownCommandDefSchema.safeParse(validDef);
-
-    expect(result.success).toBe(true);
-  });
-
-  it('should reject command def without prompt', () => {
-    const invalidDef = {
-      frontmatter: {
-        description: 'Test description',
-      },
-    };
-
-    const result = MarkdownCommandDefSchema.safeParse(invalidDef);
-
-    expect(result.success).toBe(false);
-  });
-
-  it('should reject command def with non-string prompt', () => {
-    const invalidDef = {
-      prompt: 123,
-    };
-
-    const result = MarkdownCommandDefSchema.safeParse(invalidDef);
-
-    expect(result.success).toBe(false);
-  });
-});

packages/cli/src/services/markdown-command-parser.ts

@@ -1,64 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import { parse as parseYaml } from '@qwen-code/qwen-code-core';
-
-/**
- * Defines the Zod schema for a Markdown command definition file.
- * The frontmatter contains optional metadata, and the body is the prompt.
- */
-export const MarkdownCommandDefSchema = z.object({
-  frontmatter: z
-    .object({
-      description: z.string().optional(),
-    })
-    .optional(),
-  prompt: z.string({
-    required_error: 'The prompt content is required.',
-    invalid_type_error: 'The prompt content must be a string.',
-  }),
-});
-
-export type MarkdownCommandDef = z.infer<typeof MarkdownCommandDefSchema>;
-
-/**
- * Parses a Markdown command file with optional YAML frontmatter.
- * @param content The file content
- * @returns Parsed command definition with frontmatter and prompt
- */
-export function parseMarkdownCommand(content: string): MarkdownCommandDef {
-  // Match YAML frontmatter pattern: ---\n...\n---\n
-  // Allow empty frontmatter: ---\n---\n  // Use (?:[\s\S]*?) to make the frontmatter content optional
-  const frontmatterRegex = /^---\n([\s\S]*?)---\n([\s\S]*)$/;
-  const match = content.match(frontmatterRegex);
-
-  if (!match) {
-    // No frontmatter, entire content is the prompt
-    return {
-      prompt: content.trim(),
-    };
-  }
-
-  const [, frontmatterYaml, body] = match;
-
-  // Parse YAML frontmatter if not empty
-  let frontmatter: Record<string, unknown> | undefined;
-  if (frontmatterYaml.trim()) {
-    try {
-      frontmatter = parseYaml(frontmatterYaml) as Record<string, unknown>;
-    } catch (error) {
-      throw new Error(
-        `Failed to parse YAML frontmatter: ${error instanceof Error ? error.message : String(error)}`,
-      );
-    }
-  }
-
-  return {
-    frontmatter,
-    prompt: body.trim(),
-  };
-}

packages/cli/src/services/test-commands/example.md

@@ -1,5 +0,0 @@
----
-description: Example markdown command
----
-
-This is an example prompt from a markdown file.

packages/cli/src/test-utils/createExtension.ts

@@ -0,0 +1,49 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import {
+  EXTENSIONS_CONFIG_FILENAME,
+  INSTALL_METADATA_FILENAME,
+} from '../config/extension.js';
+import {
+  type MCPServerConfig,
+  type ExtensionInstallMetadata,
+} from '@qwen-code/qwen-code-core';
+
+export function createExtension({
+  extensionsDir = 'extensions-dir',
+  name = 'my-extension',
+  version = '1.0.0',
+  addContextFile = false,
+  contextFileName = undefined as string | undefined,
+  mcpServers = {} as Record<string, MCPServerConfig>,
+  installMetadata = undefined as ExtensionInstallMetadata | undefined,
+} = {}): string {
+  const extDir = path.join(extensionsDir, name);
+  fs.mkdirSync(extDir, { recursive: true });
+  fs.writeFileSync(
+    path.join(extDir, EXTENSIONS_CONFIG_FILENAME),
+    JSON.stringify({ name, version, contextFileName, mcpServers }),
+  );
+
+  if (addContextFile) {
+    fs.writeFileSync(path.join(extDir, 'QWEN.md'), 'context');
+  }
+
+  if (contextFileName) {
+    fs.writeFileSync(path.join(extDir, contextFileName), 'context');
+  }
+
+  if (installMetadata) {
+    fs.writeFileSync(
+      path.join(extDir, INSTALL_METADATA_FILENAME),
+      JSON.stringify(installMetadata),
+    );
+  }
+  return extDir;
+}

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

@@ -76,6 +76,7 @@ vi.mock('./hooks/useFolderTrust.js');
 vi.mock('./hooks/useIdeTrustListener.js');
 vi.mock('./hooks/useMessageQueue.js');
 vi.mock('./hooks/useAutoAcceptIndicator.js');
+vi.mock('./hooks/useWorkspaceMigration.js');
 vi.mock('./hooks/useGitBranchName.js');
 vi.mock('./contexts/VimModeContext.js');
 vi.mock('./contexts/SessionContext.js');
@@ -102,6 +103,7 @@ import { useFolderTrust } from './hooks/useFolderTrust.js';
 import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
+import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
 import { useVimMode } from './contexts/VimModeContext.js';
 import { useSessionStats } from './contexts/SessionContext.js';
@@ -132,6 +134,7 @@ describe('AppContainer State Management', () => {
   const mockedUseIdeTrustListener = useIdeTrustListener as Mock;
   const mockedUseMessageQueue = useMessageQueue as Mock;
   const mockedUseAutoAcceptIndicator = useAutoAcceptIndicator as Mock;
+  const mockedUseWorkspaceMigration = useWorkspaceMigration as Mock;
   const mockedUseGitBranchName = useGitBranchName as Mock;
   const mockedUseVimMode = useVimMode as Mock;
   const mockedUseSessionStats = useSessionStats as Mock;
@@ -236,6 +239,12 @@ describe('AppContainer State Management', () => {
       getQueuedMessagesText: vi.fn().mockReturnValue(''),
     });
     mockedUseAutoAcceptIndicator.mockReturnValue(false);
+    mockedUseWorkspaceMigration.mockReturnValue({
+      showWorkspaceMigrationDialog: false,
+      workspaceExtensions: [],
+      onWorkspaceMigrationDialogOpen: vi.fn(),
+      onWorkspaceMigrationDialogClose: vi.fn(),
+    });
     mockedUseGitBranchName.mockReturnValue('main');
     mockedUseVimMode.mockReturnValue({
       isVimEnabled: false,
@@ -285,10 +294,7 @@ describe('AppContainer State Management', () => {
     // Mock LoadedSettings
     mockSettings = {
       merged: {
-        hideBanner: false,
-        hideFooter: false,
         hideTips: false,
-        showMemoryUsage: false,
         theme: 'default',
         ui: {
           showStatusInTitle: false,
@@ -436,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;
 
@@ -454,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

@@ -37,7 +37,6 @@ import {
   getErrorMessage,
   getAllGeminiMdFilenames,
   ShellExecutionService,
-  Storage,
 } from '@qwen-code/qwen-code-core';
 import { buildResumedHistoryItems } from './utils/resumeHistoryUtils.js';
 import { validateAuthMethod } from '../config/auth.js';
@@ -76,9 +75,6 @@ import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
 import { useFolderTrust } from './hooks/useFolderTrust.js';
 import { useIdeTrustListener } from './hooks/useIdeTrustListener.js';
 import { type IdeIntegrationNudgeResult } from './IdeIntegrationNudge.js';
-import { type CommandMigrationNudgeResult } from './CommandFormatMigrationNudge.js';
-import { useCommandMigration } from './hooks/useCommandMigration.js';
-import { migrateTomlCommands } from '../services/command-migration-tool.js';
 import { appEvents, AppEvent } from '../utils/events.js';
 import { type UpdateObject } from './utils/updateCheck.js';
 import { setUpdateHandler } from '../utils/handleAutoUpdate.js';
@@ -86,12 +82,10 @@ import { ConsolePatcher } from './utils/ConsolePatcher.js';
 import { registerCleanup, runExitCleanup } from '../utils/cleanup.js';
 import { useMessageQueue } from './hooks/useMessageQueue.js';
 import { useAutoAcceptIndicator } from './hooks/useAutoAcceptIndicator.js';
+import { useWorkspaceMigration } from './hooks/useWorkspaceMigration.js';
 import { useSessionStats } from './contexts/SessionContext.js';
 import { useGitBranchName } from './hooks/useGitBranchName.js';
-import {
-  useExtensionUpdates,
-  useConfirmUpdateRequests,
-} from './hooks/useExtensionUpdates.js';
+import { useExtensionUpdates } from './hooks/useExtensionUpdates.js';
 import { ShellFocusContext } from './contexts/ShellFocusContext.js';
 import { t } from '../i18n/index.js';
 import { useWelcomeBack } from './hooks/useWelcomeBack.js';
@@ -102,7 +96,6 @@ import { processVisionSwitchOutcome } from './hooks/useVisionAutoSwitch.js';
 import { useSubagentCreateDialog } from './hooks/useSubagentCreateDialog.js';
 import { useAgentsManagerDialog } from './hooks/useAgentsManagerDialog.js';
 import { useAttentionNotifications } from './hooks/useAttentionNotifications.js';
-import { requestConsentInteractive } from '../commands/extensions/consent.js';
 
 const CTRL_EXIT_PROMPT_DURATION_MS = 1000;
 
@@ -163,21 +156,15 @@ export const AppContainer = (props: AppContainerProps) => {
     config.isTrustedFolder(),
   );
 
-  const extensionManager = config.getExtensionManager();
-
-  extensionManager.setRequestConsent(async (description) =>
-    requestConsentInteractive(description, addConfirmUpdateExtensionRequest),
-  );
-
-  const { addConfirmUpdateExtensionRequest, confirmUpdateExtensionRequests } =
-    useConfirmUpdateRequests();
-
+  const extensions = config.getExtensions();
   const {
     extensionsUpdateState,
     extensionsUpdateStateInternal,
     dispatchExtensionStateUpdate,
+    confirmUpdateExtensionRequests,
+    addConfirmUpdateExtensionRequest,
   } = useExtensionUpdates(
-    extensionManager,
+    extensions,
     historyManager.addItem,
     config.getWorkingDir(),
   );
@@ -284,7 +271,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 => {
@@ -442,6 +430,13 @@ export const AppContainer = (props: AppContainerProps) => {
     remount: refreshStatic,
   });
 
+  const {
+    showWorkspaceMigrationDialog,
+    workspaceExtensions,
+    onWorkspaceMigrationDialogOpen,
+    onWorkspaceMigrationDialogClose,
+  } = useWorkspaceMigration(settings);
+
   const { toggleVimEnabled } = useVimMode();
 
   const {
@@ -577,11 +572,11 @@ export const AppContainer = (props: AppContainerProps) => {
           : [],
         config.getDebugMode(),
         config.getFileService(),
+        settings.merged,
         config.getExtensionContextFilePaths(),
         config.isTrustedFolder(),
         settings.merged.context?.importFormat || 'tree', // Use setting or default to 'tree'
         config.getFileFilteringOptions(),
-        config.getDiscoveryMaxDirs(),
       );
 
       config.setUserMemory(memoryContent);
@@ -844,13 +839,6 @@ export const AppContainer = (props: AppContainerProps) => {
       !idePromptAnswered,
   );
 
-  // Command migration nudge
-  const {
-    showMigrationNudge: shouldShowCommandMigrationNudge,
-    tomlFiles: commandMigrationTomlFiles,
-    setShowMigrationNudge: setShowCommandMigrationNudge,
-  } = useCommandMigration(settings, config.storage);
-
   const [showErrorDetails, setShowErrorDetails] = useState<boolean>(false);
   const [showToolDescriptions, setShowToolDescriptions] =
     useState<boolean>(false);
@@ -946,92 +934,6 @@ export const AppContainer = (props: AppContainerProps) => {
     [handleSlashCommand, settings],
   );
 
-  const handleCommandMigrationComplete = useCallback(
-    async (result: CommandMigrationNudgeResult) => {
-      setShowCommandMigrationNudge(false);
-
-      if (result.userSelection === 'yes') {
-        // Perform migration for both workspace and user levels
-        try {
-          const results = [];
-
-          // Migrate workspace commands
-          const workspaceCommandsDir = config.storage.getProjectCommandsDir();
-          const workspaceResult = await migrateTomlCommands({
-            commandDir: workspaceCommandsDir,
-            createBackup: true,
-            deleteOriginal: false,
-          });
-          if (
-            workspaceResult.convertedFiles.length > 0 ||
-            workspaceResult.failedFiles.length > 0
-          ) {
-            results.push({ level: 'workspace', result: workspaceResult });
-          }
-
-          // Migrate user commands
-          const userCommandsDir = Storage.getUserCommandsDir();
-          const userResult = await migrateTomlCommands({
-            commandDir: userCommandsDir,
-            createBackup: true,
-            deleteOriginal: false,
-          });
-          if (
-            userResult.convertedFiles.length > 0 ||
-            userResult.failedFiles.length > 0
-          ) {
-            results.push({ level: 'user', result: userResult });
-          }
-
-          // Report results
-          for (const { level, result: migrationResult } of results) {
-            if (
-              migrationResult.success &&
-              migrationResult.convertedFiles.length > 0
-            ) {
-              historyManager.addItem(
-                {
-                  type: MessageType.INFO,
-                  text: `[${level}] Successfully migrated ${migrationResult.convertedFiles.length} command file${migrationResult.convertedFiles.length > 1 ? 's' : ''} to Markdown format. Original files backed up as .toml.backup`,
-                },
-                Date.now(),
-              );
-            }
-
-            if (migrationResult.failedFiles.length > 0) {
-              historyManager.addItem(
-                {
-                  type: MessageType.ERROR,
-                  text: `[${level}] Failed to migrate ${migrationResult.failedFiles.length} file${migrationResult.failedFiles.length > 1 ? 's' : ''}:\n${migrationResult.failedFiles.map((f) => `  • ${f.file}: ${f.error}`).join('\n')}`,
-                },
-                Date.now(),
-              );
-            }
-          }
-
-          if (results.length === 0) {
-            historyManager.addItem(
-              {
-                type: MessageType.INFO,
-                text: 'No TOML files found to migrate.',
-              },
-              Date.now(),
-            );
-          }
-        } catch (error) {
-          historyManager.addItem(
-            {
-              type: MessageType.ERROR,
-              text: `❌ Migration failed: ${getErrorMessage(error)}`,
-            },
-            Date.now(),
-          );
-        }
-      }
-    },
-    [historyManager, setShowCommandMigrationNudge, config.storage],
-  );
-
   const { elapsedTime, currentLoadingPhrase } = useLoadingIndicator(
     streamingState,
     settings.merged.ui?.customWittyPhrases,
@@ -1274,8 +1176,8 @@ export const AppContainer = (props: AppContainerProps) => {
 
   const dialogsVisible =
     showWelcomeBackDialog ||
+    showWorkspaceMigrationDialog ||
     shouldShowIdePrompt ||
-    shouldShowCommandMigrationNudge ||
     isFolderTrustDialogOpen ||
     !!shellConfirmationRequest ||
     !!confirmationRequest ||
@@ -1341,8 +1243,6 @@ export const AppContainer = (props: AppContainerProps) => {
       suggestionsWidth,
       isInputActive,
       shouldShowIdePrompt,
-      shouldShowCommandMigrationNudge,
-      commandMigrationTomlFiles,
       isFolderTrustDialogOpen: isFolderTrustDialogOpen ?? false,
       isTrustedFolder,
       constrainHeight,
@@ -1359,6 +1259,8 @@ export const AppContainer = (props: AppContainerProps) => {
       historyRemountKey,
       messageQueue,
       showAutoAcceptIndicator,
+      showWorkspaceMigrationDialog,
+      workspaceExtensions,
       currentModel,
       contextFileNames,
       errorCount,
@@ -1430,8 +1332,6 @@ export const AppContainer = (props: AppContainerProps) => {
       suggestionsWidth,
       isInputActive,
       shouldShowIdePrompt,
-      shouldShowCommandMigrationNudge,
-      commandMigrationTomlFiles,
       isFolderTrustDialogOpen,
       isTrustedFolder,
       constrainHeight,
@@ -1448,6 +1348,8 @@ export const AppContainer = (props: AppContainerProps) => {
       historyRemountKey,
       messageQueue,
       showAutoAcceptIndicator,
+      showWorkspaceMigrationDialog,
+      workspaceExtensions,
       contextFileNames,
       errorCount,
       availableTerminalHeight,
@@ -1501,13 +1403,14 @@ export const AppContainer = (props: AppContainerProps) => {
       setShellModeActive,
       vimHandleInput,
       handleIdePromptComplete,
-      handleCommandMigrationComplete,
       handleFolderTrustSelect,
       setConstrainHeight,
       onEscapePromptChange: handleEscapePromptChange,
       refreshStatic,
       handleFinalSubmit,
       handleClearScreen,
+      onWorkspaceMigrationDialogOpen,
+      onWorkspaceMigrationDialogClose,
       // Vision switch dialog
       handleVisionSwitchSelect,
       // Welcome back dialog
@@ -1537,13 +1440,14 @@ export const AppContainer = (props: AppContainerProps) => {
       setShellModeActive,
       vimHandleInput,
       handleIdePromptComplete,
-      handleCommandMigrationComplete,
       handleFolderTrustSelect,
       setConstrainHeight,
       handleEscapePromptChange,
       refreshStatic,
       handleFinalSubmit,
       handleClearScreen,
+      onWorkspaceMigrationDialogOpen,
+      onWorkspaceMigrationDialogClose,
       handleVisionSwitchSelect,
       handleWelcomeBackSelection,
       handleWelcomeBackClose,

packages/cli/src/ui/CommandFormatMigrationNudge.tsx

@@ -1,90 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { Box, Text } from 'ink';
-import type { RadioSelectItem } from './components/shared/RadioButtonSelect.js';
-import { RadioButtonSelect } from './components/shared/RadioButtonSelect.js';
-import { useKeypress } from './hooks/useKeypress.js';
-import { theme } from './semantic-colors.js';
-
-export type CommandMigrationNudgeResult = {
-  userSelection: 'yes' | 'no';
-};
-
-interface CommandFormatMigrationNudgeProps {
-  tomlFiles: string[];
-  onComplete: (result: CommandMigrationNudgeResult) => void;
-}
-
-export function CommandFormatMigrationNudge({
-  tomlFiles,
-  onComplete,
-}: CommandFormatMigrationNudgeProps) {
-  useKeypress(
-    (key) => {
-      if (key.name === 'escape') {
-        onComplete({
-          userSelection: 'no',
-        });
-      }
-    },
-    { isActive: true },
-  );
-
-  const OPTIONS: Array<RadioSelectItem<CommandMigrationNudgeResult>> = [
-    {
-      label: 'Yes',
-      value: {
-        userSelection: 'yes',
-      },
-      key: 'Yes',
-    },
-    {
-      label: 'No (esc)',
-      value: {
-        userSelection: 'no',
-      },
-      key: 'No (esc)',
-    },
-  ];
-
-  const count = tomlFiles.length;
-  const fileList =
-    count <= 3
-      ? tomlFiles.map((f) => `  • ${f}`).join('\n')
-      : `  • ${tomlFiles.slice(0, 2).join('\n  • ')}\n  • ... and ${count - 2} more`;
-
-  return (
-    <Box
-      flexDirection="column"
-      borderStyle="round"
-      borderColor={theme.status.warning}
-      padding={1}
-      width="100%"
-      marginLeft={1}
-    >
-      <Box marginBottom={1} flexDirection="column">
-        <Text>
-          <Text color={theme.status.warning}>{'⚠️  '}</Text>
-          <Text bold>Command Format Migration</Text>
-        </Text>
-        <Text color={theme.text.secondary}>
-          {`Found ${count} TOML command file${count > 1 ? 's' : ''}:`}
-        </Text>
-        <Text color={theme.text.secondary}>{fileList}</Text>
-        <Text>{''}</Text>
-        <Text color={theme.text.secondary}>
-          The TOML format is deprecated. Would you like to migrate them to
-          Markdown format?
-        </Text>
-        <Text color={theme.text.secondary}>
-          (Backups will be created and original files will be preserved)
-        </Text>
-      </Box>
-      <RadioButtonSelect items={OPTIONS} onSelect={onComplete} />
-    </Box>
-  );
-}

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

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

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

@@ -4,6 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import type { GeminiCLIExtension } from '@qwen-code/qwen-code-core';
+import {
+  updateAllUpdatableExtensions,
+  updateExtension,
+} from '../../config/extensions/update.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { MessageType } from '../types.js';
 import { extensionsCommand } from './extensionsCommand.js';
@@ -17,59 +22,34 @@ import {
   type MockedFunction,
 } from 'vitest';
 import { ExtensionUpdateState } from '../state/extensions.js';
-import {
-  type Extension,
-  ExtensionManager,
-  parseInstallSource,
-} from '@qwen-code/qwen-code-core';
 
-vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
-  return {
-    ...actual,
-    parseInstallSource: vi.fn(),
-  };
-});
+vi.mock('../../config/extensions/update.js', () => ({
+  updateExtension: vi.fn(),
+  updateAllUpdatableExtensions: vi.fn(),
+  checkForAllExtensionUpdates: vi.fn(),
+}));
+
+const mockUpdateExtension = updateExtension as MockedFunction<
+  typeof updateExtension
+>;
+
+const mockUpdateAllUpdatableExtensions =
+  updateAllUpdatableExtensions as MockedFunction<
+    typeof updateAllUpdatableExtensions
+  >;
 
 const mockGetExtensions = vi.fn();
-const mockUpdateExtension = vi.fn();
-const mockUpdateAllUpdatableExtensions = vi.fn();
-const mockCheckForAllExtensionUpdates = vi.fn();
-const mockInstallExtension = vi.fn();
-const mockUninstallExtension = vi.fn();
-const mockGetLoadedExtensions = vi.fn();
-const mockEnableExtension = vi.fn();
-const mockDisableExtension = vi.fn();
-
-const createMockExtensionManager = () => ({
-  updateExtension: mockUpdateExtension,
-  updateAllUpdatableExtensions: mockUpdateAllUpdatableExtensions,
-  checkForAllExtensionUpdates: mockCheckForAllExtensionUpdates,
-  installExtension: mockInstallExtension,
-  uninstallExtension: mockUninstallExtension,
-  getLoadedExtensions: mockGetLoadedExtensions,
-  enableExtension: mockEnableExtension,
-  disableExtension: mockDisableExtension,
-});
 
 describe('extensionsCommand', () => {
   let mockContext: CommandContext;
-  let mockExtensionManager: ReturnType<typeof createMockExtensionManager>;
 
   beforeEach(() => {
     vi.resetAllMocks();
-    mockExtensionManager = createMockExtensionManager();
-    mockGetExtensions.mockReturnValue([]);
-    mockGetLoadedExtensions.mockReturnValue([]);
-    mockCheckForAllExtensionUpdates.mockResolvedValue(undefined);
     mockContext = createMockCommandContext({
       services: {
         config: {
           getExtensions: mockGetExtensions,
           getWorkingDir: () => '/test/dir',
-          getExtensionManager: () =>
-            mockExtensionManager as unknown as ExtensionManager,
         },
       },
       ui: {
@@ -79,9 +59,8 @@ describe('extensionsCommand', () => {
   });
 
   describe('list', () => {
-    it('should add an EXTENSIONS_LIST item to the UI when extensions exist', async () => {
+    it('should add an EXTENSIONS_LIST item to the UI', async () => {
       if (!extensionsCommand.action) throw new Error('Action not defined');
-      mockGetExtensions.mockReturnValue([{ name: 'test-ext', isActive: true }]);
       await extensionsCommand.action(mockContext, '');
 
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
@@ -91,20 +70,6 @@ describe('extensionsCommand', () => {
         expect.any(Number),
       );
     });
-
-    it('should show info message when no extensions installed', async () => {
-      if (!extensionsCommand.action) throw new Error('Action not defined');
-      mockGetExtensions.mockReturnValue([]);
-      await extensionsCommand.action(mockContext, '');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'No extensions installed. Run `/extensions explore` to check out the gallery.',
-        },
-        expect.any(Number),
-      );
-    });
   });
 
   describe('update', () => {
@@ -128,7 +93,6 @@ describe('extensionsCommand', () => {
     });
 
     it('should inform user if there are no extensions to update with --all', async () => {
-      mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]);
       mockUpdateAllUpdatableExtensions.mockResolvedValue([]);
       await updateAction(mockContext, '--all');
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
@@ -141,7 +105,6 @@ describe('extensionsCommand', () => {
     });
 
     it('should call setPendingItem and addItem in a finally block on success', async () => {
-      mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]);
       mockUpdateAllUpdatableExtensions.mockResolvedValue([
         {
           name: 'ext-one',
@@ -168,7 +131,6 @@ describe('extensionsCommand', () => {
     });
 
     it('should call setPendingItem and addItem in a finally block on failure', async () => {
-      mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]);
       mockUpdateAllUpdatableExtensions.mockRejectedValue(
         new Error('Something went wrong'),
       );
@@ -193,14 +155,11 @@ describe('extensionsCommand', () => {
     });
 
     it('should update a single extension by name', async () => {
-      const extension: Extension = {
-        id: 'ext-one',
+      const extension: GeminiCLIExtension = {
         name: 'ext-one',
         version: '1.0.0',
         isActive: true,
         path: '/test/dir/ext-one',
-        contextFiles: [],
-        config: { name: 'ext-one', version: '1.0.0' },
         installMetadata: {
           type: 'git',
           autoUpdate: false,
@@ -220,23 +179,16 @@ describe('extensionsCommand', () => {
       await updateAction(mockContext, 'ext-one');
       expect(mockUpdateExtension).toHaveBeenCalledWith(
         extension,
+        '/test/dir',
+        expect.any(Function),
         ExtensionUpdateState.UPDATE_AVAILABLE,
         expect.any(Function),
       );
     });
 
     it('should handle errors when updating a single extension', async () => {
-      // Provide at least one extension so we don't get "No extensions installed" message
-      const otherExtension: Extension = {
-        id: 'other-ext',
-        name: 'other-ext',
-        version: '1.0.0',
-        isActive: true,
-        path: '/test/dir/other-ext',
-        contextFiles: [],
-        config: { name: 'other-ext', version: '1.0.0' },
-      };
-      mockGetExtensions.mockReturnValue([otherExtension]);
+      mockUpdateExtension.mockRejectedValue(new Error('Extension not found'));
+      mockGetExtensions.mockReturnValue([]);
       await updateAction(mockContext, 'ext-one');
       expect(mockContext.ui.addItem).toHaveBeenCalledWith(
         {
@@ -248,28 +200,22 @@ describe('extensionsCommand', () => {
     });
 
     it('should update multiple extensions by name', async () => {
-      const extensionOne: Extension = {
-        id: 'ext-one',
+      const extensionOne: GeminiCLIExtension = {
         name: 'ext-one',
         version: '1.0.0',
         isActive: true,
         path: '/test/dir/ext-one',
-        contextFiles: [],
-        config: { name: 'ext-one', version: '1.0.0' },
         installMetadata: {
           type: 'git',
           autoUpdate: false,
           source: 'https://github.com/some/extension.git',
         },
       };
-      const extensionTwo: Extension = {
-        id: 'ext-two',
+      const extensionTwo: GeminiCLIExtension = {
         name: 'ext-two',
         version: '1.0.0',
         isActive: true,
         path: '/test/dir/ext-two',
-        contextFiles: [],
-        config: { name: 'ext-two', version: '1.0.0' },
         installMetadata: {
           type: 'git',
           autoUpdate: false,
@@ -277,14 +223,14 @@ describe('extensionsCommand', () => {
         },
       };
       mockGetExtensions.mockReturnValue([extensionOne, extensionTwo]);
-      mockContext.ui.extensionsUpdateState.set(extensionOne.name, {
-        status: ExtensionUpdateState.UPDATE_AVAILABLE,
-        processed: false,
-      });
-      mockContext.ui.extensionsUpdateState.set(extensionTwo.name, {
-        status: ExtensionUpdateState.UPDATE_AVAILABLE,
-        processed: false,
-      });
+      mockContext.ui.extensionsUpdateState.set(
+        extensionOne.name,
+        ExtensionUpdateState.UPDATE_AVAILABLE,
+      );
+      mockContext.ui.extensionsUpdateState.set(
+        extensionTwo.name,
+        ExtensionUpdateState.UPDATE_AVAILABLE,
+      );
       mockUpdateExtension
         .mockResolvedValueOnce({
           name: 'ext-one',
@@ -319,24 +265,18 @@ describe('extensionsCommand', () => {
         throw new Error('Update completion not found');
       }
 
-      const extensionOne: Extension = {
-        id: 'ext-one',
+      const extensionOne: GeminiCLIExtension = {
         name: 'ext-one',
         version: '1.0.0',
         isActive: true,
         path: '/test/dir/ext-one',
-        contextFiles: [],
-        config: { name: 'ext-one', version: '1.0.0' },
         installMetadata: {
           type: 'git',
           autoUpdate: false,
           source: 'https://github.com/some/extension.git',
         },
       };
-      const extensionTwo: Extension = {
-        id: 'another-ext',
-        contextFiles: [],
-        config: { name: 'another-ext', version: '1.0.0' },
+      const extensionTwo: GeminiCLIExtension = {
         name: 'another-ext',
         version: '1.0.0',
         isActive: true,
@@ -347,11 +287,8 @@ describe('extensionsCommand', () => {
           source: 'https://github.com/some/extension.git',
         },
       };
-      const allExt: Extension = {
-        id: 'all-ext',
+      const allExt: GeminiCLIExtension = {
         name: 'all-ext',
-        contextFiles: [],
-        config: { name: 'all-ext', version: '1.0.0' },
         version: '1.0.0',
         isActive: true,
         path: '/test/dir/all-ext',
@@ -394,387 +331,5 @@ describe('extensionsCommand', () => {
         expect(suggestions).toEqual(expected);
       });
     });
-
-    it('should call reloadCommands in finally block', async () => {
-      mockGetExtensions.mockReturnValue([{ name: 'ext-one', isActive: true }]);
-      mockUpdateAllUpdatableExtensions.mockResolvedValue([
-        {
-          name: 'ext-one',
-          originalVersion: '1.0.0',
-          updatedVersion: '1.0.1',
-        },
-      ]);
-      await updateAction(mockContext, '--all');
-      expect(mockContext.ui.reloadCommands).toHaveBeenCalled();
-    });
-  });
-
-  describe('install', () => {
-    const installAction = extensionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'install',
-    )?.action;
-
-    if (!installAction) {
-      throw new Error('Install action not found');
-    }
-
-    const mockParseInstallSource = parseInstallSource as MockedFunction<
-      typeof parseInstallSource
-    >;
-
-    // Create a real ExtensionManager mock that passes instanceof check
-    let realMockExtensionManager: ExtensionManager;
-
-    beforeEach(() => {
-      vi.resetAllMocks();
-      // Create a mock that inherits from ExtensionManager prototype
-      realMockExtensionManager = Object.create(ExtensionManager.prototype);
-      realMockExtensionManager.installExtension = mockInstallExtension;
-
-      mockContext = createMockCommandContext({
-        services: {
-          config: {
-            getExtensions: mockGetExtensions,
-            getWorkingDir: () => '/test/dir',
-            getExtensionManager: () => realMockExtensionManager,
-          },
-        },
-        ui: {
-          dispatchExtensionStateUpdate: vi.fn(),
-        },
-      });
-    });
-
-    it('should show usage if no source is provided', async () => {
-      await installAction(mockContext, '');
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Usage: /extensions install <source>',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should install extension successfully', async () => {
-      mockParseInstallSource.mockResolvedValue({
-        type: 'git',
-        source: 'https://github.com/test/extension',
-      });
-      mockInstallExtension.mockResolvedValue({
-        name: 'test-extension',
-        version: '1.0.0',
-      });
-
-      await installAction(mockContext, 'https://github.com/test/extension');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Installing extension from "https://github.com/test/extension"...',
-        },
-        expect.any(Number),
-      );
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Extension "test-extension" installed successfully.',
-        },
-        expect.any(Number),
-      );
-      expect(mockContext.ui.reloadCommands).toHaveBeenCalled();
-    });
-
-    it('should handle install errors', async () => {
-      mockParseInstallSource.mockRejectedValue(
-        new Error('Install source not found.'),
-      );
-
-      await installAction(mockContext, '/invalid/path');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Failed to install extension from "/invalid/path": Install source not found.',
-        },
-        expect.any(Number),
-      );
-    });
-  });
-
-  describe('uninstall', () => {
-    const uninstallAction = extensionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'uninstall',
-    )?.action;
-
-    if (!uninstallAction) {
-      throw new Error('Uninstall action not found');
-    }
-
-    let realMockExtensionManager: ExtensionManager;
-
-    beforeEach(() => {
-      vi.resetAllMocks();
-      realMockExtensionManager = Object.create(ExtensionManager.prototype);
-      realMockExtensionManager.uninstallExtension = mockUninstallExtension;
-
-      mockContext = createMockCommandContext({
-        services: {
-          config: {
-            getExtensions: mockGetExtensions,
-            getWorkingDir: () => '/test/dir',
-            getExtensionManager: () => realMockExtensionManager,
-          },
-        },
-        ui: {
-          dispatchExtensionStateUpdate: vi.fn(),
-        },
-      });
-    });
-
-    it('should show usage if no name is provided', async () => {
-      await uninstallAction(mockContext, '');
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Usage: /extensions uninstall <extension-name>',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should uninstall extension successfully', async () => {
-      mockUninstallExtension.mockResolvedValue(undefined);
-
-      await uninstallAction(mockContext, 'test-extension');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Uninstalling extension "test-extension"...',
-        },
-        expect.any(Number),
-      );
-      expect(mockUninstallExtension).toHaveBeenCalledWith(
-        'test-extension',
-        false,
-      );
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Extension "test-extension" uninstalled successfully.',
-        },
-        expect.any(Number),
-      );
-      expect(mockContext.ui.reloadCommands).toHaveBeenCalled();
-    });
-
-    it('should handle uninstall errors', async () => {
-      mockUninstallExtension.mockRejectedValue(
-        new Error('Extension not found.'),
-      );
-
-      await uninstallAction(mockContext, 'nonexistent-extension');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Failed to uninstall extension "nonexistent-extension": Extension not found.',
-        },
-        expect.any(Number),
-      );
-    });
-  });
-
-  describe('disable', () => {
-    const disableAction = extensionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'disable',
-    )?.action;
-
-    if (!disableAction) {
-      throw new Error('Disable action not found');
-    }
-
-    let realMockExtensionManager: ExtensionManager;
-
-    beforeEach(() => {
-      vi.resetAllMocks();
-      realMockExtensionManager = Object.create(ExtensionManager.prototype);
-      realMockExtensionManager.disableExtension = mockDisableExtension;
-      realMockExtensionManager.getLoadedExtensions = mockGetLoadedExtensions;
-
-      mockContext = createMockCommandContext({
-        invocation: {
-          raw: '/extensions disable',
-          name: 'disable',
-          args: '',
-        },
-        services: {
-          config: {
-            getExtensions: mockGetExtensions,
-            getWorkingDir: () => '/test/dir',
-            getExtensionManager: () => realMockExtensionManager,
-          },
-        },
-        ui: {
-          dispatchExtensionStateUpdate: vi.fn(),
-        },
-      });
-    });
-
-    it('should show usage if invalid args are provided', async () => {
-      await disableAction(mockContext, '');
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Usage: /extensions disable <extension> [--scope=<user|workspace>]',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should disable extension at user scope', async () => {
-      mockDisableExtension.mockResolvedValue(undefined);
-
-      await disableAction(mockContext, 'test-extension --scope=user');
-
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'test-extension',
-        'User',
-      );
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Extension "test-extension" disabled for the scope "User"',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should disable extension at workspace scope', async () => {
-      mockDisableExtension.mockResolvedValue(undefined);
-
-      await disableAction(mockContext, 'test-extension --scope workspace');
-
-      expect(mockDisableExtension).toHaveBeenCalledWith(
-        'test-extension',
-        'Workspace',
-      );
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Extension "test-extension" disabled for the scope "Workspace"',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should show error for invalid scope', async () => {
-      await disableAction(mockContext, 'test-extension --scope=invalid');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Unsupported scope invalid, should be one of "user" or "workspace"',
-        },
-        expect.any(Number),
-      );
-    });
-  });
-
-  describe('enable', () => {
-    const enableAction = extensionsCommand.subCommands?.find(
-      (cmd) => cmd.name === 'enable',
-    )?.action;
-
-    if (!enableAction) {
-      throw new Error('Enable action not found');
-    }
-
-    let realMockExtensionManager: ExtensionManager;
-
-    beforeEach(() => {
-      vi.resetAllMocks();
-      realMockExtensionManager = Object.create(ExtensionManager.prototype);
-      realMockExtensionManager.enableExtension = mockEnableExtension;
-      realMockExtensionManager.getLoadedExtensions = mockGetLoadedExtensions;
-
-      mockContext = createMockCommandContext({
-        invocation: {
-          raw: '/extensions enable',
-          name: 'enable',
-          args: '',
-        },
-        services: {
-          config: {
-            getExtensions: mockGetExtensions,
-            getWorkingDir: () => '/test/dir',
-            getExtensionManager: () => realMockExtensionManager,
-          },
-        },
-        ui: {
-          dispatchExtensionStateUpdate: vi.fn(),
-        },
-      });
-    });
-
-    it('should show usage if invalid args are provided', async () => {
-      await enableAction(mockContext, '');
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Usage: /extensions enable <extension> [--scope=<user|workspace>]',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should enable extension at user scope', async () => {
-      mockEnableExtension.mockResolvedValue(undefined);
-
-      await enableAction(mockContext, 'test-extension --scope=user');
-
-      expect(mockEnableExtension).toHaveBeenCalledWith(
-        'test-extension',
-        'User',
-      );
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Extension "test-extension" enabled for the scope "User"',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should enable extension at workspace scope', async () => {
-      mockEnableExtension.mockResolvedValue(undefined);
-
-      await enableAction(mockContext, 'test-extension --scope workspace');
-
-      expect(mockEnableExtension).toHaveBeenCalledWith(
-        'test-extension',
-        'Workspace',
-      );
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.INFO,
-          text: 'Extension "test-extension" enabled for the scope "Workspace"',
-        },
-        expect.any(Number),
-      );
-    });
-
-    it('should show error for invalid scope', async () => {
-      await enableAction(mockContext, 'test-extension --scope=invalid');
-
-      expect(mockContext.ui.addItem).toHaveBeenCalledWith(
-        {
-          type: MessageType.ERROR,
-          text: 'Unsupported scope invalid, should be one of "user" or "workspace"',
-        },
-        expect.any(Number),
-      );
-    });
   });
 });

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

@@ -4,6 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { requestConsentInteractive } from '../../config/extension.js';
+import {
+  updateAllUpdatableExtensions,
+  type ExtensionUpdateInfo,
+  updateExtension,
+  checkForAllExtensionUpdates,
+} from '../../config/extensions/update.js';
 import { getErrorMessage } from '../../utils/errors.js';
 import { ExtensionUpdateState } from '../state/extensions.js';
 import { MessageType } from '../types.js';
@@ -13,39 +20,8 @@ import {
   CommandKind,
 } from './types.js';
 import { t } from '../../i18n/index.js';
-import {
-  ExtensionManager,
-  parseInstallSource,
-  type ExtensionUpdateInfo,
-} from '@qwen-code/qwen-code-core';
-import { SettingScope } from '../../config/settings.js';
-
-function showMessageIfNoExtensions(
-  context: CommandContext,
-  extensions: unknown[],
-): boolean {
-  if (extensions.length === 0) {
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: 'No extensions installed. Run `/extensions explore` to check out the gallery.',
-      },
-      Date.now(),
-    );
-    return true;
-  }
-  return false;
-}
 
 async function listAction(context: CommandContext) {
-  const extensions = context.services.config
-    ? context.services.config.getExtensions()
-    : [];
-
-  if (showMessageIfNoExtensions(context, extensions)) {
-    return;
-  }
-
   context.ui.addItem(
     {
       type: MessageType.EXTENSIONS_LIST,
@@ -58,6 +34,7 @@ async function updateAction(context: CommandContext, args: string) {
   const updateArgs = args.split(' ').filter((value) => value.length > 0);
   const all = updateArgs.length === 1 && updateArgs[0] === '--all';
   const names = all ? undefined : updateArgs;
+  let updateInfos: ExtensionUpdateInfo[] = [];
 
   if (!all && names?.length === 0) {
     context.ui.addItem(
@@ -70,40 +47,29 @@ async function updateAction(context: CommandContext, args: string) {
     return;
   }
 
-  let updateInfos: ExtensionUpdateInfo[] = [];
-
-  const extensionManager = context.services.config!.getExtensionManager();
-  const extensions = context.services.config
-    ? context.services.config.getExtensions()
-    : [];
-
-  if (showMessageIfNoExtensions(context, extensions)) {
-    return Promise.resolve();
-  }
-
   try {
-    context.ui.dispatchExtensionStateUpdate({ type: 'BATCH_CHECK_START' });
-    await extensionManager.checkForAllExtensionUpdates((extensionName, state) =>
-      context.ui.dispatchExtensionStateUpdate({
-        type: 'SET_STATE',
-        payload: { name: extensionName, state },
-      }),
+    await checkForAllExtensionUpdates(
+      context.services.config!.getExtensions(),
+      context.ui.dispatchExtensionStateUpdate,
     );
-    context.ui.dispatchExtensionStateUpdate({ type: 'BATCH_CHECK_END' });
-
     context.ui.setPendingItem({
       type: MessageType.EXTENSIONS_LIST,
     });
     if (all) {
-      updateInfos = await extensionManager.updateAllUpdatableExtensions(
+      updateInfos = await updateAllUpdatableExtensions(
+        context.services.config!.getWorkingDir(),
+        // We don't have the ability to prompt for consent yet in this flow.
+        (description) =>
+          requestConsentInteractive(
+            description,
+            context.ui.addConfirmUpdateExtensionRequest,
+          ),
+        context.services.config!.getExtensions(),
         context.ui.extensionsUpdateState,
-        (extensionName, state) =>
-          context.ui.dispatchExtensionStateUpdate({
-            type: 'SET_STATE',
-            payload: { name: extensionName, state },
-          }),
+        context.ui.dispatchExtensionStateUpdate,
       );
     } else if (names?.length) {
+      const workingDir = context.services.config!.getWorkingDir();
       const extensions = context.services.config!.getExtensions();
       for (const name of names) {
         const extension = extensions.find(
@@ -119,15 +85,17 @@ async function updateAction(context: CommandContext, args: string) {
           );
           continue;
         }
-        const updateInfo = await extensionManager.updateExtension(
+        const updateInfo = await updateExtension(
           extension,
+          workingDir,
+          (description) =>
+            requestConsentInteractive(
+              description,
+              context.ui.addConfirmUpdateExtensionRequest,
+            ),
           context.ui.extensionsUpdateState.get(extension.name)?.status ??
             ExtensionUpdateState.UNKNOWN,
-          (extensionName, state) =>
-            context.ui.dispatchExtensionStateUpdate({
-              type: 'SET_STATE',
-              payload: { name: extensionName, state },
-            }),
+          context.ui.dispatchExtensionStateUpdate,
         );
         if (updateInfo) updateInfos.push(updateInfo);
       }
@@ -158,268 +126,10 @@ async function updateAction(context: CommandContext, args: string) {
       },
       Date.now(),
     );
-    context.ui.reloadCommands();
     context.ui.setPendingItem(null);
   }
 }
 
-async function installAction(context: CommandContext, args: string) {
-  const extensionManager = context.services.config?.getExtensionManager();
-  if (!(extensionManager instanceof ExtensionManager)) {
-    console.error(
-      `Cannot ${context.invocation?.name} extensions in this environment`,
-    );
-    return;
-  }
-
-  const source = args.trim();
-  if (!source) {
-    context.ui.addItem(
-      {
-        type: MessageType.ERROR,
-        text: `Usage: /extensions install <source>`,
-      },
-      Date.now(),
-    );
-    return;
-  }
-
-  try {
-    const installMetadata = await parseInstallSource(source);
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: `Installing extension from "${source}"...`,
-      },
-      Date.now(),
-    );
-    const extension = await extensionManager.installExtension(installMetadata);
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: `Extension "${extension.name}" installed successfully.`,
-      },
-      Date.now(),
-    );
-    // FIXME: refresh command controlled by ui for now, cannot be auto refreshed by extensionManager
-    context.ui.reloadCommands();
-  } catch (error) {
-    context.ui.addItem(
-      {
-        type: MessageType.ERROR,
-        text: `Failed to install extension from "${source}": ${getErrorMessage(
-          error,
-        )}`,
-      },
-      Date.now(),
-    );
-    return;
-  }
-}
-
-async function uninstallAction(context: CommandContext, args: string) {
-  const extensionManager = context.services.config?.getExtensionManager();
-  if (!(extensionManager instanceof ExtensionManager)) {
-    console.error(
-      `Cannot ${context.invocation?.name} extensions in this environment`,
-    );
-    return;
-  }
-
-  const name = args.trim();
-  if (!name) {
-    context.ui.addItem(
-      {
-        type: MessageType.ERROR,
-        text: `Usage: /extensions uninstall <extension-name>`,
-      },
-      Date.now(),
-    );
-    return;
-  }
-
-  context.ui.addItem(
-    {
-      type: MessageType.INFO,
-      text: `Uninstalling extension "${name}"...`,
-    },
-    Date.now(),
-  );
-
-  try {
-    await extensionManager.uninstallExtension(name, false);
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: `Extension "${name}" uninstalled successfully.`,
-      },
-      Date.now(),
-    );
-    context.ui.reloadCommands();
-  } catch (error) {
-    context.ui.addItem(
-      {
-        type: MessageType.ERROR,
-        text: `Failed to uninstall extension "${name}": ${getErrorMessage(
-          error,
-        )}`,
-      },
-      Date.now(),
-    );
-  }
-}
-
-function getEnableDisableContext(
-  context: CommandContext,
-  argumentsString: string,
-): {
-  extensionManager: ExtensionManager;
-  names: string[];
-  scope: SettingScope;
-} | null {
-  const extensionManager = context.services.config?.getExtensionManager();
-  if (!(extensionManager instanceof ExtensionManager)) {
-    console.error(
-      `Cannot ${context.invocation?.name} extensions in this environment`,
-    );
-    return null;
-  }
-  const parts = argumentsString.split(' ');
-  const name = parts[0];
-  if (
-    name === '' ||
-    !(
-      (parts.length === 2 && parts[1].startsWith('--scope=')) || // --scope=<scope>
-      (parts.length === 3 && parts[1] === '--scope') // --scope <scope>
-    )
-  ) {
-    context.ui.addItem(
-      {
-        type: MessageType.ERROR,
-        text: `Usage: /extensions ${context.invocation?.name} <extension> [--scope=<user|workspace>]`,
-      },
-      Date.now(),
-    );
-    return null;
-  }
-  let scope: SettingScope;
-  // Transform `--scope=<scope>` to `--scope <scope>`.
-  if (parts.length === 2) {
-    parts.push(...parts[1].split('='));
-    parts.splice(1, 1);
-  }
-  switch (parts[2].toLowerCase()) {
-    case 'workspace':
-      scope = SettingScope.Workspace;
-      break;
-    case 'user':
-      scope = SettingScope.User;
-      break;
-    default:
-      context.ui.addItem(
-        {
-          type: MessageType.ERROR,
-          text: `Unsupported scope ${parts[2]}, should be one of "user" or "workspace"`,
-        },
-        Date.now(),
-      );
-      return null;
-  }
-  let names: string[] = [];
-  if (name === '--all') {
-    let extensions = extensionManager.getLoadedExtensions();
-    if (context.invocation?.name === 'enable') {
-      extensions = extensions.filter((ext) => !ext.isActive);
-    }
-    if (context.invocation?.name === 'disable') {
-      extensions = extensions.filter((ext) => ext.isActive);
-    }
-    names = extensions.map((ext) => ext.name);
-  } else {
-    names = [name];
-  }
-
-  return {
-    extensionManager,
-    names,
-    scope,
-  };
-}
-
-async function disableAction(context: CommandContext, args: string) {
-  const enableContext = getEnableDisableContext(context, args);
-  if (!enableContext) return;
-
-  const { names, scope, extensionManager } = enableContext;
-  for (const name of names) {
-    await extensionManager.disableExtension(name, scope);
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: `Extension "${name}" disabled for the scope "${scope}"`,
-      },
-      Date.now(),
-    );
-    context.ui.reloadCommands();
-  }
-}
-
-async function enableAction(context: CommandContext, args: string) {
-  const enableContext = getEnableDisableContext(context, args);
-  if (!enableContext) return;
-
-  const { names, scope, extensionManager } = enableContext;
-  for (const name of names) {
-    await extensionManager.enableExtension(name, scope);
-    context.ui.addItem(
-      {
-        type: MessageType.INFO,
-        text: `Extension "${name}" enabled for the scope "${scope}"`,
-      },
-      Date.now(),
-    );
-    context.ui.reloadCommands();
-  }
-}
-
-export async function completeExtensions(
-  context: CommandContext,
-  partialArg: string,
-) {
-  let extensions = context.services.config?.getExtensions() ?? [];
-
-  if (context.invocation?.name === 'enable') {
-    extensions = extensions.filter((ext) => !ext.isActive);
-  }
-  if (
-    context.invocation?.name === 'disable' ||
-    context.invocation?.name === 'restart'
-  ) {
-    extensions = extensions.filter((ext) => ext.isActive);
-  }
-  const extensionNames = extensions.map((ext) => ext.name);
-  const suggestions = extensionNames.filter((name) =>
-    name.startsWith(partialArg),
-  );
-
-  if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
-    suggestions.unshift('--all');
-  }
-
-  return suggestions;
-}
-
-export async function completeExtensionsAndScopes(
-  context: CommandContext,
-  partialArg: string,
-) {
-  const completions = await completeExtensions(context, partialArg);
-  return completions.flatMap((s) => [
-    `${s} --scope user`,
-    `${s} --scope workspace`,
-  ]);
-}
-
 const listExtensionsCommand: SlashCommand = {
   name: 'list',
   get description() {
@@ -436,38 +146,19 @@ const updateExtensionsCommand: SlashCommand = {
   },
   kind: CommandKind.BUILT_IN,
   action: updateAction,
-  completion: completeExtensions,
-};
+  completion: async (context, partialArg) => {
+    const extensions = context.services.config?.getExtensions() ?? [];
+    const extensionNames = extensions.map((ext) => ext.name);
+    const suggestions = extensionNames.filter((name) =>
+      name.startsWith(partialArg),
+    );
 
-const disableCommand: SlashCommand = {
-  name: 'disable',
-  description: 'Disable an extension',
-  kind: CommandKind.BUILT_IN,
-  action: disableAction,
-  completion: completeExtensionsAndScopes,
-};
+    if ('--all'.startsWith(partialArg) || 'all'.startsWith(partialArg)) {
+      suggestions.unshift('--all');
+    }
 
-const enableCommand: SlashCommand = {
-  name: 'enable',
-  description: 'Enable an extension',
-  kind: CommandKind.BUILT_IN,
-  action: enableAction,
-  completion: completeExtensionsAndScopes,
-};
-
-const installCommand: SlashCommand = {
-  name: 'install',
-  description: 'Install an extension from a git repo or local path',
-  kind: CommandKind.BUILT_IN,
-  action: installAction,
-};
-
-const uninstallCommand: SlashCommand = {
-  name: 'uninstall',
-  description: 'Uninstall an extension',
-  kind: CommandKind.BUILT_IN,
-  action: uninstallAction,
-  completion: completeExtensions,
+    return suggestions;
+  },
 };
 
 export const extensionsCommand: SlashCommand = {
@@ -476,14 +167,7 @@ export const extensionsCommand: SlashCommand = {
     return t('Manage extensions');
   },
   kind: CommandKind.BUILT_IN,
-  subCommands: [
-    listExtensionsCommand,
-    updateExtensionsCommand,
-    disableCommand,
-    enableCommand,
-    installCommand,
-    uninstallCommand,
-  ],
+  subCommands: [listExtensionsCommand, updateExtensionsCommand],
   action: (context, args) =>
     // Default to list if no subcommand is provided
     listExtensionsCommand.action!(context, args),

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

@@ -7,7 +7,7 @@
 import type { Mock } from 'vitest';
 import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { memoryCommand } from './memoryCommand.js';
-import type { SlashCommand, CommandContext } from './types.js';
+import type { SlashCommand, type CommandContext } from './types.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import { MessageType } from '../types.js';
 import type { LoadedSettings } from '../../config/settings.js';

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

@@ -15,9 +15,11 @@ import {
 } 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,8 +28,7 @@ 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}>

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/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,46 @@
  * 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 { 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 +52,7 @@ export const Composer = () => {
   );
 
   return (
-    <Box flexDirection="column">
+    <Box flexDirection="column" marginTop={1}>
       {!uiState.embeddedShellFocused && (
         <LoadingIndicator
           thought={
@@ -70,55 +74,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">
@@ -149,6 +104,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 +118,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

@@ -6,7 +6,6 @@
 
 import { Box, Text } from 'ink';
 import { IdeIntegrationNudge } from '../IdeIntegrationNudge.js';
-import { CommandFormatMigrationNudge } from '../CommandFormatMigrationNudge.js';
 import { LoopDetectionConfirmation } from './LoopDetectionConfirmation.js';
 import { FolderTrustDialog } from './FolderTrustDialog.js';
 import { ShellConfirmationDialog } from './ShellConfirmationDialog.js';
@@ -17,6 +16,7 @@ import { QwenOAuthProgress } from './QwenOAuthProgress.js';
 import { AuthDialog } from '../auth/AuthDialog.js';
 import { OpenAIKeyPrompt } from './OpenAIKeyPrompt.js';
 import { EditorSettingsDialog } from './EditorSettingsDialog.js';
+import { WorkspaceMigrationDialog } from './WorkspaceMigrationDialog.js';
 import { PermissionsModifyTrustDialog } from './PermissionsModifyTrustDialog.js';
 import { ModelDialog } from './ModelDialog.js';
 import { ApprovalModeDialog } from './ApprovalModeDialog.js';
@@ -76,6 +76,15 @@ export const DialogManager = ({
   if (uiState.showIdeRestartPrompt) {
     return <IdeTrustChangeDialog reason={uiState.ideTrustRestartReason} />;
   }
+  if (uiState.showWorkspaceMigrationDialog) {
+    return (
+      <WorkspaceMigrationDialog
+        workspaceExtensions={uiState.workspaceExtensions}
+        onOpen={uiActions.onWorkspaceMigrationDialogOpen}
+        onClose={uiActions.onWorkspaceMigrationDialogClose}
+      />
+    );
+  }
   if (uiState.shouldShowIdePrompt) {
     return (
       <IdeIntegrationNudge
@@ -84,14 +93,6 @@ export const DialogManager = ({
       />
     );
   }
-  if (uiState.shouldShowCommandMigrationNudge) {
-    return (
-      <CommandFormatMigrationNudge
-        tomlFiles={uiState.commandMigrationTomlFiles}
-        onComplete={uiActions.handleCommandMigrationComplete}
-      />
-    );
-  }
   if (uiState.isFolderTrustDialogOpen) {
     return (
       <FolderTrustDialog

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,172 @@
 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)
+  const availableInfoPanelWidth = showLogo
+    ? availableTerminalWidth - logoWidth - logoGap
+    : 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) */}
+      <Box
+        flexDirection="column"
+        borderStyle="round"
+        borderColor={theme.border.default}
+        paddingX={infoPanelPaddingX}
+        flexGrow={1}
+      >
+        {/* 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.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.tsx

@@ -52,6 +52,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,6 +99,9 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   setShellModeActive,
   approvalMode,
   onEscapePromptChange,
+  onToggleShortcuts,
+  showShortcuts,
+  onSuggestionsVisibilityChange,
   vimHandleInput,
   isEmbeddedShellFocused,
 }) => {
@@ -338,11 +344,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 +696,8 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
       recentPasteTime,
       commandSearchActive,
       commandSearchCompletion,
+      onToggleShortcuts,
+      showShortcuts,
     ],
   );
 
@@ -689,6 +717,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 +756,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         borderLeft={false}
         borderRight={false}
         borderColor={borderColor}
-        paddingX={1}
       >
         <Text
           color={statusColor ?? theme.text.accent}
@@ -852,7 +886,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/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

@@ -1275,7 +1275,6 @@ describe('SettingsDialog', () => {
         ui: {
           hideWindowTitle: true,
           hideTips: true,
-          showMemoryUsage: true,
           showLineNumbers: true,
           showCitations: true,
           accessibility: {
@@ -1324,7 +1323,6 @@ describe('SettingsDialog', () => {
           disableAutoUpdate: true,
         },
         ui: {
-          showMemoryUsage: true,
           hideWindowTitle: false,
         },
         tools: {
@@ -1375,9 +1373,7 @@ describe('SettingsDialog', () => {
             vimMode: true,
             disableAutoUpdate: false,
           },
-          ui: {
-            showMemoryUsage: true,
-          },
+          ui: {},
         },
       );
       const onSelect = vi.fn();
@@ -1438,7 +1434,6 @@ describe('SettingsDialog', () => {
             disableLoadingPhrases: true,
             screenReader: true,
           },
-          showMemoryUsage: true,
           showLineNumbers: true,
         },
         general: {
@@ -1520,7 +1515,6 @@ describe('SettingsDialog', () => {
         ui: {
           hideWindowTitle: false,
           hideTips: false,
-          showMemoryUsage: false,
           showLineNumbers: false,
           showCitations: false,
           accessibility: {

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>

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/WorkspaceMigrationDialog.tsx

@@ -0,0 +1,119 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { Box, Text } from 'ink';
+import {
+  type Extension,
+  performWorkspaceExtensionMigration,
+} from '../../config/extension.js';
+import { RadioButtonSelect } from './shared/RadioButtonSelect.js';
+import { theme } from '../semantic-colors.js';
+import { useState } from 'react';
+import { useKeypress } from '../hooks/useKeypress.js';
+
+export function WorkspaceMigrationDialog(props: {
+  workspaceExtensions: Extension[];
+  onOpen: () => void;
+  onClose: () => void;
+}) {
+  const { workspaceExtensions, onOpen, onClose } = props;
+  const [migrationComplete, setMigrationComplete] = useState(false);
+  const [failedExtensions, setFailedExtensions] = useState<string[]>([]);
+  onOpen();
+  const onMigrate = async () => {
+    const failed = await performWorkspaceExtensionMigration(
+      workspaceExtensions,
+      // We aren't updating extensions, just moving them around, don't need to ask for consent.
+      async (_) => true,
+    );
+    setFailedExtensions(failed);
+    setMigrationComplete(true);
+  };
+
+  useKeypress(
+    (key) => {
+      if (migrationComplete && key.sequence === 'q') {
+        process.exit(0);
+      }
+    },
+    { isActive: true },
+  );
+
+  if (migrationComplete) {
+    return (
+      <Box
+        flexDirection="column"
+        borderStyle="round"
+        borderColor={theme.border.default}
+        padding={1}
+      >
+        {failedExtensions.length > 0 ? (
+          <>
+            <Text color={theme.text.primary}>
+              The following extensions failed to migrate. Please try installing
+              them manually. To see other changes, Qwen Code must be restarted.
+              Press &apos;q&apos; to quit.
+            </Text>
+            <Box flexDirection="column" marginTop={1} marginLeft={2}>
+              {failedExtensions.map((failed) => (
+                <Text key={failed}>- {failed}</Text>
+              ))}
+            </Box>
+          </>
+        ) : (
+          <Text color={theme.text.primary}>
+            Migration complete. To see changes, Qwen Code must be restarted.
+            Press &apos;q&apos; to quit.
+          </Text>
+        )}
+      </Box>
+    );
+  }
+
+  return (
+    <Box
+      flexDirection="column"
+      borderStyle="round"
+      borderColor={theme.border.default}
+      padding={1}
+    >
+      <Text bold color={theme.text.primary}>
+        Workspace-level extensions are deprecated{'\n'}
+      </Text>
+      <Text color={theme.text.primary}>
+        Would you like to install them at the user level?
+      </Text>
+      <Text color={theme.text.primary}>
+        The extension definition will remain in your workspace directory.
+      </Text>
+      <Text color={theme.text.primary}>
+        If you opt to skip, you can install them manually using the extensions
+        install command.
+      </Text>
+
+      <Box flexDirection="column" marginTop={1} marginLeft={2}>
+        {workspaceExtensions.map((extension) => (
+          <Text key={extension.config.name}>- {extension.config.name}</Text>
+        ))}
+      </Box>
+      <Box marginTop={1}>
+        <RadioButtonSelect
+          items={[
+            { label: 'Install all', value: 'migrate', key: 'migrate' },
+            { label: 'Skip', value: 'skip', key: 'skip' },
+          ]}
+          onSelect={(value: string) => {
+            if (value === 'migrate') {
+              onMigrate();
+            } else {
+              onClose();
+            }
+          }}
+        />
+      </Box>
+    </Box>
+  );
+}

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__/ToolStatsDisplay.test.tsx.snap

@@ -1,85 +1,85 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`<ToolStatsDisplay /> > should display stats for a single tool correctly 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  test-tool                       1         100.0%          100ms   │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                                   1   │
-│   » Accepted:                                                  1   │
-│   » Rejected:                                                  0   │
-│   » Modified:                                                  0   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                 100.0%   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  test-tool                       1         100.0%          100ms                                 │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                                   1                                 │
+│   » Accepted:                                                  1                                 │
+│   » Rejected:                                                  0                                 │
+│   » Modified:                                                  0                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                 100.0%                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should display stats for multiple tools correctly 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  tool-a                          2          50.0%          100ms   │
-│  tool-b                          1         100.0%          100ms   │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                                   3   │
-│   » Accepted:                                                  1   │
-│   » Rejected:                                                  1   │
-│   » Modified:                                                  1   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                  33.3%   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  tool-a                          2          50.0%          100ms                                 │
+│  tool-b                          1         100.0%          100ms                                 │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                                   3                                 │
+│   » Accepted:                                                  1                                 │
+│   » Rejected:                                                  1                                 │
+│   » Modified:                                                  1                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                  33.3%                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should handle large values without wrapping or overlapping 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  long-named-tool-for-testi99999999          88.9%            1ms   │
-│  ng-wrapping-and-such     9                                        │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                           222234566   │
-│   » Accepted:                                          123456789   │
-│   » Rejected:                                           98765432   │
-│   » Modified:                                              12345   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                  55.6%   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  long-named-tool-for-testi99999999          88.9%            1ms                                 │
+│  ng-wrapping-and-such     9                                                                      │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                           222234566                                 │
+│   » Accepted:                                          123456789                                 │
+│   » Rejected:                                           98765432                                 │
+│   » Modified:                                              12345                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                  55.6%                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should handle zero decisions gracefully 1`] = `
-"╭────────────────────────────────────────────────────────────────────╮
-│                                                                    │
-│  Tool Stats For Nerds                                              │
-│                                                                    │
-│  Tool Name                   Calls   Success Rate   Avg Duration   │
-│  ────────────────────────────────────────────────────────────────  │
-│  test-tool                       1         100.0%          100ms   │
-│                                                                    │
-│  User Decision Summary                                             │
-│  Total Reviewed Suggestions:                                   0   │
-│   » Accepted:                                                  0   │
-│   » Rejected:                                                  0   │
-│   » Modified:                                                  0   │
-│  ────────────────────────────────────────────────────────────────  │
-│   Overall Agreement Rate:                                     --   │
-│                                                                    │
-╰────────────────────────────────────────────────────────────────────╯"
+"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
+│                                                                                                  │
+│  Tool Stats For Nerds                                                                            │
+│                                                                                                  │
+│  Tool Name                   Calls   Success Rate   Avg Duration                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│  test-tool                       1         100.0%          100ms                                 │
+│                                                                                                  │
+│  User Decision Summary                                                                           │
+│  Total Reviewed Suggestions:                                   0                                 │
+│   » Accepted:                                                  0                                 │
+│   » Rejected:                                                  0                                 │
+│   » Modified:                                                  0                                 │
+│  ──────────────────────────────────────────────────────────────────────────────────────────────  │
+│   Overall Agreement Rate:                                     --                                 │
+│                                                                                                  │
+╰──────────────────────────────────────────────────────────────────────────────────────────────────╯"
 `;
 
 exports[`<ToolStatsDisplay /> > should render "no tool calls" message when there are no active tools 1`] = `