@qwen-code/qwen-code 0.8.2-nightly.20260129.dd973379 → 0.8.2-preview.1

package/cli.js

@@ -129795,30 +129795,6 @@ function isQwenQuotaExceededError(error2) {
   }
   return false;
 }
-function isQwenThrottlingError(error2) {
-  const checkMessage = /* @__PURE__ */ __name((message) => {
-    const lowerMessage = message.toLowerCase();
-    return lowerMessage.includes("throttling") || lowerMessage.includes("requests throttling triggered") || lowerMessage.includes("rate limit") || lowerMessage.includes("too many requests");
-  }, "checkMessage");
-  const getStatusCode = /* @__PURE__ */ __name((error3) => {
-    if (error3 && typeof error3 === "object") {
-      const errorObj = error3;
-      return errorObj.status || errorObj.code;
-    }
-    return void 0;
-  }, "getStatusCode");
-  const statusCode = getStatusCode(error2);
-  if (typeof error2 === "string") {
-    return statusCode === 429 && checkMessage(error2) || error2.includes("throttling");
-  }
-  if (isStructuredError(error2)) {
-    return statusCode === 429 && checkMessage(error2.message);
-  }
-  if (isApiError(error2)) {
-    return error2.error.code === 429 && checkMessage(error2.error.message);
-  }
-  return false;
-}
 var init_quotaErrorDetection = __esm({
   "packages/core/dist/src/utils/quotaErrorDetection.js"() {
     "use strict";
@@ -129826,7 +129802,6 @@ var init_quotaErrorDetection = __esm({
     __name(isApiError, "isApiError");
     __name(isStructuredError, "isStructuredError");
     __name(isQwenQuotaExceededError, "isQwenQuotaExceededError");
-    __name(isQwenThrottlingError, "isQwenThrottlingError");
   }
 });
 
@@ -155665,7 +155640,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.8.2-nightly.20260129.dd973379";
+  const version2 = "0.8.2-preview.1";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -155834,19 +155809,8 @@ var init_contentGenerator = __esm({
 
 // packages/core/dist/src/utils/retry.js
 function defaultShouldRetry(error2) {
-  if (error2 && typeof error2.status === "number") {
-    const status = error2.status;
-    if (status === 429 || status >= 500 && status < 600) {
-      return true;
-    }
-  }
-  if (error2 instanceof Error && error2.message) {
-    if (error2.message.includes("429"))
-      return true;
-    if (error2.message.match(/5\d{2}/))
-      return true;
-  }
-  return false;
+  const status = getErrorStatus(error2);
+  return status === 429 || status !== void 0 && status >= 500 && status < 600;
 }
 function delay(ms) {
   return new Promise((resolve28) => setTimeout(resolve28, ms));
@@ -155862,7 +155826,6 @@ async function retryWithBackoff(fn, options2) {
   };
   let attempt = 0;
   let currentDelay = initialDelayMs;
-  let consecutive429Count = 0;
   while (attempt < maxAttempts) {
     attempt++;
     try {
@@ -155880,23 +155843,13 @@ async function retryWithBackoff(fn, options2) {
       if (authType === AuthType2.QWEN_OAUTH && isQwenQuotaExceededError(error2)) {
         throw new Error(`Qwen API quota exceeded: Your Qwen API quota has been exhausted. Please wait for your quota to reset.`);
       }
-      if (errorStatus === 429) {
-        if (authType === AuthType2.QWEN_OAUTH && isQwenThrottlingError(error2)) {
-          consecutive429Count = 0;
-        } else {
-          consecutive429Count++;
-        }
-      } else {
-        consecutive429Count = 0;
-      }
-      console.debug("consecutive429Count", consecutive429Count);
       if (attempt >= maxAttempts || !shouldRetryOnError(error2)) {
         throw error2;
       }
-      const { delayDurationMs, errorStatus: delayErrorStatus } = getDelayDurationAndStatus(error2);
-      if (delayDurationMs > 0) {
-        console.warn(`Attempt ${attempt} failed with status ${delayErrorStatus ?? "unknown"}. Retrying after explicit delay of ${delayDurationMs}ms...`, error2);
-        await delay(delayDurationMs);
+      const retryAfterMs = errorStatus === 429 ? getRetryAfterDelayMs(error2) : 0;
+      if (retryAfterMs > 0) {
+        console.warn(`Attempt ${attempt} failed with status ${errorStatus ?? "unknown"}. Retrying after explicit delay of ${retryAfterMs}ms...`, error2);
+        await delay(retryAfterMs);
         currentDelay = initialDelayMs;
       } else {
         logRetryAttempt(attempt, error2, errorStatus);
@@ -155910,18 +155863,12 @@ async function retryWithBackoff(fn, options2) {
   throw new Error("Retry attempts exhausted");
 }
 function getErrorStatus(error2) {
-  if (typeof error2 === "object" && error2 !== null) {
-    if ("status" in error2 && typeof error2.status === "number") {
-      return error2.status;
-    }
-    if ("response" in error2 && typeof error2.response === "object" && error2.response !== null) {
-      const response = error2.response;
-      if ("status" in response && typeof response.status === "number") {
-        return response.status;
-      }
-    }
+  if (typeof error2 !== "object" || error2 === null) {
+    return void 0;
   }
-  return void 0;
+  const err = error2;
+  const value = err.status ?? err.statusCode ?? err.response?.status ?? err.error?.code;
+  return typeof value === "number" && value >= 100 && value <= 599 ? value : void 0;
 }
 function getRetryAfterDelayMs(error2) {
   if (typeof error2 === "object" && error2 !== null) {
@@ -155945,31 +155892,12 @@ function getRetryAfterDelayMs(error2) {
   }
   return 0;
 }
-function getDelayDurationAndStatus(error2) {
-  const errorStatus = getErrorStatus(error2);
-  let delayDurationMs = 0;
-  if (errorStatus === 429) {
-    delayDurationMs = getRetryAfterDelayMs(error2);
-  }
-  return { delayDurationMs, errorStatus };
-}
 function logRetryAttempt(attempt, error2, errorStatus) {
-  let message = `Attempt ${attempt} failed. Retrying with backoff...`;
-  if (errorStatus) {
-    message = `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...`;
-  }
+  const message = errorStatus ? `Attempt ${attempt} failed with status ${errorStatus}. Retrying with backoff...` : `Attempt ${attempt} failed. Retrying with backoff...`;
   if (errorStatus === 429) {
     console.warn(message, error2);
   } else if (errorStatus && errorStatus >= 500 && errorStatus < 600) {
     console.error(message, error2);
-  } else if (error2 instanceof Error) {
-    if (error2.message.includes("429")) {
-      console.warn(`Attempt ${attempt} failed with 429 error (no Retry-After header). Retrying with backoff...`, error2);
-    } else if (error2.message.match(/5\d{2}/)) {
-      console.error(`Attempt ${attempt} failed with 5xx error. Retrying with backoff...`, error2);
-    } else {
-      console.warn(message, error2);
-    }
   } else {
     console.warn(message, error2);
   }
@@ -155982,8 +155910,8 @@ var init_retry = __esm({
     init_contentGenerator();
     init_quotaErrorDetection();
     DEFAULT_RETRY_OPTIONS = {
-      maxAttempts: 5,
-      initialDelayMs: 5e3,
+      maxAttempts: 7,
+      initialDelayMs: 1500,
       maxDelayMs: 3e4,
       // 30 seconds
       shouldRetryOnError: defaultShouldRetry
@@ -155993,7 +155921,6 @@ var init_retry = __esm({
     __name(retryWithBackoff, "retryWithBackoff");
     __name(getErrorStatus, "getErrorStatus");
     __name(getRetryAfterDelayMs, "getRetryAfterDelayMs");
-    __name(getDelayDurationAndStatus, "getDelayDurationAndStatus");
     __name(logRetryAttempt, "logRetryAttempt");
   }
 });
@@ -156097,7 +156024,7 @@ var init_baseLlmClient = __esm({
     init_errors();
     init_retry();
     init_generateContentResponseUtilities();
-    DEFAULT_MAX_ATTEMPTS = 5;
+    DEFAULT_MAX_ATTEMPTS = 7;
     BaseLlmClient = class {
       static {
         __name(this, "BaseLlmClient");
@@ -156537,42 +156464,6 @@ var init_chatRecordingService = __esm({
   }
 });
 
-// packages/core/dist/src/fallback/handler.js
-async function handleFallback(config2, failedModel, authType, error2) {
-  if (authType === AuthType2.QWEN_OAUTH) {
-    return handleQwenOAuthError(error2);
-  }
-  return null;
-}
-async function handleQwenOAuthError(error2) {
-  if (!error2) {
-    return null;
-  }
-  const errorMessage = error2 instanceof Error ? error2.message.toLowerCase() : String(error2).toLowerCase();
-  const errorCode = error2?.status || error2?.code;
-  const isAuthError = errorCode === 401 || errorCode === 403 || errorMessage.includes("unauthorized") || errorMessage.includes("forbidden") || errorMessage.includes("invalid api key") || errorMessage.includes("authentication") || errorMessage.includes("access denied") || errorMessage.includes("token") && errorMessage.includes("expired");
-  const isRateLimitError = errorCode === 429 || errorMessage.includes("429") || errorMessage.includes("rate limit") || errorMessage.includes("too many requests");
-  if (isAuthError) {
-    console.warn("Qwen OAuth authentication error detected:", errorMessage);
-    console.log("Note: If this persists, you may need to re-authenticate with Qwen OAuth");
-    return null;
-  }
-  if (isRateLimitError) {
-    console.warn("Qwen API rate limit encountered:", errorMessage);
-    return null;
-  }
-  return null;
-}
-var init_handler = __esm({
-  "packages/core/dist/src/fallback/handler.js"() {
-    "use strict";
-    init_esbuild_shims();
-    init_contentGenerator();
-    __name(handleFallback, "handleFallback");
-    __name(handleQwenOAuthError, "handleQwenOAuthError");
-  }
-});
-
 // packages/core/dist/src/core/geminiChat.js
 function isValidResponse2(response) {
   if (response.usageMetadata) {
@@ -156662,7 +156553,6 @@ var init_geminiChat = __esm({
     init_loggers();
     init_chatRecordingService();
     init_types();
-    init_handler();
     init_uiTelemetry();
     (function(StreamEventType2) {
       StreamEventType2["CHUNK"] = "chunk";
@@ -156797,22 +156687,23 @@ var init_geminiChat = __esm({
           contents: requestContents,
           config: { ...this.generationConfig, ...params.config }
         }, prompt_id), "apiCall");
-        const onPersistent429Callback = /* @__PURE__ */ __name(async (authType, error2) => await handleFallback(this.config, model, authType, error2), "onPersistent429Callback");
         const streamResponse2 = await retryWithBackoff(apiCall, {
           shouldRetryOnError: /* @__PURE__ */ __name((error2) => {
-            if (error2 instanceof ApiError && error2.message) {
-              if (error2.status === 400)
-                return false;
+            if (error2 instanceof Error) {
               if (isSchemaDepthError(error2.message))
                 return false;
-              if (error2.status === 429)
-                return true;
-              if (error2.status >= 500 && error2.status < 600)
-                return true;
+              if (isInvalidArgumentError(error2.message))
+                return false;
             }
+            const status = getErrorStatus(error2);
+            if (status === 400)
+              return false;
+            if (status === 429)
+              return true;
+            if (status && status >= 500 && status < 600)
+              return true;
             return false;
           }, "shouldRetryOnError"),
-          onPersistent429: onPersistent429Callback,
           authType: this.config.getContentGeneratorConfig()?.authType
         });
         return this.processStreamResponse(model, streamResponse2);
@@ -171201,12 +171092,11 @@ function isShellCommandReadOnly(command2) {
   }
   const segments = splitCommands(command2);
   for (const segment of segments) {
-    const isAllowed = evaluateShellSegment(segment);
-    if (!isAllowed) {
+    if (!evaluateShellSegment(segment)) {
       return false;
     }
   }
-  return true;
+  return segments.length > 0;
 }
 var import_shell_quote, READ_ONLY_ROOT_COMMANDS, BLOCKED_FIND_FLAGS, BLOCKED_FIND_PREFIXES, READ_ONLY_GIT_SUBCOMMANDS, BLOCKED_GIT_REMOTE_ACTIONS, BLOCKED_GIT_BRANCH_FLAGS, BLOCKED_SED_PREFIXES, AWK_SIDE_EFFECT_PATTERNS, SED_SIDE_EFFECT_PATTERNS, ENV_ASSIGNMENT_REGEX;
 var init_shellReadOnlyChecker = __esm({
@@ -171404,6 +171294,13 @@ function splitCommands(command2) {
       } else if (char === ";" || char === "&" || char === "|") {
         commands.push(currentCommand.trim());
         currentCommand = "";
+      } else if (char === "\r" && nextChar === "\n") {
+        commands.push(currentCommand.trim());
+        currentCommand = "";
+        i3++;
+      } else if (char === "\n") {
+        commands.push(currentCommand.trim());
+        currentCommand = "";
       } else {
         currentCommand += char;
       }
@@ -172214,6 +172111,7 @@ var init_coreToolScheduler = __esm({
     "use strict";
     init_esbuild_shims();
     init_src2();
+    init_tool_names();
     init_generateContentResponseUtilities();
     init_modifiable_tool();
     init_lib();
@@ -172429,15 +172327,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) => ({
@@ -172507,8 +172411,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,
@@ -173398,13 +173301,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()
                     });
                 }
@@ -179265,7 +179170,6 @@ var init_client2 = __esm({
     init_retry();
     init_ideContext();
     init_types7();
-    init_handler();
     MAX_TURNS = 100;
     GeminiClient = class {
       static {
@@ -179632,12 +179536,7 @@ var init_client2 = __esm({
               contents
             }, this.lastPromptId);
           }, "apiCall");
-          const onPersistent429Callback = /* @__PURE__ */ __name(async (authType, error2) => (
-            // Pass the captured model to the centralized handler.
-            await handleFallback(this.config, currentAttemptModel, authType, error2)
-          ), "onPersistent429Callback");
           const result = await retryWithBackoff(apiCall, {
-            onPersistent429: onPersistent429Callback,
             authType: this.config.getContentGeneratorConfig()?.authType
           });
           return result;
@@ -218775,7 +218674,7 @@ function createFsWatchInstance(path118, options2, listener, errHandler, emitRaw)
   }
 }
 var STR_DATA, STR_END, STR_CLOSE, EMPTY_FN, pl, isWindows2, isMacos, isLinux, isFreeBSD, isIBMi, EVENTS, EV, THROTTLE_MODE_WATCH, statMethods, KEY_LISTENERS, KEY_ERR, KEY_RAW, HANDLER_KEYS, binaryExtensions, isBinaryPath, foreach, addAndConvert, clearItem, delFromSet, isEmptySet, FsWatchInstances, fsWatchBroadcast, setFsWatchListener, FsWatchFileInstances, setFsWatchFileListener, NodeFsHandler;
-var init_handler2 = __esm({
+var init_handler = __esm({
   "node_modules/chokidar/esm/handler.js"() {
     init_esbuild_shims();
     STR_DATA = "data";
@@ -219597,7 +219496,7 @@ var init_esm21 = __esm({
   "node_modules/chokidar/esm/index.js"() {
     init_esbuild_shims();
     init_esm20();
-    init_handler2();
+    init_handler();
     SLASH = "/";
     SLASH_SLASH = "//";
     ONE_DOT = ".";
@@ -231915,18 +231814,24 @@ async function convertClaudePluginPackage(extensionDir, pluginName) {
   const tmpDir = await ExtensionStorage.createTmpDir();
   try {
     await copyDirectory(pluginSource, tmpDir);
-    if (mergedConfig.commands) {
-      const commandsDestDir = path61.join(tmpDir, "commands");
-      await collectResources(mergedConfig.commands, pluginSource, commandsDestDir);
-    }
-    if (mergedConfig.skills) {
-      const skillsDestDir = path61.join(tmpDir, "skills");
-      await collectResources(mergedConfig.skills, pluginSource, skillsDestDir);
+    const resourceConfigs = [
+      { name: "commands", config: mergedConfig.commands },
+      { name: "skills", config: mergedConfig.skills },
+      { name: "agents", config: mergedConfig.agents }
+    ];
+    for (const { name: name3, config: config2 } of resourceConfigs) {
+      const folderPath = path61.join(tmpDir, name3);
+      const sourceFolderPath = path61.join(pluginSource, name3);
+      if (config2) {
+        if (fs59.existsSync(folderPath)) {
+          fs59.rmSync(folderPath, { recursive: true, force: true });
+        }
+        await collectResources(config2, pluginSource, folderPath);
+      } else if (!fs59.existsSync(sourceFolderPath) && fs59.existsSync(folderPath)) {
+        fs59.rmSync(folderPath, { recursive: true, force: true });
+      }
     }
     const agentsDestDir = path61.join(tmpDir, "agents");
-    if (mergedConfig.agents) {
-      await collectResources(mergedConfig.agents, pluginSource, agentsDestDir);
-    }
     await convertAgentFiles(agentsDestDir);
     const qwenConfig = convertClaudeToQwenConfig(mergedConfig);
     const qwenConfigPath = path61.join(tmpDir, "qwen-extension.json");
@@ -231963,6 +231868,7 @@ async function collectResources(resourcePaths, pluginRoot, destDir) {
         console.log(`Skipping ${resolvedPath} as it's already in the correct location`);
         continue;
       }
+      const finalDestDir = path61.join(destDir, dirName);
       const files = await glob("**/*", {
         cwd: resolvedPath,
         nodir: true,
@@ -231970,7 +231876,7 @@ async function collectResources(resourcePaths, pluginRoot, destDir) {
       });
       for (const file of files) {
         const srcFile = path61.join(resolvedPath, file);
-        const destFile = path61.join(destDir, file);
+        const destFile = path61.join(finalDestDir, file);
         const destFileDir = path61.dirname(destFile);
         if (!fs59.existsSync(destFileDir)) {
           fs59.mkdirSync(destFileDir, { recursive: true });
@@ -241770,7 +241676,7 @@ var init_config3 = __esm({
       contentGeneratorConfigSources = {};
       contentGenerator;
       embeddingModel;
-      _modelsConfig;
+      modelsConfig;
       modelProvidersConfig;
       sandbox;
       targetDir;
@@ -241949,7 +241855,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: {
@@ -242016,8 +241922,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.
@@ -242025,17 +241931,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);
@@ -242093,20 +241999,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;
         }
@@ -242120,8 +242026,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;
@@ -242144,14 +242050,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.
@@ -242164,7 +242070,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;
@@ -362908,7 +362814,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];
@@ -362994,7 +362900,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(
@@ -369475,7 +369381,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.8.2-nightly.20260129.dd973379";
+  return "0.8.2-preview.1";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -376560,125 +376466,11 @@ function validateTheme(settings) {
 }
 __name(validateTheme, "validateTheme");
 
-// packages/cli/src/utils/languageUtils.ts
-init_esbuild_shims();
-import * as fs78 from "node:fs";
-import * as path86 from "node:path";
-var LLM_OUTPUT_LANGUAGE_RULE_FILENAME = "output-language.md";
-var LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = "qwen-code:llm-output-language:";
-var OUTPUT_LANGUAGE_AUTO = "auto";
-function isAutoLanguage(value) {
-  return !value || value.toLowerCase() === OUTPUT_LANGUAGE_AUTO;
-}
-__name(isAutoLanguage, "isAutoLanguage");
-function normalizeOutputLanguage(language) {
-  const lowered = language.toLowerCase();
-  const fullName = getLanguageNameFromLocale(lowered);
-  if (fullName !== "English" || lowered === "en") {
-    return fullName;
-  }
-  return language;
-}
-__name(normalizeOutputLanguage, "normalizeOutputLanguage");
-function resolveOutputLanguage(value) {
-  if (isAutoLanguage(value)) {
-    const detectedLocale = detectSystemLanguage();
-    return getLanguageNameFromLocale(detectedLocale);
-  }
-  return normalizeOutputLanguage(value);
-}
-__name(resolveOutputLanguage, "resolveOutputLanguage");
-function getOutputLanguageFilePath() {
-  return path86.join(
-    Storage.getGlobalQwenDir(),
-    LLM_OUTPUT_LANGUAGE_RULE_FILENAME
-  );
-}
-__name(getOutputLanguageFilePath, "getOutputLanguageFilePath");
-function sanitizeForMarker(language) {
-  return language.replace(/[\r\n]/g, " ").replace(/--!?>/g, "").replace(/--/g, "");
-}
-__name(sanitizeForMarker, "sanitizeForMarker");
-function generateOutputLanguageFileContent(language) {
-  const safeLanguage = sanitizeForMarker(language);
-  return `# Output language preference: ${language}
-<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${safeLanguage} -->
-
-## Goal
-Prefer responding in **${language}** for normal assistant messages and explanations.
-
-## Keep technical artifacts unchanged
-Do **not** translate or rewrite:
-- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
-- Exact quoted text from the user (keep quotes verbatim)
-
-## When a conflict exists
-If higher-priority instructions (system/developer) require a different behavior, follow them.
-
-## Tool / system outputs
-Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
-`;
-}
-__name(generateOutputLanguageFileContent, "generateOutputLanguageFileContent");
-function parseOutputLanguageFromContent(content) {
-  const markerRegex = new RegExp(
-    String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
-    "i"
-  );
-  const markerMatch = content.match(markerRegex);
-  if (markerMatch?.[1]?.trim()) {
-    return markerMatch[1].trim();
-  }
-  const headingMatch = content.match(
-    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im
-  );
-  if (headingMatch?.[1]?.trim()) {
-    return headingMatch[1].trim();
-  }
-  return null;
-}
-__name(parseOutputLanguageFromContent, "parseOutputLanguageFromContent");
-function readOutputLanguageFromFile() {
-  const filePath = getOutputLanguageFilePath();
-  if (!fs78.existsSync(filePath)) {
-    return null;
-  }
-  try {
-    const content = fs78.readFileSync(filePath, "utf-8");
-    return parseOutputLanguageFromContent(content);
-  } catch {
-    return null;
-  }
-}
-__name(readOutputLanguageFromFile, "readOutputLanguageFromFile");
-function writeOutputLanguageFile(language) {
-  const filePath = getOutputLanguageFilePath();
-  const content = generateOutputLanguageFileContent(language);
-  const dir = path86.dirname(filePath);
-  fs78.mkdirSync(dir, { recursive: true });
-  fs78.writeFileSync(filePath, content, "utf-8");
-}
-__name(writeOutputLanguageFile, "writeOutputLanguageFile");
-function updateOutputLanguageFile(settingValue) {
-  const resolved = resolveOutputLanguage(settingValue);
-  writeOutputLanguageFile(resolved);
-}
-__name(updateOutputLanguageFile, "updateOutputLanguageFile");
-function initializeLlmOutputLanguage(outputLanguage) {
-  const resolved = resolveOutputLanguage(outputLanguage);
-  const currentFileLanguage = readOutputLanguageFromFile();
-  if (currentFileLanguage !== resolved) {
-    writeOutputLanguageFile(resolved);
-  }
-}
-__name(initializeLlmOutputLanguage, "initializeLlmOutputLanguage");
-
 // packages/cli/src/core/initializer.ts
 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(
@@ -376688,7 +376480,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();
@@ -377095,7 +376887,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "a90a920e";
+var GIT_COMMIT_INFO2 = "284ec6d1";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -377709,7 +377501,7 @@ var docsCommand = {
 // packages/cli/src/ui/commands/directoryCommand.tsx
 init_esbuild_shims();
 import * as os31 from "node:os";
-import * as path87 from "node:path";
+import * as path86 from "node:path";
 function expandHomeDir(p2) {
   if (!p2) {
     return "";
@@ -377720,7 +377512,7 @@ function expandHomeDir(p2) {
   } else if (p2 === "~" || p2.startsWith("~/")) {
     expandedPath = os31.homedir() + p2.substring(1);
   }
-  return path87.normalize(expandedPath);
+  return path86.normalize(expandedPath);
 }
 __name(expandHomeDir, "expandHomeDir");
 var directoryCommand = {
@@ -378505,7 +378297,7 @@ var helpCommand = {
 
 // packages/cli/src/ui/commands/ideCommand.ts
 init_esbuild_shims();
-import path88 from "node:path";
+import path87 from "node:path";
 function getIdeStatusMessage(ideClient) {
   const connection = ideClient.getConnectionStatus();
   switch (connection.status) {
@@ -378535,13 +378327,13 @@ __name(getIdeStatusMessage, "getIdeStatusMessage");
 function formatFileList(openFiles) {
   const basenameCounts = /* @__PURE__ */ new Map();
   for (const file of openFiles) {
-    const basename24 = path88.basename(file.path);
+    const basename24 = path87.basename(file.path);
     basenameCounts.set(basename24, (basenameCounts.get(basename24) || 0) + 1);
   }
   const fileList = openFiles.map((file) => {
-    const basename24 = path88.basename(file.path);
+    const basename24 = path87.basename(file.path);
     const isDuplicate = (basenameCounts.get(basename24) || 0) > 1;
-    const parentDir = path88.basename(path88.dirname(file.path));
+    const parentDir = path87.basename(path87.dirname(file.path));
     const displayName = isDuplicate ? `${basename24} (/${parentDir})` : basename24;
     return `  - ${displayName}${file.isActive ? " (active)" : ""}`;
   }).join("\n");
@@ -378784,8 +378576,8 @@ var ideCommand = /* @__PURE__ */ __name(async () => {
 
 // packages/cli/src/ui/commands/initCommand.ts
 init_esbuild_shims();
-import * as fs79 from "node:fs";
-import * as path89 from "node:path";
+import * as fs78 from "node:fs";
+import * as path88 from "node:path";
 var import_react27 = __toESM(require_react(), 1);
 var initCommand = {
   name: "init",
@@ -378803,11 +378595,11 @@ var initCommand = {
     }
     const targetDir = context2.services.config.getTargetDir();
     const contextFileName = getCurrentGeminiMdFilename();
-    const contextFilePath = path89.join(targetDir, contextFileName);
+    const contextFilePath = path88.join(targetDir, contextFileName);
     try {
-      if (fs79.existsSync(contextFilePath)) {
+      if (fs78.existsSync(contextFilePath)) {
         try {
-          const existing = fs79.readFileSync(contextFilePath, "utf8");
+          const existing = fs78.readFileSync(contextFilePath, "utf8");
           if (existing && existing.trim().length > 0) {
             if (!context2.overwriteConfirmed) {
               return {
@@ -378829,7 +378621,7 @@ var initCommand = {
         }
       }
       try {
-        fs79.writeFileSync(contextFilePath, "", "utf8");
+        fs78.writeFileSync(contextFilePath, "", "utf8");
         context2.ui.addItem(
           {
             type: "info",
@@ -378894,6 +378686,121 @@ Write the complete content to the \`${contextFileName}\` file. The output must b
 
 // packages/cli/src/ui/commands/languageCommand.ts
 init_esbuild_shims();
+
+// packages/cli/src/utils/languageUtils.ts
+init_esbuild_shims();
+import * as fs79 from "node:fs";
+import * as path89 from "node:path";
+var LLM_OUTPUT_LANGUAGE_RULE_FILENAME = "output-language.md";
+var LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = "qwen-code:llm-output-language:";
+var OUTPUT_LANGUAGE_AUTO = "auto";
+function isAutoLanguage(value) {
+  return !value || value.toLowerCase() === OUTPUT_LANGUAGE_AUTO;
+}
+__name(isAutoLanguage, "isAutoLanguage");
+function normalizeOutputLanguage(language) {
+  const lowered = language.toLowerCase();
+  const fullName = getLanguageNameFromLocale(lowered);
+  if (fullName !== "English" || lowered === "en") {
+    return fullName;
+  }
+  return language;
+}
+__name(normalizeOutputLanguage, "normalizeOutputLanguage");
+function resolveOutputLanguage(value) {
+  if (isAutoLanguage(value)) {
+    const detectedLocale = detectSystemLanguage();
+    return getLanguageNameFromLocale(detectedLocale);
+  }
+  return normalizeOutputLanguage(value);
+}
+__name(resolveOutputLanguage, "resolveOutputLanguage");
+function getOutputLanguageFilePath() {
+  return path89.join(
+    Storage.getGlobalQwenDir(),
+    LLM_OUTPUT_LANGUAGE_RULE_FILENAME
+  );
+}
+__name(getOutputLanguageFilePath, "getOutputLanguageFilePath");
+function sanitizeForMarker(language) {
+  return language.replace(/[\r\n]/g, " ").replace(/--!?>/g, "").replace(/--/g, "");
+}
+__name(sanitizeForMarker, "sanitizeForMarker");
+function generateOutputLanguageFileContent(language) {
+  const safeLanguage = sanitizeForMarker(language);
+  return `# Output language preference: ${language}
+<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${safeLanguage} -->
+
+## Goal
+Prefer responding in **${language}** for normal assistant messages and explanations.
+
+## Keep technical artifacts unchanged
+Do **not** translate or rewrite:
+- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
+- Exact quoted text from the user (keep quotes verbatim)
+
+## When a conflict exists
+If higher-priority instructions (system/developer) require a different behavior, follow them.
+
+## Tool / system outputs
+Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
+`;
+}
+__name(generateOutputLanguageFileContent, "generateOutputLanguageFileContent");
+function parseOutputLanguageFromContent(content) {
+  const markerRegex = new RegExp(
+    String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
+    "i"
+  );
+  const markerMatch = content.match(markerRegex);
+  if (markerMatch?.[1]?.trim()) {
+    return markerMatch[1].trim();
+  }
+  const headingMatch = content.match(
+    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im
+  );
+  if (headingMatch?.[1]?.trim()) {
+    return headingMatch[1].trim();
+  }
+  return null;
+}
+__name(parseOutputLanguageFromContent, "parseOutputLanguageFromContent");
+function readOutputLanguageFromFile() {
+  const filePath = getOutputLanguageFilePath();
+  if (!fs79.existsSync(filePath)) {
+    return null;
+  }
+  try {
+    const content = fs79.readFileSync(filePath, "utf-8");
+    return parseOutputLanguageFromContent(content);
+  } catch {
+    return null;
+  }
+}
+__name(readOutputLanguageFromFile, "readOutputLanguageFromFile");
+function writeOutputLanguageFile(language) {
+  const filePath = getOutputLanguageFilePath();
+  const content = generateOutputLanguageFileContent(language);
+  const dir = path89.dirname(filePath);
+  fs79.mkdirSync(dir, { recursive: true });
+  fs79.writeFileSync(filePath, content, "utf-8");
+}
+__name(writeOutputLanguageFile, "writeOutputLanguageFile");
+function updateOutputLanguageFile(settingValue) {
+  const resolved = resolveOutputLanguage(settingValue);
+  writeOutputLanguageFile(resolved);
+}
+__name(updateOutputLanguageFile, "updateOutputLanguageFile");
+function initializeLlmOutputLanguage(outputLanguage) {
+  const resolved = resolveOutputLanguage(outputLanguage);
+  const currentFileLanguage = readOutputLanguageFromFile();
+  if (currentFileLanguage !== resolved) {
+    writeOutputLanguageFile(resolved);
+  }
+}
+__name(initializeLlmOutputLanguage, "initializeLlmOutputLanguage");
+
+// packages/cli/src/ui/commands/languageCommand.ts
 function getCurrentOutputLanguage(context2) {
   const settingValue = context2?.services?.settings?.merged?.general?.outputLanguage || OUTPUT_LANGUAGE_AUTO;
   const resolved = resolveOutputLanguage(settingValue);
@@ -425911,7 +425818,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(
@@ -427834,7 +427741,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."
@@ -428175,7 +428082,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
@@ -428859,7 +428768,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,
@@ -428867,7 +428776,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 },
@@ -428993,7 +428902,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       locations,
       kind: kind2,
       rawInput: params.args ?? {},
-      _meta: { toolName: params.toolName }
+      _meta: {
+        toolName: params.toolName,
+        ...params.subagentMeta
+      }
     });
     return true;
   }
@@ -429035,7 +428947,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;
@@ -429047,9 +428962,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,
@@ -429057,7 +428974,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       content: [
         { type: "content", content: { type: "text", text: error2.message } }
       ],
-      _meta: { toolName }
+      _meta: {
+        toolName,
+        ...subagentMeta
+      }
     });
   }
   // ==================== Public Utilities ====================
@@ -429334,9 +429254,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);
   }
@@ -429346,6 +429268,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.
    *
@@ -429358,16 +429289,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();
       }
     ];
@@ -429397,7 +429331,8 @@ var SubAgentTracker = class {
       void this.toolCallEmitter.emitStart({
         toolName: event.name,
         callId: event.callId,
-        args: event.args
+        args: event.args,
+        subagentMeta: this.getSubagentMeta()
       });
     };
   }
@@ -429415,7 +429350,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);
     };
@@ -429477,7 +429413,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
+      );
     };
   }
   /**
@@ -429835,7 +429791,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
@@ -430382,7 +430345,7 @@ var GeminiAgent = class {
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description
     }));
-    const version2 = "0.8.2-nightly.20260129.dd973379";
+    const version2 = "0.8.2-preview.1";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {
@@ -430541,7 +430504,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."
@@ -430757,7 +430720,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) {
@@ -430807,6 +430770,7 @@ ${finalArgs[promptIndex + 1]}`;
     }
     argv = { ...argv, resume: selectedSessionId };
   }
+  initializeLlmOutputLanguage(settings.merged.general?.outputLanguage);
   {
     const config2 = await loadCliConfig(
       settings.merged,

package/package.json

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