@qwen-code/qwen-code 0.8.0 → 0.8.2-preview.0

package/cli.js

@@ -155656,7 +155656,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.8.0";
+  const version2 = "0.8.2-preview.0";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -172205,6 +172205,7 @@ var init_coreToolScheduler = __esm({
     "use strict";
     init_esbuild_shims();
     init_src2();
+    init_tool_names();
     init_generateContentResponseUtilities();
     init_modifiable_tool();
     init_lib();
@@ -172420,15 +172421,21 @@ var init_coreToolScheduler = __esm({
         }
       }
       /**
-       * Generates a suggestion string for a tool name that was not found in the registry.
-       * Uses Levenshtein distance to suggest similar tool names for hallucinated or misspelled tools.
-       * Note: Excluded tools are handled separately before calling this method, so this only
-       * handles the case where a tool is truly not found (hallucinated or typo).
-       * @param unknownToolName The tool name that was not found.
-       * @param topN The number of suggestions to return. Defaults to 3.
-       * @returns A suggestion string like " Did you mean 'tool'?" or " Did you mean one of: 'tool1', 'tool2'?",
-       *          or an empty string if no suggestions are found.
+       * Generates error message for unknown tool. Returns early with skill-specific
+       * message if the name matches a skill, otherwise uses Levenshtein suggestions.
        */
+      getToolNotFoundMessage(unknownToolName, topN = 3) {
+        const skillTool = this.toolRegistry.getTool(ToolNames.SKILL);
+        if (skillTool instanceof SkillTool) {
+          const availableSkillNames = skillTool.getAvailableSkillNames();
+          if (availableSkillNames.includes(unknownToolName)) {
+            return `"${unknownToolName}" is a skill name, not a tool name. To use this skill, invoke the "${ToolNames.SKILL}" tool with parameter: skill: "${unknownToolName}"`;
+          }
+        }
+        const suggestion = this.getToolSuggestion(unknownToolName, topN);
+        return `Tool "${unknownToolName}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
+      }
+      /** Suggests similar tool names using Levenshtein distance. */
       getToolSuggestion(unknownToolName, topN = 3) {
         const allToolNames = this.toolRegistry.getAllToolNames();
         const matches = allToolNames.map((toolName) => ({
@@ -172498,8 +172505,7 @@ var init_coreToolScheduler = __esm({
             }
             const toolInstance = this.toolRegistry.getTool(reqInfo.name);
             if (!toolInstance) {
-              const suggestion = this.getToolSuggestion(reqInfo.name);
-              const errorMessage = `Tool "${reqInfo.name}" not found in registry. Tools must use the exact names that are registered.${suggestion}`;
+              const errorMessage = this.getToolNotFoundMessage(reqInfo.name);
               return {
                 status: "error",
                 request: reqInfo,
@@ -173389,13 +173395,15 @@ var init_subagent = __esm({
                 const parts = content?.parts || [];
                 for (const p2 of parts) {
                   const txt = p2.text;
-                  if (txt)
+                  const isThought = p2.thought ?? false;
+                  if (txt && !isThought)
                     roundText += txt;
                   if (txt)
                     this.eventEmitter?.emit(SubAgentEventType.STREAM_TEXT, {
                       subagentId: this.subagentId,
                       round: turnCounter,
                       text: txt,
+                      thought: isThought,
                       timestamp: Date.now()
                     });
                 }
@@ -241761,7 +241769,7 @@ var init_config3 = __esm({
       contentGeneratorConfigSources = {};
       contentGenerator;
       embeddingModel;
-      _modelsConfig;
+      modelsConfig;
       modelProvidersConfig;
       sandbox;
       targetDir;
@@ -241940,7 +241948,7 @@ var init_config3 = __esm({
         if (params.contextFileName) {
           setGeminiMdFilename(params.contextFileName);
         }
-        this._modelsConfig = new ModelsConfig({
+        this.modelsConfig = new ModelsConfig({
           initialAuthType: params.authType ?? params.generationConfig?.authType,
           modelProvidersConfig: this.modelProvidersConfig,
           generationConfig: {
@@ -242007,8 +242015,8 @@ var init_config3 = __esm({
        * Get the ModelsConfig instance for model-related operations.
        * External code (e.g., CLI) can use this to access model configuration.
        */
-      get modelsConfig() {
-        return this._modelsConfig;
+      getModelsConfig() {
+        return this.modelsConfig;
       }
       /**
        * Updates the credentials in the generation config.
@@ -242016,17 +242024,17 @@ var init_config3 = __esm({
        * Delegates to ModelsConfig.
        */
       updateCredentials(credentials, settingsGenerationConfig) {
-        this._modelsConfig.updateCredentials(credentials, settingsGenerationConfig);
+        this.modelsConfig.updateCredentials(credentials, settingsGenerationConfig);
       }
       /**
        * Refresh authentication and rebuild ContentGenerator.
        */
       async refreshAuth(authMethod, isInitialAuth) {
-        const modelId = this._modelsConfig.getModel();
-        this._modelsConfig.syncAfterAuthRefresh(authMethod, modelId);
-        const requireCached = this._modelsConfig.consumeRequireCachedCredentialsFlag();
-        const { config: config2, sources } = resolveContentGeneratorConfigWithSources(this, authMethod, this._modelsConfig.getGenerationConfig(), this._modelsConfig.getGenerationConfigSources(), {
-          strictModelProvider: this._modelsConfig.isStrictModelProviderSelection()
+        const modelId = this.modelsConfig.getModel();
+        this.modelsConfig.syncAfterAuthRefresh(authMethod, modelId);
+        const requireCached = this.modelsConfig.consumeRequireCachedCredentialsFlag();
+        const { config: config2, sources } = resolveContentGeneratorConfigWithSources(this, authMethod, this.modelsConfig.getGenerationConfig(), this.modelsConfig.getGenerationConfigSources(), {
+          strictModelProvider: this.modelsConfig.isStrictModelProviderSelection()
         });
         const newContentGeneratorConfig = config2;
         this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, requireCached ? true : isInitialAuth);
@@ -242084,20 +242092,20 @@ var init_config3 = __esm({
         return this.contentGeneratorConfig;
       }
       getContentGeneratorConfigSources() {
-        if (Object.keys(this.contentGeneratorConfigSources).length === 0 && this._modelsConfig) {
-          return this._modelsConfig.getGenerationConfigSources();
+        if (Object.keys(this.contentGeneratorConfigSources).length === 0 && this.modelsConfig) {
+          return this.modelsConfig.getGenerationConfigSources();
         }
         return this.contentGeneratorConfigSources;
       }
       getModel() {
-        return this.contentGeneratorConfig?.model || this._modelsConfig.getModel();
+        return this.contentGeneratorConfig?.model || this.modelsConfig.getModel();
       }
       /**
        * Set model programmatically (e.g., VLM auto-switch, fallback).
        * Delegates to ModelsConfig.
        */
       async setModel(newModel, metadata) {
-        await this._modelsConfig.setModel(newModel, metadata);
+        await this.modelsConfig.setModel(newModel, metadata);
         if (this.contentGeneratorConfig) {
           this.contentGeneratorConfig.model = newModel;
         }
@@ -242111,8 +242119,8 @@ var init_config3 = __esm({
           return;
         }
         if (authType === AuthType2.QWEN_OAUTH && !requiresRefresh) {
-          const { config: config2, sources } = resolveContentGeneratorConfigWithSources(this, authType, this._modelsConfig.getGenerationConfig(), this._modelsConfig.getGenerationConfigSources(), {
-            strictModelProvider: this._modelsConfig.isStrictModelProviderSelection()
+          const { config: config2, sources } = resolveContentGeneratorConfigWithSources(this, authType, this.modelsConfig.getGenerationConfig(), this.modelsConfig.getGenerationConfigSources(), {
+            strictModelProvider: this.modelsConfig.isStrictModelProviderSelection()
           });
           this.contentGeneratorConfig.model = config2.model;
           this.contentGeneratorConfig.samplingParams = config2.samplingParams;
@@ -242135,14 +242143,14 @@ var init_config3 = __esm({
        * Delegates to ModelsConfig.
        */
       getAvailableModels() {
-        return this._modelsConfig.getAvailableModels();
+        return this.modelsConfig.getAvailableModels();
       }
       /**
        * Get available models for a specific authType.
        * Delegates to ModelsConfig.
        */
       getAvailableModelsForAuthType(authType) {
-        return this._modelsConfig.getAvailableModelsForAuthType(authType);
+        return this.modelsConfig.getAvailableModelsForAuthType(authType);
       }
       /**
        * Switch authType+model via registry-backed selection.
@@ -242155,7 +242163,7 @@ var init_config3 = __esm({
        * @param metadata - Metadata for logging/tracking
        */
       async switchModel(authType, modelId, options2, metadata) {
-        await this._modelsConfig.switchModel(authType, modelId, options2, metadata);
+        await this.modelsConfig.switchModel(authType, modelId, options2, metadata);
       }
       getMaxSessionTurns() {
         return this.maxSessionTurns;
@@ -361117,7 +361125,7 @@ function findModelConfig(modelProviders, authType, modelId) {
 __name(findModelConfig, "findModelConfig");
 function hasApiKeyForAuth(authType, settings, config2) {
   const modelProviders = settings.modelProviders;
-  const modelId = config2?.modelsConfig.getModel() ?? settings.model?.name;
+  const modelId = config2?.getModelsConfig().getModel() ?? settings.model?.name;
   const modelConfig = findModelConfig(modelProviders, authType, modelId);
   if (modelConfig?.envKey) {
     const hasKey2 = !!process.env[modelConfig.envKey];
@@ -361203,7 +361211,7 @@ function validateAuthMethod(authMethod, config2) {
       return apiKeyError;
     }
     const modelProviders = settings.merged.modelProviders;
-    const modelId = config2?.modelsConfig.getModel() ?? settings.merged.model?.name;
+    const modelId = config2?.getModelsConfig().getModel() ?? settings.merged.model?.name;
     const modelConfig = findModelConfig(modelProviders, authMethod, modelId);
     if (modelConfig && !modelConfig.baseUrl) {
       return t4(
@@ -367668,7 +367676,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.8.0";
+  return "0.8.2-preview.0";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -374871,7 +374879,7 @@ async function initializeApp(config2, settings) {
   const languageSetting = process.env["QWEN_CODE_LANG"] || settings.merged.general?.language || "auto";
   await initializeI18n(languageSetting);
   initializeLlmOutputLanguage(settings.merged.general?.outputLanguage);
-  const authType = config2.modelsConfig.getCurrentAuthType();
+  const authType = config2.getModelsConfig().getCurrentAuthType();
   const authError = await performInitialAuth(config2, authType);
   if (authError) {
     settings.setValue(
@@ -374881,7 +374889,7 @@ async function initializeApp(config2, settings) {
     );
   }
   const themeError = validateTheme(settings);
-  const shouldOpenAuthDialog = !config2.modelsConfig.wasAuthTypeExplicitlyProvided() || !!authError;
+  const shouldOpenAuthDialog = !config2.getModelsConfig().wasAuthTypeExplicitlyProvided() || !!authError;
   if (config2.getIdeMode()) {
     const ideClient = await IdeClient.getInstance();
     await ideClient.connect();
@@ -375288,7 +375296,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "67d54b16";
+var GIT_COMMIT_INFO2 = "83aa7283";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -424101,7 +424109,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   } = useAuthCommand(settings, config2, historyManager.addItem);
   useInitializationAuthError(initializationResult.authError, onAuthError);
   (0, import_react134.useEffect)(() => {
-    const currentAuthType = config2.modelsConfig.getCurrentAuthType();
+    const currentAuthType = config2.getModelsConfig().getCurrentAuthType();
     if (settings.merged.security?.auth?.enforcedType && currentAuthType && settings.merged.security?.auth.enforcedType !== currentAuthType) {
       onAuthError(
         t4(
@@ -426024,7 +426032,7 @@ __name(getUserStartupWarnings, "getUserStartupWarnings");
 init_esbuild_shims();
 async function validateNonInteractiveAuth(useExternalAuth, nonInteractiveConfig, settings) {
   try {
-    const authType = nonInteractiveConfig.modelsConfig.getCurrentAuthType();
+    const authType = nonInteractiveConfig.getModelsConfig().getCurrentAuthType();
     if (!authType) {
       throw new Error(
         "No auth type is selected. Please configure an auth type (e.g. via settings or `--auth-type`) before running in non-interactive mode."
@@ -426365,7 +426373,9 @@ var usageSchema = external_exports.object({
 var sessionUpdateMetaSchema = external_exports.object({
   usage: usageSchema.optional().nullable(),
   durationMs: external_exports.number().optional().nullable(),
-  toolName: external_exports.string().optional().nullable()
+  toolName: external_exports.string().optional().nullable(),
+  parentToolCallId: external_exports.string().optional().nullable(),
+  subagentType: external_exports.string().optional().nullable()
 });
 var requestPermissionResponseSchema = external_exports.object({
   outcome: requestPermissionOutcomeSchema
@@ -427049,7 +427059,7 @@ var MessageEmitter = class extends BaseEmitter {
   /**
    * Emits usage metadata.
    */
-  async emitUsageMetadata(usageMetadata, text = "", durationMs) {
+  async emitUsageMetadata(usageMetadata, text = "", durationMs, subagentMeta) {
     const usage2 = {
       promptTokens: usageMetadata.promptTokenCount,
       completionTokens: usageMetadata.candidatesTokenCount,
@@ -427057,7 +427067,7 @@ var MessageEmitter = class extends BaseEmitter {
       totalTokens: usageMetadata.totalTokenCount,
       cachedTokens: usageMetadata.cachedContentTokenCount
     };
-    const meta = typeof durationMs === "number" ? { usage: usage2, durationMs } : { usage: usage2 };
+    const meta = typeof durationMs === "number" ? { usage: usage2, durationMs, ...subagentMeta } : { usage: usage2, ...subagentMeta };
     await this.sendUpdate({
       sessionUpdate: "agent_message_chunk",
       content: { type: "text", text },
@@ -427183,7 +427193,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       locations,
       kind: kind2,
       rawInput: params.args ?? {},
-      _meta: { toolName: params.toolName }
+      _meta: {
+        toolName: params.toolName,
+        ...params.subagentMeta
+      }
     });
     return true;
   }
@@ -427225,7 +427238,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       toolCallId: params.callId,
       status: params.success ? "completed" : "failed",
       content: contentArray,
-      _meta: { toolName: params.toolName }
+      _meta: {
+        toolName: params.toolName,
+        ...params.subagentMeta
+      }
     };
     if (params.resultDisplay !== void 0) {
       update2["rawOutput"] = params.resultDisplay;
@@ -427237,9 +427253,11 @@ var ToolCallEmitter = class extends BaseEmitter {
    * Use this for explicit error handling when not using emitResult.
    *
    * @param callId - The tool call ID
+   * @param toolName - The tool name
    * @param error - The error that occurred
+   * @param subagentMeta - Optional subagent metadata
    */
-  async emitError(callId, toolName, error2) {
+  async emitError(callId, toolName, error2, subagentMeta) {
     await this.sendUpdate({
       sessionUpdate: "tool_call_update",
       toolCallId: callId,
@@ -427247,7 +427265,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       content: [
         { type: "content", content: { type: "text", text: error2.message } }
       ],
-      _meta: { toolName }
+      _meta: {
+        toolName,
+        ...subagentMeta
+      }
     });
   }
   // ==================== Public Utilities ====================
@@ -427524,9 +427545,11 @@ var basicPermissionOptions = [
   }
 ];
 var SubAgentTracker = class {
-  constructor(ctx, client) {
+  constructor(ctx, client, parentToolCallId, subagentType) {
     this.ctx = ctx;
     this.client = client;
+    this.parentToolCallId = parentToolCallId;
+    this.subagentType = subagentType;
     this.toolCallEmitter = new ToolCallEmitter(ctx);
     this.messageEmitter = new MessageEmitter(ctx);
   }
@@ -427536,6 +427559,15 @@ var SubAgentTracker = class {
   toolCallEmitter;
   messageEmitter;
   toolStates = /* @__PURE__ */ new Map();
+  /**
+   * Gets the subagent metadata to attach to all events.
+   */
+  getSubagentMeta() {
+    return {
+      parentToolCallId: this.parentToolCallId,
+      subagentType: this.subagentType
+    };
+  }
   /**
    * Sets up event listeners for a sub-agent's tool events.
    *
@@ -427548,16 +427580,19 @@ var SubAgentTracker = class {
     const onToolResult = this.createToolResultHandler(abortSignal);
     const onApproval = this.createApprovalHandler(abortSignal);
     const onUsageMetadata = this.createUsageMetadataHandler(abortSignal);
+    const onStreamText = this.createStreamTextHandler(abortSignal);
     eventEmitter.on(SubAgentEventType.TOOL_CALL, onToolCall);
     eventEmitter.on(SubAgentEventType.TOOL_RESULT, onToolResult);
     eventEmitter.on(SubAgentEventType.TOOL_WAITING_APPROVAL, onApproval);
     eventEmitter.on(SubAgentEventType.USAGE_METADATA, onUsageMetadata);
+    eventEmitter.on(SubAgentEventType.STREAM_TEXT, onStreamText);
     return [
       () => {
         eventEmitter.off(SubAgentEventType.TOOL_CALL, onToolCall);
         eventEmitter.off(SubAgentEventType.TOOL_RESULT, onToolResult);
         eventEmitter.off(SubAgentEventType.TOOL_WAITING_APPROVAL, onApproval);
         eventEmitter.off(SubAgentEventType.USAGE_METADATA, onUsageMetadata);
+        eventEmitter.off(SubAgentEventType.STREAM_TEXT, onStreamText);
         this.toolStates.clear();
       }
     ];
@@ -427587,7 +427622,8 @@ var SubAgentTracker = class {
       void this.toolCallEmitter.emitStart({
         toolName: event.name,
         callId: event.callId,
-        args: event.args
+        args: event.args,
+        subagentMeta: this.getSubagentMeta()
       });
     };
   }
@@ -427605,7 +427641,8 @@ var SubAgentTracker = class {
         success: event.success,
         message: event.responseParts ?? [],
         resultDisplay: event.resultDisplay,
-        args: state?.args
+        args: state?.args,
+        subagentMeta: this.getSubagentMeta()
       });
       this.toolStates.delete(event.callId);
     };
@@ -427667,7 +427704,27 @@ var SubAgentTracker = class {
     return (...args) => {
       const event = args[0];
       if (abortSignal.aborted) return;
-      this.messageEmitter.emitUsageMetadata(event.usage, "", event.durationMs);
+      this.messageEmitter.emitUsageMetadata(
+        event.usage,
+        "",
+        event.durationMs,
+        this.getSubagentMeta()
+      );
+    };
+  }
+  /**
+   * Creates a handler for stream text events.
+   * Emits agent message or thought chunks for text content from subagent model responses.
+   */
+  createStreamTextHandler(abortSignal) {
+    return (...args) => {
+      const event = args[0];
+      if (abortSignal.aborted) return;
+      void this.messageEmitter.emitMessage(
+        event.text,
+        "assistant",
+        event.thought ?? false
+      );
     };
   }
   /**
@@ -428025,7 +428082,14 @@ var Session3 = class {
       const invocation = tool.build(args);
       if (isTaskTool && "eventEmitter" in invocation) {
         const taskEventEmitter = invocation.eventEmitter;
-        const subAgentTracker = new SubAgentTracker(this, this.client);
+        const parentToolCallId = callId;
+        const subagentType = args["subagent_type"] ?? "";
+        const subAgentTracker = new SubAgentTracker(
+          this,
+          this.client,
+          parentToolCallId,
+          subagentType
+        );
         subAgentCleanupFunctions = subAgentTracker.setup(
           taskEventEmitter,
           abortSignal
@@ -428572,7 +428636,7 @@ var GeminiAgent = class {
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description
     }));
-    const version2 = "0.8.0";
+    const version2 = "0.8.2-preview.0";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -428731,7 +428795,7 @@ var GeminiAgent = class {
     return session.setModel(params);
   }
   async ensureAuthenticated(config2) {
-    const selectedType = this.settings.merged.security?.auth?.selectedType;
+    const selectedType = config2.getModelsConfig().getCurrentAuthType();
     if (!selectedType) {
       throw RequestError.authRequired(
         "Use Qwen Code CLI to authenticate first."
@@ -428947,7 +429011,7 @@ async function main() {
       );
       if (!settings.merged.security?.auth?.useExternal) {
         try {
-          const authType = partialConfig.modelsConfig.getCurrentAuthType();
+          const authType = partialConfig.getModelsConfig().getCurrentAuthType();
           if (authType) {
             const err = validateAuthMethod(authType, partialConfig);
             if (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.8.0",
+  "version": "0.8.2-preview.0",
   "description": "Qwen Code - AI-powered coding assistant",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "locales"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.8.2-preview.0"
   },
   "dependencies": {},
   "optionalDependencies": {