chore(release): v0.6.0-preview.0

.github/CODEOWNERS

@@ -1,3 +0,0 @@
-* @tanzhenxin @DennisYu07 @gwinthis @LaZzyMan @pomelo-nwu @Mingholy
-# SDK TypeScript package changes require review from Mingholy
-packages/sdk-typescript/** @Mingholy

.github/workflows/release-sdk.yml

@@ -33,10 +33,6 @@ on:
         type: 'boolean'
         default: false
 
-concurrency:
-  group: '${{ github.workflow }}'
-  cancel-in-progress: false
-
 jobs:
   release-sdk:
     runs-on: 'ubuntu-latest'
@@ -50,7 +46,6 @@ jobs:
       packages: 'write'
       id-token: 'write'
       issues: 'write'
-      pull-requests: 'write'
     outputs:
       RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
 
@@ -91,8 +86,6 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
-          registry-url: 'https://registry.npmjs.org'
-          scope: '@qwen-code'
 
       - name: 'Install Dependencies'
         run: |-
@@ -128,14 +121,6 @@ jobs:
           IS_PREVIEW: '${{ steps.vars.outputs.is_preview }}'
           MANUAL_VERSION: '${{ inputs.version }}'
 
-      - name: 'Set SDK package version (local only)'
-        env:
-          RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}'
-        run: |-
-          # Ensure the package version matches the computed release version.
-          # This is required for nightly/preview because npm does not allow re-publishing the same version.
-          npm version -w @qwen-code/sdk "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version
-
       - name: 'Build CLI Bundle'
         run: |
           npm run build
@@ -168,21 +153,7 @@ jobs:
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
 
-      - name: 'Build SDK'
-        working-directory: 'packages/sdk-typescript'
-        run: |-
-          npm run build
-
-      - name: 'Publish @qwen-code/sdk'
-        working-directory: 'packages/sdk-typescript'
-        run: |-
-          npm publish --access public --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
-        env:
-          NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
-
       - name: 'Create and switch to a release branch'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
         id: 'release_branch'
         env:
           RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
@@ -191,22 +162,50 @@ jobs:
           git switch -c "${BRANCH_NAME}"
           echo "BRANCH_NAME=${BRANCH_NAME}" >> "${GITHUB_OUTPUT}"
 
-      - name: 'Commit and Push package version (stable only)'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
+      - name: 'Update package version'
+        working-directory: 'packages/sdk-typescript'
+        env:
+          RELEASE_VERSION: '${{ steps.version.outputs.RELEASE_VERSION }}'
+        run: |-
+          npm version "${RELEASE_VERSION}" --no-git-tag-version --allow-same-version
+
+      - name: 'Commit and Conditionally Push package version'
         env:
           BRANCH_NAME: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
+          IS_DRY_RUN: '${{ steps.vars.outputs.is_dry_run }}'
           RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
         run: |-
-          # Only persist version bumps after a successful publish.
-          git add packages/sdk-typescript/package.json package-lock.json
+          git add packages/sdk-typescript/package.json
           if git diff --staged --quiet; then
             echo "No version changes to commit"
           else
             git commit -m "chore(release): sdk-typescript ${RELEASE_TAG}"
           fi
-          echo "Pushing release branch to remote..."
-          git push --set-upstream origin "${BRANCH_NAME}" --follow-tags
+          if [[ "${IS_DRY_RUN}" == "false" ]]; then
+            echo "Pushing release branch to remote..."
+            git push --set-upstream origin "${BRANCH_NAME}" --follow-tags
+          else
+            echo "Dry run enabled. Skipping push."
+          fi
+
+      - name: 'Build SDK'
+        working-directory: 'packages/sdk-typescript'
+        run: |-
+          npm run build
+
+      - name: 'Configure npm for publishing'
+        uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+          registry-url: 'https://registry.npmjs.org'
+          scope: '@qwen-code'
+
+      - name: 'Publish @qwen-code/sdk'
+        working-directory: 'packages/sdk-typescript'
+        run: |-
+          npm publish --access public --tag=${{ steps.version.outputs.NPM_TAG }} ${{ steps.vars.outputs.is_dry_run == 'true' && '--dry-run' || '' }}
+        env:
+          NODE_AUTH_TOKEN: '${{ secrets.NPM_TOKEN }}'
 
       - name: 'Create GitHub Release and Tag'
         if: |-
@@ -216,57 +215,12 @@ jobs:
           RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
           RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
           PREVIOUS_RELEASE_TAG: '${{ steps.version.outputs.PREVIOUS_RELEASE_TAG }}'
-          IS_NIGHTLY: '${{ steps.vars.outputs.is_nightly }}'
-          IS_PREVIEW: '${{ steps.vars.outputs.is_preview }}'
-          REF: '${{ github.event.inputs.ref || github.sha }}'
         run: |-
-          # For stable releases, use the release branch; for nightly/preview, use the current ref
-          if [[ "${IS_NIGHTLY}" == "true" || "${IS_PREVIEW}" == "true" ]]; then
-            TARGET="${REF}"
-            PRERELEASE_FLAG="--prerelease"
-          else
-            TARGET="${RELEASE_BRANCH}"
-            PRERELEASE_FLAG=""
-          fi
-
           gh release create "sdk-typescript-${RELEASE_TAG}" \
-            --target "${TARGET}" \
+            --target "$RELEASE_BRANCH" \
             --title "SDK TypeScript Release ${RELEASE_TAG}" \
             --notes-start-tag "sdk-typescript-${PREVIOUS_RELEASE_TAG}" \
-            --generate-notes \
-            ${PRERELEASE_FLAG}
-
-      - name: 'Create PR to merge release branch into main'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
-        id: 'pr'
-        env:
-          GITHUB_TOKEN: '${{ secrets.CI_BOT_PAT }}'
-          RELEASE_BRANCH: '${{ steps.release_branch.outputs.BRANCH_NAME }}'
-          RELEASE_TAG: '${{ steps.version.outputs.RELEASE_TAG }}'
-        run: |-
-          set -euo pipefail
-
-          pr_url="$(gh pr list --head "${RELEASE_BRANCH}" --base main --json url --jq '.[0].url')"
-          if [[ -z "${pr_url}" ]]; then
-            pr_url="$(gh pr create \
-              --base main \
-              --head "${RELEASE_BRANCH}" \
-              --title "chore(release): sdk-typescript ${RELEASE_TAG}" \
-              --body "Automated release PR for sdk-typescript ${RELEASE_TAG}.")"
-          fi
-
-          echo "PR_URL=${pr_url}" >> "${GITHUB_OUTPUT}"
-
-      - name: 'Enable auto-merge for release PR'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
-        env:
-          GITHUB_TOKEN: '${{ secrets.CI_BOT_PAT }}'
-          PR_URL: '${{ steps.pr.outputs.PR_URL }}'
-        run: |-
-          set -euo pipefail
-          gh pr merge "${PR_URL}" --merge --auto --delete-branch
+            --generate-notes
 
       - name: 'Create Issue on Failure'
         if: |-

.gitignore

@@ -23,7 +23,6 @@ package-lock.json
 .idea
 *.iml
 .cursor
-.qoder
 
 # OS metadata
 .DS_Store

README.md

@@ -25,7 +25,7 @@ Qwen Code is an open-source AI agent for the terminal, optimized for [Qwen3-Code
 - **OpenAI-compatible, OAuth free tier**: use an OpenAI-compatible API, or sign in with Qwen OAuth to get 2,000 free requests/day.
 - **Open-source, co-evolving**: both the framework and the Qwen3-Coder model are open-source—and they ship and evolve together.
 - **Agentic workflow, feature-rich**: rich built-in tools (Skills, SubAgents, Plan Mode) for a full agentic workflow and a Claude Code-like experience.
-- **Terminal-first, IDE-friendly**: built for developers who live in the command line, with optional integration for VS Code, Zed, and JetBrains IDEs.
+- **Terminal-first, IDE-friendly**: built for developers who live in the command line, with optional integration for VS Code and Zed.
 
 ## Installation
 
@@ -137,11 +137,10 @@ Use `-p` to run Qwen Code without the interactive UI—ideal for scripts, automa
 
 #### IDE integration
 
-Use Qwen Code inside your editor (VS Code, Zed, and JetBrains IDEs):
+Use Qwen Code inside your editor (VS Code and Zed):
 
 - [Use in VS Code](https://qwenlm.github.io/qwen-code-docs/en/users/integration-vscode/)
 - [Use in Zed](https://qwenlm.github.io/qwen-code-docs/en/users/integration-zed/)
-- [Use in JetBrains IDEs](https://qwenlm.github.io/qwen-code-docs/en/users/integration-jetbrains/)
 
 #### TypeScript SDK
 
@@ -192,7 +191,6 @@ See [settings](https://qwenlm.github.io/qwen-code-docs/en/users/configuration/se
 
 Looking for a graphical interface?
 
-- [**AionUi**](https://github.com/iOfficeAI/AionUi) A modern GUI for command-line AI tools including Qwen Code
 - [**Gemini CLI Desktop**](https://github.com/Piebald-AI/gemini-cli-desktop) A cross-platform desktop/web/mobile UI for Qwen Code
 
 ## Troubleshooting
@@ -201,11 +199,6 @@ If you encounter issues, check the [troubleshooting guide](https://qwenlm.github
 
 To report a bug from within the CLI, run `/bug` and include a short title and repro steps.
 
-## Connect with Us
-
-- Discord: https://discord.gg/ycKBjdNd
-- Dingtalk: https://qr.dingtalk.com/action/joingroup?code=v1,k1,+FX6Gf/ZDlTahTIRi8AEQhIaBlqykA0j+eBKKdhLeAE=&_dt_no_comment=1&origin=1
-
 ## Acknowledgments
 
 This project is based on [Google Gemini CLI](https://github.com/google-gemini/gemini-cli). We acknowledge and appreciate the excellent work of the Gemini CLI team. Our main contribution focuses on parser-level adaptations to better support Qwen-Coder models.

docs/developers/_meta.ts

@@ -11,7 +11,6 @@ export default {
     type: 'separator',
   },
   'sdk-typescript': 'Typescript SDK',
-  'sdk-java': 'Java SDK(alpha)',
   'Dive Into Qwen Code': {
     title: 'Dive Into Qwen Code',
     type: 'separator',

docs/developers/extensions/extension.md

@@ -4,25 +4,11 @@ Qwen Code extensions package prompts, MCP servers, and custom commands into a fa
 
 ## Extension management
 
-We offer a suite of extension management tools using both `qwen extensions` CLI commands and `/extensions` slash commands within the interactive CLI.
+We offer a suite of extension management tools using `qwen extensions` commands.
 
-### Runtime Extension Management (Slash Commands)
+Note that these commands are not supported from within the CLI, although you can list installed extensions using the `/extensions list` subcommand.
 
-You can manage extensions at runtime within the interactive CLI using `/extensions` slash commands. These commands support hot-reloading, meaning changes take effect immediately without restarting the application.
-
-| Command                                                | Description                                                     |
-| ------------------------------------------------------ | --------------------------------------------------------------- |
-| `/extensions` or `/extensions list`                    | List all installed extensions with their status                 |
-| `/extensions install <source>`                         | Install an extension from a git URL, local path, or marketplace |
-| `/extensions uninstall <name>`                         | Uninstall an extension                                          |
-| `/extensions enable <name> --scope <user\|workspace>`  | Enable an extension                                             |
-| `/extensions disable <name> --scope <user\|workspace>` | Disable an extension                                            |
-| `/extensions update <name>`                            | Update a specific extension                                     |
-| `/extensions update --all`                             | Update all extensions with available updates                    |
-
-### CLI Extension Management
-
-You can also manage extensions using `qwen extensions` CLI commands. Note that changes made via CLI commands will be reflected in active CLI sessions on restart.
+Note that all of these commands will only be reflected in active CLI sessions on restart.
 
 ### Installing an extension
 
@@ -112,18 +98,7 @@ The `qwen-extension.json` file contains the configuration for the extension. The
     }
   },
   "contextFileName": "QWEN.md",
-  "excludeTools": ["run_shell_command"],
-  "commands": "commands",
-  "skills": "skills",
-  "agents": "agents",
-  "settings": [
-    {
-      "name": "API Key",
-      "description": "Your API key for the service",
-      "envVar": "MY_API_KEY",
-      "sensitive": true
-    }
-  ]
+  "excludeTools": ["run_shell_command"]
 }
 ```
 
@@ -133,18 +108,12 @@ The `qwen-extension.json` file contains the configuration for the extension. The
   - Note that all MCP server configuration options are supported except for `trust`.
 - `contextFileName`: The name of the file that contains the context for the extension. This will be used to load the context from the extension directory. If this property is not used but a `QWEN.md` file is present in your extension directory, then that file will be loaded.
 - `excludeTools`: An array of tool names to exclude from the model. You can also specify command-specific restrictions for tools that support it, like the `run_shell_command` tool. For example, `"excludeTools": ["run_shell_command(rm -rf)"]` will block the `rm -rf` command. Note that this differs from the MCP server `excludeTools` functionality, which can be listed in the MCP server config. **Important:** Tools specified in `excludeTools` will be disabled for the entire conversation context and will affect all subsequent queries in the current session.
-- `commands`: The directory containing custom commands (default: `commands`). Commands are `.md` files that define prompts.
-- `skills`: The directory containing custom skills (default: `skills`). Skills are discovered automatically and become available via the `/skills` command.
-- `agents`: The directory containing custom subagents (default: `agents`). Subagents are `.yaml` or `.md` files that define specialized AI assistants.
-- `settings`: An array of settings that the extension requires. When installing, users will be prompted to provide values for these settings. The values are stored securely and passed to MCP servers as environment variables.
 
 When Qwen Code starts, it loads all the extensions and merges their configurations. If there are any conflicts, the workspace configuration takes precedence.
 
 ### Custom commands
 
-Extensions can provide [custom commands](./cli/commands.md#custom-commands) by placing Markdown files in a `commands/` subdirectory within the extension directory. These commands follow the same format as user and project custom commands and use standard naming conventions.
-
-> **Note:** The command format has been updated from TOML to Markdown. TOML files are deprecated but still supported. You can migrate existing TOML commands using the automatic migration prompt that appears when TOML files are detected.
+Extensions can provide [custom commands](./cli/commands.md#custom-commands) by placing TOML files in a `commands/` subdirectory within the extension directory. These commands follow the same format as user and project custom commands and use standard naming conventions.
 
 **Example**
 
@@ -154,46 +123,15 @@ An extension named `gcp` with the following structure:
 .qwen/extensions/gcp/
 ├── qwen-extension.json
 └── commands/
-    ├── deploy.md
+    ├── deploy.toml
     └── gcs/
-        └── sync.md
+        └── sync.toml
 ```
 
 Would provide these commands:
 
-- `/deploy` - Shows as `[gcp] Custom command from deploy.md` in help
-- `/gcs:sync` - Shows as `[gcp] Custom command from sync.md` in help
-
-### Custom skills
-
-Extensions can provide custom skills by placing skill files in a `skills/` subdirectory within the extension directory. Each skill should have a `SKILL.md` file with YAML frontmatter defining the skill's name and description.
-
-**Example**
-
-```
-.qwen/extensions/my-extension/
-├── qwen-extension.json
-└── skills/
-    └── pdf-processor/
-        └── SKILL.md
-```
-
-The skill will be available via the `/skills` command when the extension is active.
-
-### Custom subagents
-
-Extensions can provide custom subagents by placing agent configuration files in an `agents/` subdirectory within the extension directory. Agents are defined using YAML or Markdown files.
-
-**Example**
-
-```
-.qwen/extensions/my-extension/
-├── qwen-extension.json
-└── agents/
-    └── testing-expert.yaml
-```
-
-Extension subagents appear in the subagent manager dialog under "Extension Agents" section.
+- `/deploy` - Shows as `[gcp] Custom command from deploy.toml` in help
+- `/gcs:sync` - Shows as `[gcp] Custom command from sync.toml` in help
 
 ### Conflict resolution
 

docs/developers/extensions/getting-started-extensions.md

@@ -148,119 +148,22 @@ Custom commands provide a way to create shortcuts for complex prompts. Let's add
     mkdir -p commands/fs
     ```
 
-2.  Create a file named `commands/fs/grep-code.md`:
-
-    ```markdown
-    ---
-    description: Search for a pattern in code and summarize findings
-    ---
+2.  Create a file named `commands/fs/grep-code.toml`:
 
+    ```toml
+    prompt = """
     Please summarize the findings for the pattern `{{args}}`.
 
     Search Results:
     !{grep -r {{args}} .}
+    """
     ```
 
     This command, `/fs:grep-code`, will take an argument, run the `grep` shell command with it, and pipe the results into a prompt for summarization.
 
-> **Note:** Commands use Markdown format with optional YAML frontmatter. TOML format is deprecated but still supported for backwards compatibility.
-
 After saving the file, restart the Qwen Code. You can now run `/fs:grep-code "some pattern"` to use your new command.
 
-## Step 5: Add Custom Skills and Subagents (Optional)
-
-Extensions can also provide custom skills and subagents to extend Qwen Code's capabilities.
-
-### Adding a Custom Skill
-
-Skills are model-invoked capabilities that the AI can automatically use when relevant.
-
-1.  Create a `skills` directory with a skill subdirectory:
-
-    ```bash
-    mkdir -p skills/code-analyzer
-    ```
-
-2.  Create a `skills/code-analyzer/SKILL.md` file:
-
-    ```markdown
-    ---
-    name: code-analyzer
-    description: Analyzes code structure and provides insights about complexity, dependencies, and potential improvements
-    ---
-
-    # Code Analyzer
-
-    ## Instructions
-
-    When analyzing code, focus on:
-
-    - Code complexity and maintainability
-    - Dependencies and coupling
-    - Potential performance issues
-    - Suggestions for improvements
-
-    ## Examples
-
-    - "Analyze the complexity of this function"
-    - "What are the dependencies of this module?"
-    ```
-
-### Adding a Custom Subagent
-
-Subagents are specialized AI assistants for specific tasks.
-
-1.  Create an `agents` directory:
-
-    ```bash
-    mkdir -p agents
-    ```
-
-2.  Create an `agents/refactoring-expert.md` file:
-
-    ```markdown
-    ---
-    name: refactoring-expert
-    description: Specialized in code refactoring, improving code structure and maintainability
-    tools:
-      - read_file
-      - write_file
-      - read_many_files
-    ---
-
-    You are a refactoring specialist focused on improving code quality.
-
-    Your expertise includes:
-
-    - Identifying code smells and anti-patterns
-    - Applying SOLID principles
-    - Improving code readability and maintainability
-    - Safe refactoring with minimal risk
-
-    For each refactoring task:
-
-    1. Analyze the current code structure
-    2. Identify areas for improvement
-    3. Propose refactoring steps
-    4. Implement changes incrementally
-    5. Verify functionality is preserved
-    ```
-
-3.  Update your `qwen-extension.json` to include the new directories:
-
-    ```json
-    {
-      "name": "my-first-extension",
-      "version": "1.0.0",
-      "skills": "skills",
-      "agents": "agents",
-      "mcpServers": { ... }
-    }
-    ```
-
-After restarting Qwen Code, your custom skills will be available via `/skills` and subagents via `/agents manage`.
-
-## Step 6: Add a Custom `QWEN.md`
+## Step 5: Add a Custom `QWEN.md`
 
 You can provide persistent context to the model by adding a `QWEN.md` file to your extension. This is useful for giving the model instructions on how to behave or information about your extension's tools. Note that you may not always need this for extensions built to expose commands and prompts.
 
@@ -291,7 +194,7 @@ You can provide persistent context to the model by adding a `QWEN.md` file to yo
 
 Restart the CLI again. The model will now have the context from your `QWEN.md` file in every session where the extension is active.
 
-## Step 7: Releasing Your Extension
+## Step 6: Releasing Your Extension
 
 Once you are happy with your extension, you can share it with others. The two primary ways of releasing extensions are via a Git repository or through GitHub Releases. Using a public Git repository is the simplest method.
 
@@ -304,7 +207,6 @@ You've successfully created a Qwen Code extension! You learned how to:
 - Bootstrap a new extension from a template.
 - Add custom tools with an MCP server.
 - Create convenient custom commands.
-- Add custom skills and subagents.
 - Provide persistent context to the model.
 - Link your extension for local development.
 

docs/developers/sdk-java.md

@@ -1,312 +0,0 @@
-# Qwen Code Java SDK
-
-The Qwen Code Java SDK is a minimum experimental SDK for programmatic access to Qwen Code functionality. It provides a Java interface to interact with the Qwen Code CLI, allowing developers to integrate Qwen Code capabilities into their Java applications.
-
-## Requirements
-
-- Java >= 1.8
-- Maven >= 3.6.0 (for building from source)
-- qwen-code >= 0.5.0
-
-### Dependencies
-
-- **Logging**: ch.qos.logback:logback-classic
-- **Utilities**: org.apache.commons:commons-lang3
-- **JSON Processing**: com.alibaba.fastjson2:fastjson2
-- **Testing**: JUnit 5 (org.junit.jupiter:junit-jupiter)
-
-## Installation
-
-Add the following dependency to your Maven `pom.xml`:
-
-```xml
-<dependency>
-    <groupId>com.alibaba</groupId>
-    <artifactId>qwencode-sdk</artifactId>
-    <version>{$version}</version>
-</dependency>
-```
-
-Or if using Gradle, add to your `build.gradle`:
-
-```gradle
-implementation 'com.alibaba:qwencode-sdk:{$version}'
-```
-
-## Building and Running
-
-### Build Commands
-
-```bash
-# Compile the project
-mvn compile
-
-# Run tests
-mvn test
-
-# Package the JAR
-mvn package
-
-# Install to local repository
-mvn install
-```
-
-## Quick Start
-
-The simplest way to use the SDK is through the `QwenCodeCli.simpleQuery()` method:
-
-```java
-public static void runSimpleExample() {
-    List<String> result = QwenCodeCli.simpleQuery("hello world");
-    result.forEach(logger::info);
-}
-```
-
-For more advanced usage with custom transport options:
-
-```java
-public static void runTransportOptionsExample() {
-    TransportOptions options = new TransportOptions()
-            .setModel("qwen3-coder-flash")
-            .setPermissionMode(PermissionMode.AUTO_EDIT)
-            .setCwd("./")
-            .setEnv(new HashMap<String, String>() {{put("CUSTOM_VAR", "value");}})
-            .setIncludePartialMessages(true)
-            .setTurnTimeout(new Timeout(120L, TimeUnit.SECONDS))
-            .setMessageTimeout(new Timeout(90L, TimeUnit.SECONDS))
-            .setAllowedTools(Arrays.asList("read_file", "write_file", "list_directory"));
-
-    List<String> result = QwenCodeCli.simpleQuery("who are you, what are your capabilities?", options);
-    result.forEach(logger::info);
-}
-```
-
-For streaming content handling with custom content consumers:
-
-```java
-public static void runStreamingExample() {
-    QwenCodeCli.simpleQuery("who are you, what are your capabilities?",
-            new TransportOptions().setMessageTimeout(new Timeout(10L, TimeUnit.SECONDS)), new AssistantContentSimpleConsumers() {
-
-                @Override
-                public void onText(Session session, TextAssistantContent textAssistantContent) {
-                    logger.info("Text content received: {}", textAssistantContent.getText());
-                }
-
-                @Override
-                public void onThinking(Session session, ThingkingAssistantContent thingkingAssistantContent) {
-                    logger.info("Thinking content received: {}", thingkingAssistantContent.getThinking());
-                }
-
-                @Override
-                public void onToolUse(Session session, ToolUseAssistantContent toolUseContent) {
-                    logger.info("Tool use content received: {} with arguments: {}",
-                            toolUseContent, toolUseContent.getInput());
-                }
-
-                @Override
-                public void onToolResult(Session session, ToolResultAssistantContent toolResultContent) {
-                    logger.info("Tool result content received: {}", toolResultContent.getContent());
-                }
-
-                @Override
-                public void onOtherContent(Session session, AssistantContent<?> other) {
-                    logger.info("Other content received: {}", other);
-                }
-
-                @Override
-                public void onUsage(Session session, AssistantUsage assistantUsage) {
-                    logger.info("Usage information received: Input tokens: {}, Output tokens: {}",
-                            assistantUsage.getUsage().getInputTokens(), assistantUsage.getUsage().getOutputTokens());
-                }
-            }.setDefaultPermissionOperation(Operation.allow));
-    logger.info("Streaming example completed.");
-}
-```
-
-other examples see src/test/java/com/alibaba/qwen/code/cli/example
-
-## Architecture
-
-The SDK follows a layered architecture:
-
-- **API Layer**: Provides the main entry points through `QwenCodeCli` class with simple static methods for basic usage
-- **Session Layer**: Manages communication sessions with the Qwen Code CLI through the `Session` class
-- **Transport Layer**: Handles the communication mechanism between the SDK and CLI process (currently using process transport via `ProcessTransport`)
-- **Protocol Layer**: Defines data structures for communication based on the CLI protocol
-- **Utils**: Common utilities for concurrent execution, timeout handling, and error management
-
-## Key Features
-
-### Permission Modes
-
-The SDK supports different permission modes for controlling tool execution:
-
-- **`default`**: Write tools are denied unless approved via `canUseTool` callback or in `allowedTools`. Read-only tools execute without confirmation.
-- **`plan`**: Blocks all write tools, instructing AI to present a plan first.
-- **`auto-edit`**: Auto-approve edit tools (edit, write_file) while other tools require confirmation.
-- **`yolo`**: All tools execute automatically without confirmation.
-
-### Session Event Consumers and Assistant Content Consumers
-
-The SDK provides two key interfaces for handling events and content from the CLI:
-
-#### SessionEventConsumers Interface
-
-The `SessionEventConsumers` interface provides callbacks for different types of messages during a session:
-
-- `onSystemMessage`: Handles system messages from the CLI (receives Session and SDKSystemMessage)
-- `onResultMessage`: Handles result messages from the CLI (receives Session and SDKResultMessage)
-- `onAssistantMessage`: Handles assistant messages (AI responses) (receives Session and SDKAssistantMessage)
-- `onPartialAssistantMessage`: Handles partial assistant messages during streaming (receives Session and SDKPartialAssistantMessage)
-- `onUserMessage`: Handles user messages (receives Session and SDKUserMessage)
-- `onOtherMessage`: Handles other types of messages (receives Session and String message)
-- `onControlResponse`: Handles control responses (receives Session and CLIControlResponse)
-- `onControlRequest`: Handles control requests (receives Session and CLIControlRequest, returns CLIControlResponse)
-- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlRequest<CLIControlPermissionRequest>, returns Behavior)
-
-#### AssistantContentConsumers Interface
-
-The `AssistantContentConsumers` interface handles different types of content within assistant messages:
-
-- `onText`: Handles text content (receives Session and TextAssistantContent)
-- `onThinking`: Handles thinking content (receives Session and ThingkingAssistantContent)
-- `onToolUse`: Handles tool use content (receives Session and ToolUseAssistantContent)
-- `onToolResult`: Handles tool result content (receives Session and ToolResultAssistantContent)
-- `onOtherContent`: Handles other content types (receives Session and AssistantContent)
-- `onUsage`: Handles usage information (receives Session and AssistantUsage)
-- `onPermissionRequest`: Handles permission requests (receives Session and CLIControlPermissionRequest, returns Behavior)
-- `onOtherControlRequest`: Handles other control requests (receives Session and ControlRequestPayload, returns ControlResponsePayload)
-
-#### Relationship Between the Interfaces
-
-**Important Note on Event Hierarchy:**
-
-- `SessionEventConsumers` is the **high-level** event processor that handles different message types (system, assistant, user, etc.)
-- `AssistantContentConsumers` is the **low-level** content processor that handles different types of content within assistant messages (text, tools, thinking, etc.)
-
-**Processor Relationship:**
-
-- `SessionEventConsumers` → `AssistantContentConsumers` (SessionEventConsumers uses AssistantContentConsumers to process content within assistant messages)
-
-**Event Derivation Relationships:**
-
-- `onAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`, `onUsage`
-- `onPartialAssistantMessage` → `onText`, `onThinking`, `onToolUse`, `onToolResult`, `onOtherContent`
-- `onControlRequest` → `onPermissionRequest`, `onOtherControlRequest`
-
-**Event Timeout Relationships:**
-
-Each event handler method has a corresponding timeout method that allows customizing the timeout behavior for that specific event:
-
-- `onSystemMessage` ↔ `onSystemMessageTimeout`
-- `onResultMessage` ↔ `onResultMessageTimeout`
-- `onAssistantMessage` ↔ `onAssistantMessageTimeout`
-- `onPartialAssistantMessage` ↔ `onPartialAssistantMessageTimeout`
-- `onUserMessage` ↔ `onUserMessageTimeout`
-- `onOtherMessage` ↔ `onOtherMessageTimeout`
-- `onControlResponse` ↔ `onControlResponseTimeout`
-- `onControlRequest` ↔ `onControlRequestTimeout`
-
-For AssistantContentConsumers timeout methods:
-
-- `onText` ↔ `onTextTimeout`
-- `onThinking` ↔ `onThinkingTimeout`
-- `onToolUse` ↔ `onToolUseTimeout`
-- `onToolResult` ↔ `onToolResultTimeout`
-- `onOtherContent` ↔ `onOtherContentTimeout`
-- `onPermissionRequest` ↔ `onPermissionRequestTimeout`
-- `onOtherControlRequest` ↔ `onOtherControlRequestTimeout`
-
-**Default Timeout Values:**
-
-- `SessionEventSimpleConsumers` default timeout: 180 seconds (Timeout.TIMEOUT_180_SECONDS)
-- `AssistantContentSimpleConsumers` default timeout: 60 seconds (Timeout.TIMEOUT_60_SECONDS)
-
-**Timeout Hierarchy Requirements:**
-
-For proper operation, the following timeout relationships should be maintained:
-
-- `onAssistantMessageTimeout` return value should be greater than `onTextTimeout`, `onThinkingTimeout`, `onToolUseTimeout`, `onToolResultTimeout`, and `onOtherContentTimeout` return values
-- `onControlRequestTimeout` return value should be greater than `onPermissionRequestTimeout` and `onOtherControlRequestTimeout` return values
-
-### Transport Options
-
-The `TransportOptions` class allows configuration of how the SDK communicates with the Qwen Code CLI:
-
-- `pathToQwenExecutable`: Path to the Qwen Code CLI executable
-- `cwd`: Working directory for the CLI process
-- `model`: AI model to use for the session
-- `permissionMode`: Permission mode that controls tool execution
-- `env`: Environment variables to pass to the CLI process
-- `maxSessionTurns`: Limits the number of conversation turns in a session
-- `coreTools`: List of core tools that should be available to the AI
-- `excludeTools`: List of tools to exclude from being available to the AI
-- `allowedTools`: List of tools that are pre-approved for use without additional confirmation
-- `authType`: Authentication type to use for the session
-- `includePartialMessages`: Enables receiving partial messages during streaming responses
-- `skillsEnable`: Enables or disables skills functionality for the session
-- `turnTimeout`: Timeout for a complete turn of conversation
-- `messageTimeout`: Timeout for individual messages within a turn
-- `resumeSessionId`: ID of a previous session to resume
-- `otherOptions`: Additional command-line options to pass to the CLI
-
-### Session Control Features
-
-- **Session creation**: Use `QwenCodeCli.newSession()` to create a new session with custom options
-- **Session management**: The `Session` class provides methods to send prompts, handle responses, and manage session state
-- **Session cleanup**: Always close sessions using `session.close()` to properly terminate the CLI process
-- **Session resumption**: Use `setResumeSessionId()` in `TransportOptions` to resume a previous session
-- **Session interruption**: Use `session.interrupt()` to interrupt a currently running prompt
-- **Dynamic model switching**: Use `session.setModel()` to change the model during a session
-- **Dynamic permission mode switching**: Use `session.setPermissionMode()` to change the permission mode during a session
-
-### Thread Pool Configuration
-
-The SDK uses a thread pool for managing concurrent operations with the following default configuration:
-
-- **Core Pool Size**: 30 threads
-- **Maximum Pool Size**: 100 threads
-- **Keep-Alive Time**: 60 seconds
-- **Queue Capacity**: 300 tasks (using LinkedBlockingQueue)
-- **Thread Naming**: "qwen_code_cli-pool-{number}"
-- **Daemon Threads**: false
-- **Rejected Execution Handler**: CallerRunsPolicy
-
-## Error Handling
-
-The SDK provides specific exception types for different error scenarios:
-
-- `SessionControlException`: Thrown when there's an issue with session control (creation, initialization, etc.)
-- `SessionSendPromptException`: Thrown when there's an issue sending a prompt or receiving a response
-- `SessionClosedException`: Thrown when attempting to use a closed session
-
-## FAQ / Troubleshooting
-
-### Q: Do I need to install the Qwen CLI separately?
-
-A: yes, requires Qwen CLI 0.5.5 or higher.
-
-### Q: What Java versions are supported?
-
-A: The SDK requires Java 1.8 or higher.
-
-### Q: How do I handle long-running requests?
-
-A: The SDK includes timeout utilities. You can configure timeouts using the `Timeout` class in `TransportOptions`.
-
-### Q: Why are some tools not executing?
-
-A: This is likely due to permission modes. Check your permission mode settings and consider using `allowedTools` to pre-approve certain tools.
-
-### Q: How do I resume a previous session?
-
-A: Use the `setResumeSessionId()` method in `TransportOptions` to resume a previous session.
-
-### Q: Can I customize the environment for the CLI process?
-
-A: Yes, use the `setEnv()` method in `TransportOptions` to pass environment variables to the CLI process.
-
-## License
-
-Apache-2.0 - see [LICENSE](./LICENSE) for details.

docs/developers/tools/_meta.ts

@@ -10,5 +10,4 @@ export default {
   'web-search': 'Web Search',
   memory: 'Memory',
   'mcp-server': 'MCP Servers',
-  sandbox: 'Sandboxing',
 };

docs/developers/tools/sandbox.md

@@ -1,90 +0,0 @@
-## Customizing the sandbox environment (Docker/Podman)
-
-### Currently, the project does not support the use of the BUILD_SANDBOX function after installation through the npm package
-
-1. To build a custom sandbox, you need to access the build scripts (scripts/build_sandbox.js) in the source code repository.
-2. These build scripts are not included in the packages released by npm.
-3. The code contains hard-coded path checks that explicitly reject build requests from non-source code environments.
-
-If you need extra tools inside the container (e.g., `git`, `python`, `rg`), create a custom Dockerfile, The specific operation is as follows
-
-#### 1、Clone qwen code project first, https://github.com/QwenLM/qwen-code.git
-
-#### 2、Make sure you perform the following operation in the source code repository directory
-
-```bash
-# 1. First, install the dependencies of the project
-npm install
-
-# 2. Build the Qwen Code project
-npm run build
-
-# 3. Verify that the dist directory has been generated
-ls -la packages/cli/dist/
-
-# 4. Create a global link in the CLI package directory
-cd packages/cli
-npm link
-
-# 5. Verification link (it should now point to the source code)
-which qwen
-# Expected output: /xxx/xxx/.nvm/versions/node/v24.11.1/bin/qwen
-# Or similar paths, but it should be a symbolic link
-
-# 6. For details of the symbolic link, you can see the specific source code path
-ls -la $(dirname $(which qwen))/../lib/node_modules/@qwen-code/qwen-code
-# It should show that this is a symbolic link pointing to your source code directory
-
-# 7.Test the version of qwen
-qwen -v
-# npm link will overwrite the global qwen. To avoid being unable to distinguish the same version number, you can uninstall the global CLI first
-```
-
-#### 3、Create your sandbox Dockerfile under the root directory of your own project
-
-- Path: `.qwen/sandbox.Dockerfile`
-
-- Official mirror image address:https://github.com/QwenLM/qwen-code/pkgs/container/qwen-code
-
-```bash
-# Based on the official Qwen sandbox image (It is recommended to explicitly specify the version)
-FROM ghcr.io/qwenlm/qwen-code:sha-570ec43
-# Add your extra tools here
-RUN apt-get update && apt-get install -y \
-    git \
-    python3 \
-    ripgrep
-```
-
-#### 4、Create the first sandbox image under the root directory of your project
-
-```bash
-GEMINI_SANDBOX=docker BUILD_SANDBOX=1 qwen -s
-# Observe whether the sandbox version of the tool you launched is consistent with the version of your custom image. If they are consistent, the startup will be successful
-```
-
-This builds a project-specific image based on the default sandbox image.
-
-#### Remove npm link
-
-- If you want to restore the official CLI of qwen, please remove the npm link
-
-```bash
-# Method 1: Unlink globally
-npm unlink -g @qwen-code/qwen-code
-
-# Method 2: Remove it in the packages/cli directory
-cd packages/cli
-npm unlink
-
-# Verification has been lifted
-which qwen
-# It should display "qwen not found"
-
-# Reinstall the global version if necessary
-npm install -g @qwen-code/qwen-code
-
-# Verification Recovery
-which qwen
-qwen --version
-```

docs/users/_meta.ts

@@ -12,7 +12,6 @@ export default {
   },
   'integration-vscode': 'Visual Studio Code',
   'integration-zed': 'Zed IDE',
-  'integration-jetbrains': 'JetBrains IDEs',
   'integration-github-action': 'Github Actions',
   'Code with Qwen Code': {
     type: 'separator',

docs/users/configuration/auth.md

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

docs/users/configuration/settings.md

@@ -43,7 +43,6 @@ Qwen Code uses JSON settings files for persistent configuration. There are four
 In addition to a project settings file, a project's `.qwen` directory can contain other project-specific files related to Qwen Code's operation, such as:
 
 - [Custom sandbox profiles](../features/sandbox) (e.g. `.qwen/sandbox-macos-custom.sb`, `.qwen/sandbox.Dockerfile`).
-- [Agent Skills](../features/skills) (experimental) under `.qwen/skills/` (each Skill is a directory containing a `SKILL.md`).
 
 ### Available settings in `settings.json`
 
@@ -104,7 +103,7 @@ Settings are organized into categories. All settings should be placed within the
 | `model.name`                                       | string  | The Qwen model to use for conversations.                                                                                                                                                                                                                                                                                                                               | `undefined` |
 | `model.maxSessionTurns`                            | number  | Maximum number of user/model/tool turns to keep in a session. -1 means unlimited.                                                                                                                                                                                                                                                                                      | `-1`        |
 | `model.summarizeToolOutput`                        | object  | Enables or disables the summarization of tool output. You can specify the token budget for the summarization using the `tokenBudget` setting. Note: Currently only the `run_shell_command` tool is supported. For example `{"run_shell_command": {"tokenBudget": 2000}}`                                                                                               | `undefined` |
-| `model.generationConfig`                           | object  | Advanced overrides passed to the underlying content generator. Supports request controls such as `timeout`, `maxRetries`, `disableCacheControl`, and `customHeaders` (custom HTTP headers for API requests), along with fine-tuning knobs under `samplingParams` (for example `temperature`, `top_p`, `max_tokens`). Leave unset to rely on provider defaults.         | `undefined` |
+| `model.generationConfig`                           | object  | Advanced overrides passed to the underlying content generator. Supports request controls such as `timeout`, `maxRetries`, and `disableCacheControl`, along with fine-tuning knobs under `samplingParams` (for example `temperature`, `top_p`, `max_tokens`). Leave unset to rely on provider defaults.                                                                 | `undefined` |
 | `model.chatCompression.contextPercentageThreshold` | number  | Sets the threshold for chat history compression as a percentage of the model's total token limit. This is a value between 0 and 1 that applies to both automatic compression and the manual `/compress` command. For example, a value of `0.6` will trigger compression when the chat history exceeds 60% of the token limit. Use `0` to disable compression entirely. | `0.7`       |
 | `model.skipNextSpeakerCheck`                       | boolean | Skip the next speaker check.                                                                                                                                                                                                                                                                                                                                           | `false`     |
 | `model.skipLoopDetection`                          | boolean | Disables loop detection checks. Loop detection prevents infinite loops in AI responses but can generate false positives that interrupt legitimate workflows. Enable this option if you experience frequent false positive loop detection interruptions.                                                                                                                | `false`     |
@@ -114,16 +113,12 @@ Settings are organized into categories. All settings should be placed within the
 
 **Example model.generationConfig:**
 
-```json
+```
 {
   "model": {
     "generationConfig": {
       "timeout": 60000,
       "disableCacheControl": false,
-      "customHeaders": {
-        "X-Request-ID": "req-123",
-        "X-User-ID": "user-456"
-      },
       "samplingParams": {
         "temperature": 0.2,
         "top_p": 0.8,
@@ -134,113 +129,19 @@ Settings are organized into categories. All settings should be placed within the
 }
 ```
 
-The `customHeaders` field allows you to add custom HTTP headers to all API requests. This is useful for request tracing, monitoring, API gateway routing, or when different models require different headers. If `customHeaders` is defined in `modelProviders[].generationConfig.customHeaders`, it will be used directly; otherwise, headers from `model.generationConfig.customHeaders` will be used. No merging occurs between the two levels.
-
 **model.openAILoggingDir examples:**
 
 - `"~/qwen-logs"` - Logs to `~/qwen-logs` directory
 - `"./custom-logs"` - Logs to `./custom-logs` relative to current directory
 - `"/tmp/openai-logs"` - Logs to absolute path `/tmp/openai-logs`
 
-#### modelProviders
-
-Use `modelProviders` to declare curated model lists per auth type that the `/model` picker can switch between. Keys must be valid auth types (`openai`, `anthropic`, `gemini`, `vertex-ai`, etc.). Each entry requires an `id` and **must include `envKey`**, with optional `name`, `description`, `baseUrl`, and `generationConfig`. Credentials are never persisted in settings; the runtime reads them from `process.env[envKey]`. Qwen OAuth models remain hard-coded and cannot be overridden.
-
-##### Example
-
-```json
-{
-  "modelProviders": {
-    "openai": [
-      {
-        "id": "gpt-4o",
-        "name": "GPT-4o",
-        "envKey": "OPENAI_API_KEY",
-        "baseUrl": "https://api.openai.com/v1",
-        "generationConfig": {
-          "timeout": 60000,
-          "maxRetries": 3,
-          "customHeaders": {
-            "X-Model-Version": "v1.0",
-            "X-Request-Priority": "high"
-          },
-          "samplingParams": { "temperature": 0.2 }
-        }
-      }
-    ],
-    "anthropic": [
-      {
-        "id": "claude-3-5-sonnet",
-        "envKey": "ANTHROPIC_API_KEY",
-        "baseUrl": "https://api.anthropic.com/v1"
-      }
-    ],
-    "gemini": [
-      {
-        "id": "gemini-2.0-flash",
-        "name": "Gemini 2.0 Flash",
-        "envKey": "GEMINI_API_KEY",
-        "baseUrl": "https://generativelanguage.googleapis.com"
-      }
-    ],
-    "vertex-ai": [
-      {
-        "id": "gemini-1.5-pro-vertex",
-        "envKey": "GOOGLE_API_KEY",
-        "baseUrl": "https://generativelanguage.googleapis.com"
-      }
-    ]
-  }
-}
-```
-
-> [!note]
-> Only the `/model` command exposes non-default auth types. Anthropic, Gemini, Vertex AI, etc., must be defined via `modelProviders`. The `/auth` command intentionally lists only the built-in Qwen OAuth and OpenAI flows.
-
-##### Resolution layers and atomicity
-
-The effective auth/model/credential values are chosen per field using the following precedence (first present wins). You can combine `--auth-type` with `--model` to point directly at a provider entry; these CLI flags run before other layers.
-
-| Layer (highest → lowest)   | authType                            | model                                           | apiKey                                              | baseUrl                                              | apiKeyEnvKey           | proxy                             |
-| -------------------------- | ----------------------------------- | ----------------------------------------------- | --------------------------------------------------- | ---------------------------------------------------- | ---------------------- | --------------------------------- |
-| Programmatic overrides     | `/auth `                            | `/auth` input                                   | `/auth` input                                       | `/auth` input                                        | —                      | —                                 |
-| Model provider selection   | —                                   | `modelProvider.id`                              | `env[modelProvider.envKey]`                         | `modelProvider.baseUrl`                              | `modelProvider.envKey` | —                                 |
-| CLI arguments              | `--auth-type`                       | `--model`                                       | `--openaiApiKey` (or provider-specific equivalents) | `--openaiBaseUrl` (or provider-specific equivalents) | —                      | —                                 |
-| Environment variables      | —                                   | Provider-specific mapping (e.g. `OPENAI_MODEL`) | Provider-specific mapping (e.g. `OPENAI_API_KEY`)   | Provider-specific mapping (e.g. `OPENAI_BASE_URL`)   | —                      | —                                 |
-| Settings (`settings.json`) | `security.auth.selectedType`        | `model.name`                                    | `security.auth.apiKey`                              | `security.auth.baseUrl`                              | —                      | —                                 |
-| Default / computed         | Falls back to `AuthType.QWEN_OAUTH` | Built-in default (OpenAI ⇒ `qwen3-coder-plus`)  | —                                                   | —                                                    | —                      | `Config.getProxy()` if configured |
-
-\*When present, CLI auth flags override settings. Otherwise, `security.auth.selectedType` or the implicit default determine the auth type. Qwen OAuth and OpenAI are the only auth types surfaced without extra configuration.
-
-Model-provider sourced values are applied atomically: once a provider model is active, every field it defines is protected from lower layers until you manually clear credentials via `/auth`. The final `generationConfig` is the projection across all layers—lower layers only fill gaps left by higher ones, and the provider layer remains impenetrable.
-
-The merge strategy for `modelProviders` is REPLACE: the entire `modelProviders` from project settings will override the corresponding section in user settings, rather than merging the two.
-
-##### Generation config layering
-
-Per-field precedence for `generationConfig`:
-
-1. Programmatic overrides (e.g. runtime `/model`, `/auth` changes)
-2. `modelProviders[authType][].generationConfig`
-3. `settings.model.generationConfig`
-4. Content-generator defaults (`getDefaultGenerationConfig` for OpenAI, `getParameterValue` for Gemini, etc.)
-
-`samplingParams` and `customHeaders` are both treated atomically; provider values replace the entire object. If `modelProviders[].generationConfig` defines these fields, they are used directly; otherwise, values from `model.generationConfig` are used. No merging occurs between provider and global configuration levels. Defaults from the content generator apply last so each provider retains its tuned baseline.
-
-##### Selection persistence and recommendations
-
-> [!important]
-> Define `modelProviders` in the user-scope `~/.qwen/settings.json` whenever possible and avoid persisting credential overrides in any scope. Keeping the provider catalog in user settings prevents merge/override conflicts between project and user scopes and ensures `/auth` and `/model` updates always write back to a consistent scope.
-
-- `/model` and `/auth` persist `model.name` (where applicable) and `security.auth.selectedType` to the closest writable scope that already defines `modelProviders`; otherwise they fall back to the user scope. This keeps workspace/user files in sync with the active provider catalog.
-- Without `modelProviders`, the resolver mixes CLI/env/settings layers, which is fine for single-provider setups but cumbersome when frequently switching. Define provider catalogs whenever multi-model workflows are common so that switches stay atomic, source-attributed, and debuggable.
-
 #### context
 
 | Setting                                           | Type                       | Description                                                                                                                                                                                                                                                                                                                                                           | Default     |
 | ------------------------------------------------- | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------- |
 | `context.fileName`                                | string or array of strings | The name of the context file(s).                                                                                                                                                                                                                                                                                                                                      | `undefined` |
 | `context.importFormat`                            | string                     | The format to use when importing memory.                                                                                                                                                                                                                                                                                                                              | `undefined` |
+| `context.discoveryMaxDirs`                        | number                     | Maximum number of directories to search for memory.                                                                                                                                                                                                                                                                                                                   | `200`       |
 | `context.includeDirectories`                      | array                      | Additional directories to include in the workspace context. Specifies an array of additional absolute or relative paths to include in the workspace context. Missing directories will be skipped with a warning by default. Paths can use `~` to refer to the user's home directory. This setting can be combined with the `--include-directories` command-line flag. | `[]`        |
 | `context.loadFromIncludeDirectories`              | boolean                    | Controls the behavior of the `/memory refresh` command. If set to `true`, `QWEN.md` files should be loaded from all directories that are added. If set to `false`, `QWEN.md` should only be loaded from the current directory.                                                                                                                                        | `false`     |
 | `context.fileFiltering.respectGitIgnore`          | boolean                    | Respect .gitignore files when searching.                                                                                                                                                                                                                                                                                                                              | `true`      |
@@ -310,12 +211,6 @@ If you are experiencing performance issues with file searching (e.g., with `@` c
 >
 > **Note about advanced.tavilyApiKey:** This is a legacy configuration format. For Qwen OAuth users, DashScope provider is automatically available without any configuration. For other authentication types, configure Tavily or Google providers using the new `webSearch` configuration format.
 
-#### experimental
-
-| Setting               | Type    | Description                      | Default |
-| --------------------- | ------- | -------------------------------- | ------- |
-| `experimental.skills` | boolean | Enable experimental Agent Skills | `false` |
-
 #### mcpServers
 
 Configures connections to one or more Model-Context Protocol (MCP) servers for discovering and using custom tools. Qwen Code attempts to connect to each configured MCP server to discover available tools. If multiple MCP servers expose a tool with the same name, the tool names will be prefixed with the server alias you defined in the configuration (e.g., `serverAlias__actualToolName`) to avoid conflicts. Note that the system might strip certain schema properties from MCP tool definitions for compatibility. At least one of `command`, `url`, or `httpUrl` must be provided. If multiple are specified, the order of precedence is `httpUrl`, then `url`, then `command`.
@@ -485,8 +380,6 @@ Arguments passed directly when running the CLI can override other configurations
 | `--telemetry-otlp-protocol`  |       | Sets the OTLP protocol for telemetry (`grpc` or `http`).                                                                                                                                |                                        | Defaults to `grpc`. See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `--telemetry-log-prompts`    |       | Enables logging of prompts for telemetry.                                                                                                                                               |                                        | See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--checkpointing`            |       | Enables [checkpointing](../features/checkpointing).                                                                                                                                     |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `--acp`                      |       | Enables ACP mode (Agent Client Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                            |                                        | Stable. Replaces the deprecated `--experimental-acp` flag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
-| `--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.                                                                                                                                               |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | `--proxy`                    |       | Sets the proxy for the CLI.                                                                                                                                                             | Proxy URL                              | Example: `--proxy http://localhost:7890`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
@@ -534,13 +427,16 @@ Here's a conceptual example of what a context file at the root of a TypeScript p
 
 This example demonstrates how you can provide general project context, specific coding conventions, and even notes about particular files or components. The more relevant and precise your context files are, the better the AI can assist you. Project-specific context files are highly encouraged to establish conventions and context.
 
-- **Hierarchical Loading and Precedence:** The CLI implements a hierarchical memory system by loading context files (e.g., `QWEN.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
+- **Hierarchical Loading and Precedence:** The CLI implements a sophisticated hierarchical memory system by loading context files (e.g., `QWEN.md`) from several locations. Content from files lower in this list (more specific) typically overrides or supplements content from files higher up (more general). The exact concatenation order and final context can be inspected using the `/memory show` command. The typical loading order is:
   1. **Global Context File:**
      - Location: `~/.qwen/<configured-context-filename>` (e.g., `~/.qwen/QWEN.md` in your user home directory).
      - Scope: Provides default instructions for all your projects.
   2. **Project Root & Ancestors Context Files:**
      - Location: The CLI searches for the configured context file in the current working directory and then in each parent directory up to either the project root (identified by a `.git` folder) or your home directory.
      - Scope: Provides context relevant to the entire project or a significant portion of it.
+  3. **Sub-directory Context Files (Contextual/Local):**
+     - Location: The CLI also scans for the configured context file in subdirectories _below_ the current working directory (respecting common ignore patterns like `node_modules`, `.git`, etc.). The breadth of this search is limited to 200 directories by default, but can be configured with the `context.discoveryMaxDirs` setting in your `settings.json` file.
+     - Scope: Allows for highly specific instructions relevant to a particular component, module, or subsection of your project.
 - **Concatenation & UI Indication:** The contents of all found context files are concatenated (with separators indicating their origin and path) and provided as part of the system prompt. The CLI footer displays the count of loaded context files, giving you a quick visual cue about the active instructional context.
 - **Importing Content:** You can modularize your context files by importing other Markdown files using the `@path/to/file.md` syntax. For more details, see the [Memory Import Processor documentation](../configuration/memory).
 - **Commands for Memory Management:**

docs/users/features/_meta.ts

@@ -1,7 +1,6 @@
 export default {
   commands: 'Commands',
   'sub-agents': 'SubAgents',
-  skills: 'Skills (Experimental)',
   headless: 'Headless Mode',
   checkpointing: {
     display: 'hidden',
@@ -10,5 +9,4 @@ export default {
   mcp: 'MCP',
   'token-caching': 'Token Caching',
   sandbox: 'Sandboxing',
-  language: 'i18n',
 };

docs/users/features/commands.md

@@ -48,7 +48,7 @@ Commands specifically for controlling interface and output language.
 | → `ui [language]`     | Set UI interface language        | `/language ui zh-CN`       |
 | → `output [language]` | Set LLM output language          | `/language output Chinese` |
 
-- Available built-in UI languages: `zh-CN` (Simplified Chinese), `en-US` (English), `ru-RU` (Russian), `de-DE` (German)
+- Available UI languages: `zh-CN` (Simplified Chinese), `en-US` (English)
 - Output language examples: `Chinese`, `English`, `Japanese`, etc.
 
 ### 1.4 Tool and Model Management
@@ -59,7 +59,6 @@ Commands for managing AI tools and models.
 | ---------------- | --------------------------------------------- | --------------------------------------------- |
 | `/mcp`           | List configured MCP servers and tools         | `/mcp`, `/mcp desc`                           |
 | `/tools`         | Display currently available tool list         | `/tools`, `/tools desc`                       |
-| `/skills`        | List and run available skills (experimental)  | `/skills`, `/skills <name>`                   |
 | `/approval-mode` | Change approval mode for tool usage           | `/approval-mode <mode (auto-edit)> --project` |
 | →`plan`          | Analysis only, no execution                   | Secure review                                 |
 | →`default`       | Require approval for edits                    | Daily use                                     |
@@ -73,16 +72,17 @@ Commands for managing AI tools and models.
 
 Commands for obtaining information and performing system settings.
 
-| Command     | Description                                     | Usage Examples                   |
-| ----------- | ----------------------------------------------- | -------------------------------- |
-| `/help`     | Display help information for available commands | `/help` or `/?`                  |
-| `/about`    | Display version information                     | `/about`                         |
-| `/stats`    | Display detailed statistics for current session | `/stats`                         |
-| `/settings` | Open settings editor                            | `/settings`                      |
-| `/auth`     | Change authentication method                    | `/auth`                          |
-| `/bug`      | Submit issue about Qwen Code                    | `/bug Button click unresponsive` |
-| `/copy`     | Copy last output content to clipboard           | `/copy`                          |
-| `/quit`     | Exit Qwen Code immediately                      | `/quit` or `/exit`               |
+| Command         | Description                                     | Usage Examples                                   |
+| --------------- | ----------------------------------------------- | ------------------------------------------------ |
+| `/help`         | Display help information for available commands | `/help` or `/?`                                  |
+| `/about`        | Display version information                     | `/about`                                         |
+| `/stats`        | Display detailed statistics for current session | `/stats`                                         |
+| `/settings`     | Open settings editor                            | `/settings`                                      |
+| `/auth`         | Change authentication method                    | `/auth`                                          |
+| `/bug`          | Submit issue about Qwen Code                    | `/bug Button click unresponsive`                 |
+| `/copy`         | Copy last output content to clipboard           | `/copy`                                          |
+| `/quit-confirm` | Show confirmation dialog before quitting        | `/quit-confirm` (shortcut: press `Ctrl+C` twice) |
+| `/quit`         | Exit Qwen Code immediately                      | `/quit` or `/exit`                               |
 
 ### 1.6 Common Shortcuts
 
@@ -121,8 +121,6 @@ Environment Variables: Commands executed via `!` will set the `QWEN_CODE=1` envi
 
 Save frequently used prompts as shortcut commands to improve work efficiency and ensure consistency.
 
-> **Note:** Custom commands now use Markdown format with optional YAML frontmatter. TOML format is deprecated but still supported for backwards compatibility. When TOML files are detected, an automatic migration prompt will be displayed.
-
 ### Quick Overview
 
 | Function         | Description                                | Advantages                             | Priority | Applicable Scenarios                                 |
@@ -137,34 +135,14 @@ Priority Rules: Project commands > User commands (project command used when name
 
 #### File Path to Command Name Mapping Table
 
-| File Location              | Generated Command | Example Call          |
-| -------------------------- | ----------------- | --------------------- |
-| `~/.qwen/commands/test.md` | `/test`           | `/test Parameter`     |
-| `<project>/git/commit.md`  | `/git:commit`     | `/git:commit Message` |
+| File Location                | Generated Command | Example Call          |
+| ---------------------------- | ----------------- | --------------------- |
+| `~/.qwen/commands/test.toml` | `/test`           | `/test Parameter`     |
+| `<project>/git/commit.toml`  | `/git:commit`     | `/git:commit Message` |
 
 Naming Rules: Path separator (`/` or `\`) converted to colon (`:`)
 
-### Markdown File Format Specification (Recommended)
-
-Custom commands use Markdown files with optional YAML frontmatter:
-
-```markdown
----
-description: Optional description (displayed in /help)
----
-
-Your prompt content here.
-Use {{args}} for parameter injection.
-```
-
-| Field         | Required | Description                              | Example                                    |
-| ------------- | -------- | ---------------------------------------- | ------------------------------------------ |
-| `description` | Optional | Command description (displayed in /help) | `description: Code analysis tool`          |
-| Prompt body   | Required | Prompt content sent to model             | Any Markdown content after the frontmatter |
-
-### TOML File Format (Deprecated)
-
-> **Deprecated:** TOML format is still supported but will be removed in a future version. Please migrate to Markdown format.
+### TOML File Format Specification
 
 | Field         | Required | Description                              | Example                                    |
 | ------------- | -------- | ---------------------------------------- | ------------------------------------------ |
@@ -213,19 +191,15 @@ Use {{args}} for parameter injection.
 
 Example: Git Commit Message Generation
 
-````markdown
----
-description: Generate Commit message based on staged changes
----
-
-Please generate a Commit message based on the following diff:
-
-```diff
-!{git diff --staged}
 ```
-````
-
-````
+# git/commit.toml
+description = "Generate Commit message based on staged changes"
+prompt = """
+Please generate a Commit message based on the following diff:
+diff
+!{git diff --staged}
+"""
+```
 
 #### 4. File Content Injection (`@{...}`)
 
@@ -238,38 +212,36 @@ Please generate a Commit message based on the following diff:
 
 Example: Code Review Command
 
-```markdown
----
-description: Code review based on best practices
----
-
+```
+# review.toml
+description = "Code review based on best practices"
+prompt = """
 Review {{args}}, reference standards:
 
 @{docs/code-standards.md}
-````
+"""
+```
 
 ### Practical Creation Example
 
 #### "Pure Function Refactoring" Command Creation Steps Table
 
-| Operation                     | Command/Code                              |
-| ----------------------------- | ----------------------------------------- |
-| 1. Create directory structure | `mkdir -p ~/.qwen/commands/refactor`      |
-| 2. Create command file        | `touch ~/.qwen/commands/refactor/pure.md` |
-| 3. Edit command content       | Refer to the complete code below.         |
-| 4. Test command               | `@file.js` → `/refactor:pure`             |
+| Operation                     | Command/Code                                |
+| ----------------------------- | ------------------------------------------- |
+| 1. Create directory structure | `mkdir -p ~/.qwen/commands/refactor`        |
+| 2. Create command file        | `touch ~/.qwen/commands/refactor/pure.toml` |
+| 3. Edit command content       | Refer to the complete code below.           |
+| 4. Test command               | `@file.js` → `/refactor:pure`               |
 
-```markdown
----
-description: Refactor code to pure function
----
-
-Please analyze code in current context, refactor to pure function.
-Requirements:
-
-1. Provide refactored code
-2. Explain key changes and pure function characteristic implementation
-3. Maintain function unchanged
+```# ~/.qwen/commands/refactor/pure.toml
+description = "Refactor code to pure function"
+prompt = """
+	Please analyze code in current context, refactor to pure function.
+	Requirements:
+		1. Provide refactored code
+		2. Explain key changes and pure function characteristic implementation
+		3. Maintain function unchanged
+	"""
 ```
 
 ### Custom Command Best Practices Summary

docs/users/features/headless.md

@@ -189,20 +189,19 @@ qwen -p "Write code" --output-format stream-json --include-partial-messages | jq
 
 Key command-line options for headless usage:
 
-| Option                       | Description                                             | Example                                                                  |
-| ---------------------------- | ------------------------------------------------------- | ------------------------------------------------------------------------ |
-| `--prompt`, `-p`             | Run in headless mode                                    | `qwen -p "query"`                                                        |
-| `--output-format`, `-o`      | Specify output format (text, json, stream-json)         | `qwen -p "query" --output-format json`                                   |
-| `--input-format`             | Specify input format (text, stream-json)                | `qwen --input-format text --output-format stream-json`                   |
-| `--include-partial-messages` | Include partial messages in stream-json output          | `qwen -p "query" --output-format stream-json --include-partial-messages` |
-| `--debug`, `-d`              | Enable debug mode                                       | `qwen -p "query" --debug`                                                |
-| `--all-files`, `-a`          | Include all files in context                            | `qwen -p "query" --all-files`                                            |
-| `--include-directories`      | Include additional directories                          | `qwen -p "query" --include-directories src,docs`                         |
-| `--yolo`, `-y`               | Auto-approve all actions                                | `qwen -p "query" --yolo`                                                 |
-| `--approval-mode`            | Set approval mode                                       | `qwen -p "query" --approval-mode auto_edit`                              |
-| `--continue`                 | Resume the most recent session for this project         | `qwen --continue -p "Pick up where we left off"`                         |
-| `--resume [sessionId]`       | Resume a specific session (or choose interactively)     | `qwen --resume 123e... -p "Finish the refactor"`                         |
-| `--experimental-skills`      | Enable experimental Skills (registers the `skill` tool) | `qwen --experimental-skills -p "What Skills are available?"`             |
+| Option                       | Description                                         | Example                                                                  |
+| ---------------------------- | --------------------------------------------------- | ------------------------------------------------------------------------ |
+| `--prompt`, `-p`             | Run in headless mode                                | `qwen -p "query"`                                                        |
+| `--output-format`, `-o`      | Specify output format (text, json, stream-json)     | `qwen -p "query" --output-format json`                                   |
+| `--input-format`             | Specify input format (text, stream-json)            | `qwen --input-format text --output-format stream-json`                   |
+| `--include-partial-messages` | Include partial messages in stream-json output      | `qwen -p "query" --output-format stream-json --include-partial-messages` |
+| `--debug`, `-d`              | Enable debug mode                                   | `qwen -p "query" --debug`                                                |
+| `--all-files`, `-a`          | Include all files in context                        | `qwen -p "query" --all-files`                                            |
+| `--include-directories`      | Include additional directories                      | `qwen -p "query" --include-directories src,docs`                         |
+| `--yolo`, `-y`               | Auto-approve all actions                            | `qwen -p "query" --yolo`                                                 |
+| `--approval-mode`            | Set approval mode                                   | `qwen -p "query" --approval-mode auto_edit`                              |
+| `--continue`                 | Resume the most recent session for this project     | `qwen --continue -p "Pick up where we left off"`                         |
+| `--resume [sessionId]`       | Resume a specific session (or choose interactively) | `qwen --resume 123e... -p "Finish the refactor"`                         |
 
 For complete details on all available configuration options, settings files, and environment variables, see the [Configuration Guide](../configuration/settings).
 

docs/users/features/language.md

@@ -1,136 +0,0 @@
-# Internationalization (i18n) & Language
-
-Qwen Code is built for multilingual workflows: it supports UI localization (i18n/l10n) in the CLI, lets you choose the assistant output language, and allows custom UI language packs.
-
-## Overview
-
-From a user point of view, Qwen Code’s “internationalization” spans multiple layers:
-
-| Capability / Setting     | What it controls                                                       | Where stored                 |
-| ------------------------ | ---------------------------------------------------------------------- | ---------------------------- |
-| `/language ui`           | Terminal UI text (menus, system messages, prompts)                     | `~/.qwen/settings.json`      |
-| `/language output`       | Language the AI responds in (an output preference, not UI translation) | `~/.qwen/output-language.md` |
-| Custom UI language packs | Overrides/extends built-in UI translations                             | `~/.qwen/locales/*.js`       |
-
-## UI Language
-
-This is the CLI’s UI localization layer (i18n/l10n): it controls the language of menus, prompts, and system messages.
-
-### Setting the UI Language
-
-Use the `/language ui` command:
-
-```bash
-/language ui zh-CN    # Chinese
-/language ui en-US    # English
-/language ui ru-RU    # Russian
-/language ui de-DE    # German
-```
-
-Aliases are also supported:
-
-```bash
-/language ui zh       # Chinese
-/language ui en       # English
-/language ui ru       # Russian
-/language ui de       # German
-```
-
-### Auto-detection
-
-On first startup, Qwen Code detects your system locale and sets the UI language automatically.
-
-Detection priority:
-
-1. `QWEN_CODE_LANG` environment variable
-2. `LANG` environment variable
-3. System locale via JavaScript Intl API
-4. Default: English
-
-## LLM Output Language
-
-The LLM output language controls what language the AI assistant responds in, regardless of what language you type your questions in.
-
-### How It Works
-
-The LLM output language is controlled by a rule file at `~/.qwen/output-language.md`. This file is automatically included in the LLM's context during startup, instructing it to respond in the specified language.
-
-### Auto-detection
-
-On first startup, if no `output-language.md` file exists, Qwen Code automatically creates one based on your system locale. For example:
-
-- System locale `zh` creates a rule for Chinese responses
-- System locale `en` creates a rule for English responses
-- System locale `ru` creates a rule for Russian responses
-- System locale `de` creates a rule for German responses
-
-### Manual Setting
-
-Use `/language output <language>` to change:
-
-```bash
-/language output Chinese
-/language output English
-/language output Japanese
-/language output German
-```
-
-Any language name works. The LLM will be instructed to respond in that language.
-
-> [!note]
->
-> After changing the output language, restart Qwen Code for the change to take effect.
-
-### File Location
-
-```
-~/.qwen/output-language.md
-```
-
-## Configuration
-
-### Via Settings Dialog
-
-1. Run `/settings`
-2. Find "Language" under General
-3. Select your preferred UI language
-
-### Via Environment Variable
-
-```bash
-export QWEN_CODE_LANG=zh
-```
-
-This influences auto-detection on first startup (if you haven’t set a UI language and no `output-language.md` file exists yet).
-
-## Custom Language Packs
-
-For UI translations, you can create custom language packs in `~/.qwen/locales/`:
-
-- Example: `~/.qwen/locales/es.js` for Spanish
-- Example: `~/.qwen/locales/fr.js` for French
-
-User directory takes precedence over built-in translations.
-
-> [!tip]
->
-> Contributions are welcome! If you’d like to improve built-in translations or add new languages.
-> For a concrete example, see [PR #1238: feat(i18n): add Russian language support](https://github.com/QwenLM/qwen-code/pull/1238).
-
-### Language Pack Format
-
-```javascript
-// ~/.qwen/locales/es.js
-export default {
-  Hello: 'Hola',
-  Settings: 'Configuracion',
-  // ... more translations
-};
-```
-
-## Related Commands
-
-- `/language` - Show current language settings
-- `/language ui [lang]` - Set UI language
-- `/language output <language>` - Set LLM output language
-- `/settings` - Open settings dialog

docs/users/features/sandbox.md

@@ -49,8 +49,6 @@ Cross-platform sandboxing with complete process isolation.
 
 By default, Qwen Code uses a published sandbox image (configured in the CLI package) and will pull it as needed.
 
-The container sandbox mounts your workspace and your `~/.qwen` directory into the container so auth and settings persist between runs.
-
 **Best for**: Strong isolation on any OS, consistent tooling inside a known image.
 
 ### Choosing a method
@@ -159,13 +157,22 @@ For a working allowlist-style proxy example, see: [Example Proxy Script](/develo
 
 ## Linux UID/GID handling
 
-On Linux, Qwen Code defaults to enabling UID/GID mapping so the sandbox runs as your user (and reuses the mounted `~/.qwen`). Override with:
+The sandbox automatically handles user permissions on Linux. Override these permissions with:
 
 ```bash
 export SANDBOX_SET_UID_GID=true   # Force host UID/GID
 export SANDBOX_SET_UID_GID=false  # Disable UID/GID mapping
 ```
 
+## Customizing the sandbox environment (Docker/Podman)
+
+If you need extra tools inside the container (e.g., `git`, `python`, `rg`), create a custom Dockerfile:
+
+- Path: `.qwen/sandbox.Dockerfile`
+- Then run with: `BUILD_SANDBOX=1 qwen -s ...`
+
+This builds a project-specific image based on the default sandbox image.
+
 ## Troubleshooting
 
 ### Common issues

docs/users/features/skills.md

@@ -1,319 +0,0 @@
-# Agent Skills (Experimental)
-
-> Create, manage, and share Skills to extend Qwen Code’s capabilities.
-
-This guide shows you how to create, use, and manage Agent Skills in **Qwen Code**. Skills are modular capabilities that extend the model’s effectiveness through organized folders containing instructions (and optionally scripts/resources).
-
-> [!note]
->
-> Skills are currently **experimental** and must be enabled with `--experimental-skills`.
-
-## Prerequisites
-
-- Qwen Code (recent version)
-
-## How to enable
-
-### Via CLI flag
-
-```bash
-qwen --experimental-skills
-```
-
-### Via settings.json
-
-Add to your `~/.qwen/settings.json` or project's `.qwen/settings.json`:
-
-```json
-{
-  "tools": {
-    "experimental": {
-      "skills": true
-    }
-  }
-}
-```
-
-- Basic familiarity with Qwen Code ([Quickstart](../quickstart.md))
-
-## What are Agent Skills?
-
-Agent Skills package expertise into discoverable capabilities. Each Skill consists of a `SKILL.md` file with instructions that the model can load when relevant, plus optional supporting files like scripts and templates.
-
-### How Skills are invoked
-
-Skills are **model-invoked** — the model autonomously decides when to use them based on your request and the Skill’s description. This is different from slash commands, which are **user-invoked** (you explicitly type `/command`).
-
-If you want to invoke a Skill explicitly, use the `/skills` slash command:
-
-```bash
-/skills <skill-name>
-```
-
-The `/skills` command is only available when you run with `--experimental-skills`. Use autocomplete to browse available Skills and descriptions.
-
-### Benefits
-
-- Extend Qwen Code for your workflows
-- Share expertise across your team via git
-- Reduce repetitive prompting
-- Compose multiple Skills for complex tasks
-
-## Create a Skill
-
-Skills are stored as directories containing a `SKILL.md` file.
-
-### Personal Skills
-
-Personal Skills are available across all your projects. Store them in `~/.qwen/skills/`:
-
-```bash
-mkdir -p ~/.qwen/skills/my-skill-name
-```
-
-Use personal Skills for:
-
-- Your individual workflows and preferences
-- Experimental Skills you’re developing
-- Personal productivity helpers
-
-### Project Skills
-
-Project Skills are shared with your team. Store them in `.qwen/skills/` within your project:
-
-```bash
-mkdir -p .qwen/skills/my-skill-name
-```
-
-Use project Skills for:
-
-- Team workflows and conventions
-- Project-specific expertise
-- Shared utilities and scripts
-
-Project Skills can be checked into git and automatically become available to teammates.
-
-## Write `SKILL.md`
-
-Create a `SKILL.md` file with YAML frontmatter and Markdown content:
-
-```yaml
----
-name: your-skill-name
-description: Brief description of what this Skill does and when to use it
----
-
-# Your Skill Name
-
-## Instructions
-Provide clear, step-by-step guidance for Qwen Code.
-
-## Examples
-Show concrete examples of using this Skill.
-```
-
-### Field requirements
-
-Qwen Code currently validates that:
-
-- `name` is a non-empty string
-- `description` is a non-empty string
-
-Recommended conventions (not strictly enforced yet):
-
-- Use lowercase letters, numbers, and hyphens in `name`
-- Make `description` specific: include both **what** the Skill does and **when** to use it (key words users will naturally mention)
-
-## Add supporting files
-
-Create additional files alongside `SKILL.md`:
-
-```text
-my-skill/
-├── SKILL.md (required)
-├── reference.md (optional documentation)
-├── examples.md (optional examples)
-├── scripts/
-│   └── helper.py (optional utility)
-└── templates/
-    └── template.txt (optional template)
-```
-
-Reference these files from `SKILL.md`:
-
-````markdown
-For advanced usage, see [reference.md](reference.md).
-
-Run the helper script:
-
-```bash
-python scripts/helper.py input.txt
-```
-````
-
-## View available Skills
-
-When `--experimental-skills` is enabled, Qwen Code discovers Skills from:
-
-- Personal Skills: `~/.qwen/skills/`
-- Project Skills: `.qwen/skills/`
-- Extension Skills: Skills provided by installed extensions
-
-### Extension Skills
-
-Extensions can provide custom skills that become available when the extension is enabled. These skills are stored in the extension's `skills/` directory and follow the same format as personal and project skills.
-
-Extension skills are automatically discovered and loaded when:
-
-- The extension is installed and enabled
-- The `--experimental-skills` flag is enabled
-
-To see which extensions provide skills, check the extension's `qwen-extension.json` file for a `skills` field.
-
-To view available Skills, ask Qwen Code directly:
-
-```text
-What Skills are available?
-```
-
-Or inspect the filesystem:
-
-```bash
-# List personal Skills
-ls ~/.qwen/skills/
-
-# List project Skills (if in a project directory)
-ls .qwen/skills/
-
-# View a specific Skill’s content
-cat ~/.qwen/skills/my-skill/SKILL.md
-```
-
-## Test a Skill
-
-After creating a Skill, test it by asking questions that match your description.
-
-Example: if your description mentions “PDF files”:
-
-```text
-Can you help me extract text from this PDF?
-```
-
-The model autonomously decides to use your Skill if it matches the request — you don’t need to explicitly invoke it.
-
-## Debug a Skill
-
-If Qwen Code doesn’t use your Skill, check these common issues:
-
-### Make the description specific
-
-Too vague:
-
-```yaml
-description: Helps with documents
-```
-
-Specific:
-
-```yaml
-description: Extract text and tables from PDF files, fill forms, merge documents. Use when working with PDFs, forms, or document extraction.
-```
-
-### Verify file path
-
-- Personal Skills: `~/.qwen/skills/<skill-name>/SKILL.md`
-- Project Skills: `.qwen/skills/<skill-name>/SKILL.md`
-
-```bash
-# Personal
-ls ~/.qwen/skills/my-skill/SKILL.md
-
-# Project
-ls .qwen/skills/my-skill/SKILL.md
-```
-
-### Check YAML syntax
-
-Invalid YAML prevents the Skill metadata from loading correctly.
-
-```bash
-cat SKILL.md | head -n 15
-```
-
-Ensure:
-
-- Opening `---` on line 1
-- Closing `---` before Markdown content
-- Valid YAML syntax (no tabs, correct indentation)
-
-### View errors
-
-Run Qwen Code with debug mode to see Skill loading errors:
-
-```bash
-qwen --experimental-skills --debug
-```
-
-## Share Skills with your team
-
-You can share Skills through project repositories:
-
-1. Add the Skill under `.qwen/skills/`
-2. Commit and push
-3. Teammates pull the changes and run with `--experimental-skills`
-
-```bash
-git add .qwen/skills/
-git commit -m "Add team Skill for PDF processing"
-git push
-```
-
-## Update a Skill
-
-Edit `SKILL.md` directly:
-
-```bash
-# Personal Skill
-code ~/.qwen/skills/my-skill/SKILL.md
-
-# Project Skill
-code .qwen/skills/my-skill/SKILL.md
-```
-
-Changes take effect the next time you start Qwen Code. If Qwen Code is already running, restart it to load the updates.
-
-## Remove a Skill
-
-Delete the Skill directory:
-
-```bash
-# Personal
-rm -rf ~/.qwen/skills/my-skill
-
-# Project
-rm -rf .qwen/skills/my-skill
-git commit -m "Remove unused Skill"
-```
-
-## Best practices
-
-### Keep Skills focused
-
-One Skill should address one capability:
-
-- Focused: “PDF form filling”, “Excel analysis”, “Git commit messages”
-- Too broad: “Document processing” (split into smaller Skills)
-
-### Write clear descriptions
-
-Help the model discover when to use Skills by including specific triggers:
-
-```yaml
-description: Analyze Excel spreadsheets, create pivot tables, and generate charts. Use when working with Excel files, spreadsheets, or .xlsx data.
-```
-
-### Test with your team
-
-- Does the Skill activate when expected?
-- Are the instructions clear?
-- Are there missing examples or edge cases?

docs/users/features/sub-agents.md

@@ -6,11 +6,11 @@ Subagents are specialized AI assistants that handle specific types of tasks with
 
 Subagents are independent AI assistants that:
 
-- **Specialize in specific tasks** - Each Subagent is configured with a focused system prompt for particular types of work
-- **Have separate context** - They maintain their own conversation history, separate from your main chat
-- **Use controlled tools** - You can configure which tools each Subagent has access to
-- **Work autonomously** - Once given a task, they work independently until completion or failure
-- **Provide detailed feedback** - You can see their progress, tool usage, and execution statistics in real-time
+- **Specialize in specific tasks** - Each Subagent is configured with a focused system prompt for particular types of work
+- **Have separate context** - They maintain their own conversation history, separate from your main chat
+- **Use controlled tools** - You can configure which tools each Subagent has access to
+- **Work autonomously** - Once given a task, they work independently until completion or failure
+- **Provide detailed feedback** - You can see their progress, tool usage, and execution statistics in real-time
 
 ## Key Benefits
 
@@ -59,7 +59,7 @@ AI: I'll delegate this to your testing specialist Subagents.
 
 ### CLI Commands
 
-Subagents are managed through the `/agents` slash command and its subcommands:
+Subagents are managed through the `/agents` slash command and its subcommands:
 
 **Usage:**：`/agents create`。Creates a new Subagent through a guided step wizard.
 
@@ -67,26 +67,12 @@ Subagents are managed through the `/agents` slash command and its subcommands:
 
 ### Storage Locations
 
-Subagents are stored as Markdown files in multiple locations:
+Subagents are stored as Markdown files in two locations:
 
-- **Project-level**: `.qwen/agents/` (highest precedence)
-- **User-level**: `~/.qwen/agents/` (fallback)
-- **Extension-level**: Provided by installed extensions
+- **Project-level**: `.qwen/agents/` (takes precedence)
+- **User-level**: `~/.qwen/agents/` (fallback)
 
-This allows you to have project-specific agents, personal agents that work across all projects, and extension-provided agents that add specialized capabilities.
-
-### Extension Subagents
-
-Extensions can provide custom subagents that become available when the extension is enabled. These agents are stored in the extension's `agents/` directory and follow the same format as personal and project agents.
-
-Extension subagents:
-
-- Are automatically discovered when the extension is enabled
-- Appear in the `/agents manage` dialog under "Extension Agents" section
-- Cannot be edited directly (edit the extension source instead)
-- Follow the same configuration format as user-defined agents
-
-To see which extensions provide subagents, check the extension's `qwen-extension.json` file for an `agents` field.
+This allows you to have both project-specific agents and personal agents that work across all projects.
 
 ### File Format
 
@@ -412,7 +398,7 @@ description: Helps with testing, documentation, code review, and deployment
 ---
 ```
 
-**Why:** Focused agents produce better results and are easier to maintain.
+**Why:** Focused agents produce better results and are easier to maintain.
 
 #### Clear Specialization
 
@@ -436,7 +422,7 @@ description: Works on frontend development tasks
 ---
 ```
 
-**Why:** Specific expertise leads to more targeted and effective assistance.
+**Why:** Specific expertise leads to more targeted and effective assistance.
 
 #### Actionable Descriptions
 
@@ -454,7 +440,7 @@ description: Reviews code for security vulnerabilities, performance issues, and
 description: A helpful code reviewer
 ```
 
-**Why:** Clear descriptions help the main AI choose the right agent for each task.
+**Why:** Clear descriptions help the main AI choose the right agent for each task.
 
 ### Configuration Best Practices
 

docs/users/integration-jetbrains.md

@@ -1,57 +0,0 @@
-# JetBrains IDEs
-
-> JetBrains IDEs provide native support for AI coding assistants through the Agent Client Protocol (ACP). This integration allows you to use Qwen Code directly within your JetBrains IDE with real-time code suggestions.
-
-### Features
-
-- **Native agent experience**: Integrated AI assistant panel within your JetBrains IDE
-- **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
-
-### Requirements
-
-- JetBrains IDE with ACP support (IntelliJ IDEA, WebStorm, PyCharm, etc.)
-- Qwen Code CLI installed
-
-### Installation
-
-1. Install Qwen Code CLI:
-
-   ```bash
-   npm install -g @qwen-code/qwen-code
-   ```
-
-2. Open your JetBrains IDE and navigate to AI Chat tool window.
-
-3. Click the 3-dot menu in the upper-right corner and select **Configure ACP Agent** and configure Qwen Code with the following settings:
-
-```json
-{
-  "agent_servers": {
-    "qwen": {
-      "command": "/path/to/qwen",
-      "args": ["--acp"],
-      "env": {}
-    }
-  }
-}
-```
-
-4. The Qwen Code agent should now be available in the AI Assistant panel
-
-![Qwen Code in JetBrains AI Chat](https://img.alicdn.com/imgextra/i3/O1CN01ZxYel21y433Ci6eg0_!!6000000006524-2-tps-2774-1494.png)
-
-## Troubleshooting
-
-### Agent not appearing
-
-- Run `qwen --version` in terminal to verify installation
-- Ensure your JetBrains IDE version supports ACP
-- Restart your JetBrains IDE
-
-### Qwen Code not responding
-
-- Check your internet connection
-- Verify CLI works by running `qwen` in terminal
-- [File an issue on GitHub](https://github.com/qwenlm/qwen-code/issues) if the problem persists

docs/users/integration-vscode.md

@@ -18,17 +18,23 @@
 
 ### Requirements
 
-- VS Code 1.85.0 or higher
+- VS Code 1.98.0 or higher
 
 ### Installation
 
-Download and install the extension from the [Visual Studio Code Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion).
+1. Install Qwen Code CLI:
+
+   ```bash
+   npm install -g qwen-code
+   ```
+
+2. Download and install the extension from the [Visual Studio Code Extension Marketplace](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion).
 
 ## Troubleshooting
 
 ### Extension not installing
 
-- Ensure you have VS Code 1.85.0 or higher
+- Ensure you have VS Code 1.98.0 or higher
 - Check that VS Code has permission to install extensions
 - Try installing directly from the Marketplace website
 

docs/users/integration-zed.md

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

docs/users/overview.md

@@ -1,8 +1,5 @@
 # Qwen Code overview
 
-[![@qwen-code/qwen-code downloads](https://img.shields.io/npm/dw/@qwen-code/qwen-code.svg)](https://npm-compare.com/@qwen-code/qwen-code)
-[![@qwen-code/qwen-code version](https://img.shields.io/npm/v/@qwen-code/qwen-code.svg)](https://www.npmjs.com/package/@qwen-code/qwen-code)
-
 > Learn about Qwen Code, Qwen's agentic coding tool that lives in your terminal and helps you turn ideas into code faster than ever before.
 
 ## Get started in 30 seconds
@@ -49,7 +46,7 @@ You'll be prompted to log in on first use. That's it! [Continue with Quickstart
 
 > [!note]
 >
-> **New VS Code Extension (Beta)**: Prefer a graphical interface? Our new **VS Code extension** provides an easy-to-use native IDE experience without requiring terminal familiarity. Simply install from the marketplace and start coding with Qwen Code directly in your sidebar. Download and install the [Qwen Code Companion](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion) now.
+> **New VS Code Extension (Beta)**: Prefer a graphical interface? Our new **VS Code extension** provides an easy-to-use native IDE experience without requiring terminal familiarity. Simply install from the marketplace and start coding with Qwen Code directly in your sidebar. You can search for **Qwen Code** in the VS Code Marketplace and download it.
 
 ## What Qwen Code does for you
 

docs/users/quickstart.md

@@ -159,7 +159,7 @@ Qwen Code will:
 
 ### Test out other common workflows
 
-There are a number of ways to work with Qwen Code:
+There are a number of ways to work with Claude:
 
 **Refactor code**
 

docs/users/support/troubleshooting.md

@@ -9,18 +9,11 @@ This guide provides solutions to common issues and debugging tips, including top
 
 ## Authentication or login errors
 
-- **Error: `UNABLE_TO_GET_ISSUER_CERT_LOCALLY`, `UNABLE_TO_VERIFY_LEAF_SIGNATURE`, or `unable to get local issuer certificate`**
+- **Error: `UNABLE_TO_GET_ISSUER_CERT_LOCALLY` or `unable to get local issuer certificate`**
   - **Cause:** You may be on a corporate network with a firewall that intercepts and inspects SSL/TLS traffic. This often requires a custom root CA certificate to be trusted by Node.js.
   - **Solution:** Set the `NODE_EXTRA_CA_CERTS` environment variable to the absolute path of your corporate root CA certificate file.
     - Example: `export NODE_EXTRA_CA_CERTS=/path/to/your/corporate-ca.crt`
 
-- **Error: `Device authorization flow failed: fetch failed`**
-  - **Cause:** Node.js could not reach Qwen OAuth endpoints (often a proxy or SSL/TLS trust issue). When available, Qwen Code will also print the underlying error cause (for example: `UNABLE_TO_VERIFY_LEAF_SIGNATURE`).
-  - **Solution:**
-    - Confirm you can access `https://chat.qwen.ai` from the same machine/network.
-    - If you are behind a proxy, set it via `qwen --proxy <url>` (or the `proxy` setting in `settings.json`).
-    - If your network uses a corporate TLS inspection CA, set `NODE_EXTRA_CA_CERTS` as described above.
-
 - **Issue: Unable to display UI after authentication failure**
   - **Cause:** If authentication fails after selecting an authentication type, the `security.auth.selectedType` setting may be persisted in `settings.json`. On restart, the CLI may get stuck trying to authenticate with the failed auth type and fail to display the UI.
   - **Solution:** Clear the `security.auth.selectedType` configuration item in your `settings.json` file:

eslint.config.js

@@ -24,8 +24,6 @@ export default tseslint.config(
       '.integration-tests/**',
       'packages/**/.integration-test/**',
       'dist/**',
-      'docs-site/.next/**',
-      'docs-site/out/**',
     ],
   },
   eslint.configs.recommended,

integration-tests/acp-integration.test.ts

@@ -80,11 +80,10 @@ type PermissionHandler = (
 
 /**
  * Sets up an ACP test environment with all necessary utilities.
- * @param useNewFlag - If true, uses --acp; if false, uses --experimental-acp (for backward compatibility testing)
  */
 function setupAcpTest(
   rig: TestRig,
-  options?: { permissionHandler?: PermissionHandler; useNewFlag?: boolean },
+  options?: { permissionHandler?: PermissionHandler },
 ) {
   const pending = new Map<number, PendingRequest>();
   let nextRequestId = 1;
@@ -96,13 +95,9 @@ function setupAcpTest(
   const permissionHandler =
     options?.permissionHandler ?? (() => ({ optionId: 'proceed_once' }));
 
-  // Use --acp by default, but allow testing with --experimental-acp for backward compatibility
-  const acpFlag =
-    options?.useNewFlag !== false ? '--acp' : '--experimental-acp';
-
   const agent = spawn(
     'node',
-    [rig.bundlePath, acpFlag, '--no-chat-recording'],
+    [rig.bundlePath, '--experimental-acp', '--no-chat-recording'],
     {
       cwd: rig.testDir!,
       stdio: ['pipe', 'pipe', 'pipe'],
@@ -311,9 +306,9 @@ function setupAcpTest(
     }
   });
 
-  it('returns modes on initialize and allows setting mode and model', async () => {
+  it('returns modes on initialize and allows setting approval mode', async () => {
     const rig = new TestRig();
-    rig.setup('acp mode and model');
+    rig.setup('acp approval mode');
 
     const { sendRequest, cleanup, stderr } = setupAcpTest(rig);
 
@@ -366,14 +361,8 @@ function setupAcpTest(
       const newSession = (await sendRequest('session/new', {
         cwd: rig.testDir!,
         mcpServers: [],
-      })) as {
-        sessionId: string;
-        models: {
-          availableModels: Array<{ modelId: string }>;
-        };
-      };
+      })) as { sessionId: string };
       expect(newSession.sessionId).toBeTruthy();
-      expect(newSession.models.availableModels.length).toBeGreaterThan(0);
 
       // Test 4: Set approval mode to 'yolo'
       const setModeResult = (await sendRequest('session/set_mode', {
@@ -398,15 +387,6 @@ function setupAcpTest(
       })) as { modeId: string };
       expect(setModeResult3).toBeDefined();
       expect(setModeResult3.modeId).toBe('default');
-
-      // Test 7: Set model using first available model
-      const firstModel = newSession.models.availableModels[0];
-      const setModelResult = (await sendRequest('session/set_model', {
-        sessionId: newSession.sessionId,
-        modelId: firstModel.modelId,
-      })) as { modelId: string };
-      expect(setModelResult).toBeDefined();
-      expect(setModelResult.modelId).toBeTruthy();
     } catch (e) {
       if (stderr.length) {
         console.error('Agent stderr:', stderr.join(''));
@@ -641,99 +621,3 @@ function setupAcpTest(
     }
   });
 });
-
-(IS_SANDBOX ? describe.skip : describe)(
-  'acp flag backward compatibility',
-  () => {
-    it('should work with deprecated --experimental-acp flag and show warning', async () => {
-      const rig = new TestRig();
-      rig.setup('acp backward compatibility');
-
-      const { sendRequest, cleanup, stderr } = setupAcpTest(rig, {
-        useNewFlag: false,
-      });
-
-      try {
-        const initResult = await sendRequest('initialize', {
-          protocolVersion: 1,
-          clientCapabilities: {
-            fs: { readTextFile: true, writeTextFile: true },
-          },
-        });
-        expect(initResult).toBeDefined();
-
-        // Verify deprecation warning is shown
-        const stderrOutput = stderr.join('');
-        expect(stderrOutput).toContain('--experimental-acp is deprecated');
-        expect(stderrOutput).toContain('Please use --acp instead');
-
-        await sendRequest('authenticate', { methodId: 'openai' });
-
-        const newSession = (await sendRequest('session/new', {
-          cwd: rig.testDir!,
-          mcpServers: [],
-        })) as { sessionId: string };
-        expect(newSession.sessionId).toBeTruthy();
-
-        // Verify functionality still works
-        const promptResult = await sendRequest('session/prompt', {
-          sessionId: newSession.sessionId,
-          prompt: [{ type: 'text', text: 'Say hello.' }],
-        });
-        expect(promptResult).toBeDefined();
-      } catch (e) {
-        if (stderr.length) {
-          console.error('Agent stderr:', stderr.join(''));
-        }
-        throw e;
-      } finally {
-        await cleanup();
-      }
-    });
-
-    it('should work with new --acp flag without warnings', async () => {
-      const rig = new TestRig();
-      rig.setup('acp new flag');
-
-      const { sendRequest, cleanup, stderr } = setupAcpTest(rig, {
-        useNewFlag: true,
-      });
-
-      try {
-        const initResult = await sendRequest('initialize', {
-          protocolVersion: 1,
-          clientCapabilities: {
-            fs: { readTextFile: true, writeTextFile: true },
-          },
-        });
-        expect(initResult).toBeDefined();
-
-        // Verify no deprecation warning is shown
-        const stderrOutput = stderr.join('');
-        expect(stderrOutput).not.toContain('--experimental-acp is deprecated');
-
-        await sendRequest('authenticate', { methodId: 'openai' });
-
-        const newSession = (await sendRequest('session/new', {
-          cwd: rig.testDir!,
-          mcpServers: [],
-        })) as { sessionId: string };
-        expect(newSession.sessionId).toBeTruthy();
-
-        // Verify functionality works
-        const promptResult = await sendRequest('session/prompt', {
-          sessionId: newSession.sessionId,
-          prompt: [{ type: 'text', text: 'Say hello.' }],
-        });
-        expect(promptResult).toBeDefined();
-      } catch (e) {
-        if (stderr.length) {
-          console.error('Agent stderr:', stderr.join(''));
-        }
-        throw e;
-      } finally {
-        await cleanup();
-      }
-    });
-  },
-);

integration-tests/file-system.test.ts

@@ -5,6 +5,8 @@
  */
 
 import { describe, it, expect } from 'vitest';
+import { existsSync } from 'node:fs';
+import * as path from 'node:path';
 import { TestRig, printDebugInfo, validateModelOutput } from './test-helper.js';
 
 describe('file-system', () => {
@@ -200,8 +202,8 @@ describe('file-system', () => {
     const readAttempt = toolLogs.find(
       (log) => log.toolRequest.name === 'read_file',
     );
-    const editAttempt = toolLogs.find(
-      (log) => log.toolRequest.name === 'edit_file',
+    const writeAttempt = toolLogs.find(
+      (log) => log.toolRequest.name === 'write_file',
     );
     const successfulReplace = toolLogs.find(
       (log) => log.toolRequest.name === 'replace' && log.toolRequest.success,
@@ -224,15 +226,15 @@ describe('file-system', () => {
 
     // CRITICAL: Verify that no matter what the model did, it never successfully
     // wrote or replaced anything.
-    if (editAttempt) {
+    if (writeAttempt) {
       console.error(
-        'A edit_file attempt was made when no file should be written.',
+        'A write_file attempt was made when no file should be written.',
       );
       printDebugInfo(rig, result);
     }
     expect(
-      editAttempt,
-      'edit_file should not have been called',
+      writeAttempt,
+      'write_file should not have been called',
     ).toBeUndefined();
 
     if (successfulReplace) {
@@ -243,5 +245,12 @@ describe('file-system', () => {
       successfulReplace,
       'A successful replace should not have occurred',
     ).toBeUndefined();
+
+    // Final verification: ensure the file was not created.
+    const filePath = path.join(rig.testDir!, fileName);
+    const fileExists = existsSync(filePath);
+    expect(fileExists, 'The non-existent file should not be created').toBe(
+      false,
+    );
   });
 });

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

@@ -831,7 +831,7 @@ describe('Permission Control (E2E)', () => {
         TEST_TIMEOUT,
       );
 
-      it.skip(
+      it(
         'should execute dangerous commands without confirmation',
         async () => {
           const q = query({
@@ -952,8 +952,7 @@ describe('Permission Control (E2E)', () => {
         TEST_TIMEOUT,
       );
 
-      // FIXME: This test is flaky and sometimes fails with no tool calls.
-      it.skip(
+      it(
         'should allow read-only tools without restrictions',
         async () => {
           // Create test files for the model to read

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

@@ -314,88 +314,4 @@ describe('System Control (E2E)', () => {
       );
     });
   });
-
-  describe('supportedCommands API', () => {
-    it('should return list of supported slash commands', async () => {
-      const sessionId = crypto.randomUUID();
-      const generator = (async function* () {
-        yield {
-          type: 'user',
-          session_id: sessionId,
-          message: { role: 'user', content: 'Hello' },
-          parent_tool_use_id: null,
-        } as SDKUserMessage;
-      })();
-
-      const q = query({
-        prompt: generator,
-        options: {
-          ...SHARED_TEST_OPTIONS,
-          cwd: testDir,
-          model: 'qwen3-max',
-          debug: false,
-        },
-      });
-
-      try {
-        const result = await q.supportedCommands();
-        // Start consuming messages to trigger initialization
-        const messageConsumer = (async () => {
-          try {
-            for await (const _message of q) {
-              // Just consume messages
-            }
-          } catch (error) {
-            // Ignore errors from query being closed
-            if (error instanceof Error && error.message !== 'Query is closed') {
-              throw error;
-            }
-          }
-        })();
-
-        // Verify result structure
-        expect(result).toBeDefined();
-        expect(result).toHaveProperty('commands');
-        expect(Array.isArray(result?.['commands'])).toBe(true);
-
-        const commands = result?.['commands'] as string[];
-
-        // Verify default allowed built-in commands are present
-        expect(commands).toContain('init');
-        expect(commands).toContain('summary');
-        expect(commands).toContain('compress');
-
-        // Verify commands are sorted
-        const sortedCommands = [...commands].sort();
-        expect(commands).toEqual(sortedCommands);
-
-        // Verify all commands are strings
-        commands.forEach((cmd) => {
-          expect(typeof cmd).toBe('string');
-          expect(cmd.length).toBeGreaterThan(0);
-        });
-
-        await q.close();
-        await messageConsumer;
-      } catch (error) {
-        await q.close();
-        throw error;
-      }
-    });
-
-    it('should throw error when supportedCommands is called on closed query', async () => {
-      const q = query({
-        prompt: 'Hello',
-        options: {
-          ...SHARED_TEST_OPTIONS,
-          cwd: testDir,
-          model: 'qwen3-max',
-        },
-      });
-
-      await q.close();
-
-      await expect(q.supportedCommands()).rejects.toThrow('Query is closed');
-    });
-  });
 });

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.7.1",
+  "version": "0.6.0-preview.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.7.1",
+      "version": "0.6.0-preview.0",
       "workspaces": [
         "packages/*"
       ],
@@ -134,36 +134,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@anthropic-ai/sdk": {
-      "version": "0.36.3",
-      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.36.3.tgz",
-      "integrity": "sha512-+c0mMLxL/17yFZ4P5+U6bTWiCSFZUKJddrv01ud2aFBWnTPLdRncYV76D3q1tqfnL7aCnhRtykFnoCFzvr4U3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "^18.11.18",
-        "@types/node-fetch": "^2.6.4",
-        "abort-controller": "^3.0.0",
-        "agentkeepalive": "^4.2.1",
-        "form-data-encoder": "1.7.2",
-        "formdata-node": "^4.3.2",
-        "node-fetch": "^2.6.7"
-      }
-    },
-    "node_modules/@anthropic-ai/sdk/node_modules/@types/node": {
-      "version": "18.19.130",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz",
-      "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@anthropic-ai/sdk/node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "license": "MIT"
-    },
     "node_modules/@asamuzakjp/css-color": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.2.0.tgz",
@@ -3852,16 +3822,6 @@
         "undici-types": "~6.21.0"
       }
     },
-    "node_modules/@types/node-fetch": {
-      "version": "2.6.13",
-      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.13.tgz",
-      "integrity": "sha512-QGpRVpzSaUs30JBSGPjOg4Uveu384erbHBoT1zeONvyCfwQxIkUshLAOqN/k9EjGviPRmWTTe6aH2qySWKTVSw==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "form-data": "^4.0.4"
-      }
-    },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.4",
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
@@ -3875,17 +3835,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",
@@ -4871,6 +4820,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
       "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "event-target-shim": "^5.0.0"
@@ -4957,18 +4907,6 @@
         "node": ">= 14"
       }
     },
-    "node_modules/agentkeepalive": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz",
-      "integrity": "sha512-kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==",
-      "license": "MIT",
-      "dependencies": {
-        "humanize-ms": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -5540,6 +5478,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/atomically": {
@@ -6227,7 +6166,10 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
       "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "readdirp": "^4.0.1"
       },
@@ -6495,6 +6437,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
       "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "delayed-stream": "~1.0.0"
@@ -7120,6 +7063,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
@@ -7632,6 +7576,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
       "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "es-errors": "^1.3.0",
@@ -8161,6 +8106,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
       "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6"
@@ -8706,6 +8652,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
       "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
@@ -8718,16 +8665,11 @@
         "node": ">= 6"
       }
     },
-    "node_modules/form-data-encoder": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.2.tgz",
-      "integrity": "sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A==",
-      "license": "MIT"
-    },
     "node_modules/form-data/node_modules/mime-types": {
       "version": "2.1.35",
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mime-db": "1.52.0"
@@ -8736,28 +8678,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/formdata-node": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/formdata-node/-/formdata-node-4.4.1.tgz",
-      "integrity": "sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ==",
-      "license": "MIT",
-      "dependencies": {
-        "node-domexception": "1.0.0",
-        "web-streams-polyfill": "4.0.0-beta.3"
-      },
-      "engines": {
-        "node": ">= 12.20"
-      }
-    },
-    "node_modules/formdata-node/node_modules/web-streams-polyfill": {
-      "version": "4.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz",
-      "integrity": "sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
     "node_modules/formdata-polyfill": {
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
@@ -9342,6 +9262,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.3"
@@ -9520,15 +9441,6 @@
         "node": ">=16.17.0"
       }
     },
-    "node_modules/humanize-ms": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz",
-      "integrity": "sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.0.0"
-      }
-    },
     "node_modules/husky": {
       "version": "9.1.7",
       "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
@@ -10992,15 +10904,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",
@@ -12037,48 +11940,6 @@
         "node": ">=10.5.0"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "license": "MIT"
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/node-pty": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-pty/-/node-pty-1.0.0.tgz",
@@ -13410,19 +13271,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",
@@ -13912,7 +13760,10 @@
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
       "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": ">= 14.18.0"
       },
@@ -14780,12 +14631,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",
@@ -17349,7 +17194,7 @@
     },
     "packages/cli": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.7.1",
+      "version": "0.6.0-preview.0",
       "dependencies": {
         "@google/genai": "1.30.0",
         "@iarna/toml": "^2.2.5",
@@ -17371,7 +17216,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 +17244,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",
@@ -17988,10 +17831,9 @@
     },
     "packages/core": {
       "name": "@qwen-code/qwen-code-core",
-      "version": "0.7.1",
+      "version": "0.6.0-preview.0",
       "hasInstallScript": true,
       "dependencies": {
-        "@anthropic-ai/sdk": "^0.36.1",
         "@google/genai": "1.30.0",
         "@modelcontextprotocol/sdk": "^1.25.1",
         "@opentelemetry/api": "^1.9.0",
@@ -18009,7 +17851,6 @@
         "ajv-formats": "^3.0.0",
         "async-mutex": "^0.5.0",
         "chardet": "^2.1.0",
-        "chokidar": "^4.0.3",
         "diff": "^7.0.0",
         "dotenv": "^17.1.0",
         "fast-levenshtein": "^2.0.6",
@@ -18629,7 +18470,7 @@
     },
     "packages/sdk-typescript": {
       "name": "@qwen-code/sdk",
-      "version": "0.1.3",
+      "version": "0.6.0-preview.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",
@@ -21449,7 +21290,7 @@
     },
     "packages/test-utils": {
       "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.7.1",
+      "version": "0.6.0-preview.0",
       "dev": true,
       "license": "Apache-2.0",
       "devDependencies": {
@@ -21461,7 +21302,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "qwen-code-vscode-ide-companion",
-      "version": "0.7.1",
+      "version": "0.6.0-preview.0",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.7.1",
+  "version": "0.6.0-preview.0",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/QwenLM/qwen-code.git"
   },
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.7.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-preview.0"
   },
   "scripts": {
     "start": "cross-env node scripts/start.js",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.7.1",
+  "version": "0.6.0-preview.0",
   "description": "Qwen Code",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.7.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-preview.0"
   },
   "dependencies": {
     "@google/genai": "1.30.0",
@@ -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/acp.ts

@@ -70,13 +70,6 @@ export class AgentSideConnection implements Client {
           const validatedParams = schema.setModeRequestSchema.parse(params);
           return agent.setMode(validatedParams);
         }
-        case schema.AGENT_METHODS.session_set_model: {
-          if (!agent.setModel) {
-            throw RequestError.methodNotFound();
-          }
-          const validatedParams = schema.setModelRequestSchema.parse(params);
-          return agent.setModel(validatedParams);
-        }
         default:
           throw RequestError.methodNotFound(method);
       }
@@ -105,14 +98,6 @@ export class AgentSideConnection implements Client {
     );
   }
 
-  /**
-   * Sends a custom notification to the client.
-   * Used for extension-specific notifications that are not part of the core ACP protocol.
-   */
-  async sendCustomNotification<T>(method: string, params: T): Promise<void> {
-    return await this.#connection.sendNotification(method, params);
-  }
-
   /**
    * Request permission before running a tool
    *
@@ -389,7 +374,6 @@ export interface Client {
   ): Promise<schema.RequestPermissionResponse>;
   sessionUpdate(params: schema.SessionNotification): Promise<void>;
   authenticateUpdate(params: schema.AuthenticateUpdate): Promise<void>;
-  sendCustomNotification<T>(method: string, params: T): Promise<void>;
   writeTextFile(
     params: schema.WriteTextFileRequest,
   ): Promise<schema.WriteTextFileResponse>;
@@ -415,5 +399,4 @@ export interface Agent {
   prompt(params: schema.PromptRequest): Promise<schema.PromptResponse>;
   cancel(params: schema.CancelNotification): Promise<void>;
   setMode?(params: schema.SetModeRequest): Promise<schema.SetModeResponse>;
-  setModel?(params: schema.SetModelRequest): Promise<schema.SetModelResponse>;
 }

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

@@ -15,10 +15,10 @@ import {
   qwenOAuth2Events,
   MCPServerConfig,
   SessionService,
+  buildApiHistoryFromConversation,
   type Config,
   type ConversationRecord,
   type DeviceAuthorizationData,
-  tokenLimit,
 } from '@qwen-code/qwen-code-core';
 import type { ApprovalModeValue } from './schema.js';
 import * as acp from './acp.js';
@@ -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,
   ) {}
@@ -160,11 +165,9 @@ class GeminiAgent {
     this.setupFileSystem(config);
 
     const session = await this.createAndStoreSession(config);
-    const availableModels = this.buildAvailableModels(config);
 
     return {
       sessionId: session.getId(),
-      models: availableModels,
     };
   }
 
@@ -191,7 +194,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;
@@ -272,29 +284,15 @@ class GeminiAgent {
   async setMode(params: acp.SetModeRequest): Promise<acp.SetModeResponse> {
     const session = this.sessions.get(params.sessionId);
     if (!session) {
-      throw acp.RequestError.invalidParams(
-        `Session not found for id: ${params.sessionId}`,
-      );
+      throw new Error(`Session not found: ${params.sessionId}`);
     }
     return session.setMode(params);
   }
 
-  async setModel(params: acp.SetModelRequest): Promise<acp.SetModelResponse> {
-    const session = this.sessions.get(params.sessionId);
-    if (!session) {
-      throw acp.RequestError.invalidParams(
-        `Session not found for id: ${params.sessionId}`,
-      );
-    }
-    return session.setModel(params);
-  }
-
   private async ensureAuthenticated(config: Config): Promise<void> {
     const selectedType = this.settings.merged.security?.auth?.selectedType;
     if (!selectedType) {
-      throw acp.RequestError.authRequired(
-        'Use Qwen Code CLI to authenticate first.',
-      );
+      throw acp.RequestError.authRequired('No Selected Type');
     }
 
     try {
@@ -329,20 +327,12 @@ class GeminiAgent {
     const sessionId = config.getSessionId();
     const geminiClient = config.getGeminiClient();
 
-    // Use GeminiClient to manage chat lifecycle properly
-    // This ensures geminiClient.chat is in sync with the session's chat
-    //
-    // Note: When loading a session, config.initialize() has already been called
-    // in newSessionConfig(), which in turn calls geminiClient.initialize().
-    // The GeminiClient.initialize() method checks config.getResumedSessionData()
-    // and automatically loads the conversation history into the chat instance.
-    // So we only need to initialize if it hasn't been done yet.
-    if (!geminiClient.isInitialized()) {
-      await geminiClient.initialize();
-    }
-
-    // Now get the chat instance that's managed by GeminiClient
-    const chat = geminiClient.getChat();
+    const history = conversation
+      ? buildApiHistoryFromConversation(conversation)
+      : undefined;
+    const chat = history
+      ? await geminiClient.startChat(history)
+      : await geminiClient.startChat();
 
     const session = new Session(
       sessionId,
@@ -363,43 +353,4 @@ class GeminiAgent {
 
     return session;
   }
-
-  private buildAvailableModels(
-    config: Config,
-  ): acp.NewSessionResponse['models'] {
-    const currentModelId = (
-      config.getModel() ||
-      this.config.getModel() ||
-      ''
-    ).trim();
-    const availableModels = config.getAvailableModels();
-
-    const mappedAvailableModels = availableModels.map((model) => ({
-      modelId: model.id,
-      name: model.label,
-      description: model.description ?? null,
-      _meta: {
-        contextLimit: tokenLimit(model.id),
-      },
-    }));
-
-    if (
-      currentModelId &&
-      !mappedAvailableModels.some((model) => model.modelId === currentModelId)
-    ) {
-      mappedAvailableModels.unshift({
-        modelId: currentModelId,
-        name: currentModelId,
-        description: null,
-        _meta: {
-          contextLimit: tokenLimit(currentModelId),
-        },
-      });
-    }
-
-    return {
-      currentModelId,
-      availableModels: mappedAvailableModels,
-    };
-  }
 }

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

@@ -15,7 +15,6 @@ export const AGENT_METHODS = {
   session_prompt: 'session/prompt',
   session_list: 'session/list',
   session_set_mode: 'session/set_mode',
-  session_set_model: 'session/set_model',
 };
 
 export const CLIENT_METHODS = {
@@ -94,7 +93,6 @@ export type ModeInfo = z.infer<typeof modeInfoSchema>;
 export type ModesData = z.infer<typeof modesDataSchema>;
 
 export type AgentInfo = z.infer<typeof agentInfoSchema>;
-export type ModelInfo = z.infer<typeof modelInfoSchema>;
 
 export type PromptCapabilities = z.infer<typeof promptCapabilitiesSchema>;
 
@@ -256,38 +254,8 @@ export const authenticateUpdateSchema = z.object({
 
 export type AuthenticateUpdate = z.infer<typeof authenticateUpdateSchema>;
 
-export const acpMetaSchema = z.record(z.unknown()).nullable().optional();
-
-export const modelIdSchema = z.string();
-
-export const modelInfoSchema = z.object({
-  _meta: acpMetaSchema,
-  description: z.string().nullable().optional(),
-  modelId: modelIdSchema,
-  name: z.string(),
-});
-
-export const setModelRequestSchema = z.object({
-  sessionId: z.string(),
-  modelId: z.string(),
-});
-
-export const setModelResponseSchema = z.object({
-  modelId: z.string(),
-});
-
-export type SetModelRequest = z.infer<typeof setModelRequestSchema>;
-export type SetModelResponse = z.infer<typeof setModelResponseSchema>;
-
-export const sessionModelStateSchema = z.object({
-  _meta: acpMetaSchema,
-  availableModels: z.array(modelInfoSchema),
-  currentModelId: modelIdSchema,
-});
-
 export const newSessionResponseSchema = z.object({
   sessionId: z.string(),
-  models: sessionModelStateSchema,
 });
 
 export const loadSessionResponseSchema = z.null();
@@ -546,13 +514,6 @@ export const currentModeUpdateSchema = z.object({
 
 export type CurrentModeUpdate = z.infer<typeof currentModeUpdateSchema>;
 
-export const currentModelUpdateSchema = z.object({
-  sessionUpdate: z.literal('current_model_update'),
-  model: modelInfoSchema,
-});
-
-export type CurrentModelUpdate = z.infer<typeof currentModelUpdateSchema>;
-
 export const sessionUpdateSchema = z.union([
   z.object({
     content: contentBlockSchema,
@@ -594,7 +555,6 @@ export const sessionUpdateSchema = z.union([
     sessionUpdate: z.literal('plan'),
   }),
   currentModeUpdateSchema,
-  currentModelUpdateSchema,
   availableCommandsUpdateSchema,
 ]);
 
@@ -605,7 +565,6 @@ export const agentResponseSchema = z.union([
   promptResponseSchema,
   listSessionsResponseSchema,
   setModeResponseSchema,
-  setModelResponseSchema,
 ]);
 
 export const requestPermissionRequestSchema = z.object({
@@ -638,7 +597,6 @@ export const agentRequestSchema = z.union([
   promptRequestSchema,
   listSessionsRequestSchema,
   setModeRequestSchema,
-  setModelRequestSchema,
 ]);
 
 export const agentNotificationSchema = sessionNotificationSchema;

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

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

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

@@ -41,19 +41,15 @@ import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { z } from 'zod';
 import { getErrorMessage } from '../../utils/errors.js';
-import { normalizePartList } from '../../utils/nonInteractiveHelpers.js';
 import {
   handleSlashCommand,
   getAvailableCommands,
-  type NonInteractiveSlashCommandResult,
 } from '../../nonInteractiveCliCommands.js';
 import type {
   AvailableCommand,
   AvailableCommandsUpdate,
   SetModeRequest,
   SetModeResponse,
-  SetModelRequest,
-  SetModelResponse,
   ApprovalModeValue,
   CurrentModeUpdate,
 } from '../schema.js';
@@ -67,6 +63,12 @@ import { PlanEmitter } from './emitters/PlanEmitter.js';
 import { MessageEmitter } from './emitters/MessageEmitter.js';
 import { SubAgentTracker } from './SubAgentTracker.js';
 
+/**
+ * Built-in commands that are allowed in ACP integration mode.
+ * Only safe, read-only commands that don't require interactive UI.
+ */
+export const ALLOWED_BUILTIN_COMMANDS_FOR_ACP = ['init'];
+
 /**
  * Session represents an active conversation session with the AI model.
  * It uses modular components for consistent event emission:
@@ -165,26 +167,24 @@ export class Session implements SessionContext {
     const firstTextBlock = params.prompt.find((block) => block.type === 'text');
     const inputText = firstTextBlock?.text || '';
 
-    let parts: Part[] | null;
+    let parts: Part[];
 
     if (isSlashCommand(inputText)) {
-      // Handle slash command - uses default allowed commands (init, summary, compress)
+      // Handle slash command - allow specific built-in commands for ACP integration
       const slashCommandResult = await handleSlashCommand(
         inputText,
         pendingSend,
         this.config,
         this.settings,
+        ALLOWED_BUILTIN_COMMANDS_FOR_ACP,
       );
 
-      parts = await this.#processSlashCommandResult(
-        slashCommandResult,
-        params.prompt,
-      );
-
-      // If parts is null, the command was fully handled (e.g., /summary completed)
-      // Return early without sending to the model
-      if (parts === null) {
-        return { stopReason: 'end_turn' };
+      if (slashCommandResult) {
+        // Use the result from the slash command
+        parts = slashCommandResult as Part[];
+      } else {
+        // Slash command didn't return a prompt, continue with normal processing
+        parts = await this.#resolvePrompt(params.prompt, pendingSend.signal);
       }
     } else {
       // Normal processing for non-slash commands
@@ -295,10 +295,11 @@ export class Session implements SessionContext {
   async sendAvailableCommandsUpdate(): Promise<void> {
     const abortController = new AbortController();
     try {
-      // Use default allowed commands from getAvailableCommands
       const slashCommands = await getAvailableCommands(
         this.config,
+        this.settings,
         abortController.signal,
+        ALLOWED_BUILTIN_COMMANDS_FOR_ACP,
       );
 
       // Convert SlashCommand[] to AvailableCommand[] format for ACP protocol
@@ -350,31 +351,6 @@ export class Session implements SessionContext {
     return { modeId: params.modeId };
   }
 
-  /**
-   * Sets the model for the current session.
-   * Validates the model ID and switches the model via Config.
-   */
-  async setModel(params: SetModelRequest): Promise<SetModelResponse> {
-    const modelId = params.modelId.trim();
-
-    if (!modelId) {
-      throw acp.RequestError.invalidParams('modelId cannot be empty');
-    }
-
-    // Attempt to set the model using config
-    await this.config.setModel(modelId, {
-      reason: 'user_request_acp',
-      context: 'session/set_model',
-    });
-
-    // Get updated model info
-    const currentModel = this.config.getModel();
-
-    return {
-      modelId: currentModel,
-    };
-  }
-
   /**
    * Sends a current_mode_update notification to the client.
    * Called after the agent switches modes (e.g., from exit_plan_mode tool).
@@ -671,103 +647,6 @@ export class Session implements SessionContext {
     }
   }
 
-  /**
-   * Processes the result of a slash command execution.
-   *
-   * Supported result types in ACP mode:
-   * - submit_prompt: Submits content to the model
-   * - stream_messages: Streams multiple messages to the client (ACP-specific)
-   * - unsupported: Command cannot be executed in ACP mode
-   * - no_command: No command was found, use original prompt
-   *
-   * Note: 'message' type is not supported in ACP mode - commands should use
-   * 'stream_messages' instead for consistent async handling.
-   *
-   * @param result The result from handleSlashCommand
-   * @param originalPrompt The original prompt blocks
-   * @returns Parts to use for the prompt, or null if command was handled without needing model interaction
-   */
-  async #processSlashCommandResult(
-    result: NonInteractiveSlashCommandResult,
-    originalPrompt: acp.ContentBlock[],
-  ): Promise<Part[] | null> {
-    switch (result.type) {
-      case 'submit_prompt':
-        // Command wants to submit a prompt to the model
-        // Convert PartListUnion to Part[]
-        return normalizePartList(result.content);
-
-      case 'message': {
-        // 'message' type is not ideal for ACP mode, but we handle it for compatibility
-        // by converting it to a stream_messages-like notification
-        await this.client.sendCustomNotification('_qwencode/slash_command', {
-          sessionId: this.sessionId,
-          command: originalPrompt
-            .filter((block) => block.type === 'text')
-            .map((block) => (block.type === 'text' ? block.text : ''))
-            .join(' '),
-          messageType: result.messageType,
-          message: result.content || '',
-        });
-
-        if (result.messageType === 'error') {
-          // Throw error to stop execution
-          throw new Error(result.content || 'Slash command failed.');
-        }
-        // For info messages, return null to indicate command was handled
-        return null;
-      }
-
-      case 'stream_messages': {
-        // Command returns multiple messages via async generator (ACP-preferred)
-        const command = originalPrompt
-          .filter((block) => block.type === 'text')
-          .map((block) => (block.type === 'text' ? block.text : ''))
-          .join(' ');
-
-        // Stream all messages to the client
-        for await (const msg of result.messages) {
-          await this.client.sendCustomNotification('_qwencode/slash_command', {
-            sessionId: this.sessionId,
-            command,
-            messageType: msg.messageType,
-            message: msg.content,
-          });
-
-          // If we encounter an error message, throw after sending
-          if (msg.messageType === 'error') {
-            throw new Error(msg.content || 'Slash command failed.');
-          }
-        }
-
-        // All messages sent successfully, return null to indicate command was handled
-        return null;
-      }
-
-      case 'unsupported': {
-        // Command returned an unsupported result type
-        const unsupportedError = `Slash command not supported in ACP integration: ${result.reason}`;
-        throw new Error(unsupportedError);
-      }
-
-      case 'no_command':
-        // No command was found or executed, use original prompt
-        return originalPrompt.map((block) => {
-          if (block.type === 'text') {
-            return { text: block.text };
-          }
-          throw new Error(`Unsupported block type: ${block.type}`);
-        });
-
-      default: {
-        // Exhaustiveness check
-        const _exhaustive: never = result;
-        const unknownError = `Unknown slash command result type: ${(_exhaustive as NonInteractiveSlashCommandResult).type}`;
-        throw new Error(unknownError);
-      }
-    }
-  }
-
   async #resolvePrompt(
     message: acp.ContentBlock[],
     abortSignal: AbortSignal,

packages/cli/src/commands/extensions.test.tsx

@@ -1,106 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { extensionsCommand } from './extensions.js';
-import { updateCommand } from './extensions/update.js';
-import { disableCommand } from './extensions/disable.js';
-import { enableCommand } from './extensions/enable.js';
-import { linkCommand } from './extensions/link.js';
-import { newCommand } from './extensions/new.js';
-import yargs from 'yargs';
-
-describe('extensions command', () => {
-  it('should have correct command name', () => {
-    expect(extensionsCommand.command).toBe('extensions <command>');
-  });
-
-  it('should have a description', () => {
-    expect(extensionsCommand.describe).toBe('Manage Qwen Code extensions.');
-  });
-
-  it('should require a subcommand', () => {
-    const parser = yargs([])
-      .command(extensionsCommand)
-      .fail(false)
-      .locale('en');
-
-    expect(() => parser.parse('extensions')).toThrow();
-  });
-
-  it('should register install subcommand', () => {
-    const parser = yargs([])
-      .command(extensionsCommand)
-      .fail(false)
-      .locale('en');
-
-    // This should throw as 'install' requires a source argument
-    expect(() => parser.parse('extensions install')).toThrow(
-      'Not enough non-option arguments',
-    );
-  });
-
-  it('should register uninstall subcommand', () => {
-    const parser = yargs([])
-      .command(extensionsCommand)
-      .fail(false)
-      .locale('en');
-
-    expect(() => parser.parse('extensions uninstall')).toThrow(
-      'Not enough non-option arguments',
-    );
-  });
-
-  it('should register list subcommand', () => {
-    const parser = yargs([])
-      .command(extensionsCommand)
-      .fail(false)
-      .locale('en');
-
-    // list doesn't require arguments, so it should not throw
-    expect(() => parser.parse('extensions list')).not.toThrow();
-  });
-
-  it('should register update subcommand', () => {
-    const parser = yargs([]).command(updateCommand).fail(false).locale('en');
-
-    expect(() => parser.parse('update')).toThrow(
-      'Either an extension name or --all must be provided',
-    );
-  });
-
-  it('should register disable subcommand', () => {
-    const parser = yargs([]).command(disableCommand).fail(false).locale('en');
-
-    expect(() => parser.parse('disable')).toThrow(
-      'Not enough non-option arguments',
-    );
-  });
-
-  it('should register enable subcommand', () => {
-    const parser = yargs([]).command(enableCommand).fail(false).locale('en');
-
-    expect(() => parser.parse('enable')).toThrow(
-      'Not enough non-option arguments',
-    );
-  });
-
-  it('should register link subcommand', () => {
-    const parser = yargs([]).command(linkCommand).fail(false).locale('en');
-
-    expect(() => parser.parse('link')).toThrow(
-      'Not enough non-option arguments',
-    );
-  });
-
-  it('should register new subcommand', async () => {
-    const parser = yargs([]).command(newCommand).fail(false).locale('en');
-
-    await expect(parser.parseAsync('new')).rejects.toThrow(
-      'Not enough non-option arguments',
-    );
-  });
-});

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

@@ -1,273 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { extensionConsentString, requestConsentOrFail } from './consent.js';
-import type { ExtensionConfig } from '@qwen-code/qwen-code-core';
-
-vi.mock('../../i18n/index.js', () => ({
-  t: vi.fn((str: string, params?: Record<string, string>) => {
-    if (params) {
-      return Object.entries(params).reduce(
-        (acc, [key, value]) => acc.replace(`{{${key}}}`, value),
-        str,
-      );
-    }
-    return str;
-  }),
-}));
-
-describe('extensionConsentString', () => {
-  it('should include extension name', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain('Installing extension "test-extension".');
-  });
-
-  it('should include warning message', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain('Extensions may introduce unexpected behavior');
-  });
-
-  it('should include MCP servers when present', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-      mcpServers: {
-        'test-server': {
-          command: 'node',
-          args: ['server.js'],
-        },
-      },
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain(
-      'This extension will run the following MCP servers',
-    );
-    expect(result).toContain('test-server');
-    expect(result).toContain('local');
-    expect(result).toContain('node server.js');
-  });
-
-  it('should include remote MCP servers', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-      mcpServers: {
-        'remote-server': {
-          httpUrl: 'https://example.com/mcp',
-        },
-      },
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain('remote');
-    expect(result).toContain('https://example.com/mcp');
-  });
-
-  it('should include commands when present', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-    };
-
-    const result = extensionConsentString(config, ['command1', 'command2']);
-
-    expect(result).toContain('This extension will add the following commands');
-    expect(result).toContain('command1, command2');
-  });
-
-  it('should include context file name when present (string)', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-      contextFileName: 'CUSTOM.md',
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain('CUSTOM.md');
-  });
-
-  it('should include context file name when present (array)', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-      contextFileName: ['FILE1.md', 'FILE2.md'],
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain('FILE1.md, FILE2.md');
-  });
-
-  it('should include excluded tools when present', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-      excludeTools: ['tool1', 'tool2'],
-    };
-
-    const result = extensionConsentString(config);
-
-    expect(result).toContain(
-      'This extension will exclude the following core tools',
-    );
-    expect(result).toContain('tool1, tool2');
-  });
-
-  it('should include skills when present', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-    };
-
-    const result = extensionConsentString(
-      config,
-      [],
-      [
-        {
-          name: 'skill1',
-          description: 'Skill 1 description',
-          level: 'extension',
-          filePath: '/test/skill1',
-          body: 'skill body',
-        },
-        {
-          name: 'skill2',
-          description: 'Skill 2 description',
-          level: 'extension',
-          filePath: '/test/skill2',
-          body: 'skill body',
-        },
-      ],
-    );
-
-    expect(result).toContain(
-      'This extension will install the following skills',
-    );
-    expect(result).toContain('skill1');
-    expect(result).toContain('Skill 1 description');
-  });
-
-  it('should include subagents when present', () => {
-    const config: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-    };
-
-    const result = extensionConsentString(
-      config,
-      [],
-      [],
-      [
-        {
-          name: 'agent1',
-          description: 'Agent 1 description',
-          systemPrompt: 'You are agent1',
-          level: 'extension',
-        },
-      ],
-    );
-
-    expect(result).toContain(
-      'This extension will install the following subagents',
-    );
-    expect(result).toContain('agent1');
-    expect(result).toContain('Agent 1 description');
-  });
-});
-
-describe('requestConsentOrFail', () => {
-  let mockRequestConsent: ReturnType<typeof vi.fn>;
-
-  beforeEach(() => {
-    mockRequestConsent = vi.fn();
-    vi.clearAllMocks();
-  });
-
-  it('should do nothing when options is undefined', async () => {
-    await requestConsentOrFail(mockRequestConsent, undefined);
-
-    expect(mockRequestConsent).not.toHaveBeenCalled();
-  });
-
-  it('should request consent for new extension', async () => {
-    mockRequestConsent.mockResolvedValueOnce(true);
-
-    await requestConsentOrFail(mockRequestConsent, {
-      extensionConfig: { name: 'test-extension', version: '1.0.0' },
-    });
-
-    expect(mockRequestConsent).toHaveBeenCalled();
-  });
-
-  it('should throw error when user declines consent', async () => {
-    mockRequestConsent.mockResolvedValueOnce(false);
-
-    await expect(
-      requestConsentOrFail(mockRequestConsent, {
-        extensionConfig: { name: 'test-extension', version: '1.0.0' },
-      }),
-    ).rejects.toThrow('Installation cancelled for "test-extension".');
-  });
-
-  it('should skip consent when consent string is unchanged', async () => {
-    const extensionConfig: ExtensionConfig = {
-      name: 'test-extension',
-      version: '1.0.0',
-    };
-
-    await requestConsentOrFail(mockRequestConsent, {
-      extensionConfig,
-      previousExtensionConfig: extensionConfig,
-    });
-
-    expect(mockRequestConsent).not.toHaveBeenCalled();
-  });
-
-  it('should request consent when consent string changes', async () => {
-    mockRequestConsent.mockResolvedValueOnce(true);
-
-    await requestConsentOrFail(mockRequestConsent, {
-      extensionConfig: {
-        name: 'test-extension',
-        version: '1.0.0',
-        excludeTools: ['tool1'],
-      },
-      previousExtensionConfig: { name: 'test-extension', version: '1.0.0' },
-    });
-
-    expect(mockRequestConsent).toHaveBeenCalled();
-  });
-
-  it('should request consent when commands change', async () => {
-    mockRequestConsent.mockResolvedValueOnce(true);
-
-    await requestConsentOrFail(mockRequestConsent, {
-      extensionConfig: { name: 'test-extension', version: '1.0.0' },
-      commands: ['command1'],
-      previousExtensionConfig: { name: 'test-extension', version: '1.0.0' },
-      previousCommands: [],
-    });
-
-    expect(mockRequestConsent).toHaveBeenCalled();
-  });
-});

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

@@ -1,218 +0,0 @@
-import type {
-  ExtensionConfig,
-  ExtensionRequestOptions,
-  SkillConfig,
-  SubagentConfig,
-} from '@qwen-code/qwen-code-core';
-import type { ConfirmationRequest } from '../../ui/types.js';
-import chalk from 'chalk';
-import { t } from '../../i18n/index.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(
-    t('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\n' + t('Do 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);
-      },
-    });
-  });
-}
-
-/**
- * Builds a consent string for installing an extension based on it's
- * extensionConfig.
- */
-export function extensionConsentString(
-  extensionConfig: ExtensionConfig,
-  commands: string[] = [],
-  skills: SkillConfig[] = [],
-  subagents: SubagentConfig[] = [],
-): string {
-  const output: string[] = [];
-  const mcpServerEntries = Object.entries(extensionConfig.mcpServers || {});
-  output.push(
-    t('Installing extension "{{name}}".', { name: extensionConfig.name }),
-  );
-  output.push(
-    t(
-      '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**',
-    ),
-  );
-
-  if (mcpServerEntries.length) {
-    output.push(t('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 ? t('local') : t('remote')}): ${source}`,
-      );
-    }
-  }
-  if (commands && commands.length > 0) {
-    output.push(
-      t('This extension will add the following commands: {{commands}}.', {
-        commands: commands.join(', '),
-      }),
-    );
-  }
-  if (extensionConfig.contextFileName) {
-    const fileName = Array.isArray(extensionConfig.contextFileName)
-      ? extensionConfig.contextFileName.join(', ')
-      : extensionConfig.contextFileName;
-    output.push(
-      t(
-        'This extension will append info to your QWEN.md context using {{fileName}}',
-        { fileName },
-      ),
-    );
-  }
-  if (extensionConfig.excludeTools) {
-    output.push(
-      t('This extension will exclude the following core tools: {{tools}}', {
-        tools: extensionConfig.excludeTools.join(', '),
-      }),
-    );
-  }
-  if (skills.length > 0) {
-    output.push(t('This extension will install the following skills:'));
-    for (const skill of skills) {
-      output.push(`  * ${chalk.bold(skill.name)}: ${skill.description}`);
-    }
-  }
-  if (subagents.length > 0) {
-    output.push(t('This extension will install the following subagents:'));
-    for (const subagent of subagents) {
-      output.push(`  * ${chalk.bold(subagent.name)}: ${subagent.description}`);
-    }
-  }
-  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.
- */
-export const requestConsentOrFail = async (
-  requestConsent: (consent: string) => Promise<boolean>,
-  options?: ExtensionRequestOptions,
-) => {
-  if (!options) return;
-  const {
-    extensionConfig,
-    commands = [],
-    skills = [],
-    subagents = [],
-    previousExtensionConfig,
-    previousCommands = [],
-    previousSkills = [],
-    previousSubagents = [],
-  } = options;
-  const extensionConsent = extensionConsentString(
-    extensionConfig,
-    commands,
-    skills,
-    subagents,
-  );
-  if (previousExtensionConfig) {
-    const previousExtensionConsent = extensionConsentString(
-      previousExtensionConfig,
-      previousCommands,
-      previousSkills,
-      previousSubagents,
-    );
-    if (previousExtensionConsent === extensionConsent) {
-      return;
-    }
-  }
-  if (!(await requestConsent(extensionConsent))) {
-    throw new Error(
-      t('Installation cancelled for "{{name}}".', {
-        name: extensionConfig.name,
-      }),
-    );
-  }
-};

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

@@ -1,129 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockInstance,
-} from 'vitest';
-import { disableCommand, handleDisable } from './disable.js';
-import yargs from 'yargs';
-import { SettingScope } from '../../config/settings.js';
-
-const mockDisableExtension = vi.hoisted(() => vi.fn());
-
-vi.mock('./utils.js', () => ({
-  getExtensionManager: vi.fn().mockResolvedValue({
-    disableExtension: mockDisableExtension,
-  }),
-}));
-
-vi.mock('../../utils/errors.js', () => ({
-  getErrorMessage: vi.fn((error: Error) => error.message),
-}));
-
-describe('extensions disable command', () => {
-  it('should fail if no name is provided', () => {
-    const validationParser = yargs([])
-      .command(disableCommand)
-      .fail(false)
-      .locale('en');
-    expect(() => validationParser.parse('disable')).toThrow(
-      'Not enough non-option arguments: got 0, need at least 1',
-    );
-  });
-
-  it('should fail if invalid scope is provided', () => {
-    const validationParser = yargs([])
-      .command(disableCommand)
-      .fail(false)
-      .locale('en');
-    expect(() =>
-      validationParser.parse('disable test-extension --scope=invalid'),
-    ).toThrow(/Invalid scope: invalid/);
-  });
-
-  it('should accept valid scope values', () => {
-    const parser = yargs([]).command(disableCommand).fail(false).locale('en');
-    // Just check that the scope option is recognized, actual execution needs name first
-    expect(() =>
-      parser.parse('disable my-extension --scope=user'),
-    ).not.toThrow();
-  });
-});
-
-describe('handleDisable', () => {
-  let consoleLogSpy: MockInstance;
-  let consoleErrorSpy: MockInstance;
-  let processExitSpy: MockInstance;
-
-  beforeEach(() => {
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation(() => undefined as never);
-    vi.clearAllMocks();
-  });
-
-  it('should disable an extension with user scope', async () => {
-    await handleDisable({
-      name: 'test-extension',
-      scope: 'user',
-    });
-
-    expect(mockDisableExtension).toHaveBeenCalledWith(
-      'test-extension',
-      SettingScope.User,
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Extension "test-extension" successfully disabled for scope "user".',
-    );
-  });
-
-  it('should disable an extension with workspace scope', async () => {
-    await handleDisable({
-      name: 'test-extension',
-      scope: 'workspace',
-    });
-
-    expect(mockDisableExtension).toHaveBeenCalledWith(
-      'test-extension',
-      SettingScope.Workspace,
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Extension "test-extension" successfully disabled for scope "workspace".',
-    );
-  });
-
-  it('should default to user scope when no scope is provided', async () => {
-    await handleDisable({
-      name: 'test-extension',
-    });
-
-    expect(mockDisableExtension).toHaveBeenCalledWith(
-      'test-extension',
-      SettingScope.User,
-    );
-  });
-
-  it('should handle errors and exit with code 1', async () => {
-    mockDisableExtension.mockImplementationOnce(() => {
-      throw new Error('Disable failed');
-    });
-
-    await handleDisable({
-      name: 'test-extension',
-      scope: 'user',
-    });
-
-    expect(consoleErrorSpy).toHaveBeenCalledWith('Disable failed');
-    expect(processExitSpy).toHaveBeenCalledWith(1);
-  });
-});

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

@@ -1,136 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockInstance,
-} from 'vitest';
-import { enableCommand, handleEnable } from './enable.js';
-import yargs from 'yargs';
-import { SettingScope } from '../../config/settings.js';
-
-const mockEnableExtension = vi.hoisted(() => vi.fn());
-
-vi.mock('./utils.js', () => ({
-  getExtensionManager: vi.fn().mockResolvedValue({
-    enableExtension: mockEnableExtension,
-  }),
-}));
-
-vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {
-  const actual =
-    await importOriginal<typeof import('@qwen-code/qwen-code-core')>();
-  return {
-    ...actual,
-    FatalConfigError: class FatalConfigError extends Error {
-      constructor(message: string) {
-        super(message);
-        this.name = 'FatalConfigError';
-      }
-    },
-    getErrorMessage: (error: Error) => error.message,
-  };
-});
-
-describe('extensions enable command', () => {
-  it('should fail if no name is provided', () => {
-    const validationParser = yargs([])
-      .command(enableCommand)
-      .fail(false)
-      .locale('en');
-    expect(() => validationParser.parse('enable')).toThrow(
-      'Not enough non-option arguments: got 0, need at least 1',
-    );
-  });
-
-  it('should fail if invalid scope is provided', () => {
-    const validationParser = yargs([])
-      .command(enableCommand)
-      .fail(false)
-      .locale('en');
-    expect(() =>
-      validationParser.parse('enable test-extension --scope=invalid'),
-    ).toThrow(/Invalid scope: invalid/);
-  });
-
-  it('should accept valid scope values', () => {
-    const parser = yargs([]).command(enableCommand).fail(false).locale('en');
-    // Just check that the scope option is recognized, actual execution needs name first
-    expect(() =>
-      parser.parse('enable my-extension --scope=user'),
-    ).not.toThrow();
-  });
-});
-
-describe('handleEnable', () => {
-  let consoleLogSpy: MockInstance;
-
-  beforeEach(() => {
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.clearAllMocks();
-  });
-
-  it('should enable an extension with user scope', async () => {
-    await handleEnable({
-      name: 'test-extension',
-      scope: 'user',
-    });
-
-    expect(mockEnableExtension).toHaveBeenCalledWith(
-      'test-extension',
-      SettingScope.User,
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Extension "test-extension" successfully enabled for scope "user".',
-    );
-  });
-
-  it('should enable an extension with workspace scope', async () => {
-    await handleEnable({
-      name: 'test-extension',
-      scope: 'workspace',
-    });
-
-    expect(mockEnableExtension).toHaveBeenCalledWith(
-      'test-extension',
-      SettingScope.Workspace,
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Extension "test-extension" successfully enabled for scope "workspace".',
-    );
-  });
-
-  it('should default to user scope when no scope is provided', async () => {
-    await handleEnable({
-      name: 'test-extension',
-    });
-
-    expect(mockEnableExtension).toHaveBeenCalledWith(
-      'test-extension',
-      SettingScope.User,
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Extension "test-extension" successfully enabled in all scopes.',
-    );
-  });
-
-  it('should throw FatalConfigError when enable fails', async () => {
-    mockEnableExtension.mockImplementationOnce(() => {
-      throw new Error('Enable failed');
-    });
-
-    await expect(
-      handleEnable({
-        name: 'test-extension',
-        scope: 'user',
-      }),
-    ).rejects.toThrow('Enable failed');
-  });
-});

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

@@ -4,51 +4,30 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  afterEach,
-  type MockInstance,
-} from 'vitest';
+import { describe, it, expect, vi, type MockInstance } from 'vitest';
 import { handleInstall, installCommand } from './install.js';
 import yargs from 'yargs';
 
 const mockInstallExtension = vi.hoisted(() => vi.fn());
-const mockRefreshCache = vi.hoisted(() => vi.fn());
-const mockParseInstallSource = vi.hoisted(() => vi.fn());
 const mockRequestConsentNonInteractive = vi.hoisted(() => vi.fn());
-const mockRequestConsentOrFail = vi.hoisted(() => vi.fn());
-const mockIsWorkspaceTrusted = vi.hoisted(() => vi.fn());
-const mockLoadSettings = vi.hoisted(() => vi.fn());
+const mockStat = vi.hoisted(() => vi.fn());
 
-vi.mock('@qwen-code/qwen-code-core', () => ({
-  ExtensionManager: vi.fn().mockImplementation(() => ({
-    installExtension: mockInstallExtension,
-    refreshCache: mockRefreshCache,
-  })),
-  parseInstallSource: mockParseInstallSource,
-}));
-
-vi.mock('./consent.js', () => ({
+vi.mock('../../config/extension.js', () => ({
+  installExtension: mockInstallExtension,
   requestConsentNonInteractive: mockRequestConsentNonInteractive,
-  requestConsentOrFail: mockRequestConsentOrFail,
-}));
-
-vi.mock('../../config/trustedFolders.js', () => ({
-  isWorkspaceTrusted: mockIsWorkspaceTrusted,
-}));
-
-vi.mock('../../config/settings.js', () => ({
-  loadSettings: mockLoadSettings,
 }));
 
 vi.mock('../../utils/errors.js', () => ({
   getErrorMessage: vi.fn((error: Error) => error.message),
 }));
 
+vi.mock('node:fs/promises', () => ({
+  stat: mockStat,
+  default: {
+    stat: mockStat,
+  },
+}));
+
 describe('extensions install command', () => {
   it('should fail if no source is provided', () => {
     const validationParser = yargs([])
@@ -72,21 +51,17 @@ describe('handleInstall', () => {
     processSpy = vi
       .spyOn(process, 'exit')
       .mockImplementation(() => undefined as never);
-    mockRefreshCache.mockResolvedValue(undefined);
-    mockLoadSettings.mockReturnValue({ merged: {} });
-    mockIsWorkspaceTrusted.mockReturnValue(true);
   });
 
   afterEach(() => {
-    vi.clearAllMocks();
+    mockInstallExtension.mockClear();
+    mockRequestConsentNonInteractive.mockClear();
+    mockStat.mockClear();
+    vi.resetAllMocks();
   });
 
   it('should install an extension from a http source', async () => {
-    mockParseInstallSource.mockResolvedValue({
-      type: 'http',
-      url: 'http://google.com',
-    });
-    mockInstallExtension.mockResolvedValue({ name: 'http-extension' });
+    mockInstallExtension.mockResolvedValue('http-extension');
 
     await handleInstall({
       source: 'http://google.com',
@@ -98,11 +73,7 @@ describe('handleInstall', () => {
   });
 
   it('should install an extension from a https source', async () => {
-    mockParseInstallSource.mockResolvedValue({
-      type: 'https',
-      url: 'https://google.com',
-    });
-    mockInstallExtension.mockResolvedValue({ name: 'https-extension' });
+    mockInstallExtension.mockResolvedValue('https-extension');
 
     await handleInstall({
       source: 'https://google.com',
@@ -114,11 +85,7 @@ describe('handleInstall', () => {
   });
 
   it('should install an extension from a git source', async () => {
-    mockParseInstallSource.mockResolvedValue({
-      type: 'git',
-      url: 'git@some-url',
-    });
-    mockInstallExtension.mockResolvedValue({ name: 'git-extension' });
+    mockInstallExtension.mockResolvedValue('git-extension');
 
     await handleInstall({
       source: 'git@some-url',
@@ -130,9 +97,7 @@ describe('handleInstall', () => {
   });
 
   it('throws an error from an unknown source', async () => {
-    mockParseInstallSource.mockRejectedValue(
-      new Error('Install source not found.'),
-    );
+    mockStat.mockRejectedValue(new Error('ENOENT: no such file or directory'));
     await handleInstall({
       source: 'test://google.com',
     });
@@ -142,11 +107,7 @@ describe('handleInstall', () => {
   });
 
   it('should install an extension from a sso source', async () => {
-    mockParseInstallSource.mockResolvedValue({
-      type: 'sso',
-      url: 'sso://google.com',
-    });
-    mockInstallExtension.mockResolvedValue({ name: 'sso-extension' });
+    mockInstallExtension.mockResolvedValue('sso-extension');
 
     await handleInstall({
       source: 'sso://google.com',
@@ -158,12 +119,8 @@ describe('handleInstall', () => {
   });
 
   it('should install an extension from a local path', async () => {
-    mockParseInstallSource.mockResolvedValue({
-      type: 'local',
-      path: '/some/path',
-    });
-    mockInstallExtension.mockResolvedValue({ name: 'local-extension' });
-
+    mockInstallExtension.mockResolvedValue('local-extension');
+    mockStat.mockResolvedValue({});
     await handleInstall({
       source: '/some/path',
     });
@@ -174,10 +131,6 @@ describe('handleInstall', () => {
   });
 
   it('should throw an error if install extension fails', async () => {
-    mockParseInstallSource.mockResolvedValue({
-      type: 'git',
-      url: 'git@some-url',
-    });
     mockInstallExtension.mockRejectedValue(
       new Error('Install extension failed'),
     );

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

@@ -5,67 +5,58 @@
  */
 
 import type { CommandModule } from 'yargs';
-
 import {
-  ExtensionManager,
-  parseInstallSource,
-} 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 {
-  requestConsentOrFail,
+  installExtension,
   requestConsentNonInteractive,
-} from './consent.js';
+} from '../../config/extension.js';
+import type { ExtensionInstallMetadata } from '@qwen-code/qwen-code-core';
+import { getErrorMessage } from '../../utils/errors.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()
-      : requestConsentOrFail.bind(null, 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);
@@ -74,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,
       })
@@ -92,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.');
@@ -113,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.test.ts

@@ -1,95 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockInstance,
-} from 'vitest';
-import { linkCommand, handleLink } from './link.js';
-import yargs from 'yargs';
-
-const mockInstallExtension = vi.hoisted(() => vi.fn());
-
-vi.mock('./utils.js', () => ({
-  getExtensionManager: vi.fn().mockResolvedValue({
-    installExtension: mockInstallExtension,
-  }),
-}));
-
-vi.mock('./consent.js', () => ({
-  requestConsentNonInteractive: vi.fn().mockResolvedValue(true),
-  requestConsentOrFail: vi.fn(),
-}));
-
-vi.mock('../../utils/errors.js', () => ({
-  getErrorMessage: vi.fn((error: Error) => error.message),
-}));
-
-describe('extensions link command', () => {
-  it('should fail if no path is provided', () => {
-    const validationParser = yargs([])
-      .command(linkCommand)
-      .fail(false)
-      .locale('en');
-    expect(() => validationParser.parse('link')).toThrow(
-      'Not enough non-option arguments: got 0, need at least 1',
-    );
-  });
-
-  it('should accept a path argument', () => {
-    const parser = yargs([]).command(linkCommand).fail(false).locale('en');
-    expect(() => parser.parse('link /some/path')).not.toThrow();
-  });
-});
-
-describe('handleLink', () => {
-  let consoleLogSpy: MockInstance;
-  let consoleErrorSpy: MockInstance;
-  let processExitSpy: MockInstance;
-
-  beforeEach(() => {
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation(() => undefined as never);
-    vi.clearAllMocks();
-  });
-
-  it('should link an extension from a local path', async () => {
-    mockInstallExtension.mockResolvedValueOnce({ name: 'linked-extension' });
-
-    await handleLink({
-      path: '/some/local/path',
-    });
-
-    expect(mockInstallExtension).toHaveBeenCalledWith(
-      {
-        source: '/some/local/path',
-        type: 'link',
-      },
-      expect.any(Function),
-    );
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'Extension "linked-extension" linked successfully and enabled.',
-    );
-  });
-
-  it('should handle errors and exit with code 1', async () => {
-    mockInstallExtension.mockRejectedValueOnce(new Error('Link failed'));
-
-    await handleLink({
-      path: '/some/local/path',
-    });
-
-    expect(consoleErrorSpy).toHaveBeenCalledWith('Link failed');
-    expect(processExitSpy).toHaveBeenCalledWith(1);
-  });
-});

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

@@ -5,13 +5,13 @@
  */
 
 import type { CommandModule } from 'yargs';
-import { type ExtensionInstallMetadata } from '@qwen-code/qwen-code-core';
-import { getErrorMessage } from '../../utils/errors.js';
 import {
+  installExtension,
   requestConsentNonInteractive,
-  requestConsentOrFail,
-} from './consent.js';
-import { getExtensionManager } from './utils.js';
+} from '../../config/extension.js';
+import type { ExtensionInstallMetadata } from '@qwen-code/qwen-code-core';
+
+import { getErrorMessage } from '../../utils/errors.js';
 
 interface InstallArgs {
   path: string;
@@ -23,18 +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,
-      requestConsentOrFail.bind(null, requestConsentNonInteractive),
+      requestConsentNonInteractive,
     );
-    if (!extension) {
-      console.log('Link extension failed to install.');
-      return;
-    }
     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.test.ts

@@ -1,90 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockInstance,
-} from 'vitest';
-import { listCommand, handleList } from './list.js';
-import yargs from 'yargs';
-
-const mockGetLoadedExtensions = vi.hoisted(() => vi.fn());
-const mockToOutputString = vi.hoisted(() => vi.fn());
-
-vi.mock('./utils.js', () => ({
-  getExtensionManager: vi.fn().mockResolvedValue({
-    getLoadedExtensions: mockGetLoadedExtensions,
-    toOutputString: mockToOutputString,
-  }),
-}));
-
-vi.mock('../../utils/errors.js', () => ({
-  getErrorMessage: vi.fn((error: Error) => error.message),
-}));
-
-describe('extensions list command', () => {
-  it('should parse the list command', () => {
-    const parser = yargs([]).command(listCommand).fail(false).locale('en');
-    expect(() => parser.parse('list')).not.toThrow();
-  });
-});
-
-describe('handleList', () => {
-  let consoleLogSpy: MockInstance;
-  let consoleErrorSpy: MockInstance;
-  let processExitSpy: MockInstance;
-
-  beforeEach(() => {
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation(() => undefined as never);
-    vi.clearAllMocks();
-  });
-
-  it('should display message when no extensions are installed', async () => {
-    mockGetLoadedExtensions.mockReturnValueOnce([]);
-
-    await handleList();
-
-    expect(consoleLogSpy).toHaveBeenCalledWith('No extensions installed.');
-  });
-
-  it('should list installed extensions', async () => {
-    const mockExtensions = [
-      { name: 'extension-1', version: '1.0.0' },
-      { name: 'extension-2', version: '2.0.0' },
-    ];
-    mockGetLoadedExtensions.mockReturnValueOnce(mockExtensions);
-    mockToOutputString.mockImplementation(
-      (ext) => `${ext.name} (${ext.version})`,
-    );
-
-    await handleList();
-
-    expect(mockGetLoadedExtensions).toHaveBeenCalled();
-    expect(mockToOutputString).toHaveBeenCalledTimes(2);
-    expect(consoleLogSpy).toHaveBeenCalledWith(
-      'extension-1 (1.0.0)\n\nextension-2 (2.0.0)',
-    );
-  });
-
-  it('should handle errors and exit with code 1', async () => {
-    mockGetLoadedExtensions.mockImplementationOnce(() => {
-      throw new Error('List failed');
-    });
-
-    await handleList();
-
-    expect(consoleErrorSpy).toHaveBeenCalledWith('List failed');
-    expect(processExitSpy).toHaveBeenCalledWith(1);
-  });
-});

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();
-
-    if (!extensions || extensions.length === 0) {
+    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,14 +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,
-  requestConsentOrFail,
-} 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.
@@ -20,19 +14,7 @@ interface UninstallArgs {
 
 export async function handleUninstall(args: UninstallArgs) {
   try {
-    const workspaceDir = process.cwd();
-    const extensionManager = new ExtensionManager({
-      workspaceDir,
-      requestConsent: requestConsentOrFail.bind(
-        null,
-        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.test.ts

@@ -1,262 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import {
-  describe,
-  it,
-  expect,
-  vi,
-  beforeEach,
-  type MockInstance,
-} from 'vitest';
-import { updateCommand, handleUpdate } from './update.js';
-import yargs from 'yargs';
-import { ExtensionUpdateState } from '../../ui/state/extensions.js';
-
-const mockGetLoadedExtensions = vi.hoisted(() => vi.fn());
-const mockUpdateExtension = vi.hoisted(() => vi.fn());
-const mockCheckForAllExtensionUpdates = vi.hoisted(() => vi.fn());
-const mockUpdateAllUpdatableExtensions = vi.hoisted(() => vi.fn());
-const mockCheckForExtensionUpdate = vi.hoisted(() => vi.fn());
-
-vi.mock('./utils.js', () => ({
-  getExtensionManager: vi.fn().mockResolvedValue({
-    getLoadedExtensions: mockGetLoadedExtensions,
-    updateExtension: mockUpdateExtension,
-    checkForAllExtensionUpdates: mockCheckForAllExtensionUpdates,
-    updateAllUpdatableExtensions: mockUpdateAllUpdatableExtensions,
-  }),
-}));
-
-vi.mock('@qwen-code/qwen-code-core', () => ({
-  checkForExtensionUpdate: mockCheckForExtensionUpdate,
-}));
-
-vi.mock('../../utils/errors.js', () => ({
-  getErrorMessage: vi.fn((error: Error) => error.message),
-}));
-
-vi.mock('../../ui/state/extensions.js', () => ({
-  ExtensionUpdateState: {
-    UPDATE_AVAILABLE: 'update available',
-    UP_TO_DATE: 'up to date',
-    ERROR: 'error',
-  },
-}));
-
-describe('extensions update command', () => {
-  it('should fail if neither name nor --all is provided', () => {
-    const validationParser = yargs([])
-      .command(updateCommand)
-      .fail(false)
-      .locale('en');
-    expect(() => validationParser.parse('update')).toThrow(
-      'Either an extension name or --all must be provided',
-    );
-  });
-
-  it('should fail if both name and --all are provided', () => {
-    const validationParser = yargs([])
-      .command(updateCommand)
-      .fail(false)
-      .locale('en');
-    expect(() => validationParser.parse('update test-extension --all')).toThrow(
-      /Arguments .* are mutually exclusive/,
-    );
-  });
-
-  it('should accept --all flag', () => {
-    const parser = yargs([]).command(updateCommand).fail(false).locale('en');
-    expect(() => parser.parse('update --all')).not.toThrow();
-  });
-
-  it('should accept an extension name', () => {
-    const parser = yargs([]).command(updateCommand).fail(false).locale('en');
-    expect(() => parser.parse('update test-extension')).not.toThrow();
-  });
-});
-
-describe('handleUpdate', () => {
-  let consoleLogSpy: MockInstance;
-  let consoleErrorSpy: MockInstance;
-
-  beforeEach(() => {
-    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.clearAllMocks();
-  });
-
-  describe('update by name', () => {
-    it('should show message when extension is not found', async () => {
-      mockGetLoadedExtensions.mockReturnValueOnce([]);
-
-      await handleUpdate({ name: 'non-existent-extension' });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Extension "non-existent-extension" not found.',
-      );
-    });
-
-    it('should show message when extension has no install metadata', async () => {
-      mockGetLoadedExtensions.mockReturnValueOnce([
-        { name: 'test-extension', installMetadata: undefined },
-      ]);
-
-      await handleUpdate({ name: 'test-extension' });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Unable to install extension "test-extension" due to missing install metadata',
-      );
-    });
-
-    it('should show message when extension is already up to date', async () => {
-      const mockExtension = {
-        name: 'test-extension',
-        installMetadata: { source: 'test' },
-      };
-      mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]);
-      mockCheckForExtensionUpdate.mockResolvedValueOnce(
-        ExtensionUpdateState.UP_TO_DATE,
-      );
-
-      await handleUpdate({ name: 'test-extension' });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Extension "test-extension" is already up to date.',
-      );
-    });
-
-    it('should update extension when update is available', async () => {
-      const mockExtension = {
-        name: 'test-extension',
-        installMetadata: { source: 'test' },
-      };
-      mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]);
-      mockCheckForExtensionUpdate.mockResolvedValueOnce(
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-      );
-      mockUpdateExtension.mockResolvedValueOnce({
-        name: 'test-extension',
-        originalVersion: '1.0.0',
-        updatedVersion: '2.0.0',
-      });
-
-      await handleUpdate({ name: 'test-extension' });
-
-      expect(mockUpdateExtension).toHaveBeenCalledWith(
-        mockExtension,
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-        expect.any(Function),
-      );
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Extension "test-extension" successfully updated: 1.0.0 → 2.0.0.',
-      );
-    });
-
-    it('should show up to date message when versions are the same after update', async () => {
-      const mockExtension = {
-        name: 'test-extension',
-        installMetadata: { source: 'test' },
-      };
-      mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]);
-      mockCheckForExtensionUpdate.mockResolvedValueOnce(
-        ExtensionUpdateState.UPDATE_AVAILABLE,
-      );
-      mockUpdateExtension.mockResolvedValueOnce({
-        name: 'test-extension',
-        originalVersion: '1.0.0',
-        updatedVersion: '1.0.0',
-      });
-
-      await handleUpdate({ name: 'test-extension' });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Extension "test-extension" is already up to date.',
-      );
-    });
-
-    it('should handle errors during update', async () => {
-      const mockExtension = {
-        name: 'test-extension',
-        installMetadata: { source: 'test' },
-      };
-      mockGetLoadedExtensions.mockReturnValueOnce([mockExtension]);
-      mockCheckForExtensionUpdate.mockRejectedValueOnce(
-        new Error('Update check failed'),
-      );
-
-      await handleUpdate({ name: 'test-extension' });
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith('Update check failed');
-    });
-  });
-
-  describe('update all', () => {
-    it('should show message when no extensions to update', async () => {
-      mockCheckForAllExtensionUpdates.mockResolvedValueOnce(undefined);
-      mockUpdateAllUpdatableExtensions.mockResolvedValueOnce([]);
-
-      await handleUpdate({ all: true });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith('No extensions to update.');
-    });
-
-    it('should update all extensions with updates available', async () => {
-      mockCheckForAllExtensionUpdates.mockResolvedValueOnce(undefined);
-      mockUpdateAllUpdatableExtensions.mockResolvedValueOnce([
-        {
-          name: 'extension-1',
-          originalVersion: '1.0.0',
-          updatedVersion: '2.0.0',
-        },
-        {
-          name: 'extension-2',
-          originalVersion: '1.0.0',
-          updatedVersion: '1.5.0',
-        },
-      ]);
-
-      await handleUpdate({ all: true });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Extension "extension-1" successfully updated: 1.0.0 → 2.0.0.\n' +
-          'Extension "extension-2" successfully updated: 1.0.0 → 1.5.0.',
-      );
-    });
-
-    it('should filter out extensions with same version after update', async () => {
-      mockCheckForAllExtensionUpdates.mockResolvedValueOnce(undefined);
-      mockUpdateAllUpdatableExtensions.mockResolvedValueOnce([
-        {
-          name: 'extension-1',
-          originalVersion: '1.0.0',
-          updatedVersion: '2.0.0',
-        },
-        {
-          name: 'extension-2',
-          originalVersion: '1.0.0',
-          updatedVersion: '1.0.0',
-        },
-      ]);
-
-      await handleUpdate({ all: true });
-
-      expect(consoleLogSpy).toHaveBeenCalledWith(
-        'Extension "extension-1" successfully updated: 1.0.0 → 2.0.0.',
-      );
-    });
-
-    it('should handle errors during update all', async () => {
-      mockCheckForAllExtensionUpdates.mockRejectedValueOnce(
-        new Error('Update all failed'),
-      );
-
-      await handleUpdate({ all: true });
-
-      expect(consoleErrorSpy).toHaveBeenCalledWith('Update all failed');
-    });
-  });
-});

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

@@ -1,66 +0,0 @@
-/**
- * @license
- * Copyright 2025 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { getExtensionManager } from './utils.js';
-
-const mockRefreshCache = vi.fn();
-const mockExtensionManagerInstance = {
-  refreshCache: mockRefreshCache,
-};
-
-vi.mock('@qwen-code/qwen-code-core', () => ({
-  ExtensionManager: vi
-    .fn()
-    .mockImplementation(() => mockExtensionManagerInstance),
-}));
-
-vi.mock('../../config/settings.js', () => ({
-  loadSettings: vi.fn().mockReturnValue({
-    merged: {},
-  }),
-}));
-
-vi.mock('../../config/trustedFolders.js', () => ({
-  isWorkspaceTrusted: vi.fn().mockReturnValue({ isTrusted: true }),
-}));
-
-vi.mock('./consent.js', () => ({
-  requestConsentOrFail: vi.fn(),
-  requestConsentNonInteractive: vi.fn(),
-}));
-
-describe('getExtensionManager', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    mockRefreshCache.mockResolvedValue(undefined);
-  });
-
-  it('should return an ExtensionManager instance', async () => {
-    const manager = await getExtensionManager();
-
-    expect(manager).toBeDefined();
-    expect(manager).toBe(mockExtensionManagerInstance);
-  });
-
-  it('should call refreshCache on the ExtensionManager', async () => {
-    await getExtensionManager();
-
-    expect(mockRefreshCache).toHaveBeenCalled();
-  });
-
-  it('should use current working directory as workspace', async () => {
-    const { ExtensionManager } = await import('@qwen-code/qwen-code-core');
-
-    await getExtensionManager();
-
-    expect(ExtensionManager).toHaveBeenCalledWith(
-      expect.objectContaining({
-        workspaceDir: process.cwd(),
-      }),
-    );
-  });
-});

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

@@ -1,27 +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 {
-  requestConsentOrFail,
-  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: requestConsentOrFail.bind(
-      null,
-      requestConsentNonInteractive,
-    ),
-    isWorkspaceTrusted: !!isWorkspaceTrusted(loadSettings(workspaceDir).merged),
-  });
-  await extensionManager.refreshCache();
-  return extensionManager;
-}

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

@@ -7,16 +7,11 @@
 import yargs from 'yargs';
 import { addCommand } from './add.js';
 import { loadSettings, SettingScope } from '../../config/settings.js';
-import { describe, it, expect, vi, beforeEach } from 'vitest';
 
-vi.mock('fs/promises', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs/promises')>();
-  return {
-    ...actual,
-    readFile: vi.fn(),
-    writeFile: vi.fn(),
-  };
-});
+vi.mock('fs/promises', () => ({
+  readFile: vi.fn(),
+  writeFile: vi.fn(),
+}));
 
 vi.mock('os', () => {
   const homedir = vi.fn(() => '/home/user');

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

@@ -7,15 +7,18 @@
 import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
 import { listMcpServers } from './list.js';
 import { loadSettings } from '../../config/settings.js';
-import { isWorkspaceTrusted } from '../../config/trustedFolders.js';
-import { createTransport, ExtensionManager } from '@qwen-code/qwen-code-core';
+import { ExtensionStorage, loadExtensions } from '../../config/extension.js';
+import { createTransport } from '@qwen-code/qwen-code-core';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
 vi.mock('../../config/settings.js', () => ({
   loadSettings: vi.fn(),
 }));
-vi.mock('../../config/trustedFolders.js', () => ({
-  isWorkspaceTrusted: vi.fn(),
+vi.mock('../../config/extension.js', () => ({
+  loadExtensions: vi.fn(),
+  ExtensionStorage: {
+    getUserExtensionsDir: vi.fn(),
+  },
 }));
 vi.mock('@qwen-code/qwen-code-core', () => ({
   createTransport: vi.fn(),
@@ -24,15 +27,20 @@ vi.mock('@qwen-code/qwen-code-core', () => ({
     CONNECTING: 'CONNECTING',
     DISCONNECTED: 'DISCONNECTED',
   },
-  ExtensionManager: vi.fn(),
+  Storage: vi.fn().mockImplementation((_cwd: string) => ({
+    getGlobalSettingsPath: () => '/tmp/qwen/settings.json',
+    getWorkspaceSettingsPath: () => '/tmp/qwen/workspace-settings.json',
+    getProjectTempDir: () => '/test/home/.qwen/tmp/mocked_hash',
+  })),
+  QWEN_CONFIG_DIR: '.qwen',
   getErrorMessage: (e: unknown) => (e instanceof Error ? e.message : String(e)),
 }));
 vi.mock('@modelcontextprotocol/sdk/client/index.js');
 
+const mockedExtensionStorage = ExtensionStorage as vi.Mock;
 const mockedLoadSettings = loadSettings as vi.Mock;
-const mockedIsWorkspaceTrusted = isWorkspaceTrusted as vi.Mock;
+const mockedLoadExtensions = loadExtensions as vi.Mock;
 const mockedCreateTransport = createTransport as vi.Mock;
-const MockedExtensionManager = ExtensionManager as vi.Mock;
 const MockedClient = Client as vi.Mock;
 
 interface MockClient {
@@ -49,10 +57,6 @@ describe('mcp list command', () => {
   let consoleSpy: vi.SpyInstance;
   let mockClient: MockClient;
   let mockTransport: MockTransport;
-  let mockExtensionManager: {
-    refreshCache: vi.Mock;
-    getLoadedExtensions: vi.Mock;
-  };
 
   beforeEach(() => {
     vi.resetAllMocks();
@@ -66,15 +70,12 @@ describe('mcp list command', () => {
       close: vi.fn(),
     };
 
-    mockExtensionManager = {
-      refreshCache: vi.fn().mockResolvedValue(undefined),
-      getLoadedExtensions: vi.fn().mockReturnValue([]),
-    };
-
     MockedClient.mockImplementation(() => mockClient);
     mockedCreateTransport.mockResolvedValue(mockTransport);
-    MockedExtensionManager.mockImplementation(() => mockExtensionManager);
-    mockedIsWorkspaceTrusted.mockReturnValue(true);
+    mockedLoadExtensions.mockReturnValue([]);
+    mockedExtensionStorage.getUserExtensionsDir.mockReturnValue(
+      '/mocked/extensions/dir',
+    );
   });
 
   afterEach(() => {
@@ -150,9 +151,8 @@ describe('mcp list command', () => {
       },
     });
 
-    mockExtensionManager.getLoadedExtensions.mockReturnValue([
+    mockedLoadExtensions.mockReturnValue([
       {
-        isActive: true,
         config: {
           name: 'test-extension',
           mcpServers: { 'extension-server': { command: '/ext/server' } },

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/commands/mcp/remove.test.ts

@@ -9,14 +9,10 @@ import yargs from 'yargs';
 import { loadSettings, SettingScope } from '../../config/settings.js';
 import { removeCommand } from './remove.js';
 
-vi.mock('fs/promises', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('fs/promises')>();
-  return {
-    ...actual,
-    readFile: vi.fn(),
-    writeFile: vi.fn(),
-  };
-});
+vi.mock('fs/promises', () => ({
+  readFile: vi.fn(),
+  writeFile: vi.fn(),
+}));
 
 vi.mock('../../config/settings.js', async () => {
   const actual = await vi.importActual('../../config/settings.js');

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

@@ -1,112 +1,41 @@
 /**
  * @license
- * Copyright 2025 Qwen Team
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
 import { AuthType } from '@qwen-code/qwen-code-core';
 import { vi } from 'vitest';
 import { validateAuthMethod } from './auth.js';
-import * as settings from './settings.js';
 
 vi.mock('./settings.js', () => ({
   loadEnvironment: vi.fn(),
   loadSettings: vi.fn().mockReturnValue({
-    merged: {},
+    merged: vi.fn().mockReturnValue({}),
   }),
 }));
 
 describe('validateAuthMethod', () => {
   beforeEach(() => {
     vi.resetModules();
-    // Reset mock to default
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {},
-    } as ReturnType<typeof settings.loadSettings>);
   });
 
   afterEach(() => {
     vi.unstubAllEnvs();
-    delete process.env['OPENAI_API_KEY'];
-    delete process.env['CUSTOM_API_KEY'];
-    delete process.env['GEMINI_API_KEY'];
-    delete process.env['GEMINI_API_KEY_ALTERED'];
-    delete process.env['ANTHROPIC_API_KEY'];
-    delete process.env['ANTHROPIC_BASE_URL'];
-    delete process.env['GOOGLE_API_KEY'];
   });
 
-  it('should return null for USE_OPENAI with default env key', () => {
+  it('should return null for USE_OPENAI', () => {
     process.env['OPENAI_API_KEY'] = 'fake-key';
     expect(validateAuthMethod(AuthType.USE_OPENAI)).toBeNull();
   });
 
-  it('should return an error message for USE_OPENAI if no API key is available', () => {
+  it('should return an error message for USE_OPENAI if OPENAI_API_KEY is not set', () => {
+    delete process.env['OPENAI_API_KEY'];
     expect(validateAuthMethod(AuthType.USE_OPENAI)).toBe(
-      "Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the 'OPENAI_API_KEY' environment variable.",
+      'OPENAI_API_KEY environment variable not found. You can enter it interactively or add it to your .env file.',
     );
   });
 
-  it('should return null for USE_OPENAI with custom envKey from modelProviders', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'custom-model' },
-        modelProviders: {
-          openai: [{ id: 'custom-model', envKey: 'CUSTOM_API_KEY' }],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-    process.env['CUSTOM_API_KEY'] = 'custom-key';
-
-    expect(validateAuthMethod(AuthType.USE_OPENAI)).toBeNull();
-  });
-
-  it('should return error with custom envKey hint when modelProviders envKey is set but env var is missing', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'custom-model' },
-        modelProviders: {
-          openai: [{ id: 'custom-model', envKey: 'CUSTOM_API_KEY' }],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-
-    const result = validateAuthMethod(AuthType.USE_OPENAI);
-    expect(result).toContain('CUSTOM_API_KEY');
-  });
-
-  it('should return null for USE_GEMINI with custom envKey', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'gemini-1.5-flash' },
-        modelProviders: {
-          gemini: [
-            { id: 'gemini-1.5-flash', envKey: 'GEMINI_API_KEY_ALTERED' },
-          ],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-    process.env['GEMINI_API_KEY_ALTERED'] = 'altered-key';
-
-    expect(validateAuthMethod(AuthType.USE_GEMINI)).toBeNull();
-  });
-
-  it('should return error with custom envKey for USE_GEMINI when env var is missing', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'gemini-1.5-flash' },
-        modelProviders: {
-          gemini: [
-            { id: 'gemini-1.5-flash', envKey: 'GEMINI_API_KEY_ALTERED' },
-          ],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-
-    const result = validateAuthMethod(AuthType.USE_GEMINI);
-    expect(result).toContain('GEMINI_API_KEY_ALTERED');
-  });
-
   it('should return null for QWEN_OAUTH', () => {
     expect(validateAuthMethod(AuthType.QWEN_OAUTH)).toBeNull();
   });
@@ -116,115 +45,4 @@ describe('validateAuthMethod', () => {
       'Invalid auth method selected.',
     );
   });
-
-  it('should return null for USE_ANTHROPIC with custom envKey and baseUrl', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'claude-3' },
-        modelProviders: {
-          anthropic: [
-            {
-              id: 'claude-3',
-              envKey: 'CUSTOM_ANTHROPIC_KEY',
-              baseUrl: 'https://api.anthropic.com',
-            },
-          ],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-    process.env['CUSTOM_ANTHROPIC_KEY'] = 'custom-anthropic-key';
-
-    expect(validateAuthMethod(AuthType.USE_ANTHROPIC)).toBeNull();
-  });
-
-  it('should return error for USE_ANTHROPIC when baseUrl is missing', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'claude-3' },
-        modelProviders: {
-          anthropic: [{ id: 'claude-3', envKey: 'CUSTOM_ANTHROPIC_KEY' }],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-    process.env['CUSTOM_ANTHROPIC_KEY'] = 'custom-key';
-
-    const result = validateAuthMethod(AuthType.USE_ANTHROPIC);
-    expect(result).toContain('modelProviders[].baseUrl');
-  });
-
-  it('should return null for USE_VERTEX_AI with custom envKey', () => {
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'vertex-model' },
-        modelProviders: {
-          'vertex-ai': [
-            { id: 'vertex-model', envKey: 'GOOGLE_API_KEY_VERTEX' },
-          ],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-    process.env['GOOGLE_API_KEY_VERTEX'] = 'vertex-key';
-
-    expect(validateAuthMethod(AuthType.USE_VERTEX_AI)).toBeNull();
-  });
-
-  it('should use config.modelsConfig.getModel() when Config is provided', () => {
-    // Settings has a different model
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'settings-model' },
-        modelProviders: {
-          openai: [
-            { id: 'settings-model', envKey: 'SETTINGS_API_KEY' },
-            { id: 'cli-model', envKey: 'CLI_API_KEY' },
-          ],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-
-    // Mock Config object that returns a different model (e.g., from CLI args)
-    const mockConfig = {
-      modelsConfig: {
-        getModel: vi.fn().mockReturnValue('cli-model'),
-      },
-    } as unknown as import('@qwen-code/qwen-code-core').Config;
-
-    // Set the env key for the CLI model, not the settings model
-    process.env['CLI_API_KEY'] = 'cli-key';
-
-    // Should use 'cli-model' from config.modelsConfig.getModel(), not 'settings-model'
-    const result = validateAuthMethod(AuthType.USE_OPENAI, mockConfig);
-    expect(result).toBeNull();
-    expect(mockConfig.modelsConfig.getModel).toHaveBeenCalled();
-  });
-
-  it('should fail validation when Config provides different model without matching env key', () => {
-    // Clean up any existing env keys first
-    delete process.env['CLI_API_KEY'];
-    delete process.env['SETTINGS_API_KEY'];
-    delete process.env['OPENAI_API_KEY'];
-
-    vi.mocked(settings.loadSettings).mockReturnValue({
-      merged: {
-        model: { name: 'settings-model' },
-        modelProviders: {
-          openai: [
-            { id: 'settings-model', envKey: 'SETTINGS_API_KEY' },
-            { id: 'cli-model', envKey: 'CLI_API_KEY' },
-          ],
-        },
-      },
-    } as unknown as ReturnType<typeof settings.loadSettings>);
-
-    const mockConfig = {
-      modelsConfig: {
-        getModel: vi.fn().mockReturnValue('cli-model'),
-      },
-    } as unknown as import('@qwen-code/qwen-code-core').Config;
-
-    // Don't set CLI_API_KEY - validation should fail
-    const result = validateAuthMethod(AuthType.USE_OPENAI, mockConfig);
-    expect(result).not.toBeNull();
-    expect(result).toContain('CLI_API_KEY');
-  });
 });

packages/cli/src/config/auth.ts

@@ -1,169 +1,21 @@
 /**
  * @license
- * Copyright 2025 Qwen Team
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  AuthType,
-  type Config,
-  type ModelProvidersConfig,
-  type ProviderModelConfig,
-} from '@qwen-code/qwen-code-core';
-import { loadEnvironment, loadSettings, type Settings } from './settings.js';
-import { t } from '../i18n/index.js';
+import { AuthType } from '@qwen-code/qwen-code-core';
+import { loadEnvironment, loadSettings } from './settings.js';
 
-/**
- * Default environment variable names for each auth type
- */
-const DEFAULT_ENV_KEYS: Record<string, string> = {
-  [AuthType.USE_OPENAI]: 'OPENAI_API_KEY',
-  [AuthType.USE_ANTHROPIC]: 'ANTHROPIC_API_KEY',
-  [AuthType.USE_GEMINI]: 'GEMINI_API_KEY',
-  [AuthType.USE_VERTEX_AI]: 'GOOGLE_API_KEY',
-};
-
-/**
- * Find model configuration from modelProviders by authType and modelId
- */
-function findModelConfig(
-  modelProviders: ModelProvidersConfig | undefined,
-  authType: string,
-  modelId: string | undefined,
-): ProviderModelConfig | undefined {
-  if (!modelProviders || !modelId) {
-    return undefined;
-  }
-
-  const models = modelProviders[authType];
-  if (!Array.isArray(models)) {
-    return undefined;
-  }
-
-  return models.find((m) => m.id === modelId);
-}
-
-/**
- * Check if API key is available for the given auth type and model configuration.
- * Prioritizes custom envKey from modelProviders over default environment variables.
- */
-function hasApiKeyForAuth(
-  authType: string,
-  settings: Settings,
-  config?: Config,
-): {
-  hasKey: boolean;
-  checkedEnvKey: string | undefined;
-  isExplicitEnvKey: boolean;
-} {
-  const modelProviders = settings.modelProviders as
-    | ModelProvidersConfig
-    | undefined;
-
-  // Use config.modelsConfig.getModel() if available for accurate model ID resolution
-  // that accounts for CLI args, env vars, and settings. Fall back to settings.model.name.
-  const modelId = config?.modelsConfig.getModel() ?? settings.model?.name;
-
-  // Try to find model-specific envKey from modelProviders
-  const modelConfig = findModelConfig(modelProviders, authType, modelId);
-  if (modelConfig?.envKey) {
-    // Explicit envKey configured - only check this env var, no apiKey fallback
-    const hasKey = !!process.env[modelConfig.envKey];
-    return {
-      hasKey,
-      checkedEnvKey: modelConfig.envKey,
-      isExplicitEnvKey: true,
-    };
-  }
-
-  // Using default environment variable - apiKey fallback is allowed
-  const defaultEnvKey = DEFAULT_ENV_KEYS[authType];
-  if (defaultEnvKey) {
-    const hasKey = !!process.env[defaultEnvKey];
-    if (hasKey) {
-      return { hasKey, checkedEnvKey: defaultEnvKey, isExplicitEnvKey: false };
-    }
-  }
-
-  // Also check settings.security.auth.apiKey as fallback (only for default env key)
-  if (settings.security?.auth?.apiKey) {
-    return {
-      hasKey: true,
-      checkedEnvKey: defaultEnvKey || undefined,
-      isExplicitEnvKey: false,
-    };
-  }
-
-  return {
-    hasKey: false,
-    checkedEnvKey: defaultEnvKey,
-    isExplicitEnvKey: false,
-  };
-}
-
-/**
- * Generate API key error message based on auth check result.
- * Returns null if API key is present, otherwise returns the appropriate error message.
- */
-function getApiKeyError(
-  authMethod: string,
-  settings: Settings,
-  config?: Config,
-): string | null {
-  const { hasKey, checkedEnvKey, isExplicitEnvKey } = hasApiKeyForAuth(
-    authMethod,
-    settings,
-    config,
-  );
-  if (hasKey) {
-    return null;
-  }
-
-  const envKeyHint = checkedEnvKey || DEFAULT_ENV_KEYS[authMethod];
-  if (isExplicitEnvKey) {
-    return t(
-      '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.',
-      { envKeyHint },
-    );
-  }
-  return t(
-    '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.',
-    { envKeyHint },
-  );
-}
-
-/**
- * Validate that the required credentials and configuration exist for the given auth method.
- */
-export function validateAuthMethod(
-  authMethod: string,
-  config?: Config,
-): string | null {
+export function validateAuthMethod(authMethod: string): string | null {
   const settings = loadSettings();
   loadEnvironment(settings.merged);
 
   if (authMethod === AuthType.USE_OPENAI) {
-    const { hasKey, checkedEnvKey, isExplicitEnvKey } = hasApiKeyForAuth(
-      authMethod,
-      settings.merged,
-      config,
-    );
-    if (!hasKey) {
-      const envKeyHint = checkedEnvKey
-        ? `'${checkedEnvKey}'`
-        : "'OPENAI_API_KEY'";
-      if (isExplicitEnvKey) {
-        // Explicit envKey configured - only suggest setting the env var
-        return t(
-          'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.',
-          { envKeyHint },
-        );
-      }
-      // Default env key - can use either apiKey or env var
-      return t(
-        'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.',
-        { envKeyHint },
-      );
+    const hasApiKey =
+      process.env['OPENAI_API_KEY'] || settings.merged.security?.auth?.apiKey;
+    if (!hasApiKey) {
+      return 'OPENAI_API_KEY environment variable not found. You can enter it interactively or add it to your .env file.';
     }
     return null;
   }
@@ -174,50 +26,23 @@ export function validateAuthMethod(
     return null;
   }
 
-  if (authMethod === AuthType.USE_ANTHROPIC) {
-    const apiKeyError = getApiKeyError(authMethod, settings.merged, config);
-    if (apiKeyError) {
-      return apiKeyError;
-    }
-
-    // Check baseUrl - can come from modelProviders or environment
-    const modelProviders = settings.merged.modelProviders as
-      | ModelProvidersConfig
-      | undefined;
-    // Use config.modelsConfig.getModel() if available for accurate model ID
-    const modelId =
-      config?.modelsConfig.getModel() ?? settings.merged.model?.name;
-    const modelConfig = findModelConfig(modelProviders, authMethod, modelId);
-
-    if (modelConfig && !modelConfig.baseUrl) {
-      return t(
-        'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.',
-      );
-    }
-    if (!modelConfig && !process.env['ANTHROPIC_BASE_URL']) {
-      return t('ANTHROPIC_BASE_URL environment variable not found.');
-    }
-
-    return null;
-  }
-
   if (authMethod === AuthType.USE_GEMINI) {
-    const apiKeyError = getApiKeyError(authMethod, settings.merged, config);
-    if (apiKeyError) {
-      return apiKeyError;
+    const hasApiKey = process.env['GEMINI_API_KEY'];
+    if (!hasApiKey) {
+      return 'GEMINI_API_KEY environment variable not found. Please set it in your .env file or environment variables.';
     }
     return null;
   }
 
   if (authMethod === AuthType.USE_VERTEX_AI) {
-    const apiKeyError = getApiKeyError(authMethod, settings.merged, config);
-    if (apiKeyError) {
-      return apiKeyError;
+    const hasApiKey = process.env['GOOGLE_API_KEY'];
+    if (!hasApiKey) {
+      return 'GOOGLE_API_KEY environment variable not found. Please set it in your .env file or environment variables.';
     }
 
     process.env['GOOGLE_GENAI_USE_VERTEXAI'] = 'true';
     return null;
   }
 
-  return t('Invalid auth method selected.');
+  return 'Invalid auth method selected.';
 }

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

@@ -231,21 +231,18 @@ describe('Configuration Integration Tests', () => {
       expect(config.getExtensionContextFilePaths()).toEqual([]);
     });
 
-    it('should correctly store and return extension context file paths with outputLanguageFilePath', () => {
-      const outputLanguageFilePath = '/path/to/language.txt';
+    it('should correctly store and return extension context file paths', () => {
+      const contextFiles = ['/path/to/file1.txt', '/path/to/file2.js'];
       const configParams: ConfigParameters = {
         cwd: '/tmp',
         generationConfig: TEST_CONTENT_GENERATOR_CONFIG,
         embeddingModel: 'test-embedding-model',
         targetDir: tempDir,
         debugMode: false,
-        outputLanguageFilePath,
+        extensionContextFilePaths: contextFiles,
       };
       const config = new Config(configParams);
-      // outputLanguageFilePath should be included in extension context file paths
-      expect(config.getExtensionContextFilePaths()).toContain(
-        outputLanguageFilePath,
-      );
+      expect(config.getExtensionContextFilePaths()).toEqual(contextFiles);
     });
   });
 

packages/cli/src/config/config.ts

@@ -9,29 +9,26 @@ import {
   AuthType,
   Config,
   DEFAULT_QWEN_EMBEDDING_MODEL,
+  DEFAULT_MEMORY_FILE_FILTERING_OPTIONS,
+  EditTool,
   FileDiscoveryService,
   getCurrentGeminiMdFilename,
   loadServerHierarchicalMemory,
   setGeminiMdFilename as setServerGeminiMdFilename,
+  ShellTool,
+  WriteFileTool,
   resolveTelemetrySettings,
   FatalConfigError,
   Storage,
   InputFormat,
   OutputFormat,
-  isToolEnabled,
   SessionService,
   type ResumedSessionData,
-  type ToolName,
-  EditTool,
-  ShellTool,
-  WriteFileTool,
+  type FileFilteringOptions,
+  type MCPServerConfig,
 } from '@qwen-code/qwen-code-core';
 import { extensionsCommand } from '../commands/extensions.js';
 import type { Settings } from './settings.js';
-import {
-  resolveCliGenerationConfig,
-  getAuthTypeFromEnv,
-} from '../utils/modelConfigUtils.js';
 import yargs, { type Argv } from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import * as fs from 'node:fs';
@@ -40,11 +37,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
@@ -111,9 +111,7 @@ export interface CliArgs {
   telemetryOutfile: string | undefined;
   allowedMcpServerNames: string[] | undefined;
   allowedTools: string[] | undefined;
-  acp: boolean | undefined;
   experimentalAcp: boolean | undefined;
-  experimentalSkills: boolean | undefined;
   extensions: string[] | undefined;
   listExtensions: boolean | undefined;
   openaiLogging: boolean | undefined;
@@ -164,17 +162,7 @@ function normalizeOutputFormat(
 }
 
 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
-  if (
-    rawArgv.length > 0 &&
-    (rawArgv[0].endsWith('/dist/qwen-cli/cli.js') ||
-      rawArgv[0].endsWith('/dist/cli.js'))
-  ) {
-    rawArgv = rawArgv.slice(1);
-  }
-
+  const rawArgv = hideBin(process.argv);
   const yargsInstance = yargs(rawArgv)
     .locale('en')
     .scriptName('qwen')
@@ -315,27 +303,9 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           description: 'Enables checkpointing of file edits',
           default: false,
         })
-        .option('acp', {
-          type: 'boolean',
-          description: 'Starts the agent in ACP mode',
-        })
         .option('experimental-acp', {
           type: 'boolean',
-          description:
-            'Starts the agent in ACP mode (deprecated, use --acp instead)',
-          hidden: true,
-        })
-        .option('experimental-skills', {
-          type: 'boolean',
-          description: 'Enable experimental Skills feature',
-          default: (() => {
-            const legacySkills = (
-              settings as Settings & {
-                tools?: { experimental?: { skills?: boolean } };
-              }
-            ).tools?.experimental?.skills;
-            return settings.experimental?.skills ?? legacySkills ?? false;
-          })(),
+          description: 'Starts the agent in ACP mode',
         })
         .option('channel', {
           type: 'string',
@@ -492,7 +462,6 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
           type: 'string',
           choices: [
             AuthType.USE_OPENAI,
-            AuthType.USE_ANTHROPIC,
             AuthType.QWEN_OAUTH,
             AuthType.USE_GEMINI,
             AuthType.USE_VERTEX_AI,
@@ -561,9 +530,11 @@ export async function parseArguments(settings: Settings): 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
@@ -611,19 +582,8 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
   // The import format is now only controlled by settings.memoryImportFormat
   // We no longer accept it as a CLI argument
 
-  // Handle deprecated --experimental-acp flag
-  if (result['experimentalAcp']) {
-    console.warn(
-      '\x1b[33m⚠ Warning: --experimental-acp is deprecated and will be removed in a future release. Please use --acp instead.\x1b[0m',
-    );
-    // Map experimental-acp to acp if acp is not explicitly set
-    if (!result['acp']) {
-      (result as Record<string, unknown>)['acp'] = true;
-    }
-  }
-
-  // Apply ACP fallback: if acp or experimental-acp is present but no explicit --channel, treat as ACP
-  if ((result['acp'] || result['experimentalAcp']) && !result['channel']) {
+  // Apply ACP fallback: if experimental-acp is present but no explicit --channel, treat as ACP
+  if (result['experimentalAcp'] && !result['channel']) {
     (result as Record<string, unknown>)['channel'] = 'ACP';
   }
 
@@ -638,9 +598,11 @@ export async function loadHierarchicalGeminiMemory(
   includeDirectoriesToReadGemini: readonly string[] = [],
   debugMode: boolean,
   fileService: FileDiscoveryService,
+  settings: Settings,
   extensionContextFilePaths: string[] = [],
   folderTrust: boolean,
   memoryImportFormat: 'flat' | 'tree' = 'tree',
+  fileFilteringOptions?: FileFilteringOptions,
 ): Promise<{ memoryContent: string; fileCount: number }> {
   // FIX: Use real, canonical paths for a reliable comparison to handle symlinks.
   const realCwd = fs.realpathSync(path.resolve(currentWorkingDirectory));
@@ -666,6 +628,8 @@ export async function loadHierarchicalGeminiMemory(
     extensionContextFilePaths,
     folderTrust,
     memoryImportFormat,
+    fileFilteringOptions,
+    settings.context?.discoveryMaxDirs,
   );
 }
 
@@ -680,17 +644,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.
@@ -702,27 +679,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;
@@ -810,44 +811,20 @@ export async function loadCliConfig(
   // However, if stream-json input is used, control can be requested via JSON messages,
   // so tools should not be excluded in that case.
   const extraExcludes: string[] = [];
-  const resolvedCoreTools = argv.coreTools || settings.tools?.core || [];
-  const resolvedAllowedTools =
-    argv.allowedTools || settings.tools?.allowed || [];
-  const isExplicitlyEnabled = (toolName: ToolName): boolean => {
-    if (resolvedCoreTools.length > 0) {
-      if (isToolEnabled(toolName, resolvedCoreTools, [])) {
-        return true;
-      }
-    }
-    if (resolvedAllowedTools.length > 0) {
-      if (isToolEnabled(toolName, resolvedAllowedTools, [])) {
-        return true;
-      }
-    }
-    return false;
-  };
-  const excludeUnlessExplicit = (toolName: ToolName): void => {
-    if (!isExplicitlyEnabled(toolName)) {
-      extraExcludes.push(toolName);
-    }
-  };
-
-  // ACP mode check: must include both --acp (current) and --experimental-acp (deprecated).
-  // Without this check, edit, write_file, run_shell_command would be excluded in ACP mode.
-  const isAcpMode = argv.acp || argv.experimentalAcp;
-  if (!interactive && !isAcpMode && inputFormat !== InputFormat.STREAM_JSON) {
+  if (
+    !interactive &&
+    !argv.experimentalAcp &&
+    inputFormat !== InputFormat.STREAM_JSON
+  ) {
     switch (approvalMode) {
       case ApprovalMode.PLAN:
       case ApprovalMode.DEFAULT:
-        // In default non-interactive mode, all tools that require approval are excluded,
-        // unless explicitly enabled via coreTools/allowedTools.
-        excludeUnlessExplicit(ShellTool.Name as ToolName);
-        excludeUnlessExplicit(EditTool.Name as ToolName);
-        excludeUnlessExplicit(WriteFileTool.Name as ToolName);
+        // In default non-interactive mode, all tools that require approval are excluded.
+        extraExcludes.push(ShellTool.Name, EditTool.Name, WriteFileTool.Name);
         break;
       case ApprovalMode.AUTO_EDIT:
         // In auto-edit non-interactive mode, only tools that still require a prompt are excluded.
-        excludeUnlessExplicit(ShellTool.Name as ToolName);
+        extraExcludes.push(ShellTool.Name);
         break;
       case ApprovalMode.YOLO:
         // No extra excludes for YOLO mode.
@@ -860,45 +837,44 @@ export async function loadCliConfig(
 
   const excludeTools = mergeExcludeTools(
     settings,
+    activeExtensions,
     extraExcludes.length > 0 ? extraExcludes : undefined,
     argv.excludeTools,
   );
+  const blockedMcpServers: Array<{ name: string; extensionName: string }> = [];
 
-  let allowedMcpServers: Set<string> | undefined;
-  let excludedMcpServers: Set<string> | undefined;
-  if (argv.allowedMcpServerNames) {
-    allowedMcpServers = new Set(argv.allowedMcpServerNames.filter(Boolean));
-    excludedMcpServers = undefined;
-  } else {
-    allowedMcpServers = settings.mcp?.allowed
-      ? new Set(settings.mcp.allowed.filter(Boolean))
-      : undefined;
-    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)),
+        );
+      }
+    }
   }
 
-  const selectedAuthType =
-    (argv.authType as AuthType | undefined) ||
-    settings.security?.auth?.selectedType ||
-    /* getAuthTypeFromEnv means no authType was explicitly provided, we infer the authType from env vars */
-    getAuthTypeFromEnv();
+  if (argv.allowedMcpServerNames) {
+    mcpServers = allowedMcpServers(
+      mcpServers,
+      argv.allowedMcpServerNames,
+      blockedMcpServers,
+    );
+  }
 
-  // Unified resolution of generation config with source attribution
-  const resolvedCliConfig = resolveCliGenerationConfig({
-    argv: {
-      model: argv.model,
-      openaiApiKey: argv.openaiApiKey,
-      openaiBaseUrl: argv.openaiBaseUrl,
-      openaiLogging: argv.openaiLogging,
-      openaiLoggingDir: argv.openaiLoggingDir,
-    },
-    settings,
-    selectedAuthType,
-    env: process.env as Record<string, string | undefined>,
-  });
-
-  const { model: resolvedModel } = resolvedCliConfig;
+  const resolvedModel =
+    argv.model ||
+    process.env['OPENAI_MODEL'] ||
+    process.env['QWEN_MODEL'] ||
+    settings.model?.name;
 
   const sandboxConfig = await loadSandboxConfig(settings, argv);
   const screenReader =
@@ -932,8 +908,6 @@ export async function loadCliConfig(
     }
   }
 
-  const modelProvidersConfig = settings.modelProviders;
-
   return new Config({
     sessionId,
     sessionData,
@@ -943,7 +917,6 @@ export async function loadCliConfig(
     includeDirectories,
     loadMemoryFromIncludeDirectories:
       settings.context?.loadMemoryFromIncludeDirectories || false,
-    importFormat: settings.context?.importFormat || 'tree',
     debugMode,
     question,
     fullContext: argv.allFiles || false,
@@ -953,13 +926,9 @@ 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,
@@ -982,24 +951,45 @@ 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,
+    experimentalZedIntegration: argv.experimentalAcp || false,
     listExtensions: argv.listExtensions || false,
-    overrideExtensions: overrideExtensions || argv.extensions,
+    extensions: allExtensions,
+    blockedMcpServers,
     noBrowser: !!process.env['NO_BROWSER'],
-    authType: selectedAuthType,
+    authType:
+      (argv.authType as AuthType | undefined) ||
+      settings.security?.auth?.selectedType,
     inputFormat,
     outputFormat,
     includePartialMessages,
-    modelProvidersConfig,
-    generationConfigSources: resolvedCliConfig.sources,
-    generationConfig: resolvedCliConfig.generationConfig,
+    generationConfig: {
+      ...(settings.model?.generationConfig || {}),
+      model: resolvedModel,
+      apiKey:
+        argv.openaiApiKey ||
+        process.env['OPENAI_API_KEY'] ||
+        settings.security?.auth?.apiKey,
+      baseUrl:
+        argv.openaiBaseUrl ||
+        process.env['OPENAI_BASE_URL'] ||
+        settings.security?.auth?.baseUrl,
+      enableOpenAILogging:
+        (typeof argv.openaiLogging === 'undefined'
+          ? settings.model?.enableOpenAILogging
+          : argv.openaiLogging) ?? false,
+      openAILoggingDir:
+        argv.openaiLoggingDir || settings.model?.openAILoggingDir,
+    },
     cliVersion: await getCliVersion(),
-    webSearch: buildWebSearchConfig(argv, settings, selectedAuthType),
+    webSearch: buildWebSearchConfig(
+      argv,
+      settings,
+      settings.security?.auth?.selectedType,
+    ),
     summarizeToolOutput: settings.model?.summarizeToolOutput,
     ideMode,
     chatCompression: settings.model?.chatCompression,
@@ -1031,8 +1021,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[] {
@@ -1041,5 +1084,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/keyBindings.ts

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

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

@@ -1,87 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, expect, it } from 'vitest';
-import { SettingScope } from './settings.js';
-import { getPersistScopeForModelSelection } from './modelProvidersScope.js';
-
-function makeSettings({
-  isTrusted,
-  userModelProviders,
-  workspaceModelProviders,
-}: {
-  isTrusted: boolean;
-  userModelProviders?: unknown;
-  workspaceModelProviders?: unknown;
-}) {
-  const userSettings: Record<string, unknown> = {};
-  const workspaceSettings: Record<string, unknown> = {};
-
-  // When undefined, treat as "not present in this scope" (the key is omitted),
-  // matching how LoadedSettings is shaped when a settings file doesn't define it.
-  if (userModelProviders !== undefined) {
-    userSettings['modelProviders'] = userModelProviders;
-  }
-  if (workspaceModelProviders !== undefined) {
-    workspaceSettings['modelProviders'] = workspaceModelProviders;
-  }
-
-  return {
-    isTrusted,
-    user: { settings: userSettings },
-    workspace: { settings: workspaceSettings },
-  } as unknown as import('./settings.js').LoadedSettings;
-}
-
-describe('getPersistScopeForModelSelection', () => {
-  it('prefers workspace when trusted and workspace defines modelProviders', () => {
-    const settings = makeSettings({
-      isTrusted: true,
-      workspaceModelProviders: {},
-      userModelProviders: { anything: true },
-    });
-
-    expect(getPersistScopeForModelSelection(settings)).toBe(
-      SettingScope.Workspace,
-    );
-  });
-
-  it('falls back to user when workspace does not define modelProviders', () => {
-    const settings = makeSettings({
-      isTrusted: true,
-      workspaceModelProviders: undefined,
-      userModelProviders: {},
-    });
-
-    expect(getPersistScopeForModelSelection(settings)).toBe(SettingScope.User);
-  });
-
-  it('ignores workspace modelProviders when workspace is untrusted', () => {
-    const settings = makeSettings({
-      isTrusted: false,
-      workspaceModelProviders: {},
-      userModelProviders: undefined,
-    });
-
-    expect(getPersistScopeForModelSelection(settings)).toBe(SettingScope.User);
-  });
-
-  it('falls back to legacy trust heuristic when neither scope defines modelProviders', () => {
-    const trusted = makeSettings({
-      isTrusted: true,
-      userModelProviders: undefined,
-      workspaceModelProviders: undefined,
-    });
-    expect(getPersistScopeForModelSelection(trusted)).toBe(SettingScope.User);
-
-    const untrusted = makeSettings({
-      isTrusted: false,
-      userModelProviders: undefined,
-      workspaceModelProviders: undefined,
-    });
-    expect(getPersistScopeForModelSelection(untrusted)).toBe(SettingScope.User);
-  });
-});

packages/cli/src/config/modelProvidersScope.ts

@@ -1,48 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { SettingScope, type LoadedSettings } from './settings.js';
-
-function hasOwnModelProviders(settingsObj: unknown): boolean {
-  if (!settingsObj || typeof settingsObj !== 'object') {
-    return false;
-  }
-  const obj = settingsObj as Record<string, unknown>;
-  // Treat an explicitly configured empty object (modelProviders: {}) as "owned"
-  // by this scope, which is important when mergeStrategy is REPLACE.
-  return Object.prototype.hasOwnProperty.call(obj, 'modelProviders');
-}
-
-/**
- * Returns which writable scope (Workspace/User) owns the effective modelProviders
- * configuration.
- *
- * Note: Workspace scope is only considered when the workspace is trusted.
- */
-export function getModelProvidersOwnerScope(
-  settings: LoadedSettings,
-): SettingScope | undefined {
-  if (settings.isTrusted && hasOwnModelProviders(settings.workspace.settings)) {
-    return SettingScope.Workspace;
-  }
-
-  if (hasOwnModelProviders(settings.user.settings)) {
-    return SettingScope.User;
-  }
-
-  return undefined;
-}
-
-/**
- * Choose the settings scope to persist a model selection.
- * Prefer persisting back to the scope that contains the effective modelProviders
- * config, otherwise fall back to the legacy trust-based heuristic.
- */
-export function getPersistScopeForModelSelection(
-  settings: LoadedSettings,
-): SettingScope {
-  return getModelProvidersOwnerScope(settings) ?? SettingScope.User;
-}

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

@@ -51,10 +51,10 @@ 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 {
-  getSettingsWarnings,
   loadSettings,
   USER_SETTINGS_PATH, // This IS the mocked path.
   getSystemSettingsPath,
@@ -64,6 +64,8 @@ import {
   needsMigration,
   type Settings,
   loadEnvironment,
+  migrateDeprecatedSettings,
+  SettingScope,
   SETTINGS_VERSION,
   SETTINGS_VERSION_KEY,
 } from './settings.js';
@@ -416,86 +418,6 @@ describe('Settings Loading and Merging', () => {
       });
     });
 
-    it('should warn about ignored legacy keys in a v2 settings file', () => {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      const userSettingsContent = {
-        [SETTINGS_VERSION_KEY]: SETTINGS_VERSION,
-        usageStatisticsEnabled: false,
-      };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
-
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      expect(getSettingsWarnings(settings)).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining(
-            "Legacy setting 'usageStatisticsEnabled' will be ignored",
-          ),
-        ]),
-      );
-      expect(getSettingsWarnings(settings)).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining("'privacy.usageStatisticsEnabled'"),
-        ]),
-      );
-    });
-
-    it('should warn about unknown top-level keys in a v2 settings file', () => {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      const userSettingsContent = {
-        [SETTINGS_VERSION_KEY]: SETTINGS_VERSION,
-        someUnknownKey: 'value',
-      };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
-
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      expect(getSettingsWarnings(settings)).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining(
-            "Unknown setting 'someUnknownKey' will be ignored",
-          ),
-        ]),
-      );
-    });
-
-    it('should not warn for valid v2 container keys', () => {
-      (mockFsExistsSync as Mock).mockImplementation(
-        (p: fs.PathLike) => p === USER_SETTINGS_PATH,
-      );
-      const userSettingsContent = {
-        [SETTINGS_VERSION_KEY]: SETTINGS_VERSION,
-        model: { name: 'qwen-coder' },
-      };
-      (fs.readFileSync as Mock).mockImplementation(
-        (p: fs.PathOrFileDescriptor) => {
-          if (p === USER_SETTINGS_PATH)
-            return JSON.stringify(userSettingsContent);
-          return '{}';
-        },
-      );
-
-      const settings = loadSettings(MOCK_WORKSPACE_DIR);
-
-      expect(getSettingsWarnings(settings)).toEqual([]);
-    });
-
     it('should rewrite allowedTools to tools.allowed during migration', () => {
       (mockFsExistsSync as Mock).mockImplementation(
         (p: fs.PathLike) => p === USER_SETTINGS_PATH,
@@ -2727,4 +2649,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',
@@ -104,6 +106,7 @@ const MIGRATION_MAP: Record<string, string> = {
   mcpServers: 'mcpServers',
   mcpServerCommand: 'mcp.serverCommand',
   memoryImportFormat: 'context.importFormat',
+  memoryDiscoveryMaxDirs: 'context.discoveryMaxDirs',
   model: 'model.name',
   preferredEditor: 'general.preferredEditor',
   sandbox: 'tools.sandbox',
@@ -341,97 +344,6 @@ const KNOWN_V2_CONTAINERS = new Set(
   Object.values(MIGRATION_MAP).map((path) => path.split('.')[0]),
 );
 
-function getSettingsFileKeyWarnings(
-  settings: Record<string, unknown>,
-  settingsFilePath: string,
-): string[] {
-  const version = settings[SETTINGS_VERSION_KEY];
-  if (typeof version !== 'number' || version < SETTINGS_VERSION) {
-    return [];
-  }
-
-  const warnings: string[] = [];
-  const ignoredLegacyKeys = new Set<string>();
-
-  // Ignored legacy keys (V1 top-level keys that moved to a nested V2 path).
-  for (const [oldKey, newPath] of Object.entries(MIGRATION_MAP)) {
-    if (oldKey === newPath) {
-      continue;
-    }
-    if (!(oldKey in settings)) {
-      continue;
-    }
-
-    const oldValue = settings[oldKey];
-
-    // If this key is a V2 container (like 'model') and it's already an object,
-    // it's likely already in V2 format. Don't warn.
-    if (
-      KNOWN_V2_CONTAINERS.has(oldKey) &&
-      typeof oldValue === 'object' &&
-      oldValue !== null &&
-      !Array.isArray(oldValue)
-    ) {
-      continue;
-    }
-
-    ignoredLegacyKeys.add(oldKey);
-    warnings.push(
-      `⚠️  Legacy setting '${oldKey}' will be ignored in ${settingsFilePath}. Please use '${newPath}' instead.`,
-    );
-  }
-
-  // Unknown top-level keys.
-  const schemaKeys = new Set(Object.keys(getSettingsSchema()));
-  for (const key of Object.keys(settings)) {
-    if (key === SETTINGS_VERSION_KEY) {
-      continue;
-    }
-    if (ignoredLegacyKeys.has(key)) {
-      continue;
-    }
-    if (schemaKeys.has(key)) {
-      continue;
-    }
-
-    warnings.push(
-      `⚠️  Unknown setting '${key}' will be ignored in ${settingsFilePath}.`,
-    );
-  }
-
-  return warnings;
-}
-
-/**
- * Collects warnings for ignored legacy and unknown settings keys.
- *
- * For `$version: 2` settings files, we do not apply implicit migrations.
- * Instead, we surface actionable, de-duplicated warnings in the terminal UI.
- */
-export function getSettingsWarnings(loadedSettings: LoadedSettings): string[] {
-  const warningSet = new Set<string>();
-
-  for (const scope of [SettingScope.User, SettingScope.Workspace]) {
-    const settingsFile = loadedSettings.forScope(scope);
-    if (settingsFile.rawJson === undefined) {
-      continue; // File not present / not loaded.
-    }
-    const settingsObject = settingsFile.originalSettings as unknown as Record<
-      string,
-      unknown
-    >;
-
-    for (const warning of getSettingsFileKeyWarnings(
-      settingsObject,
-      settingsFile.path,
-    )) {
-      warningSet.add(warning);
-    }
-  }
-
-  return [...warningSet];
-}
-
 export function migrateSettingsToV1(
   v2Settings: Record<string, unknown>,
 ): Record<string, unknown> {
@@ -902,22 +814,22 @@ export function loadSettings(
 
 export function migrateDeprecatedSettings(
   loadedSettings: LoadedSettings,
+  workspaceDir: string = process.cwd(),
 ): void {
   const processScope = (scope: SettingScope) => {
     const settings = loadedSettings.forScope(scope).settings;
-    const legacySkills = (
-      settings as Settings & {
-        tools?: { experimental?: { skills?: boolean } };
-      }
-    ).tools?.experimental?.skills;
-    if (
-      legacySkills !== undefined &&
-      settings.experimental?.skills === undefined
-    ) {
+    if (settings.extensions?.disabled) {
       console.log(
-        `Migrating deprecated tools.experimental.skills setting from ${scope} settings...`,
+        `Migrating deprecated extensions.disabled settings from ${scope} settings...`,
       );
-      loadedSettings.setValue(scope, 'experimental.skills', legacySkills);
+      for (const extension of settings.extensions.disabled ?? []) {
+        disableExtension(extension, scope, workspaceDir);
+      }
+
+      const newExtensionsValue = { ...settings.extensions };
+      newExtensionsValue.disabled = undefined;
+
+      loadedSettings.setValue(scope, 'extensions', newExtensionsValue);
     }
   };
 

packages/cli/src/config/settingsSchema.ts

@@ -10,7 +10,6 @@ import type {
   TelemetrySettings,
   AuthType,
   ChatCompressionSettings,
-  ModelProvidersConfig,
 } from '@qwen-code/qwen-code-core';
 import {
   ApprovalMode,
@@ -103,19 +102,6 @@ const SETTINGS_SCHEMA = {
     mergeStrategy: MergeStrategy.SHALLOW_MERGE,
   },
 
-  // Model providers configuration grouped by authType
-  modelProviders: {
-    type: 'object',
-    label: 'Model Providers',
-    category: 'Model',
-    requiresRestart: false,
-    default: {} as ModelProvidersConfig,
-    description:
-      'Model providers configuration grouped by authType. Each authType contains an array of model configurations.',
-    showInDialog: false,
-    mergeStrategy: MergeStrategy.REPLACE,
-  },
-
   general: {
     type: 'object',
     label: 'General',
@@ -216,7 +202,6 @@ const SETTINGS_SCHEMA = {
           { value: 'en', label: 'English' },
           { value: 'zh', label: '中文 (Chinese)' },
           { value: 'ru', label: 'Русский (Russian)' },
-          { value: 'de', label: 'Deutsch (German)' },
         ],
       },
       terminalBell: {
@@ -434,16 +419,6 @@ const SETTINGS_SCHEMA = {
           'Show welcome back dialog when returning to a project with conversation history.',
         showInDialog: true,
       },
-      enableUserFeedback: {
-        type: 'boolean',
-        label: 'Enable User Feedback',
-        category: 'UI',
-        requiresRestart: false,
-        default: true,
-        description:
-          'Show optional feedback dialog after conversations to help improve Qwen performance.',
-        showInDialog: true,
-      },
       accessibility: {
         type: 'object',
         label: 'Accessibility',
@@ -474,15 +449,6 @@ const SETTINGS_SCHEMA = {
           },
         },
       },
-      feedbackLastShownTimestamp: {
-        type: 'number',
-        label: 'Feedback Last Shown Timestamp',
-        category: 'UI',
-        requiresRestart: false,
-        default: 0,
-        description: 'The last time the feedback dialog was shown.',
-        showInDialog: false,
-      },
     },
   },
 
@@ -741,6 +707,15 @@ const SETTINGS_SCHEMA = {
         description: 'The format to use when importing memory.',
         showInDialog: false,
       },
+      discoveryMaxDirs: {
+        type: 'number',
+        label: 'Memory Discovery Max Dirs',
+        category: 'Context',
+        requiresRestart: false,
+        default: 200,
+        description: 'Maximum number of directories to search for memory.',
+        showInDialog: true,
+      },
       includeDirectories: {
         type: 'array',
         label: 'Include Directories',
@@ -1217,15 +1192,14 @@ const SETTINGS_SCHEMA = {
     description: 'Setting to enable experimental features',
     showInDialog: false,
     properties: {
-      skills: {
+      extensionManagement: {
         type: 'boolean',
-        label: 'Skills',
+        label: 'Extension Management',
         category: 'Experimental',
         requiresRestart: true,
-        default: false,
-        description:
-          'Enable experimental Agent Skills feature. When enabled, Qwen Code can use Skills from .qwen/skills/ and ~/.qwen/skills/.',
-        showInDialog: true,
+        default: true,
+        description: 'Enable extension management features.',
+        showInDialog: false,
       },
       visionModelPreview: {
         type: 'boolean',
@@ -1249,6 +1223,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;

packages/cli/src/core/initializer.ts

@@ -15,7 +15,6 @@ import { type LoadedSettings, SettingScope } from '../config/settings.js';
 import { performInitialAuth } from './auth.js';
 import { validateTheme } from './theme.js';
 import { initializeI18n } from '../i18n/index.js';
-import { initializeLlmOutputLanguage } from '../ui/commands/languageCommand.js';
 
 export interface InitializationResult {
   authError: string | null;
@@ -42,12 +41,7 @@ export async function initializeApp(
     'auto';
   await initializeI18n(languageSetting);
 
-  // Auto-detect and set LLM output language on first use
-  initializeLlmOutputLanguage();
-
-  // Use authType from modelsConfig which respects CLI --auth-type argument
-  // over settings.security.auth.selectedType
-  const authType = config.modelsConfig.getCurrentAuthType();
+  const authType = settings.merged.security?.auth?.selectedType;
   const authError = await performInitialAuth(config, authType);
 
   // Fallback to user select when initial authentication fails
@@ -61,7 +55,7 @@ export async function initializeApp(
   const themeError = validateTheme(settings);
 
   const shouldOpenAuthDialog =
-    !config.modelsConfig.wasAuthTypeExplicitlyProvided() || !!authError;
+    settings.merged.security?.auth?.selectedType === undefined || !!authError;
 
   if (config.getIdeMode()) {
     const ideClient = await IdeClient.getInstance();

packages/cli/src/gemini.test.tsx

@@ -87,15 +87,6 @@ vi.mock('./config/sandboxConfig.js', () => ({
   loadSandboxConfig: vi.fn(),
 }));
 
-vi.mock('./core/initializer.js', () => ({
-  initializeApp: vi.fn().mockResolvedValue({
-    authError: null,
-    themeError: null,
-    shouldOpenAuthDialog: false,
-    geminiMdFileCount: 0,
-  }),
-}));
-
 describe('gemini.tsx main function', () => {
   let originalEnvGeminiSandbox: string | undefined;
   let originalEnvSandbox: string | undefined;
@@ -271,6 +262,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 +275,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,
@@ -365,6 +362,7 @@ describe('gemini.tsx main function', () => {
     expect(inputArg).toBe('hello stream');
 
     expect(validateAuthSpy).toHaveBeenCalledWith(
+      undefined,
       undefined,
       configStub,
       expect.any(Object),
@@ -462,9 +460,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       telemetryOutfile: undefined,
       allowedMcpServerNames: undefined,
       allowedTools: undefined,
-      acp: undefined,
       experimentalAcp: undefined,
-      experimentalSkills: undefined,
       extensions: undefined,
       listExtensions: undefined,
       openaiLogging: undefined,
@@ -642,37 +638,4 @@ describe('startInteractiveUI', () => {
     await new Promise((resolve) => setTimeout(resolve, 0));
     expect(checkForUpdates).toHaveBeenCalledTimes(1);
   });
-
-  it('should not check for updates when update nag is disabled', async () => {
-    const { checkForUpdates } = await import('./ui/utils/updateCheck.js');
-
-    const mockInitializationResult = {
-      authError: null,
-      themeError: null,
-      shouldOpenAuthDialog: false,
-      geminiMdFileCount: 0,
-    };
-
-    const settingsWithUpdateNagDisabled = {
-      merged: {
-        general: {
-          disableUpdateNag: true,
-        },
-        ui: {
-          hideWindowTitle: false,
-        },
-      },
-    } as LoadedSettings;
-
-    await startInteractiveUI(
-      mockConfig,
-      settingsWithUpdateNagDisabled,
-      mockStartupWarnings,
-      mockWorkspaceRoot,
-      mockInitializationResult,
-    );
-
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    expect(checkForUpdates).not.toHaveBeenCalled();
-  });
 });

packages/cli/src/gemini.tsx

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { Config } from '@qwen-code/qwen-code-core';
+import type { Config, AuthType } from '@qwen-code/qwen-code-core';
 import { InputFormat, logUserPrompt } from '@qwen-code/qwen-code-core';
 import { render } from 'ink';
 import dns from 'node:dns';
@@ -15,8 +15,9 @@ 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 { loadSettings, migrateDeprecatedSettings } from './config/settings.js';
 import {
   initializeApp,
   type InitializationResult,
@@ -102,6 +103,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';
 
@@ -181,18 +183,16 @@ export async function startInteractiveUI(
     },
   );
 
-  if (!settings.merged.general?.disableUpdateNag) {
-    checkForUpdates()
-      .then((info) => {
-        handleAutoUpdate(info, settings, config.getProjectRoot());
-      })
-      .catch((err) => {
-        // Silently ignore update check errors.
-        if (config.getDebugMode()) {
-          console.error('Update check failed:', err);
-        }
-      });
-  }
+  checkForUpdates()
+    .then((info) => {
+      handleAutoUpdate(info, settings, config.getProjectRoot());
+    })
+    .catch((err) => {
+      // Silently ignore update check errors.
+      if (config.getDebugMode()) {
+        console.error('Update check failed:', err);
+      }
+    });
 
   registerCleanup(() => instance.unmount());
 }
@@ -200,6 +200,7 @@ export async function startInteractiveUI(
 export async function main() {
   setupUnhandledRejectionHandler();
   const settings = loadSettings();
+  migrateDeprecatedSettings(settings);
   await cleanupCheckpoints();
 
   let argv = await parseArguments(settings.merged);
@@ -244,25 +245,27 @@ 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) {
+      if (
+        settings.merged.security?.auth?.selectedType &&
+        !settings.merged.security?.auth?.useExternal
+      ) {
         // Validate authentication here because the sandbox will interfere with the Oauth2 web redirect.
         try {
-          const authType = partialConfig.modelsConfig.getCurrentAuthType();
-          // Fresh users may not have selected/persisted an authType yet.
-          // In that case, defer auth prompting/selection to the main interactive flow.
-          if (authType) {
-            const err = validateAuthMethod(authType, partialConfig);
-            if (err) {
-              throw new Error(err);
-            }
-
-            await partialConfig.refreshAuth(authType);
+          const err = validateAuthMethod(
+            settings.merged.security.auth.selectedType,
+          );
+          if (err) {
+            throw new Error(err);
           }
+
+          await partialConfig.refreshAuth(
+            settings.merged.security.auth.selectedType,
+          );
         } catch (err) {
           console.error('Error authenticating:', err);
           process.exit(1);
@@ -328,22 +331,25 @@ export async function main() {
   // to run Gemini CLI. It is now safe to perform expensive initialization that
   // may have side effects.
   {
-    const config = await loadCliConfig(
-      settings.merged,
-      argv,
-      process.cwd(),
+    const extensionEnablementManager = new ExtensionEnablementManager(
+      ExtensionStorage.getUserExtensionsDir(),
       argv.extensions,
     );
-    registerCleanup(() => config.shutdown());
+    const extensions = loadExtensions(extensionEnablementManager);
+    const config = await loadCliConfig(
+      settings.merged,
+      extensions,
+      extensionEnablementManager,
+      argv,
+    );
 
-    // 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,20 +395,17 @@ export async function main() {
     }
 
     if (config.getExperimentalZedIntegration()) {
-      return runAcpAgent(config, settings, argv);
+      return runAcpAgent(config, settings, extensions, argv);
     }
 
     let input = config.getQuestion();
     const startupWarnings = [
-      ...new Set([
-        ...(await getStartupWarnings()),
-        ...(await getUserStartupWarnings({
-          workspaceRoot: process.cwd(),
-          useRipgrep: settings.merged.tools?.useRipgrep ?? true,
-          useBuiltinRipgrep: settings.merged.tools?.useBuiltinRipgrep ?? true,
-        })),
-        ...getSettingsWarnings(settings),
-      ]),
+      ...(await getStartupWarnings()),
+      ...(await getUserStartupWarnings({
+        workspaceRoot: process.cwd(),
+        useRipgrep: settings.merged.tools?.useRipgrep ?? true,
+        useBuiltinRipgrep: settings.merged.tools?.useBuiltinRipgrep ?? true,
+      })),
     ];
 
     // Render UI, passing necessary config values. Check that there is no command line question.
@@ -435,6 +438,8 @@ export async function main() {
     }
 
     const nonInteractiveConfig = await validateNonInteractiveAuth(
+      (argv.authType as AuthType) ||
+        settings.merged.security?.auth?.selectedType,
       settings.merged.security?.auth?.useExternal,
       config,
       settings,

packages/cli/src/i18n/index.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright 2025 Qwen team
+ * Copyright 2025 Qwen
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,21 +8,15 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { homedir } from 'node:os';
-import {
-  type SupportedLanguage,
-  getLanguageNameFromLocale,
-} from './languages.js';
 
-export type { SupportedLanguage };
-export { getLanguageNameFromLocale };
+export type SupportedLanguage = 'en' | 'zh' | 'ru' | string; // Allow custom language codes
 
 // State
 let currentLanguage: SupportedLanguage = 'en';
-let translations: Record<string, string | string[]> = {};
+let translations: Record<string, string> = {};
 
 // Cache
-type TranslationValue = string | string[];
-type TranslationDict = Record<string, TranslationValue>;
+type TranslationDict = Record<string, string>;
 const translationCache: Record<string, TranslationDict> = {};
 const loadingPromises: Record<string, Promise<TranslationDict>> = {};
 
@@ -58,13 +52,11 @@ export function detectSystemLanguage(): SupportedLanguage {
   if (envLang?.startsWith('zh')) return 'zh';
   if (envLang?.startsWith('en')) return 'en';
   if (envLang?.startsWith('ru')) return 'ru';
-  if (envLang?.startsWith('de')) return 'de';
 
   try {
     const locale = Intl.DateTimeFormat().resolvedOptions().locale;
     if (locale.startsWith('zh')) return 'zh';
     if (locale.startsWith('ru')) return 'ru';
-    if (locale.startsWith('de')) return 'de';
   } catch {
     // Fallback to default
   }
@@ -232,25 +224,9 @@ export function getCurrentLanguage(): SupportedLanguage {
 
 export function t(key: string, params?: Record<string, string>): string {
   const translation = translations[key] ?? key;
-  if (Array.isArray(translation)) {
-    return key;
-  }
   return interpolate(translation, params);
 }
 
-/**
- * Get a translation that is an array of strings.
- * @param key The translation key
- * @returns The array of strings, or an empty array if not found or not an array
- */
-export function ta(key: string): string[] {
-  const translation = translations[key];
-  if (Array.isArray(translation)) {
-    return translation;
-  }
-  return [];
-}
-
 export async function initializeI18n(
   lang?: SupportedLanguage | 'auto',
 ): Promise<void> {

packages/cli/src/i18n/languages.ts

@@ -1,48 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export type SupportedLanguage = 'en' | 'zh' | 'ru' | 'de' | string;
-
-export interface LanguageDefinition {
-  /** The internal locale code used by the i18n system (e.g., 'en', 'zh'). */
-  code: SupportedLanguage;
-  /** The standard name used in UI settings (e.g., 'en-US', 'zh-CN'). */
-  id: string;
-  /** The full English name of the language (e.g., 'English', 'Chinese'). */
-  fullName: string;
-}
-
-export const SUPPORTED_LANGUAGES: readonly LanguageDefinition[] = [
-  {
-    code: 'en',
-    id: 'en-US',
-    fullName: 'English',
-  },
-  {
-    code: 'zh',
-    id: 'zh-CN',
-    fullName: 'Chinese',
-  },
-  {
-    code: 'ru',
-    id: 'ru-RU',
-    fullName: 'Russian',
-  },
-  {
-    code: 'de',
-    id: 'de-DE',
-    fullName: 'German',
-  },
-];
-
-/**
- * Maps a locale code to its English language name.
- * Used for LLM output language instructions.
- */
-export function getLanguageNameFromLocale(locale: SupportedLanguage): string {
-  const lang = SUPPORTED_LANGUAGES.find((l) => l.code === locale);
-  return lang?.fullName || 'English';
-}

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

@@ -89,9 +89,6 @@ export default {
   'No tools available': 'No tools available',
   'View or change the approval mode for tool usage':
     'View or change the approval mode for tool usage',
-  'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
-    'Invalid approval mode "{{arg}}". Valid modes: {{modes}}',
-  'Approval mode set to "{{mode}}"': 'Approval mode set to "{{mode}}"',
   'View or change the language setting': 'View or change the language setting',
   'change the theme': 'change the theme',
   'Select Theme': 'Select Theme',
@@ -105,8 +102,8 @@ export default {
   'Theme "{{themeName}}" not found.': 'Theme "{{themeName}}" not found.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Theme "{{themeName}}" not found in selected scope.',
-  'Clear conversation history and free up context':
-    'Clear conversation history and free up context',
+  'clear the screen and conversation history':
+    'clear the screen and conversation history',
   'Compresses the context by replacing it with a summary.':
     'Compresses the context by replacing it with a summary.',
   'open full Qwen Code documentation in your browser':
@@ -152,7 +149,6 @@ export default {
   'Project Level ({{path}})': 'Project Level ({{path}})',
   'User Level ({{path}})': 'User Level ({{path}})',
   'Built-in Agents': 'Built-in Agents',
-  'Extension Agents': 'Extension Agents',
   'Using: {{count}} agents': 'Using: {{count}} agents',
   'View Agent': 'View Agent',
   'Edit Agent': 'Edit Agent',
@@ -262,8 +258,6 @@ export default {
   ', Tab to change focus': ', Tab to change focus',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.',
-  'The command "/{{command}}" is not supported in non-interactive mode.':
-    'The command "/{{command}}" is not supported in non-interactive mode.',
   // ============================================================================
   // Settings Labels
   // ============================================================================
@@ -287,13 +281,6 @@ export default {
   'Show Citations': 'Show Citations',
   'Custom Witty Phrases': 'Custom Witty Phrases',
   'Enable Welcome Back': 'Enable Welcome Back',
-  'Enable User Feedback': 'Enable User Feedback',
-  'How is Qwen doing this session? (optional)':
-    'How is Qwen doing this session? (optional)',
-  Bad: 'Bad',
-  Good: 'Good',
-  'Not Sure Yet': 'Not Sure Yet',
-  'Any other key': 'Any other key',
   'Disable Loading Phrases': 'Disable Loading Phrases',
   'Screen Reader Mode': 'Screen Reader Mode',
   'IDE Mode': 'IDE Mode',
@@ -352,60 +339,6 @@ export default {
   'List active extensions': 'List active extensions',
   'Update extensions. Usage: update <extension-names>|--all':
     'Update extensions. Usage: update <extension-names>|--all',
-  'Disable an extension': 'Disable an extension',
-  'Enable an extension': 'Enable an extension',
-  'Install an extension from a git repo or local path':
-    'Install an extension from a git repo or local path',
-  'Uninstall an extension': 'Uninstall an extension',
-  'No extensions installed.': 'No extensions installed.',
-  'Usage: /extensions update <extension-names>|--all':
-    'Usage: /extensions update <extension-names>|--all',
-  'Extension "{{name}}" not found.': 'Extension "{{name}}" not found.',
-  'No extensions to update.': 'No extensions to update.',
-  'Usage: /extensions install <source>': 'Usage: /extensions install <source>',
-  'Installing extension from "{{source}}"...':
-    'Installing extension from "{{source}}"...',
-  'Extension "{{name}}" installed successfully.':
-    'Extension "{{name}}" installed successfully.',
-  'Failed to install extension from "{{source}}": {{error}}':
-    'Failed to install extension from "{{source}}": {{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    'Usage: /extensions uninstall <extension-name>',
-  'Uninstalling extension "{{name}}"...':
-    'Uninstalling extension "{{name}}"...',
-  'Extension "{{name}}" uninstalled successfully.':
-    'Extension "{{name}}" uninstalled successfully.',
-  'Failed to uninstall extension "{{name}}": {{error}}':
-    'Failed to uninstall extension "{{name}}": {{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]',
-  'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
-    'Unsupported scope "{{scope}}", should be one of "user" or "workspace"',
-  'Extension "{{name}}" disabled for scope "{{scope}}"':
-    'Extension "{{name}}" disabled for scope "{{scope}}"',
-  'Extension "{{name}}" enabled for scope "{{scope}}"':
-    'Extension "{{name}}" enabled for scope "{{scope}}"',
-  'Do you want to continue? [Y/n]: ': 'Do you want to continue? [Y/n]: ',
-  'Do you want to continue?': 'Do you want to continue?',
-  'Installing extension "{{name}}".': 'Installing extension "{{name}}".',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**',
-  'This extension will run the following MCP servers:':
-    'This extension will run the following MCP servers:',
-  local: 'local',
-  remote: 'remote',
-  'This extension will add the following commands: {{commands}}.':
-    'This extension will add the following commands: {{commands}}.',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    'This extension will append info to your QWEN.md context using {{fileName}}',
-  'This extension will exclude the following core tools: {{tools}}':
-    'This extension will exclude the following core tools: {{tools}}',
-  'This extension will install the following skills:':
-    'This extension will install the following skills:',
-  'This extension will install the following subagents:':
-    'This extension will install the following subagents:',
-  'Installation cancelled for "{{name}}".':
-    'Installation cancelled for "{{name}}".',
   'manage IDE integration': 'manage IDE integration',
   'check status of IDE integration': 'check status of IDE integration',
   'install required IDE companion for {{ideName}}':
@@ -657,12 +590,6 @@ export default {
   'No conversation found to summarize.': 'No conversation found to summarize.',
   'Failed to generate project context summary: {{error}}':
     'Failed to generate project context summary: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'Saved project summary to {{filePathForDisplay}}.',
-  'Saving project summary...': 'Saving project summary...',
-  'Generating project summary...': 'Generating project summary...',
-  'Failed to generate summary - no text content received from LLM response':
-    'Failed to generate summary - no text content received from LLM response',
 
   // ============================================================================
   // Commands - Model
@@ -677,10 +604,9 @@ export default {
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    'Starting a new session, resetting chat, and clearing terminal.',
-  'Starting a new session and clearing.':
-    'Starting a new session and clearing.',
+  'Clearing terminal and resetting chat.':
+    'Clearing terminal and resetting chat.',
+  'Clearing terminal.': 'Clearing terminal.',
 
   // ============================================================================
   // Commands - Compress
@@ -832,21 +758,6 @@ export default {
     'Authentication timed out. Please try again.',
   'Waiting for auth... (Press ESC or CTRL+C to cancel)':
     'Waiting for auth... (Press ESC or CTRL+C to cancel)',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.',
-  '{{envKeyHint}} environment variable not found.':
-    '{{envKeyHint}} environment variable not found.',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    'ANTHROPIC_BASE_URL environment variable not found.',
-  'Invalid auth method selected.': 'Invalid auth method selected.',
   'Failed to authenticate. Message: {{message}}':
     'Failed to authenticate. Message: {{message}}',
   'Authenticated successfully with {{authType}} credentials.':
@@ -868,15 +779,6 @@ export default {
   // ============================================================================
   'Select Model': 'Select Model',
   '(Press Esc to close)': '(Press Esc to close)',
-  'Current (effective) configuration': 'Current (effective) configuration',
-  AuthType: 'AuthType',
-  'API Key': 'API Key',
-  unset: 'unset',
-  '(default)': '(default)',
-  '(set)': '(set)',
-  '(not set)': '(not set)',
-  "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
-    "Failed to switch model to '{{modelId}}'.\n\n{{error}}",
   'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)':
     'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)',
   'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
@@ -1020,154 +922,197 @@ export default {
   'Session start time is unavailable, cannot calculate stats.':
     'Session start time is unavailable, cannot calculate stats.',
 
-  // ============================================================================
-  // Command Format Migration
-  // ============================================================================
-  'Command Format Migration': 'Command Format Migration',
-  'Found {{count}} TOML command file:': 'Found {{count}} TOML command file:',
-  'Found {{count}} TOML command files:': 'Found {{count}} TOML command files:',
-  '... and {{count}} more': '... and {{count}} more',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'The TOML format is deprecated. Would you like to migrate them to Markdown format?',
-  '(Backups will be created and original files will be preserved)':
-    '(Backups will be created and original files will be preserved)',
-
   // ============================================================================
   // Loading Phrases
   // ============================================================================
   'Waiting for user confirmation...': 'Waiting for user confirmation...',
   '(esc to cancel, {{time}})': '(esc to cancel, {{time}})',
-
-  // ============================================================================
-  // Loading Phrases
-  // ============================================================================
-  WITTY_LOADING_PHRASES: [
-    "I'm Feeling Lucky",
-    'Shipping awesomeness... ',
-    'Painting the serifs back on...',
-    'Navigating the slime mold...',
-    'Consulting the digital spirits...',
-    'Reticulating splines...',
-    'Warming up the AI hamsters...',
-    'Asking the magic conch shell...',
-    'Generating witty retort...',
-    'Polishing the algorithms...',
+  "I'm Feeling Lucky": "I'm Feeling Lucky",
+  'Shipping awesomeness... ': 'Shipping awesomeness... ',
+  'Painting the serifs back on...': 'Painting the serifs back on...',
+  'Navigating the slime mold...': 'Navigating the slime mold...',
+  'Consulting the digital spirits...': 'Consulting the digital spirits...',
+  'Reticulating splines...': 'Reticulating splines...',
+  'Warming up the AI hamsters...': 'Warming up the AI hamsters...',
+  'Asking the magic conch shell...': 'Asking the magic conch shell...',
+  'Generating witty retort...': 'Generating witty retort...',
+  'Polishing the algorithms...': 'Polishing the algorithms...',
+  "Don't rush perfection (or my code)...":
     "Don't rush perfection (or my code)...",
-    'Brewing fresh bytes...',
-    'Counting electrons...',
-    'Engaging cognitive processors...',
+  'Brewing fresh bytes...': 'Brewing fresh bytes...',
+  'Counting electrons...': 'Counting electrons...',
+  'Engaging cognitive processors...': 'Engaging cognitive processors...',
+  'Checking for syntax errors in the universe...':
     'Checking for syntax errors in the universe...',
-    'One moment, optimizing humor...',
-    'Shuffling punchlines...',
-    'Untangling neural nets...',
-    'Compiling brilliance...',
-    'Loading wit.exe...',
-    'Summoning the cloud of wisdom...',
-    'Preparing a witty response...',
+  'One moment, optimizing humor...': 'One moment, optimizing humor...',
+  'Shuffling punchlines...': 'Shuffling punchlines...',
+  'Untangling neural nets...': 'Untangling neural nets...',
+  'Compiling brilliance...': 'Compiling brilliance...',
+  'Loading wit.exe...': 'Loading wit.exe...',
+  'Summoning the cloud of wisdom...': 'Summoning the cloud of wisdom...',
+  'Preparing a witty response...': 'Preparing a witty response...',
+  "Just a sec, I'm debugging reality...":
     "Just a sec, I'm debugging reality...",
-    'Confuzzling the options...',
-    'Tuning the cosmic frequencies...',
+  'Confuzzling the options...': 'Confuzzling the options...',
+  'Tuning the cosmic frequencies...': 'Tuning the cosmic frequencies...',
+  'Crafting a response worthy of your patience...':
     'Crafting a response worthy of your patience...',
-    'Compiling the 1s and 0s...',
+  'Compiling the 1s and 0s...': 'Compiling the 1s and 0s...',
+  'Resolving dependencies... and existential crises...':
     'Resolving dependencies... and existential crises...',
+  'Defragmenting memories... both RAM and personal...':
     'Defragmenting memories... both RAM and personal...',
-    'Rebooting the humor module...',
+  'Rebooting the humor module...': 'Rebooting the humor module...',
+  'Caching the essentials (mostly cat memes)...':
     'Caching the essentials (mostly cat memes)...',
-    'Optimizing for ludicrous speed',
+  'Optimizing for ludicrous speed': 'Optimizing for ludicrous speed',
+  "Swapping bits... don't tell the bytes...":
     "Swapping bits... don't tell the bytes...",
+  'Garbage collecting... be right back...':
     'Garbage collecting... be right back...',
-    'Assembling the interwebs...',
-    'Converting coffee into code...',
-    'Updating the syntax for reality...',
-    'Rewiring the synapses...',
+  'Assembling the interwebs...': 'Assembling the interwebs...',
+  'Converting coffee into code...': 'Converting coffee into code...',
+  'Updating the syntax for reality...': 'Updating the syntax for reality...',
+  'Rewiring the synapses...': 'Rewiring the synapses...',
+  'Looking for a misplaced semicolon...':
     'Looking for a misplaced semicolon...',
-    "Greasin' the cogs of the machine...",
-    'Pre-heating the servers...',
-    'Calibrating the flux capacitor...',
-    'Engaging the improbability drive...',
-    'Channeling the Force...',
+  "Greasin' the cogs of the machine...": "Greasin' the cogs of the machine...",
+  'Pre-heating the servers...': 'Pre-heating the servers...',
+  'Calibrating the flux capacitor...': 'Calibrating the flux capacitor...',
+  'Engaging the improbability drive...': 'Engaging the improbability drive...',
+  'Channeling the Force...': 'Channeling the Force...',
+  'Aligning the stars for optimal response...':
     'Aligning the stars for optimal response...',
-    'So say we all...',
-    'Loading the next great idea...',
-    "Just a moment, I'm in the zone...",
+  'So say we all...': 'So say we all...',
+  'Loading the next great idea...': 'Loading the next great idea...',
+  "Just a moment, I'm in the zone...": "Just a moment, I'm in the zone...",
+  'Preparing to dazzle you with brilliance...':
     'Preparing to dazzle you with brilliance...',
+  "Just a tick, I'm polishing my wit...":
     "Just a tick, I'm polishing my wit...",
+  "Hold tight, I'm crafting a masterpiece...":
     "Hold tight, I'm crafting a masterpiece...",
+  "Just a jiffy, I'm debugging the universe...":
     "Just a jiffy, I'm debugging the universe...",
+  "Just a moment, I'm aligning the pixels...":
     "Just a moment, I'm aligning the pixels...",
+  "Just a sec, I'm optimizing the humor...":
     "Just a sec, I'm optimizing the humor...",
+  "Just a moment, I'm tuning the algorithms...":
     "Just a moment, I'm tuning the algorithms...",
-    'Warp speed engaged...',
+  'Warp speed engaged...': 'Warp speed engaged...',
+  'Mining for more Dilithium crystals...':
     'Mining for more Dilithium crystals...',
-    "Don't panic...",
-    'Following the white rabbit...',
+  "Don't panic...": "Don't panic...",
+  'Following the white rabbit...': 'Following the white rabbit...',
+  'The truth is in here... somewhere...':
     'The truth is in here... somewhere...',
-    'Blowing on the cartridge...',
-    'Loading... Do a barrel roll!',
-    'Waiting for the respawn...',
+  'Blowing on the cartridge...': 'Blowing on the cartridge...',
+  'Loading... Do a barrel roll!': 'Loading... Do a barrel roll!',
+  'Waiting for the respawn...': 'Waiting for the respawn...',
+  'Finishing the Kessel Run in less than 12 parsecs...':
     'Finishing the Kessel Run in less than 12 parsecs...',
+  "The cake is not a lie, it's just still loading...":
     "The cake is not a lie, it's just still loading...",
+  'Fiddling with the character creation screen...':
     'Fiddling with the character creation screen...',
+  "Just a moment, I'm finding the right meme...":
     "Just a moment, I'm finding the right meme...",
-    "Pressing 'A' to continue...",
-    'Herding digital cats...',
-    'Polishing the pixels...',
+  "Pressing 'A' to continue...": "Pressing 'A' to continue...",
+  'Herding digital cats...': 'Herding digital cats...',
+  'Polishing the pixels...': 'Polishing the pixels...',
+  'Finding a suitable loading screen pun...':
     'Finding a suitable loading screen pun...',
+  'Distracting you with this witty phrase...':
     'Distracting you with this witty phrase...',
-    'Almost there... probably...',
+  'Almost there... probably...': 'Almost there... probably...',
+  'Our hamsters are working as fast as they can...':
     'Our hamsters are working as fast as they can...',
-    'Giving Cloudy a pat on the head...',
-    'Petting the cat...',
-    'Rickrolling my boss...',
+  'Giving Cloudy a pat on the head...': 'Giving Cloudy a pat on the head...',
+  'Petting the cat...': 'Petting the cat...',
+  'Rickrolling my boss...': 'Rickrolling my boss...',
+  'Never gonna give you up, never gonna let you down...':
     'Never gonna give you up, never gonna let you down...',
-    'Slapping the bass...',
-    'Tasting the snozberries...',
+  'Slapping the bass...': 'Slapping the bass...',
+  'Tasting the snozberries...': 'Tasting the snozberries...',
+  "I'm going the distance, I'm going for speed...":
     "I'm going the distance, I'm going for speed...",
+  'Is this the real life? Is this just fantasy?...':
     'Is this the real life? Is this just fantasy?...',
+  "I've got a good feeling about this...":
     "I've got a good feeling about this...",
-    'Poking the bear...',
+  'Poking the bear...': 'Poking the bear...',
+  'Doing research on the latest memes...':
     'Doing research on the latest memes...',
+  'Figuring out how to make this more witty...':
     'Figuring out how to make this more witty...',
-    'Hmmm... let me think...',
+  'Hmmm... let me think...': 'Hmmm... let me think...',
+  'What do you call a fish with no eyes? A fsh...':
     'What do you call a fish with no eyes? A fsh...',
+  'Why did the computer go to therapy? It had too many bytes...':
     'Why did the computer go to therapy? It had too many bytes...',
+  "Why don't programmers like nature? It has too many bugs...":
     "Why don't programmers like nature? It has too many bugs...",
+  'Why do programmers prefer dark mode? Because light attracts bugs...':
     'Why do programmers prefer dark mode? Because light attracts bugs...',
+  'Why did the developer go broke? Because they used up all their cache...':
     'Why did the developer go broke? Because they used up all their cache...',
+  "What can you do with a broken pencil? Nothing, it's pointless...":
     "What can you do with a broken pencil? Nothing, it's pointless...",
-    'Applying percussive maintenance...',
+  'Applying percussive maintenance...': 'Applying percussive maintenance...',
+  'Searching for the correct USB orientation...':
     'Searching for the correct USB orientation...',
+  'Ensuring the magic smoke stays inside the wires...':
     'Ensuring the magic smoke stays inside the wires...',
-    'Trying to exit Vim...',
-    'Spinning up the hamster wheel...',
+  'Rewriting in Rust for no particular reason...':
+    'Rewriting in Rust for no particular reason...',
+  'Trying to exit Vim...': 'Trying to exit Vim...',
+  'Spinning up the hamster wheel...': 'Spinning up the hamster wheel...',
+  "That's not a bug, it's an undocumented feature...":
     "That's not a bug, it's an undocumented feature...",
-    'Engage.',
-    "I'll be back... with an answer.",
-    'My other process is a TARDIS...',
+  'Engage.': 'Engage.',
+  "I'll be back... with an answer.": "I'll be back... with an answer.",
+  'My other process is a TARDIS...': 'My other process is a TARDIS...',
+  'Communing with the machine spirit...':
     'Communing with the machine spirit...',
-    'Letting the thoughts marinate...',
+  'Letting the thoughts marinate...': 'Letting the thoughts marinate...',
+  'Just remembered where I put my keys...':
     'Just remembered where I put my keys...',
-    'Pondering the orb...',
+  'Pondering the orb...': 'Pondering the orb...',
+  "I've seen things you people wouldn't believe... like a user who reads loading messages.":
     "I've seen things you people wouldn't believe... like a user who reads loading messages.",
-    'Initiating thoughtful gaze...',
+  'Initiating thoughtful gaze...': 'Initiating thoughtful gaze...',
+  "What's a computer's favorite snack? Microchips.":
     "What's a computer's favorite snack? Microchips.",
+  "Why do Java developers wear glasses? Because they don't C#.":
     "Why do Java developers wear glasses? Because they don't C#.",
-    'Charging the laser... pew pew!',
-    'Dividing by zero... just kidding!',
+  'Charging the laser... pew pew!': 'Charging the laser... pew pew!',
+  'Dividing by zero... just kidding!': 'Dividing by zero... just kidding!',
+  'Looking for an adult superviso... I mean, processing.':
     'Looking for an adult superviso... I mean, processing.',
-    'Making it go beep boop.',
+  'Making it go beep boop.': 'Making it go beep boop.',
+  'Buffering... because even AIs need a moment.':
     'Buffering... because even AIs need a moment.',
+  'Entangling quantum particles for a faster response...':
     'Entangling quantum particles for a faster response...',
+  'Polishing the chrome... on the algorithms.':
     'Polishing the chrome... on the algorithms.',
+  'Are you not entertained? (Working on it!)':
     'Are you not entertained? (Working on it!)',
+  'Summoning the code gremlins... to help, of course.':
     'Summoning the code gremlins... to help, of course.',
+  'Just waiting for the dial-up tone to finish...':
     'Just waiting for the dial-up tone to finish...',
-    'Recalibrating the humor-o-meter.',
+  'Recalibrating the humor-o-meter.': 'Recalibrating the humor-o-meter.',
+  'My other loading screen is even funnier.':
     'My other loading screen is even funnier.',
+  "Pretty sure there's a cat walking on the keyboard somewhere...":
     "Pretty sure there's a cat walking on the keyboard somewhere...",
+  'Enhancing... Enhancing... Still loading.':
     'Enhancing... Enhancing... Still loading.',
+  "It's not a bug, it's a feature... of this loading screen.":
     "It's not a bug, it's a feature... of this loading screen.",
+  'Have you tried turning it off and on again? (The loading screen, not me.)':
     'Have you tried turning it off and on again? (The loading screen, not me.)',
-    'Constructing additional pylons...',
-  ],
+  'Constructing additional pylons...': 'Constructing additional pylons...',
 };

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

@@ -89,10 +89,6 @@ export default {
   'No tools available': 'Нет доступных инструментов',
   'View or change the approval mode for tool usage':
     'Просмотр или изменение режима подтверждения для использования инструментов',
-  'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
-    'Недопустимый режим подтверждения "{{arg}}". Допустимые режимы: {{modes}}',
-  'Approval mode set to "{{mode}}"':
-    'Режим подтверждения установлен на "{{mode}}"',
   'View or change the language setting':
     'Просмотр или изменение настроек языка',
   'change the theme': 'Изменение темы',
@@ -107,8 +103,8 @@ export default {
   'Theme "{{themeName}}" not found.': 'Тема "{{themeName}}" не найдена.',
   'Theme "{{themeName}}" not found in selected scope.':
     'Тема "{{themeName}}" не найдена в выбранной области.',
-  'Clear conversation history and free up context':
-    'Очистить историю диалога и освободить контекст',
+  'clear the screen and conversation history':
+    'Очистка экрана и истории диалога',
   'Compresses the context by replacing it with a summary.':
     'Сжатие контекста заменой на краткую сводку',
   'open full Qwen Code documentation in your browser':
@@ -155,7 +151,6 @@ export default {
   'Project Level ({{path}})': 'Уровень проекта ({{path}})',
   'User Level ({{path}})': 'Уровень пользователя ({{path}})',
   'Built-in Agents': 'Встроенные агенты',
-  'Extension Agents': 'Агенты расширений',
   'Using: {{count}} agents': 'Используется: {{count}} агент(ов)',
   'View Agent': 'Просмотреть агента',
   'Edit Agent': 'Редактировать агента',
@@ -265,8 +260,7 @@ export default {
   ', Tab to change focus': ', Tab для смены фокуса',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     'Для применения изменений необходимо перезапустить Qwen Code. Нажмите r для выхода и применения изменений.',
-  'The command "/{{command}}" is not supported in non-interactive mode.':
-    'Команда "/{{command}}" не поддерживается в неинтерактивном режиме.',
+
   // ============================================================================
   // Метки настроек
   // ============================================================================
@@ -290,13 +284,6 @@ export default {
   'Show Citations': 'Показывать цитаты',
   'Custom Witty Phrases': 'Пользовательские остроумные фразы',
   'Enable Welcome Back': 'Включить приветствие при возврате',
-  'Enable User Feedback': 'Включить отзывы пользователей',
-  'How is Qwen doing this session? (optional)':
-    'Как дела у Qwen в этой сессии? (необязательно)',
-  Bad: 'Плохо',
-  Good: 'Хорошо',
-  'Not Sure Yet': 'Пока не уверен',
-  'Any other key': 'Любая другая клавиша',
   'Disable Loading Phrases': 'Отключить фразы при загрузке',
   'Screen Reader Mode': 'Режим программы чтения с экрана',
   'IDE Mode': 'Режим IDE',
@@ -326,7 +313,6 @@ export default {
   'Tool Output Truncation Lines': 'Лимит строк вывода инструментов',
   'Folder Trust': 'Доверие к папке',
   'Vision Model Preview': 'Визуальная модель (предпросмотр)',
-  'Tool Schema Compliance': 'Соответствие схеме инструмента',
   // Варианты перечислений настроек
   'Auto (detect from system)': 'Авто (определить из системы)',
   Text: 'Текст',
@@ -355,61 +341,8 @@ export default {
     'Установка предпочитаемого внешнего редактора',
   'Manage extensions': 'Управление расширениями',
   'List active extensions': 'Показать активные расширения',
-  'Update extensions. Usage: update <extension-names>|--all':
-    'Обновить расширения. Использование: update <extension-names>|--all',
-  'Disable an extension': 'Отключить расширение',
-  'Enable an extension': 'Включить расширение',
-  'Install an extension from a git repo or local path':
-    'Установить расширение из Git-репозитория или локального пути',
-  'Uninstall an extension': 'Удалить расширение',
-  'No extensions installed.': 'Расширения не установлены.',
-  'Usage: /extensions update <extension-names>|--all':
-    'Использование: /extensions update <имена-расширений>|--all',
-  'Extension "{{name}}" not found.': 'Расширение "{{name}}" не найдено.',
-  'No extensions to update.': 'Нет расширений для обновления.',
-  'Usage: /extensions install <source>':
-    'Использование: /extensions install <источник>',
-  'Installing extension from "{{source}}"...':
-    'Установка расширения из "{{source}}"...',
-  'Extension "{{name}}" installed successfully.':
-    'Расширение "{{name}}" успешно установлено.',
-  'Failed to install extension from "{{source}}": {{error}}':
-    'Не удалось установить расширение из "{{source}}": {{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    'Использование: /extensions uninstall <имя-расширения>',
-  'Uninstalling extension "{{name}}"...': 'Удаление расширения "{{name}}"...',
-  'Extension "{{name}}" uninstalled successfully.':
-    'Расширение "{{name}}" успешно удалено.',
-  'Failed to uninstall extension "{{name}}": {{error}}':
-    'Не удалось удалить расширение "{{name}}": {{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    'Использование: /extensions {{command}} <расширение> [--scope=<user|workspace>]',
-  'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
-    'Неподдерживаемая область "{{scope}}", должна быть "user" или "workspace"',
-  'Extension "{{name}}" disabled for scope "{{scope}}"':
-    'Расширение "{{name}}" отключено для области "{{scope}}"',
-  'Extension "{{name}}" enabled for scope "{{scope}}"':
-    'Расширение "{{name}}" включено для области "{{scope}}"',
-  'Do you want to continue? [Y/n]: ': 'Хотите продолжить? [Y/n]: ',
-  'Do you want to continue?': 'Хотите продолжить?',
-  'Installing extension "{{name}}".': 'Установка расширения "{{name}}".',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**Расширения могут вызывать неожиданное поведение. Убедитесь, что вы изучили источник расширения и доверяете автору.**',
-  'This extension will run the following MCP servers:':
-    'Это расширение запустит следующие MCP-серверы:',
-  local: 'локальный',
-  remote: 'удалённый',
-  'This extension will add the following commands: {{commands}}.':
-    'Это расширение добавит следующие команды: {{commands}}.',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    'Это расширение добавит информацию в ваш контекст QWEN.md с помощью {{fileName}}',
-  'This extension will exclude the following core tools: {{tools}}':
-    'Это расширение исключит следующие основные инструменты: {{tools}}',
-  'This extension will install the following skills:':
-    'Это расширение установит следующие навыки:',
-  'This extension will install the following subagents:':
-    'Это расширение установит следующие подагенты:',
-  'Installation cancelled for "{{name}}".': 'Установка "{{name}}" отменена.',
+  'Update extensions. Usage: update |--all':
+    'Обновить расширения. Использование: update |--all',
   'manage IDE integration': 'Управление интеграцией с IDE',
   'check status of IDE integration': 'Проверить статус интеграции с IDE',
   'install required IDE companion for {{ideName}}':
@@ -467,8 +400,7 @@ export default {
   'Set LLM output language': 'Установка языка вывода LLM',
   'Usage: /language ui [zh-CN|en-US]':
     'Использование: /language ui [zh-CN|en-US|ru-RU]',
-  'Usage: /language output <language>':
-    'Использование: /language output <language>',
+  'Usage: /language output ': 'Использование: /language output ',
   'Example: /language output 中文': 'Пример: /language output 中文',
   'Example: /language output English': 'Пример: /language output English',
   'Example: /language output 日本語': 'Пример: /language output 日本語',
@@ -485,8 +417,9 @@ export default {
   'To request additional UI language packs, please open an issue on GitHub.':
     'Для запроса дополнительных языковых пакетов интерфейса, пожалуйста, создайте обращение на GitHub.',
   'Available options:': 'Доступные варианты:',
-  '  - zh-CN: Simplified Chinese': ' - zh-CN: Упрощенный китайский',
-  '  - en-US: English': ' - en-US: Английский',
+  ' - zh-CN: Simplified Chinese': ' - zh-CN: Упрощенный китайский',
+  ' - en-US: English': ' - en-US: Английский',
+  ' - ru-RU: Russian': ' - ru-RU: Русский',
   'Set UI language to Simplified Chinese (zh-CN)':
     'Установить язык интерфейса на упрощенный китайский (zh-CN)',
   'Set UI language to English (en-US)':
@@ -502,8 +435,8 @@ export default {
     'Режим подтверждения изменен на: {{mode}}',
   'Approval mode changed to: {{mode}} (saved to {{scope}} settings{{location}})':
     'Режим подтверждения изменен на: {{mode}} (сохранено в настройках {{scope}}{{location}})',
-  'Usage: /approval-mode <mode> [--session|--user|--project]':
-    'Использование: /approval-mode <mode> [--session|--user|--project]',
+  'Usage: /approval-mode [--session|--user|--project]':
+    'Использование: /approval-mode [--session|--user|--project]',
   'Scope subcommands do not accept additional arguments.':
     'Подкоманды области не принимают дополнительных аргументов.',
   'Plan mode - Analyze only, do not modify files or execute commands':
@@ -655,8 +588,8 @@ export default {
     'Ошибка при экспорте диалога: {{error}}',
   'Conversation shared to {{filePath}}': 'Диалог экспортирован в {{filePath}}',
   'No conversation found to share.': 'Нет диалога для экспорта.',
-  'Share the current conversation to a markdown or json file. Usage: /chat share <file>':
-    'Экспортировать текущий диалог в markdown или json файл. Использование: /chat share <файл>',
+  'Share the current conversation to a markdown or json file. Usage: /chat share <путь-к-файлу>':
+    'Экспортировать текущий диалог в markdown или json файл. Использование: /chat share <путь-к-файлу>',
 
   // ============================================================================
   // Команды - Резюме
@@ -671,12 +604,6 @@ export default {
     'Не найдено диалогов для создания сводки.',
   'Failed to generate project context summary: {{error}}':
     'Не удалось сгенерировать сводку контекста проекта: {{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    'Сводка проекта сохранена в {{filePathForDisplay}}',
-  'Saving project summary...': 'Сохранение сводки проекта...',
-  'Generating project summary...': 'Генерация сводки проекта...',
-  'Failed to generate summary - no text content received from LLM response':
-    'Не удалось сгенерировать сводку - не получен текстовый контент из ответа LLM',
 
   // ============================================================================
   // Команды - Модель
@@ -691,9 +618,8 @@ export default {
   // ============================================================================
   // Команды - Очистка
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    'Начало новой сессии, сброс чата и очистка терминала.',
-  'Starting a new session and clearing.': 'Начало новой сессии и очистка.',
+  'Clearing terminal and resetting chat.': 'Очистка терминала и сброс чата.',
+  'Clearing terminal.': 'Очистка терминала.',
 
   // ============================================================================
   // Команды - Сжатие
@@ -724,8 +650,8 @@ export default {
     'Команда /directory add не поддерживается в ограничительных профилях песочницы. Пожалуйста, используйте --include-directories при запуске сессии.',
   "Error adding '{{path}}': {{error}}":
     "Ошибка при добавлении '{{path}}': {{error}}",
-  'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}':
-    'Успешно добавлены файлы QWEN.md из следующих директорий (если они есть):\n- {{directories}}',
+  'Successfully added GEMINI.md files from the following directories if there are:\n- {{directories}}':
+    'Успешно добавлены файлы GEMINI.md из следующих директорий (если они есть):\n- {{directories}}',
   'Error refreshing memory: {{error}}':
     'Ошибка при обновлении памяти: {{error}}',
   'Successfully added directories:\n- {{directories}}':
@@ -847,21 +773,6 @@ export default {
     'Время ожидания авторизации истекло. Пожалуйста, попробуйте снова.',
   'Waiting for auth... (Press ESC or CTRL+C to cancel)':
     'Ожидание авторизации... (Нажмите ESC или CTRL+C для отмены)',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    'Отсутствует API-ключ для аутентификации, совместимой с OpenAI. Укажите settings.security.auth.apiKey или переменную окружения {{envKeyHint}}.',
-  '{{envKeyHint}} environment variable not found.':
-    'Переменная окружения {{envKeyHint}} не найдена.',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    'Переменная окружения {{envKeyHint}} не найдена. Укажите её в файле .env или среди системных переменных.',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    'Переменная окружения {{envKeyHint}} не найдена (или установите settings.security.auth.apiKey). Укажите её в файле .env или среди системных переменных.',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    'Отсутствует API-ключ для аутентификации, совместимой с OpenAI. Установите переменную окружения {{envKeyHint}}.',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'У провайдера Anthropic отсутствует обязательный baseUrl в modelProviders[].baseUrl.',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    'Переменная окружения ANTHROPIC_BASE_URL не найдена.',
-  'Invalid auth method selected.': 'Выбран недопустимый метод авторизации.',
   'Failed to authenticate. Message: {{message}}':
     'Не удалось авторизоваться. Сообщение: {{message}}',
   'Authenticated successfully with {{authType}} credentials.':
@@ -883,15 +794,6 @@ export default {
   // ============================================================================
   'Select Model': 'Выбрать модель',
   '(Press Esc to close)': '(Нажмите Esc для закрытия)',
-  'Current (effective) configuration': 'Текущая (фактическая) конфигурация',
-  AuthType: 'Тип авторизации',
-  'API Key': 'API-ключ',
-  unset: 'не задано',
-  '(default)': '(по умолчанию)',
-  '(set)': '(установлено)',
-  '(not set)': '(не задано)',
-  "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
-    "Не удалось переключиться на модель '{{modelId}}'.\n\n{{error}}",
   'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)':
     'Последняя модель Qwen Coder от Alibaba Cloud ModelStudio (версия: qwen3-coder-plus-2025-09-23)',
   'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
@@ -982,7 +884,6 @@ export default {
   // Экран выхода / Статистика
   // ============================================================================
   'Agent powering down. Goodbye!': 'Агент завершает работу. До свидания!',
-  'To continue this session, run': 'Для продолжения этой сессии, выполните',
   'Interaction Summary': 'Сводка взаимодействия',
   'Session ID:': 'ID сессии:',
   'Tool Calls:': 'Вызовы инструментов:',
@@ -1036,158 +937,185 @@ export default {
   'Session start time is unavailable, cannot calculate stats.':
     'Время начала сессии недоступно, невозможно рассчитать статистику.',
 
-  // ============================================================================
-  // Command Format Migration
-  // ============================================================================
-  'Command Format Migration': 'Миграция формата команд',
-  'Found {{count}} TOML command file:': 'Найден {{count}} файл команд TOML:',
-  'Found {{count}} TOML command files:':
-    'Найдено {{count}} файлов команд TOML:',
-  '... and {{count}} more': '... и ещё {{count}}',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'Формат TOML устарел. Хотите перенести их в формат Markdown?',
-  '(Backups will be created and original files will be preserved)':
-    '(Будут созданы резервные копии, исходные файлы будут сохранены)',
-
   // ============================================================================
   // Loading Phrases
   // ============================================================================
   'Waiting for user confirmation...':
     'Ожидание подтверждения от пользователя...',
   '(esc to cancel, {{time}})': '(esc для отмены, {{time}})',
-
-  // ============================================================================
-
-  // ============================================================================
-  // Loading Phrases
-  // ============================================================================
-  WITTY_LOADING_PHRASES: [
-    'Мне повезёт!',
-    'Доставляем крутизну... ',
-    'Рисуем засечки на буквах...',
-    'Пробираемся через слизевиков..',
-    'Советуемся с цифровыми духами...',
-    'Сглаживание сплайнов...',
-    'Разогреваем ИИ-хомячков...',
-    'Спрашиваем волшебную ракушку...',
-    'Генерируем остроумный ответ...',
-    'Полируем алгоритмы...',
+  "I'm Feeling Lucky": 'Мне повезёт!',
+  'Shipping awesomeness... ': 'Доставляем крутизну... ',
+  'Painting the serifs back on...': 'Рисуем засечки на буквах...',
+  'Navigating the slime mold...': 'Пробираемся через слизевиков..',
+  'Consulting the digital spirits...': 'Советуемся с цифровыми духами...',
+  'Reticulating splines...': 'Сглаживание сплайнов...',
+  'Warming up the AI hamsters...': 'Разогреваем ИИ-хомячков...',
+  'Asking the magic conch shell...': 'Спрашиваем волшебную ракушку...',
+  'Generating witty retort...': 'Генерируем остроумный ответ...',
+  'Polishing the algorithms...': 'Полируем алгоритмы...',
+  "Don't rush perfection (or my code)...":
     'Не торопите совершенство (или мой код)...',
-    'Завариваем свежие байты...',
-    'Пересчитываем электроны...',
-    'Задействуем когнитивные процессоры...',
+  'Brewing fresh bytes...': 'Завариваем свежие байты...',
+  'Counting electrons...': 'Пересчитываем электроны...',
+  'Engaging cognitive processors...': 'Задействуем когнитивные процессоры...',
+  'Checking for syntax errors in the universe...':
     'Ищем синтаксические ошибки во вселенной...',
-    'Секундочку, оптимизируем юмор...',
-    'Перетасовываем панчлайны...',
-    'Распутаваем нейросети...',
-    'Компилируем гениальность...',
-    'Загружаем yumor.exe...',
-    'Призываем облако мудрости...',
-    'Готовим остроумный ответ...',
-    'Секунду, идёт отладка реальности...',
-    'Запутываем варианты...',
-    'Настраиваем космические частоты...',
+  'One moment, optimizing humor...': 'Секундочку, оптимизируем юмор...',
+  'Shuffling punchlines...': 'Перетасовываем панчлайны...',
+  'Untangling neural nets...': 'Распутаваем нейросети...',
+  'Compiling brilliance...': 'Компилируем гениальность...',
+  'Loading wit.exe...': 'Загружаем yumor.exe...',
+  'Summoning the cloud of wisdom...': 'Призываем облако мудрости...',
+  'Preparing a witty response...': 'Готовим остроумный ответ...',
+  "Just a sec, I'm debugging reality...": 'Секунду, идёт отладка реальности...',
+  'Confuzzling the options...': 'Запутываем варианты...',
+  'Tuning the cosmic frequencies...': 'Настраиваем космические частоты...',
+  'Crafting a response worthy of your patience...':
     'Создаем ответ, достойный вашего терпения...',
-    'Компилируем единички и нолики...',
+  'Compiling the 1s and 0s...': 'Компилируем единички и нолики...',
+  'Resolving dependencies... and existential crises...':
     'Разрешаем зависимости... и экзистенциальные кризисы...',
+  'Defragmenting memories... both RAM and personal...':
     'Дефрагментация памяти... и оперативной, и личной...',
-    'Перезагрузка модуля юмора...',
+  'Rebooting the humor module...': 'Перезагрузка модуля юмора...',
+  'Caching the essentials (mostly cat memes)...':
     'Кэшируем самое важное (в основном мемы с котиками)...',
-    'Оптимизация для безумной скорости',
+  'Optimizing for ludicrous speed': 'Оптимизация для безумной скорости',
+  "Swapping bits... don't tell the bytes...":
     'Меняем биты... только байтам не говорите...',
-    'Сборка мусора... скоро вернусь...',
-    'Сборка интернетов...',
-    'Превращаем кофе в код...',
-    'Обновляем синтаксис реальности...',
-    'Переподключаем синапсы...',
-    'Ищем лишнюю точку с запятой...',
-    'Смазываем шестерёнки машины...',
-    'Разогреваем серверы...',
-    'Калибруем потоковый накопитель...',
-    'Включаем двигатель невероятности...',
-    'Направляем Силу...',
+  'Garbage collecting... be right back...': 'Сборка мусора... скоро вернусь...',
+  'Assembling the interwebs...': 'Сборка интернетов...',
+  'Converting coffee into code...': 'Превращаем кофе в код...',
+  'Updating the syntax for reality...': 'Обновляем синтаксис реальности...',
+  'Rewiring the synapses...': 'Переподключаем синапсы...',
+  'Looking for a misplaced semicolon...': 'Ищем лишнюю точку с запятой...',
+  "Greasin' the cogs of the machine...": 'Смазываем шестерёнки машины...',
+  'Pre-heating the servers...': 'Разогреваем серверы...',
+  'Calibrating the flux capacitor...': 'Калибруем потоковый накопитель...',
+  'Engaging the improbability drive...': 'Включаем двигатель невероятности...',
+  'Channeling the Force...': 'Направляем Силу...',
+  'Aligning the stars for optimal response...':
     'Выравниваем звёзды для оптимального ответа...',
-    'Так скажем мы все...',
-    'Загрузка следующей великой идеи...',
-    'Минутку, я в потоке...',
+  'So say we all...': 'Так скажем мы все...',
+  'Loading the next great idea...': 'Загрузка следующей великой идеи...',
+  "Just a moment, I'm in the zone...": 'Минутку, я в потоке...',
+  'Preparing to dazzle you with brilliance...':
     'Готовлюсь ослепить вас гениальностью...',
-    'Секунду, полирую остроумие...',
-    'Держитесь, создаю шедевр...',
+  "Just a tick, I'm polishing my wit...": 'Секунду, полирую остроумие...',
+  "Hold tight, I'm crafting a masterpiece...": 'Держитесь, создаю шедевр...',
+  "Just a jiffy, I'm debugging the universe...":
     'Мигом, отлаживаю вселенную...',
-    'Момент, выравниваю пиксели...',
-    'Секунду, оптимизирую юмор...',
+  "Just a moment, I'm aligning the pixels...": 'Момент, выравниваю пиксели...',
+  "Just a sec, I'm optimizing the humor...": 'Секунду, оптимизирую юмор...',
+  "Just a moment, I'm tuning the algorithms...":
     'Момент, настраиваю алгоритмы...',
-    'Варп-прыжок активирован...',
-    'Добываем кристаллы дилития...',
-    'Без паники...',
-    'Следуем за белым кроликом...',
-    'Истина где-то здесь... внутри...',
-    'Продуваем картридж...',
-    'Загрузка... Сделай бочку!',
-    'Ждем респауна...',
+  'Warp speed engaged...': 'Варп-скорость включена...',
+  'Mining for more Dilithium crystals...': 'Добываем кристаллы дилития...',
+  "Don't panic...": 'Без паники...',
+  'Following the white rabbit...': 'Следуем за белым кроликом...',
+  'The truth is in here... somewhere...': 'Истина где-то здесь... внутри...',
+  'Blowing on the cartridge...': 'Продуваем картридж...',
+  'Loading... Do a barrel roll!': 'Загрузка... Сделай бочку!',
+  'Waiting for the respawn...': 'Ждем респауна...',
+  'Finishing the Kessel Run in less than 12 parsecs...':
     'Делаем Дугу Кесселя менее чем за 12 парсеков...',
+  "The cake is not a lie, it's just still loading...":
     'Тортик — не ложь, он просто ещё грузится...',
+  'Fiddling with the character creation screen...':
     'Возимся с экраном создания персонажа...',
+  "Just a moment, I'm finding the right meme...":
     'Минутку, ищу подходящий мем...',
-    "Нажимаем 'A' для продолжения...",
-    'Пасём цифровых котов...',
-    'Полируем пиксели...',
+  "Pressing 'A' to continue...": "Нажимаем 'A' для продолжения...",
+  'Herding digital cats...': 'Пасём цифровых котов...',
+  'Polishing the pixels...': 'Полируем пиксели...',
+  'Finding a suitable loading screen pun...':
     'Ищем подходящий каламбур для экрана загрузки...',
+  'Distracting you with this witty phrase...':
     'Отвлекаем вас этой остроумной фразой...',
-    'Почти готово... вроде...',
+  'Almost there... probably...': 'Почти готово... вроде...',
+  'Our hamsters are working as fast as they can...':
     'Наши хомячки работают изо всех сил...',
-    'Гладим Облачко по голове...',
-    'Гладим кота...',
-    'Рикроллим начальника...',
+  'Giving Cloudy a pat on the head...': 'Гладим Облачко по голове...',
+  'Petting the cat...': 'Гладим кота...',
+  'Rickrolling my boss...': 'Рикроллим начальника...',
+  'Never gonna give you up, never gonna let you down...':
     'Never gonna give you up, never gonna let you down...',
-    'Лабаем бас-гитару...',
-    'Пробуем снузберри на вкус...',
+  'Slapping the bass...': 'Лабаем бас-гитару...',
+  'Tasting the snozberries...': 'Пробуем снузберри на вкус...',
+  "I'm going the distance, I'm going for speed...":
     'Иду до конца, иду на скорость...',
+  'Is this the real life? Is this just fantasy?...':
     'Is this the real life? Is this just fantasy?...',
-    'У меня хорошее предчувствие...',
-    'Дразним медведя... (Не лезь...)',
-    'Изучаем свежие мемы...',
+  "I've got a good feeling about this...": 'У меня хорошее предчувствие...',
+  'Poking the bear...': 'Дразним медведя... (Не лезь...)',
+  'Doing research on the latest memes...': 'Изучаем свежие мемы...',
+  'Figuring out how to make this more witty...':
     'Думаем, как сделать это остроумнее...',
-    'Хмм... дайте подумать...',
+  'Hmmm... let me think...': 'Хмм... дайте подумать...',
+  'What do you call a fish with no eyes? A fsh...':
     'Как называется бумеранг, который не возвращается? Палка...',
+  'Why did the computer go to therapy? It had too many bytes...':
     'Почему компьютер простудился? Потому что оставил окна открытыми...',
+  "Why don't programmers like nature? It has too many bugs...":
     'Почему программисты не любят гулять на улице? Там среда не настроена...',
+  'Why do programmers prefer dark mode? Because light attracts bugs...':
     'Почему программисты предпочитают тёмную тему? Потому что в темноте не видно багов...',
+  'Why did the developer go broke? Because they used up all their cache...':
     'Почему разработчик разорился? Потому что потратил весь свой кэш...',
+  "What can you do with a broken pencil? Nothing, it's pointless...":
     'Что можно делать со сломанным карандашом? Ничего — он тупой...',
-    'Провожу настройку методом тыка...',
+  'Applying percussive maintenance...': 'Провожу настройку методом тыка...',
+  'Searching for the correct USB orientation...':
     'Ищем, какой стороной вставлять флешку...',
+  'Ensuring the magic smoke stays inside the wires...':
     'Следим, чтобы волшебный дым не вышел из проводов...',
-    'Пытаемся выйти из Vim...',
-    'Раскручиваем колесо для хомяка...',
-    'Это не баг, а фича...',
-    'Поехали!',
-    'Я вернусь... с ответом.',
-    'Мой другой процесс — это ТАРДИС...',
-    'Общаемся с духом машины...',
-    'Даем мыслям замариноваться...',
+  'Rewriting in Rust for no particular reason...':
+    'Переписываем всё на Rust без особой причины...',
+  'Trying to exit Vim...': 'Пытаемся выйти из Vim...',
+  'Spinning up the hamster wheel...': 'Раскручиваем колесо для хомяка...',
+  "That's not a bug, it's an undocumented feature...": 'Это не баг, а фича...',
+  'Engage.': 'Поехали!',
+  "I'll be back... with an answer.": 'Я вернусь... с ответом.',
+  'My other process is a TARDIS...': 'Мой другой процесс — это ТАРДИС...',
+  'Communing with the machine spirit...': 'Общаемся с духом машины...',
+  'Letting the thoughts marinate...': 'Даем мыслям замариноваться...',
+  'Just remembered where I put my keys...':
     'Только что вспомнил, куда положил ключи...',
-    'Размышляю над сферой...',
-    'Я видел такое, что вам, людям, и не снилось... пользователя, читающего эти сообщения.',
-    'Инициируем задумчивый взгляд...',
+  'Pondering the orb...': 'Размышляю над сферой...',
+  "I've seen things you people wouldn't believe... like a user who reads loading messages.":
+    'Я видел такое, во что вы, люди, просто не поверите... например, пользователя, читающего сообщения загрузки.',
+  'Initiating thoughtful gaze...': 'Инициируем задумчивый взгляд...',
+  "What's a computer's favorite snack? Microchips.":
     'Что сервер заказывает в баре? Пинг-коладу.',
+  "Why do Java developers wear glasses? Because they don't C#.":
     'Почему Java-разработчики не убираются дома? Они ждут сборщик мусора...',
-    'Заряжаем лазер... пиу-пиу!',
-    'Делим на ноль... шучу!',
+  'Charging the laser... pew pew!': 'Заряжаем лазер... пиу-пиу!',
+  'Dividing by zero... just kidding!': 'Делим на ноль... шучу!',
+  'Looking for an adult superviso... I mean, processing.':
     'Ищу взрослых для присмот... в смысле, обрабатываю.',
-    'Делаем бип-буп.',
-    'Буферизация... даже ИИ нужно время подумать.',
+  'Making it go beep boop.': 'Делаем бип-буп.',
+  'Buffering... because even AIs need a moment.':
+    'Буферизация... даже ИИ нужно мгновение.',
+  'Entangling quantum particles for a faster response...':
     'Запутываем квантовые частицы для быстрого ответа...',
+  'Polishing the chrome... on the algorithms.':
     'Полируем хром... на алгоритмах.',
+  'Are you not entertained? (Working on it!)':
     'Вы ещё не развлеклись?! Разве вы не за этим сюда пришли?!',
+  'Summoning the code gremlins... to help, of course.':
     'Призываем гремлинов кода... для помощи, конечно же.',
+  'Just waiting for the dial-up tone to finish...':
     'Ждем, пока закончится звук dial-up модема...',
-    'Перекалибровка юморометра.',
+  'Recalibrating the humor-o-meter.': 'Перекалибровка юморометра.',
+  'My other loading screen is even funnier.':
     'Мой другой экран загрузки ещё смешнее.',
+  "Pretty sure there's a cat walking on the keyboard somewhere...":
     'Кажется, где-то по клавиатуре гуляет кот...',
+  'Enhancing... Enhancing... Still loading.':
     'Улучшаем... Ещё улучшаем... Всё ещё грузится.',
+  "It's not a bug, it's a feature... of this loading screen.":
     'Это не баг, это фича... экрана загрузки.',
+  'Have you tried turning it off and on again? (The loading screen, not me.)':
     'Пробовали выключить и включить снова? (Экран загрузки, не меня!)',
-    'Нужно построить больше пилонов...',
-  ],
+  'Constructing additional pylons...': 'Нужно построить больше пилонов...',
 };

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

@@ -88,9 +88,6 @@ export default {
   'No tools available': '没有可用工具',
   'View or change the approval mode for tool usage':
     '查看或更改工具使用的审批模式',
-  'Invalid approval mode "{{arg}}". Valid modes: {{modes}}':
-    '无效的审批模式 "{{arg}}"。有效模式：{{modes}}',
-  'Approval mode set to "{{mode}}"': '审批模式已设置为 "{{mode}}"',
   'View or change the language setting': '查看或更改语言设置',
   'change the theme': '更改主题',
   'Select Theme': '选择主题',
@@ -104,7 +101,7 @@ export default {
   'Theme "{{themeName}}" not found.': '未找到主题 "{{themeName}}"。',
   'Theme "{{themeName}}" not found in selected scope.':
     '在所选作用域中未找到主题 "{{themeName}}"。',
-  'Clear conversation history and free up context': '清除对话历史并释放上下文',
+  'clear the screen and conversation history': '清屏并清除对话历史',
   'Compresses the context by replacing it with a summary.':
     '通过用摘要替换来压缩上下文',
   'open full Qwen Code documentation in your browser':
@@ -149,7 +146,6 @@ export default {
   'Project Level ({{path}})': '项目级 ({{path}})',
   'User Level ({{path}})': '用户级 ({{path}})',
   'Built-in Agents': '内置代理',
-  'Extension Agents': '扩展代理',
   'Using: {{count}} agents': '使用中: {{count}} 个代理',
   'View Agent': '查看代理',
   'Edit Agent': '编辑代理',
@@ -253,8 +249,6 @@ export default {
   ', Tab to change focus': '，Tab 切换焦点',
   'To see changes, Qwen Code must be restarted. Press r to exit and apply changes now.':
     '要查看更改，必须重启 Qwen Code。按 r 退出并立即应用更改。',
-  'The command "/{{command}}" is not supported in non-interactive mode.':
-    '不支持在非交互模式下使用命令 "/{{command}}"。',
   // ============================================================================
   // Settings Labels
   // ============================================================================
@@ -278,12 +272,6 @@ export default {
   'Show Citations': '显示引用',
   'Custom Witty Phrases': '自定义诙谐短语',
   'Enable Welcome Back': '启用欢迎回来',
-  'Enable User Feedback': '启用用户反馈',
-  'How is Qwen doing this session? (optional)': 'Qwen 这次表现如何？（可选）',
-  Bad: '不满意',
-  Good: '满意',
-  'Not Sure Yet': '暂不评价',
-  'Any other key': '任意其他键',
   'Disable Loading Phrases': '禁用加载短语',
   'Screen Reader Mode': '屏幕阅读器模式',
   'IDE Mode': 'IDE 模式',
@@ -338,56 +326,6 @@ export default {
   'List active extensions': '列出活动扩展',
   'Update extensions. Usage: update <extension-names>|--all':
     '更新扩展。用法：update <extension-names>|--all',
-  'Disable an extension': '禁用扩展',
-  'Enable an extension': '启用扩展',
-  'Install an extension from a git repo or local path':
-    '从 Git 仓库或本地路径安装扩展',
-  'Uninstall an extension': '卸载扩展',
-  'No extensions installed.': '未安装扩展。',
-  'Usage: /extensions update <extension-names>|--all':
-    '用法：/extensions update <扩展名>|--all',
-  'Extension "{{name}}" not found.': '未找到扩展 "{{name}}"。',
-  'No extensions to update.': '没有可更新的扩展。',
-  'Usage: /extensions install <source>': '用法：/extensions install <来源>',
-  'Installing extension from "{{source}}"...':
-    '正在从 "{{source}}" 安装扩展...',
-  'Extension "{{name}}" installed successfully.': '扩展 "{{name}}" 安装成功。',
-  'Failed to install extension from "{{source}}": {{error}}':
-    '从 "{{source}}" 安装扩展失败：{{error}}',
-  'Usage: /extensions uninstall <extension-name>':
-    '用法：/extensions uninstall <扩展名>',
-  'Uninstalling extension "{{name}}"...': '正在卸载扩展 "{{name}}"...',
-  'Extension "{{name}}" uninstalled successfully.':
-    '扩展 "{{name}}" 卸载成功。',
-  'Failed to uninstall extension "{{name}}": {{error}}':
-    '卸载扩展 "{{name}}" 失败：{{error}}',
-  'Usage: /extensions {{command}} <extension> [--scope=<user|workspace>]':
-    '用法：/extensions {{command}} <扩展> [--scope=<user|workspace>]',
-  'Unsupported scope "{{scope}}", should be one of "user" or "workspace"':
-    '不支持的作用域 "{{scope}}"，应为 "user" 或 "workspace"',
-  'Extension "{{name}}" disabled for scope "{{scope}}"':
-    '扩展 "{{name}}" 已在作用域 "{{scope}}" 中禁用',
-  'Extension "{{name}}" enabled for scope "{{scope}}"':
-    '扩展 "{{name}}" 已在作用域 "{{scope}}" 中启用',
-  'Do you want to continue? [Y/n]: ': '是否继续？[Y/n]：',
-  'Do you want to continue?': '是否继续？',
-  'Installing extension "{{name}}".': '正在安装扩展 "{{name}}"。',
-  '**Extensions may introduce unexpected behavior. Ensure you have investigated the extension source and trust the author.**':
-    '**扩展可能会引入意外行为。请确保您已调查过扩展源并信任作者。**',
-  'This extension will run the following MCP servers:':
-    '此扩展将运行以下 MCP 服务器：',
-  local: '本地',
-  remote: '远程',
-  'This extension will add the following commands: {{commands}}.':
-    '此扩展将添加以下命令：{{commands}}。',
-  'This extension will append info to your QWEN.md context using {{fileName}}':
-    '此扩展将使用 {{fileName}} 向您的 QWEN.md 上下文追加信息',
-  'This extension will exclude the following core tools: {{tools}}':
-    '此扩展将排除以下核心工具：{{tools}}',
-  'This extension will install the following skills:': '此扩展将安装以下技能：',
-  'This extension will install the following subagents:':
-    '此扩展将安装以下子代理：',
-  'Installation cancelled for "{{name}}".': '已取消安装 "{{name}}"。',
   'manage IDE integration': '管理 IDE 集成',
   'check status of IDE integration': '检查 IDE 集成状态',
   'install required IDE companion for {{ideName}}':
@@ -622,12 +560,6 @@ export default {
   'No conversation found to summarize.': '未找到要总结的对话',
   'Failed to generate project context summary: {{error}}':
     '生成项目上下文摘要失败：{{error}}',
-  'Saved project summary to {{filePathForDisplay}}.':
-    '项目摘要已保存到 {{filePathForDisplay}}',
-  'Saving project summary...': '正在保存项目摘要...',
-  'Generating project summary...': '正在生成项目摘要...',
-  'Failed to generate summary - no text content received from LLM response':
-    '生成摘要失败 - 未从 LLM 响应中接收到文本内容',
 
   // ============================================================================
   // Commands - Model
@@ -641,9 +573,8 @@ export default {
   // ============================================================================
   // Commands - Clear
   // ============================================================================
-  'Starting a new session, resetting chat, and clearing terminal.':
-    '正在开始新会话，重置聊天并清屏。',
-  'Starting a new session and clearing.': '正在开始新会话并清屏。',
+  'Clearing terminal and resetting chat.': '正在清屏并重置聊天',
+  'Clearing terminal.': '正在清屏',
 
   // ============================================================================
   // Commands - Compress
@@ -785,21 +716,6 @@ export default {
   'Authentication timed out. Please try again.': '认证超时。请重试。',
   'Waiting for auth... (Press ESC or CTRL+C to cancel)':
     '正在等待认证...（按 ESC 或 CTRL+C 取消）',
-  'Missing API key for OpenAI-compatible auth. Set settings.security.auth.apiKey, or set the {{envKeyHint}} environment variable.':
-    '缺少 OpenAI 兼容认证的 API 密钥。请设置 settings.security.auth.apiKey 或设置 {{envKeyHint}} 环境变量。',
-  '{{envKeyHint}} environment variable not found.':
-    '未找到 {{envKeyHint}} 环境变量。',
-  '{{envKeyHint}} environment variable not found. Please set it in your .env file or environment variables.':
-    '未找到 {{envKeyHint}} 环境变量。请在 .env 文件或系统环境变量中进行设置。',
-  '{{envKeyHint}} environment variable not found (or set settings.security.auth.apiKey). Please set it in your .env file or environment variables.':
-    '未找到 {{envKeyHint}} 环境变量（或设置 settings.security.auth.apiKey）。请在 .env 文件或系统环境变量中进行设置。',
-  'Missing API key for OpenAI-compatible auth. Set the {{envKeyHint}} environment variable.':
-    '缺少 OpenAI 兼容认证的 API 密钥。请设置 {{envKeyHint}} 环境变量。',
-  'Anthropic provider missing required baseUrl in modelProviders[].baseUrl.':
-    'Anthropic 提供商缺少必需的 baseUrl，请在 modelProviders[].baseUrl 中配置。',
-  'ANTHROPIC_BASE_URL environment variable not found.':
-    '未找到 ANTHROPIC_BASE_URL 环境变量。',
-  'Invalid auth method selected.': '选择了无效的认证方式。',
   'Failed to authenticate. Message: {{message}}': '认证失败。消息：{{message}}',
   'Authenticated successfully with {{authType}} credentials.':
     '使用 {{authType}} 凭据成功认证。',
@@ -819,15 +735,6 @@ export default {
   // ============================================================================
   'Select Model': '选择模型',
   '(Press Esc to close)': '（按 Esc 关闭）',
-  'Current (effective) configuration': '当前（实际生效）配置',
-  AuthType: '认证方式',
-  'API Key': 'API 密钥',
-  unset: '未设置',
-  '(default)': '(默认)',
-  '(set)': '(已设置)',
-  '(not set)': '(未设置)',
-  "Failed to switch model to '{{modelId}}'.\n\n{{error}}":
-    "无法切换到模型 '{{modelId}}'.\n\n{{error}}",
   'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)':
     '来自阿里云 ModelStudio 的最新 Qwen Coder 模型（版本：qwen3-coder-plus-2025-09-23）',
   'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)':
@@ -930,11 +837,11 @@ export default {
   'Session Stats': '会话统计',
   'Model Usage': '模型使用情况',
   Reqs: '请求数',
-  'Input Tokens': '输入 token 数',
-  'Output Tokens': '输出 token 数',
+  'Input Tokens': '输入令牌',
+  'Output Tokens': '输出令牌',
   'Savings Highlight:': '节省亮点：',
   'of input tokens were served from the cache, reducing costs.':
-    '从缓存载入 token ，降低了成本',
+    '的输入令牌来自缓存，降低了成本',
   'Tip: For a full token breakdown, run `/stats model`.':
     '提示：要查看完整的令牌明细，请运行 `/stats model`',
   'Model Stats For Nerds': '模型统计（技术细节）',
@@ -968,56 +875,170 @@ export default {
   'Session start time is unavailable, cannot calculate stats.':
     '会话开始时间不可用，无法计算统计信息',
 
-  // ============================================================================
-  // Command Format Migration
-  // ============================================================================
-  'Command Format Migration': '命令格式迁移',
-  'Found {{count}} TOML command file:': '发现 {{count}} 个 TOML 命令文件：',
-  'Found {{count}} TOML command files:': '发现 {{count}} 个 TOML 命令文件：',
-  '... and {{count}} more': '... 以及其他 {{count}} 个',
-  'The TOML format is deprecated. Would you like to migrate them to Markdown format?':
-    'TOML 格式已弃用。是否将它们迁移到 Markdown 格式？',
-  '(Backups will be created and original files will be preserved)':
-    '（将创建备份，原始文件将保留）',
-
   // ============================================================================
   // Loading Phrases
   // ============================================================================
   'Waiting for user confirmation...': '等待用户确认...',
   '(esc to cancel, {{time}})': '（按 esc 取消，{{time}}）',
-  WITTY_LOADING_PHRASES: [
-    // --- 职场搬砖系列 ---
-    '正在努力搬砖，请稍候...',
-    '老板在身后，快加载啊！',
-    '头发掉光前，一定能加载完...',
-    '服务器正在深呼吸，准备放大招...',
-    '正在向服务器投喂咖啡...',
-
-    // --- 大厂黑话系列 ---
-    '正在赋能全链路，寻找关键抓手...',
-    '正在降本增效，优化加载路径...',
-    '正在打破部门壁垒，沉淀方法论...',
-    '正在拥抱变化，迭代核心价值...',
-    '正在对齐颗粒度，打磨底层逻辑...',
-    '大力出奇迹，正在强行加载...',
-
-    // --- 程序员自嘲系列 ---
-    '只要我不写代码，代码就没有 Bug...',
-    '正在把 Bug 转化为 Feature...',
-    '只要我不尴尬，Bug 就追不上我...',
-    '正在试图理解去年的自己写了什么...',
-    '正在猿力觉醒中，请耐心等待...',
-
-    // --- 合作愉快系列 ---
-    '正在询问产品经理：这需求是真的吗？',
-    '正在给产品经理画饼，请稍等...',
-
-    // --- 温暖治愈系列 ---
-    '每一行代码，都在努力让世界变得更好一点点...',
-    '每一个伟大的想法，都值得这份耐心的等待...',
-    '别急，美好的事物总是需要一点时间去酝酿...',
-    '愿你的代码永无 Bug，愿你的梦想终将成真...',
-    '哪怕只有 0.1% 的进度，也是在向目标靠近...',
-    '加载的是字节，承载的是对技术的热爱...',
-  ],
+  "I'm Feeling Lucky": '我感觉很幸运',
+  'Shipping awesomeness... ': '正在运送精彩内容... ',
+  'Painting the serifs back on...': '正在重新绘制衬线...',
+  'Navigating the slime mold...': '正在导航粘液霉菌...',
+  'Consulting the digital spirits...': '正在咨询数字精灵...',
+  'Reticulating splines...': '正在网格化样条曲线...',
+  'Warming up the AI hamsters...': '正在预热 AI 仓鼠...',
+  'Asking the magic conch shell...': '正在询问魔法海螺壳...',
+  'Generating witty retort...': '正在生成机智的反驳...',
+  'Polishing the algorithms...': '正在打磨算法...',
+  "Don't rush perfection (or my code)...": '不要急于追求完美（或我的代码）...',
+  'Brewing fresh bytes...': '正在酿造新鲜字节...',
+  'Counting electrons...': '正在计算电子...',
+  'Engaging cognitive processors...': '正在启动认知处理器...',
+  'Checking for syntax errors in the universe...':
+    '正在检查宇宙中的语法错误...',
+  'One moment, optimizing humor...': '稍等片刻，正在优化幽默感...',
+  'Shuffling punchlines...': '正在洗牌笑点...',
+  'Untangling neural nets...': '正在解开神经网络...',
+  'Compiling brilliance...': '正在编译智慧...',
+  'Loading wit.exe...': '正在加载 wit.exe...',
+  'Summoning the cloud of wisdom...': '正在召唤智慧云...',
+  'Preparing a witty response...': '正在准备机智的回复...',
+  "Just a sec, I'm debugging reality...": '稍等片刻，我正在调试现实...',
+  'Confuzzling the options...': '正在混淆选项...',
+  'Tuning the cosmic frequencies...': '正在调谐宇宙频率...',
+  'Crafting a response worthy of your patience...':
+    '正在制作值得您耐心等待的回复...',
+  'Compiling the 1s and 0s...': '正在编译 1 和 0...',
+  'Resolving dependencies... and existential crises...':
+    '正在解决依赖关系...和存在主义危机...',
+  'Defragmenting memories... both RAM and personal...':
+    '正在整理记忆碎片...包括 RAM 和个人记忆...',
+  'Rebooting the humor module...': '正在重启幽默模块...',
+  'Caching the essentials (mostly cat memes)...':
+    '正在缓存必需品（主要是猫咪表情包）...',
+  'Optimizing for ludicrous speed': '正在优化到荒谬的速度',
+  "Swapping bits... don't tell the bytes...": '正在交换位...不要告诉字节...',
+  'Garbage collecting... be right back...': '正在垃圾回收...马上回来...',
+  'Assembling the interwebs...': '正在组装互联网...',
+  'Converting coffee into code...': '正在将咖啡转换为代码...',
+  'Updating the syntax for reality...': '正在更新现实的语法...',
+  'Rewiring the synapses...': '正在重新连接突触...',
+  'Looking for a misplaced semicolon...': '正在寻找放错位置的分号...',
+  "Greasin' the cogs of the machine...": '正在给机器的齿轮上油...',
+  'Pre-heating the servers...': '正在预热服务器...',
+  'Calibrating the flux capacitor...': '正在校准通量电容器...',
+  'Engaging the improbability drive...': '正在启动不可能性驱动器...',
+  'Channeling the Force...': '正在引导原力...',
+  'Aligning the stars for optimal response...': '正在对齐星星以获得最佳回复...',
+  'So say we all...': '我们都说...',
+  'Loading the next great idea...': '正在加载下一个伟大的想法...',
+  "Just a moment, I'm in the zone...": '稍等片刻，我正进入状态...',
+  'Preparing to dazzle you with brilliance...': '正在准备用智慧让您眼花缭乱...',
+  "Just a tick, I'm polishing my wit...": '稍等片刻，我正在打磨我的智慧...',
+  "Hold tight, I'm crafting a masterpiece...": '请稍等，我正在制作杰作...',
+  "Just a jiffy, I'm debugging the universe...": '稍等片刻，我正在调试宇宙...',
+  "Just a moment, I'm aligning the pixels...": '稍等片刻，我正在对齐像素...',
+  "Just a sec, I'm optimizing the humor...": '稍等片刻，我正在优化幽默感...',
+  "Just a moment, I'm tuning the algorithms...": '稍等片刻，我正在调整算法...',
+  'Warp speed engaged...': '曲速已启动...',
+  'Mining for more Dilithium crystals...': '正在挖掘更多二锂晶体...',
+  "Don't panic...": '不要惊慌...',
+  'Following the white rabbit...': '正在跟随白兔...',
+  'The truth is in here... somewhere...': '真相在这里...某个地方...',
+  'Blowing on the cartridge...': '正在吹卡带...',
+  'Loading... Do a barrel roll!': '正在加载...做个桶滚！',
+  'Waiting for the respawn...': '等待重生...',
+  'Finishing the Kessel Run in less than 12 parsecs...':
+    '正在以不到 12 秒差距完成凯塞尔航线...',
+  "The cake is not a lie, it's just still loading...":
+    '蛋糕不是谎言，只是还在加载...',
+  'Fiddling with the character creation screen...': '正在摆弄角色创建界面...',
+  "Just a moment, I'm finding the right meme...":
+    '稍等片刻，我正在寻找合适的表情包...',
+  "Pressing 'A' to continue...": "按 'A' 继续...",
+  'Herding digital cats...': '正在放牧数字猫...',
+  'Polishing the pixels...': '正在打磨像素...',
+  'Finding a suitable loading screen pun...': '正在寻找合适的加载屏幕双关语...',
+  'Distracting you with this witty phrase...':
+    '正在用这个机智的短语分散您的注意力...',
+  'Almost there... probably...': '快到了...可能...',
+  'Our hamsters are working as fast as they can...':
+    '我们的仓鼠正在尽可能快地工作...',
+  'Giving Cloudy a pat on the head...': '正在拍拍 Cloudy 的头...',
+  'Petting the cat...': '正在抚摸猫咪...',
+  'Rickrolling my boss...': '正在 Rickroll 我的老板...',
+  'Never gonna give you up, never gonna let you down...':
+    '永远不会放弃你，永远不会让你失望...',
+  'Slapping the bass...': '正在拍打低音...',
+  'Tasting the snozberries...': '正在品尝 snozberries...',
+  "I'm going the distance, I'm going for speed...":
+    '我要走得更远，我要追求速度...',
+  'Is this the real life? Is this just fantasy?...':
+    '这是真实的生活吗？还是只是幻想？...',
+  "I've got a good feeling about this...": '我对这个感觉很好...',
+  'Poking the bear...': '正在戳熊...',
+  'Doing research on the latest memes...': '正在研究最新的表情包...',
+  'Figuring out how to make this more witty...': '正在想办法让这更有趣...',
+  'Hmmm... let me think...': '嗯...让我想想...',
+  'What do you call a fish with no eyes? A fsh...':
+    '没有眼睛的鱼叫什么？一条鱼...',
+  'Why did the computer go to therapy? It had too many bytes...':
+    '为什么电脑去看心理医生？因为它有太多字节...',
+  "Why don't programmers like nature? It has too many bugs...":
+    '为什么程序员不喜欢大自然？因为虫子太多了...',
+  'Why do programmers prefer dark mode? Because light attracts bugs...':
+    '为什么程序员喜欢暗色模式？因为光会吸引虫子...',
+  'Why did the developer go broke? Because they used up all their cache...':
+    '为什么开发者破产了？因为他们用完了所有缓存...',
+  "What can you do with a broken pencil? Nothing, it's pointless...":
+    '你能用断了的铅笔做什么？什么都不能，因为它没有笔尖...',
+  'Applying percussive maintenance...': '正在应用敲击维护...',
+  'Searching for the correct USB orientation...': '正在寻找正确的 USB 方向...',
+  'Ensuring the magic smoke stays inside the wires...':
+    '确保魔法烟雾留在电线内...',
+  'Rewriting in Rust for no particular reason...':
+    '正在用 Rust 重写，没有特别的原因...',
+  'Trying to exit Vim...': '正在尝试退出 Vim...',
+  'Spinning up the hamster wheel...': '正在启动仓鼠轮...',
+  "That's not a bug, it's an undocumented feature...":
+    '这不是一个错误，这是一个未记录的功能...',
+  'Engage.': '启动。',
+  "I'll be back... with an answer.": '我会回来的...带着答案。',
+  'My other process is a TARDIS...': '我的另一个进程是 TARDIS...',
+  'Communing with the machine spirit...': '正在与机器精神交流...',
+  'Letting the thoughts marinate...': '让想法慢慢酝酿...',
+  'Just remembered where I put my keys...': '刚刚想起我把钥匙放在哪里了...',
+  'Pondering the orb...': '正在思考球体...',
+  "I've seen things you people wouldn't believe... like a user who reads loading messages.":
+    '我见过你们不会相信的事情...比如一个阅读加载消息的用户。',
+  'Initiating thoughtful gaze...': '正在启动深思凝视...',
+  "What's a computer's favorite snack? Microchips.":
+    '电脑最喜欢的零食是什么？微芯片。',
+  "Why do Java developers wear glasses? Because they don't C#.":
+    '为什么 Java 开发者戴眼镜？因为他们不会 C#。',
+  'Charging the laser... pew pew!': '正在给激光充电...砰砰！',
+  'Dividing by zero... just kidding!': '除以零...只是开玩笑！',
+  'Looking for an adult superviso... I mean, processing.':
+    '正在寻找成人监督...我是说，处理中。',
+  'Making it go beep boop.': '让它发出哔哔声。',
+  'Buffering... because even AIs need a moment.':
+    '正在缓冲...因为即使是 AI 也需要片刻。',
+  'Entangling quantum particles for a faster response...':
+    '正在纠缠量子粒子以获得更快的回复...',
+  'Polishing the chrome... on the algorithms.': '正在打磨铬...在算法上。',
+  'Are you not entertained? (Working on it!)': '你不觉得有趣吗？（正在努力！）',
+  'Summoning the code gremlins... to help, of course.':
+    '正在召唤代码小精灵...当然是来帮忙的。',
+  'Just waiting for the dial-up tone to finish...': '只是等待拨号音结束...',
+  'Recalibrating the humor-o-meter.': '正在重新校准幽默计。',
+  'My other loading screen is even funnier.': '我的另一个加载屏幕更有趣。',
+  "Pretty sure there's a cat walking on the keyboard somewhere...":
+    '很确定有只猫在某个地方键盘上走...',
+  'Enhancing... Enhancing... Still loading.':
+    '正在增强...正在增强...仍在加载。',
+  "It's not a bug, it's a feature... of this loading screen.":
+    '这不是一个错误，这是一个功能...这个加载屏幕的功能。',
+  'Have you tried turning it off and on again? (The loading screen, not me.)':
+    '你试过把它关掉再打开吗？（加载屏幕，不是我。）',
+  'Constructing additional pylons...': '正在建造额外的能量塔...',
 };

packages/cli/src/nonInteractive/control/controllers/systemController.ts

@@ -20,7 +20,8 @@ import type {
   CLIControlSetModelRequest,
   CLIMcpServerConfig,
 } from '../../types.js';
-import { getAvailableCommands } from '../../../nonInteractiveCliCommands.js';
+import { CommandService } from '../../../services/CommandService.js';
+import { BuiltinCommandLoader } from '../../../services/BuiltinCommandLoader.js';
 import {
   MCPServerConfig,
   AuthProviderType,
@@ -406,7 +407,7 @@ export class SystemController extends BaseController {
   }
 
   /**
-   * Load slash command names using getAvailableCommands
+   * Load slash command names using CommandService
    *
    * @param signal - AbortSignal to respect for cancellation
    * @returns Promise resolving to array of slash command names
@@ -417,14 +418,21 @@ export class SystemController extends BaseController {
     }
 
     try {
-      const commands = await getAvailableCommands(this.context.config, signal);
+      const service = await CommandService.create(
+        [new BuiltinCommandLoader(this.context.config)],
+        signal,
+      );
 
       if (signal.aborted) {
         return [];
       }
 
-      // Extract command names and sort
-      return commands.map((cmd) => cmd.name).sort();
+      const names = new Set<string>();
+      const commands = service.getCommands();
+      for (const command of commands) {
+        names.add(command.name);
+      }
+      return Array.from(names).sort();
     } catch (error) {
       // Check if the error is due to abort
       if (signal.aborted) {

packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.test.ts

@@ -630,67 +630,6 @@ describe('BaseJsonOutputAdapter', () => {
 
       expect(state.blocks).toHaveLength(0);
     });
-
-    it('should preserve whitespace in thinking content', () => {
-      const state = adapter.exposeCreateMessageState();
-      adapter.startAssistantMessage();
-
-      adapter.exposeAppendThinking(
-        state,
-        '',
-        'The user just said "Hello"',
-        null,
-      );
-
-      expect(state.blocks).toHaveLength(1);
-      expect(state.blocks[0]).toMatchObject({
-        type: 'thinking',
-        thinking: 'The user just said "Hello"',
-      });
-      // Verify spaces are preserved
-      const block = state.blocks[0] as { thinking: string };
-      expect(block.thinking).toContain('user just');
-      expect(block.thinking).not.toContain('userjust');
-    });
-
-    it('should preserve whitespace when appending multiple thinking fragments', () => {
-      const state = adapter.exposeCreateMessageState();
-      adapter.startAssistantMessage();
-
-      // Simulate streaming thinking content in fragments
-      adapter.exposeAppendThinking(state, '', 'The user just', null);
-      adapter.exposeAppendThinking(state, '', ' said "Hello"', null);
-      adapter.exposeAppendThinking(
-        state,
-        '',
-        '. This is a simple greeting',
-        null,
-      );
-
-      expect(state.blocks).toHaveLength(1);
-      const block = state.blocks[0] as { thinking: string };
-      // Verify the complete text with all spaces preserved
-      expect(block.thinking).toBe(
-        'The user just said "Hello". This is a simple greeting',
-      );
-      // Verify specific space preservation
-      expect(block.thinking).toContain('user just ');
-      expect(block.thinking).toContain(' said');
-      expect(block.thinking).toContain('". This');
-      expect(block.thinking).not.toContain('userjust');
-      expect(block.thinking).not.toContain('justsaid');
-    });
-
-    it('should preserve leading and trailing whitespace in description', () => {
-      const state = adapter.exposeCreateMessageState();
-      adapter.startAssistantMessage();
-
-      adapter.exposeAppendThinking(state, '', '  content with spaces  ', null);
-
-      expect(state.blocks).toHaveLength(1);
-      const block = state.blocks[0] as { thinking: string };
-      expect(block.thinking).toBe('  content with spaces  ');
-    });
   });
 
   describe('appendToolUse', () => {

packages/cli/src/nonInteractive/io/BaseJsonOutputAdapter.ts

@@ -816,18 +816,9 @@ export abstract class BaseJsonOutputAdapter {
     parentToolUseId?: string | null,
   ): void {
     const actualParentToolUseId = parentToolUseId ?? null;
-
-    // Build fragment without trimming to preserve whitespace in streaming content
-    // Only filter out null/undefined/empty values
-    const parts: string[] = [];
-    if (subject && subject.length > 0) {
-      parts.push(subject);
-    }
-    if (description && description.length > 0) {
-      parts.push(description);
-    }
-
-    const fragment = parts.join(': ');
+    const fragment = [subject?.trim(), description?.trim()]
+      .filter((value) => value && value.length > 0)
+      .join(': ');
     if (!fragment) {
       return;
     }

packages/cli/src/nonInteractive/io/StreamJsonOutputAdapter.test.ts

@@ -323,68 +323,6 @@ describe('StreamJsonOutputAdapter', () => {
       });
     });
 
-    it('should preserve whitespace in thinking content (issue #1356)', () => {
-      adapter.processEvent({
-        type: GeminiEventType.Thought,
-        value: {
-          subject: '',
-          description: 'The user just said "Hello"',
-        },
-      });
-
-      const message = adapter.finalizeAssistantMessage();
-      expect(message.message.content).toHaveLength(1);
-      const block = message.message.content[0] as {
-        type: string;
-        thinking: string;
-      };
-      expect(block.type).toBe('thinking');
-      expect(block.thinking).toBe('The user just said "Hello"');
-      // Verify spaces are preserved
-      expect(block.thinking).toContain('user just');
-      expect(block.thinking).not.toContain('userjust');
-    });
-
-    it('should preserve whitespace when streaming multiple thinking fragments (issue #1356)', () => {
-      // Simulate streaming thinking content in multiple events
-      adapter.processEvent({
-        type: GeminiEventType.Thought,
-        value: {
-          subject: '',
-          description: 'The user just',
-        },
-      });
-      adapter.processEvent({
-        type: GeminiEventType.Thought,
-        value: {
-          subject: '',
-          description: ' said "Hello"',
-        },
-      });
-      adapter.processEvent({
-        type: GeminiEventType.Thought,
-        value: {
-          subject: '',
-          description: '. This is a simple greeting',
-        },
-      });
-
-      const message = adapter.finalizeAssistantMessage();
-      expect(message.message.content).toHaveLength(1);
-      const block = message.message.content[0] as {
-        type: string;
-        thinking: string;
-      };
-      expect(block.thinking).toBe(
-        'The user just said "Hello". This is a simple greeting',
-      );
-      // Verify specific spaces are preserved
-      expect(block.thinking).toContain('user just ');
-      expect(block.thinking).toContain(' said');
-      expect(block.thinking).not.toContain('userjust');
-      expect(block.thinking).not.toContain('justsaid');
-    });
-
     it('should append tool use from ToolCallRequest events', () => {
       adapter.processEvent({
         type: GeminiEventType.ToolCallRequest,

packages/cli/src/nonInteractiveCli.test.ts

@@ -68,7 +68,6 @@ describe('runNonInteractive', () => {
   let mockShutdownTelemetry: Mock;
   let consoleErrorSpy: MockInstance;
   let processStdoutSpy: MockInstance;
-  let processStderrSpy: MockInstance;
   let mockGeminiClient: {
     sendMessageStream: Mock;
     getChatRecordingService: Mock;
@@ -87,9 +86,6 @@ describe('runNonInteractive', () => {
     processStdoutSpy = vi
       .spyOn(process.stdout, 'write')
       .mockImplementation(() => true);
-    processStderrSpy = vi
-      .spyOn(process.stderr, 'write')
-      .mockImplementation(() => true);
     vi.spyOn(process, 'exit').mockImplementation((code) => {
       throw new Error(`process.exit(${code}) called`);
     });
@@ -143,8 +139,6 @@ describe('runNonInteractive', () => {
       setModel: vi.fn(async (model: string) => {
         currentModel = model;
       }),
-      getExperimentalZedIntegration: vi.fn().mockReturnValue(false),
-      isInteractive: vi.fn().mockReturnValue(false),
     } as unknown as Config;
 
     mockSettings = {
@@ -298,9 +292,7 @@ describe('runNonInteractive', () => {
       mockConfig,
       expect.objectContaining({ name: 'testTool' }),
       expect.any(AbortSignal),
-      expect.objectContaining({
-        outputUpdateHandler: expect.any(Function),
-      }),
+      undefined,
     );
     // Verify first call has isContinuation: false
     expect(mockGeminiClient.sendMessageStream).toHaveBeenNthCalledWith(
@@ -773,52 +765,6 @@ describe('runNonInteractive', () => {
     );
   });
 
-  it('should handle API errors in text mode and exit with error code', async () => {
-    (mockConfig.getOutputFormat as Mock).mockReturnValue(OutputFormat.TEXT);
-    setupMetricsMock();
-
-    // Simulate an API error event (like 401 unauthorized)
-    const apiErrorEvent: ServerGeminiStreamEvent = {
-      type: GeminiEventType.Error,
-      value: {
-        error: {
-          message: '401 Incorrect API key provided',
-          status: 401,
-        },
-      },
-    };
-
-    mockGeminiClient.sendMessageStream.mockReturnValue(
-      createStreamFromEvents([apiErrorEvent]),
-    );
-
-    let thrownError: Error | null = null;
-    try {
-      await runNonInteractive(
-        mockConfig,
-        mockSettings,
-        'Test input',
-        'prompt-id-api-error',
-      );
-      // Should not reach here
-      expect.fail('Expected error to be thrown');
-    } catch (error) {
-      thrownError = error as Error;
-    }
-
-    // Should throw with the API error message
-    expect(thrownError).toBeTruthy();
-    expect(thrownError?.message).toContain('401');
-    expect(thrownError?.message).toContain('Incorrect API key provided');
-
-    // Verify error was written to stderr
-    expect(processStderrSpy).toHaveBeenCalled();
-    const stderrCalls = processStderrSpy.mock.calls;
-    const errorOutput = stderrCalls.map((call) => call[0]).join('');
-    expect(errorOutput).toContain('401');
-    expect(errorOutput).toContain('Incorrect API key provided');
-  });
-
   it('should handle FatalInputError with custom exit code in JSON format', async () => {
     (mockConfig.getOutputFormat as Mock).mockReturnValue(OutputFormat.JSON);
     setupMetricsMock();
@@ -906,7 +852,7 @@ describe('runNonInteractive', () => {
     expect(processStdoutSpy).toHaveBeenCalledWith('Response from command');
   });
 
-  it('should handle command that requires confirmation by returning early', async () => {
+  it('should throw FatalInputError if a command requires confirmation', async () => {
     const mockCommand = {
       name: 'confirm',
       description: 'a command that needs confirmation',
@@ -918,16 +864,15 @@ describe('runNonInteractive', () => {
     };
     mockGetCommands.mockReturnValue([mockCommand]);
 
-    await runNonInteractive(
-      mockConfig,
-      mockSettings,
-      '/confirm',
-      'prompt-id-confirm',
-    );
-
-    // Should write error message to stderr
-    expect(processStderrSpy).toHaveBeenCalledWith(
-      'Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.\n',
+    await expect(
+      runNonInteractive(
+        mockConfig,
+        mockSettings,
+        '/confirm',
+        'prompt-id-confirm',
+      ),
+    ).rejects.toThrow(
+      'Exiting due to a confirmation prompt requested by the command.',
     );
   });
 
@@ -964,30 +909,7 @@ describe('runNonInteractive', () => {
     expect(processStdoutSpy).toHaveBeenCalledWith('Response to unknown');
   });
 
-  it('should handle known but unsupported slash commands like /help by returning early', async () => {
-    // Mock a built-in command that exists but is not in the allowed list
-    const mockHelpCommand = {
-      name: 'help',
-      description: 'Show help',
-      kind: CommandKind.BUILT_IN,
-      action: vi.fn(),
-    };
-    mockGetCommands.mockReturnValue([mockHelpCommand]);
-
-    await runNonInteractive(
-      mockConfig,
-      mockSettings,
-      '/help',
-      'prompt-id-help',
-    );
-
-    // Should write error message to stderr
-    expect(processStderrSpy).toHaveBeenCalledWith(
-      'The command "/help" is not supported in non-interactive mode.\n',
-    );
-  });
-
-  it('should handle unhandled command result types by returning early with error', async () => {
+  it('should throw for unhandled command result types', async () => {
     const mockCommand = {
       name: 'noaction',
       description: 'unhandled type',
@@ -998,16 +920,15 @@ describe('runNonInteractive', () => {
     };
     mockGetCommands.mockReturnValue([mockCommand]);
 
-    await runNonInteractive(
-      mockConfig,
-      mockSettings,
-      '/noaction',
-      'prompt-id-unhandled',
-    );
-
-    // Should write error message to stderr
-    expect(processStderrSpy).toHaveBeenCalledWith(
-      'Unknown command result type: unhandled\n',
+    await expect(
+      runNonInteractive(
+        mockConfig,
+        mockSettings,
+        '/noaction',
+        'prompt-id-unhandled',
+      ),
+    ).rejects.toThrow(
+      'Exiting due to command result that is not supported in non-interactive mode.',
     );
   });
 
@@ -1825,84 +1746,4 @@ describe('runNonInteractive', () => {
       { isContinuation: false },
     );
   });
-
-  it('should print tool output to console in text mode (non-Task tools)', async () => {
-    // Test that tool output is printed to stdout in text mode
-    const toolCallEvent: ServerGeminiStreamEvent = {
-      type: GeminiEventType.ToolCallRequest,
-      value: {
-        callId: 'tool-1',
-        name: 'run_in_terminal',
-        args: { command: 'npm outdated' },
-        isClientInitiated: false,
-        prompt_id: 'prompt-id-tool-output',
-      },
-    };
-
-    // Mock tool execution with outputUpdateHandler being called
-    mockCoreExecuteToolCall.mockImplementation(
-      async (_config, _request, _signal, options) => {
-        // Simulate tool calling outputUpdateHandler with output chunks
-        if (options?.outputUpdateHandler) {
-          options.outputUpdateHandler('tool-1', 'Package outdated\n');
-          options.outputUpdateHandler('tool-1', 'npm@1.0.0 -> npm@2.0.0\n');
-        }
-        return {
-          responseParts: [
-            {
-              functionResponse: {
-                id: 'tool-1',
-                name: 'run_in_terminal',
-                response: {
-                  output: 'Package outdated\nnpm@1.0.0 -> npm@2.0.0',
-                },
-              },
-            },
-          ],
-        };
-      },
-    );
-
-    const firstCallEvents: ServerGeminiStreamEvent[] = [
-      toolCallEvent,
-      {
-        type: GeminiEventType.Finished,
-        value: { reason: undefined, usageMetadata: { totalTokenCount: 5 } },
-      },
-    ];
-
-    const secondCallEvents: ServerGeminiStreamEvent[] = [
-      { type: GeminiEventType.Content, value: 'Dependencies checked' },
-      {
-        type: GeminiEventType.Finished,
-        value: { reason: undefined, usageMetadata: { totalTokenCount: 3 } },
-      },
-    ];
-
-    mockGeminiClient.sendMessageStream
-      .mockReturnValueOnce(createStreamFromEvents(firstCallEvents))
-      .mockReturnValueOnce(createStreamFromEvents(secondCallEvents));
-
-    await runNonInteractive(
-      mockConfig,
-      mockSettings,
-      'Check dependencies',
-      'prompt-id-tool-output',
-    );
-
-    // Verify that executeToolCall was called with outputUpdateHandler
-    expect(mockCoreExecuteToolCall).toHaveBeenCalledWith(
-      mockConfig,
-      expect.objectContaining({ name: 'run_in_terminal' }),
-      expect.any(AbortSignal),
-      expect.objectContaining({
-        outputUpdateHandler: expect.any(Function),
-      }),
-    );
-
-    // Verify tool output was written to stdout
-    expect(processStdoutSpy).toHaveBeenCalledWith('Package outdated\n');
-    expect(processStdoutSpy).toHaveBeenCalledWith('npm@1.0.0 -> npm@2.0.0\n');
-    expect(processStdoutSpy).toHaveBeenCalledWith('Dependencies checked');
-  });
 });

packages/cli/src/nonInteractiveCli.ts

@@ -4,11 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type {
-  Config,
-  ToolCallRequestInfo,
-  ToolResultDisplay,
-} from '@qwen-code/qwen-code-core';
+import type { Config, ToolCallRequestInfo } from '@qwen-code/qwen-code-core';
 import { isSlashCommand } from './ui/utils/commandUtils.js';
 import type { LoadedSettings } from './config/settings.js';
 import {
@@ -46,55 +42,6 @@ import {
   computeUsageFromMetrics,
 } from './utils/nonInteractiveHelpers.js';
 
-/**
- * Emits a final message for slash command results.
- * Note: systemMessage should already be emitted before calling this function.
- */
-async function emitNonInteractiveFinalMessage(params: {
-  message: string;
-  isError: boolean;
-  adapter?: JsonOutputAdapterInterface;
-  config: Config;
-  startTimeMs: number;
-}): Promise<void> {
-  const { message, isError, adapter, config } = params;
-
-  if (!adapter) {
-    // Text output mode: write directly to stdout/stderr
-    const target = isError ? process.stderr : process.stdout;
-    target.write(`${message}\n`);
-    return;
-  }
-
-  // JSON output mode: emit assistant message and result
-  // (systemMessage should already be emitted by caller)
-  adapter.startAssistantMessage();
-  adapter.processEvent({
-    type: GeminiEventType.Content,
-    value: message,
-  } as unknown as Parameters<JsonOutputAdapterInterface['processEvent']>[0]);
-  adapter.finalizeAssistantMessage();
-
-  const metrics = uiTelemetryService.getMetrics();
-  const usage = computeUsageFromMetrics(metrics);
-  const outputFormat = config.getOutputFormat();
-  const stats =
-    outputFormat === OutputFormat.JSON
-      ? uiTelemetryService.getMetrics()
-      : undefined;
-
-  adapter.emitResult({
-    isError,
-    durationMs: Date.now() - params.startTimeMs,
-    apiDurationMs: 0,
-    numTurns: 0,
-    errorMessage: isError ? message : undefined,
-    usage,
-    stats,
-    summary: message,
-  });
-}
-
 /**
  * Provides optional overrides for `runNonInteractive` execution.
  *
@@ -168,16 +115,6 @@ export async function runNonInteractive(
       process.on('SIGINT', shutdownHandler);
       process.on('SIGTERM', shutdownHandler);
 
-      // Emit systemMessage first (always the first message in JSON mode)
-      if (adapter) {
-        const systemMessage = await buildSystemMessage(
-          config,
-          sessionId,
-          permissionMode,
-        );
-        adapter.emitMessage(systemMessage);
-      }
-
       let initialPartList: PartListUnion | null = extractPartsFromUserMessage(
         options.userMessage,
       );
@@ -191,45 +128,10 @@ export async function runNonInteractive(
             config,
             settings,
           );
-          switch (slashCommandResult.type) {
-            case 'submit_prompt':
-              // A slash command can replace the prompt entirely; fall back to @-command processing otherwise.
-              initialPartList = slashCommandResult.content;
-              slashHandled = true;
-              break;
-            case 'message': {
-              // systemMessage already emitted above
-              await emitNonInteractiveFinalMessage({
-                message: slashCommandResult.content,
-                isError: slashCommandResult.messageType === 'error',
-                adapter,
-                config,
-                startTimeMs: startTime,
-              });
-              return;
-            }
-            case 'stream_messages':
-              throw new FatalInputError(
-                'Stream messages mode is not supported in non-interactive CLI',
-              );
-            case 'unsupported': {
-              await emitNonInteractiveFinalMessage({
-                message: slashCommandResult.reason,
-                isError: true,
-                adapter,
-                config,
-                startTimeMs: startTime,
-              });
-              return;
-            }
-            case 'no_command':
-              break;
-            default: {
-              const _exhaustive: never = slashCommandResult;
-              throw new FatalInputError(
-                `Unhandled slash command result type: ${(_exhaustive as { type: string }).type}`,
-              );
-            }
+          if (slashCommandResult) {
+            // A slash command can replace the prompt entirely; fall back to @-command processing otherwise.
+            initialPartList = slashCommandResult as PartListUnion;
+            slashHandled = true;
           }
         }
 
@@ -261,6 +163,15 @@ export async function runNonInteractive(
       const initialParts = normalizePartList(initialPartList);
       let currentMessages: Content[] = [{ role: 'user', parts: initialParts }];
 
+      if (adapter) {
+        const systemMessage = await buildSystemMessage(
+          config,
+          sessionId,
+          permissionMode,
+        );
+        adapter.emitMessage(systemMessage);
+      }
+
       let isFirstTurn = true;
       while (true) {
         turnCount++;
@@ -312,8 +223,6 @@ export async function runNonInteractive(
                 config.getContentGeneratorConfig()?.authType,
               );
               process.stderr.write(`${errorText}\n`);
-              // Throw error to exit with non-zero code
-              throw new Error(errorText);
             }
           }
         }
@@ -339,7 +248,7 @@ export async function runNonInteractive(
                 ? options.controlService.permission.getToolCallUpdateCallback()
                 : undefined;
 
-            // Create output handler for Task tool (for subagent execution)
+            // Only pass outputUpdateHandler for Task tool
             const isTaskTool = finalRequestInfo.name === 'task';
             const taskToolProgress = isTaskTool
               ? createTaskToolProgressHandler(
@@ -349,41 +258,20 @@ export async function runNonInteractive(
                 )
               : undefined;
             const taskToolProgressHandler = taskToolProgress?.handler;
-
-            // Create output handler for non-Task tools in text mode (for console output)
-            const nonTaskOutputHandler =
-              !isTaskTool && !adapter
-                ? (callId: string, outputChunk: ToolResultDisplay) => {
-                    // Print tool output to console in text mode
-                    if (typeof outputChunk === 'string') {
-                      process.stdout.write(outputChunk);
-                    } else if (
-                      outputChunk &&
-                      typeof outputChunk === 'object' &&
-                      'ansiOutput' in outputChunk
-                    ) {
-                      // Handle ANSI output - just print as string for now
-                      process.stdout.write(String(outputChunk.ansiOutput));
-                    }
-                  }
-                : undefined;
-
-            // Combine output handlers
-            const outputUpdateHandler =
-              taskToolProgressHandler || nonTaskOutputHandler;
-
             const toolResponse = await executeToolCall(
               config,
               finalRequestInfo,
               abortController.signal,
-              outputUpdateHandler || toolCallUpdateCallback
+              isTaskTool && taskToolProgressHandler
                 ? {
-                    ...(outputUpdateHandler && { outputUpdateHandler }),
-                    ...(toolCallUpdateCallback && {
-                      onToolCallsUpdate: toolCallUpdateCallback,
-                    }),
+                    outputUpdateHandler: taskToolProgressHandler,
+                    onToolCallsUpdate: toolCallUpdateCallback,
                   }
-                : undefined,
+                : toolCallUpdateCallback
+                  ? {
+                      onToolCallsUpdate: toolCallUpdateCallback,
+                    }
+                  : undefined,
             );
 
             // Note: In JSON mode, subagent messages are automatically added to the main

packages/cli/src/nonInteractiveCliCommands.test.ts

@@ -1,242 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { handleSlashCommand } from './nonInteractiveCliCommands.js';
-import type { Config } from '@qwen-code/qwen-code-core';
-import type { LoadedSettings } from './config/settings.js';
-import { CommandKind } from './ui/commands/types.js';
-
-// Mock the CommandService
-const mockGetCommands = vi.hoisted(() => vi.fn());
-const mockCommandServiceCreate = vi.hoisted(() => vi.fn());
-vi.mock('./services/CommandService.js', () => ({
-  CommandService: {
-    create: mockCommandServiceCreate,
-  },
-}));
-
-describe('handleSlashCommand', () => {
-  let mockConfig: Config;
-  let mockSettings: LoadedSettings;
-  let abortController: AbortController;
-
-  beforeEach(() => {
-    mockCommandServiceCreate.mockResolvedValue({
-      getCommands: mockGetCommands,
-    });
-
-    mockConfig = {
-      getExperimentalZedIntegration: vi.fn().mockReturnValue(false),
-      isInteractive: vi.fn().mockReturnValue(false),
-      getSessionId: vi.fn().mockReturnValue('test-session'),
-      getFolderTrustFeature: vi.fn().mockReturnValue(false),
-      getFolderTrust: vi.fn().mockReturnValue(false),
-      getProjectRoot: vi.fn().mockReturnValue('/test/project'),
-      storage: {},
-    } as unknown as Config;
-
-    mockSettings = {
-      system: { path: '', settings: {} },
-      systemDefaults: { path: '', settings: {} },
-      user: { path: '', settings: {} },
-      workspace: { path: '', settings: {} },
-    } as LoadedSettings;
-
-    abortController = new AbortController();
-  });
-
-  it('should return no_command for non-slash input', async () => {
-    const result = await handleSlashCommand(
-      'regular text',
-      abortController,
-      mockConfig,
-      mockSettings,
-    );
-
-    expect(result.type).toBe('no_command');
-  });
-
-  it('should return no_command for unknown slash commands', async () => {
-    mockGetCommands.mockReturnValue([]);
-
-    const result = await handleSlashCommand(
-      '/unknowncommand',
-      abortController,
-      mockConfig,
-      mockSettings,
-    );
-
-    expect(result.type).toBe('no_command');
-  });
-
-  it('should return unsupported for known built-in commands not in allowed list', async () => {
-    const mockHelpCommand = {
-      name: 'help',
-      description: 'Show help',
-      kind: CommandKind.BUILT_IN,
-      action: vi.fn(),
-    };
-    mockGetCommands.mockReturnValue([mockHelpCommand]);
-
-    const result = await handleSlashCommand(
-      '/help',
-      abortController,
-      mockConfig,
-      mockSettings,
-      [], // Empty allowed list
-    );
-
-    expect(result.type).toBe('unsupported');
-    if (result.type === 'unsupported') {
-      expect(result.reason).toContain('/help');
-      expect(result.reason).toContain('not supported');
-    }
-  });
-
-  it('should return unsupported for /help when using default allowed list', async () => {
-    const mockHelpCommand = {
-      name: 'help',
-      description: 'Show help',
-      kind: CommandKind.BUILT_IN,
-      action: vi.fn(),
-    };
-    mockGetCommands.mockReturnValue([mockHelpCommand]);
-
-    const result = await handleSlashCommand(
-      '/help',
-      abortController,
-      mockConfig,
-      mockSettings,
-      // Default allowed list: ['init', 'summary', 'compress']
-    );
-
-    expect(result.type).toBe('unsupported');
-    if (result.type === 'unsupported') {
-      expect(result.reason).toBe(
-        'The command "/help" is not supported in non-interactive mode.',
-      );
-    }
-  });
-
-  it('should execute allowed built-in commands', async () => {
-    const mockInitCommand = {
-      name: 'init',
-      description: 'Initialize project',
-      kind: CommandKind.BUILT_IN,
-      action: vi.fn().mockResolvedValue({
-        type: 'message',
-        messageType: 'info',
-        content: 'Project initialized',
-      }),
-    };
-    mockGetCommands.mockReturnValue([mockInitCommand]);
-
-    const result = await handleSlashCommand(
-      '/init',
-      abortController,
-      mockConfig,
-      mockSettings,
-      ['init'], // init is in the allowed list
-    );
-
-    expect(result.type).toBe('message');
-    if (result.type === 'message') {
-      expect(result.content).toBe('Project initialized');
-    }
-  });
-
-  it('should execute file commands regardless of allowed list', async () => {
-    const mockFileCommand = {
-      name: 'custom',
-      description: 'Custom file command',
-      kind: CommandKind.FILE,
-      action: vi.fn().mockResolvedValue({
-        type: 'submit_prompt',
-        content: [{ text: 'Custom prompt' }],
-      }),
-    };
-    mockGetCommands.mockReturnValue([mockFileCommand]);
-
-    const result = await handleSlashCommand(
-      '/custom',
-      abortController,
-      mockConfig,
-      mockSettings,
-      [], // Empty allowed list, but FILE commands should still work
-    );
-
-    expect(result.type).toBe('submit_prompt');
-    if (result.type === 'submit_prompt') {
-      expect(result.content).toEqual([{ text: 'Custom prompt' }]);
-    }
-  });
-
-  it('should return unsupported for other built-in commands like /quit', async () => {
-    const mockQuitCommand = {
-      name: 'quit',
-      description: 'Quit application',
-      kind: CommandKind.BUILT_IN,
-      action: vi.fn(),
-    };
-    mockGetCommands.mockReturnValue([mockQuitCommand]);
-
-    const result = await handleSlashCommand(
-      '/quit',
-      abortController,
-      mockConfig,
-      mockSettings,
-    );
-
-    expect(result.type).toBe('unsupported');
-    if (result.type === 'unsupported') {
-      expect(result.reason).toContain('/quit');
-      expect(result.reason).toContain('not supported');
-    }
-  });
-
-  it('should handle command with no action', async () => {
-    const mockCommand = {
-      name: 'noaction',
-      description: 'Command without action',
-      kind: CommandKind.FILE,
-      // No action property
-    };
-    mockGetCommands.mockReturnValue([mockCommand]);
-
-    const result = await handleSlashCommand(
-      '/noaction',
-      abortController,
-      mockConfig,
-      mockSettings,
-    );
-
-    expect(result.type).toBe('no_command');
-  });
-
-  it('should return message when command returns void', async () => {
-    const mockCommand = {
-      name: 'voidcmd',
-      description: 'Command that returns void',
-      kind: CommandKind.FILE,
-      action: vi.fn().mockResolvedValue(undefined),
-    };
-    mockGetCommands.mockReturnValue([mockCommand]);
-
-    const result = await handleSlashCommand(
-      '/voidcmd',
-      abortController,
-      mockConfig,
-      mockSettings,
-    );
-
-    expect(result.type).toBe('message');
-    if (result.type === 'message') {
-      expect(result.content).toBe('Command executed successfully.');
-      expect(result.messageType).toBe('info');
-    }
-  });
-});