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

README.md

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

docs/users/configuration/settings.md

@@ -275,7 +275,6 @@ If you are experiencing performance issues with file searching (e.g., with `@` c
 | `tools.truncateToolOutputThreshold`  | number            | Truncate tool output if it is larger than this many characters. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | `25000`     | Requires restart: Yes                                                                                                                                                                                                                                |
 | `tools.truncateToolOutputLines`      | number            | Maximum lines or entries kept when truncating tool output. Applies to Shell, Grep, Glob, ReadFile and ReadManyFiles tools.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `1000`      | Requires restart: Yes                                                                                                                                                                                                                                |
 | `tools.autoAccept`                   | boolean           | Controls whether the CLI automatically accepts and executes tool calls that are considered safe (e.g., read-only operations) without explicit user confirmation. If set to `true`, the CLI will bypass the confirmation prompt for tools deemed safe.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | `false`     |                                                                                                                                                                                                                                                      |
-| `tools.experimental.skills`           | boolean           | Enable experimental Agent Skills feature                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `false`     |                                                                                                                                                                                                                                                      |
 
 #### mcp
 
@@ -481,7 +480,7 @@ Arguments passed directly when running the CLI can override other configurations
 | `--telemetry-otlp-protocol`  |       | Sets the OTLP protocol for telemetry (`grpc` or `http`).                                                                                                                                |                                        | Defaults to `grpc`. See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                               |
 | `--telemetry-log-prompts`    |       | Enables logging of prompts for telemetry.                                                                                                                                               |                                        | See [telemetry](../../developers/development/telemetry) for more information.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--checkpointing`            |       | Enables [checkpointing](../features/checkpointing).                                                                                                                                     |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-| `--acp`                      |       | Enables ACP mode (Agent Client Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                            |                                        | Stable. Replaces the deprecated `--experimental-acp` flag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| `--acp`                      |       | Enables ACP mode (Agent Control Protocol). Useful for IDE/editor integrations like [Zed](../integration-zed).                                                                           |                                        | Stable. Replaces the deprecated `--experimental-acp` flag.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | `--experimental-skills`      |       | Enables experimental [Agent Skills](../features/skills) (registers the `skill` tool and loads Skills from `.qwen/skills/` and `~/.qwen/skills/`).                                       |                                        | Experimental.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | `--extensions`               | `-e`  | Specifies a list of extensions to use for the session.                                                                                                                                  | Extension names                        | If not provided, all available extensions are used. Use the special term `qwen -e none` to disable all extensions. Example: `qwen -e my-extension -e my-other-extension`                                                                                                                                                                                                                                                                                                                                                                                        |
 | `--list-extensions`          | `-l`  | Lists all available extensions and exits.                                                                                                                                               |                                        |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |

docs/users/features/skills.md

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

docs/users/integration-jetbrains.md

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

docs/users/integration-vscode.md

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

docs/users/integration-zed.md

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

integration-tests/acp-integration.test.ts

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

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

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

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.7.1",
+  "version": "0.7.0-preview.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.7.1",
+      "version": "0.7.0-preview.0",
       "workspaces": [
         "packages/*"
       ],
@@ -17310,7 +17310,7 @@
     },
     "packages/cli": {
       "name": "@qwen-code/qwen-code",
-      "version": "0.7.1",
+      "version": "0.7.0-preview.0",
       "dependencies": {
         "@google/genai": "1.30.0",
         "@iarna/toml": "^2.2.5",
@@ -17947,7 +17947,7 @@
     },
     "packages/core": {
       "name": "@qwen-code/qwen-code-core",
-      "version": "0.7.1",
+      "version": "0.7.0-preview.0",
       "hasInstallScript": true,
       "dependencies": {
         "@anthropic-ai/sdk": "^0.36.1",
@@ -18588,7 +18588,7 @@
     },
     "packages/sdk-typescript": {
       "name": "@qwen-code/sdk",
-      "version": "0.1.3",
+      "version": "0.1.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",
@@ -21408,7 +21408,7 @@
     },
     "packages/test-utils": {
       "name": "@qwen-code/qwen-code-test-utils",
-      "version": "0.7.1",
+      "version": "0.7.0-preview.0",
       "dev": true,
       "license": "Apache-2.0",
       "devDependencies": {
@@ -21420,7 +21420,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "qwen-code-vscode-ide-companion",
-      "version": "0.7.1",
+      "version": "0.7.0-preview.0",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.25.1",

package.json

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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.7.1",
+  "version": "0.7.0-preview.0",
   "description": "Qwen Code",
   "repository": {
     "type": "git",
@@ -33,7 +33,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.7.1"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.7.0-preview.0"
   },
   "dependencies": {
     "@google/genai": "1.30.0",

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

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

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

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

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

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

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

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

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

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

packages/cli/src/config/config.ts

@@ -334,7 +334,7 @@ export async function parseArguments(settings: Settings): Promise<CliArgs> {
         .option('experimental-skills', {
           type: 'boolean',
           description: 'Enable experimental Skills feature',
-          default: settings.tools?.experimental?.skills ?? false,
+          default: false,
         })
         .option('channel', {
           type: 'string',
@@ -874,10 +874,11 @@ export async function loadCliConfig(
     }
   };
 
-  // ACP mode check: must include both --acp (current) and --experimental-acp (deprecated).
-  // Without this check, edit, write_file, run_shell_command would be excluded in ACP mode.
-  const isAcpMode = argv.acp || argv.experimentalAcp;
-  if (!interactive && !isAcpMode && inputFormat !== InputFormat.STREAM_JSON) {
+  if (
+    !interactive &&
+    !argv.experimentalAcp &&
+    inputFormat !== InputFormat.STREAM_JSON
+  ) {
     switch (approvalMode) {
       case ApprovalMode.PLAN:
       case ApprovalMode.DEFAULT:

packages/cli/src/config/settingsSchema.ts

@@ -981,27 +981,6 @@ const SETTINGS_SCHEMA = {
         description: 'The number of lines to keep when truncating tool output.',
         showInDialog: true,
       },
-      experimental: {
-        type: 'object',
-        label: 'Experimental',
-        category: 'Tools',
-        requiresRestart: true,
-        default: {},
-        description: 'Experimental tool features.',
-        showInDialog: false,
-        properties: {
-          skills: {
-            type: 'boolean',
-            label: 'Skills',
-            category: 'Tools',
-            requiresRestart: true,
-            default: false,
-            description:
-              'Enable experimental Agent Skills feature. When enabled, Qwen Code can use Skills from .qwen/skills/ and ~/.qwen/skills/.',
-            showInDialog: true,
-          },
-        },
-      },
     },
   },
 

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

@@ -873,11 +873,11 @@ export default {
   'Session Stats': '会话统计',
   'Model Usage': '模型使用情况',
   Reqs: '请求数',
-  'Input Tokens': '输入 token 数',
-  'Output Tokens': '输出 token 数',
+  'Input Tokens': '输入令牌',
+  'Output Tokens': '输出令牌',
   'Savings Highlight:': '节省亮点：',
   'of input tokens were served from the cache, reducing costs.':
-    '从缓存载入 token ，降低了成本',
+    '的输入令牌来自缓存，降低了成本',
   'Tip: For a full token breakdown, run `/stats model`.':
     '提示：要查看完整的令牌明细，请运行 `/stats model`',
   'Model Stats For Nerds': '模型统计（技术细节）',

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

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

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

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

packages/cli/src/utils/commentJson.ts

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

packages/cli/src/utils/modelConfigUtils.ts

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

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code-core",
-  "version": "0.7.1",
+  "version": "0.7.0-preview.0",
   "description": "Qwen Code Core",
   "repository": {
     "type": "git",

packages/core/src/config/config.ts

@@ -404,7 +404,7 @@ export class Config {
   private toolRegistry!: ToolRegistry;
   private promptRegistry!: PromptRegistry;
   private subagentManager!: SubagentManager;
-  private skillManager: SkillManager | null = null;
+  private skillManager!: SkillManager;
   private fileSystemService: FileSystemService;
   private contentGeneratorConfig!: ContentGeneratorConfig;
   private contentGeneratorConfigSources: ContentGeneratorConfigSources = {};
@@ -672,10 +672,8 @@ export class Config {
     }
     this.promptRegistry = new PromptRegistry();
     this.subagentManager = new SubagentManager(this);
-    if (this.getExperimentalSkills()) {
-      this.skillManager = new SkillManager(this);
-      await this.skillManager.startWatching();
-    }
+    this.skillManager = new SkillManager(this);
+    await this.skillManager.startWatching();
 
     // Load session subagents if they were provided before initialization
     if (this.sessionSubagents.length > 0) {
@@ -1441,7 +1439,7 @@ export class Config {
     return this.subagentManager;
   }
 
-  getSkillManager(): SkillManager | null {
+  getSkillManager(): SkillManager {
     return this.skillManager;
   }
 

packages/core/src/core/contentGenerator.ts

@@ -270,28 +270,28 @@ export function createContentGeneratorConfig(
 }
 
 export async function createContentGenerator(
-  generatorConfig: ContentGeneratorConfig,
-  config: Config,
+  config: ContentGeneratorConfig,
+  gcConfig: Config,
   isInitialAuth?: boolean,
 ): Promise<ContentGenerator> {
-  const validation = validateModelConfig(generatorConfig, false);
+  const validation = validateModelConfig(config, false);
   if (!validation.valid) {
     throw new Error(validation.errors.map((e) => e.message).join('\n'));
   }
 
-  const authType = generatorConfig.authType;
-  if (!authType) {
-    throw new Error('ContentGeneratorConfig must have an authType');
-  }
-
-  let baseGenerator: ContentGenerator;
-
-  if (authType === AuthType.USE_OPENAI) {
+  if (config.authType === AuthType.USE_OPENAI) {
+    // Import OpenAIContentGenerator dynamically to avoid circular dependencies
     const { createOpenAIContentGenerator } = await import(
       './openaiContentGenerator/index.js'
     );
-    baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
-  } else if (authType === AuthType.QWEN_OAUTH) {
+
+    // Always use OpenAIContentGenerator, logging is controlled by enableOpenAILogging flag
+    const generator = createOpenAIContentGenerator(config, gcConfig);
+    return new LoggingContentGenerator(generator, gcConfig);
+  }
+
+  if (config.authType === AuthType.QWEN_OAUTH) {
+    // Import required classes dynamically
     const { getQwenOAuthClient: getQwenOauthClient } = await import(
       '../qwen/qwenOAuth2.js'
     );
@@ -300,38 +300,44 @@ export async function createContentGenerator(
     );
 
     try {
+      // Get the Qwen OAuth client (now includes integrated token management)
+      // If this is initial auth, require cached credentials to detect missing credentials
       const qwenClient = await getQwenOauthClient(
-        config,
+        gcConfig,
         isInitialAuth ? { requireCachedCredentials: true } : undefined,
       );
-      baseGenerator = new QwenContentGenerator(
-        qwenClient,
-        generatorConfig,
-        config,
-      );
+
+      // Create the content generator with dynamic token management
+      const generator = new QwenContentGenerator(qwenClient, config, gcConfig);
+      return new LoggingContentGenerator(generator, gcConfig);
     } catch (error) {
       throw new Error(
         `${error instanceof Error ? error.message : String(error)}`,
       );
     }
-  } else if (authType === AuthType.USE_ANTHROPIC) {
+  }
+
+  if (config.authType === AuthType.USE_ANTHROPIC) {
     const { createAnthropicContentGenerator } = await import(
       './anthropicContentGenerator/index.js'
     );
-    baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
-  } else if (
-    authType === AuthType.USE_GEMINI ||
-    authType === AuthType.USE_VERTEX_AI
+
+    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'
     );
-    baseGenerator = createGeminiContentGenerator(generatorConfig, config);
-  } else {
-    throw new Error(
-      `Error creating contentGenerator: Unsupported authType: ${authType}`,
-    );
+    const generator = createGeminiContentGenerator(config, gcConfig);
+    return new LoggingContentGenerator(generator, gcConfig);
   }
 
-  return new LoggingContentGenerator(baseGenerator, config, generatorConfig);
+  throw new Error(
+    `Error creating contentGenerator: Unsupported authType: ${config.authType}`,
+  );
 }

packages/core/src/core/loggingContentGenerator/loggingContentGenerator.test.ts

@@ -12,7 +12,6 @@ import type {
 import { GenerateContentResponse } from '@google/genai';
 import type { Config } from '../../config/config.js';
 import type { ContentGenerator } from '../contentGenerator.js';
-import { AuthType } from '../contentGenerator.js';
 import { LoggingContentGenerator } from './index.js';
 import { OpenAIContentConverter } from '../openaiContentGenerator/converter.js';
 import {
@@ -51,17 +50,14 @@ const convertGeminiResponseToOpenAISpy = vi
     choices: [],
   } as OpenAI.Chat.ChatCompletion);
 
-const createConfig = (overrides: Record<string, unknown> = {}): Config => {
-  const configContent = {
-    authType: 'openai',
-    enableOpenAILogging: false,
-    ...overrides,
-  };
-  return {
-    getContentGeneratorConfig: () => configContent,
-    getAuthType: () => configContent.authType as AuthType | undefined,
-  } as Config;
-};
+const createConfig = (overrides: Record<string, unknown> = {}): Config =>
+  ({
+    getContentGeneratorConfig: () => ({
+      authType: 'openai',
+      enableOpenAILogging: false,
+      ...overrides,
+    }),
+  }) as Config;
 
 const createWrappedGenerator = (
   generateContent: ContentGenerator['generateContent'],
@@ -128,17 +124,13 @@ describe('LoggingContentGenerator', () => {
       ),
       vi.fn(),
     );
-    const generatorConfig = {
-      model: 'test-model',
-      authType: AuthType.USE_OPENAI,
-      enableOpenAILogging: true,
-      openAILoggingDir: 'logs',
-      schemaCompliance: 'openapi_30' as const,
-    };
     const generator = new LoggingContentGenerator(
       wrapped,
-      createConfig(),
-      generatorConfig,
+      createConfig({
+        enableOpenAILogging: true,
+        openAILoggingDir: 'logs',
+        schemaCompliance: 'openapi_30',
+      }),
     );
 
     const request = {
@@ -233,15 +225,9 @@ describe('LoggingContentGenerator', () => {
       vi.fn().mockRejectedValue(error),
       vi.fn(),
     );
-    const generatorConfig = {
-      model: 'test-model',
-      authType: AuthType.USE_OPENAI,
-      enableOpenAILogging: true,
-    };
     const generator = new LoggingContentGenerator(
       wrapped,
-      createConfig(),
-      generatorConfig,
+      createConfig({ enableOpenAILogging: true }),
     );
 
     const request = {
@@ -307,15 +293,9 @@ describe('LoggingContentGenerator', () => {
         })(),
       ),
     );
-    const generatorConfig = {
-      model: 'test-model',
-      authType: AuthType.USE_OPENAI,
-      enableOpenAILogging: true,
-    };
     const generator = new LoggingContentGenerator(
       wrapped,
-      createConfig(),
-      generatorConfig,
+      createConfig({ enableOpenAILogging: true }),
     );
 
     const request = {
@@ -365,15 +345,9 @@ describe('LoggingContentGenerator', () => {
         })(),
       ),
     );
-    const generatorConfig = {
-      model: 'test-model',
-      authType: AuthType.USE_OPENAI,
-      enableOpenAILogging: true,
-    };
     const generator = new LoggingContentGenerator(
       wrapped,
-      createConfig(),
-      generatorConfig,
+      createConfig({ enableOpenAILogging: true }),
     );
 
     const request = {

packages/core/src/core/loggingContentGenerator/loggingContentGenerator.ts

@@ -31,10 +31,7 @@ import {
   logApiRequest,
   logApiResponse,
 } from '../../telemetry/loggers.js';
-import type {
-  ContentGenerator,
-  ContentGeneratorConfig,
-} from '../contentGenerator.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';
@@ -53,11 +50,9 @@ export class LoggingContentGenerator implements ContentGenerator {
   constructor(
     private readonly wrapped: ContentGenerator,
     private readonly config: Config,
-    generatorConfig: ContentGeneratorConfig,
   ) {
-    // Extract fields needed for initialization from passed config
-    // (config.getContentGeneratorConfig() may not be available yet during refreshAuth)
-    if (generatorConfig.enableOpenAILogging) {
+    const generatorConfig = this.config.getContentGeneratorConfig();
+    if (generatorConfig?.enableOpenAILogging) {
       this.openaiLogger = new OpenAILogger(generatorConfig.openAILoggingDir);
       this.schemaCompliance = generatorConfig.schemaCompliance;
     }
@@ -94,7 +89,7 @@ export class LoggingContentGenerator implements ContentGenerator {
         model,
         durationMs,
         prompt_id,
-        this.config.getAuthType(),
+        this.config.getContentGeneratorConfig()?.authType,
         usageMetadata,
         responseText,
       ),
@@ -131,7 +126,7 @@ export class LoggingContentGenerator implements ContentGenerator {
         errorMessage,
         durationMs,
         prompt_id,
-        this.config.getAuthType(),
+        this.config.getContentGeneratorConfig()?.authType,
         errorType,
         errorStatus,
       ),

packages/core/src/models/constants.ts

@@ -106,6 +106,15 @@ export const QWEN_OAUTH_MODELS: ModelConfig[] = [
     description:
       'The latest Qwen Coder model from Alibaba Cloud ModelStudio (version: qwen3-coder-plus-2025-09-23)',
     capabilities: { vision: false },
+    generationConfig: {
+      samplingParams: {
+        temperature: 0.7,
+        top_p: 0.9,
+        max_tokens: 8192,
+      },
+      timeout: 60000,
+      maxRetries: 3,
+    },
   },
   {
     id: 'vision-model',
@@ -113,5 +122,14 @@ export const QWEN_OAUTH_MODELS: ModelConfig[] = [
     description:
       'The latest Qwen Vision model from Alibaba Cloud ModelStudio (version: qwen3-vl-plus-2025-09-23)',
     capabilities: { vision: true },
+    generationConfig: {
+      samplingParams: {
+        temperature: 0.7,
+        top_p: 0.9,
+        max_tokens: 8192,
+      },
+      timeout: 60000,
+      maxRetries: 3,
+    },
   },
 ];

packages/core/src/models/modelsConfig.test.ts

@@ -480,91 +480,6 @@ describe('ModelsConfig', () => {
     expect(gc.apiKeyEnvKey).toBeUndefined();
   });
 
-  it('should use default model for new authType when switching from different authType with env vars', () => {
-    // Simulate cold start with OPENAI env vars (OPENAI_MODEL and OPENAI_API_KEY)
-    // This sets the model in generationConfig but no authType is selected yet
-    const modelsConfig = new ModelsConfig({
-      generationConfig: {
-        model: 'gpt-4o', // From OPENAI_MODEL env var
-        apiKey: 'openai-key-from-env',
-      },
-    });
-
-    // User switches to qwen-oauth via AuthDialog
-    // refreshAuth calls syncAfterAuthRefresh with the current model (gpt-4o)
-    // which doesn't exist in qwen-oauth registry, so it should use default
-    modelsConfig.syncAfterAuthRefresh(AuthType.QWEN_OAUTH, 'gpt-4o');
-
-    const gc = currentGenerationConfig(modelsConfig);
-    // Should use default qwen-oauth model (coder-model), not the OPENAI model
-    expect(gc.model).toBe('coder-model');
-    expect(gc.apiKey).toBe('QWEN_OAUTH_DYNAMIC_TOKEN');
-    expect(gc.apiKeyEnvKey).toBeUndefined();
-  });
-
-  it('should clear manual credentials when switching from USE_OPENAI to QWEN_OAUTH', () => {
-    // User manually set credentials for OpenAI
-    const modelsConfig = new ModelsConfig({
-      initialAuthType: AuthType.USE_OPENAI,
-      generationConfig: {
-        model: 'gpt-4o',
-        apiKey: 'manual-openai-key',
-        baseUrl: 'https://manual.example.com/v1',
-      },
-    });
-
-    // Manually set credentials via updateCredentials
-    modelsConfig.updateCredentials({
-      apiKey: 'manual-openai-key',
-      baseUrl: 'https://manual.example.com/v1',
-      model: 'gpt-4o',
-    });
-
-    // User switches to qwen-oauth
-    // Since authType is not USE_OPENAI, manual credentials should be cleared
-    // and default qwen-oauth model should be applied
-    modelsConfig.syncAfterAuthRefresh(AuthType.QWEN_OAUTH, 'gpt-4o');
-
-    const gc = currentGenerationConfig(modelsConfig);
-    // Should use default qwen-oauth model, not preserve manual OpenAI credentials
-    expect(gc.model).toBe('coder-model');
-    expect(gc.apiKey).toBe('QWEN_OAUTH_DYNAMIC_TOKEN');
-    // baseUrl should be set to qwen-oauth default, not preserved from manual OpenAI config
-    expect(gc.baseUrl).toBe('DYNAMIC_QWEN_OAUTH_BASE_URL');
-    expect(gc.apiKeyEnvKey).toBeUndefined();
-  });
-
-  it('should preserve manual credentials when switching to USE_OPENAI', () => {
-    // User manually set credentials
-    const modelsConfig = new ModelsConfig({
-      initialAuthType: AuthType.USE_OPENAI,
-      generationConfig: {
-        model: 'gpt-4o',
-        apiKey: 'manual-openai-key',
-        baseUrl: 'https://manual.example.com/v1',
-        samplingParams: { temperature: 0.9 },
-      },
-    });
-
-    // Manually set credentials via updateCredentials
-    modelsConfig.updateCredentials({
-      apiKey: 'manual-openai-key',
-      baseUrl: 'https://manual.example.com/v1',
-      model: 'gpt-4o',
-    });
-
-    // User switches to USE_OPENAI (same or different model)
-    // Since authType is USE_OPENAI, manual credentials should be preserved
-    modelsConfig.syncAfterAuthRefresh(AuthType.USE_OPENAI, 'gpt-4o');
-
-    const gc = currentGenerationConfig(modelsConfig);
-    // Should preserve manual credentials
-    expect(gc.model).toBe('gpt-4o');
-    expect(gc.apiKey).toBe('manual-openai-key');
-    expect(gc.baseUrl).toBe('https://manual.example.com/v1');
-    expect(gc.samplingParams?.temperature).toBe(0.9); // Preserved from initial config
-  });
-
   it('should maintain consistency between currentModelId and _generationConfig.model after initialization', () => {
     const modelProvidersConfig: ModelProvidersConfig = {
       openai: [

packages/core/src/models/modelsConfig.ts

@@ -600,7 +600,7 @@ export class ModelsConfig {
 
     // If credentials were manually set, don't apply modelProvider defaults
     // Just update the authType and preserve the manually set credentials
-    if (preserveManualCredentials && authType === AuthType.USE_OPENAI) {
+    if (preserveManualCredentials) {
       this.strictModelProviderSelection = false;
       this.currentAuthType = authType;
       if (modelId) {
@@ -621,17 +621,7 @@ export class ModelsConfig {
         this.applyResolvedModelDefaults(resolved);
       }
     } else {
-      // If the provided modelId doesn't exist in the registry for the new authType,
-      // use the default model for that authType instead of keeping the old model.
-      // This handles the case where switching from one authType (e.g., OPENAI with
-      // env vars) to another (e.g., qwen-oauth) - we should use the default model
-      // for the new authType, not the old model.
       this.currentAuthType = authType;
-      const defaultModel =
-        this.modelRegistry.getDefaultModelForAuthType(authType);
-      if (defaultModel) {
-        this.applyResolvedModelDefaults(defaultModel);
-      }
     }
   }
 

packages/core/src/qwen/qwenOAuth2.ts

@@ -559,109 +559,6 @@ export async function getQwenOAuthClient(
   }
 }
 
-/**
- * Displays a formatted box with OAuth device authorization URL.
- * Uses process.stderr.write() to bypass ConsolePatcher and ensure the auth URL
- * is always visible to users, especially in non-interactive mode.
- * Using stderr prevents corruption of structured JSON output (which goes to stdout)
- * and follows the standard Unix convention of user-facing messages to stderr.
- */
-function showFallbackMessage(verificationUriComplete: string): void {
-  const title = 'Qwen OAuth Device Authorization';
-  const url = verificationUriComplete;
-  const minWidth = 70;
-  const maxWidth = 80;
-  const boxWidth = Math.min(Math.max(title.length + 4, minWidth), maxWidth);
-
-  // Calculate the width needed for the box (account for padding)
-  const contentWidth = boxWidth - 4; // Subtract 2 spaces and 2 border chars
-
-  // Helper to wrap text to fit within box width
-  const wrapText = (text: string, width: number): string[] => {
-    // For URLs, break at any character if too long
-    if (text.startsWith('http://') || text.startsWith('https://')) {
-      const lines: string[] = [];
-      for (let i = 0; i < text.length; i += width) {
-        lines.push(text.substring(i, i + width));
-      }
-      return lines;
-    }
-
-    // For regular text, break at word boundaries
-    const words = text.split(' ');
-    const lines: string[] = [];
-    let currentLine = '';
-
-    for (const word of words) {
-      if (currentLine.length + word.length + 1 <= width) {
-        currentLine += (currentLine ? ' ' : '') + word;
-      } else {
-        if (currentLine) {
-          lines.push(currentLine);
-        }
-        currentLine = word.length > width ? word.substring(0, width) : word;
-      }
-    }
-    if (currentLine) {
-      lines.push(currentLine);
-    }
-    return lines;
-  };
-
-  // Build the box borders with title centered in top border
-  // Format: +--- Title ---+
-  const titleWithSpaces = ' ' + title + ' ';
-  const totalDashes = boxWidth - 2 - titleWithSpaces.length; // Subtract corners and title
-  const leftDashes = Math.floor(totalDashes / 2);
-  const rightDashes = totalDashes - leftDashes;
-  const topBorder =
-    '+' +
-    '-'.repeat(leftDashes) +
-    titleWithSpaces +
-    '-'.repeat(rightDashes) +
-    '+';
-  const emptyLine = '|' + ' '.repeat(boxWidth - 2) + '|';
-  const bottomBorder = '+' + '-'.repeat(boxWidth - 2) + '+';
-
-  // Build content lines
-  const instructionLines = wrapText(
-    'Please visit the following URL in your browser to authorize:',
-    contentWidth,
-  );
-  const urlLines = wrapText(url, contentWidth);
-  const waitingLine = 'Waiting for authorization to complete...';
-
-  // Write the box
-  process.stderr.write('\n' + topBorder + '\n');
-  process.stderr.write(emptyLine + '\n');
-
-  // Write instructions
-  for (const line of instructionLines) {
-    process.stderr.write(
-      '| ' + line + ' '.repeat(contentWidth - line.length) + ' |\n',
-    );
-  }
-
-  process.stderr.write(emptyLine + '\n');
-
-  // Write URL
-  for (const line of urlLines) {
-    process.stderr.write(
-      '| ' + line + ' '.repeat(contentWidth - line.length) + ' |\n',
-    );
-  }
-
-  process.stderr.write(emptyLine + '\n');
-
-  // Write waiting message
-  process.stderr.write(
-    '| ' + waitingLine + ' '.repeat(contentWidth - waitingLine.length) + ' |\n',
-  );
-
-  process.stderr.write(emptyLine + '\n');
-  process.stderr.write(bottomBorder + '\n\n');
-}
-
 async function authWithQwenDeviceFlow(
   client: QwenOAuth2Client,
   config: Config,
@@ -674,50 +571,6 @@ async function authWithQwenDeviceFlow(
   };
   qwenOAuth2Events.once(QwenOAuth2Event.AuthCancel, cancelHandler);
 
-  // Helper to check cancellation and return appropriate result
-  const checkCancellation = (): AuthResult | null => {
-    if (!isCancelled) {
-      return null;
-    }
-    const message = 'Authentication cancelled by user.';
-    console.debug('\n' + message);
-    qwenOAuth2Events.emit(QwenOAuth2Event.AuthProgress, 'error', message);
-    return { success: false, reason: 'cancelled', message };
-  };
-
-  // Helper to emit auth progress events
-  const emitAuthProgress = (
-    status: 'polling' | 'success' | 'error' | 'timeout' | 'rate_limit',
-    message: string,
-  ): void => {
-    qwenOAuth2Events.emit(QwenOAuth2Event.AuthProgress, status, message);
-  };
-
-  // Helper to handle browser launch with error handling
-  const launchBrowser = async (url: string): Promise<void> => {
-    try {
-      const childProcess = await open(url);
-
-      // IMPORTANT: Attach an error handler to the returned child process.
-      // Without this, if `open` fails to spawn a process (e.g., `xdg-open` is not found
-      // in a minimal Docker container), it will emit an unhandled 'error' event,
-      // causing the entire Node.js process to crash.
-      if (childProcess) {
-        childProcess.on('error', (err) => {
-          console.debug(
-            'Browser launch failed:',
-            err.message || 'Unknown error',
-          );
-        });
-      }
-    } catch (err) {
-      console.debug(
-        'Failed to open browser:',
-        err instanceof Error ? err.message : 'Unknown error',
-      );
-    }
-  };
-
   try {
     // Generate PKCE code verifier and challenge
     const { code_verifier, code_challenge } = generatePKCEPair();
@@ -740,18 +593,56 @@ async function authWithQwenDeviceFlow(
     // Emit device authorization event for UI integration immediately
     qwenOAuth2Events.emit(QwenOAuth2Event.AuthUri, deviceAuth);
 
+    const showFallbackMessage = () => {
+      console.log('\n=== Qwen OAuth Device Authorization ===');
+      console.log(
+        'Please visit the following URL in your browser to authorize:',
+      );
+      console.log(`\n${deviceAuth.verification_uri_complete}\n`);
+      console.log('Waiting for authorization to complete...\n');
+    };
+
     // Always show the fallback message in non-interactive environments to ensure
     // users can see the authorization URL even if browser launching is attempted.
     // This is critical for headless/remote environments where browser launching
     // may silently fail without throwing an error.
-    showFallbackMessage(deviceAuth.verification_uri_complete);
+    if (config.isBrowserLaunchSuppressed()) {
+      // Browser launch is suppressed, show fallback message
+      showFallbackMessage();
+    } else {
+      // Try to open the URL in browser, but always show the URL as fallback
+      // to handle cases where browser launch silently fails (e.g., headless servers)
+      showFallbackMessage();
+      try {
+        const childProcess = await open(deviceAuth.verification_uri_complete);
 
-    // Try to open browser if not suppressed
-    if (!config.isBrowserLaunchSuppressed()) {
-      await launchBrowser(deviceAuth.verification_uri_complete);
+        // IMPORTANT: Attach an error handler to the returned child process.
+        // Without this, if `open` fails to spawn a process (e.g., `xdg-open` is not found
+        // in a minimal Docker container), it will emit an unhandled 'error' event,
+        // causing the entire Node.js process to crash.
+        if (childProcess) {
+          childProcess.on('error', (err) => {
+            console.debug(
+              'Browser launch failed:',
+              err.message || 'Unknown error',
+            );
+          });
+        }
+      } catch (err) {
+        console.debug(
+          'Failed to open browser:',
+          err instanceof Error ? err.message : 'Unknown error',
+        );
+      }
     }
 
-    emitAuthProgress('polling', 'Waiting for authorization...');
+    // Emit auth progress event
+    qwenOAuth2Events.emit(
+      QwenOAuth2Event.AuthProgress,
+      'polling',
+      'Waiting for authorization...',
+    );
+
     console.debug('Waiting for authorization...\n');
 
     // Poll for the token
@@ -762,9 +653,11 @@ async function authWithQwenDeviceFlow(
 
     for (let attempt = 0; attempt < maxAttempts; attempt++) {
       // Check if authentication was cancelled
-      const cancellationResult = checkCancellation();
-      if (cancellationResult) {
-        return cancellationResult;
+      if (isCancelled) {
+        const message = 'Authentication cancelled by user.';
+        console.debug('\n' + message);
+        qwenOAuth2Events.emit(QwenOAuth2Event.AuthProgress, 'error', message);
+        return { success: false, reason: 'cancelled', message };
       }
 
       try {
@@ -807,7 +700,9 @@ async function authWithQwenDeviceFlow(
             // minimal stub; cache invalidation is best-effort and should not break auth.
           }
 
-          emitAuthProgress(
+          // Emit auth progress success event
+          qwenOAuth2Events.emit(
+            QwenOAuth2Event.AuthProgress,
             'success',
             'Authentication successful! Access token obtained.',
           );
@@ -830,7 +725,9 @@ async function authWithQwenDeviceFlow(
             pollInterval = 2000; // Reset to default interval
           }
 
-          emitAuthProgress(
+          // Emit polling progress event
+          qwenOAuth2Events.emit(
+            QwenOAuth2Event.AuthProgress,
             'polling',
             `Polling... (attempt ${attempt + 1}/${maxAttempts})`,
           );
@@ -860,9 +757,15 @@ async function authWithQwenDeviceFlow(
           });
 
           // Check for cancellation after waiting
-          const cancellationResult = checkCancellation();
-          if (cancellationResult) {
-            return cancellationResult;
+          if (isCancelled) {
+            const message = 'Authentication cancelled by user.';
+            console.debug('\n' + message);
+            qwenOAuth2Events.emit(
+              QwenOAuth2Event.AuthProgress,
+              'error',
+              message,
+            );
+            return { success: false, reason: 'cancelled', message };
           }
 
           continue;
@@ -890,17 +793,15 @@ async function authWithQwenDeviceFlow(
           message: string,
           eventType: 'error' | 'rate_limit' = 'error',
         ): AuthResult => {
-          emitAuthProgress(eventType, message);
+          qwenOAuth2Events.emit(
+            QwenOAuth2Event.AuthProgress,
+            eventType,
+            message,
+          );
           console.error('\n' + message);
           return { success: false, reason, message };
         };
 
-        // Check for cancellation first
-        const cancellationResult = checkCancellation();
-        if (cancellationResult) {
-          return cancellationResult;
-        }
-
         // Handle credential caching failures - stop polling immediately
         if (errorMessage.includes('Failed to cache credentials')) {
           return handleError('error', errorMessage);
@@ -924,14 +825,26 @@ async function authWithQwenDeviceFlow(
         }
 
         const message = `Error polling for token: ${errorMessage}`;
-        emitAuthProgress('error', message);
+        qwenOAuth2Events.emit(QwenOAuth2Event.AuthProgress, 'error', message);
+
+        if (isCancelled) {
+          const message = 'Authentication cancelled by user.';
+          return { success: false, reason: 'cancelled', message };
+        }
 
         await new Promise((resolve) => setTimeout(resolve, pollInterval));
       }
     }
 
     const timeoutMessage = 'Authorization timeout, please restart the process.';
-    emitAuthProgress('timeout', timeoutMessage);
+
+    // Emit timeout error event
+    qwenOAuth2Events.emit(
+      QwenOAuth2Event.AuthProgress,
+      'timeout',
+      timeoutMessage,
+    );
+
     console.error('\n' + timeoutMessage);
     return { success: false, reason: 'timeout', message: timeoutMessage };
   } catch (error: unknown) {
@@ -940,7 +853,7 @@ async function authWithQwenDeviceFlow(
     });
     const message = `Device authorization flow failed: ${fullErrorMessage}`;
 
-    emitAuthProgress('error', message);
+    qwenOAuth2Events.emit(QwenOAuth2Event.AuthProgress, 'error', message);
     console.error(message);
     return { success: false, reason: 'error', message };
   } finally {

packages/core/src/skills/skill-manager.ts

@@ -235,7 +235,6 @@ export class SkillManager {
     }
 
     this.watchStarted = true;
-    await this.ensureUserSkillsDir();
     await this.refreshCache();
     this.updateWatchersFromCache();
   }
@@ -487,14 +486,29 @@ export class SkillManager {
   }
 
   private updateWatchersFromCache(): void {
-    const watchTargets = new Set<string>(
-      (['project', 'user'] as const)
-        .map((level) => this.getSkillsBaseDir(level))
-        .filter((baseDir) => fsSync.existsSync(baseDir)),
-    );
+    const desiredPaths = new Set<string>();
+
+    for (const level of ['project', 'user'] as const) {
+      const baseDir = this.getSkillsBaseDir(level);
+      const parentDir = path.dirname(baseDir);
+      if (fsSync.existsSync(parentDir)) {
+        desiredPaths.add(parentDir);
+      }
+      if (fsSync.existsSync(baseDir)) {
+        desiredPaths.add(baseDir);
+      }
+
+      const levelSkills = this.skillsCache?.get(level) || [];
+      for (const skill of levelSkills) {
+        const skillDir = path.dirname(skill.filePath);
+        if (fsSync.existsSync(skillDir)) {
+          desiredPaths.add(skillDir);
+        }
+      }
+    }
 
     for (const existingPath of this.watchers.keys()) {
-      if (!watchTargets.has(existingPath)) {
+      if (!desiredPaths.has(existingPath)) {
         void this.watchers
           .get(existingPath)
           ?.close()
@@ -508,7 +522,7 @@ export class SkillManager {
       }
     }
 
-    for (const watchPath of watchTargets) {
+    for (const watchPath of desiredPaths) {
       if (this.watchers.has(watchPath)) {
         continue;
       }
@@ -543,16 +557,4 @@ export class SkillManager {
       void this.refreshCache().then(() => this.updateWatchersFromCache());
     }, 150);
   }
-
-  private async ensureUserSkillsDir(): Promise<void> {
-    const baseDir = this.getSkillsBaseDir('user');
-    try {
-      await fs.mkdir(baseDir, { recursive: true });
-    } catch (error) {
-      console.warn(
-        `Failed to create user skills directory at ${baseDir}:`,
-        error,
-      );
-    }
-  }
 }

packages/core/src/tools/skill.ts

@@ -53,7 +53,7 @@ export class SkillTool extends BaseDeclarativeTool<SkillParams, ToolResult> {
       false, // canUpdateOutput
     );
 
-    this.skillManager = config.getSkillManager()!;
+    this.skillManager = config.getSkillManager();
     this.skillManager.addChangeListener(() => {
       void this.refreshSkills();
     });

packages/sdk-typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/sdk",
-  "version": "0.1.3",
+  "version": "0.1.2",
   "description": "TypeScript SDK for programmatic access to qwen-code CLI",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

packages/sdk-typescript/src/utils/cliPath.ts

@@ -125,9 +125,8 @@ function normalizeForRegex(dirPath: string): string {
 function tryResolveCliFromImportMeta(): string | null {
   try {
     if (typeof import.meta !== 'undefined' && import.meta.url) {
-      const currentFilePath = fileURLToPath(import.meta.url);
-      const currentDir = path.dirname(currentFilePath);
-      const cliPath = path.join(currentDir, 'cli', 'cli.js');
+      const cliUrl = new URL('./cli/cli.js', import.meta.url);
+      const cliPath = fileURLToPath(cliUrl);
       if (fs.existsSync(cliPath)) {
         return cliPath;
       }

packages/test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code-test-utils",
-  "version": "0.7.1",
+  "version": "0.7.0-preview.0",
   "private": true,
   "main": "src/index.ts",
   "license": "Apache-2.0",

packages/vscode-ide-companion/README.md

@@ -1,11 +1,6 @@
 # Qwen Code Companion
 
-[![Version](https://img.shields.io/visual-studio-marketplace/v/qwenlm.qwen-code-vscode-ide-companion)](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion)
-[![VS Code Installs](https://img.shields.io/visual-studio-marketplace/i/qwenlm.qwen-code-vscode-ide-companion)](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion)
-[![Open VSX Downloads](https://img.shields.io/open-vsx/dt/qwenlm/qwen-code-vscode-ide-companion)](https://open-vsx.org/extension/qwenlm/qwen-code-vscode-ide-companion)
-[![Rating](https://img.shields.io/visual-studio-marketplace/r/qwenlm.qwen-code-vscode-ide-companion)](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion)
-
-Seamlessly integrate [Qwen Code](https://github.com/QwenLM/qwen-code) into Visual Studio Code with native IDE features and an intuitive chat interface. This extension bundles everything you need — no additional installation required.
+Seamlessly integrate [Qwen Code](https://github.com/QwenLM/qwen-code) into Visual Studio Code with native IDE features and an intuitive interface. This extension bundles everything you need to get started immediately.
 
 ## Demo
 
@@ -16,7 +11,7 @@ Seamlessly integrate [Qwen Code](https://github.com/QwenLM/qwen-code) into Visua
 
 ## Features
 
-- **Native IDE experience**: Dedicated Qwen Code Chat panel accessed via the Qwen icon in the editor title bar
+- **Native IDE experience**: Dedicated Qwen Code sidebar panel accessed via the Qwen icon
 - **Native diffing**: Review, edit, and accept changes in VS Code's diff view
 - **Auto-accept edits mode**: Automatically apply Qwen's changes as they're made
 - **File management**: @-mention files or attach files and images using the system file picker
@@ -25,46 +20,73 @@ Seamlessly integrate [Qwen Code](https://github.com/QwenLM/qwen-code) into Visua
 
 ## Requirements
 
-- Visual Studio Code 1.85.0 or newer (also works with Cursor, Windsurf, and other VS Code-based editors)
+- Visual Studio Code 1.85.0 or newer
 
-## Quick Start
+## Installation
 
-1. **Install** from the [VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion) or [Open VSX Registry](https://open-vsx.org/extension/qwenlm/qwen-code-vscode-ide-companion)
+1. Install from the VS Code Marketplace: https://marketplace.visualstudio.com/items?itemName=qwenlm.qwen-code-vscode-ide-companion
 
-2. **Open the Chat panel** using one of these methods:
-   - Click the **Qwen icon** in the top-right corner of the editor
-   - Run `Qwen Code: Open` from the Command Palette (`Cmd+Shift+P` / `Ctrl+Shift+P`)
+2. Two ways to use
+   - Chat panel: Click the Qwen icon in the Activity Bar, or run `Qwen Code: Open` from the Command Palette (`Cmd+Shift+P` / `Ctrl+Shift+P`).
+   - Terminal session (classic): Run `Qwen Code: Run` to launch a session in the integrated terminal (bundled CLI).
 
-3. **Start chatting** — Ask Qwen to help with coding tasks, explain code, fix bugs, or write new features
+## Development and Debugging
 
-## Commands
+To debug and develop this extension locally:
 
-| Command                          | Description                                            |
-| -------------------------------- | ------------------------------------------------------ |
-| `Qwen Code: Open`                | Open the Qwen Code Chat panel                          |
-| `Qwen Code: Run`                 | Launch a classic terminal session with the bundled CLI |
-| `Qwen Code: Accept Current Diff` | Accept the currently displayed diff                    |
-| `Qwen Code: Close Diff Editor`   | Close/reject the current diff                          |
+1. **Clone the repository**
 
-## Feedback & Issues
+   ```bash
+   git clone https://github.com/QwenLM/qwen-code.git
+   cd qwen-code
+   ```
 
-- 🐛 [Report bugs](https://github.com/QwenLM/qwen-code/issues/new?template=bug_report.yml&labels=bug,vscode-ide-companion)
-- 💡 [Request features](https://github.com/QwenLM/qwen-code/issues/new?template=feature_request.yml&labels=enhancement,vscode-ide-companion)
-- 📖 [Documentation](https://qwenlm.github.io/qwen-code-docs/)
-- 📋 [Changelog](https://github.com/QwenLM/qwen-code/releases)
+2. **Install dependencies**
 
-## Contributing
+   ```bash
+   npm install
+   # or if using pnpm
+   pnpm install
+   ```
 
-We welcome contributions! See our [Contributing Guide](https://github.com/QwenLM/qwen-code/blob/main/CONTRIBUTING.md) for details on:
+3. **Start debugging**
 
-- Setting up the development environment
-- Building and debugging the extension locally
-- Submitting pull requests
+   ```bash
+   code .  # Open the project root in VS Code
+   ```
+   - Open the `packages/vscode-ide-companion/src/extension.ts` file
+   - Open Debug panel (`Ctrl+Shift+D` or `Cmd+Shift+D`)
+   - Select **"Launch Companion VS Code Extension"** from the debug dropdown
+   - Press `F5` to launch Extension Development Host
+
+4. **Make changes and reload**
+   - Edit the source code in the original VS Code window
+   - To see your changes, reload the Extension Development Host window by:
+     - Pressing `Ctrl+R` (Windows/Linux) or `Cmd+R` (macOS)
+     - Or clicking the "Reload" button in the debug toolbar
+
+5. **View logs and debug output**
+   - Open the Debug Console in the original VS Code window to see extension logs
+   - In the Extension Development Host window, open Developer Tools with `Help > Toggle Developer Tools` to see webview logs
+
+## Build for Production
+
+To build the extension for distribution:
+
+```bash
+npm run compile
+# or
+pnpm run compile
+```
+
+To package the extension as a VSIX file:
+
+```bash
+npx vsce package
+# or
+pnpm vsce package
+```
 
 ## Terms of Service and Privacy Notice
 
 By installing this extension, you agree to the [Terms of Service](https://github.com/QwenLM/qwen-code/blob/main/docs/tos-privacy.md).
-
-## License
-
-[Apache-2.0](https://github.com/QwenLM/qwen-code/blob/main/LICENSE)

packages/vscode-ide-companion/package.json

@@ -2,7 +2,7 @@
   "name": "qwen-code-vscode-ide-companion",
   "displayName": "Qwen Code Companion",
   "description": "Enable Qwen Code with direct access to your VS Code workspace.",
-  "version": "0.7.1",
+  "version": "0.7.0-preview.0",
   "publisher": "qwenlm",
   "icon": "assets/icon.png",
   "repository": {

packages/vscode-ide-companion/src/extension.ts

@@ -314,32 +314,34 @@ export async function activate(context: vscode.ExtensionContext) {
             'cli.js',
           ).fsPath;
           const execPath = process.execPath;
+          const lowerExecPath = execPath.toLowerCase();
+          const needsElectronRunAsNode =
+            lowerExecPath.includes('code') ||
+            lowerExecPath.includes('electron');
 
+          let qwenCmd: string;
           const terminalOptions: vscode.TerminalOptions = {
             name: `Qwen Code (${selectedFolder.name})`,
             cwd: selectedFolder.uri.fsPath,
             location,
           };
 
-          let qwenCmd: string;
-
           if (isWindows) {
-            // On Windows, try multiple strategies to find a Node.js runtime:
-            // 1. Check if VSCode ships a standalone node.exe alongside Code.exe
-            // 2. Check VSCode's internal Node.js in resources directory
-            // 3. Fall back to using Code.exe with ELECTRON_RUN_AS_NODE=1
+            // Use system Node via cmd.exe; avoid PowerShell parsing issues
             const quoteCmd = (s: string) => `"${s.replace(/"/g, '""')}"`;
             const cliQuoted = quoteCmd(cliEntry);
             // TODO: @yiliang114, temporarily run through node, and later hope to decouple from the local node
             qwenCmd = `node ${cliQuoted}`;
             terminalOptions.shellPath = process.env.ComSpec;
           } else {
-            // macOS/Linux: All VSCode-like IDEs (VSCode, Cursor, Windsurf, etc.)
-            // are Electron-based, so we always need ELECTRON_RUN_AS_NODE=1
-            // to run Node.js scripts using the IDE's bundled runtime.
             const quotePosix = (s: string) => `"${s.replace(/"/g, '\\"')}"`;
             const baseCmd = `${quotePosix(execPath)} ${quotePosix(cliEntry)}`;
-            qwenCmd = `ELECTRON_RUN_AS_NODE=1 ${baseCmd}`;
+            if (needsElectronRunAsNode) {
+              // macOS Electron helper needs ELECTRON_RUN_AS_NODE=1;
+              qwenCmd = `ELECTRON_RUN_AS_NODE=1 ${baseCmd}`;
+            } else {
+              qwenCmd = baseCmd;
+            }
           }
 
           const terminal = vscode.window.createTerminal(terminalOptions);