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

2025-12-27 20:19:14 +00:00 · 2025-12-24 01:17:33 +00:00
153 changed files with 3479 additions and 9176 deletions
--- a/.github/workflows/release-sdk.yml
+++ b/.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,68 +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.GITHUB_TOKEN }}'
-          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: 'Wait for CI checks to complete'
-        if: |-
-          ${{ steps.vars.outputs.is_dry_run == 'false' && steps.vars.outputs.is_nightly == 'false' && steps.vars.outputs.is_preview == 'false' }}
-        env:
-          GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          PR_URL: '${{ steps.pr.outputs.PR_URL }}'
-        run: |-
-          set -euo pipefail
-          echo "Waiting for CI checks to complete..."
-          gh pr checks "${PR_URL}" --watch --interval 30
-
-      - 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.GITHUB_TOKEN }}'
-          PR_URL: '${{ steps.pr.outputs.PR_URL }}'
-        run: |-
-          set -euo pipefail
-          gh pr merge "${PR_URL}" --merge --auto
+            --generate-notes

      - name: 'Create Issue on Failure'
        if: |-
--- a/docs/users/configuration/settings.md
+++ b/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`

@@ -381,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).                                                                                                                                     |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `--experimental-acp`         |       | Enables ACP mode (Agent Control Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                           |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| `--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`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
--- a/docs/users/features/_meta.ts
+++ b/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',
 };
--- a/docs/users/features/commands.md
+++ b/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
@@ -72,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

--- a/docs/users/features/headless.md
+++ b/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).

--- a/docs/users/features/language.md
+++ b/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
--- a/docs/users/features/skills.md
+++ b/docs/users/features/skills.md
@@ -1,282 +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)
- Run with the experimental flag enabled:
-
-```bash
-qwen --experimental-skills
-```
-
- 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`).
-
-### 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/`
-
-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?
--- a/docs/users/overview.md
+++ b/docs/users/overview.md
@@ -1,6 +1,4 @@
 # 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.

@@ -48,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

--- a/eslint.config.js
+++ b/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,
--- a/integration-tests/file-system.test.ts
+++ b/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,
+    );
  });
 });
--- a/integration-tests/sdk-typescript/permission-control.test.ts
+++ b/integration-tests/sdk-typescript/permission-control.test.ts
@@ -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
--- a/integration-tests/sdk-typescript/system-control.test.ts
+++ b/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');
-    });
-  });
 });
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.0",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.6.0",
+      "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",
@@ -4860,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"
@@ -4946,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",
@@ -5529,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": {
@@ -6487,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"
@@ -7112,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"
@@ -7624,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",
@@ -8153,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"
@@ -8698,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",
@@ -8710,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"
@@ -8728,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",
@@ -9334,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"
@@ -9512,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",
@@ -12020,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",
@@ -17316,7 +17194,7 @@
    },
    "packages/cli": {
      "name": "@qwen-code/qwen-code",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.0",
      "dependencies": {
        "@google/genai": "1.30.0",
        "@iarna/toml": "^2.2.5",
@@ -17953,10 +17831,9 @@
    },
    "packages/core": {
      "name": "@qwen-code/qwen-code-core",
-      "version": "0.6.0",
+      "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",
@@ -18593,7 +18470,7 @@
    },
    "packages/sdk-typescript": {
      "name": "@qwen-code/sdk",
-      "version": "0.1.0",
+      "version": "0.6.0-preview.0",
      "license": "Apache-2.0",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.25.1",
@@ -21413,7 +21290,7 @@
    },
    "packages/test-utils": {
      "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.0",
      "dev": true,
      "license": "Apache-2.0",
      "devDependencies": {
@@ -21425,7 +21302,7 @@
    },
    "packages/vscode-ide-companion": {
      "name": "qwen-code-vscode-ide-companion",
-      "version": "0.6.0",
+      "version": "0.6.0-preview.0",
      "license": "LICENSE",
      "dependencies": {
        "@modelcontextprotocol/sdk": "^1.25.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.6.0",
+  "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.6.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-preview.0"
  },
  "scripts": {
    "start": "cross-env node scripts/start.js",
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code",
-  "version": "0.6.0",
+  "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.6.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.6.0-preview.0"
  },
  "dependencies": {
    "@google/genai": "1.30.0",
--- a/packages/cli/src/acp-integration/acp.ts
+++ b/packages/cli/src/acp-integration/acp.ts
@@ -98,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
   *
@@ -382,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>;
--- a/packages/cli/src/acp-integration/acpAgent.ts
+++ b/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';
@@ -165,30 +165,9 @@ class GeminiAgent {
    this.setupFileSystem(config);

    const session = await this.createAndStoreSession(config);
-    const configuredModel = (
-      config.getModel() ||
-      this.config.getModel() ||
-      ''
-    ).trim();
-    const modelId = configuredModel || 'default';
-    const modelName = configuredModel || modelId;

    return {
      sessionId: session.getId(),
-      models: {
-        currentModelId: modelId,
-        availableModels: [
-          {
-            modelId,
-            name: modelName,
-            description: null,
-            _meta: {
-              contextLimit: tokenLimit(modelId),
-            },
-          },
-        ],
-        _meta: null,
-      },
    };
  }

@@ -348,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,
--- a/packages/cli/src/acp-integration/schema.ts
+++ b/packages/cli/src/acp-integration/schema.ts
@@ -93,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>;

@@ -255,26 +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 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();
@@ -533,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,
@@ -581,7 +555,6 @@ export const sessionUpdateSchema = z.union([
    sessionUpdate: z.literal('plan'),
  }),
  currentModeUpdateSchema,
-  currentModelUpdateSchema,
  availableCommandsUpdateSchema,
 ]);

--- a/packages/cli/src/acp-integration/session/Session.ts
+++ b/packages/cli/src/acp-integration/session/Session.ts
@@ -41,11 +41,9 @@ 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,
@@ -65,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:
@@ -163,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
@@ -293,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
@@ -644,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,
--- a/packages/cli/src/config/auth.ts
+++ b/packages/cli/src/config/auth.ts
@@ -26,20 +26,6 @@ export function validateAuthMethod(authMethod: string): string | null {
    return null;
  }

-  if (authMethod === AuthType.USE_ANTHROPIC) {
-    const hasApiKey = process.env['ANTHROPIC_API_KEY'];
-    if (!hasApiKey) {
-      return 'ANTHROPIC_API_KEY environment variable not found.';
-    }
-
-    const hasBaseUrl = process.env['ANTHROPIC_BASE_URL'];
-    if (!hasBaseUrl) {
-      return 'ANTHROPIC_BASE_URL environment variable not found.';
-    }
-
-    return null;
-  }
-
  if (authMethod === AuthType.USE_GEMINI) {
    const hasApiKey = process.env['GEMINI_API_KEY'];
    if (!hasApiKey) {
--- a/packages/cli/src/config/config.test.ts
+++ b/packages/cli/src/config/config.test.ts
@@ -2114,14 +2114,7 @@ describe('loadCliConfig model selection', () => {
  });

  it('always prefers model from argvs', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--auth-type',
-      'openai',
-      '--model',
-      'qwen3-coder-plus',
-    ];
+    process.argv = ['node', 'script.js', '--model', 'qwen3-coder-plus'];
    const argv = await parseArguments({} as Settings);
    const config = await loadCliConfig(
      {
@@ -2141,14 +2134,7 @@ describe('loadCliConfig model selection', () => {
  });

  it('selects the model from argvs if provided', async () => {
-    process.argv = [
-      'node',
-      'script.js',
-      '--auth-type',
-      'openai',
-      '--model',
-      'qwen3-coder-plus',
-    ];
+    process.argv = ['node', 'script.js', '--model', 'qwen3-coder-plus'];
    const argv = await parseArguments({} as Settings);
    const config = await loadCliConfig(
      {
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -112,7 +112,6 @@ export interface CliArgs {
  allowedMcpServerNames: string[] | undefined;
  allowedTools: string[] | undefined;
  experimentalAcp: boolean | undefined;
-  experimentalSkills: boolean | undefined;
  extensions: string[] | undefined;
  listExtensions: boolean | undefined;
  openaiLogging: boolean | undefined;
@@ -308,11 +307,6 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
          type: 'boolean',
          description: 'Starts the agent in ACP mode',
        })
-        .option('experimental-skills', {
-          type: 'boolean',
-          description: 'Enable experimental Skills feature',
-          default: false,
-        })
        .option('channel', {
          type: 'string',
          choices: ['VSCode', 'ACP', 'SDK', 'CI'],
@@ -468,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,
@@ -877,30 +870,11 @@ export async function loadCliConfig(
    );
  }

-  const selectedAuthType =
-    (argv.authType as AuthType | undefined) ||
-    settings.security?.auth?.selectedType;
-
-  const apiKey =
-    (selectedAuthType === AuthType.USE_OPENAI
-      ? argv.openaiApiKey ||
-        process.env['OPENAI_API_KEY'] ||
-        settings.security?.auth?.apiKey
-      : '') || '';
-  const baseUrl =
-    (selectedAuthType === AuthType.USE_OPENAI
-      ? argv.openaiBaseUrl ||
-        process.env['OPENAI_BASE_URL'] ||
-        settings.security?.auth?.baseUrl
-      : '') || '';
  const resolvedModel =
    argv.model ||
-    (selectedAuthType === AuthType.USE_OPENAI
-      ? process.env['OPENAI_MODEL'] ||
-        process.env['QWEN_MODEL'] ||
-        settings.model?.name
-      : '') ||
-    '';
+    process.env['OPENAI_MODEL'] ||
+    process.env['QWEN_MODEL'] ||
+    settings.model?.name;

  const sandboxConfig = await loadSandboxConfig(settings, argv);
  const screenReader =
@@ -982,20 +956,27 @@ export async function loadCliConfig(
    maxSessionTurns:
      argv.maxSessionTurns ?? settings.model?.maxSessionTurns ?? -1,
    experimentalZedIntegration: argv.experimentalAcp || false,
-    experimentalSkills: argv.experimentalSkills || false,
    listExtensions: argv.listExtensions || false,
    extensions: allExtensions,
    blockedMcpServers,
    noBrowser: !!process.env['NO_BROWSER'],
-    authType: selectedAuthType,
+    authType:
+      (argv.authType as AuthType | undefined) ||
+      settings.security?.auth?.selectedType,
    inputFormat,
    outputFormat,
    includePartialMessages,
    generationConfig: {
      ...(settings.model?.generationConfig || {}),
      model: resolvedModel,
-      apiKey,
-      baseUrl,
+      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
--- a/packages/cli/src/core/initializer.ts
+++ b/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,9 +41,6 @@ export async function initializeApp(
    'auto';
  await initializeI18n(languageSetting);

-  // Auto-detect and set LLM output language on first use
-  initializeLlmOutputLanguage();
-
  const authType = settings.merged.security?.auth?.selectedType;
  const authError = await performInitialAuth(config, authType);

--- a/packages/cli/src/gemini.test.tsx
+++ b/packages/cli/src/gemini.test.tsx
@@ -461,7 +461,6 @@ describe('gemini.tsx main function kitty protocol', () => {
      allowedMcpServerNames: undefined,
      allowedTools: undefined,
      experimentalAcp: undefined,
-      experimentalSkills: undefined,
      extensions: undefined,
      listExtensions: undefined,
      openaiLogging: undefined,
--- a/packages/cli/src/i18n/index.ts
+++ b/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> {
--- a/packages/cli/src/i18n/languages.ts
+++ b/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';
-}
--- a/packages/cli/src/i18n/locales/en.js
+++ b/packages/cli/src/i18n/locales/en.js
@@ -102,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':
@@ -258,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
  // ============================================================================
@@ -592,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
@@ -612,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
@@ -936,138 +927,192 @@ export default {
  // ============================================================================
  '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...',
+  'Rewriting in Rust for no particular reason...':
    'Rewriting in Rust for no particular reason...',
-    'Trying to exit Vim...',
-    'Spinning up the hamster wheel...',
+  '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...',
 };
--- a/packages/cli/src/i18n/locales/ru.js
+++ b/packages/cli/src/i18n/locales/ru.js
@@ -103,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':
@@ -260,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}}" не поддерживается в неинтерактивном режиме.',
+
  // ============================================================================
  // Метки настроек
  // ============================================================================
@@ -314,7 +313,6 @@ export default {
  'Tool Output Truncation Lines': 'Лимит строк вывода инструментов',
  'Folder Trust': 'Доверие к папке',
  'Vision Model Preview': 'Визуальная модель (предпросмотр)',
-  'Tool Schema Compliance': 'Соответствие схеме инструмента',
  // Варианты перечислений настроек
  'Auto (detect from system)': 'Авто (определить из системы)',
  Text: 'Текст',
@@ -343,8 +341,8 @@ export default {
    'Установка предпочитаемого внешнего редактора',
  'Manage extensions': 'Управление расширениями',
  'List active extensions': 'Показать активные расширения',
-  'Update extensions. Usage: update <extension-names>|--all':
-    'Обновить расширения. Использование: update <extension-names>|--all',
+  'Update extensions. Usage: update |--all':
+    'Обновить расширения. Использование: update |--all',
  'manage IDE integration': 'Управление интеграцией с IDE',
  'check status of IDE integration': 'Проверить статус интеграции с IDE',
  'install required IDE companion for {{ideName}}':
@@ -402,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 日本語',
@@ -420,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)':
@@ -437,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':
@@ -590,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 <путь-к-файлу>',

  // ============================================================================
  // Команды - Резюме
@@ -606,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',

  // ============================================================================
  // Команды - Модель
@@ -626,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.': 'Очистка терминала.',

  // ============================================================================
  // Команды - Сжатие
@@ -659,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}}':
@@ -893,7 +884,6 @@ export default {
  // Экран выхода / Статистика
  // ============================================================================
  'Agent powering down. Goodbye!': 'Агент завершает работу. До свидания!',
-  'To continue this session, run': 'Для продолжения этой сессии, выполните',
  'Interaction Summary': 'Сводка взаимодействия',
  'Session ID:': 'ID сессии:',
  'Tool Calls:': 'Вызовы инструментов:',
@@ -953,140 +943,179 @@ export default {
  '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...':
    'Следим, чтобы волшебный дым не вышел из проводов...',
+  'Rewriting in Rust for no particular reason...':
    'Переписываем всё на Rust без особой причины...',
-    'Пытаемся выйти из Vim...',
-    'Раскручиваем колесо для хомяка...',
-    'Это не баг, а фича...',
-    'Поехали!',
-    'Я вернусь... с ответом.',
-    'Мой другой процесс — это ТАРДИС...',
-    'Общаемся с духом машины...',
-    'Даем мыслям замариноваться...',
+  '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...': 'Нужно построить больше пилонов...',
 };
--- a/packages/cli/src/i18n/locales/zh.js
+++ b/packages/cli/src/i18n/locales/zh.js
@@ -101,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':
@@ -249,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
  // ============================================================================
@@ -562,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
@@ -581,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
@@ -889,39 +880,165 @@ export default {
  // ============================================================================
  '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...': '正在建造额外的能量塔...',
 };
--- a/packages/cli/src/nonInteractive/control/controllers/systemController.ts
+++ b/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) {
--- a/packages/cli/src/nonInteractiveCli.test.ts
+++ b/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 = {
@@ -858,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',
@@ -870,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.',
    );
  });

@@ -916,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',
@@ -950,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.',
    );
  });

--- a/packages/cli/src/nonInteractiveCli.ts
+++ b/packages/cli/src/nonInteractiveCli.ts
@@ -42,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.
 *
@@ -164,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,
      );
@@ -187,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;
          }
        }

@@ -257,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++;
--- a/packages/cli/src/nonInteractiveCliCommands.test.ts
+++ b/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');
-    }
-  });
-});
--- a/packages/cli/src/nonInteractiveCliCommands.ts
+++ b/packages/cli/src/nonInteractiveCliCommands.ts
@@ -7,6 +7,7 @@
 import type { PartListUnion } from '@google/genai';
 import { parseSlashCommand } from './utils/commands.js';
 import {
+  FatalInputError,
  Logger,
  uiTelemetryService,
  type Config,
@@ -18,164 +19,10 @@ import {
  CommandKind,
  type CommandContext,
  type SlashCommand,
-  type SlashCommandActionReturn,
 } from './ui/commands/types.js';
 import { createNonInteractiveUI } from './ui/noninteractive/nonInteractiveUi.js';
 import type { LoadedSettings } from './config/settings.js';
 import type { SessionStatsState } from './ui/contexts/SessionContext.js';
-import { t } from './i18n/index.js';
-
-/**
- * Built-in commands that are allowed in non-interactive modes (CLI and ACP).
- * Only safe, read-only commands that don't require interactive UI.
- *
- * These commands are:
- * - init: Initialize project configuration
- * - summary: Generate session summary
- * - compress: Compress conversation history
- */
-export const ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE = [
-  'init',
-  'summary',
-  'compress',
-] as const;
-
-/**
- * Result of handling a slash command in non-interactive mode.
- *
- * Supported types:
- * - 'submit_prompt': Submits content to the model (supports all modes)
- * - 'message': Returns a single message (supports non-interactive JSON/text only)
- * - 'stream_messages': Streams multiple messages (supports ACP only)
- * - 'unsupported': Command cannot be executed in this mode
- * - 'no_command': No command was found or executed
- */
-export type NonInteractiveSlashCommandResult =
-  | {
-      type: 'submit_prompt';
-      content: PartListUnion;
-    }
-  | {
-      type: 'message';
-      messageType: 'info' | 'error';
-      content: string;
-    }
-  | {
-      type: 'stream_messages';
-      messages: AsyncGenerator<
-        { messageType: 'info' | 'error'; content: string },
-        void,
-        unknown
-      >;
-    }
-  | {
-      type: 'unsupported';
-      reason: string;
-      originalType: string;
-    }
-  | {
-      type: 'no_command';
-    };
-
-/**
- * Converts a SlashCommandActionReturn to a NonInteractiveSlashCommandResult.
- *
- * Only the following result types are supported in non-interactive mode:
- * - submit_prompt: Submits content to the model (all modes)
- * - message: Returns a single message (non-interactive JSON/text only)
- * - stream_messages: Streams multiple messages (ACP only)
- *
- * All other result types are converted to 'unsupported'.
- *
- * @param result The result from executing a slash command action
- * @returns A NonInteractiveSlashCommandResult describing the outcome
- */
-function handleCommandResult(
-  result: SlashCommandActionReturn,
-): NonInteractiveSlashCommandResult {
-  switch (result.type) {
-    case 'submit_prompt':
-      return {
-        type: 'submit_prompt',
-        content: result.content,
-      };
-
-    case 'message':
-      return {
-        type: 'message',
-        messageType: result.messageType,
-        content: result.content,
-      };
-
-    case 'stream_messages':
-      return {
-        type: 'stream_messages',
-        messages: result.messages,
-      };
-
-    /**
-     * Currently return types below are never generated due to the
-     * whitelist of allowed slash commands in ACP and non-interactive mode.
-     * We'll try to add more supported return types in the future.
-     */
-    case 'tool':
-      return {
-        type: 'unsupported',
-        reason:
-          'Tool execution from slash commands is not supported in non-interactive mode.',
-        originalType: 'tool',
-      };
-
-    case 'quit':
-      return {
-        type: 'unsupported',
-        reason:
-          'Quit command is not supported in non-interactive mode. The process will exit naturally after completion.',
-        originalType: 'quit',
-      };
-
-    case 'dialog':
-      return {
-        type: 'unsupported',
-        reason: `Dialog '${result.dialog}' cannot be opened in non-interactive mode.`,
-        originalType: 'dialog',
-      };
-
-    case 'load_history':
-      return {
-        type: 'unsupported',
-        reason:
-          'Loading history is not supported in non-interactive mode. Each invocation starts with a fresh context.',
-        originalType: 'load_history',
-      };
-
-    case 'confirm_shell_commands':
-      return {
-        type: 'unsupported',
-        reason:
-          'Shell command confirmation is not supported in non-interactive mode. Use YOLO mode or pre-approve commands.',
-        originalType: 'confirm_shell_commands',
-      };
-
-    case 'confirm_action':
-      return {
-        type: 'unsupported',
-        reason:
-          'Action confirmation is not supported in non-interactive mode. Commands requiring confirmation cannot be executed.',
-        originalType: 'confirm_action',
-      };
-
-    default: {
-      // Exhaustiveness check
-      const _exhaustive: never = result;
-      return {
-        type: 'unsupported',
-        reason: `Unknown command result type: ${(_exhaustive as SlashCommandActionReturn).type}`,
-        originalType: 'unknown',
-      };
-    }
-  }
-}

 /**
 * Filters commands based on the allowed built-in command names.
@@ -215,146 +62,122 @@ function filterCommandsForNonInteractive(
 * @param config The configuration object
 * @param settings The loaded settings
 * @param allowedBuiltinCommandNames Optional array of built-in command names that are
- *   allowed. Defaults to ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE (init, summary, compress).
- *   Pass an empty array to only allow file commands.
- * @returns A Promise that resolves to a `NonInteractiveSlashCommandResult` describing
- *   the outcome of the command execution.
+ *   allowed. If not provided or empty, only file commands are available.
+ * @returns A Promise that resolves to `PartListUnion` if a valid command is
+ *   found and results in a prompt, or `undefined` otherwise.
+ * @throws {FatalInputError} if the command result is not supported in
+ *   non-interactive mode.
 */
 export const handleSlashCommand = async (
  rawQuery: string,
  abortController: AbortController,
  config: Config,
  settings: LoadedSettings,
-  allowedBuiltinCommandNames: string[] = [
-    ...ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE,
-  ],
-): Promise<NonInteractiveSlashCommandResult> => {
+  allowedBuiltinCommandNames?: string[],
+): Promise<PartListUnion | undefined> => {
  const trimmed = rawQuery.trim();
  if (!trimmed.startsWith('/')) {
-    return { type: 'no_command' };
+    return;
  }

-  const isAcpMode = config.getExperimentalZedIntegration();
-  const isInteractive = config.isInteractive();
-
-  const executionMode = isAcpMode
-    ? 'acp'
-    : isInteractive
-      ? 'interactive'
-      : 'non_interactive';
-
  const allowedBuiltinSet = new Set(allowedBuiltinCommandNames ?? []);

-  // Load all commands to check if the command exists but is not allowed
-  const allLoaders = [
-    new BuiltinCommandLoader(config),
-    new FileCommandLoader(config),
-  ];
+  // Only load BuiltinCommandLoader if there are allowed built-in commands
+  const loaders =
+    allowedBuiltinSet.size > 0
+      ? [new BuiltinCommandLoader(config), new FileCommandLoader(config)]
+      : [new FileCommandLoader(config)];

  const commandService = await CommandService.create(
-    allLoaders,
+    loaders,
    abortController.signal,
  );
-  const allCommands = commandService.getCommands();
+  const commands = commandService.getCommands();
  const filteredCommands = filterCommandsForNonInteractive(
-    allCommands,
+    commands,
    allowedBuiltinSet,
  );

-  // First, try to parse with filtered commands
  const { commandToExecute, args } = parseSlashCommand(
    rawQuery,
    filteredCommands,
  );

-  if (!commandToExecute) {
-    // Check if this is a known command that's just not allowed
-    const { commandToExecute: knownCommand } = parseSlashCommand(
-      rawQuery,
-      allCommands,
-    );
-
-    if (knownCommand) {
-      // Command exists but is not allowed in non-interactive mode
-      return {
-        type: 'unsupported',
-        reason: t(
-          'The command "/{{command}}" is not supported in non-interactive mode.',
-          { command: knownCommand.name },
-        ),
-        originalType: 'filtered_command',
+  if (commandToExecute) {
+    if (commandToExecute.action) {
+      // Not used by custom commands but may be in the future.
+      const sessionStats: SessionStatsState = {
+        sessionId: config?.getSessionId(),
+        sessionStartTime: new Date(),
+        metrics: uiTelemetryService.getMetrics(),
+        lastPromptTokenCount: 0,
+        promptCount: 1,
      };
+
+      const logger = new Logger(config?.getSessionId() || '', config?.storage);
+
+      const context: CommandContext = {
+        services: {
+          config,
+          settings,
+          git: undefined,
+          logger,
+        },
+        ui: createNonInteractiveUI(),
+        session: {
+          stats: sessionStats,
+          sessionShellAllowlist: new Set(),
+        },
+        invocation: {
+          raw: trimmed,
+          name: commandToExecute.name,
+          args,
+        },
+      };
+
+      const result = await commandToExecute.action(context, args);
+
+      if (result) {
+        switch (result.type) {
+          case 'submit_prompt':
+            return result.content;
+          case 'confirm_shell_commands':
+            // This result indicates a command attempted to confirm shell commands.
+            // However note that currently, ShellTool is excluded in non-interactive
+            // mode unless 'YOLO mode' is active, so confirmation actually won't
+            // occur because of YOLO mode.
+            // This ensures that if a command *does* request confirmation (e.g.
+            // in the future with more granular permissions), it's handled appropriately.
+            throw new FatalInputError(
+              'Exiting due to a confirmation prompt requested by the command.',
+            );
+          default:
+            throw new FatalInputError(
+              'Exiting due to command result that is not supported in non-interactive mode.',
+            );
+        }
+      }
    }
-
-    return { type: 'no_command' };
  }

-  if (!commandToExecute.action) {
-    return { type: 'no_command' };
-  }
-
-  // Not used by custom commands but may be in the future.
-  const sessionStats: SessionStatsState = {
-    sessionId: config?.getSessionId(),
-    sessionStartTime: new Date(),
-    metrics: uiTelemetryService.getMetrics(),
-    lastPromptTokenCount: 0,
-    promptCount: 1,
-  };
-
-  const logger = new Logger(config?.getSessionId() || '', config?.storage);
-
-  const context: CommandContext = {
-    executionMode,
-    services: {
-      config,
-      settings,
-      git: undefined,
-      logger,
-    },
-    ui: createNonInteractiveUI(),
-    session: {
-      stats: sessionStats,
-      sessionShellAllowlist: new Set(),
-    },
-    invocation: {
-      raw: trimmed,
-      name: commandToExecute.name,
-      args,
-    },
-  };
-
-  const result = await commandToExecute.action(context, args);
-
-  if (!result) {
-    // Command executed but returned no result (e.g., void return)
-    return {
-      type: 'message',
-      messageType: 'info',
-      content: 'Command executed successfully.',
-    };
-  }
-
-  // Handle different result types
-  return handleCommandResult(result);
+  return;
 };

 /**
 * Retrieves all available slash commands for the current configuration.
 *
 * @param config The configuration object
+ * @param settings The loaded settings
 * @param abortSignal Signal to cancel the loading process
 * @param allowedBuiltinCommandNames Optional array of built-in command names that are
- *   allowed. Defaults to ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE (init, summary, compress).
- *   Pass an empty array to only include file commands.
+ *   allowed. If not provided or empty, only file commands are available.
 * @returns A Promise that resolves to an array of SlashCommand objects
 */
 export const getAvailableCommands = async (
  config: Config,
+  settings: LoadedSettings,
  abortSignal: AbortSignal,
-  allowedBuiltinCommandNames: string[] = [
-    ...ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE,
-  ],
+  allowedBuiltinCommandNames?: string[],
 ): Promise<SlashCommand[]> => {
  try {
    const allowedBuiltinSet = new Set(allowedBuiltinCommandNames ?? []);
--- a/packages/cli/src/ui/auth/useAuth.ts
+++ b/packages/cli/src/ui/auth/useAuth.ts
@@ -228,7 +228,6 @@ export const useAuthCommand = (
      ![
        AuthType.QWEN_OAUTH,
        AuthType.USE_OPENAI,
-        AuthType.USE_ANTHROPIC,
        AuthType.USE_GEMINI,
        AuthType.USE_VERTEX_AI,
      ].includes(defaultAuthType as AuthType)
@@ -241,7 +240,6 @@ export const useAuthCommand = (
            validValues: [
              AuthType.QWEN_OAUTH,
              AuthType.USE_OPENAI,
-              AuthType.USE_ANTHROPIC,
              AuthType.USE_GEMINI,
              AuthType.USE_VERTEX_AI,
            ].join(', '),
--- a/packages/cli/src/ui/commands/compressCommand.ts
+++ b/packages/cli/src/ui/commands/compressCommand.ts
@@ -19,9 +19,7 @@ export const compressCommand: SlashCommand = {
  kind: CommandKind.BUILT_IN,
  action: async (context) => {
    const { ui } = context;
-    const executionMode = context.executionMode ?? 'interactive';
-
-    if (executionMode === 'interactive' && ui.pendingItem) {
+    if (ui.pendingItem) {
      ui.addItem(
        {
          type: MessageType.ERROR,
@@ -42,80 +40,13 @@ export const compressCommand: SlashCommand = {
      },
    };

-    const config = context.services.config;
-    const geminiClient = config?.getGeminiClient();
-    if (!config || !geminiClient) {
-      return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Config not loaded.'),
-      };
-    }
-
-    const doCompress = async () => {
-      const promptId = `compress-${Date.now()}`;
-      return await geminiClient.tryCompressChat(promptId, true);
-    };
-
-    if (executionMode === 'acp') {
-      const messages = async function* () {
-        try {
-          yield {
-            messageType: 'info' as const,
-            content: 'Compressing context...',
-          };
-          const compressed = await doCompress();
-          if (!compressed) {
-            yield {
-              messageType: 'error' as const,
-              content: t('Failed to compress chat history.'),
-            };
-            return;
-          }
-          yield {
-            messageType: 'info' as const,
-            content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`,
-          };
-        } catch (e) {
-          yield {
-            messageType: 'error' as const,
-            content: t('Failed to compress chat history: {{error}}', {
-              error: e instanceof Error ? e.message : String(e),
-            }),
-          };
-        }
-      };
-
-      return { type: 'stream_messages', messages: messages() };
-    }
-
    try {
-      if (executionMode === 'interactive') {
-        ui.setPendingItem(pendingMessage);
-      }
-
-      const compressed = await doCompress();
-
-      if (!compressed) {
-        if (executionMode === 'interactive') {
-          ui.addItem(
-            {
-              type: MessageType.ERROR,
-              text: t('Failed to compress chat history.'),
-            },
-            Date.now(),
-          );
-          return;
-        }
-
-        return {
-          type: 'message',
-          messageType: 'error',
-          content: t('Failed to compress chat history.'),
-        };
-      }
-
-      if (executionMode === 'interactive') {
+      ui.setPendingItem(pendingMessage);
+      const promptId = `compress-${Date.now()}`;
+      const compressed = await context.services.config
+        ?.getGeminiClient()
+        ?.tryCompressChat(promptId, true);
+      if (compressed) {
        ui.addItem(
          {
            type: MessageType.COMPRESSION,
@@ -128,39 +59,27 @@ export const compressCommand: SlashCommand = {
          } as HistoryItemCompression,
          Date.now(),
        );
-        return;
-      }
-
-      return {
-        type: 'message',
-        messageType: 'info',
-        content: `Context compressed (${compressed.originalTokenCount} -> ${compressed.newTokenCount}).`,
-      };
-    } catch (e) {
-      if (executionMode === 'interactive') {
+      } else {
        ui.addItem(
          {
            type: MessageType.ERROR,
-            text: t('Failed to compress chat history: {{error}}', {
-              error: e instanceof Error ? e.message : String(e),
-            }),
+            text: t('Failed to compress chat history.'),
          },
          Date.now(),
        );
-        return;
      }
-
-      return {
-        type: 'message',
-        messageType: 'error',
-        content: t('Failed to compress chat history: {{error}}', {
-          error: e instanceof Error ? e.message : String(e),
-        }),
-      };
+    } catch (e) {
+      ui.addItem(
+        {
+          type: MessageType.ERROR,
+          text: t('Failed to compress chat history: {{error}}', {
+            error: e instanceof Error ? e.message : String(e),
+          }),
+        },
+        Date.now(),
+      );
    } finally {
-      if (executionMode === 'interactive') {
-        ui.setPendingItem(null);
-      }
+      ui.setPendingItem(null);
    }
  },
 };
--- a/packages/cli/src/ui/commands/languageCommand.test.ts
+++ b/packages/cli/src/ui/commands/languageCommand.test.ts
@@ -13,16 +13,6 @@ import { createMockCommandContext } from '../../test-utils/mockCommandContext.js
 vi.mock('../../i18n/index.js', () => ({
  setLanguageAsync: vi.fn().mockResolvedValue(undefined),
  getCurrentLanguage: vi.fn().mockReturnValue('en'),
-  detectSystemLanguage: vi.fn().mockReturnValue('en'),
-  getLanguageNameFromLocale: vi.fn((locale: string) => {
-    const map: Record<string, string> = {
-      zh: 'Chinese',
-      en: 'English',
-      ru: 'Russian',
-      de: 'German',
-    };
-    return map[locale] || 'English';
-  }),
  t: vi.fn((key: string) => key),
 }));

@@ -71,10 +61,7 @@ vi.mock('@qwen-code/qwen-code-core', async (importOriginal) => {

 // Import modules after mocking
 import * as i18n from '../../i18n/index.js';
-import {
-  languageCommand,
-  initializeLlmOutputLanguage,
-} from './languageCommand.js';
+import { languageCommand } from './languageCommand.js';

 describe('languageCommand', () => {
  let mockContext: CommandContext;
@@ -199,39 +186,6 @@ describe('languageCommand', () => {
        content: expect.stringContaining('Chinese'),
      });
    });
-
-    it('should parse Unicode LLM output language from marker', async () => {
-      vi.mocked(fs.existsSync).mockReturnValue(true);
-      vi.mocked(fs.readFileSync).mockReturnValue(
-        [
-          '# ⚠️ CRITICAL: 中文 Output Language Rule - HIGHEST PRIORITY ⚠️',
-          '<!-- qwen-code:llm-output-language: 中文 -->',
-          '',
-          'Some other content...',
-        ].join('\n'),
-      );
-
-      vi.mocked(i18n.t).mockImplementation(
-        (key: string, params?: Record<string, string>) => {
-          if (params && key.includes('{{lang}}')) {
-            return key.replace('{{lang}}', params['lang'] || '');
-          }
-          return key;
-        },
-      );
-
-      if (!languageCommand.action) {
-        throw new Error('The language command must have an action.');
-      }
-
-      const result = await languageCommand.action(mockContext, '');
-
-      expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: expect.stringContaining('中文'),
-      });
-    });
  });

  describe('main command action - config not available', () => {
@@ -446,34 +400,6 @@ describe('languageCommand', () => {
      });
    });

-    it('should normalize locale code "ru" to "Russian"', async () => {
-      if (!languageCommand.action) {
-        throw new Error('The language command must have an action.');
-      }
-
-      await languageCommand.action(mockContext, 'output ru');
-
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('Russian'),
-        'utf-8',
-      );
-    });
-
-    it('should normalize locale code "de" to "German"', async () => {
-      if (!languageCommand.action) {
-        throw new Error('The language command must have an action.');
-      }
-
-      await languageCommand.action(mockContext, 'output de');
-
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('German'),
-        'utf-8',
-      );
-    });
-
    it('should handle file write errors gracefully', async () => {
      vi.mocked(fs.writeFileSync).mockImplementation(() => {
        throw new Error('Permission denied');
@@ -555,8 +481,6 @@ describe('languageCommand', () => {
      const nestedNames = uiSubcommand?.subCommands?.map((c) => c.name);
      expect(nestedNames).toContain('zh-CN');
      expect(nestedNames).toContain('en-US');
-      expect(nestedNames).toContain('ru-RU');
-      expect(nestedNames).toContain('de-DE');
    });

    it('should have action that sets language', async () => {
@@ -618,9 +542,16 @@ describe('languageCommand', () => {
    const enUSSubcommand = uiSubcommand?.subCommands?.find(
      (c) => c.name === 'en-US',
    );
-    const deDESubcommand = uiSubcommand?.subCommands?.find(
-      (c) => c.name === 'de-DE',
-    );
+
+    it('zh-CN should have aliases', () => {
+      expect(zhCNSubcommand?.altNames).toContain('zh');
+      expect(zhCNSubcommand?.altNames).toContain('chinese');
+    });
+
+    it('en-US should have aliases', () => {
+      expect(enUSSubcommand?.altNames).toContain('en');
+      expect(enUSSubcommand?.altNames).toContain('english');
+    });

    it('zh-CN action should set Chinese', async () => {
      if (!zhCNSubcommand?.action) {
@@ -652,21 +583,6 @@ describe('languageCommand', () => {
      });
    });

-    it('de-DE action should set German', async () => {
-      if (!deDESubcommand?.action) {
-        throw new Error('de-DE subcommand must have an action.');
-      }
-
-      const result = await deDESubcommand.action(mockContext, '');
-
-      expect(i18n.setLanguageAsync).toHaveBeenCalledWith('de');
-      expect(result).toEqual({
-        type: 'message',
-        messageType: 'info',
-        content: expect.stringContaining('UI language changed'),
-      });
-    });
-
    it('should reject extra arguments', async () => {
      if (!zhCNSubcommand?.action) {
        throw new Error('zh-CN subcommand must have an action.');
@@ -681,74 +597,4 @@ describe('languageCommand', () => {
      });
    });
  });
-
-  describe('initializeLlmOutputLanguage', () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-      vi.mocked(fs.existsSync).mockReturnValue(false);
-      vi.mocked(fs.mkdirSync).mockImplementation(() => undefined);
-      vi.mocked(fs.writeFileSync).mockImplementation(() => undefined);
-    });
-
-    it('should create file when it does not exist', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(false);
-      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('en');
-
-      initializeLlmOutputLanguage();
-
-      expect(fs.mkdirSync).toHaveBeenCalled();
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('English'),
-        'utf-8',
-      );
-    });
-
-    it('should NOT overwrite existing file', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(true);
-
-      initializeLlmOutputLanguage();
-
-      expect(fs.writeFileSync).not.toHaveBeenCalled();
-    });
-
-    it('should detect Chinese locale and create Chinese rule file', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(false);
-      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('zh');
-
-      initializeLlmOutputLanguage();
-
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('Chinese'),
-        'utf-8',
-      );
-    });
-
-    it('should detect Russian locale and create Russian rule file', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(false);
-      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('ru');
-
-      initializeLlmOutputLanguage();
-
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('Russian'),
-        'utf-8',
-      );
-    });
-
-    it('should detect German locale and create German rule file', () => {
-      vi.mocked(fs.existsSync).mockReturnValue(false);
-      vi.mocked(i18n.detectSystemLanguage).mockReturnValue('de');
-
-      initializeLlmOutputLanguage();
-
-      expect(fs.writeFileSync).toHaveBeenCalledWith(
-        expect.stringContaining('output-language.md'),
-        expect.stringContaining('German'),
-        'utf-8',
-      );
-    });
-  });
 });
--- a/packages/cli/src/ui/commands/languageCommand.ts
+++ b/packages/cli/src/ui/commands/languageCommand.ts
@@ -1,6 +1,6 @@
 /**
 * @license
- * Copyright 2025 Qwen team
+ * Copyright 2025 Google LLC
 * SPDX-License-Identifier: Apache-2.0
 */

@@ -15,72 +15,51 @@ import { SettingScope } from '../../config/settings.js';
 import {
  setLanguageAsync,
  getCurrentLanguage,
-  detectSystemLanguage,
-  getLanguageNameFromLocale,
  type SupportedLanguage,
  t,
 } from '../../i18n/index.js';
-import {
-  SUPPORTED_LANGUAGES,
-  type LanguageDefinition,
-} from '../../i18n/languages.js';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { Storage } from '@qwen-code/qwen-code-core';

 const LLM_OUTPUT_LANGUAGE_RULE_FILENAME = 'output-language.md';
-const LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = 'qwen-code:llm-output-language:';
-
-function parseUiLanguageArg(input: string): SupportedLanguage | null {
-  const lowered = input.trim().toLowerCase();
-  if (!lowered) return null;
-  for (const lang of SUPPORTED_LANGUAGES) {
-    if (
-      lowered === lang.code ||
-      lowered === lang.id.toLowerCase() ||
-      lowered === lang.fullName.toLowerCase()
-    ) {
-      return lang.code;
-    }
-  }
-  return null;
-}
-
-function formatUiLanguageDisplay(lang: SupportedLanguage): string {
-  const option = SUPPORTED_LANGUAGES.find((o) => o.code === lang);
-  return option ? `${option.fullName}（${option.id}）` : lang;
-}
-
-function sanitizeLanguageForMarker(language: string): string {
-  // HTML comments cannot contain "--" or end markers like "-->" or "--!>" safely.
-  // Also avoid newlines to keep the marker single-line and robust to parsing.
-  return language
-    .replace(/[\r\n]/g, ' ')
-    .replace(/--!?>/g, '')
-    .replace(/--/g, '');
-}

 /**
 * Generates the LLM output language rule template based on the language name.
 */
 function generateLlmOutputLanguageRule(language: string): string {
-  const markerLanguage = sanitizeLanguageForMarker(language);
-  return `# Output language preference: ${language}
-<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${markerLanguage} -->
+  return `# ⚠️ CRITICAL: ${language} Output Language Rule - HIGHEST PRIORITY ⚠️

-## Goal
-Prefer responding in **${language}** for normal assistant messages and explanations.
+## 🚨 MANDATORY RULE - NO EXCEPTIONS 🚨

-## Keep technical artifacts unchanged
-Do **not** translate or rewrite:
- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
- Exact quoted text from the user (keep quotes verbatim)
+**YOU MUST RESPOND IN ${language.toUpperCase()} FOR EVERY SINGLE OUTPUT, REGARDLESS OF THE USER'S INPUT LANGUAGE.**

-## When a conflict exists
-If higher-priority instructions (system/developer) require a different behavior, follow them.
+This is a **NON-NEGOTIABLE** requirement. Even if the user writes in English, says "hi", asks a simple question, or explicitly requests another language, **YOU MUST ALWAYS RESPOND IN ${language.toUpperCase()}.**

-## Tool / system outputs
-Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
+## What Must Be in ${language}
+
+**EVERYTHING** you output: conversation replies, tool call descriptions, success/error messages, generated file content (comments, documentation), and all explanatory text.
+
+**Tool outputs**: All descriptive text from \`read_file\`, \`write_file\`, \`codebase_search\`, \`run_terminal_cmd\`, \`todo_write\`, \`web_search\`, etc. MUST be in ${language}.
+
+## Examples
+
+### ✅ CORRECT:
+- User says "hi" → Respond in ${language} (e.g., "Bonjour" if ${language} is French)
+- Tool result → "已成功读取文件 config.json" (if ${language} is Chinese)
+- Error → "无法找到指定的文件" (if ${language} is Chinese)
+
+### ❌ WRONG:
+- User says "hi" → "Hello" in English
+- Tool result → "Successfully read file" in English
+- Error → "File not found" in English
+
+## Notes
+
+- Code elements (variable/function names, syntax) can remain in English
+- Comments, documentation, and all other text MUST be in ${language}
+
+**THIS RULE IS ACTIVE NOW. ALL OUTPUTS MUST BE IN ${language.toUpperCase()}. NO EXCEPTIONS.**
 `;
 }

@@ -94,80 +73,6 @@ function getLlmOutputLanguageRulePath(): string {
  );
 }

-/**
- * Normalizes a language input to its full English name.
- * If the input is a known locale code (e.g., "ru", "zh"), converts it to the full name.
- * Otherwise, returns the input as-is (e.g., "Japanese" stays "Japanese").
- */
-function normalizeLanguageName(language: string): string {
-  const lowered = language.toLowerCase();
-  // Check if it's a known locale code and convert to full name
-  const fullName = getLanguageNameFromLocale(lowered);
-  // If getLanguageNameFromLocale returned a different value, use it
-  // Otherwise, use the original input (preserves case for unknown languages)
-  if (fullName !== 'English' || lowered === 'en') {
-    return fullName;
-  }
-  return language;
-}
-
-function extractLlmOutputLanguageFromRuleFileContent(
-  content: string,
-): string | null {
-  // Preferred: machine-readable marker that supports Unicode and spaces.
-  // Example: <!-- qwen-code:llm-output-language: 中文 -->
-  const markerMatch = content.match(
-    new RegExp(
-      String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
-      'i',
-    ),
-  );
-  if (markerMatch?.[1]) {
-    const lang = markerMatch[1].trim();
-    if (lang) return lang;
-  }
-
-  // Backward compatibility: parse the heading line.
-  // Example: "# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY"
-  // Example: "# ⚠️ CRITICAL: 日本語 Output Language Rule - HIGHEST PRIORITY ⚠️"
-  const headingMatch = content.match(
-    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im,
-  );
-  if (headingMatch?.[1]) {
-    const lang = headingMatch[1].trim();
-    if (lang) return lang;
-  }
-
-  return null;
-}
-
-/**
- * Initializes the LLM output language rule file on first startup.
- * If the file already exists, it is not overwritten (respects user preference).
- */
-export function initializeLlmOutputLanguage(): void {
-  const filePath = getLlmOutputLanguageRulePath();
-
-  // Skip if file already exists (user preference)
-  if (fs.existsSync(filePath)) {
-    return;
-  }
-
-  // Detect system language and map to language name
-  const detectedLocale = detectSystemLanguage();
-  const languageName = getLanguageNameFromLocale(detectedLocale);
-
-  // Generate the rule file
-  const content = generateLlmOutputLanguageRule(languageName);
-
-  // Ensure directory exists
-  const dir = path.dirname(filePath);
-  fs.mkdirSync(dir, { recursive: true });
-
-  // Write file
-  fs.writeFileSync(filePath, content, 'utf-8');
-}
-
 /**
 * Gets the current LLM output language from the rule file if it exists.
 */
@@ -176,7 +81,12 @@ function getCurrentLlmOutputLanguage(): string | null {
  if (fs.existsSync(filePath)) {
    try {
      const content = fs.readFileSync(filePath, 'utf-8');
-      return extractLlmOutputLanguageFromRuleFileContent(content);
+      // Extract language name from the first line
+      // Template format: "# CRITICAL: Chinese Output Language Rule - HIGHEST PRIORITY"
+      const match = content.match(/^#.*?(\w+)\s+Output Language Rule/i);
+      if (match) {
+        return match[1];
+      }
    } catch {
      // Ignore errors
    }
@@ -217,11 +127,18 @@ async function setUiLanguage(
  // Reload commands to update their descriptions with the new language
  context.ui.reloadCommands();

+  // Map language codes to friendly display names
+  const langDisplayNames: Partial<Record<SupportedLanguage, string>> = {
+    zh: '中文（zh-CN）',
+    en: 'English（en-US）',
+    ru: 'Русский (ru-RU)',
+  };
+
  return {
    type: 'message',
    messageType: 'info',
    content: t('UI language changed to {{lang}}', {
-      lang: formatUiLanguageDisplay(lang),
+      lang: langDisplayNames[lang] || lang,
    }),
  };
 }
@@ -234,9 +151,7 @@ function generateLlmOutputLanguageRuleFile(
 ): Promise<MessageActionReturn> {
  try {
    const filePath = getLlmOutputLanguageRulePath();
-    // Normalize locale codes (e.g., "ru" -> "Russian") to full language names
-    const normalizedLanguage = normalizeLanguageName(language);
-    const content = generateLlmOutputLanguageRule(normalizedLanguage);
+    const content = generateLlmOutputLanguageRule(language);

    // Ensure directory exists
    const dir = path.dirname(filePath);
@@ -281,6 +196,7 @@ export const languageCommand: SlashCommand = {
    args: string,
  ): Promise<SlashCommandActionReturn> => {
    const { services } = context;
+
    if (!services.config) {
      return {
        type: 'message',
@@ -291,37 +207,18 @@ export const languageCommand: SlashCommand = {

    const trimmedArgs = args.trim();

-    // Handle subcommands if called directly via action (for tests/backward compatibility)
-    const parts = trimmedArgs.split(/\s+/);
-    const firstArg = parts[0].toLowerCase();
-    const subArgs = parts.slice(1).join(' ');
-
-    if (firstArg === 'ui' || firstArg === 'output') {
-      const subCommand = languageCommand.subCommands?.find(
-        (s) => s.name === firstArg,
-      );
-      if (subCommand?.action) {
-        return subCommand.action(
-          context,
-          subArgs,
-        ) as Promise<SlashCommandActionReturn>;
-      }
-    }
-
    // If no arguments, show current language settings and usage
    if (!trimmedArgs) {
      const currentUiLang = getCurrentLanguage();
      const currentLlmLang = getCurrentLlmOutputLanguage();
      const message = [
-        t('Current UI language: {{lang}}', {
-          lang: formatUiLanguageDisplay(currentUiLang as SupportedLanguage),
-        }),
+        t('Current UI language: {{lang}}', { lang: currentUiLang }),
        currentLlmLang
          ? t('Current LLM output language: {{lang}}', { lang: currentLlmLang })
          : t('LLM output language not set'),
        '',
        t('Available subcommands:'),
-        `  /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`,
+        `  /language ui [zh-CN|en-US|ru-RU] - ${t('Set UI language')}`,
        `  /language output <language> - ${t('Set LLM output language')}`,
      ].join('\n');

@@ -332,21 +229,115 @@ export const languageCommand: SlashCommand = {
      };
    }

-    // Handle backward compatibility for /language [lang]
-    const targetLang = parseUiLanguageArg(trimmedArgs);
-    if (targetLang) {
+    // Parse subcommand
+    const parts = trimmedArgs.split(/\s+/);
+    const subcommand = parts[0].toLowerCase();
+
+    if (subcommand === 'ui') {
+      // Handle /language ui [zh-CN|en-US|ru-RU]
+      if (parts.length === 1) {
+        // Show UI language subcommand help
+        return {
+          type: 'message',
+          messageType: 'info',
+          content: [
+            t('Set UI language'),
+            '',
+            t('Usage: /language ui [zh-CN|en-US|ru-RU]'),
+            '',
+            t('Available options:'),
+            t('  - zh-CN: Simplified Chinese'),
+            t('  - en-US: English'),
+            t('  - ru-RU: Russian'),
+            '',
+            t(
+              'To request additional UI language packs, please open an issue on GitHub.',
+            ),
+          ].join('\n'),
+        };
+      }
+
+      const langArg = parts[1].toLowerCase();
+      let targetLang: SupportedLanguage | null = null;
+
+      if (langArg === 'en' || langArg === 'english' || langArg === 'en-us') {
+        targetLang = 'en';
+      } else if (
+        langArg === 'zh' ||
+        langArg === 'chinese' ||
+        langArg === '中文' ||
+        langArg === 'zh-cn'
+      ) {
+        targetLang = 'zh';
+      } else if (
+        langArg === 'ru' ||
+        langArg === 'ru-RU' ||
+        langArg === 'russian' ||
+        langArg === 'русский'
+      ) {
+        targetLang = 'ru';
+      } else {
+        return {
+          type: 'message',
+          messageType: 'error',
+          content: t('Invalid language. Available: en-US, zh-CN, ru-RU'),
+        };
+      }
+
+      return setUiLanguage(context, targetLang);
+    } else if (subcommand === 'output') {
+      // Handle /language output <language>
+      if (parts.length === 1) {
+        return {
+          type: 'message',
+          messageType: 'info',
+          content: [
+            t('Set LLM output language'),
+            '',
+            t('Usage: /language output <language>'),
+            `  ${t('Example: /language output 中文')}`,
+          ].join('\n'),
+        };
+      }
+
+      // Join all parts after "output" as the language name
+      const language = parts.slice(1).join(' ');
+      return generateLlmOutputLanguageRuleFile(language);
+    } else {
+      // Backward compatibility: treat as UI language
+      const langArg = trimmedArgs.toLowerCase();
+      let targetLang: SupportedLanguage | null = null;
+
+      if (langArg === 'en' || langArg === 'english' || langArg === 'en-us') {
+        targetLang = 'en';
+      } else if (
+        langArg === 'zh' ||
+        langArg === 'chinese' ||
+        langArg === '中文' ||
+        langArg === 'zh-cn'
+      ) {
+        targetLang = 'zh';
+      } else if (
+        langArg === 'ru' ||
+        langArg === 'ru-RU' ||
+        langArg === 'russian' ||
+        langArg === 'русский'
+      ) {
+        targetLang = 'ru';
+      } else {
+        return {
+          type: 'message',
+          messageType: 'error',
+          content: [
+            t('Invalid command. Available subcommands:'),
+            '  - /language ui [zh-CN|en-US|ru-RU] - ' + t('Set UI language'),
+            '  - /language output <language> - ' + t('Set LLM output language'),
+          ].join('\n'),
+        };
+      }
+
      return setUiLanguage(context, targetLang);
    }
-
-    return {
-      type: 'message',
-      messageType: 'error',
-      content: [
-        t('Invalid command. Available subcommands:'),
-        `  - /language ui [${SUPPORTED_LANGUAGES.map((o) => o.id).join('|')}] - ${t('Set UI language')}`,
-        '  - /language output <language> - ' + t('Set LLM output language'),
-      ].join('\n'),
-    };
  },
  subCommands: [
    {
@@ -367,14 +358,11 @@ export const languageCommand: SlashCommand = {
            content: [
              t('Set UI language'),
              '',
-              t('Usage: /language ui [{{options}}]', {
-                options: SUPPORTED_LANGUAGES.map((o) => o.id).join('|'),
-              }),
+              t('Usage: /language ui [zh-CN|en-US]'),
              '',
              t('Available options:'),
-              ...SUPPORTED_LANGUAGES.map(
-                (o) => `  - ${o.id}: ${t(o.fullName)}`,
-              ),
+              t('  - zh-CN: Simplified Chinese'),
+              t('  - en-US: English'),
              '',
              t(
                'To request additional UI language packs, please open an issue on GitHub.',
@@ -383,20 +371,99 @@ export const languageCommand: SlashCommand = {
          };
        }

-        const targetLang = parseUiLanguageArg(trimmedArgs);
-        if (!targetLang) {
+        const langArg = trimmedArgs.toLowerCase();
+        let targetLang: SupportedLanguage | null = null;
+
+        if (langArg === 'en' || langArg === 'english' || langArg === 'en-us') {
+          targetLang = 'en';
+        } else if (
+          langArg === 'zh' ||
+          langArg === 'chinese' ||
+          langArg === '中文' ||
+          langArg === 'zh-cn'
+        ) {
+          targetLang = 'zh';
+        } else {
          return {
            type: 'message',
            messageType: 'error',
-            content: t('Invalid language. Available: {{options}}', {
-              options: SUPPORTED_LANGUAGES.map((o) => o.id).join(','),
-            }),
+            content: t('Invalid language. Available: en-US, zh-CN'),
          };
        }

        return setUiLanguage(context, targetLang);
      },
-      subCommands: SUPPORTED_LANGUAGES.map(createUiLanguageSubCommand),
+      subCommands: [
+        {
+          name: 'zh-CN',
+          altNames: ['zh', 'chinese', '中文'],
+          get description() {
+            return t('Set UI language to Simplified Chinese (zh-CN)');
+          },
+          kind: CommandKind.BUILT_IN,
+          action: async (
+            context: CommandContext,
+            args: string,
+          ): Promise<MessageActionReturn> => {
+            if (args.trim().length > 0) {
+              return {
+                type: 'message',
+                messageType: 'error',
+                content: t(
+                  'Language subcommands do not accept additional arguments.',
+                ),
+              };
+            }
+            return setUiLanguage(context, 'zh');
+          },
+        },
+        {
+          name: 'en-US',
+          altNames: ['en', 'english'],
+          get description() {
+            return t('Set UI language to English (en-US)');
+          },
+          kind: CommandKind.BUILT_IN,
+          action: async (
+            context: CommandContext,
+            args: string,
+          ): Promise<MessageActionReturn> => {
+            if (args.trim().length > 0) {
+              return {
+                type: 'message',
+                messageType: 'error',
+                content: t(
+                  'Language subcommands do not accept additional arguments.',
+                ),
+              };
+            }
+            return setUiLanguage(context, 'en');
+          },
+        },
+        {
+          name: 'ru-RU',
+          altNames: ['ru', 'russian', 'русский'],
+          get description() {
+            return t('Set UI language to Russian (ru-RU)');
+          },
+          kind: CommandKind.BUILT_IN,
+          action: async (
+            context: CommandContext,
+            args: string,
+          ): Promise<MessageActionReturn> => {
+            if (args.trim().length > 0) {
+              return {
+                type: 'message',
+                messageType: 'error',
+                content: t(
+                  'Language subcommands do not accept additional arguments.',
+                ),
+              };
+            }
+            return setUiLanguage(context, 'ru');
+          },
+        },
+      ],
    },
    {
      name: 'output',
@@ -429,28 +496,3 @@ export const languageCommand: SlashCommand = {
    },
  ],
 };
-
-/**
- * Helper to create a UI language subcommand.
- */
-function createUiLanguageSubCommand(option: LanguageDefinition): SlashCommand {
-  return {
-    name: option.id,
-    get description() {
-      return t('Set UI language to {{name}}', { name: option.fullName });
-    },
-    kind: CommandKind.BUILT_IN,
-    action: async (context, args) => {
-      if (args.trim().length > 0) {
-        return {
-          type: 'message',
-          messageType: 'error',
-          content: t(
-            'Language subcommands do not accept additional arguments.',
-          ),
-        };
-      }
-      return setUiLanguage(context, option.code);
-    },
-  };
-}
--- a/packages/cli/src/ui/commands/summaryCommand.ts
+++ b/packages/cli/src/ui/commands/summaryCommand.ts
@@ -26,8 +26,6 @@ export const summaryCommand: SlashCommand = {
  action: async (context): Promise<SlashCommandActionReturn> => {
    const { config } = context.services;
    const { ui } = context;
-    const executionMode = context.executionMode ?? 'interactive';
-
    if (!config) {
      return {
        type: 'message',
@@ -45,8 +43,8 @@ export const summaryCommand: SlashCommand = {
      };
    }

-    // Check if already generating summary (interactive UI only)
-    if (executionMode === 'interactive' && ui.pendingItem) {
+    // Check if already generating summary
+    if (ui.pendingItem) {
      ui.addItem(
        {
          type: 'error' as const,
@@ -65,22 +63,29 @@ export const summaryCommand: SlashCommand = {
      };
    }

-    const getChatHistory = () => {
+    try {
+      // Get the current chat history
      const chat = geminiClient.getChat();
-      return chat.getHistory();
-    };
+      const history = chat.getHistory();

-    const validateChatHistory = (
-      history: ReturnType<typeof getChatHistory>,
-    ) => {
      if (history.length <= 2) {
-        throw new Error(t('No conversation found to summarize.'));
+        return {
+          type: 'message',
+          messageType: 'info',
+          content: t('No conversation found to summarize.'),
+        };
      }
-    };

-    const generateSummaryMarkdown = async (
-      history: ReturnType<typeof getChatHistory>,
-    ): Promise<string> => {
+      // Show loading state
+      const pendingMessage: HistoryItemSummary = {
+        type: 'summary',
+        summary: {
+          isPending: true,
+          stage: 'generating',
+        },
+      };
+      ui.setPendingItem(pendingMessage);
+
      // Build the conversation context for summary generation
      const conversationContext = history.map((message) => ({
        role: message.role,
@@ -116,21 +121,19 @@ export const summaryCommand: SlashCommand = {

      if (!markdownSummary) {
        throw new Error(
-          t(
-            'Failed to generate summary - no text content received from LLM response',
-          ),
+          'Failed to generate summary - no text content received from LLM response',
        );
      }

-      return markdownSummary;
-    };
+      // Update loading message to show saving progress
+      ui.setPendingItem({
+        type: 'summary',
+        summary: {
+          isPending: true,
+          stage: 'saving',
+        },
+      });

-    const saveSummaryToDisk = async (
-      markdownSummary: string,
-    ): Promise<{
-      filePathForDisplay: string;
-      fullPath: string;
-    }> => {
      // Ensure .qwen directory exists
      const projectRoot = config.getProjectRoot();
      const qwenDir = path.join(projectRoot, '.qwen');
@@ -152,163 +155,45 @@ export const summaryCommand: SlashCommand = {

      await fsPromises.writeFile(summaryPath, summaryContent, 'utf8');

-      return {
-        filePathForDisplay: '.qwen/PROJECT_SUMMARY.md',
-        fullPath: summaryPath,
-      };
-    };
-
-    const emitInteractivePending = (stage: 'generating' | 'saving') => {
-      if (executionMode !== 'interactive') {
-        return;
-      }
-      const pendingMessage: HistoryItemSummary = {
-        type: 'summary',
-        summary: {
-          isPending: true,
-          stage,
-        },
-      };
-      ui.setPendingItem(pendingMessage);
-    };
-
-    const completeInteractive = (filePathForDisplay: string) => {
-      if (executionMode !== 'interactive') {
-        return;
-      }
+      // Clear pending item and show success message
      ui.setPendingItem(null);
      const completedSummaryItem: HistoryItemSummary = {
        type: 'summary',
        summary: {
          isPending: false,
          stage: 'completed',
-          filePath: filePathForDisplay,
+          filePath: '.qwen/PROJECT_SUMMARY.md',
        },
      };
      ui.addItem(completedSummaryItem, Date.now());
-    };

-    const formatErrorMessage = (error: unknown): string =>
-      t('Failed to generate project context summary: {{error}}', {
-        error: error instanceof Error ? error.message : String(error),
-      });
-
-    const failInteractive = (error: unknown) => {
-      if (executionMode !== 'interactive') {
-        return;
-      }
+      return {
+        type: 'message',
+        messageType: 'info',
+        content: '', // Empty content since we show the message in UI component
+      };
+    } catch (error) {
+      // Clear pending item on error
      ui.setPendingItem(null);
      ui.addItem(
        {
          type: 'error' as const,
-          text: `❌ ${formatErrorMessage(error)}`,
+          text: `❌ ${t(
+            'Failed to generate project context summary: {{error}}',
+            {
+              error: error instanceof Error ? error.message : String(error),
+            },
+          )}`,
        },
        Date.now(),
      );
-    };
-
-    const formatSuccessMessage = (filePathForDisplay: string): string =>
-      t('Saved project summary to {{filePathForDisplay}}.', {
-        filePathForDisplay,
-      });
-
-    const returnNoConversationMessage = (): SlashCommandActionReturn => {
-      const msg = t('No conversation found to summarize.');
-      if (executionMode === 'acp') {
-        const messages = async function* () {
-          yield {
-            messageType: 'info' as const,
-            content: msg,
-          };
-        };
-        return {
-          type: 'stream_messages',
-          messages: messages(),
-        };
-      }
-      return {
-        type: 'message',
-        messageType: 'info',
-        content: msg,
-      };
-    };
-
-    const executeSummaryGeneration = async (
-      history: ReturnType<typeof getChatHistory>,
-    ): Promise<{
-      markdownSummary: string;
-      filePathForDisplay: string;
-    }> => {
-      emitInteractivePending('generating');
-      const markdownSummary = await generateSummaryMarkdown(history);
-      emitInteractivePending('saving');
-      const { filePathForDisplay } = await saveSummaryToDisk(markdownSummary);
-      completeInteractive(filePathForDisplay);
-      return { markdownSummary, filePathForDisplay };
-    };
-
-    // Validate chat history once at the beginning
-    const history = getChatHistory();
-    try {
-      validateChatHistory(history);
-    } catch (_error) {
-      return returnNoConversationMessage();
-    }
-
-    if (executionMode === 'acp') {
-      const messages = async function* () {
-        try {
-          yield {
-            messageType: 'info' as const,
-            content: t('Generating project summary...'),
-          };
-
-          const { filePathForDisplay } =
-            await executeSummaryGeneration(history);
-
-          yield {
-            messageType: 'info' as const,
-            content: formatSuccessMessage(filePathForDisplay),
-          };
-        } catch (error) {
-          failInteractive(error);
-          yield {
-            messageType: 'error' as const,
-            content: formatErrorMessage(error),
-          };
-        }
-      };
-
-      return {
-        type: 'stream_messages',
-        messages: messages(),
-      };
-    }
-
-    try {
-      const { filePathForDisplay } = await executeSummaryGeneration(history);
-
-      if (executionMode === 'non_interactive') {
-        return {
-          type: 'message',
-          messageType: 'info',
-          content: formatSuccessMessage(filePathForDisplay),
-        };
-      }
-
-      // Interactive mode: UI components already display progress and completion.
-      return {
-        type: 'message',
-        messageType: 'info',
-        content: '',
-      };
-    } catch (error) {
-      failInteractive(error);

      return {
        type: 'message',
        messageType: 'error',
-        content: formatErrorMessage(error),
+        content: t('Failed to generate project context summary: {{error}}', {
+          error: error instanceof Error ? error.message : String(error),
+        }),
      };
    }
  },
--- a/packages/cli/src/ui/commands/types.ts
+++ b/packages/cli/src/ui/commands/types.ts
@@ -22,14 +22,6 @@ import type {

 // Grouped dependencies for clarity and easier mocking
 export interface CommandContext {
-  /**
-   * Execution mode for the current invocation.
-   *
-   * - interactive: React/Ink UI mode
-   * - non_interactive: non-interactive CLI mode (text/json)
-   * - acp: ACP/Zed integration mode
-   */
-  executionMode?: 'interactive' | 'non_interactive' | 'acp';
  // Invocation properties for when commands are called.
  invocation?: {
    /** The raw, untrimmed input string from the user. */
@@ -116,19 +108,6 @@ export interface MessageActionReturn {
  content: string;
 }

-/**
- * The return type for a command action that streams multiple messages.
- * Used for long-running operations that need to send progress updates.
- */
-export interface StreamMessagesActionReturn {
-  type: 'stream_messages';
-  messages: AsyncGenerator<
-    { messageType: 'info' | 'error'; content: string },
-    void,
-    unknown
-  >;
-}
-
 /**
 * The return type for a command action that needs to open a dialog.
 */
@@ -195,7 +174,6 @@ export interface ConfirmActionReturn {
 export type SlashCommandActionReturn =
  | ToolActionReturn
  | MessageActionReturn
-  | StreamMessagesActionReturn
  | QuitActionReturn
  | OpenDialogActionReturn
  | LoadHistoryActionReturn
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -520,13 +520,6 @@ export const useSlashCommandProcessor = (
                    true,
                  );
                }
-                case 'stream_messages': {
-                  // stream_messages is only used in ACP/Zed integration mode
-                  // and should not be returned in interactive UI mode
-                  throw new Error(
-                    'stream_messages result type is not supported in interactive mode',
-                  );
-                }
                default: {
                  const unhandled: never = result;
                  throw new Error(
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -526,15 +526,10 @@ export const useGeminiStream = (
        return currentThoughtBuffer;
      }

-      let newThoughtBuffer = currentThoughtBuffer + thoughtText;
-
-      const pendingType = pendingHistoryItemRef.current?.type;
-      const isPendingThought =
-        pendingType === 'gemini_thought' ||
-        pendingType === 'gemini_thought_content';
+      const newThoughtBuffer = currentThoughtBuffer + thoughtText;

      // If we're not already showing a thought, start a new one
-      if (!isPendingThought) {
+      if (pendingHistoryItemRef.current?.type !== 'gemini_thought') {
        // If there's a pending non-thought item, finalize it first
        if (pendingHistoryItemRef.current) {
          addItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -542,37 +537,11 @@ export const useGeminiStream = (
        setPendingHistoryItem({ type: 'gemini_thought', text: '' });
      }

-      // Split large thought messages for better rendering performance (same rationale
-      // as regular content streaming). This helps avoid terminal flicker caused by
-      // constantly re-rendering an ever-growing "pending" block.
-      const splitPoint = findLastSafeSplitPoint(newThoughtBuffer);
-      const nextPendingType: 'gemini_thought' | 'gemini_thought_content' =
-        isPendingThought && pendingType === 'gemini_thought_content'
-          ? 'gemini_thought_content'
-          : 'gemini_thought';
-
-      if (splitPoint === newThoughtBuffer.length) {
-        // Update the existing thought message with accumulated content
-        setPendingHistoryItem({
-          type: nextPendingType,
-          text: newThoughtBuffer,
-        });
-      } else {
-        const beforeText = newThoughtBuffer.substring(0, splitPoint);
-        const afterText = newThoughtBuffer.substring(splitPoint);
-        addItem(
-          {
-            type: nextPendingType,
-            text: beforeText,
-          },
-          userMessageTimestamp,
-        );
-        setPendingHistoryItem({
-          type: 'gemini_thought_content',
-          text: afterText,
-        });
-        newThoughtBuffer = afterText;
-      }
+      // Update the existing thought message with accumulated content
+      setPendingHistoryItem({
+        type: 'gemini_thought',
+        text: newThoughtBuffer,
+      });

      // Also update the thought state for the loading indicator
      mergeThought(eventValue);
--- a/packages/cli/src/ui/hooks/useLoadingIndicator.test.ts
+++ b/packages/cli/src/ui/hooks/useLoadingIndicator.test.ts
@@ -8,22 +8,19 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import { useLoadingIndicator } from './useLoadingIndicator.js';
 import { StreamingState } from '../types.js';
-import { PHRASE_CHANGE_INTERVAL_MS } from './usePhraseCycler.js';
-import * as i18n from '../../i18n/index.js';
-
-const MOCK_WITTY_PHRASES = ['Phrase 1', 'Phrase 2', 'Phrase 3'];
+import {
+  WITTY_LOADING_PHRASES,
+  PHRASE_CHANGE_INTERVAL_MS,
+} from './usePhraseCycler.js';

 describe('useLoadingIndicator', () => {
  beforeEach(() => {
    vi.useFakeTimers();
-    vi.spyOn(i18n, 'ta').mockReturnValue(MOCK_WITTY_PHRASES);
-    vi.spyOn(i18n, 't').mockImplementation((key) => key);
  });

  afterEach(() => {
    vi.useRealTimers(); // Restore real timers after each test
    act(() => vi.runOnlyPendingTimers);
-    vi.restoreAllMocks();
  });

  it('should initialize with default values when Idle', () => {
@@ -31,7 +28,9 @@ describe('useLoadingIndicator', () => {
      useLoadingIndicator(StreamingState.Idle),
    );
    expect(result.current.elapsedTime).toBe(0);
-    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(
+      result.current.currentLoadingPhrase,
+    );
  });

  it('should reflect values when Responding', async () => {
@@ -41,14 +40,18 @@ describe('useLoadingIndicator', () => {

    // Initial state before timers advance
    expect(result.current.elapsedTime).toBe(0);
-    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(
+      result.current.currentLoadingPhrase,
+    );

    await act(async () => {
      await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 1);
    });

    // Phrase should cycle if PHRASE_CHANGE_INTERVAL_MS has passed
-    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(
+      result.current.currentLoadingPhrase,
+    );
  });

  it('should show waiting phrase and retain elapsedTime when WaitingForConfirmation', async () => {
@@ -101,7 +104,9 @@ describe('useLoadingIndicator', () => {
      rerender({ streamingState: StreamingState.Responding });
    });
    expect(result.current.elapsedTime).toBe(0); // Should reset
-    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(
+      result.current.currentLoadingPhrase,
+    );

    await act(async () => {
      await vi.advanceTimersByTimeAsync(1000);
@@ -125,7 +130,9 @@ describe('useLoadingIndicator', () => {
    });

    expect(result.current.elapsedTime).toBe(0);
-    expect(MOCK_WITTY_PHRASES).toContain(result.current.currentLoadingPhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(
+      result.current.currentLoadingPhrase,
+    );

    // Timer should not advance
    await act(async () => {
--- a/packages/cli/src/ui/hooks/usePhraseCycler.test.ts
+++ b/packages/cli/src/ui/hooks/usePhraseCycler.test.ts
@@ -8,17 +8,13 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { renderHook, act } from '@testing-library/react';
 import {
  usePhraseCycler,
+  WITTY_LOADING_PHRASES,
  PHRASE_CHANGE_INTERVAL_MS,
 } from './usePhraseCycler.js';
-import * as i18n from '../../i18n/index.js';
-
-const MOCK_WITTY_PHRASES = ['Phrase 1', 'Phrase 2', 'Phrase 3'];

 describe('usePhraseCycler', () => {
  beforeEach(() => {
    vi.useFakeTimers();
-    vi.spyOn(i18n, 'ta').mockReturnValue(MOCK_WITTY_PHRASES);
-    vi.spyOn(i18n, 't').mockImplementation((key) => key);
  });

  afterEach(() => {
@@ -27,7 +23,7 @@ describe('usePhraseCycler', () => {

  it('should initialize with a witty phrase when not active and not waiting', () => {
    const { result } = renderHook(() => usePhraseCycler(false, false));
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);
  });

  it('should show "Waiting for user confirmation..." when isWaiting is true', () => {
@@ -51,30 +47,35 @@ describe('usePhraseCycler', () => {
  it('should cycle through witty phrases when isActive is true and not waiting', () => {
    const { result } = renderHook(() => usePhraseCycler(true, false));
    // Initial phrase should be one of the witty phrases
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);
    const _initialPhrase = result.current;

    act(() => {
      vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
    });
    // Phrase should change and be one of the witty phrases
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);

    const _secondPhrase = result.current;
    act(() => {
      vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
    });
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);
  });

  it('should reset to a witty phrase when isActive becomes true after being false (and not waiting)', () => {
+    // Ensure there are at least two phrases for this test to be meaningful.
+    if (WITTY_LOADING_PHRASES.length < 2) {
+      return;
+    }
+
    // Mock Math.random to make the test deterministic.
    let callCount = 0;
    vi.spyOn(Math, 'random').mockImplementation(() => {
      // Cycle through 0, 1, 0, 1, ...
      const val = callCount % 2;
      callCount++;
-      return val / MOCK_WITTY_PHRASES.length;
+      return val / WITTY_LOADING_PHRASES.length;
    });

    const { result, rerender } = renderHook(
@@ -85,9 +86,9 @@ describe('usePhraseCycler', () => {
    // Activate
    rerender({ isActive: true, isWaiting: false });
    const firstActivePhrase = result.current;
-    expect(MOCK_WITTY_PHRASES).toContain(firstActivePhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(firstActivePhrase);
    // With our mock, this should be the first phrase.
-    expect(firstActivePhrase).toBe(MOCK_WITTY_PHRASES[0]);
+    expect(firstActivePhrase).toBe(WITTY_LOADING_PHRASES[0]);

    act(() => {
      vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
@@ -95,18 +96,18 @@ describe('usePhraseCycler', () => {

    // Phrase should change to the second phrase.
    expect(result.current).not.toBe(firstActivePhrase);
-    expect(result.current).toBe(MOCK_WITTY_PHRASES[1]);
+    expect(result.current).toBe(WITTY_LOADING_PHRASES[1]);

    // Set to inactive - should reset to the default initial phrase
    rerender({ isActive: false, isWaiting: false });
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);

    // Set back to active - should pick a random witty phrase (which our mock controls)
    act(() => {
      rerender({ isActive: true, isWaiting: false });
    });
    // The random mock will now return 0, so it should be the first phrase again.
-    expect(result.current).toBe(MOCK_WITTY_PHRASES[0]);
+    expect(result.current).toBe(WITTY_LOADING_PHRASES[0]);
  });

  it('should clear phrase interval on unmount when active', () => {
@@ -147,7 +148,7 @@ describe('usePhraseCycler', () => {

    rerender({ isActive: true, isWaiting: false, customPhrases: undefined });

-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);
  });

  it('should fall back to witty phrases if custom phrases are an empty array', () => {
@@ -163,7 +164,7 @@ describe('usePhraseCycler', () => {
      },
    );

-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);
  });

  it('should reset to a witty phrase when transitioning from waiting to active', () => {
@@ -173,13 +174,16 @@ describe('usePhraseCycler', () => {
    );

    const _initialPhrase = result.current;
-    expect(MOCK_WITTY_PHRASES).toContain(_initialPhrase);
+    expect(WITTY_LOADING_PHRASES).toContain(_initialPhrase);

    // Cycle to a different phrase (potentially)
    act(() => {
      vi.advanceTimersByTime(PHRASE_CHANGE_INTERVAL_MS);
    });
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    if (WITTY_LOADING_PHRASES.length > 1) {
+      // This check is probabilistic with random selection
+    }
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);

    // Go to waiting state
    rerender({ isActive: false, isWaiting: true });
@@ -187,6 +191,6 @@ describe('usePhraseCycler', () => {

    // Go back to active cycling - should pick a random witty phrase
    rerender({ isActive: true, isWaiting: false });
-    expect(MOCK_WITTY_PHRASES).toContain(result.current);
+    expect(WITTY_LOADING_PHRASES).toContain(result.current);
  });
 });
--- a/packages/cli/src/ui/hooks/usePhraseCycler.ts
+++ b/packages/cli/src/ui/hooks/usePhraseCycler.ts
@@ -5,9 +5,139 @@
 */

 import { useState, useEffect, useRef, useMemo } from 'react';
-import { t, ta } from '../../i18n/index.js';
+import { t } from '../../i18n/index.js';

-export const WITTY_LOADING_PHRASES: string[] = ["I'm Feeling Lucky"];
+export const 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...',
+  'One moment, optimizing humor...',
+  'Shuffling punchlines...',
+  'Untangling neural nets...',
+  'Compiling brilliance...',
+  'Loading 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...',
+  '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...',
+  "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...",
+  '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...',
+  '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?...',
+  "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...',
+  'Rewriting in Rust for no particular reason...',
+  'Trying to exit 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#.",
+  '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...',
+  '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...',
+  'New line? That’s Ctrl+J.',
+];

 export const PHRASE_CHANGE_INTERVAL_MS = 15000;

@@ -22,16 +152,14 @@ export const usePhraseCycler = (
  isWaiting: boolean,
  customPhrases?: string[],
 ) => {
-  // Get phrases from translations if available
-  const loadingPhrases = useMemo(() => {
-    if (customPhrases && customPhrases.length > 0) {
-      return customPhrases;
-    }
-    const translatedPhrases = ta('WITTY_LOADING_PHRASES');
-    return translatedPhrases.length > 0
-      ? translatedPhrases
-      : WITTY_LOADING_PHRASES;
-  }, [customPhrases]);
+  // Translate all phrases at once if using default phrases
+  const loadingPhrases = useMemo(
+    () =>
+      customPhrases && customPhrases.length > 0
+        ? customPhrases
+        : WITTY_LOADING_PHRASES.map((phrase) => t(phrase)),
+    [customPhrases],
+  );

  const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(
    loadingPhrases[0],
--- a/packages/cli/src/ui/models/availableModels.ts
+++ b/packages/cli/src/ui/models/availableModels.ts
@@ -60,11 +60,6 @@ export function getOpenAIAvailableModelFromEnv(): AvailableModel | null {
  return id ? { id, label: id } : null;
 }

-export function getAnthropicAvailableModelFromEnv(): AvailableModel | null {
-  const id = process.env['ANTHROPIC_MODEL']?.trim();
-  return id ? { id, label: id } : null;
-}
-
 export function getAvailableModelsForAuthType(
  authType: AuthType,
 ): AvailableModel[] {
@@ -75,10 +70,6 @@ export function getAvailableModelsForAuthType(
      const openAIModel = getOpenAIAvailableModelFromEnv();
      return openAIModel ? [openAIModel] : [];
    }
-    case AuthType.USE_ANTHROPIC: {
-      const anthropicModel = getAnthropicAvailableModelFromEnv();
-      return anthropicModel ? [anthropicModel] : [];
-    }
    default:
      // For other auth types, return empty array for now
      // This can be expanded later according to the design doc
--- a/packages/cli/src/ui/utils/resumeHistoryUtils.test.ts
+++ b/packages/cli/src/ui/utils/resumeHistoryUtils.test.ts
@@ -20,11 +20,6 @@ const makeConfig = (tools: Record<string, AnyDeclarativeTool>) =>
    getToolRegistry: () => ({
      getTool: (name: string) => tools[name],
    }),
-    getContentGenerator: () => ({
-      // Default to showing full thinking content during resume unless explicitly
-      // summarized; tests don't care about summarized thinking behavior.
-      useSummarizedThinking: () => false,
-    }),
  }) as unknown as Config;

 describe('resumeHistoryUtils', () => {
--- a/packages/cli/src/ui/utils/resumeHistoryUtils.ts
+++ b/packages/cli/src/ui/utils/resumeHistoryUtils.ts
@@ -204,11 +204,7 @@ function convertToHistoryItems(
        const parts = record.message?.parts as Part[] | undefined;

        // Extract thought content
-        const thoughtText = !config
-          .getContentGenerator()
-          .useSummarizedThinking()
-          ? extractThoughtTextFromParts(parts)
-          : '';
+        const thoughtText = extractThoughtTextFromParts(parts);

        // Extract text content (non-function-call, non-thought)
        const text = extractTextFromParts(parts);
--- a/packages/cli/src/utils/nonInteractiveHelpers.test.ts
+++ b/packages/cli/src/utils/nonInteractiveHelpers.test.ts
@@ -35,33 +35,22 @@ import {
 } from './nonInteractiveHelpers.js';

 // Mock dependencies
-vi.mock('../nonInteractiveCliCommands.js', () => ({
-  getAvailableCommands: vi
-    .fn()
-    .mockImplementation(
-      async (
-        _config: unknown,
-        _signal: AbortSignal,
-        allowedBuiltinCommandNames?: string[],
-      ) => {
-        const allowedSet = new Set(allowedBuiltinCommandNames ?? []);
-        const allCommands = [
-          { name: 'help', kind: 'built-in' },
-          { name: 'commit', kind: 'file' },
-          { name: 'memory', kind: 'built-in' },
-          { name: 'init', kind: 'built-in' },
-          { name: 'summary', kind: 'built-in' },
-          { name: 'compress', kind: 'built-in' },
-        ];
+vi.mock('../services/CommandService.js', () => ({
+  CommandService: {
+    create: vi.fn().mockResolvedValue({
+      getCommands: vi
+        .fn()
+        .mockReturnValue([
+          { name: 'help' },
+          { name: 'commit' },
+          { name: 'memory' },
+        ]),
+    }),
+  },
+}));

-        // Filter commands: always include file commands, only include allowed built-in commands
-        return allCommands.filter(
-          (cmd) =>
-            cmd.kind === 'file' ||
-            (cmd.kind === 'built-in' && allowedSet.has(cmd.name)),
-        );
-      },
-    ),
+vi.mock('../services/BuiltinCommandLoader.js', () => ({
+  BuiltinCommandLoader: vi.fn().mockImplementation(() => ({})),
 }));

 vi.mock('../ui/utils/computeStats.js', () => ({
@@ -522,12 +511,10 @@ describe('buildSystemMessage', () => {
  });

  it('should build system message with all fields', async () => {
-    const allowedBuiltinCommands = ['init', 'summary', 'compress'];
    const result = await buildSystemMessage(
      mockConfig,
      'test-session-id',
      'auto' as PermissionMode,
-      allowedBuiltinCommands,
    );

    expect(result).toEqual({
@@ -543,7 +530,7 @@ describe('buildSystemMessage', () => {
      ],
      model: 'test-model',
      permission_mode: 'auto',
-      slash_commands: ['commit', 'compress', 'init', 'summary'],
+      slash_commands: ['commit', 'help', 'memory'],
      qwen_code_version: '1.0.0',
      agents: [],
    });
@@ -559,7 +546,6 @@ describe('buildSystemMessage', () => {
      config,
      'test-session-id',
      'auto' as PermissionMode,
-      ['init', 'summary'],
    );

    expect(result.tools).toEqual([]);
@@ -575,7 +561,6 @@ describe('buildSystemMessage', () => {
      config,
      'test-session-id',
      'auto' as PermissionMode,
-      ['init', 'summary'],
    );

    expect(result.mcp_servers).toEqual([]);
@@ -591,37 +576,10 @@ describe('buildSystemMessage', () => {
      config,
      'test-session-id',
      'auto' as PermissionMode,
-      ['init', 'summary'],
    );

    expect(result.qwen_code_version).toBe('unknown');
  });
-
-  it('should only include allowed built-in commands and all file commands', async () => {
-    const allowedBuiltinCommands = ['init', 'summary'];
-    const result = await buildSystemMessage(
-      mockConfig,
-      'test-session-id',
-      'auto' as PermissionMode,
-      allowedBuiltinCommands,
-    );
-
-    // Should include: 'commit' (FILE), 'init' (BUILT_IN, allowed), 'summary' (BUILT_IN, allowed)
-    // Should NOT include: 'help', 'memory', 'compress' (BUILT_IN but not in allowed set)
-    expect(result.slash_commands).toEqual(['commit', 'init', 'summary']);
-  });
-
-  it('should include only file commands when no built-in commands are allowed', async () => {
-    const result = await buildSystemMessage(
-      mockConfig,
-      'test-session-id',
-      'auto' as PermissionMode,
-      [], // Empty array - no built-in commands allowed
-    );
-
-    // Should only include 'commit' (FILE command)
-    expect(result.slash_commands).toEqual(['commit']);
-  });
 });

 describe('createTaskToolProgressHandler', () => {
--- a/packages/cli/src/utils/nonInteractiveHelpers.ts
+++ b/packages/cli/src/utils/nonInteractiveHelpers.ts
@@ -25,9 +25,10 @@ import type {
  PermissionMode,
  CLISystemMessage,
 } from '../nonInteractive/types.js';
+import { CommandService } from '../services/CommandService.js';
+import { BuiltinCommandLoader } from '../services/BuiltinCommandLoader.js';
 import type { JsonOutputAdapterInterface } from '../nonInteractive/io/BaseJsonOutputAdapter.js';
 import { computeSessionStats } from '../ui/utils/computeStats.js';
-import { getAvailableCommands } from '../nonInteractiveCliCommands.js';

 /**
 * Normalizes various part list formats into a consistent Part[] array.
@@ -186,27 +187,24 @@ export function computeUsageFromMetrics(metrics: SessionMetrics): Usage {
 }

 /**
- * Load slash command names using getAvailableCommands
+ * Load slash command names using CommandService
 *
 * @param config - Config instance
- * @param allowedBuiltinCommandNames - Optional array of allowed built-in command names.
- *   If not provided, uses the default from getAvailableCommands.
 * @returns Promise resolving to array of slash command names
 */
-async function loadSlashCommandNames(
-  config: Config,
-  allowedBuiltinCommandNames?: string[],
-): Promise<string[]> {
+async function loadSlashCommandNames(config: Config): Promise<string[]> {
  const controller = new AbortController();
  try {
-    const commands = await getAvailableCommands(
-      config,
+    const service = await CommandService.create(
+      [new BuiltinCommandLoader(config)],
      controller.signal,
-      allowedBuiltinCommandNames,
    );
-
-    // 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) {
    if (config.getDebugMode()) {
      console.error(
@@ -235,15 +233,12 @@ async function loadSlashCommandNames(
 * @param config - Config instance
 * @param sessionId - Session identifier
 * @param permissionMode - Current permission/approval mode
- * @param allowedBuiltinCommandNames - Optional array of allowed built-in command names.
- *   If not provided, defaults to empty array (only file commands will be included).
 * @returns Promise resolving to CLISystemMessage
 */
 export async function buildSystemMessage(
  config: Config,
  sessionId: string,
  permissionMode: PermissionMode,
-  allowedBuiltinCommandNames?: string[],
 ): Promise<CLISystemMessage> {
  const toolRegistry = config.getToolRegistry();
  const tools = toolRegistry ? toolRegistry.getAllToolNames() : [];
@@ -256,11 +251,8 @@ export async function buildSystemMessage(
      }))
    : [];

-  // Load slash commands with filtering based on allowed built-in commands
-  const slashCommands = await loadSlashCommandNames(
-    config,
-    allowedBuiltinCommandNames,
-  );
+  // Load slash commands
+  const slashCommands = await loadSlashCommandNames(config);

  // Load subagent names from config
  let agentNames: string[] = [];
--- a/packages/cli/src/utils/systemInfo.ts
+++ b/packages/cli/src/utils/systemInfo.ts
@@ -153,8 +153,7 @@ export async function getExtendedSystemInfo(

  // Get base URL if using OpenAI auth
  const baseUrl =
-    baseInfo.selectedAuthType === AuthType.USE_OPENAI ||
-    baseInfo.selectedAuthType === AuthType.USE_ANTHROPIC
+    baseInfo.selectedAuthType === AuthType.USE_OPENAI
      ? context.services.config?.getContentGeneratorConfig()?.baseUrl
      : undefined;

--- a/packages/cli/src/validateNonInterActiveAuth.test.ts
+++ b/packages/cli/src/validateNonInterActiveAuth.test.ts
@@ -19,9 +19,6 @@ describe('validateNonInterActiveAuth', () => {
  let originalEnvVertexAi: string | undefined;
  let originalEnvGcp: string | undefined;
  let originalEnvOpenAiApiKey: string | undefined;
-  let originalEnvQwenOauth: string | undefined;
-  let originalEnvGoogleApiKey: string | undefined;
-  let originalEnvAnthropicApiKey: string | undefined;
  let consoleErrorSpy: ReturnType<typeof vi.spyOn>;
  let processExitSpy: ReturnType<typeof vi.spyOn<[code?: number], never>>;
  let refreshAuthMock: ReturnType<typeof vi.fn>;
@@ -32,16 +29,10 @@ describe('validateNonInterActiveAuth', () => {
    originalEnvVertexAi = process.env['GOOGLE_GENAI_USE_VERTEXAI'];
    originalEnvGcp = process.env['GOOGLE_GENAI_USE_GCA'];
    originalEnvOpenAiApiKey = process.env['OPENAI_API_KEY'];
-    originalEnvQwenOauth = process.env['QWEN_OAUTH'];
-    originalEnvGoogleApiKey = process.env['GOOGLE_API_KEY'];
-    originalEnvAnthropicApiKey = process.env['ANTHROPIC_API_KEY'];
    delete process.env['GEMINI_API_KEY'];
    delete process.env['GOOGLE_GENAI_USE_VERTEXAI'];
    delete process.env['GOOGLE_GENAI_USE_GCA'];
    delete process.env['OPENAI_API_KEY'];
-    delete process.env['QWEN_OAUTH'];
-    delete process.env['GOOGLE_API_KEY'];
-    delete process.env['ANTHROPIC_API_KEY'];
    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
    processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
      throw new Error(`process.exit(${code}) called`);
@@ -89,21 +80,6 @@ describe('validateNonInterActiveAuth', () => {
    } else {
      delete process.env['OPENAI_API_KEY'];
    }
-    if (originalEnvQwenOauth !== undefined) {
-      process.env['QWEN_OAUTH'] = originalEnvQwenOauth;
-    } else {
-      delete process.env['QWEN_OAUTH'];
-    }
-    if (originalEnvGoogleApiKey !== undefined) {
-      process.env['GOOGLE_API_KEY'] = originalEnvGoogleApiKey;
-    } else {
-      delete process.env['GOOGLE_API_KEY'];
-    }
-    if (originalEnvAnthropicApiKey !== undefined) {
-      process.env['ANTHROPIC_API_KEY'] = originalEnvAnthropicApiKey;
-    } else {
-      delete process.env['ANTHROPIC_API_KEY'];
-    }
    vi.restoreAllMocks();
  });

--- a/packages/cli/src/validateNonInterActiveAuth.ts
+++ b/packages/cli/src/validateNonInterActiveAuth.ts
@@ -27,9 +27,6 @@ function getAuthTypeFromEnv(): AuthType | undefined {
  if (process.env['GOOGLE_API_KEY']) {
    return AuthType.USE_VERTEX_AI;
  }
-  if (process.env['ANTHROPIC_API_KEY']) {
-    return AuthType.USE_ANTHROPIC;
-  }

  return undefined;
 }
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@qwen-code/qwen-code-core",
-  "version": "0.6.0",
+  "version": "0.6.0-preview.0",
  "description": "Qwen Code Core",
  "repository": {
    "type": "git",
@@ -23,7 +23,6 @@
    "scripts/postinstall.js"
  ],
  "dependencies": {
-    "@anthropic-ai/sdk": "^0.36.1",
    "@google/genai": "1.30.0",
    "@modelcontextprotocol/sdk": "^1.25.1",
    "@opentelemetry/api": "^1.9.0",
--- a/packages/core/src/config/config.test.ts
+++ b/packages/core/src/config/config.test.ts
@@ -16,6 +16,7 @@ import {
  QwenLogger,
 } from '../telemetry/index.js';
 import type { ContentGeneratorConfig } from '../core/contentGenerator.js';
+import { DEFAULT_DASHSCOPE_BASE_URL } from '../core/openaiContentGenerator/constants.js';
 import {
  AuthType,
  createContentGeneratorConfig,
@@ -272,7 +273,7 @@ describe('Server Config (config.ts)', () => {
        authType,
        {
          model: MODEL,
-          baseUrl: undefined,
+          baseUrl: DEFAULT_DASHSCOPE_BASE_URL,
        },
      );
      // Verify that contentGeneratorConfig is updated
--- a/packages/core/src/config/config.ts
+++ b/packages/core/src/config/config.ts
@@ -54,7 +54,6 @@ import { canUseRipgrep } from '../utils/ripgrepUtils.js';
 import { RipGrepTool } from '../tools/ripGrep.js';
 import { ShellTool } from '../tools/shell.js';
 import { SmartEditTool } from '../tools/smart-edit.js';
-import { SkillTool } from '../tools/skill.js';
 import { TaskTool } from '../tools/task.js';
 import { TodoWriteTool } from '../tools/todoWrite.js';
 import { ToolRegistry } from '../tools/tool-registry.js';
@@ -66,7 +65,6 @@ import { WriteFileTool } from '../tools/write-file.js';
 import { ideContextStore } from '../ide/ideContext.js';
 import { InputFormat, OutputFormat } from '../output/types.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
-import { SkillManager } from '../skills/skill-manager.js';
 import { SubagentManager } from '../subagents/subagent-manager.js';
 import type { SubagentConfig } from '../subagents/types.js';
 import {
@@ -96,6 +94,7 @@ import {
 } from './constants.js';
 import { DEFAULT_QWEN_EMBEDDING_MODEL, DEFAULT_QWEN_MODEL } from './models.js';
 import { Storage } from './storage.js';
+import { DEFAULT_DASHSCOPE_BASE_URL } from '../core/openaiContentGenerator/constants.js';
 import { ChatRecordingService } from '../services/chatRecordingService.js';
 import {
  SessionService,
@@ -306,7 +305,6 @@ export interface ConfigParameters {
  extensionContextFilePaths?: string[];
  maxSessionTurns?: number;
  sessionTokenLimit?: number;
-  experimentalSkills?: boolean;
  experimentalZedIntegration?: boolean;
  listExtensions?: boolean;
  extensions?: GeminiCLIExtension[];
@@ -391,7 +389,6 @@ export class Config {
  private toolRegistry!: ToolRegistry;
  private promptRegistry!: PromptRegistry;
  private subagentManager!: SubagentManager;
-  private skillManager!: SkillManager;
  private fileSystemService: FileSystemService;
  private contentGeneratorConfig!: ContentGeneratorConfig;
  private contentGenerator!: ContentGenerator;
@@ -461,7 +458,6 @@ export class Config {
    | undefined;
  private readonly cliVersion?: string;
  private readonly experimentalZedIntegration: boolean = false;
-  private readonly experimentalSkills: boolean = false;
  private readonly chatRecordingEnabled: boolean;
  private readonly loadMemoryFromIncludeDirectories: boolean = false;
  private readonly webSearch?: {
@@ -561,7 +557,6 @@ export class Config {
    this.sessionTokenLimit = params.sessionTokenLimit ?? -1;
    this.experimentalZedIntegration =
      params.experimentalZedIntegration ?? false;
-    this.experimentalSkills = params.experimentalSkills ?? false;
    this.listExtensions = params.listExtensions ?? false;
    this._extensions = params.extensions ?? [];
    this._blockedMcpServers = params.blockedMcpServers ?? [];
@@ -573,7 +568,7 @@ export class Config {
    this._generationConfig = {
      model: params.model,
      ...(params.generationConfig || {}),
-      baseUrl: params.generationConfig?.baseUrl,
+      baseUrl: params.generationConfig?.baseUrl || DEFAULT_DASHSCOPE_BASE_URL,
    };
    this.contentGeneratorConfig = this
      ._generationConfig as ContentGeneratorConfig;
@@ -649,7 +644,6 @@ export class Config {
    }
    this.promptRegistry = new PromptRegistry();
    this.subagentManager = new SubagentManager(this);
-    this.skillManager = new SkillManager(this);

    // Load session subagents if they were provided before initialization
    if (this.sessionSubagents.length > 0) {
@@ -1072,10 +1066,6 @@ export class Config {
    return this.experimentalZedIntegration;
  }

-  getExperimentalSkills(): boolean {
-    return this.experimentalSkills;
-  }
-
  getListExtensions(): boolean {
    return this.listExtensions;
  }
@@ -1306,10 +1296,6 @@ export class Config {
    return this.subagentManager;
  }

-  getSkillManager(): SkillManager {
-    return this.skillManager;
-  }
-
  async createToolRegistry(
    sendSdkMcpMessage?: SendSdkMcpMessage,
  ): Promise<ToolRegistry> {
@@ -1352,9 +1338,6 @@ export class Config {
    };

    registerCoreTool(TaskTool, this);
-    if (this.getExperimentalSkills()) {
-      registerCoreTool(SkillTool, this);
-    }
    registerCoreTool(LSTool, this);
    registerCoreTool(ReadFileTool, this);

--- a/packages/core/src/config/storage.ts
+++ b/packages/core/src/config/storage.ts
@@ -126,10 +126,6 @@ export class Storage {
    return path.join(this.getExtensionsDir(), 'qwen-extension.json');
  }

-  getUserSkillsDir(): string {
-    return path.join(Storage.getGlobalQwenDir(), 'skills');
-  }
-
  getHistoryFilePath(): string {
    return path.join(this.getProjectTempDir(), 'shell_history');
  }
--- a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.test.ts
+++ b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.test.ts
@@ -1,500 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type {
-  CountTokensParameters,
-  GenerateContentParameters,
-} from '@google/genai';
-import { FinishReason, GenerateContentResponse } from '@google/genai';
-
-// Mock the request tokenizer module BEFORE importing the class that uses it.
-const mockTokenizer = {
-  calculateTokens: vi.fn(),
-  dispose: vi.fn(),
-};
-
-vi.mock('../../utils/request-tokenizer/index.js', () => ({
-  getDefaultTokenizer: vi.fn(() => mockTokenizer),
-  DefaultRequestTokenizer: vi.fn(() => mockTokenizer),
-  disposeDefaultTokenizer: vi.fn(),
-}));
-
-type AnthropicCreateArgs = [unknown, { signal?: AbortSignal }?];
-
-const anthropicMockState: {
-  constructorOptions?: Record<string, unknown>;
-  lastCreateArgs?: AnthropicCreateArgs;
-  createImpl: ReturnType<typeof vi.fn>;
-} = {
-  constructorOptions: undefined,
-  lastCreateArgs: undefined,
-  createImpl: vi.fn(),
-};
-
-vi.mock('@anthropic-ai/sdk', () => {
-  class AnthropicMock {
-    messages: { create: (...args: AnthropicCreateArgs) => unknown };
-
-    constructor(options: Record<string, unknown>) {
-      anthropicMockState.constructorOptions = options;
-      this.messages = {
-        create: (...args: AnthropicCreateArgs) => {
-          anthropicMockState.lastCreateArgs = args;
-          return anthropicMockState.createImpl(...args);
-        },
-      };
-    }
-  }
-
-  return {
-    default: AnthropicMock,
-    __anthropicState: anthropicMockState,
-  };
-});
-
-// Now import the modules that depend on the mocked modules.
-import type { Config } from '../../config/config.js';
-
-const importGenerator = async (): Promise<{
-  AnthropicContentGenerator: typeof import('./anthropicContentGenerator.js').AnthropicContentGenerator;
-}> => import('./anthropicContentGenerator.js');
-
-const importConverter = async (): Promise<{
-  AnthropicContentConverter: typeof import('./converter.js').AnthropicContentConverter;
-}> => import('./converter.js');
-
-describe('AnthropicContentGenerator', () => {
-  let mockConfig: Config;
-  let anthropicState: {
-    constructorOptions?: Record<string, unknown>;
-    lastCreateArgs?: AnthropicCreateArgs;
-    createImpl: ReturnType<typeof vi.fn>;
-  };
-
-  beforeEach(async () => {
-    vi.clearAllMocks();
-    vi.resetModules();
-
-    mockTokenizer.calculateTokens.mockResolvedValue({
-      totalTokens: 50,
-      breakdown: {
-        textTokens: 50,
-        imageTokens: 0,
-        audioTokens: 0,
-        otherTokens: 0,
-      },
-      processingTime: 1,
-    });
-    anthropicState = anthropicMockState;
-
-    anthropicState.createImpl.mockReset();
-    anthropicState.lastCreateArgs = undefined;
-    anthropicState.constructorOptions = undefined;
-
-    mockConfig = {
-      getCliVersion: vi.fn().mockReturnValue('1.2.3'),
-    } as unknown as Config;
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  it('passes a QwenCode User-Agent header to the Anthropic SDK', async () => {
-    const { AnthropicContentGenerator } = await importGenerator();
-    void new AnthropicContentGenerator(
-      {
-        model: 'claude-test',
-        apiKey: 'test-key',
-        baseUrl: 'https://example.invalid',
-        timeout: 10_000,
-        maxRetries: 2,
-        samplingParams: {},
-        schemaCompliance: 'auto',
-      },
-      mockConfig,
-    );
-
-    const headers = (anthropicState.constructorOptions?.['defaultHeaders'] ||
-      {}) as Record<string, string>;
-    expect(headers['User-Agent']).toContain('QwenCode/1.2.3');
-    expect(headers['User-Agent']).toContain(
-      `(${process.platform}; ${process.arch})`,
-    );
-  });
-
-  it('adds the effort beta header when reasoning.effort is set', async () => {
-    const { AnthropicContentGenerator } = await importGenerator();
-    void new AnthropicContentGenerator(
-      {
-        model: 'claude-test',
-        apiKey: 'test-key',
-        baseUrl: 'https://example.invalid',
-        timeout: 10_000,
-        maxRetries: 2,
-        samplingParams: {},
-        schemaCompliance: 'auto',
-        reasoning: { effort: 'medium' },
-      },
-      mockConfig,
-    );
-
-    const headers = (anthropicState.constructorOptions?.['defaultHeaders'] ||
-      {}) as Record<string, string>;
-    expect(headers['anthropic-beta']).toContain('effort-2025-11-24');
-  });
-
-  it('does not add the effort beta header when reasoning.effort is not set', async () => {
-    const { AnthropicContentGenerator } = await importGenerator();
-    void new AnthropicContentGenerator(
-      {
-        model: 'claude-test',
-        apiKey: 'test-key',
-        baseUrl: 'https://example.invalid',
-        timeout: 10_000,
-        maxRetries: 2,
-        samplingParams: {},
-        schemaCompliance: 'auto',
-      },
-      mockConfig,
-    );
-
-    const headers = (anthropicState.constructorOptions?.['defaultHeaders'] ||
-      {}) as Record<string, string>;
-    expect(headers['anthropic-beta']).not.toContain('effort-2025-11-24');
-  });
-
-  it('omits the anthropic beta header when reasoning is disabled', async () => {
-    const { AnthropicContentGenerator } = await importGenerator();
-    void new AnthropicContentGenerator(
-      {
-        model: 'claude-test',
-        apiKey: 'test-key',
-        baseUrl: 'https://example.invalid',
-        timeout: 10_000,
-        maxRetries: 2,
-        samplingParams: {},
-        schemaCompliance: 'auto',
-        reasoning: false,
-      },
-      mockConfig,
-    );
-
-    const headers = (anthropicState.constructorOptions?.['defaultHeaders'] ||
-      {}) as Record<string, string>;
-    expect(headers['anthropic-beta']).toBeUndefined();
-  });
-
-  describe('generateContent', () => {
-    it('builds request with config sampling params (config overrides request) and thinking budget', async () => {
-      const { AnthropicContentConverter } = await importConverter();
-      const { AnthropicContentGenerator } = await importGenerator();
-
-      const convertResponseSpy = vi
-        .spyOn(
-          AnthropicContentConverter.prototype,
-          'convertAnthropicResponseToGemini',
-        )
-        .mockReturnValue(
-          (() => {
-            const r = new GenerateContentResponse();
-            r.responseId = 'gemini-1';
-            return r;
-          })(),
-        );
-
-      anthropicState.createImpl.mockResolvedValue({
-        id: 'anthropic-1',
-        model: 'claude-test',
-        content: [{ type: 'text', text: 'hi' }],
-      });
-
-      const generator = new AnthropicContentGenerator(
-        {
-          model: 'claude-test',
-          apiKey: 'test-key',
-          baseUrl: 'https://example.invalid',
-          timeout: 10_000,
-          maxRetries: 2,
-          samplingParams: {
-            temperature: 0.7,
-            max_tokens: 1000,
-            top_p: 0.9,
-            top_k: 20,
-          },
-          schemaCompliance: 'auto',
-          reasoning: { effort: 'high', budget_tokens: 1000 },
-        },
-        mockConfig,
-      );
-
-      const abortController = new AbortController();
-      const request: GenerateContentParameters = {
-        model: 'models/ignored',
-        contents: 'Hello',
-        config: {
-          temperature: 0.1,
-          maxOutputTokens: 200,
-          topP: 0.5,
-          topK: 5,
-          abortSignal: abortController.signal,
-        },
-      };
-
-      const result = await generator.generateContent(request);
-      expect(result.responseId).toBe('gemini-1');
-
-      expect(anthropicState.lastCreateArgs).toBeDefined();
-      const [anthropicRequest, options] =
-        anthropicState.lastCreateArgs as AnthropicCreateArgs;
-
-      expect(options?.signal).toBe(abortController.signal);
-
-      expect(anthropicRequest).toEqual(
-        expect.objectContaining({
-          model: 'claude-test',
-          max_tokens: 1000,
-          temperature: 0.7,
-          top_p: 0.9,
-          top_k: 20,
-          thinking: { type: 'enabled', budget_tokens: 1000 },
-          output_config: { effort: 'high' },
-        }),
-      );
-
-      expect(convertResponseSpy).toHaveBeenCalledTimes(1);
-    });
-
-    it('omits thinking when request.config.thinkingConfig.includeThoughts is false', async () => {
-      const { AnthropicContentGenerator } = await importGenerator();
-      anthropicState.createImpl.mockResolvedValue({
-        id: 'anthropic-1',
-        model: 'claude-test',
-        content: [{ type: 'text', text: 'hi' }],
-      });
-
-      const generator = new AnthropicContentGenerator(
-        {
-          model: 'claude-test',
-          apiKey: 'test-key',
-          timeout: 10_000,
-          maxRetries: 2,
-          samplingParams: { max_tokens: 500 },
-          schemaCompliance: 'auto',
-          reasoning: { effort: 'high' },
-        },
-        mockConfig,
-      );
-
-      await generator.generateContent({
-        model: 'models/ignored',
-        contents: 'Hello',
-        config: { thinkingConfig: { includeThoughts: false } },
-      } as unknown as GenerateContentParameters);
-
-      const [anthropicRequest] =
-        anthropicState.lastCreateArgs as AnthropicCreateArgs;
-      expect(anthropicRequest).toEqual(
-        expect.not.objectContaining({ thinking: expect.anything() }),
-      );
-    });
-  });
-
-  describe('countTokens', () => {
-    it('counts tokens using the request tokenizer', async () => {
-      const { AnthropicContentGenerator } = await importGenerator();
-      const generator = new AnthropicContentGenerator(
-        {
-          model: 'claude-test',
-          apiKey: 'test-key',
-          timeout: 10_000,
-          maxRetries: 2,
-          samplingParams: {},
-          schemaCompliance: 'auto',
-        },
-        mockConfig,
-      );
-
-      const request: CountTokensParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello world' }] }],
-        model: 'claude-test',
-      };
-
-      const result = await generator.countTokens(request);
-      expect(mockTokenizer.calculateTokens).toHaveBeenCalledWith(request, {
-        textEncoding: 'cl100k_base',
-      });
-      expect(result.totalTokens).toBe(50);
-    });
-
-    it('falls back to character approximation when tokenizer throws', async () => {
-      const { AnthropicContentGenerator } = await importGenerator();
-      mockTokenizer.calculateTokens.mockRejectedValueOnce(new Error('boom'));
-      const generator = new AnthropicContentGenerator(
-        {
-          model: 'claude-test',
-          apiKey: 'test-key',
-          timeout: 10_000,
-          maxRetries: 2,
-          samplingParams: {},
-          schemaCompliance: 'auto',
-        },
-        mockConfig,
-      );
-
-      const request: CountTokensParameters = {
-        contents: [{ role: 'user', parts: [{ text: 'Hello' }] }],
-        model: 'claude-test',
-      };
-
-      const content = JSON.stringify(request.contents);
-      const expected = Math.ceil(content.length / 4);
-      const result = await generator.countTokens(request);
-      expect(result.totalTokens).toBe(expected);
-    });
-  });
-
-  describe('generateContentStream', () => {
-    it('requests stream=true and converts streamed events into Gemini chunks', async () => {
-      const { AnthropicContentGenerator } = await importGenerator();
-      anthropicState.createImpl.mockResolvedValue(
-        (async function* () {
-          yield {
-            type: 'message_start',
-            message: {
-              id: 'msg-1',
-              model: 'claude-test',
-              usage: { cache_read_input_tokens: 2, input_tokens: 3 },
-            },
-          };
-
-          yield {
-            type: 'content_block_start',
-            index: 0,
-            content_block: { type: 'text' },
-          };
-          yield {
-            type: 'content_block_delta',
-            index: 0,
-            delta: { type: 'text_delta', text: 'Hello' },
-          };
-          yield { type: 'content_block_stop', index: 0 };
-
-          yield {
-            type: 'content_block_start',
-            index: 1,
-            content_block: { type: 'thinking', signature: '' },
-          };
-          yield {
-            type: 'content_block_delta',
-            index: 1,
-            delta: { type: 'thinking_delta', thinking: 'Think' },
-          };
-          yield {
-            type: 'content_block_delta',
-            index: 1,
-            delta: { type: 'signature_delta', signature: 'abc' },
-          };
-          yield { type: 'content_block_stop', index: 1 };
-
-          yield {
-            type: 'content_block_start',
-            index: 2,
-            content_block: {
-              type: 'tool_use',
-              id: 't1',
-              name: 'tool',
-              input: {},
-            },
-          };
-          yield {
-            type: 'content_block_delta',
-            index: 2,
-            delta: { type: 'input_json_delta', partial_json: '{"x":' },
-          };
-          yield {
-            type: 'content_block_delta',
-            index: 2,
-            delta: { type: 'input_json_delta', partial_json: '1}' },
-          };
-          yield { type: 'content_block_stop', index: 2 };
-
-          yield {
-            type: 'message_delta',
-            delta: { stop_reason: 'end_turn' },
-            usage: {
-              output_tokens: 5,
-              input_tokens: 7,
-              cache_read_input_tokens: 2,
-            },
-          };
-          yield { type: 'message_stop' };
-        })(),
-      );
-
-      const generator = new AnthropicContentGenerator(
-        {
-          model: 'claude-test',
-          apiKey: 'test-key',
-          timeout: 10_000,
-          maxRetries: 2,
-          samplingParams: { max_tokens: 123 },
-          schemaCompliance: 'auto',
-        },
-        mockConfig,
-      );
-
-      const stream = await generator.generateContentStream({
-        model: 'models/ignored',
-        contents: 'Hello',
-      } as unknown as GenerateContentParameters);
-
-      const chunks: GenerateContentResponse[] = [];
-      for await (const chunk of stream) {
-        chunks.push(chunk);
-      }
-
-      const [anthropicRequest] =
-        anthropicState.lastCreateArgs as AnthropicCreateArgs;
-      expect(anthropicRequest).toEqual(
-        expect.objectContaining({ stream: true }),
-      );
-
-      // Text chunk.
-      expect(chunks[0]?.candidates?.[0]?.content?.parts?.[0]).toEqual({
-        text: 'Hello',
-      });
-
-      // Thinking chunk.
-      expect(chunks[1]?.candidates?.[0]?.content?.parts?.[0]).toEqual({
-        text: 'Think',
-        thought: true,
-      });
-
-      // Signature chunk.
-      expect(chunks[2]?.candidates?.[0]?.content?.parts?.[0]).toEqual({
-        thought: true,
-        thoughtSignature: 'abc',
-      });
-
-      // Tool call chunk.
-      expect(chunks[3]?.candidates?.[0]?.content?.parts?.[0]).toEqual({
-        functionCall: { id: 't1', name: 'tool', args: { x: 1 } },
-      });
-
-      // Usage/finish chunks exist; check the last one.
-      const last = chunks[chunks.length - 1]!;
-      expect(last.candidates?.[0]?.finishReason).toBe(FinishReason.STOP);
-      expect(last.usageMetadata).toEqual({
-        cachedContentTokenCount: 2,
-        promptTokenCount: 9, // cached(2) + input(7)
-        candidatesTokenCount: 5,
-        totalTokenCount: 14,
-      });
-    });
-  });
-});
--- a/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts
+++ b/packages/core/src/core/anthropicContentGenerator/anthropicContentGenerator.ts
@@ -1,502 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import Anthropic from '@anthropic-ai/sdk';
-import type {
-  CountTokensParameters,
-  CountTokensResponse,
-  EmbedContentParameters,
-  EmbedContentResponse,
-  GenerateContentParameters,
-  GenerateContentResponseUsageMetadata,
-  Part,
-} from '@google/genai';
-import { GenerateContentResponse } from '@google/genai';
-import type { Config } from '../../config/config.js';
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../contentGenerator.js';
-type Message = Anthropic.Message;
-type MessageCreateParamsNonStreaming =
-  Anthropic.MessageCreateParamsNonStreaming;
-type MessageCreateParamsStreaming = Anthropic.MessageCreateParamsStreaming;
-type RawMessageStreamEvent = Anthropic.RawMessageStreamEvent;
-import { getDefaultTokenizer } from '../../utils/request-tokenizer/index.js';
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
-import { AnthropicContentConverter } from './converter.js';
-
-type StreamingBlockState = {
-  type: string;
-  id?: string;
-  name?: string;
-  inputJson: string;
-  signature: string;
-};
-
-type MessageCreateParamsWithThinking = MessageCreateParamsNonStreaming & {
-  thinking?: { type: 'enabled'; budget_tokens: number };
-  // Anthropic beta feature: output_config.effort (requires beta header effort-2025-11-24)
-  // This is not yet represented in the official SDK types we depend on.
-  output_config?: { effort: 'low' | 'medium' | 'high' };
-};
-
-export class AnthropicContentGenerator implements ContentGenerator {
-  private client: Anthropic;
-  private converter: AnthropicContentConverter;
-
-  constructor(
-    private contentGeneratorConfig: ContentGeneratorConfig,
-    private readonly cliConfig: Config,
-  ) {
-    const defaultHeaders = this.buildHeaders();
-    const baseURL = contentGeneratorConfig.baseUrl;
-
-    this.client = new Anthropic({
-      apiKey: contentGeneratorConfig.apiKey,
-      baseURL,
-      timeout: contentGeneratorConfig.timeout,
-      maxRetries: contentGeneratorConfig.maxRetries,
-      defaultHeaders,
-    });
-
-    this.converter = new AnthropicContentConverter(
-      contentGeneratorConfig.model,
-      contentGeneratorConfig.schemaCompliance,
-    );
-  }
-
-  async generateContent(
-    request: GenerateContentParameters,
-  ): Promise<GenerateContentResponse> {
-    const anthropicRequest = await this.buildRequest(request);
-    const response = (await this.client.messages.create(anthropicRequest, {
-      signal: request.config?.abortSignal,
-    })) as Message;
-
-    return this.converter.convertAnthropicResponseToGemini(response);
-  }
-
-  async generateContentStream(
-    request: GenerateContentParameters,
-  ): Promise<AsyncGenerator<GenerateContentResponse>> {
-    const anthropicRequest = await this.buildRequest(request);
-    const streamingRequest: MessageCreateParamsStreaming & {
-      thinking?: { type: 'enabled'; budget_tokens: number };
-    } = {
-      ...anthropicRequest,
-      stream: true,
-    };
-
-    const stream = (await this.client.messages.create(
-      streamingRequest as MessageCreateParamsStreaming,
-      {
-        signal: request.config?.abortSignal,
-      },
-    )) as AsyncIterable<RawMessageStreamEvent>;
-
-    return this.processStream(stream);
-  }
-
-  async countTokens(
-    request: CountTokensParameters,
-  ): Promise<CountTokensResponse> {
-    try {
-      const tokenizer = getDefaultTokenizer();
-      const result = await tokenizer.calculateTokens(request, {
-        textEncoding: 'cl100k_base',
-      });
-
-      return {
-        totalTokens: result.totalTokens,
-      };
-    } catch (error) {
-      console.warn(
-        'Failed to calculate tokens with tokenizer, ' +
-          'falling back to simple method:',
-        error,
-      );
-
-      const content = JSON.stringify(request.contents);
-      const totalTokens = Math.ceil(content.length / 4);
-      return {
-        totalTokens,
-      };
-    }
-  }
-
-  async embedContent(
-    _request: EmbedContentParameters,
-  ): Promise<EmbedContentResponse> {
-    throw new Error('Anthropic does not support embeddings.');
-  }
-
-  useSummarizedThinking(): boolean {
-    return false;
-  }
-
-  private buildHeaders(): Record<string, string> {
-    const version = this.cliConfig.getCliVersion() || 'unknown';
-    const userAgent = `QwenCode/${version} (${process.platform}; ${process.arch})`;
-
-    const betas: string[] = [];
-    const reasoning = this.contentGeneratorConfig.reasoning;
-
-    // Interleaved thinking is used when we send the `thinking` field.
-    if (reasoning !== false) {
-      betas.push('interleaved-thinking-2025-05-14');
-    }
-
-    // Effort (beta) is enabled when reasoning.effort is set.
-    if (reasoning !== false && reasoning?.effort !== undefined) {
-      betas.push('effort-2025-11-24');
-    }
-
-    const headers: Record<string, string> = {
-      'User-Agent': userAgent,
-    };
-
-    if (betas.length) {
-      headers['anthropic-beta'] = betas.join(',');
-    }
-
-    return headers;
-  }
-
-  private async buildRequest(
-    request: GenerateContentParameters,
-  ): Promise<MessageCreateParamsWithThinking> {
-    const { system, messages } =
-      this.converter.convertGeminiRequestToAnthropic(request);
-
-    const tools = request.config?.tools
-      ? await this.converter.convertGeminiToolsToAnthropic(request.config.tools)
-      : undefined;
-
-    const sampling = this.buildSamplingParameters(request);
-    const thinking = this.buildThinkingConfig(request);
-    const outputConfig = this.buildOutputConfig();
-
-    return {
-      model: this.contentGeneratorConfig.model,
-      system,
-      messages,
-      tools,
-      ...sampling,
-      ...(thinking ? { thinking } : {}),
-      ...(outputConfig ? { output_config: outputConfig } : {}),
-    };
-  }
-
-  private buildSamplingParameters(request: GenerateContentParameters): {
-    max_tokens: number;
-    temperature?: number;
-    top_p?: number;
-    top_k?: number;
-  } {
-    const configSamplingParams = this.contentGeneratorConfig.samplingParams;
-    const requestConfig = request.config || {};
-
-    const getParam = <T>(
-      configKey: keyof NonNullable<typeof configSamplingParams>,
-      requestKey?: keyof NonNullable<typeof requestConfig>,
-    ): T | undefined => {
-      const configValue = configSamplingParams?.[configKey] as T | undefined;
-      const requestValue = requestKey
-        ? (requestConfig[requestKey] as T | undefined)
-        : undefined;
-      return configValue !== undefined ? configValue : requestValue;
-    };
-
-    const maxTokens =
-      getParam<number>('max_tokens', 'maxOutputTokens') ?? 10_000;
-
-    return {
-      max_tokens: maxTokens,
-      temperature: getParam<number>('temperature', 'temperature') ?? 1,
-      top_p: getParam<number>('top_p', 'topP'),
-      top_k: getParam<number>('top_k', 'topK'),
-    };
-  }
-
-  private buildThinkingConfig(
-    request: GenerateContentParameters,
-  ): { type: 'enabled'; budget_tokens: number } | undefined {
-    if (request.config?.thinkingConfig?.includeThoughts === false) {
-      return undefined;
-    }
-
-    const reasoning = this.contentGeneratorConfig.reasoning;
-
-    if (reasoning === false) {
-      return undefined;
-    }
-
-    if (reasoning?.budget_tokens !== undefined) {
-      return {
-        type: 'enabled',
-        budget_tokens: reasoning.budget_tokens,
-      };
-    }
-
-    const effort = reasoning?.effort;
-    // When using interleaved thinking with tools, this budget token limit is the entire context window(200k tokens).
-    const budgetTokens =
-      effort === 'low' ? 16_000 : effort === 'high' ? 64_000 : 32_000;
-
-    return {
-      type: 'enabled',
-      budget_tokens: budgetTokens,
-    };
-  }
-
-  private buildOutputConfig():
-    | { effort: 'low' | 'medium' | 'high' }
-    | undefined {
-    const reasoning = this.contentGeneratorConfig.reasoning;
-    if (reasoning === false || reasoning === undefined) {
-      return undefined;
-    }
-
-    if (reasoning.effort === undefined) {
-      return undefined;
-    }
-
-    return { effort: reasoning.effort };
-  }
-
-  private async *processStream(
-    stream: AsyncIterable<RawMessageStreamEvent>,
-  ): AsyncGenerator<GenerateContentResponse> {
-    let messageId: string | undefined;
-    let model = this.contentGeneratorConfig.model;
-    let cachedTokens = 0;
-    let promptTokens = 0;
-    let completionTokens = 0;
-    let finishReason: string | undefined;
-
-    const blocks = new Map<number, StreamingBlockState>();
-    const collectedResponses: GenerateContentResponse[] = [];
-
-    for await (const event of stream) {
-      switch (event.type) {
-        case 'message_start': {
-          messageId = event.message.id ?? messageId;
-          model = event.message.model ?? model;
-          cachedTokens =
-            event.message.usage?.cache_read_input_tokens ?? cachedTokens;
-          promptTokens = event.message.usage?.input_tokens ?? promptTokens;
-          break;
-        }
-        case 'content_block_start': {
-          const index = event.index ?? 0;
-          const type = String(event.content_block.type || 'text');
-          const initialInput =
-            type === 'tool_use' && 'input' in event.content_block
-              ? JSON.stringify(event.content_block.input)
-              : '';
-          blocks.set(index, {
-            type,
-            id:
-              'id' in event.content_block ? event.content_block.id : undefined,
-            name:
-              'name' in event.content_block
-                ? event.content_block.name
-                : undefined,
-            inputJson: initialInput !== '{}' ? initialInput : '',
-            signature:
-              type === 'thinking' &&
-              'signature' in event.content_block &&
-              typeof event.content_block.signature === 'string'
-                ? event.content_block.signature
-                : '',
-          });
-          break;
-        }
-        case 'content_block_delta': {
-          const index = event.index ?? 0;
-          const deltaType = (event.delta as { type?: string }).type || '';
-          const blockState = blocks.get(index);
-
-          if (deltaType === 'text_delta') {
-            const text = 'text' in event.delta ? event.delta.text : '';
-            if (text) {
-              const chunk = this.buildGeminiChunk({ text }, messageId, model);
-              collectedResponses.push(chunk);
-              yield chunk;
-            }
-          } else if (deltaType === 'thinking_delta') {
-            const thinking =
-              (event.delta as { thinking?: string }).thinking || '';
-            if (thinking) {
-              const chunk = this.buildGeminiChunk(
-                { text: thinking, thought: true },
-                messageId,
-                model,
-              );
-              collectedResponses.push(chunk);
-              yield chunk;
-            }
-          } else if (deltaType === 'signature_delta' && blockState) {
-            const signature =
-              (event.delta as { signature?: string }).signature || '';
-            if (signature) {
-              blockState.signature += signature;
-              const chunk = this.buildGeminiChunk(
-                { thought: true, thoughtSignature: signature },
-                messageId,
-                model,
-              );
-              collectedResponses.push(chunk);
-              yield chunk;
-            }
-          } else if (deltaType === 'input_json_delta' && blockState) {
-            const jsonDelta =
-              (event.delta as { partial_json?: string }).partial_json || '';
-            if (jsonDelta) {
-              blockState.inputJson += jsonDelta;
-            }
-          }
-          break;
-        }
-        case 'content_block_stop': {
-          const index = event.index ?? 0;
-          const blockState = blocks.get(index);
-          if (blockState?.type === 'tool_use') {
-            const args = safeJsonParse(blockState.inputJson || '{}', {});
-            const chunk = this.buildGeminiChunk(
-              {
-                functionCall: {
-                  id: blockState.id,
-                  name: blockState.name,
-                  args,
-                },
-              },
-              messageId,
-              model,
-            );
-            collectedResponses.push(chunk);
-            yield chunk;
-          }
-          blocks.delete(index);
-          break;
-        }
-        case 'message_delta': {
-          const stopReasonValue = event.delta.stop_reason;
-          if (stopReasonValue) {
-            finishReason = stopReasonValue;
-          }
-
-          // Some Anthropic-compatible providers may include additional usage fields
-          // (e.g. `input_tokens`, `cache_read_input_tokens`) even though the official
-          // Anthropic SDK types only expose `output_tokens` here.
-          const usageUnknown = event.usage as unknown;
-          const usageRecord =
-            usageUnknown && typeof usageUnknown === 'object'
-              ? (usageUnknown as Record<string, unknown>)
-              : undefined;
-
-          if (event.usage?.output_tokens !== undefined) {
-            completionTokens = event.usage.output_tokens;
-          }
-          if (usageRecord?.['input_tokens'] !== undefined) {
-            const inputTokens = usageRecord['input_tokens'];
-            if (typeof inputTokens === 'number') {
-              promptTokens = inputTokens;
-            }
-          }
-          if (usageRecord?.['cache_read_input_tokens'] !== undefined) {
-            const cacheRead = usageRecord['cache_read_input_tokens'];
-            if (typeof cacheRead === 'number') {
-              cachedTokens = cacheRead;
-            }
-          }
-
-          if (finishReason || event.usage) {
-            const chunk = this.buildGeminiChunk(
-              undefined,
-              messageId,
-              model,
-              finishReason,
-              {
-                cachedContentTokenCount: cachedTokens,
-                promptTokenCount: cachedTokens + promptTokens,
-                candidatesTokenCount: completionTokens,
-                totalTokenCount: cachedTokens + promptTokens + completionTokens,
-              },
-            );
-            collectedResponses.push(chunk);
-            yield chunk;
-          }
-          break;
-        }
-        case 'message_stop': {
-          if (promptTokens || completionTokens) {
-            const chunk = this.buildGeminiChunk(
-              undefined,
-              messageId,
-              model,
-              finishReason,
-              {
-                cachedContentTokenCount: cachedTokens,
-                promptTokenCount: cachedTokens + promptTokens,
-                candidatesTokenCount: completionTokens,
-                totalTokenCount: cachedTokens + promptTokens + completionTokens,
-              },
-            );
-            collectedResponses.push(chunk);
-            yield chunk;
-          }
-          break;
-        }
-        default:
-          break;
-      }
-    }
-  }
-
-  private buildGeminiChunk(
-    part?: {
-      text?: string;
-      thought?: boolean;
-      thoughtSignature?: string;
-      functionCall?: unknown;
-    },
-    responseId?: string,
-    model?: string,
-    finishReason?: string,
-    usageMetadata?: GenerateContentResponseUsageMetadata,
-  ): GenerateContentResponse {
-    const response = new GenerateContentResponse();
-    response.responseId = responseId;
-    response.createTime = Date.now().toString();
-    response.modelVersion = model || this.contentGeneratorConfig.model;
-    response.promptFeedback = { safetyRatings: [] };
-
-    const candidateParts = part ? [part as unknown as Part] : [];
-    const mappedFinishReason =
-      finishReason !== undefined
-        ? this.converter.mapAnthropicFinishReasonToGemini(finishReason)
-        : undefined;
-    response.candidates = [
-      {
-        content: {
-          parts: candidateParts,
-          role: 'model' as const,
-        },
-        index: 0,
-        safetyRatings: [],
-        ...(mappedFinishReason ? { finishReason: mappedFinishReason } : {}),
-      },
-    ];
-
-    if (usageMetadata) {
-      response.usageMetadata = usageMetadata;
-    }
-
-    return response;
-  }
-}
--- a/packages/core/src/core/anthropicContentGenerator/converter.test.ts
+++ b/packages/core/src/core/anthropicContentGenerator/converter.test.ts
@@ -1,377 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-import type { CallableTool, Content, Tool } from '@google/genai';
-import { FinishReason } from '@google/genai';
-import type Anthropic from '@anthropic-ai/sdk';
-
-// Mock schema conversion so we can force edge-cases (e.g. missing `type`).
-vi.mock('../../utils/schemaConverter.js', () => ({
-  convertSchema: vi.fn((schema: unknown) => schema),
-}));
-
-import { convertSchema } from '../../utils/schemaConverter.js';
-import { AnthropicContentConverter } from './converter.js';
-
-describe('AnthropicContentConverter', () => {
-  let converter: AnthropicContentConverter;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    converter = new AnthropicContentConverter('test-model', 'auto');
-  });
-
-  describe('convertGeminiRequestToAnthropic', () => {
-    it('extracts systemInstruction text from string', () => {
-      const { system } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: 'hi',
-        config: { systemInstruction: 'sys' },
-      });
-
-      expect(system).toBe('sys');
-    });
-
-    it('extracts systemInstruction text from parts and joins with newlines', () => {
-      const { system } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: 'hi',
-        config: {
-          systemInstruction: {
-            role: 'system',
-            parts: [{ text: 'a' }, { text: 'b' }],
-          } as unknown as Content,
-        },
-      });
-
-      expect(system).toBe('a\nb');
-    });
-
-    it('converts a plain string content into a user message', () => {
-      const { messages } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: 'Hello',
-      });
-
-      expect(messages).toEqual([
-        { role: 'user', content: [{ type: 'text', text: 'Hello' }] },
-      ]);
-    });
-
-    it('converts user content parts into a user message with text blocks', () => {
-      const { messages } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: [
-          {
-            role: 'user',
-            parts: [{ text: 'Hello' }, { text: 'World' }],
-          },
-        ],
-      });
-
-      expect(messages).toEqual([
-        {
-          role: 'user',
-          content: [
-            { type: 'text', text: 'Hello' },
-            { type: 'text', text: 'World' },
-          ],
-        },
-      ]);
-    });
-
-    it('converts assistant thought parts into Anthropic thinking blocks', () => {
-      const { messages } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: [
-          {
-            role: 'model',
-            parts: [
-              { text: 'internal', thought: true, thoughtSignature: 'sig' },
-              { text: 'visible' },
-            ],
-          },
-        ],
-      });
-
-      expect(messages).toEqual([
-        {
-          role: 'assistant',
-          content: [
-            { type: 'thinking', thinking: 'internal', signature: 'sig' },
-            { type: 'text', text: 'visible' },
-          ],
-        },
-      ]);
-    });
-
-    it('converts functionCall parts from model role into tool_use blocks', () => {
-      const { messages } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: [
-          {
-            role: 'model',
-            parts: [
-              { text: 'preface' },
-              {
-                functionCall: {
-                  id: 'call-1',
-                  name: 'tool_name',
-                  args: { a: 1 },
-                },
-              },
-            ],
-          },
-        ],
-      });
-
-      expect(messages).toEqual([
-        {
-          role: 'assistant',
-          content: [
-            { type: 'text', text: 'preface' },
-            {
-              type: 'tool_use',
-              id: 'call-1',
-              name: 'tool_name',
-              input: { a: 1 },
-            },
-          ],
-        },
-      ]);
-    });
-
-    it('converts functionResponse parts into user tool_result messages', () => {
-      const { messages } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: [
-          {
-            role: 'user',
-            parts: [
-              {
-                functionResponse: {
-                  id: 'call-1',
-                  name: 'tool_name',
-                  response: { output: 'ok' },
-                },
-              },
-            ],
-          },
-        ],
-      });
-
-      expect(messages).toEqual([
-        {
-          role: 'user',
-          content: [
-            {
-              type: 'tool_result',
-              tool_use_id: 'call-1',
-              content: 'ok',
-            },
-          ],
-        },
-      ]);
-    });
-
-    it('extracts function response error field when present', () => {
-      const { messages } = converter.convertGeminiRequestToAnthropic({
-        model: 'models/test',
-        contents: [
-          {
-            role: 'user',
-            parts: [
-              {
-                functionResponse: {
-                  id: 'call-1',
-                  name: 'tool_name',
-                  response: { error: 'boom' },
-                },
-              },
-            ],
-          },
-        ],
-      });
-
-      expect(messages[0]).toEqual({
-        role: 'user',
-        content: [
-          {
-            type: 'tool_result',
-            tool_use_id: 'call-1',
-            content: 'boom',
-          },
-        ],
-      });
-    });
-  });
-
-  describe('convertGeminiToolsToAnthropic', () => {
-    it('converts Tool.functionDeclarations to Anthropic tools and runs schema conversion', async () => {
-      const tools = [
-        {
-          functionDeclarations: [
-            {
-              name: 'get_weather',
-              description: 'Get weather',
-              parametersJsonSchema: {
-                type: 'object',
-                properties: { location: { type: 'string' } },
-                required: ['location'],
-              },
-            },
-          ],
-        },
-      ] as Tool[];
-
-      const result = await converter.convertGeminiToolsToAnthropic(tools);
-
-      expect(result).toHaveLength(1);
-      expect(result[0]).toEqual({
-        name: 'get_weather',
-        description: 'Get weather',
-        input_schema: {
-          type: 'object',
-          properties: { location: { type: 'string' } },
-          required: ['location'],
-        },
-      });
-
-      expect(vi.mocked(convertSchema)).toHaveBeenCalledTimes(1);
-    });
-
-    it('resolves CallableTool.tool() and converts its functionDeclarations', async () => {
-      const callable = [
-        {
-          tool: async () =>
-            ({
-              functionDeclarations: [
-                {
-                  name: 'dynamic_tool',
-                  description: 'resolved tool',
-                  parametersJsonSchema: { type: 'object', properties: {} },
-                },
-              ],
-            }) as unknown as Tool,
-        },
-      ] as CallableTool[];
-
-      const result = await converter.convertGeminiToolsToAnthropic(callable);
-
-      expect(result).toHaveLength(1);
-      expect(result[0].name).toBe('dynamic_tool');
-    });
-
-    it('defaults missing parameters to an empty object schema', async () => {
-      const tools = [
-        {
-          functionDeclarations: [
-            { name: 'no_params', description: 'no params' },
-          ],
-        },
-      ] as Tool[];
-
-      const result = await converter.convertGeminiToolsToAnthropic(tools);
-
-      expect(result).toHaveLength(1);
-      expect(result[0]).toEqual({
-        name: 'no_params',
-        description: 'no params',
-        input_schema: { type: 'object', properties: {} },
-      });
-    });
-
-    it('forces input_schema.type to "object" when schema conversion yields no type', async () => {
-      vi.mocked(convertSchema).mockImplementationOnce(() => ({
-        properties: {},
-      }));
-      const tools = [
-        {
-          functionDeclarations: [
-            {
-              name: 'edge',
-              description: 'edge',
-              parametersJsonSchema: { type: 'object', properties: {} },
-            },
-          ],
-        },
-      ] as Tool[];
-
-      const result = await converter.convertGeminiToolsToAnthropic(tools);
-      expect(result[0]?.input_schema?.type).toBe('object');
-    });
-  });
-
-  describe('convertAnthropicResponseToGemini', () => {
-    it('converts text, tool_use, thinking, and redacted_thinking blocks', () => {
-      const response = converter.convertAnthropicResponseToGemini({
-        id: 'msg-1',
-        model: 'claude-test',
-        stop_reason: 'end_turn',
-        content: [
-          { type: 'thinking', thinking: 'thought', signature: 'sig' },
-          { type: 'text', text: 'hello' },
-          { type: 'tool_use', id: 't1', name: 'tool', input: { x: 1 } },
-          { type: 'redacted_thinking' },
-        ],
-        usage: { input_tokens: 3, output_tokens: 5 },
-      } as unknown as Anthropic.Message);
-
-      expect(response.responseId).toBe('msg-1');
-      expect(response.modelVersion).toBe('claude-test');
-      expect(response.candidates?.[0]?.finishReason).toBe(FinishReason.STOP);
-      expect(response.usageMetadata).toEqual({
-        promptTokenCount: 3,
-        candidatesTokenCount: 5,
-        totalTokenCount: 8,
-      });
-
-      const parts = response.candidates?.[0]?.content?.parts || [];
-      expect(parts).toEqual([
-        { text: 'thought', thought: true, thoughtSignature: 'sig' },
-        { text: 'hello' },
-        { functionCall: { id: 't1', name: 'tool', args: { x: 1 } } },
-        { text: '', thought: true },
-      ]);
-    });
-
-    it('handles tool_use input that is a JSON string', () => {
-      const response = converter.convertAnthropicResponseToGemini({
-        id: 'msg-1',
-        model: 'claude-test',
-        stop_reason: null,
-        content: [
-          { type: 'tool_use', id: 't1', name: 'tool', input: '{"x":1}' },
-        ],
-      } as unknown as Anthropic.Message);
-
-      const parts = response.candidates?.[0]?.content?.parts || [];
-      expect(parts).toEqual([
-        { functionCall: { id: 't1', name: 'tool', args: { x: 1 } } },
-      ]);
-    });
-  });
-
-  describe('mapAnthropicFinishReasonToGemini', () => {
-    it('maps known reasons', () => {
-      expect(converter.mapAnthropicFinishReasonToGemini('end_turn')).toBe(
-        FinishReason.STOP,
-      );
-      expect(converter.mapAnthropicFinishReasonToGemini('max_tokens')).toBe(
-        FinishReason.MAX_TOKENS,
-      );
-      expect(converter.mapAnthropicFinishReasonToGemini('content_filter')).toBe(
-        FinishReason.SAFETY,
-      );
-    });
-
-    it('returns undefined for null/empty', () => {
-      expect(converter.mapAnthropicFinishReasonToGemini(null)).toBeUndefined();
-      expect(converter.mapAnthropicFinishReasonToGemini('')).toBeUndefined();
-    });
-  });
-});
--- a/packages/core/src/core/anthropicContentGenerator/converter.ts
+++ b/packages/core/src/core/anthropicContentGenerator/converter.ts
@@ -1,448 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type {
-  Candidate,
-  CallableTool,
-  Content,
-  ContentListUnion,
-  ContentUnion,
-  FunctionCall,
-  FunctionResponse,
-  GenerateContentParameters,
-  Part,
-  PartUnion,
-  Tool,
-  ToolListUnion,
-} from '@google/genai';
-import { FinishReason, GenerateContentResponse } from '@google/genai';
-import type Anthropic from '@anthropic-ai/sdk';
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
-import {
-  convertSchema,
-  type SchemaComplianceMode,
-} from '../../utils/schemaConverter.js';
-
-type AnthropicMessageParam = Anthropic.MessageParam;
-type AnthropicToolParam = Anthropic.Tool;
-type AnthropicContentBlockParam = Anthropic.ContentBlockParam;
-
-type ThoughtPart = { text: string; signature?: string };
-
-interface ParsedParts {
-  thoughtParts: ThoughtPart[];
-  contentParts: string[];
-  functionCalls: FunctionCall[];
-  functionResponses: FunctionResponse[];
-}
-
-export class AnthropicContentConverter {
-  private model: string;
-  private schemaCompliance: SchemaComplianceMode;
-
-  constructor(model: string, schemaCompliance: SchemaComplianceMode = 'auto') {
-    this.model = model;
-    this.schemaCompliance = schemaCompliance;
-  }
-
-  convertGeminiRequestToAnthropic(request: GenerateContentParameters): {
-    system?: string;
-    messages: AnthropicMessageParam[];
-  } {
-    const messages: AnthropicMessageParam[] = [];
-
-    const system = this.extractTextFromContentUnion(
-      request.config?.systemInstruction,
-    );
-
-    this.processContents(request.contents, messages);
-
-    return {
-      system: system || undefined,
-      messages,
-    };
-  }
-
-  async convertGeminiToolsToAnthropic(
-    geminiTools: ToolListUnion,
-  ): Promise<AnthropicToolParam[]> {
-    const tools: AnthropicToolParam[] = [];
-
-    for (const tool of geminiTools) {
-      let actualTool: Tool;
-
-      if ('tool' in tool) {
-        actualTool = await (tool as CallableTool).tool();
-      } else {
-        actualTool = tool as Tool;
-      }
-
-      if (!actualTool.functionDeclarations) {
-        continue;
-      }
-
-      for (const func of actualTool.functionDeclarations) {
-        if (!func.name) continue;
-
-        let inputSchema: Record<string, unknown> | undefined;
-        if (func.parametersJsonSchema) {
-          inputSchema = {
-            ...(func.parametersJsonSchema as Record<string, unknown>),
-          };
-        } else if (func.parameters) {
-          inputSchema = func.parameters as Record<string, unknown>;
-        }
-
-        if (!inputSchema) {
-          inputSchema = { type: 'object', properties: {} };
-        }
-
-        inputSchema = convertSchema(inputSchema, this.schemaCompliance);
-        if (typeof inputSchema['type'] !== 'string') {
-          inputSchema['type'] = 'object';
-        }
-
-        tools.push({
-          name: func.name,
-          description: func.description,
-          input_schema: inputSchema as Anthropic.Tool.InputSchema,
-        });
-      }
-    }
-
-    return tools;
-  }
-
-  convertAnthropicResponseToGemini(
-    response: Anthropic.Message,
-  ): GenerateContentResponse {
-    const geminiResponse = new GenerateContentResponse();
-    const parts: Part[] = [];
-
-    for (const block of response.content || []) {
-      const blockType = String((block as { type?: string })['type'] || '');
-      if (blockType === 'text') {
-        const text =
-          typeof (block as { text?: string }).text === 'string'
-            ? (block as { text?: string }).text
-            : '';
-        if (text) {
-          parts.push({ text });
-        }
-      } else if (blockType === 'tool_use') {
-        const toolUse = block as {
-          id?: string;
-          name?: string;
-          input?: unknown;
-        };
-        parts.push({
-          functionCall: {
-            id: typeof toolUse.id === 'string' ? toolUse.id : undefined,
-            name: typeof toolUse.name === 'string' ? toolUse.name : undefined,
-            args: this.safeInputToArgs(toolUse.input),
-          },
-        });
-      } else if (blockType === 'thinking') {
-        const thinking =
-          typeof (block as { thinking?: string }).thinking === 'string'
-            ? (block as { thinking?: string }).thinking
-            : '';
-        const signature =
-          typeof (block as { signature?: string }).signature === 'string'
-            ? (block as { signature?: string }).signature
-            : '';
-        if (thinking || signature) {
-          const thoughtPart: Part = {
-            text: thinking,
-            thought: true,
-            thoughtSignature: signature,
-          };
-          parts.push(thoughtPart);
-        }
-      } else if (blockType === 'redacted_thinking') {
-        parts.push({ text: '', thought: true });
-      }
-    }
-
-    const candidate: Candidate = {
-      content: {
-        parts,
-        role: 'model' as const,
-      },
-      index: 0,
-      safetyRatings: [],
-    };
-
-    const finishReason = this.mapAnthropicFinishReasonToGemini(
-      response.stop_reason,
-    );
-    if (finishReason) {
-      candidate.finishReason = finishReason;
-    }
-
-    geminiResponse.candidates = [candidate];
-    geminiResponse.responseId = response.id;
-    geminiResponse.createTime = Date.now().toString();
-    geminiResponse.modelVersion = response.model || this.model;
-    geminiResponse.promptFeedback = { safetyRatings: [] };
-
-    if (response.usage) {
-      const promptTokens = response.usage.input_tokens || 0;
-      const completionTokens = response.usage.output_tokens || 0;
-      geminiResponse.usageMetadata = {
-        promptTokenCount: promptTokens,
-        candidatesTokenCount: completionTokens,
-        totalTokenCount: promptTokens + completionTokens,
-      };
-    }
-
-    return geminiResponse;
-  }
-
-  private processContents(
-    contents: ContentListUnion,
-    messages: AnthropicMessageParam[],
-  ): void {
-    if (Array.isArray(contents)) {
-      for (const content of contents) {
-        this.processContent(content, messages);
-      }
-    } else if (contents) {
-      this.processContent(contents, messages);
-    }
-  }
-
-  private processContent(
-    content: ContentUnion | PartUnion,
-    messages: AnthropicMessageParam[],
-  ): void {
-    if (typeof content === 'string') {
-      messages.push({
-        role: 'user',
-        content: [{ type: 'text', text: content }],
-      });
-      return;
-    }
-
-    if (!this.isContentObject(content)) return;
-
-    const parsed = this.parseParts(content.parts || []);
-
-    if (parsed.functionResponses.length > 0) {
-      for (const response of parsed.functionResponses) {
-        messages.push({
-          role: 'user',
-          content: [
-            {
-              type: 'tool_result',
-              tool_use_id: response.id || '',
-              content: this.extractFunctionResponseContent(response.response),
-            },
-          ],
-        });
-      }
-      return;
-    }
-
-    if (content.role === 'model' && parsed.functionCalls.length > 0) {
-      const thinkingBlocks: AnthropicContentBlockParam[] =
-        parsed.thoughtParts.map((part) => {
-          const thinkingBlock: unknown = {
-            type: 'thinking',
-            thinking: part.text,
-          };
-          if (part.signature) {
-            (thinkingBlock as { signature?: string }).signature =
-              part.signature;
-          }
-          return thinkingBlock as AnthropicContentBlockParam;
-        });
-      const toolUses: AnthropicContentBlockParam[] = parsed.functionCalls.map(
-        (call, index) => ({
-          type: 'tool_use',
-          id: call.id || `tool_${index}`,
-          name: call.name || '',
-          input: (call.args as Record<string, unknown>) || {},
-        }),
-      );
-
-      const textBlocks: AnthropicContentBlockParam[] = parsed.contentParts.map(
-        (text) => ({
-          type: 'text' as const,
-          text,
-        }),
-      );
-
-      messages.push({
-        role: 'assistant',
-        content: [...thinkingBlocks, ...textBlocks, ...toolUses],
-      });
-      return;
-    }
-
-    const role = content.role === 'model' ? 'assistant' : 'user';
-    const thinkingBlocks: AnthropicContentBlockParam[] =
-      role === 'assistant'
-        ? parsed.thoughtParts.map((part) => {
-            const thinkingBlock: unknown = {
-              type: 'thinking',
-              thinking: part.text,
-            };
-            if (part.signature) {
-              (thinkingBlock as { signature?: string }).signature =
-                part.signature;
-            }
-            return thinkingBlock as AnthropicContentBlockParam;
-          })
-        : [];
-    const textBlocks: AnthropicContentBlockParam[] = [
-      ...thinkingBlocks,
-      ...parsed.contentParts.map((text) => ({
-        type: 'text' as const,
-        text,
-      })),
-    ];
-    if (textBlocks.length > 0) {
-      messages.push({ role, content: textBlocks });
-    }
-  }
-
-  private parseParts(parts: Part[]): ParsedParts {
-    const thoughtParts: ThoughtPart[] = [];
-    const contentParts: string[] = [];
-    const functionCalls: FunctionCall[] = [];
-    const functionResponses: FunctionResponse[] = [];
-
-    for (const part of parts) {
-      if (typeof part === 'string') {
-        contentParts.push(part);
-      } else if (
-        'text' in part &&
-        part.text &&
-        !('thought' in part && part.thought)
-      ) {
-        contentParts.push(part.text);
-      } else if ('text' in part && 'thought' in part && part.thought) {
-        thoughtParts.push({
-          text: part.text || '',
-          signature:
-            'thoughtSignature' in part &&
-            typeof part.thoughtSignature === 'string'
-              ? part.thoughtSignature
-              : undefined,
-        });
-      } else if ('functionCall' in part && part.functionCall) {
-        functionCalls.push(part.functionCall);
-      } else if ('functionResponse' in part && part.functionResponse) {
-        functionResponses.push(part.functionResponse);
-      }
-    }
-
-    return {
-      thoughtParts,
-      contentParts,
-      functionCalls,
-      functionResponses,
-    };
-  }
-
-  private extractTextFromContentUnion(contentUnion: unknown): string {
-    if (typeof contentUnion === 'string') {
-      return contentUnion;
-    }
-
-    if (Array.isArray(contentUnion)) {
-      return contentUnion
-        .map((item) => this.extractTextFromContentUnion(item))
-        .filter(Boolean)
-        .join('\n');
-    }
-
-    if (typeof contentUnion === 'object' && contentUnion !== null) {
-      if ('parts' in contentUnion) {
-        const content = contentUnion as Content;
-        return (
-          content.parts
-            ?.map((part: Part) => {
-              if (typeof part === 'string') return part;
-              if ('text' in part) return part.text || '';
-              return '';
-            })
-            .filter(Boolean)
-            .join('\n') || ''
-        );
-      }
-    }
-
-    return '';
-  }
-
-  private extractFunctionResponseContent(response: unknown): string {
-    if (response === null || response === undefined) {
-      return '';
-    }
-
-    if (typeof response === 'string') {
-      return response;
-    }
-
-    if (typeof response === 'object') {
-      const responseObject = response as Record<string, unknown>;
-      const output = responseObject['output'];
-      if (typeof output === 'string') {
-        return output;
-      }
-
-      const error = responseObject['error'];
-      if (typeof error === 'string') {
-        return error;
-      }
-    }
-
-    try {
-      const serialized = JSON.stringify(response);
-      return serialized ?? String(response);
-    } catch {
-      return String(response);
-    }
-  }
-
-  private safeInputToArgs(input: unknown): Record<string, unknown> {
-    if (input && typeof input === 'object') {
-      return input as Record<string, unknown>;
-    }
-    if (typeof input === 'string') {
-      return safeJsonParse(input, {});
-    }
-    return {};
-  }
-
-  mapAnthropicFinishReasonToGemini(
-    reason?: string | null,
-  ): FinishReason | undefined {
-    if (!reason) return undefined;
-    const mapping: Record<string, FinishReason> = {
-      end_turn: FinishReason.STOP,
-      stop_sequence: FinishReason.STOP,
-      tool_use: FinishReason.STOP,
-      max_tokens: FinishReason.MAX_TOKENS,
-      content_filter: FinishReason.SAFETY,
-    };
-    return mapping[reason] || FinishReason.FINISH_REASON_UNSPECIFIED;
-  }
-
-  private isContentObject(
-    content: unknown,
-  ): content is { role: string; parts: Part[] } {
-    return (
-      typeof content === 'object' &&
-      content !== null &&
-      'role' in content &&
-      'parts' in content &&
-      Array.isArray((content as Record<string, unknown>)['parts'])
-    );
-  }
-}
--- a/packages/core/src/core/anthropicContentGenerator/index.ts
+++ b/packages/core/src/core/anthropicContentGenerator/index.ts
@@ -1,21 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../contentGenerator.js';
-import type { Config } from '../../config/config.js';
-import { AnthropicContentGenerator } from './anthropicContentGenerator.js';
-
-export { AnthropicContentGenerator } from './anthropicContentGenerator.js';
-
-export function createAnthropicContentGenerator(
-  contentGeneratorConfig: ContentGeneratorConfig,
-  cliConfig: Config,
-): ContentGenerator {
-  return new AnthropicContentGenerator(contentGeneratorConfig, cliConfig);
-}
--- a/packages/core/src/core/contentGenerator.test.ts
+++ b/packages/core/src/core/contentGenerator.test.ts
@@ -8,7 +8,7 @@ import { describe, it, expect, vi } from 'vitest';
 import { createContentGenerator, AuthType } from './contentGenerator.js';
 import { GoogleGenAI } from '@google/genai';
 import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from './loggingContentGenerator/index.js';
+import { LoggingContentGenerator } from './geminiContentGenerator/loggingContentGenerator.js';

 vi.mock('@google/genai');

--- a/packages/core/src/core/contentGenerator.ts
+++ b/packages/core/src/core/contentGenerator.ts
@@ -14,7 +14,6 @@ import type {
 } from '@google/genai';
 import { DEFAULT_QWEN_MODEL } from '../config/models.js';
 import type { Config } from '../config/config.js';
-import { LoggingContentGenerator } from './loggingContentGenerator/index.js';

 /**
 * Interface abstracting the core functionalities for generating content and counting tokens.
@@ -38,11 +37,10 @@ export interface ContentGenerator {
 }

 export enum AuthType {
+  USE_GEMINI = 'gemini-api-key',
+  USE_VERTEX_AI = 'vertex-ai',
  USE_OPENAI = 'openai',
  QWEN_OAUTH = 'qwen-oauth',
-  USE_GEMINI = 'gemini',
-  USE_VERTEX_AI = 'vertex-ai',
-  USE_ANTHROPIC = 'anthropic',
 }

 export type ContentGeneratorConfig = {
@@ -65,12 +63,9 @@ export type ContentGeneratorConfig = {
    temperature?: number;
    max_tokens?: number;
  };
-  reasoning?:
-    | false
-    | {
-        effort?: 'low' | 'medium' | 'high';
-        budget_tokens?: number;
-      };
+  reasoning?: {
+    effort?: 'low' | 'medium' | 'high';
+  };
  proxy?: string | undefined;
  userAgent?: string;
  // Schema compliance mode for tool definitions
@@ -82,7 +77,7 @@ export function createContentGeneratorConfig(
  authType: AuthType | undefined,
  generationConfig?: Partial<ContentGeneratorConfig>,
 ): ContentGeneratorConfig {
-  let newContentGeneratorConfig: Partial<ContentGeneratorConfig> = {
+  const newContentGeneratorConfig: Partial<ContentGeneratorConfig> = {
    ...(generationConfig || {}),
    authType,
    proxy: config?.getProxy(),
@@ -99,16 +94,8 @@ export function createContentGeneratorConfig(
  }

  if (authType === AuthType.USE_OPENAI) {
-    newContentGeneratorConfig = {
-      ...newContentGeneratorConfig,
-      apiKey: newContentGeneratorConfig.apiKey || process.env['OPENAI_API_KEY'],
-      baseUrl:
-        newContentGeneratorConfig.baseUrl || process.env['OPENAI_BASE_URL'],
-      model: newContentGeneratorConfig.model || process.env['OPENAI_MODEL'],
-    };
-
    if (!newContentGeneratorConfig.apiKey) {
-      throw new Error('OPENAI_API_KEY environment variable not found.');
+      throw new Error('OpenAI API key is required');
    }

    return {
@@ -117,62 +104,10 @@ export function createContentGeneratorConfig(
    } as ContentGeneratorConfig;
  }

-  if (authType === AuthType.USE_ANTHROPIC) {
-    newContentGeneratorConfig = {
-      ...newContentGeneratorConfig,
-      apiKey:
-        newContentGeneratorConfig.apiKey || process.env['ANTHROPIC_API_KEY'],
-      baseUrl:
-        newContentGeneratorConfig.baseUrl || process.env['ANTHROPIC_BASE_URL'],
-      model: newContentGeneratorConfig.model || process.env['ANTHROPIC_MODEL'],
-    };
-
-    if (!newContentGeneratorConfig.apiKey) {
-      throw new Error('ANTHROPIC_API_KEY environment variable not found.');
-    }
-
-    if (!newContentGeneratorConfig.baseUrl) {
-      throw new Error('ANTHROPIC_BASE_URL environment variable not found.');
-    }
-
-    if (!newContentGeneratorConfig.model) {
-      throw new Error('ANTHROPIC_MODEL environment variable not found.');
-    }
-  }
-
-  if (authType === AuthType.USE_GEMINI) {
-    newContentGeneratorConfig = {
-      ...newContentGeneratorConfig,
-      apiKey: newContentGeneratorConfig.apiKey || process.env['GEMINI_API_KEY'],
-      model: newContentGeneratorConfig.model || process.env['GEMINI_MODEL'],
-    };
-
-    if (!newContentGeneratorConfig.apiKey) {
-      throw new Error('GEMINI_API_KEY environment variable not found.');
-    }
-
-    if (!newContentGeneratorConfig.model) {
-      throw new Error('GEMINI_MODEL environment variable not found.');
-    }
-  }
-
-  if (authType === AuthType.USE_VERTEX_AI) {
-    newContentGeneratorConfig = {
-      ...newContentGeneratorConfig,
-      apiKey: newContentGeneratorConfig.apiKey || process.env['GOOGLE_API_KEY'],
-      model: newContentGeneratorConfig.model || process.env['GOOGLE_MODEL'],
-    };
-
-    if (!newContentGeneratorConfig.apiKey) {
-      throw new Error('GOOGLE_API_KEY environment variable not found.');
-    }
-
-    if (!newContentGeneratorConfig.model) {
-      throw new Error('GOOGLE_MODEL environment variable not found.');
-    }
-  }
-
-  return newContentGeneratorConfig as ContentGeneratorConfig;
+  return {
+    ...newContentGeneratorConfig,
+    model: newContentGeneratorConfig?.model || DEFAULT_QWEN_MODEL,
+  } as ContentGeneratorConfig;
 }

 export async function createContentGenerator(
@@ -180,9 +115,19 @@ export async function createContentGenerator(
  gcConfig: Config,
  isInitialAuth?: boolean,
 ): Promise<ContentGenerator> {
+  if (
+    config.authType === AuthType.USE_GEMINI ||
+    config.authType === AuthType.USE_VERTEX_AI
+  ) {
+    const { createGeminiContentGenerator } = await import(
+      './geminiContentGenerator/index.js'
+    );
+    return createGeminiContentGenerator(config, gcConfig);
+  }
+
  if (config.authType === AuthType.USE_OPENAI) {
    if (!config.apiKey) {
-      throw new Error('OPENAI_API_KEY environment variable not found.');
+      throw new Error('OpenAI API key is required');
    }

    // Import OpenAIContentGenerator dynamically to avoid circular dependencies
@@ -191,8 +136,7 @@ export async function createContentGenerator(
    );

    // Always use OpenAIContentGenerator, logging is controlled by enableOpenAILogging flag
-    const generator = createOpenAIContentGenerator(config, gcConfig);
-    return new LoggingContentGenerator(generator, gcConfig);
+    return createOpenAIContentGenerator(config, gcConfig);
  }

  if (config.authType === AuthType.QWEN_OAUTH) {
@@ -213,8 +157,7 @@ export async function createContentGenerator(
      );

      // Create the content generator with dynamic token management
-      const generator = new QwenContentGenerator(qwenClient, config, gcConfig);
-      return new LoggingContentGenerator(generator, gcConfig);
+      return new QwenContentGenerator(qwenClient, config, gcConfig);
    } catch (error) {
      throw new Error(
        `${error instanceof Error ? error.message : String(error)}`,
@@ -222,30 +165,6 @@ export async function createContentGenerator(
    }
  }

-  if (config.authType === AuthType.USE_ANTHROPIC) {
-    if (!config.apiKey) {
-      throw new Error('ANTHROPIC_API_KEY environment variable not found.');
-    }
-
-    const { createAnthropicContentGenerator } = await import(
-      './anthropicContentGenerator/index.js'
-    );
-
-    const generator = createAnthropicContentGenerator(config, gcConfig);
-    return new LoggingContentGenerator(generator, gcConfig);
-  }
-
-  if (
-    config.authType === AuthType.USE_GEMINI ||
-    config.authType === AuthType.USE_VERTEX_AI
-  ) {
-    const { createGeminiContentGenerator } = await import(
-      './geminiContentGenerator/index.js'
-    );
-    const generator = createGeminiContentGenerator(config, gcConfig);
-    return new LoggingContentGenerator(generator, gcConfig);
-  }
-
  throw new Error(
    `Error creating contentGenerator: Unsupported authType: ${config.authType}`,
  );
--- a/packages/core/src/core/geminiChat.test.ts
+++ b/packages/core/src/core/geminiChat.test.ts
@@ -720,6 +720,66 @@ describe('GeminiChat', () => {
      );
    });

+    it('should handle summarized thinking by conditionally including thoughts in history', async () => {
+      // Case 1: useSummarizedThinking is true -> thoughts NOT in history
+      vi.mocked(mockContentGenerator.useSummarizedThinking).mockReturnValue(
+        true,
+      );
+      const stream1 = (async function* () {
+        yield {
+          candidates: [
+            {
+              content: {
+                role: 'model',
+                parts: [{ thought: true, text: 'T1' }, { text: 'A1' }],
+              },
+              finishReason: 'STOP',
+            },
+          ],
+        } as unknown as GenerateContentResponse;
+      })();
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
+        stream1,
+      );
+
+      const res1 = await chat.sendMessageStream('m1', { message: 'h1' }, 'p1');
+      for await (const _ of res1);
+
+      const history1 = chat.getHistory();
+      expect(history1[1].parts).toEqual([{ text: 'A1' }]);
+
+      // Case 2: useSummarizedThinking is false -> thoughts ARE in history
+      chat.clearHistory();
+      vi.mocked(mockContentGenerator.useSummarizedThinking).mockReturnValue(
+        false,
+      );
+      const stream2 = (async function* () {
+        yield {
+          candidates: [
+            {
+              content: {
+                role: 'model',
+                parts: [{ thought: true, text: 'T2' }, { text: 'A2' }],
+              },
+              finishReason: 'STOP',
+            },
+          ],
+        } as unknown as GenerateContentResponse;
+      })();
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
+        stream2,
+      );
+
+      const res2 = await chat.sendMessageStream('m1', { message: 'h1' }, 'p2');
+      for await (const _ of res2);
+
+      const history2 = chat.getHistory();
+      expect(history2[1].parts).toEqual([
+        { text: 'T2', thought: true },
+        { text: 'A2' },
+      ]);
+    });
+
    it('should keep parts with thoughtSignature when consolidating history', async () => {
      const stream = (async function* () {
        yield {
--- a/packages/core/src/core/geminiChat.ts
+++ b/packages/core/src/core/geminiChat.ts
@@ -559,25 +559,14 @@ export class GeminiChat {
      yield chunk; // Yield every chunk to the UI immediately.
    }

-    let thoughtContentPart: Part | undefined;
-    const thoughtText = allModelParts
-      .filter((part) => part.thought)
-      .map((part) => part.text)
-      .join('')
-      .trim();
-
-    if (thoughtText !== '') {
-      thoughtContentPart = {
-        text: thoughtText,
-        thought: true,
-      };
-
-      const thoughtSignature = allModelParts.filter(
-        (part) => part.thoughtSignature && part.thought,
-      )?.[0]?.thoughtSignature;
-      if (thoughtContentPart && thoughtSignature) {
-        thoughtContentPart.thoughtSignature = thoughtSignature;
-      }
+    let thoughtText = '';
+    // Only include thoughts if not using summarized thinking.
+    if (!this.config.getContentGenerator().useSummarizedThinking()) {
+      thoughtText = allModelParts
+        .filter((part) => part.thought)
+        .map((part) => part.text)
+        .join('')
+        .trim();
    }

    const contentParts = allModelParts.filter((part) => !part.thought);
@@ -603,11 +592,11 @@ export class GeminiChat {
      .trim();

    // Record assistant turn with raw Content and metadata
-    if (thoughtContentPart || contentText || hasToolCall || usageMetadata) {
+    if (thoughtText || contentText || hasToolCall || usageMetadata) {
      this.chatRecordingService?.recordAssistantTurn({
        model,
        message: [
-          ...(thoughtContentPart ? [thoughtContentPart] : []),
+          ...(thoughtText ? [{ text: thoughtText, thought: true }] : []),
          ...(contentText ? [{ text: contentText }] : []),
          ...(hasToolCall
            ? contentParts
@@ -643,7 +632,7 @@ export class GeminiChat {
    this.history.push({
      role: 'model',
      parts: [
-        ...(thoughtContentPart ? [thoughtContentPart] : []),
+        ...(thoughtText ? [{ text: thoughtText, thought: true }] : []),
        ...consolidatedHistoryParts,
      ],
    });
--- a/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.ts
+++ b/packages/core/src/core/geminiContentGenerator/geminiContentGenerator.ts
@@ -39,7 +39,7 @@ export class GeminiContentGenerator implements ContentGenerator {
    this.contentGeneratorConfig = contentGeneratorConfig;
  }

-  private buildGenerateContentConfig(
+  private buildSamplingParameters(
    request: GenerateContentParameters,
  ): GenerateContentConfig {
    const configSamplingParams = this.contentGeneratorConfig?.samplingParams;
@@ -84,7 +84,17 @@ export class GeminiContentGenerator implements ContentGenerator {
        'frequencyPenalty',
      ),
      thinkingConfig: getParameterValue(
-        this.buildThinkingConfig(),
+        this.contentGeneratorConfig?.reasoning
+          ? {
+              includeThoughts: true,
+              thinkingLevel: (this.contentGeneratorConfig.reasoning.effort ===
+              'low'
+                ? 'LOW'
+                : this.contentGeneratorConfig.reasoning.effort === 'high'
+                  ? 'HIGH'
+                  : 'THINKING_LEVEL_UNSPECIFIED') as ThinkingLevel,
+            }
+          : undefined,
        'thinkingConfig',
        {
          includeThoughts: true,
@@ -94,40 +104,13 @@ export class GeminiContentGenerator implements ContentGenerator {
    };
  }

-  private buildThinkingConfig():
-    | { includeThoughts: boolean; thinkingLevel?: ThinkingLevel }
-    | undefined {
-    const reasoning = this.contentGeneratorConfig?.reasoning;
-
-    if (reasoning === false) {
-      return { includeThoughts: false };
-    }
-
-    if (reasoning) {
-      const thinkingLevel = (
-        reasoning.effort === 'low'
-          ? 'LOW'
-          : reasoning.effort === 'high'
-            ? 'HIGH'
-            : 'THINKING_LEVEL_UNSPECIFIED'
-      ) as ThinkingLevel;
-
-      return {
-        includeThoughts: true,
-        thinkingLevel,
-      };
-    }
-
-    return undefined;
-  }
-
  async generateContent(
    request: GenerateContentParameters,
    _userPromptId: string,
  ): Promise<GenerateContentResponse> {
    const finalRequest = {
      ...request,
-      config: this.buildGenerateContentConfig(request),
+      config: this.buildSamplingParameters(request),
    };
    return this.googleGenAI.models.generateContent(finalRequest);
  }
@@ -138,7 +121,7 @@ export class GeminiContentGenerator implements ContentGenerator {
  ): Promise<AsyncGenerator<GenerateContentResponse>> {
    const finalRequest = {
      ...request,
-      config: this.buildGenerateContentConfig(request),
+      config: this.buildSamplingParameters(request),
    };
    return this.googleGenAI.models.generateContentStream(finalRequest);
  }
--- a/packages/core/src/core/geminiContentGenerator/index.test.ts
+++ b/packages/core/src/core/geminiContentGenerator/index.test.ts
@@ -7,6 +7,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { createGeminiContentGenerator } from './index.js';
 import { GeminiContentGenerator } from './geminiContentGenerator.js';
+import { LoggingContentGenerator } from './loggingContentGenerator.js';
 import type { Config } from '../../config/config.js';
 import { AuthType } from '../contentGenerator.js';

@@ -14,6 +15,10 @@ vi.mock('./geminiContentGenerator.js', () => ({
  GeminiContentGenerator: vi.fn().mockImplementation(() => ({})),
 }));

+vi.mock('./loggingContentGenerator.js', () => ({
+  LoggingContentGenerator: vi.fn().mockImplementation((wrapped) => wrapped),
+}));
+
 describe('createGeminiContentGenerator', () => {
  let mockConfig: Config;

@@ -26,7 +31,7 @@ describe('createGeminiContentGenerator', () => {
    } as unknown as Config;
  });

-  it('should create a GeminiContentGenerator', () => {
+  it('should create a GeminiContentGenerator wrapped in LoggingContentGenerator', () => {
    const config = {
      model: 'gemini-1.5-flash',
      apiKey: 'test-key',
@@ -36,6 +41,7 @@ describe('createGeminiContentGenerator', () => {
    const generator = createGeminiContentGenerator(config, mockConfig);

    expect(GeminiContentGenerator).toHaveBeenCalled();
+    expect(LoggingContentGenerator).toHaveBeenCalled();
    expect(generator).toBeDefined();
  });
 });
--- a/packages/core/src/core/geminiContentGenerator/index.ts
+++ b/packages/core/src/core/geminiContentGenerator/index.ts
@@ -11,8 +11,10 @@ import type {
 } from '../contentGenerator.js';
 import type { Config } from '../../config/config.js';
 import { InstallationManager } from '../../utils/installationManager.js';
+import { LoggingContentGenerator } from './loggingContentGenerator.js';

 export { GeminiContentGenerator } from './geminiContentGenerator.js';
+export { LoggingContentGenerator } from './loggingContentGenerator.js';

 /**
 * Create a Gemini content generator.
@@ -49,5 +51,5 @@ export function createGeminiContentGenerator(
    config,
  );

-  return geminiContentGenerator;
+  return new LoggingContentGenerator(geminiContentGenerator, gcConfig);
 }
--- a/packages/core/src/core/loggingContentGenerator/loggingContentGenerator.ts
+++ b/packages/core/src/core/loggingContentGenerator/loggingContentGenerator.ts
@@ -4,22 +4,20 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-import {
+import type {
+  Content,
+  CountTokensParameters,
+  CountTokensResponse,
+  EmbedContentParameters,
+  EmbedContentResponse,
+  GenerateContentParameters,
+  GenerateContentResponseUsageMetadata,
  GenerateContentResponse,
-  type Content,
-  type CountTokensParameters,
-  type CountTokensResponse,
-  type EmbedContentParameters,
-  type EmbedContentResponse,
-  type GenerateContentParameters,
-  type GenerateContentResponseUsageMetadata,
-  type ContentListUnion,
-  type ContentUnion,
-  type Part,
-  type PartUnion,
-  type FinishReason,
+  ContentListUnion,
+  ContentUnion,
+  Part,
+  PartUnion,
 } from '@google/genai';
-import type OpenAI from 'openai';
 import {
  ApiRequestEvent,
  ApiResponseEvent,
@@ -33,8 +31,6 @@ import {
 } from '../../telemetry/loggers.js';
 import type { ContentGenerator } from '../contentGenerator.js';
 import { isStructuredError } from '../../utils/quotaErrorDetection.js';
-import { OpenAIContentConverter } from '../openaiContentGenerator/converter.js';
-import { OpenAILogger } from '../../utils/openaiLogger.js';

 interface StructuredError {
  status: number;
@@ -44,19 +40,10 @@ interface StructuredError {
 * A decorator that wraps a ContentGenerator to add logging to API calls.
 */
 export class LoggingContentGenerator implements ContentGenerator {
-  private openaiLogger?: OpenAILogger;
-  private schemaCompliance?: 'auto' | 'openapi_30';
-
  constructor(
    private readonly wrapped: ContentGenerator,
    private readonly config: Config,
-  ) {
-    const generatorConfig = this.config.getContentGeneratorConfig();
-    if (generatorConfig?.enableOpenAILogging) {
-      this.openaiLogger = new OpenAILogger(generatorConfig.openAILoggingDir);
-      this.schemaCompliance = generatorConfig.schemaCompliance;
-    }
-  }
+  ) {}

  getWrapped(): ContentGenerator {
    return this.wrapped;
@@ -104,31 +91,21 @@ export class LoggingContentGenerator implements ContentGenerator {
    prompt_id: string,
  ): void {
    const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorType =
-      (error as { type?: string })?.type ||
-      (error instanceof Error ? error.name : 'unknown');
-    const errorResponseId =
-      (error as { requestID?: string; request_id?: string })?.requestID ||
-      (error as { requestID?: string; request_id?: string })?.request_id ||
-      responseId;
-    const errorStatus =
-      (error as { code?: string | number; status?: number })?.code ??
-      (error as { status?: number })?.status ??
-      (isStructuredError(error)
-        ? (error as StructuredError).status
-        : undefined);
+    const errorType = error instanceof Error ? error.name : 'unknown';

    logApiError(
      this.config,
      new ApiErrorEvent(
-        errorResponseId,
+        responseId,
        model,
        errorMessage,
        durationMs,
        prompt_id,
        this.config.getContentGeneratorConfig()?.authType,
        errorType,
-        errorStatus,
+        isStructuredError(error)
+          ? (error as StructuredError).status
+          : undefined,
      ),
    );
  }
@@ -139,7 +116,6 @@ export class LoggingContentGenerator implements ContentGenerator {
  ): Promise<GenerateContentResponse> {
    const startTime = Date.now();
    this.logApiRequest(this.toContents(req.contents), req.model, userPromptId);
-    const openaiRequest = await this.buildOpenAIRequestForLogging(req);
    try {
      const response = await this.wrapped.generateContent(req, userPromptId);
      const durationMs = Date.now() - startTime;
@@ -151,12 +127,10 @@ export class LoggingContentGenerator implements ContentGenerator {
        response.usageMetadata,
        JSON.stringify(response),
      );
-      await this.logOpenAIInteraction(openaiRequest, response);
      return response;
    } catch (error) {
      const durationMs = Date.now() - startTime;
      this._logApiError(undefined, durationMs, error, req.model, userPromptId);
-      await this.logOpenAIInteraction(openaiRequest, undefined, error);
      throw error;
    }
  }
@@ -167,7 +141,6 @@ export class LoggingContentGenerator implements ContentGenerator {
  ): Promise<AsyncGenerator<GenerateContentResponse>> {
    const startTime = Date.now();
    this.logApiRequest(this.toContents(req.contents), req.model, userPromptId);
-    const openaiRequest = await this.buildOpenAIRequestForLogging(req);

    let stream: AsyncGenerator<GenerateContentResponse>;
    try {
@@ -175,7 +148,6 @@ export class LoggingContentGenerator implements ContentGenerator {
    } catch (error) {
      const durationMs = Date.now() - startTime;
      this._logApiError(undefined, durationMs, error, req.model, userPromptId);
-      await this.logOpenAIInteraction(openaiRequest, undefined, error);
      throw error;
    }

@@ -184,7 +156,6 @@ export class LoggingContentGenerator implements ContentGenerator {
      startTime,
      userPromptId,
      req.model,
-      openaiRequest,
    );
  }

@@ -193,7 +164,6 @@ export class LoggingContentGenerator implements ContentGenerator {
    startTime: number,
    userPromptId: string,
    model: string,
-    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
  ): AsyncGenerator<GenerateContentResponse> {
    const responses: GenerateContentResponse[] = [];

@@ -216,9 +186,6 @@ export class LoggingContentGenerator implements ContentGenerator {
        lastUsageMetadata,
        JSON.stringify(responses),
      );
-      const consolidatedResponse =
-        this.consolidateGeminiResponsesForLogging(responses);
-      await this.logOpenAIInteraction(openaiRequest, consolidatedResponse);
    } catch (error) {
      const durationMs = Date.now() - startTime;
      this._logApiError(
@@ -228,182 +195,10 @@ export class LoggingContentGenerator implements ContentGenerator {
        responses[0]?.modelVersion || model,
        userPromptId,
      );
-      await this.logOpenAIInteraction(openaiRequest, undefined, error);
      throw error;
    }
  }

-  private async buildOpenAIRequestForLogging(
-    request: GenerateContentParameters,
-  ): Promise<OpenAI.Chat.ChatCompletionCreateParams | undefined> {
-    if (!this.openaiLogger) {
-      return undefined;
-    }
-
-    const converter = new OpenAIContentConverter(
-      request.model,
-      this.schemaCompliance,
-    );
-    const messages = converter.convertGeminiRequestToOpenAI(request, {
-      cleanOrphanToolCalls: false,
-    });
-
-    const openaiRequest: OpenAI.Chat.ChatCompletionCreateParams = {
-      model: request.model,
-      messages,
-    };
-
-    if (request.config?.tools) {
-      openaiRequest.tools = await converter.convertGeminiToolsToOpenAI(
-        request.config.tools,
-      );
-    }
-
-    if (request.config?.temperature !== undefined) {
-      openaiRequest.temperature = request.config.temperature;
-    }
-    if (request.config?.topP !== undefined) {
-      openaiRequest.top_p = request.config.topP;
-    }
-    if (request.config?.maxOutputTokens !== undefined) {
-      openaiRequest.max_tokens = request.config.maxOutputTokens;
-    }
-    if (request.config?.presencePenalty !== undefined) {
-      openaiRequest.presence_penalty = request.config.presencePenalty;
-    }
-    if (request.config?.frequencyPenalty !== undefined) {
-      openaiRequest.frequency_penalty = request.config.frequencyPenalty;
-    }
-
-    return openaiRequest;
-  }
-
-  private async logOpenAIInteraction(
-    openaiRequest: OpenAI.Chat.ChatCompletionCreateParams | undefined,
-    response?: GenerateContentResponse,
-    error?: unknown,
-  ): Promise<void> {
-    if (!this.openaiLogger || !openaiRequest) {
-      return;
-    }
-
-    const openaiResponse = response
-      ? this.convertGeminiResponseToOpenAIForLogging(response, openaiRequest)
-      : undefined;
-
-    await this.openaiLogger.logInteraction(
-      openaiRequest,
-      openaiResponse,
-      error instanceof Error
-        ? error
-        : error
-          ? new Error(String(error))
-          : undefined,
-    );
-  }
-
-  private convertGeminiResponseToOpenAIForLogging(
-    response: GenerateContentResponse,
-    openaiRequest: OpenAI.Chat.ChatCompletionCreateParams,
-  ): OpenAI.Chat.ChatCompletion {
-    const converter = new OpenAIContentConverter(
-      openaiRequest.model,
-      this.schemaCompliance,
-    );
-
-    return converter.convertGeminiResponseToOpenAI(response);
-  }
-
-  private consolidateGeminiResponsesForLogging(
-    responses: GenerateContentResponse[],
-  ): GenerateContentResponse | undefined {
-    if (responses.length === 0) {
-      return undefined;
-    }
-
-    const consolidated = new GenerateContentResponse();
-    const combinedParts: Part[] = [];
-    const functionCallIndex = new Map<string, number>();
-    let finishReason: FinishReason | undefined;
-    let usageMetadata: GenerateContentResponseUsageMetadata | undefined;
-
-    for (const response of responses) {
-      if (response.usageMetadata) {
-        usageMetadata = response.usageMetadata;
-      }
-
-      const candidate = response.candidates?.[0];
-      if (candidate?.finishReason) {
-        finishReason = candidate.finishReason;
-      }
-
-      const parts = candidate?.content?.parts ?? [];
-      for (const part of parts as Part[]) {
-        if (typeof part === 'string') {
-          combinedParts.push({ text: part });
-          continue;
-        }
-
-        if ('text' in part) {
-          if (part.text) {
-            combinedParts.push({
-              text: part.text,
-              ...(part.thought ? { thought: true } : {}),
-              ...(part.thoughtSignature
-                ? { thoughtSignature: part.thoughtSignature }
-                : {}),
-            });
-          }
-          continue;
-        }
-
-        if ('functionCall' in part && part.functionCall) {
-          const callKey =
-            part.functionCall.id || part.functionCall.name || 'tool_call';
-          const existingIndex = functionCallIndex.get(callKey);
-          const functionPart = { functionCall: part.functionCall };
-          if (existingIndex !== undefined) {
-            combinedParts[existingIndex] = functionPart;
-          } else {
-            functionCallIndex.set(callKey, combinedParts.length);
-            combinedParts.push(functionPart);
-          }
-          continue;
-        }
-
-        if ('functionResponse' in part && part.functionResponse) {
-          combinedParts.push({ functionResponse: part.functionResponse });
-          continue;
-        }
-
-        combinedParts.push(part);
-      }
-    }
-
-    const lastResponse = responses[responses.length - 1];
-    const lastCandidate = lastResponse.candidates?.[0];
-
-    consolidated.responseId = lastResponse.responseId;
-    consolidated.createTime = lastResponse.createTime;
-    consolidated.modelVersion = lastResponse.modelVersion;
-    consolidated.promptFeedback = lastResponse.promptFeedback;
-    consolidated.usageMetadata = usageMetadata;
-
-    consolidated.candidates = [
-      {
-        content: {
-          role: lastCandidate?.content?.role || 'model',
-          parts: combinedParts,
-        },
-        ...(finishReason ? { finishReason } : {}),
-        index: 0,
-        safetyRatings: lastCandidate?.safetyRatings || [],
-      },
-    ];
-
-    return consolidated;
-  }
-
  async countTokens(req: CountTokensParameters): Promise<CountTokensResponse> {
    return this.wrapped.countTokens(req);
  }
--- a/packages/core/src/core/loggingContentGenerator/index.ts
+++ b/packages/core/src/core/loggingContentGenerator/index.ts
@@ -1,7 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export { LoggingContentGenerator } from './loggingContentGenerator.js';
--- a/packages/core/src/core/loggingContentGenerator/loggingContentGenerator.test.ts
+++ b/packages/core/src/core/loggingContentGenerator/loggingContentGenerator.test.ts
@@ -1,371 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import type {
-  GenerateContentParameters,
-  GenerateContentResponseUsageMetadata,
-} from '@google/genai';
-import { GenerateContentResponse } from '@google/genai';
-import type { Config } from '../../config/config.js';
-import type { ContentGenerator } from '../contentGenerator.js';
-import { LoggingContentGenerator } from './index.js';
-import { OpenAIContentConverter } from '../openaiContentGenerator/converter.js';
-import {
-  logApiRequest,
-  logApiResponse,
-  logApiError,
-} from '../../telemetry/loggers.js';
-import { OpenAILogger } from '../../utils/openaiLogger.js';
-import type OpenAI from 'openai';
-
-vi.mock('../../telemetry/loggers.js', () => ({
-  logApiRequest: vi.fn(),
-  logApiResponse: vi.fn(),
-  logApiError: vi.fn(),
-}));
-
-vi.mock('../../utils/openaiLogger.js', () => ({
-  OpenAILogger: vi.fn().mockImplementation(() => ({
-    logInteraction: vi.fn().mockResolvedValue(undefined),
-  })),
-}));
-
-const convertGeminiRequestToOpenAISpy = vi
-  .spyOn(OpenAIContentConverter.prototype, 'convertGeminiRequestToOpenAI')
-  .mockReturnValue([{ role: 'user', content: 'converted' }]);
-const convertGeminiToolsToOpenAISpy = vi
-  .spyOn(OpenAIContentConverter.prototype, 'convertGeminiToolsToOpenAI')
-  .mockResolvedValue([{ type: 'function', function: { name: 'tool' } }]);
-const convertGeminiResponseToOpenAISpy = vi
-  .spyOn(OpenAIContentConverter.prototype, 'convertGeminiResponseToOpenAI')
-  .mockReturnValue({
-    id: 'openai-response',
-    object: 'chat.completion',
-    created: 123456789,
-    model: 'test-model',
-    choices: [],
-  } as OpenAI.Chat.ChatCompletion);
-
-const createConfig = (overrides: Record<string, unknown> = {}): Config =>
-  ({
-    getContentGeneratorConfig: () => ({
-      authType: 'openai',
-      enableOpenAILogging: false,
-      ...overrides,
-    }),
-  }) as Config;
-
-const createWrappedGenerator = (
-  generateContent: ContentGenerator['generateContent'],
-  generateContentStream: ContentGenerator['generateContentStream'],
-): ContentGenerator =>
-  ({
-    generateContent,
-    generateContentStream,
-    countTokens: vi.fn(),
-    embedContent: vi.fn(),
-    useSummarizedThinking: vi.fn().mockReturnValue(false),
-  }) as ContentGenerator;
-
-const createResponse = (
-  responseId: string,
-  modelVersion: string,
-  parts: Array<Record<string, unknown>>,
-  usageMetadata?: GenerateContentResponseUsageMetadata,
-  finishReason?: string,
-): GenerateContentResponse => {
-  const response = new GenerateContentResponse();
-  response.responseId = responseId;
-  response.modelVersion = modelVersion;
-  response.usageMetadata = usageMetadata;
-  response.candidates = [
-    {
-      content: {
-        role: 'model',
-        parts: parts as never[],
-      },
-      finishReason: finishReason as never,
-      index: 0,
-      safetyRatings: [],
-    },
-  ];
-  return response;
-};
-
-describe('LoggingContentGenerator', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    convertGeminiRequestToOpenAISpy.mockClear();
-    convertGeminiToolsToOpenAISpy.mockClear();
-    convertGeminiResponseToOpenAISpy.mockClear();
-  });
-
-  it('logs request/response, normalizes thought parts, and logs OpenAI interaction', async () => {
-    const wrapped = createWrappedGenerator(
-      vi.fn().mockResolvedValue(
-        createResponse(
-          'resp-1',
-          'model-v2',
-          [{ text: 'ok' }],
-          {
-            promptTokenCount: 3,
-            candidatesTokenCount: 5,
-            totalTokenCount: 8,
-          },
-          'STOP',
-        ),
-      ),
-      vi.fn(),
-    );
-    const generator = new LoggingContentGenerator(
-      wrapped,
-      createConfig({
-        enableOpenAILogging: true,
-        openAILoggingDir: 'logs',
-        schemaCompliance: 'openapi_30',
-      }),
-    );
-
-    const request = {
-      model: 'test-model',
-      contents: [
-        {
-          role: 'user',
-          parts: [
-            { text: 'Hello', thought: 'internal' },
-            {
-              functionCall: { id: 'call-1', name: 'tool', args: '{}' },
-              thought: 'strip-me',
-            },
-            null,
-          ],
-        },
-      ],
-      config: {
-        temperature: 0.3,
-        topP: 0.9,
-        maxOutputTokens: 256,
-        presencePenalty: 0.2,
-        frequencyPenalty: 0.1,
-        tools: [
-          {
-            functionDeclarations: [
-              { name: 'tool', description: 'desc', parameters: {} },
-            ],
-          },
-        ],
-      },
-    } as unknown as GenerateContentParameters;
-
-    const response = await generator.generateContent(request, 'prompt-1');
-
-    expect(response.responseId).toBe('resp-1');
-    expect(logApiRequest).toHaveBeenCalledTimes(1);
-    const [, requestEvent] = vi.mocked(logApiRequest).mock.calls[0];
-    const loggedContents = JSON.parse(requestEvent.request_text || '[]');
-    expect(loggedContents[0].parts[0]).toEqual({
-      text: 'Hello\n[Thought: internal]',
-    });
-    expect(loggedContents[0].parts[1]).toEqual({
-      functionCall: { id: 'call-1', name: 'tool', args: '{}' },
-    });
-
-    expect(logApiResponse).toHaveBeenCalledTimes(1);
-    const [, responseEvent] = vi.mocked(logApiResponse).mock.calls[0];
-    expect(responseEvent.response_id).toBe('resp-1');
-    expect(responseEvent.model).toBe('model-v2');
-    expect(responseEvent.prompt_id).toBe('prompt-1');
-    expect(responseEvent.input_token_count).toBe(3);
-
-    expect(convertGeminiRequestToOpenAISpy).toHaveBeenCalledTimes(1);
-    expect(convertGeminiToolsToOpenAISpy).toHaveBeenCalledTimes(1);
-    expect(convertGeminiResponseToOpenAISpy).toHaveBeenCalledTimes(1);
-
-    const openaiLoggerInstance = vi.mocked(OpenAILogger).mock.results[0]
-      ?.value as { logInteraction: ReturnType<typeof vi.fn> };
-    expect(openaiLoggerInstance.logInteraction).toHaveBeenCalledTimes(1);
-    const [openaiRequest, openaiResponse, openaiError] =
-      openaiLoggerInstance.logInteraction.mock.calls[0];
-    expect(openaiRequest).toEqual(
-      expect.objectContaining({
-        model: 'test-model',
-        messages: [{ role: 'user', content: 'converted' }],
-        tools: [{ type: 'function', function: { name: 'tool' } }],
-        temperature: 0.3,
-        top_p: 0.9,
-        max_tokens: 256,
-        presence_penalty: 0.2,
-        frequency_penalty: 0.1,
-      }),
-    );
-    expect(openaiResponse).toEqual({
-      id: 'openai-response',
-      object: 'chat.completion',
-      created: 123456789,
-      model: 'test-model',
-      choices: [],
-    });
-    expect(openaiError).toBeUndefined();
-  });
-
-  it('logs errors with status code and request id, then rethrows', async () => {
-    const error = Object.assign(new Error('boom'), {
-      code: 429,
-      request_id: 'req-99',
-      type: 'rate_limit',
-    });
-    const wrapped = createWrappedGenerator(
-      vi.fn().mockRejectedValue(error),
-      vi.fn(),
-    );
-    const generator = new LoggingContentGenerator(
-      wrapped,
-      createConfig({ enableOpenAILogging: true }),
-    );
-
-    const request = {
-      model: 'test-model',
-      contents: 'Hello',
-    } as unknown as GenerateContentParameters;
-
-    await expect(
-      generator.generateContent(request, 'prompt-2'),
-    ).rejects.toThrow('boom');
-
-    expect(logApiError).toHaveBeenCalledTimes(1);
-    const [, errorEvent] = vi.mocked(logApiError).mock.calls[0];
-    expect(errorEvent.response_id).toBe('req-99');
-    expect(errorEvent.status_code).toBe(429);
-    expect(errorEvent.error_type).toBe('rate_limit');
-    expect(errorEvent.prompt_id).toBe('prompt-2');
-
-    const openaiLoggerInstance = vi.mocked(OpenAILogger).mock.results[0]
-      ?.value as { logInteraction: ReturnType<typeof vi.fn> };
-    const [, , loggedError] = openaiLoggerInstance.logInteraction.mock.calls[0];
-    expect(loggedError).toBeInstanceOf(Error);
-    expect((loggedError as Error).message).toBe('boom');
-  });
-
-  it('logs streaming responses and consolidates tool calls', async () => {
-    const usage1 = {
-      promptTokenCount: 1,
-    } as GenerateContentResponseUsageMetadata;
-    const usage2 = {
-      promptTokenCount: 2,
-      candidatesTokenCount: 4,
-      totalTokenCount: 6,
-    } as GenerateContentResponseUsageMetadata;
-
-    const response1 = createResponse(
-      'resp-1',
-      'model-stream',
-      [
-        { text: 'Hello' },
-        { functionCall: { id: 'call-1', name: 'tool', args: '{}' } },
-      ],
-      usage1,
-    );
-    const response2 = createResponse(
-      'resp-2',
-      'model-stream',
-      [
-        { text: ' world' },
-        { functionCall: { id: 'call-1', name: 'tool', args: '{"x":1}' } },
-        { functionResponse: { name: 'tool', response: { output: 'ok' } } },
-      ],
-      usage2,
-      'STOP',
-    );
-
-    const wrapped = createWrappedGenerator(
-      vi.fn(),
-      vi.fn().mockResolvedValue(
-        (async function* () {
-          yield response1;
-          yield response2;
-        })(),
-      ),
-    );
-    const generator = new LoggingContentGenerator(
-      wrapped,
-      createConfig({ enableOpenAILogging: true }),
-    );
-
-    const request = {
-      model: 'test-model',
-      contents: 'Hello',
-    } as unknown as GenerateContentParameters;
-
-    const stream = await generator.generateContentStream(request, 'prompt-3');
-    const seen: GenerateContentResponse[] = [];
-    for await (const item of stream) {
-      seen.push(item);
-    }
-    expect(seen).toHaveLength(2);
-
-    expect(logApiResponse).toHaveBeenCalledTimes(1);
-    const [, responseEvent] = vi.mocked(logApiResponse).mock.calls[0];
-    expect(responseEvent.response_id).toBe('resp-1');
-    expect(responseEvent.input_token_count).toBe(2);
-
-    expect(convertGeminiResponseToOpenAISpy).toHaveBeenCalledTimes(1);
-    const [consolidatedResponse] =
-      convertGeminiResponseToOpenAISpy.mock.calls[0];
-    const consolidatedParts =
-      consolidatedResponse.candidates?.[0]?.content?.parts || [];
-    expect(consolidatedParts).toEqual([
-      { text: 'Hello' },
-      { functionCall: { id: 'call-1', name: 'tool', args: '{"x":1}' } },
-      { text: ' world' },
-      { functionResponse: { name: 'tool', response: { output: 'ok' } } },
-    ]);
-    expect(consolidatedResponse.usageMetadata).toBe(usage2);
-    expect(consolidatedResponse.responseId).toBe('resp-2');
-    expect(consolidatedResponse.candidates?.[0]?.finishReason).toBe('STOP');
-  });
-
-  it('logs stream errors and skips response logging', async () => {
-    const response1 = createResponse('resp-1', 'model-stream', [
-      { text: 'partial' },
-    ]);
-    const streamError = new Error('stream-fail');
-    const wrapped = createWrappedGenerator(
-      vi.fn(),
-      vi.fn().mockResolvedValue(
-        (async function* () {
-          yield response1;
-          throw streamError;
-        })(),
-      ),
-    );
-    const generator = new LoggingContentGenerator(
-      wrapped,
-      createConfig({ enableOpenAILogging: true }),
-    );
-
-    const request = {
-      model: 'test-model',
-      contents: 'Hello',
-    } as unknown as GenerateContentParameters;
-
-    const stream = await generator.generateContentStream(request, 'prompt-4');
-    await expect(async () => {
-      for await (const _item of stream) {
-        // Consume stream to trigger error.
-      }
-    }).rejects.toThrow('stream-fail');
-
-    expect(logApiResponse).not.toHaveBeenCalled();
-    expect(logApiError).toHaveBeenCalledTimes(1);
-    const openaiLoggerInstance = vi.mocked(OpenAILogger).mock.results[0]
-      ?.value as { logInteraction: ReturnType<typeof vi.fn> };
-    expect(openaiLoggerInstance.logInteraction).toHaveBeenCalledTimes(1);
-  });
-});
--- a/packages/core/src/core/openaiContentGenerator/converter.ts
+++ b/packages/core/src/core/openaiContentGenerator/converter.ts
@@ -236,9 +236,8 @@ export class OpenAIContentConverter {
   */
  convertGeminiRequestToOpenAI(
    request: GenerateContentParameters,
-    options: { cleanOrphanToolCalls: boolean } = { cleanOrphanToolCalls: true },
  ): OpenAI.Chat.ChatCompletionMessageParam[] {
-    let messages: OpenAI.Chat.ChatCompletionMessageParam[] = [];
+    const messages: OpenAI.Chat.ChatCompletionMessageParam[] = [];

    // Handle system instruction from config
    this.addSystemInstructionMessage(request, messages);
@@ -247,89 +246,11 @@ export class OpenAIContentConverter {
    this.processContents(request.contents, messages);

    // Clean up orphaned tool calls and merge consecutive assistant messages
-    if (options.cleanOrphanToolCalls) {
-      messages = this.cleanOrphanedToolCalls(messages);
-    }
-    messages = this.mergeConsecutiveAssistantMessages(messages);
+    const cleanedMessages = this.cleanOrphanedToolCalls(messages);
+    const mergedMessages =
+      this.mergeConsecutiveAssistantMessages(cleanedMessages);

-    return messages;
-  }
-
-  /**
-   * Convert Gemini response to OpenAI completion format (for logging).
-   */
-  convertGeminiResponseToOpenAI(
-    response: GenerateContentResponse,
-  ): OpenAI.Chat.ChatCompletion {
-    const candidate = response.candidates?.[0];
-    const parts = (candidate?.content?.parts || []) as Part[];
-    const parsedParts = this.parseParts(parts);
-
-    const message: ExtendedCompletionMessage = {
-      role: 'assistant',
-      content: parsedParts.contentParts.join('') || null,
-      refusal: null,
-    };
-
-    const reasoningContent = parsedParts.thoughtParts.join('');
-    if (reasoningContent) {
-      message.reasoning_content = reasoningContent;
-    }
-
-    if (parsedParts.functionCalls.length > 0) {
-      message.tool_calls = parsedParts.functionCalls.map((call, index) => ({
-        id: call.id || `call_${index}`,
-        type: 'function' as const,
-        function: {
-          name: call.name || '',
-          arguments: JSON.stringify(call.args || {}),
-        },
-      }));
-    }
-
-    const finishReason = this.mapGeminiFinishReasonToOpenAI(
-      candidate?.finishReason,
-    );
-
-    const usageMetadata = response.usageMetadata;
-    const usage: OpenAI.CompletionUsage = {
-      prompt_tokens: usageMetadata?.promptTokenCount || 0,
-      completion_tokens: usageMetadata?.candidatesTokenCount || 0,
-      total_tokens: usageMetadata?.totalTokenCount || 0,
-    };
-
-    if (usageMetadata?.cachedContentTokenCount !== undefined) {
-      (
-        usage as OpenAI.CompletionUsage & {
-          prompt_tokens_details?: { cached_tokens?: number };
-        }
-      ).prompt_tokens_details = {
-        cached_tokens: usageMetadata.cachedContentTokenCount,
-      };
-    }
-
-    const createdMs = response.createTime
-      ? Number(response.createTime)
-      : Date.now();
-    const createdSeconds = Number.isFinite(createdMs)
-      ? Math.floor(createdMs / 1000)
-      : Math.floor(Date.now() / 1000);
-
-    return {
-      id: response.responseId || `gemini-${Date.now()}`,
-      object: 'chat.completion',
-      created: createdSeconds,
-      model: response.modelVersion || this.model,
-      choices: [
-        {
-          index: 0,
-          message,
-          finish_reason: finishReason,
-          logprobs: null,
-        },
-      ],
-      usage,
-    };
+    return mergedMessages;
  }

  /**
@@ -915,6 +836,84 @@ export class OpenAIContentConverter {
    return response;
  }

+  /**
+   * Convert Gemini response format to OpenAI chat completion format for logging
+   */
+  convertGeminiResponseToOpenAI(
+    response: GenerateContentResponse,
+  ): OpenAI.Chat.ChatCompletion {
+    const candidate = response.candidates?.[0];
+    const content = candidate?.content;
+
+    let messageContent: string | null = null;
+    const toolCalls: OpenAI.Chat.ChatCompletionMessageToolCall[] = [];
+
+    if (content?.parts) {
+      const textParts: string[] = [];
+
+      for (const part of content.parts) {
+        if ('text' in part && part.text) {
+          textParts.push(part.text);
+        } else if ('functionCall' in part && part.functionCall) {
+          toolCalls.push({
+            id: part.functionCall.id || `call_${toolCalls.length}`,
+            type: 'function' as const,
+            function: {
+              name: part.functionCall.name || '',
+              arguments: JSON.stringify(part.functionCall.args || {}),
+            },
+          });
+        }
+      }
+
+      messageContent = textParts.join('').trimEnd();
+    }
+
+    const choice: OpenAI.Chat.ChatCompletion.Choice = {
+      index: 0,
+      message: {
+        role: 'assistant',
+        content: messageContent,
+        refusal: null,
+      },
+      finish_reason: this.mapGeminiFinishReasonToOpenAI(
+        candidate?.finishReason,
+      ) as OpenAI.Chat.ChatCompletion.Choice['finish_reason'],
+      logprobs: null,
+    };
+
+    if (toolCalls.length > 0) {
+      choice.message.tool_calls = toolCalls;
+    }
+
+    const openaiResponse: OpenAI.Chat.ChatCompletion = {
+      id: response.responseId || `chatcmpl-${Date.now()}`,
+      object: 'chat.completion',
+      created: response.createTime
+        ? Number(response.createTime)
+        : Math.floor(Date.now() / 1000),
+      model: this.model,
+      choices: [choice],
+    };
+
+    // Add usage metadata if available
+    if (response.usageMetadata) {
+      openaiResponse.usage = {
+        prompt_tokens: response.usageMetadata.promptTokenCount || 0,
+        completion_tokens: response.usageMetadata.candidatesTokenCount || 0,
+        total_tokens: response.usageMetadata.totalTokenCount || 0,
+      };
+
+      if (response.usageMetadata.cachedContentTokenCount) {
+        openaiResponse.usage.prompt_tokens_details = {
+          cached_tokens: response.usageMetadata.cachedContentTokenCount,
+        };
+      }
+    }
+
+    return openaiResponse;
+  }
+
  /**
   * Map OpenAI finish reasons to Gemini finish reasons
   */
@@ -932,24 +931,29 @@ export class OpenAIContentConverter {
    return mapping[openaiReason] || FinishReason.FINISH_REASON_UNSPECIFIED;
  }

-  private mapGeminiFinishReasonToOpenAI(
-    geminiReason?: FinishReason,
-  ): 'stop' | 'length' | 'tool_calls' | 'content_filter' | 'function_call' {
-    if (!geminiReason) {
-      return 'stop';
-    }
+  /**
+   * Map Gemini finish reasons to OpenAI finish reasons
+   */
+  private mapGeminiFinishReasonToOpenAI(geminiReason?: unknown): string {
+    if (!geminiReason) return 'stop';

    switch (geminiReason) {
-      case FinishReason.STOP:
+      case 'STOP':
+      case 1: // FinishReason.STOP
        return 'stop';
-      case FinishReason.MAX_TOKENS:
+      case 'MAX_TOKENS':
+      case 2: // FinishReason.MAX_TOKENS
        return 'length';
-      case FinishReason.SAFETY:
+      case 'SAFETY':
+      case 3: // FinishReason.SAFETY
        return 'content_filter';
+      case 'RECITATION':
+      case 4: // FinishReason.RECITATION
+        return 'content_filter';
+      case 'OTHER':
+      case 5: // FinishReason.OTHER
+        return 'stop';
      default:
-        if (geminiReason === ('RECITATION' as FinishReason)) {
-          return 'content_filter';
-        }
        return 'stop';
    }
  }
--- a/packages/core/src/core/openaiContentGenerator/errorHandler.test.ts
+++ b/packages/core/src/core/openaiContentGenerator/errorHandler.test.ts
@@ -7,7 +7,7 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import type { GenerateContentParameters } from '@google/genai';
 import { EnhancedErrorHandler } from './errorHandler.js';
-import type { RequestContext } from './errorHandler.js';
+import type { RequestContext } from './telemetryService.js';

 describe('EnhancedErrorHandler', () => {
  let errorHandler: EnhancedErrorHandler;
--- a/packages/core/src/core/openaiContentGenerator/errorHandler.ts
+++ b/packages/core/src/core/openaiContentGenerator/errorHandler.ts
@@ -5,15 +5,7 @@
 */

 import type { GenerateContentParameters } from '@google/genai';
-
-export interface RequestContext {
-  userPromptId: string;
-  model: string;
-  authType: string;
-  startTime: number;
-  duration: number;
-  isStreaming: boolean;
-}
+import type { RequestContext } from './telemetryService.js';

 export interface ErrorHandler {
  handle(
--- a/packages/core/src/core/openaiContentGenerator/index.ts
+++ b/packages/core/src/core/openaiContentGenerator/index.ts
@@ -91,4 +91,11 @@ export function determineProvider(
  return new DefaultOpenAICompatibleProvider(contentGeneratorConfig, cliConfig);
 }

+// Services
+export {
+  type TelemetryService,
+  type RequestContext,
+  DefaultTelemetryService,
+} from './telemetryService.js';
+
 export { type ErrorHandler, EnhancedErrorHandler } from './errorHandler.js';
--- a/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.ts
+++ b/packages/core/src/core/openaiContentGenerator/openaiContentGenerator.ts
@@ -11,6 +11,7 @@ import type {
 } from '@google/genai';
 import type { PipelineConfig } from './pipeline.js';
 import { ContentGenerationPipeline } from './pipeline.js';
+import { DefaultTelemetryService } from './telemetryService.js';
 import { EnhancedErrorHandler } from './errorHandler.js';
 import { getDefaultTokenizer } from '../../utils/request-tokenizer/index.js';
 import type { ContentGeneratorConfig } from '../contentGenerator.js';
@@ -28,6 +29,11 @@ export class OpenAIContentGenerator implements ContentGenerator {
      cliConfig,
      provider,
      contentGeneratorConfig,
+      telemetryService: new DefaultTelemetryService(
+        cliConfig,
+        contentGeneratorConfig.enableOpenAILogging,
+        contentGeneratorConfig.openAILoggingDir,
+      ),
      errorHandler: new EnhancedErrorHandler(
        (error: unknown, request: GenerateContentParameters) =>
          this.shouldSuppressErrorLogging(error, request),
--- a/packages/core/src/core/openaiContentGenerator/pipeline.test.ts
+++ b/packages/core/src/core/openaiContentGenerator/pipeline.test.ts
@@ -15,6 +15,7 @@ import { OpenAIContentConverter } from './converter.js';
 import type { Config } from '../../config/config.js';
 import type { ContentGeneratorConfig, AuthType } from '../contentGenerator.js';
 import type { OpenAICompatibleProvider } from './provider/index.js';
+import type { TelemetryService } from './telemetryService.js';
 import type { ErrorHandler } from './errorHandler.js';

 // Mock dependencies
@@ -27,6 +28,7 @@ describe('ContentGenerationPipeline', () => {
  let mockProvider: OpenAICompatibleProvider;
  let mockClient: OpenAI;
  let mockConverter: OpenAIContentConverter;
+  let mockTelemetryService: TelemetryService;
  let mockErrorHandler: ErrorHandler;
  let mockContentGeneratorConfig: ContentGeneratorConfig;
  let mockCliConfig: Config;
@@ -61,6 +63,13 @@ describe('ContentGenerationPipeline', () => {
      getDefaultGenerationConfig: vi.fn().mockReturnValue({}),
    };

+    // Mock telemetry service
+    mockTelemetryService = {
+      logSuccess: vi.fn().mockResolvedValue(undefined),
+      logError: vi.fn().mockResolvedValue(undefined),
+      logStreamingSuccess: vi.fn().mockResolvedValue(undefined),
+    };
+
    // Mock error handler
    mockErrorHandler = {
      handle: vi.fn().mockImplementation((error: unknown) => {
@@ -90,6 +99,7 @@ describe('ContentGenerationPipeline', () => {
      cliConfig: mockCliConfig,
      provider: mockProvider,
      contentGeneratorConfig: mockContentGeneratorConfig,
+      telemetryService: mockTelemetryService,
      errorHandler: mockErrorHandler,
    };

@@ -162,6 +172,17 @@ describe('ContentGenerationPipeline', () => {
      expect(mockConverter.convertOpenAIResponseToGemini).toHaveBeenCalledWith(
        mockOpenAIResponse,
      );
+      expect(mockTelemetryService.logSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: false,
+        }),
+        mockGeminiResponse,
+        expect.any(Object),
+        mockOpenAIResponse,
+      );
    });

    it('should handle tools in request', async () => {
@@ -247,6 +268,16 @@ describe('ContentGenerationPipeline', () => {
        'API Error',
      );

+      expect(mockTelemetryService.logError).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: false,
+        }),
+        testError,
+        expect.any(Object),
+      );
      expect(mockErrorHandler.handle).toHaveBeenCalledWith(
        testError,
        expect.any(Object),
@@ -345,6 +376,17 @@ describe('ContentGenerationPipeline', () => {
          signal: undefined,
        }),
      );
+      expect(mockTelemetryService.logStreamingSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: true,
+        }),
+        [mockGeminiResponse1, mockGeminiResponse2],
+        expect.any(Object),
+        [mockChunk1, mockChunk2],
+      );
    });

    it('should filter empty responses', async () => {
@@ -448,6 +490,16 @@ describe('ContentGenerationPipeline', () => {

      expect(results).toHaveLength(0); // No results due to error
      expect(mockConverter.resetStreamingToolCalls).toHaveBeenCalledTimes(2); // Once at start, once on error
+      expect(mockTelemetryService.logError).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: true,
+        }),
+        testError,
+        expect.any(Object),
+      );
      expect(mockErrorHandler.handle).toHaveBeenCalledWith(
        testError,
        expect.any(Object),
@@ -598,6 +650,18 @@ describe('ContentGenerationPipeline', () => {
        candidatesTokenCount: 20,
        totalTokenCount: 30,
      });
+
+      expect(mockTelemetryService.logStreamingSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: true,
+        }),
+        results,
+        expect.any(Object),
+        [mockChunk1, mockChunk2, mockChunk3],
+      );
    });

    it('should handle ideal case where last chunk has both finishReason and usageMetadata', async () => {
@@ -789,6 +853,18 @@ describe('ContentGenerationPipeline', () => {
        candidatesTokenCount: 20,
        totalTokenCount: 30,
      });
+
+      expect(mockTelemetryService.logStreamingSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: true,
+        }),
+        results,
+        expect.any(Object),
+        [mockChunk1, mockChunk2, mockChunk3],
+      );
    });

    it('should handle providers that send finishReason and valid usage in same chunk', async () => {
@@ -1042,6 +1118,19 @@ describe('ContentGenerationPipeline', () => {
      await pipeline.execute(request, userPromptId);

      // Assert
+      expect(mockTelemetryService.logSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: false,
+          startTime: expect.any(Number),
+          duration: expect.any(Number),
+        }),
+        expect.any(Object),
+        expect.any(Object),
+        expect.any(Object),
+      );
    });

    it('should create context with correct properties for streaming request', async () => {
@@ -1084,6 +1173,19 @@ describe('ContentGenerationPipeline', () => {
      }

      // Assert
+      expect(mockTelemetryService.logStreamingSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          userPromptId,
+          model: 'test-model',
+          authType: 'openai',
+          isStreaming: true,
+          startTime: expect.any(Number),
+          duration: expect.any(Number),
+        }),
+        expect.any(Array),
+        expect.any(Object),
+        expect.any(Array),
+      );
    });

    it('should collect all OpenAI chunks for logging even when Gemini responses are filtered', async () => {
@@ -1227,6 +1329,22 @@ describe('ContentGenerationPipeline', () => {
      // Should only yield the final response (empty ones are filtered)
      expect(responses).toHaveLength(1);
      expect(responses[0]).toBe(finalGeminiResponse);
+
+      // Verify telemetry was called with ALL OpenAI chunks, including the filtered ones
+      expect(mockTelemetryService.logStreamingSuccess).toHaveBeenCalledWith(
+        expect.objectContaining({
+          model: 'test-model',
+          duration: expect.any(Number),
+          userPromptId: 'test-prompt-id',
+          authType: 'openai',
+        }),
+        [finalGeminiResponse], // Only the non-empty Gemini response
+        expect.objectContaining({
+          model: 'test-model',
+          messages: [{ role: 'user', content: 'test' }],
+        }),
+        [partialToolCallChunk1, partialToolCallChunk2, finishChunk], // ALL OpenAI chunks
+      );
    });
  });
 });
--- a/packages/core/src/core/openaiContentGenerator/pipeline.ts
+++ b/packages/core/src/core/openaiContentGenerator/pipeline.ts
@@ -13,12 +13,14 @@ import type { Config } from '../../config/config.js';
 import type { ContentGeneratorConfig } from '../contentGenerator.js';
 import type { OpenAICompatibleProvider } from './provider/index.js';
 import { OpenAIContentConverter } from './converter.js';
-import type { ErrorHandler, RequestContext } from './errorHandler.js';
+import type { TelemetryService, RequestContext } from './telemetryService.js';
+import type { ErrorHandler } from './errorHandler.js';

 export interface PipelineConfig {
  cliConfig: Config;
  provider: OpenAICompatibleProvider;
  contentGeneratorConfig: ContentGeneratorConfig;
+  telemetryService: TelemetryService;
  errorHandler: ErrorHandler;
 }

@@ -44,7 +46,7 @@ export class ContentGenerationPipeline {
      request,
      userPromptId,
      false,
-      async (openaiRequest) => {
+      async (openaiRequest, context) => {
        const openaiResponse = (await this.client.chat.completions.create(
          openaiRequest,
          {
@@ -55,6 +57,14 @@ export class ContentGenerationPipeline {
        const geminiResponse =
          this.converter.convertOpenAIResponseToGemini(openaiResponse);

+        // Log success
+        await this.config.telemetryService.logSuccess(
+          context,
+          geminiResponse,
+          openaiRequest,
+          openaiResponse,
+        );
+
        return geminiResponse;
      },
    );
@@ -78,7 +88,12 @@ export class ContentGenerationPipeline {
        )) as AsyncIterable<OpenAI.Chat.ChatCompletionChunk>;

        // Stage 2: Process stream with conversion and logging
-        return this.processStreamWithLogging(stream, context, request);
+        return this.processStreamWithLogging(
+          stream,
+          context,
+          openaiRequest,
+          request,
+        );
      },
    );
  }
@@ -95,9 +110,11 @@ export class ContentGenerationPipeline {
  private async *processStreamWithLogging(
    stream: AsyncIterable<OpenAI.Chat.ChatCompletionChunk>,
    context: RequestContext,
+    openaiRequest: OpenAI.Chat.ChatCompletionCreateParams,
    request: GenerateContentParameters,
  ): AsyncGenerator<GenerateContentResponse> {
    const collectedGeminiResponses: GenerateContentResponse[] = [];
+    const collectedOpenAIChunks: OpenAI.Chat.ChatCompletionChunk[] = [];

    // Reset streaming tool calls to prevent data pollution from previous streams
    this.converter.resetStreamingToolCalls();
@@ -108,6 +125,9 @@ export class ContentGenerationPipeline {
    try {
      // Stage 2a: Convert and yield each chunk while preserving original
      for await (const chunk of stream) {
+        // Always collect OpenAI chunks for logging, regardless of Gemini conversion result
+        collectedOpenAIChunks.push(chunk);
+
        const response = this.converter.convertOpenAIChunkToGemini(chunk);

        // Stage 2b: Filter empty responses to avoid downstream issues
@@ -144,8 +164,15 @@ export class ContentGenerationPipeline {
        yield pendingFinishResponse;
      }

-      // Stage 2e: Stream completed successfully
+      // Stage 2e: Stream completed successfully - perform logging with original OpenAI chunks
      context.duration = Date.now() - context.startTime;
+
+      await this.config.telemetryService.logStreamingSuccess(
+        context,
+        collectedGeminiResponses,
+        openaiRequest,
+        collectedOpenAIChunks,
+      );
    } catch (error) {
      // Clear streaming tool calls on error to prevent data pollution
      this.converter.resetStreamingToolCalls();
@@ -231,7 +258,7 @@ export class ContentGenerationPipeline {
    const baseRequest: OpenAI.Chat.ChatCompletionCreateParams = {
      model: this.contentGeneratorConfig.model,
      messages,
-      ...this.buildGenerateContentConfig(request),
+      ...this.buildSamplingParameters(request),
    };

    // Add streaming options if present
@@ -253,7 +280,7 @@ export class ContentGenerationPipeline {
    return this.config.provider.buildRequest(baseRequest, userPromptId);
  }

-  private buildGenerateContentConfig(
+  private buildSamplingParameters(
    request: GenerateContentParameters,
  ): Record<string, unknown> {
    const defaultSamplingParams =
@@ -289,7 +316,7 @@ export class ContentGenerationPipeline {
      return value !== undefined ? { [key]: value } : {};
    };

-    const params: Record<string, unknown> = {
+    const params = {
      // Parameters with request fallback but no defaults
      ...addParameterIfDefined('temperature', 'temperature', 'temperature'),
      ...addParameterIfDefined('top_p', 'top_p', 'topP'),
@@ -310,24 +337,11 @@ export class ContentGenerationPipeline {
        'frequency_penalty',
        'frequencyPenalty',
      ),
-      ...this.buildReasoningConfig(),
    };

    return params;
  }

-  private buildReasoningConfig(): Record<string, unknown> {
-    const reasoning = this.contentGeneratorConfig.reasoning;
-
-    if (reasoning === false) {
-      return {};
-    }
-
-    return {
-      reasoning_effort: reasoning?.effort ?? 'medium',
-    };
-  }
-
  /**
   * Common error handling wrapper for execute methods
   */
@@ -355,7 +369,13 @@ export class ContentGenerationPipeline {
      return result;
    } catch (error) {
      // Use shared error handling logic
-      return await this.handleError(error, context, request);
+      return await this.handleError(
+        error,
+        context,
+        request,
+        userPromptId,
+        isStreaming,
+      );
    }
  }

@@ -367,8 +387,37 @@ export class ContentGenerationPipeline {
    error: unknown,
    context: RequestContext,
    request: GenerateContentParameters,
+    userPromptId?: string,
+    isStreaming?: boolean,
  ): Promise<never> {
    context.duration = Date.now() - context.startTime;
+
+    // Build request for logging (may fail, but we still want to log the error)
+    let openaiRequest: OpenAI.Chat.ChatCompletionCreateParams;
+    try {
+      if (userPromptId !== undefined && isStreaming !== undefined) {
+        openaiRequest = await this.buildRequest(
+          request,
+          userPromptId,
+          isStreaming,
+        );
+      } else {
+        // For processStreamWithLogging, we don't have userPromptId/isStreaming,
+        // so create a minimal request
+        openaiRequest = {
+          model: this.contentGeneratorConfig.model,
+          messages: [],
+        };
+      }
+    } catch (_buildError) {
+      // If we can't build the request, create a minimal one for logging
+      openaiRequest = {
+        model: this.contentGeneratorConfig.model,
+        messages: [],
+      };
+    }
+
+    await this.config.telemetryService.logError(context, error, openaiRequest);
    this.config.errorHandler.handle(error, context, request);
  }

--- a/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts
+++ b/packages/core/src/core/openaiContentGenerator/provider/dashscope.ts
@@ -39,8 +39,7 @@ export class DashScopeOpenAICompatibleProvider
    return (
      authType === AuthType.QWEN_OAUTH ||
      baseUrl === 'https://dashscope.aliyuncs.com/compatible-mode/v1' ||
-      baseUrl === 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1' ||
-      !baseUrl
+      baseUrl === 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1'
    );
  }

@@ -145,7 +144,9 @@ export class DashScopeOpenAICompatibleProvider

  getDefaultGenerationConfig(): GenerateContentConfig {
    return {
-      temperature: 0.3,
+      temperature: 0.7,
+      topP: 0.8,
+      topK: 20,
    };
  }

--- a/packages/core/src/core/openaiContentGenerator/telemetryService.test.ts
+++ b/packages/core/src/core/openaiContentGenerator/telemetryService.test.ts
--- a/packages/core/src/core/openaiContentGenerator/telemetryService.ts
+++ b/packages/core/src/core/openaiContentGenerator/telemetryService.ts
@@ -0,0 +1,275 @@
+/**
+ * @license
+ * Copyright 2025 Qwen
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import type { Config } from '../../config/config.js';
+import { logApiError, logApiResponse } from '../../telemetry/loggers.js';
+import { ApiErrorEvent, ApiResponseEvent } from '../../telemetry/types.js';
+import { OpenAILogger } from '../../utils/openaiLogger.js';
+import type { GenerateContentResponse } from '@google/genai';
+import type OpenAI from 'openai';
+import type { ExtendedCompletionChunkDelta } from './converter.js';
+
+export interface RequestContext {
+  userPromptId: string;
+  model: string;
+  authType: string;
+  startTime: number;
+  duration: number;
+  isStreaming: boolean;
+}
+
+export interface TelemetryService {
+  logSuccess(
+    context: RequestContext,
+    response: GenerateContentResponse,
+    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
+    openaiResponse?: OpenAI.Chat.ChatCompletion,
+  ): Promise<void>;
+
+  logError(
+    context: RequestContext,
+    error: unknown,
+    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
+  ): Promise<void>;
+
+  logStreamingSuccess(
+    context: RequestContext,
+    responses: GenerateContentResponse[],
+    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
+    openaiChunks?: OpenAI.Chat.ChatCompletionChunk[],
+  ): Promise<void>;
+}
+
+export class DefaultTelemetryService implements TelemetryService {
+  private logger: OpenAILogger;
+
+  constructor(
+    private config: Config,
+    private enableOpenAILogging: boolean = false,
+    openAILoggingDir?: string,
+  ) {
+    // Always create a new logger instance to ensure correct working directory
+    // If no custom directory is provided, undefined will use the default path
+    this.logger = new OpenAILogger(openAILoggingDir);
+  }
+
+  async logSuccess(
+    context: RequestContext,
+    response: GenerateContentResponse,
+    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
+    openaiResponse?: OpenAI.Chat.ChatCompletion,
+  ): Promise<void> {
+    // Log API response event for UI telemetry
+    const responseEvent = new ApiResponseEvent(
+      response.responseId || 'unknown',
+      context.model,
+      context.duration,
+      context.userPromptId,
+      context.authType,
+      response.usageMetadata,
+    );
+
+    logApiResponse(this.config, responseEvent);
+
+    // Log interaction if enabled
+    if (this.enableOpenAILogging && openaiRequest && openaiResponse) {
+      await this.logger.logInteraction(openaiRequest, openaiResponse);
+    }
+  }
+
+  async logError(
+    context: RequestContext,
+    error: unknown,
+    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
+  ): Promise<void> {
+    const errorMessage = error instanceof Error ? error.message : String(error);
+
+    // Log API error event for UI telemetry
+    const errorEvent = new ApiErrorEvent(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (error as any)?.requestID || 'unknown',
+      context.model,
+      errorMessage,
+      context.duration,
+      context.userPromptId,
+      context.authType,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (error as any)?.type,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (error as any)?.code,
+    );
+    logApiError(this.config, errorEvent);
+
+    // Log error interaction if enabled
+    if (this.enableOpenAILogging && openaiRequest) {
+      await this.logger.logInteraction(
+        openaiRequest,
+        undefined,
+        error as Error,
+      );
+    }
+  }
+
+  async logStreamingSuccess(
+    context: RequestContext,
+    responses: GenerateContentResponse[],
+    openaiRequest?: OpenAI.Chat.ChatCompletionCreateParams,
+    openaiChunks?: OpenAI.Chat.ChatCompletionChunk[],
+  ): Promise<void> {
+    // Get final usage metadata from the last response that has it
+    const finalUsageMetadata = responses
+      .slice()
+      .reverse()
+      .find((r) => r.usageMetadata)?.usageMetadata;
+
+    // Log API response event for UI telemetry
+    const responseEvent = new ApiResponseEvent(
+      responses[responses.length - 1]?.responseId || 'unknown',
+      context.model,
+      context.duration,
+      context.userPromptId,
+      context.authType,
+      finalUsageMetadata,
+    );
+
+    logApiResponse(this.config, responseEvent);
+
+    // Log interaction if enabled - combine chunks only when needed
+    if (
+      this.enableOpenAILogging &&
+      openaiRequest &&
+      openaiChunks &&
+      openaiChunks.length > 0
+    ) {
+      const combinedResponse = this.combineOpenAIChunksForLogging(openaiChunks);
+      await this.logger.logInteraction(openaiRequest, combinedResponse);
+    }
+  }
+
+  /**
+   * Combine OpenAI chunks for logging purposes
+   * This method consolidates all OpenAI stream chunks into a single ChatCompletion response
+   * for telemetry and logging purposes, avoiding unnecessary format conversions
+   */
+  private combineOpenAIChunksForLogging(
+    chunks: OpenAI.Chat.ChatCompletionChunk[],
+  ): OpenAI.Chat.ChatCompletion {
+    if (chunks.length === 0) {
+      throw new Error('No chunks to combine');
+    }
+
+    const firstChunk = chunks[0];
+
+    // Combine all content from chunks
+    let combinedContent = '';
+    const toolCalls: OpenAI.Chat.ChatCompletionMessageToolCall[] = [];
+    let finishReason:
+      | 'stop'
+      | 'length'
+      | 'tool_calls'
+      | 'content_filter'
+      | 'function_call'
+      | null = null;
+    let combinedReasoning = '';
+    let usage:
+      | {
+          prompt_tokens: number;
+          completion_tokens: number;
+          total_tokens: number;
+        }
+      | undefined;
+
+    for (const chunk of chunks) {
+      const choice = chunk.choices?.[0];
+      if (choice) {
+        // Combine reasoning content
+        const reasoningContent = (choice.delta as ExtendedCompletionChunkDelta)
+          ?.reasoning_content;
+        if (reasoningContent) {
+          combinedReasoning += reasoningContent;
+        }
+        // Combine text content
+        if (choice.delta?.content) {
+          combinedContent += choice.delta.content;
+        }
+
+        // Collect tool calls
+        if (choice.delta?.tool_calls) {
+          for (const toolCall of choice.delta.tool_calls) {
+            if (toolCall.index !== undefined) {
+              if (!toolCalls[toolCall.index]) {
+                toolCalls[toolCall.index] = {
+                  id: toolCall.id || '',
+                  type: toolCall.type || 'function',
+                  function: { name: '', arguments: '' },
+                };
+              }
+
+              if (toolCall.function?.name) {
+                toolCalls[toolCall.index].function.name +=
+                  toolCall.function.name;
+              }
+              if (toolCall.function?.arguments) {
+                toolCalls[toolCall.index].function.arguments +=
+                  toolCall.function.arguments;
+              }
+            }
+          }
+        }
+
+        // Get finish reason from the last chunk
+        if (choice.finish_reason) {
+          finishReason = choice.finish_reason;
+        }
+      }
+
+      // Get usage from the last chunk that has it
+      if (chunk.usage) {
+        usage = chunk.usage;
+      }
+    }
+
+    // Create the combined ChatCompletion response
+    const message: OpenAI.Chat.ChatCompletionMessage = {
+      role: 'assistant',
+      content: combinedContent || null,
+      refusal: null,
+    };
+    if (combinedReasoning) {
+      // Attach reasoning content if any thought tokens were streamed
+      (message as { reasoning_content?: string }).reasoning_content =
+        combinedReasoning;
+    }
+
+    // Add tool calls if any
+    if (toolCalls.length > 0) {
+      message.tool_calls = toolCalls.filter((tc) => tc.id); // Filter out empty tool calls
+    }
+
+    const combinedResponse: OpenAI.Chat.ChatCompletion = {
+      id: firstChunk.id,
+      object: 'chat.completion',
+      created: firstChunk.created,
+      model: firstChunk.model,
+      choices: [
+        {
+          index: 0,
+          message,
+          finish_reason: finishReason || 'stop',
+          logprobs: null,
+        },
+      ],
+      usage: usage || {
+        prompt_tokens: 0,
+        completion_tokens: 0,
+        total_tokens: 0,
+      },
+      system_fingerprint: firstChunk.system_fingerprint,
+    };
+
+    return combinedResponse;
+  }
+}
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -80,9 +80,6 @@ export * from './tools/tool-registry.js';
 // Export subagents (Phase 1)
 export * from './subagents/index.js';

-// Export skills
-export * from './skills/index.js';
-
 // Export prompt logic
 export * from './prompts/mcp-prompts.js';

@@ -104,7 +101,6 @@ export * from './tools/mcp-client-manager.js';
 export * from './tools/mcp-tool.js';
 export * from './tools/sdk-control-client-transport.js';
 export * from './tools/task.js';
-export * from './tools/skill.js';
 export * from './tools/todoWrite.js';
 export * from './tools/exitPlanMode.js';

--- a/packages/core/src/mcp/constants.ts
+++ b/packages/core/src/mcp/constants.ts
@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * OAuth client name used for MCP dynamic client registration.
- * This name must match the allowlist on MCP servers like Figma.
- */
-export const MCP_OAUTH_CLIENT_NAME = 'Gemini CLI MCP Client';
-
-/**
- * OAuth client name for service account impersonation provider.
- */
-export const MCP_SA_IMPERSONATION_CLIENT_NAME =
-  'Gemini CLI (Service Account Impersonation)';
-
-/**
- * Port for OAuth redirect callback server.
- */
-export const OAUTH_REDIRECT_PORT = 7777;
-
-/**
- * Path for OAuth redirect callback.
- */
-export const OAUTH_REDIRECT_PATH = '/oauth/callback';
--- a/packages/core/src/mcp/google-auth-provider.ts
+++ b/packages/core/src/mcp/google-auth-provider.ts
@@ -13,7 +13,6 @@ import type {
 } from '@modelcontextprotocol/sdk/shared/auth.js';
 import { GoogleAuth } from 'google-auth-library';
 import type { MCPServerConfig } from '../config/config.js';
-import { MCP_OAUTH_CLIENT_NAME } from './constants.js';

 const ALLOWED_HOSTS = [/^.+\.googleapis\.com$/, /^(.*\.)?luci\.app$/];

@@ -23,7 +22,7 @@ export class GoogleCredentialProvider implements OAuthClientProvider {
  // Properties required by OAuthClientProvider, with no-op values
  readonly redirectUrl = '';
  readonly clientMetadata: OAuthClientMetadata = {
-    client_name: MCP_OAUTH_CLIENT_NAME,
+    client_name: 'Gemini CLI (Google ADC)',
    redirect_uris: [],
    grant_types: [],
    response_types: [],
--- a/packages/core/src/mcp/oauth-provider.ts
+++ b/packages/core/src/mcp/oauth-provider.ts
@@ -13,11 +13,6 @@ import type { OAuthToken } from './token-storage/types.js';
 import { MCPOAuthTokenStorage } from './oauth-token-storage.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { OAuthUtils } from './oauth-utils.js';
-import {
-  MCP_OAUTH_CLIENT_NAME,
-  OAUTH_REDIRECT_PORT,
-  OAUTH_REDIRECT_PATH,
-} from './constants.js';

 export const OAUTH_DISPLAY_MESSAGE_EVENT = 'oauth-display-message' as const;

@@ -94,6 +89,8 @@ interface PKCEParams {
  state: string;
 }

+const REDIRECT_PORT = 7777;
+const REDIRECT_PATH = '/oauth/callback';
 const HTTP_OK = 200;

 /**
@@ -118,11 +115,10 @@ export class MCPOAuthProvider {
    config: MCPOAuthConfig,
  ): Promise<OAuthClientRegistrationResponse> {
    const redirectUri =
-      config.redirectUri ||
-      `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
+      config.redirectUri || `http://localhost:${REDIRECT_PORT}${REDIRECT_PATH}`;

    const registrationRequest: OAuthClientRegistrationRequest = {
-      client_name: MCP_OAUTH_CLIENT_NAME,
+      client_name: 'Gemini CLI (Google ADC)',
      redirect_uris: [redirectUri],
      grant_types: ['authorization_code', 'refresh_token'],
      response_types: ['code'],
@@ -196,12 +192,9 @@ export class MCPOAuthProvider {
      const server = http.createServer(
        async (req: http.IncomingMessage, res: http.ServerResponse) => {
          try {
-            const url = new URL(
-              req.url!,
-              `http://localhost:${OAUTH_REDIRECT_PORT}`,
-            );
+            const url = new URL(req.url!, `http://localhost:${REDIRECT_PORT}`);

-            if (url.pathname !== OAUTH_REDIRECT_PATH) {
+            if (url.pathname !== REDIRECT_PATH) {
              res.writeHead(404);
              res.end('Not found');
              return;
@@ -264,10 +257,8 @@ export class MCPOAuthProvider {
      );

      server.on('error', reject);
-      server.listen(OAUTH_REDIRECT_PORT, () => {
-        console.log(
-          `OAuth callback server listening on port ${OAUTH_REDIRECT_PORT}`,
-        );
+      server.listen(REDIRECT_PORT, () => {
+        console.log(`OAuth callback server listening on port ${REDIRECT_PORT}`);
      });

      // Timeout after 5 minutes
@@ -295,8 +286,7 @@ export class MCPOAuthProvider {
    mcpServerUrl?: string,
  ): string {
    const redirectUri =
-      config.redirectUri ||
-      `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
+      config.redirectUri || `http://localhost:${REDIRECT_PORT}${REDIRECT_PATH}`;

    const params = new URLSearchParams({
      client_id: config.clientId!,
@@ -353,8 +343,7 @@ export class MCPOAuthProvider {
    mcpServerUrl?: string,
  ): Promise<OAuthTokenResponse> {
    const redirectUri =
-      config.redirectUri ||
-      `http://localhost:${OAUTH_REDIRECT_PORT}${OAUTH_REDIRECT_PATH}`;
+      config.redirectUri || `http://localhost:${REDIRECT_PORT}${REDIRECT_PATH}`;

    const params = new URLSearchParams({
      grant_type: 'authorization_code',
--- a/packages/core/src/mcp/sa-impersonation-provider.ts
+++ b/packages/core/src/mcp/sa-impersonation-provider.ts
@@ -13,7 +13,6 @@ import type {
 import { GoogleAuth } from 'google-auth-library';
 import type { MCPServerConfig } from '../config/config.js';
 import type { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js';
-import { MCP_SA_IMPERSONATION_CLIENT_NAME } from './constants.js';

 const fiveMinBufferMs = 5 * 60 * 1000;

@@ -33,7 +32,7 @@ export class ServiceAccountImpersonationProvider
  // Properties required by OAuthClientProvider, with no-op values
  readonly redirectUrl = '';
  readonly clientMetadata: OAuthClientMetadata = {
-    client_name: MCP_SA_IMPERSONATION_CLIENT_NAME,
+    client_name: 'Gemini CLI (Service Account Impersonation)',
    redirect_uris: [],
    grant_types: [],
    response_types: [],
--- a/packages/core/src/skills/index.ts
+++ b/packages/core/src/skills/index.ts
@@ -1,31 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @fileoverview Skills feature implementation
- *
- * This module provides the foundation for the skills feature, which allows
- * users to define reusable skill configurations that can be loaded by the
- * model via a dedicated Skills tool.
- *
- * Skills are stored as directories in `.qwen/skills/` (project-level) or
- * `~/.qwen/skills/` (user-level), with each directory containing a SKILL.md
- * file with YAML frontmatter for metadata.
- */
-
-// Core types and interfaces
-export type {
-  SkillConfig,
-  SkillLevel,
-  SkillValidationResult,
-  ListSkillsOptions,
-  SkillErrorCode,
-} from './types.js';
-
-export { SkillError } from './types.js';
-
-// Main management class
-export { SkillManager } from './skill-manager.js';
--- a/packages/core/src/skills/skill-manager.test.ts
+++ b/packages/core/src/skills/skill-manager.test.ts
@@ -1,463 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { vi, describe, it, expect, beforeEach, afterEach } from 'vitest';
-import * as fs from 'fs/promises';
-import * as path from 'path';
-import * as os from 'os';
-import { SkillManager } from './skill-manager.js';
-import { type SkillConfig, SkillError } from './types.js';
-import type { Config } from '../config/config.js';
-import { makeFakeConfig } from '../test-utils/config.js';
-
-// Mock file system operations
-vi.mock('fs/promises');
-vi.mock('os');
-
-// Mock yaml parser - use vi.hoisted for proper hoisting
-const mockParseYaml = vi.hoisted(() => vi.fn());
-
-vi.mock('../utils/yaml-parser.js', () => ({
-  parse: mockParseYaml,
-  stringify: vi.fn(),
-}));
-
-describe('SkillManager', () => {
-  let manager: SkillManager;
-  let mockConfig: Config;
-
-  beforeEach(() => {
-    // Create mock Config object using test utility
-    mockConfig = makeFakeConfig({});
-
-    // Mock the project root method
-    vi.spyOn(mockConfig, 'getProjectRoot').mockReturnValue('/test/project');
-
-    // Mock os.homedir
-    vi.mocked(os.homedir).mockReturnValue('/home/user');
-
-    // Reset and setup mocks
-    vi.clearAllMocks();
-
-    // Setup yaml parser mocks with sophisticated behavior
-    mockParseYaml.mockImplementation((yamlString: string) => {
-      // Handle different test cases based on YAML content
-      if (yamlString.includes('allowedTools:')) {
-        return {
-          name: 'test-skill',
-          description: 'A test skill',
-          allowedTools: ['read_file', 'write_file'],
-        };
-      }
-      if (yamlString.includes('name: skill1')) {
-        return { name: 'skill1', description: 'First skill' };
-      }
-      if (yamlString.includes('name: skill2')) {
-        return { name: 'skill2', description: 'Second skill' };
-      }
-      if (yamlString.includes('name: skill3')) {
-        return { name: 'skill3', description: 'Third skill' };
-      }
-      if (!yamlString.includes('name:')) {
-        return { description: 'A test skill' }; // Missing name case
-      }
-      if (!yamlString.includes('description:')) {
-        return { name: 'test-skill' }; // Missing description case
-      }
-      // Default case
-      return {
-        name: 'test-skill',
-        description: 'A test skill',
-      };
-    });
-
-    manager = new SkillManager(mockConfig);
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  const validSkillConfig: SkillConfig = {
-    name: 'test-skill',
-    description: 'A test skill',
-    level: 'project',
-    filePath: '/test/project/.qwen/skills/test-skill/SKILL.md',
-    body: 'You are a helpful assistant with this skill.',
-  };
-
-  const validMarkdown = `---
-name: test-skill
-description: A test skill
---
-
-You are a helpful assistant with this skill.
-`;
-
-  describe('parseSkillContent', () => {
-    it('should parse valid markdown content', () => {
-      const config = manager.parseSkillContent(
-        validMarkdown,
-        validSkillConfig.filePath,
-        'project',
-      );
-
-      expect(config.name).toBe('test-skill');
-      expect(config.description).toBe('A test skill');
-      expect(config.body).toBe('You are a helpful assistant with this skill.');
-      expect(config.level).toBe('project');
-      expect(config.filePath).toBe(validSkillConfig.filePath);
-    });
-
-    it('should parse content with allowedTools', () => {
-      const markdownWithTools = `---
-name: test-skill
-description: A test skill
-allowedTools:
-  - read_file
-  - write_file
---
-
-You are a helpful assistant with this skill.
-`;
-
-      const config = manager.parseSkillContent(
-        markdownWithTools,
-        validSkillConfig.filePath,
-        'project',
-      );
-
-      expect(config.allowedTools).toEqual(['read_file', 'write_file']);
-    });
-
-    it('should determine level from file path', () => {
-      const projectPath = '/test/project/.qwen/skills/test-skill/SKILL.md';
-      const userPath = '/home/user/.qwen/skills/test-skill/SKILL.md';
-
-      const projectConfig = manager.parseSkillContent(
-        validMarkdown,
-        projectPath,
-        'project',
-      );
-      const userConfig = manager.parseSkillContent(
-        validMarkdown,
-        userPath,
-        'user',
-      );
-
-      expect(projectConfig.level).toBe('project');
-      expect(userConfig.level).toBe('user');
-    });
-
-    it('should throw error for invalid frontmatter format', () => {
-      const invalidMarkdown = `No frontmatter here
-Just content`;
-
-      expect(() =>
-        manager.parseSkillContent(
-          invalidMarkdown,
-          validSkillConfig.filePath,
-          'project',
-        ),
-      ).toThrow(SkillError);
-    });
-
-    it('should throw error for missing name', () => {
-      const markdownWithoutName = `---
-description: A test skill
---
-
-You are a helpful assistant.
-`;
-
-      expect(() =>
-        manager.parseSkillContent(
-          markdownWithoutName,
-          validSkillConfig.filePath,
-          'project',
-        ),
-      ).toThrow(SkillError);
-    });
-
-    it('should throw error for missing description', () => {
-      const markdownWithoutDescription = `---
-name: test-skill
---
-
-You are a helpful assistant.
-`;
-
-      expect(() =>
-        manager.parseSkillContent(
-          markdownWithoutDescription,
-          validSkillConfig.filePath,
-          'project',
-        ),
-      ).toThrow(SkillError);
-    });
-  });
-
-  describe('validateConfig', () => {
-    it('should validate valid configuration', () => {
-      const result = manager.validateConfig(validSkillConfig);
-
-      expect(result.isValid).toBe(true);
-      expect(result.errors).toHaveLength(0);
-    });
-
-    it('should report error for missing name', () => {
-      const invalidConfig = { ...validSkillConfig, name: '' };
-      const result = manager.validateConfig(invalidConfig);
-
-      expect(result.isValid).toBe(false);
-      expect(result.errors).toContain('"name" cannot be empty');
-    });
-
-    it('should report error for missing description', () => {
-      const invalidConfig = { ...validSkillConfig, description: '' };
-      const result = manager.validateConfig(invalidConfig);
-
-      expect(result.isValid).toBe(false);
-      expect(result.errors).toContain('"description" cannot be empty');
-    });
-
-    it('should report error for invalid allowedTools type', () => {
-      const invalidConfig = {
-        ...validSkillConfig,
-        allowedTools: 'not-an-array' as unknown as string[],
-      };
-      const result = manager.validateConfig(invalidConfig);
-
-      expect(result.isValid).toBe(false);
-      expect(result.errors).toContain('"allowedTools" must be an array');
-    });
-
-    it('should warn for empty body', () => {
-      const configWithEmptyBody = { ...validSkillConfig, body: '' };
-      const result = manager.validateConfig(configWithEmptyBody);
-
-      expect(result.isValid).toBe(true); // Still valid
-      expect(result.warnings).toContain('Skill body is empty');
-    });
-  });
-
-  describe('loadSkill', () => {
-    it('should load skill from project level first', async () => {
-      vi.mocked(fs.readdir).mockResolvedValue([
-        { name: 'test-skill', isDirectory: () => true, isFile: () => false },
-      ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      vi.mocked(fs.readFile).mockResolvedValue(validMarkdown);
-
-      const config = await manager.loadSkill('test-skill');
-
-      expect(config).toBeDefined();
-      expect(config!.name).toBe('test-skill');
-    });
-
-    it('should fall back to user level if project level fails', async () => {
-      vi.mocked(fs.readdir)
-        .mockRejectedValueOnce(new Error('Project dir not found')) // project level fails
-        .mockResolvedValueOnce([
-          { name: 'test-skill', isDirectory: () => true, isFile: () => false },
-        ] as unknown as Awaited<ReturnType<typeof fs.readdir>>); // user level succeeds
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      vi.mocked(fs.readFile).mockResolvedValue(validMarkdown);
-
-      const config = await manager.loadSkill('test-skill');
-
-      expect(config).toBeDefined();
-      expect(config!.name).toBe('test-skill');
-    });
-
-    it('should return null if not found at either level', async () => {
-      vi.mocked(fs.readdir).mockRejectedValue(new Error('Directory not found'));
-
-      const config = await manager.loadSkill('nonexistent');
-
-      expect(config).toBeNull();
-    });
-  });
-
-  describe('loadSkillForRuntime', () => {
-    it('should load skill for runtime', async () => {
-      vi.mocked(fs.readdir).mockResolvedValueOnce([
-        { name: 'test-skill', isDirectory: () => true, isFile: () => false },
-      ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
-
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      vi.mocked(fs.readFile).mockResolvedValue(validMarkdown); // SKILL.md
-
-      const config = await manager.loadSkillForRuntime('test-skill');
-
-      expect(config).toBeDefined();
-      expect(config!.name).toBe('test-skill');
-    });
-
-    it('should return null if skill not found', async () => {
-      vi.mocked(fs.readdir).mockRejectedValue(new Error('Directory not found'));
-
-      const config = await manager.loadSkillForRuntime('nonexistent');
-
-      expect(config).toBeNull();
-    });
-  });
-
-  describe('listSkills', () => {
-    beforeEach(() => {
-      // Mock directory listing for skills directories (with Dirent objects)
-      vi.mocked(fs.readdir)
-        .mockResolvedValueOnce([
-          { name: 'skill1', isDirectory: () => true, isFile: () => false },
-          { name: 'skill2', isDirectory: () => true, isFile: () => false },
-          {
-            name: 'not-a-dir.txt',
-            isDirectory: () => false,
-            isFile: () => true,
-          },
-        ] as unknown as Awaited<ReturnType<typeof fs.readdir>>)
-        .mockResolvedValueOnce([
-          { name: 'skill3', isDirectory: () => true, isFile: () => false },
-          { name: 'skill1', isDirectory: () => true, isFile: () => false },
-        ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
-
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-
-      // Mock file reading for valid skills
-      vi.mocked(fs.readFile).mockImplementation((filePath) => {
-        const pathStr = String(filePath);
-        if (pathStr.includes('skill1')) {
-          return Promise.resolve(`---
-name: skill1
-description: First skill
---
-Skill 1 content`);
-        } else if (pathStr.includes('skill2')) {
-          return Promise.resolve(`---
-name: skill2
-description: Second skill
---
-Skill 2 content`);
-        } else if (pathStr.includes('skill3')) {
-          return Promise.resolve(`---
-name: skill3
-description: Third skill
---
-Skill 3 content`);
-        }
-        return Promise.reject(new Error('File not found'));
-      });
-    });
-
-    it('should list skills from both levels', async () => {
-      const skills = await manager.listSkills();
-
-      expect(skills).toHaveLength(3); // skill1 (project takes precedence), skill2, skill3
-      expect(skills.map((s) => s.name).sort()).toEqual([
-        'skill1',
-        'skill2',
-        'skill3',
-      ]);
-    });
-
-    it('should prioritize project level over user level', async () => {
-      const skills = await manager.listSkills();
-      const skill1 = skills.find((s) => s.name === 'skill1');
-
-      expect(skill1!.level).toBe('project');
-    });
-
-    it('should filter by level', async () => {
-      const projectSkills = await manager.listSkills({
-        level: 'project',
-      });
-
-      expect(projectSkills).toHaveLength(2); // skill1, skill2
-      expect(projectSkills.every((s) => s.level === 'project')).toBe(true);
-    });
-
-    it('should handle empty directories', async () => {
-      vi.mocked(fs.readdir).mockReset();
-      vi.mocked(fs.readdir).mockResolvedValue(
-        [] as unknown as Awaited<ReturnType<typeof fs.readdir>>,
-      );
-
-      const skills = await manager.listSkills({ force: true });
-
-      expect(skills).toHaveLength(0);
-    });
-
-    it('should handle directory read errors', async () => {
-      vi.mocked(fs.readdir).mockReset();
-      vi.mocked(fs.readdir).mockRejectedValue(new Error('Directory not found'));
-
-      const skills = await manager.listSkills({ force: true });
-
-      expect(skills).toHaveLength(0);
-    });
-  });
-
-  describe('getSkillsBaseDir', () => {
-    it('should return project-level base dir', () => {
-      const baseDir = manager.getSkillsBaseDir('project');
-
-      expect(baseDir).toBe(path.join('/test/project', '.qwen', 'skills'));
-    });
-
-    it('should return user-level base dir', () => {
-      const baseDir = manager.getSkillsBaseDir('user');
-
-      expect(baseDir).toBe(path.join('/home/user', '.qwen', 'skills'));
-    });
-  });
-
-  describe('change listeners', () => {
-    it('should notify listeners when cache is refreshed', async () => {
-      const listener = vi.fn();
-      manager.addChangeListener(listener);
-
-      vi.mocked(fs.readdir).mockResolvedValue(
-        [] as unknown as Awaited<ReturnType<typeof fs.readdir>>,
-      );
-
-      await manager.refreshCache();
-
-      expect(listener).toHaveBeenCalled();
-    });
-
-    it('should remove listener when cleanup function is called', async () => {
-      const listener = vi.fn();
-      const removeListener = manager.addChangeListener(listener);
-
-      removeListener();
-
-      vi.mocked(fs.readdir).mockResolvedValue(
-        [] as unknown as Awaited<ReturnType<typeof fs.readdir>>,
-      );
-
-      await manager.refreshCache();
-
-      expect(listener).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('parse errors', () => {
-    it('should track parse errors', async () => {
-      vi.mocked(fs.readdir).mockResolvedValue([
-        { name: 'bad-skill', isDirectory: () => true, isFile: () => false },
-      ] as unknown as Awaited<ReturnType<typeof fs.readdir>>);
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        'invalid content without frontmatter',
-      );
-
-      await manager.listSkills({ force: true });
-
-      const errors = manager.getParseErrors();
-      expect(errors.size).toBeGreaterThan(0);
-    });
-  });
-});
--- a/packages/core/src/skills/skill-manager.ts
+++ b/packages/core/src/skills/skill-manager.ts
@@ -1,452 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import * as fs from 'fs/promises';
-import * as path from 'path';
-import * as os from 'os';
-import { parse as parseYaml } from '../utils/yaml-parser.js';
-import type {
-  SkillConfig,
-  SkillLevel,
-  ListSkillsOptions,
-  SkillValidationResult,
-} from './types.js';
-import { SkillError, SkillErrorCode } from './types.js';
-import type { Config } from '../config/config.js';
-
-const QWEN_CONFIG_DIR = '.qwen';
-const SKILLS_CONFIG_DIR = 'skills';
-const SKILL_MANIFEST_FILE = 'SKILL.md';
-
-/**
- * Manages skill configurations stored as directories containing SKILL.md files.
- * Provides discovery, parsing, validation, and caching for skills.
- */
-export class SkillManager {
-  private skillsCache: Map<SkillLevel, SkillConfig[]> | null = null;
-  private readonly changeListeners: Set<() => void> = new Set();
-  private parseErrors: Map<string, SkillError> = new Map();
-
-  constructor(private readonly config: Config) {}
-
-  /**
-   * Adds a listener that will be called when skills change.
-   * @returns A function to remove the listener.
-   */
-  addChangeListener(listener: () => void): () => void {
-    this.changeListeners.add(listener);
-    return () => {
-      this.changeListeners.delete(listener);
-    };
-  }
-
-  /**
-   * Notifies all registered change listeners.
-   */
-  private notifyChangeListeners(): void {
-    for (const listener of this.changeListeners) {
-      try {
-        listener();
-      } catch (error) {
-        console.warn('Skill change listener threw an error:', error);
-      }
-    }
-  }
-
-  /**
-   * Gets any parse errors that occurred during skill loading.
-   * @returns Map of skill paths to their parse errors.
-   */
-  getParseErrors(): Map<string, SkillError> {
-    return new Map(this.parseErrors);
-  }
-
-  /**
-   * Lists all available skills.
-   *
-   * @param options - Filtering options
-   * @returns Array of skill configurations
-   */
-  async listSkills(options: ListSkillsOptions = {}): Promise<SkillConfig[]> {
-    const skills: SkillConfig[] = [];
-    const seenNames = new Set<string>();
-
-    const levelsToCheck: SkillLevel[] = options.level
-      ? [options.level]
-      : ['project', 'user'];
-
-    // Check if we should use cache or force refresh
-    const shouldUseCache = !options.force && this.skillsCache !== null;
-
-    // Initialize cache if it doesn't exist or we're forcing a refresh
-    if (!shouldUseCache) {
-      await this.refreshCache();
-    }
-
-    // Collect skills from each level (project takes precedence over user)
-    for (const level of levelsToCheck) {
-      const levelSkills = this.skillsCache?.get(level) || [];
-
-      for (const skill of levelSkills) {
-        // Skip if we've already seen this name (precedence: project > user)
-        if (seenNames.has(skill.name)) {
-          continue;
-        }
-
-        skills.push(skill);
-        seenNames.add(skill.name);
-      }
-    }
-
-    // Sort by name for consistent ordering
-    skills.sort((a, b) => a.name.localeCompare(b.name));
-
-    return skills;
-  }
-
-  /**
-   * Loads a skill configuration by name.
-   * If level is specified, only searches that level.
-   * If level is omitted, searches project-level first, then user-level.
-   *
-   * @param name - Name of the skill to load
-   * @param level - Optional level to limit search to
-   * @returns SkillConfig or null if not found
-   */
-  async loadSkill(
-    name: string,
-    level?: SkillLevel,
-  ): Promise<SkillConfig | null> {
-    if (level) {
-      return this.findSkillByNameAtLevel(name, level);
-    }
-
-    // Try project level first
-    const projectSkill = await this.findSkillByNameAtLevel(name, 'project');
-    if (projectSkill) {
-      return projectSkill;
-    }
-
-    // Try user level
-    return this.findSkillByNameAtLevel(name, 'user');
-  }
-
-  /**
-   * Loads a skill with its full content, ready for runtime use.
-   * This includes loading additional files from the skill directory.
-   *
-   * @param name - Name of the skill to load
-   * @param level - Optional level to limit search to
-   * @returns SkillConfig or null if not found
-   */
-  async loadSkillForRuntime(
-    name: string,
-    level?: SkillLevel,
-  ): Promise<SkillConfig | null> {
-    const skill = await this.loadSkill(name, level);
-    if (!skill) {
-      return null;
-    }
-
-    return skill;
-  }
-
-  /**
-   * Validates a skill configuration.
-   *
-   * @param config - Configuration to validate
-   * @returns Validation result
-   */
-  validateConfig(config: Partial<SkillConfig>): SkillValidationResult {
-    const errors: string[] = [];
-    const warnings: string[] = [];
-
-    // Check required fields
-    if (typeof config.name !== 'string') {
-      errors.push('Missing or invalid "name" field');
-    } else if (config.name.trim() === '') {
-      errors.push('"name" cannot be empty');
-    }
-
-    if (typeof config.description !== 'string') {
-      errors.push('Missing or invalid "description" field');
-    } else if (config.description.trim() === '') {
-      errors.push('"description" cannot be empty');
-    }
-
-    // Validate allowedTools if present
-    if (config.allowedTools !== undefined) {
-      if (!Array.isArray(config.allowedTools)) {
-        errors.push('"allowedTools" must be an array');
-      } else {
-        for (const tool of config.allowedTools) {
-          if (typeof tool !== 'string') {
-            errors.push('"allowedTools" must contain only strings');
-            break;
-          }
-        }
-      }
-    }
-
-    // Warn if body is empty
-    if (!config.body || config.body.trim() === '') {
-      warnings.push('Skill body is empty');
-    }
-
-    return {
-      isValid: errors.length === 0,
-      errors,
-      warnings,
-    };
-  }
-
-  /**
-   * Refreshes the skills cache by loading all skills from disk.
-   */
-  async refreshCache(): Promise<void> {
-    const skillsCache = new Map<SkillLevel, SkillConfig[]>();
-    this.parseErrors.clear();
-
-    const levels: SkillLevel[] = ['project', 'user'];
-
-    for (const level of levels) {
-      const levelSkills = await this.listSkillsAtLevel(level);
-      skillsCache.set(level, levelSkills);
-    }
-
-    this.skillsCache = skillsCache;
-    this.notifyChangeListeners();
-  }
-
-  /**
-   * Parses a SKILL.md file and returns the configuration.
-   *
-   * @param filePath - Path to the SKILL.md file
-   * @param level - Storage level
-   * @returns SkillConfig
-   * @throws SkillError if parsing fails
-   */
-  parseSkillFile(filePath: string, level: SkillLevel): Promise<SkillConfig> {
-    return this.parseSkillFileInternal(filePath, level);
-  }
-
-  /**
-   * Internal implementation of skill file parsing.
-   */
-  private async parseSkillFileInternal(
-    filePath: string,
-    level: SkillLevel,
-  ): Promise<SkillConfig> {
-    let content: string;
-
-    try {
-      content = await fs.readFile(filePath, 'utf8');
-    } catch (error) {
-      const skillError = new SkillError(
-        `Failed to read skill file: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        SkillErrorCode.FILE_ERROR,
-      );
-      this.parseErrors.set(filePath, skillError);
-      throw skillError;
-    }
-
-    return this.parseSkillContent(content, filePath, level);
-  }
-
-  /**
-   * Parses skill content from a string.
-   *
-   * @param content - File content
-   * @param filePath - File path for error reporting
-   * @param level - Storage level
-   * @returns SkillConfig
-   * @throws SkillError if parsing fails
-   */
-  parseSkillContent(
-    content: string,
-    filePath: string,
-    level: SkillLevel,
-  ): SkillConfig {
-    try {
-      // Split frontmatter and content
-      const frontmatterRegex = /^---\n([\s\S]*?)\n---\n([\s\S]*)$/;
-      const match = content.match(frontmatterRegex);
-
-      if (!match) {
-        throw new Error('Invalid format: missing YAML frontmatter');
-      }
-
-      const [, frontmatterYaml, body] = match;
-
-      // Parse YAML frontmatter
-      const frontmatter = parseYaml(frontmatterYaml) as Record<string, unknown>;
-
-      // Extract required fields
-      const nameRaw = frontmatter['name'];
-      const descriptionRaw = frontmatter['description'];
-
-      if (nameRaw == null || nameRaw === '') {
-        throw new Error('Missing "name" in frontmatter');
-      }
-
-      if (descriptionRaw == null || descriptionRaw === '') {
-        throw new Error('Missing "description" in frontmatter');
-      }
-
-      // Convert to strings
-      const name = String(nameRaw);
-      const description = String(descriptionRaw);
-
-      // Extract optional fields
-      const allowedToolsRaw = frontmatter['allowedTools'] as
-        | unknown[]
-        | undefined;
-      let allowedTools: string[] | undefined;
-
-      if (allowedToolsRaw !== undefined) {
-        if (Array.isArray(allowedToolsRaw)) {
-          allowedTools = allowedToolsRaw.map(String);
-        } else {
-          throw new Error('"allowedTools" must be an array');
-        }
-      }
-
-      const config: SkillConfig = {
-        name,
-        description,
-        allowedTools,
-        level,
-        filePath,
-        body: body.trim(),
-      };
-
-      // Validate the parsed configuration
-      const validation = this.validateConfig(config);
-      if (!validation.isValid) {
-        throw new Error(`Validation failed: ${validation.errors.join(', ')}`);
-      }
-
-      return config;
-    } catch (error) {
-      const skillError = new SkillError(
-        `Failed to parse skill file: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        SkillErrorCode.PARSE_ERROR,
-      );
-      this.parseErrors.set(filePath, skillError);
-      throw skillError;
-    }
-  }
-
-  /**
-   * Gets the base directory for skills at a specific level.
-   *
-   * @param level - Storage level
-   * @returns Absolute directory path
-   */
-  getSkillsBaseDir(level: SkillLevel): string {
-    const baseDir =
-      level === 'project'
-        ? path.join(
-            this.config.getProjectRoot(),
-            QWEN_CONFIG_DIR,
-            SKILLS_CONFIG_DIR,
-          )
-        : path.join(os.homedir(), QWEN_CONFIG_DIR, SKILLS_CONFIG_DIR);
-
-    return baseDir;
-  }
-
-  /**
-   * Lists skills at a specific level.
-   *
-   * @param level - Storage level to scan
-   * @returns Array of skill configurations
-   */
-  private async listSkillsAtLevel(level: SkillLevel): Promise<SkillConfig[]> {
-    const projectRoot = this.config.getProjectRoot();
-    const homeDir = os.homedir();
-    const isHomeDirectory = path.resolve(projectRoot) === path.resolve(homeDir);
-
-    // If project level is requested but project root is same as home directory,
-    // return empty array to avoid conflicts between project and global skills
-    if (level === 'project' && isHomeDirectory) {
-      return [];
-    }
-
-    const baseDir = this.getSkillsBaseDir(level);
-
-    try {
-      const entries = await fs.readdir(baseDir, { withFileTypes: true });
-      const skills: SkillConfig[] = [];
-
-      for (const entry of entries) {
-        // Only process directories (each skill is a directory)
-        if (!entry.isDirectory()) continue;
-
-        const skillDir = path.join(baseDir, entry.name);
-        const skillManifest = path.join(skillDir, SKILL_MANIFEST_FILE);
-
-        try {
-          // Check if SKILL.md exists
-          await fs.access(skillManifest);
-
-          const config = await this.parseSkillFileInternal(
-            skillManifest,
-            level,
-          );
-          skills.push(config);
-        } catch (error) {
-          // Skip directories without valid SKILL.md
-          if (error instanceof SkillError) {
-            // Parse error was already recorded
-            console.warn(
-              `Failed to parse skill at ${skillDir}: ${error.message}`,
-            );
-          }
-          continue;
-        }
-      }
-
-      return skills;
-    } catch (_error) {
-      // Directory doesn't exist or can't be read
-      return [];
-    }
-  }
-
-  /**
-   * Finds a skill by name at a specific level.
-   *
-   * @param name - Name of the skill to find
-   * @param level - Storage level to search
-   * @returns SkillConfig or null if not found
-   */
-  private async findSkillByNameAtLevel(
-    name: string,
-    level: SkillLevel,
-  ): Promise<SkillConfig | null> {
-    await this.ensureLevelCache(level);
-
-    const levelSkills = this.skillsCache?.get(level) || [];
-
-    // Find the skill with matching name
-    return levelSkills.find((skill) => skill.name === name) || null;
-  }
-
-  /**
-   * Ensures the cache is populated for a specific level without loading other levels.
-   */
-  private async ensureLevelCache(level: SkillLevel): Promise<void> {
-    if (!this.skillsCache) {
-      this.skillsCache = new Map<SkillLevel, SkillConfig[]>();
-    }
-
-    if (!this.skillsCache.has(level)) {
-      const levelSkills = await this.listSkillsAtLevel(level);
-      this.skillsCache.set(level, levelSkills);
-    }
-  }
-}
--- a/packages/core/src/skills/types.ts
+++ b/packages/core/src/skills/types.ts
@@ -1,105 +0,0 @@
-/**
- * @license
- * Copyright 2025 Qwen
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * Represents the storage level for a skill configuration.
- * - 'project': Stored in `.qwen/skills/` within the project directory
- * - 'user': Stored in `~/.qwen/skills/` in the user's home directory
- */
-export type SkillLevel = 'project' | 'user';
-
-/**
- * Core configuration for a skill as stored in SKILL.md files.
- * Each skill directory contains a SKILL.md file with YAML frontmatter
- * containing metadata, followed by markdown content describing the skill.
- */
-export interface SkillConfig {
-  /** Unique name identifier for the skill */
-  name: string;
-
-  /** Human-readable description of what this skill provides */
-  description: string;
-
-  /**
-   * Optional list of tool names that this skill is allowed to use.
-   * For v1, this is informational only (no gating).
-   */
-  allowedTools?: string[];
-
-  /**
-   * Storage level - determines where the configuration file is stored
-   */
-  level: SkillLevel;
-
-  /**
-   * Absolute path to the skill directory containing SKILL.md
-   */
-  filePath: string;
-
-  /**
-   * The markdown body content from SKILL.md (after the frontmatter)
-   */
-  body: string;
-}
-
-/**
- * Runtime configuration for a skill when it's being actively used.
- * Extends SkillConfig with additional runtime-specific fields.
- */
-export type SkillRuntimeConfig = SkillConfig;
-
-/**
- * Result of a validation operation on a skill configuration.
- */
-export interface SkillValidationResult {
-  /** Whether the configuration is valid */
-  isValid: boolean;
-
-  /** Array of error messages if validation failed */
-  errors: string[];
-
-  /** Array of warning messages (non-blocking issues) */
-  warnings: string[];
-}
-
-/**
- * Options for listing skills.
- */
-export interface ListSkillsOptions {
-  /** Filter by storage level */
-  level?: SkillLevel;
-
-  /** Force refresh from disk, bypassing cache. Defaults to false. */
-  force?: boolean;
-}
-
-/**
- * Error thrown when a skill operation fails.
- */
-export class SkillError extends Error {
-  constructor(
-    message: string,
-    readonly code: SkillErrorCode,
-    readonly skillName?: string,
-  ) {
-    super(message);
-    this.name = 'SkillError';
-  }
-}
-
-/**
- * Error codes for skill operations.
- */
-export const SkillErrorCode = {
-  NOT_FOUND: 'NOT_FOUND',
-  INVALID_CONFIG: 'INVALID_CONFIG',
-  INVALID_NAME: 'INVALID_NAME',
-  FILE_ERROR: 'FILE_ERROR',
-  PARSE_ERROR: 'PARSE_ERROR',
-} as const;
-
-export type SkillErrorCode =
-  (typeof SkillErrorCode)[keyof typeof SkillErrorCode];
--- a/packages/core/src/telemetry/constants.ts
+++ b/packages/core/src/telemetry/constants.ts
@@ -33,7 +33,6 @@ export const EVENT_MALFORMED_JSON_RESPONSE =
 export const EVENT_FILE_OPERATION = 'qwen-code.file_operation';
 export const EVENT_MODEL_SLASH_COMMAND = 'qwen-code.slash_command.model';
 export const EVENT_SUBAGENT_EXECUTION = 'qwen-code.subagent_execution';
-export const EVENT_SKILL_LAUNCH = 'qwen-code.skill_launch';
 export const EVENT_AUTH = 'qwen-code.auth';

 // Performance Events
--- a/packages/core/src/telemetry/index.ts
+++ b/packages/core/src/telemetry/index.ts
@@ -44,7 +44,6 @@ export {
  logRipgrepFallback,
  logNextSpeakerCheck,
  logAuth,
-  logSkillLaunch,
 } from './loggers.js';
 export type { SlashCommandEvent, ChatCompressionEvent } from './types.js';
 export {
@@ -64,7 +63,6 @@ export {
  RipgrepFallbackEvent,
  NextSpeakerCheckEvent,
  AuthEvent,
-  SkillLaunchEvent,
 } from './types.js';
 export { makeSlashCommandEvent, makeChatCompressionEvent } from './types.js';
 export type { TelemetryEvent } from './types.js';
--- a/packages/core/src/telemetry/loggers.test.ts
+++ b/packages/core/src/telemetry/loggers.test.ts
@@ -200,8 +200,6 @@ describe('loggers', () => {
          mcp_tools: undefined,
          mcp_tools_count: undefined,
          output_format: 'json',
-          skills: undefined,
-          subagents: undefined,
        },
      });
    });
@@ -264,7 +262,7 @@ describe('loggers', () => {
          'event.timestamp': '2025-01-01T00:00:00.000Z',
          prompt_length: 11,
          prompt_id: 'prompt-id-9',
-          auth_type: 'gemini',
+          auth_type: 'gemini-api-key',
        },
      });
    });
@@ -333,7 +331,7 @@ describe('loggers', () => {
          total_token_count: 0,
          response_text: 'test-response',
          prompt_id: 'prompt-id-1',
-          auth_type: 'gemini',
+          auth_type: 'gemini-api-key',
        },
      });

--- a/packages/core/src/telemetry/loggers.ts
+++ b/packages/core/src/telemetry/loggers.ts
@@ -37,7 +37,6 @@ import {
  EVENT_MALFORMED_JSON_RESPONSE,
  EVENT_INVALID_CHUNK,
  EVENT_AUTH,
-  EVENT_SKILL_LAUNCH,
 } from './constants.js';
 import {
  recordApiErrorMetrics,
@@ -85,7 +84,6 @@ import type {
  MalformedJsonResponseEvent,
  InvalidChunkEvent,
  AuthEvent,
-  SkillLaunchEvent,
 } from './types.js';
 import type { UiEvent } from './uiTelemetry.js';
 import { uiTelemetryService } from './uiTelemetry.js';
@@ -125,8 +123,6 @@ export function logStartSession(
    mcp_tools: event.mcp_tools,
    mcp_tools_count: event.mcp_tools_count,
    output_format: event.output_format,
-    skills: event.skills,
-    subagents: event.subagents,
  };

  const logger = logs.getLogger(SERVICE_NAME);
@@ -869,21 +865,3 @@ export function logAuth(config: Config, event: AuthEvent): void {
  };
  logger.emit(logRecord);
 }
-
-export function logSkillLaunch(config: Config, event: SkillLaunchEvent): void {
-  if (!isTelemetrySdkInitialized()) return;
-
-  const attributes: LogAttributes = {
-    ...getCommonAttributes(config),
-    ...event,
-    'event.name': EVENT_SKILL_LAUNCH,
-    'event.timestamp': new Date().toISOString(),
-  };
-
-  const logger = logs.getLogger(SERVICE_NAME);
-  const logRecord: LogRecord = {
-    body: `Skill launch: ${event.skill_name}. Success: ${event.success}.`,
-    attributes,
-  };
-  logger.emit(logRecord);
-}
--- a/packages/core/src/telemetry/qwen-logger/qwen-logger.ts
+++ b/packages/core/src/telemetry/qwen-logger/qwen-logger.ts
@@ -38,7 +38,6 @@ import type {
  ModelSlashCommandEvent,
  ExtensionDisableEvent,
  AuthEvent,
-  SkillLaunchEvent,
  RipgrepFallbackEvent,
  EndSessionEvent,
 } from '../types.js';
@@ -392,8 +391,6 @@ export class QwenLogger {
        telemetry_enabled: event.telemetry_enabled,
        telemetry_log_user_prompts_enabled:
          event.telemetry_log_user_prompts_enabled,
-        skills: event.skills,
-        subagents: event.subagents,
      },
    });

@@ -830,18 +827,6 @@ export class QwenLogger {
    this.flushIfNeeded();
  }

-  logSkillLaunchEvent(event: SkillLaunchEvent): void {
-    const rumEvent = this.createActionEvent('misc', 'skill_launch', {
-      properties: {
-        skill_name: event.skill_name,
-        success: event.success ? 1 : 0,
-      },
-    });
-
-    this.enqueueLogEvent(rumEvent);
-    this.flushIfNeeded();
-  }
-
  logChatCompressionEvent(event: ChatCompressionEvent): void {
    const rumEvent = this.createActionEvent('misc', 'chat_compression', {
      properties: {
--- a/packages/core/src/telemetry/types.ts
+++ b/packages/core/src/telemetry/types.ts
@@ -18,9 +18,6 @@ import {
 import type { FileOperation } from './metrics.js';
 export { ToolCallDecision };
 import type { OutputFormat } from '../output/types.js';
-import { ToolNames } from '../tools/tool-names.js';
-import type { SkillTool } from '../tools/skill.js';
-import type { TaskTool } from '../tools/task.js';

 export interface BaseTelemetryEvent {
  'event.name': string;
@@ -50,8 +47,6 @@ export class StartSessionEvent implements BaseTelemetryEvent {
  mcp_tools_count?: number;
  mcp_tools?: string;
  output_format: OutputFormat;
-  skills?: string;
-  subagents?: string;

  constructor(config: Config) {
    const generatorConfig = config.getContentGeneratorConfig();
@@ -84,7 +79,6 @@ export class StartSessionEvent implements BaseTelemetryEvent {
      config.getFileFilteringRespectGitIgnore();
    this.mcp_servers_count = mcpServers ? Object.keys(mcpServers).length : 0;
    this.output_format = config.getOutputFormat();
-
    if (toolRegistry) {
      const mcpTools = toolRegistry
        .getAllTools()
@@ -93,22 +87,6 @@ export class StartSessionEvent implements BaseTelemetryEvent {
      this.mcp_tools = mcpTools
        .map((tool) => (tool as DiscoveredMCPTool).name)
        .join(',');
-
-      const skillTool = toolRegistry.getTool(ToolNames.SKILL) as
-        | SkillTool
-        | undefined;
-      const skillNames = skillTool?.getAvailableSkillNames?.();
-      if (skillNames && skillNames.length > 0) {
-        this.skills = skillNames.join(',');
-      }
-
-      const taskTool = toolRegistry.getTool(ToolNames.TASK) as
-        | TaskTool
-        | undefined;
-      const subagentNames = taskTool?.getAvailableSubagentNames?.();
-      if (subagentNames && subagentNames.length > 0) {
-        this.subagents = subagentNames.join(',');
-      }
    }
  }
 }
@@ -743,20 +721,6 @@ export class AuthEvent implements BaseTelemetryEvent {
  }
 }

-export class SkillLaunchEvent implements BaseTelemetryEvent {
-  'event.name': 'skill_launch';
-  'event.timestamp': string;
-  skill_name: string;
-  success: boolean;
-
-  constructor(skill_name: string, success: boolean) {
-    this['event.name'] = 'skill_launch';
-    this['event.timestamp'] = new Date().toISOString();
-    this.skill_name = skill_name;
-    this.success = success;
-  }
-}
-
 export type TelemetryEvent =
  | StartSessionEvent
  | EndSessionEvent
@@ -785,8 +749,7 @@ export type TelemetryEvent =
  | ExtensionUninstallEvent
  | ToolOutputTruncatedEvent
  | ModelSlashCommandEvent
-  | AuthEvent
-  | SkillLaunchEvent;
+  | AuthEvent;

 export class ExtensionDisableEvent implements BaseTelemetryEvent {
  'event.name': 'extension_disable';
--- a/packages/core/src/tools/ls.test.ts
+++ b/packages/core/src/tools/ls.test.ts
@@ -31,8 +31,6 @@ describe('LSTool', () => {
      tempSecondaryDir,
    ]);

-    const userSkillsBase = path.join(os.homedir(), '.qwen', 'skills');
-
    mockConfig = {
      getTargetDir: () => tempRootDir,
      getWorkspaceContext: () => mockWorkspaceContext,
@@ -41,9 +39,6 @@ describe('LSTool', () => {
        respectGitIgnore: true,
        respectQwenIgnore: true,
      }),
-      storage: {
-        getUserSkillsDir: () => userSkillsBase,
-      },
    } as unknown as Config;

    lsTool = new LSTool(mockConfig);
@@ -293,7 +288,7 @@ describe('LSTool', () => {
      };
      const invocation = lsTool.build(params);
      const description = invocation.getDescription();
-      const expected = path.resolve(params.path);
+      const expected = path.relative(tempRootDir, params.path);
      expect(description).toBe(expected);
    });
  });
--- a/packages/core/src/tools/ls.ts
+++ b/packages/core/src/tools/ls.ts
@@ -9,7 +9,6 @@ import path from 'node:path';
 import type { ToolInvocation, ToolResult } from './tools.js';
 import { BaseDeclarativeTool, BaseToolInvocation, Kind } from './tools.js';
 import { makeRelative, shortenPath } from '../utils/paths.js';
-import { isSubpath } from '../utils/paths.js';
 import type { Config } from '../config/config.js';
 import { DEFAULT_FILE_FILTERING_OPTIONS } from '../config/constants.js';
 import { ToolErrorType } from './tool-error.js';
@@ -312,14 +311,8 @@ export class LSTool extends BaseDeclarativeTool<LSToolParams, ToolResult> {
      return `Path must be absolute: ${params.path}`;
    }

-    const userSkillsBase = this.config.storage.getUserSkillsDir();
-    const isUnderUserSkills = isSubpath(userSkillsBase, params.path);
-
    const workspaceContext = this.config.getWorkspaceContext();
-    if (
-      !workspaceContext.isPathWithinWorkspace(params.path) &&
-      !isUnderUserSkills
-    ) {
+    if (!workspaceContext.isPathWithinWorkspace(params.path)) {
      const directories = workspaceContext.getDirectories();
      return `Path must be within one of the workspace directories: ${directories.join(
        ', ',
--- a/packages/core/src/tools/read-file.test.ts
+++ b/packages/core/src/tools/read-file.test.ts
@@ -40,7 +40,6 @@ describe('ReadFileTool', () => {
      getWorkspaceContext: () => createMockWorkspaceContext(tempRootDir),
      storage: {
        getProjectTempDir: () => path.join(tempRootDir, '.temp'),
-        getUserSkillsDir: () => path.join(os.homedir(), '.qwen', 'skills'),
      },
      getTruncateToolOutputThreshold: () => 2500,
      getTruncateToolOutputLines: () => 500,
--- a/Show More
+++ b/Show More