@qwen-code/qwen-code 0.21.0 → 0.21.1

package/chunks/{chunk-K36B6G2O.js → chunk-JFMA7Y5M.js}

@@ -3,24 +3,24 @@
 import {
   AUTO_THEME_NAME,
   themeManager
-} from "./chunk-L5UHQJTJ.js";
+} from "./chunk-GATT5TKW.js";
 import {
   initializeI18n,
   resolveLanguageSetting,
   t
-} from "./chunk-LKEJ26GS.js";
+} from "./chunk-TCIFAA7K.js";
 import {
   IdeClient
-} from "./chunk-PHOF65IG.js";
+} from "./chunk-X5WNMMIA.js";
 import {
   AuthEvent,
   IdeConnectionEvent,
   logAuth,
   logIdeConnection
-} from "./chunk-CIKQ7KKO.js";
+} from "./chunk-PT722TDT.js";
 import {
   getErrorMessage
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-55DJUCI2.js → chunk-JHNRZMHI.js}

@@ -3,10 +3,10 @@
 import {
   DashScopeOpenAICompatibleProvider,
   DefaultOpenAICompatibleProvider
-} from "./chunk-DLWL3Z7A.js";
+} from "./chunk-WBSMNTSV.js";
 import {
   RequestTokenizer
-} from "./chunk-OKY7HXPG.js";
+} from "./chunk-FNMZK765.js";
 import {
   DEFAULT_STREAM_IDLE_TIMEOUT_MS,
   MAX_STREAM_IDLE_TIMEOUT_MS,
@@ -19,40 +19,42 @@ import {
   OpenAIContentConverter,
   TaggedThinkingParser,
   openaiRequestCaptureContext
-} from "./chunk-DHHOYAPR.js";
+} from "./chunk-5TBMQLGG.js";
 import {
   InvalidStreamError
-} from "./chunk-BPJSQIJX.js";
+} from "./chunk-2J3OJGTL.js";
 import {
   getRateLimitErrorDetails
-} from "./chunk-6FGBXPWM.js";
+} from "./chunk-RPLGZJV2.js";
 import {
   safeJsonParse
-} from "./chunk-H5FFA6TH.js";
+} from "./chunk-NOKIVHOL.js";
 import {
   getToolCallPreparations,
   runtimeDiagnostics
-} from "./chunk-LS77BEZP.js";
+} from "./chunk-GLCZKT5V.js";
 import {
-  reportOpenAiRequest
-} from "./chunk-LEH5C7FV.js";
+  reportOpenAiChunk,
+  reportOpenAiRequest,
+  reportOpenAiResponse
+} from "./chunk-5YKDXHUY.js";
 import {
   ProtocolTagSanitizedEvent,
   logProtocolTagSanitized
-} from "./chunk-CIKQ7KKO.js";
+} from "./chunk-PT722TDT.js";
 import {
   reconcileMaxTokens
-} from "./chunk-UW5EOVUN.js";
+} from "./chunk-ZBVS26BY.js";
 import {
   redactProxyError
-} from "./chunk-2JZBVYTU.js";
+} from "./chunk-WZRWHXFE.js";
 import {
   createDebugLogger,
   getErrorMessage,
   getErrorStatus,
   getErrorType,
   isAbortError
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
 import {
   GenerateContentResponse
 } from "./chunk-22C7BQ6D.js";
@@ -453,7 +455,12 @@ var StreamingToolCallParser = class {
   namelessToolCallIndices = /* @__PURE__ */ new Set();
   /** Map from tool call ID to actual index used for storage */
   idToIndexMap = /* @__PURE__ */ new Map();
-  /** Remapped slots awaiting a stable ID from a later chunk. */
+  /**
+   * Maps a provider index to the actual slot it was remapped to on collision.
+   * Two readers consume it: an id that arrives after its name/args adopts the
+   * slot, and later id-less continuation chunks at the same provider index are
+   * routed to it.
+   */
   pendingIndexRemaps = /* @__PURE__ */ new Map();
   /** Counter for generating new indices when collisions occur */
   nextAvailableIndex = 0;
@@ -501,9 +508,8 @@ var StreamingToolCallParser = class {
     if (id) {
       if (this.idToIndexMap.has(id)) {
         actualIndex = this.idToIndexMap.get(id);
-      } else if (this.pendingIndexRemaps.has(index)) {
+      } else if (this.pendingIndexRemaps.has(index) && !this.toolCallMeta.get(this.pendingIndexRemaps.get(index))?.id) {
         actualIndex = this.pendingIndexRemaps.get(index);
-        this.pendingIndexRemaps.delete(index);
         this.idToIndexMap.set(id, actualIndex);
       } else {
         if (this.buffers.has(index)) {
@@ -577,7 +583,7 @@ var StreamingToolCallParser = class {
       } else {
         this.namelessToolCallIndices.delete(actualIndex);
       }
-      if (!meta.id && actualIndex !== index) {
+      if (actualIndex !== index) {
         this.pendingIndexRemaps.set(index, actualIndex);
       }
       return { actualIndex, complete: false };
@@ -603,7 +609,7 @@ var StreamingToolCallParser = class {
         meta.name = validName;
       }
     }
-    if (!meta.id && actualIndex !== index) {
+    if (actualIndex !== index) {
       this.pendingIndexRemaps.set(index, actualIndex);
     }
     const currentInString = this.inStrings.get(actualIndex);
@@ -1074,7 +1080,7 @@ var ContentGenerationPipeline = class {
       request,
       userPromptId,
       false,
-      async (openaiRequest, context) => {
+      async (openaiRequest, context, telemetryAttempt) => {
         const parentSignal = request.config?.abortSignal;
         const perRequestAc = parentSignal ? createChildAbortController(parentSignal) : void 0;
         try {
@@ -1084,6 +1090,7 @@ var ContentGenerationPipeline = class {
               signal: perRequestAc?.signal
             }
           );
+          reportOpenAiResponse(telemetryAttempt, openaiResponse);
           const geminiResponse = OpenAIContentConverter.convertOpenAIResponseToGemini(
             openaiResponse,
             context
@@ -1100,7 +1107,7 @@ var ContentGenerationPipeline = class {
       request,
       userPromptId,
       true,
-      async (openaiRequest, context) => {
+      async (openaiRequest, context, telemetryAttempt) => {
         const parentSignal = request.config?.abortSignal;
         const perRequestAc = createChildAbortController(parentSignal);
         let stream;
@@ -1155,7 +1162,8 @@ var ContentGenerationPipeline = class {
           guarded,
           context,
           request,
-          userPromptId
+          userPromptId,
+          telemetryAttempt
         );
         async function* drainThenCleanup() {
           try {
@@ -1177,7 +1185,7 @@ var ContentGenerationPipeline = class {
    * 3. Handle chunk merging for providers that send finishReason and usageMetadata separately
    * 4. Handle success/error logging
    */
-  async *processStreamWithLogging(stream, context, request, userPromptId) {
+  async *processStreamWithLogging(stream, context, request, userPromptId, telemetryAttempt) {
     let pendingFinishResponse = null;
     let finishYielded = false;
     let pendingFinishProtocolTagSanitized;
@@ -1201,6 +1209,7 @@ var ContentGenerationPipeline = class {
     }, "logPendingProtocolTagSanitized");
     try {
       for await (const chunk of stream) {
+        reportOpenAiChunk(telemetryAttempt, chunk);
         if (chunk.choices?.[0]?.finish_reason === "error_finish") {
           const errorContent = chunk.choices?.[0]?.delta?.content?.trim() || "Unknown stream error";
           throw new StreamContentError(errorContent);
@@ -1394,47 +1403,48 @@ var ContentGenerationPipeline = class {
     const thinkingMandatory = this.requiresThinking(model);
     const reasoningDisabled = request.config?.thinkingConfig?.includeThoughts === false || this.contentGeneratorConfig.reasoning === false;
     if (reasoningDisabled) {
-      const typed = providerRequest;
+      const typed2 = providerRequest;
       if (!thinkingMandatory && (model.startsWith("qwen") || model === "coder-model")) {
         if (isDashScope) {
-          typed["enable_thinking"] = false;
+          typed2["enable_thinking"] = false;
         } else {
-          delete typed["enable_thinking"];
-          const existing = typed["chat_template_kwargs"] ?? {};
-          typed["chat_template_kwargs"] = {
+          delete typed2["enable_thinking"];
+          const existing = typed2["chat_template_kwargs"] ?? {};
+          typed2["chat_template_kwargs"] = {
             ...existing,
             enable_thinking: false
           };
         }
       }
-      if ("reasoning" in typed) {
-        delete typed["reasoning"];
+      if ("reasoning" in typed2) {
+        delete typed2["reasoning"];
       }
-      if ("reasoning_effort" in typed && typed["reasoning_effort"] !== "none") {
-        delete typed["reasoning_effort"];
+      if ("reasoning_effort" in typed2 && typed2["reasoning_effort"] !== "none") {
+        delete typed2["reasoning_effort"];
       }
       if (isDeepSeekHostname(this.contentGeneratorConfig)) {
-        typed["thinking"] = { type: "disabled" };
+        typed2["thinking"] = { type: "disabled" };
       }
     }
     if (thinkingMandatory) {
-      const typed = providerRequest;
-      if (typed["enable_thinking"] === false) {
-        delete typed["enable_thinking"];
+      const typed2 = providerRequest;
+      if (typed2["enable_thinking"] === false) {
+        delete typed2["enable_thinking"];
       }
-      const chatTemplateKwargs = typed["chat_template_kwargs"];
+      const chatTemplateKwargs = typed2["chat_template_kwargs"];
       if (chatTemplateKwargs?.["enable_thinking"] === false) {
         const remaining = { ...chatTemplateKwargs };
         delete remaining["enable_thinking"];
         if (Object.keys(remaining).length > 0) {
-          typed["chat_template_kwargs"] = remaining;
+          typed2["chat_template_kwargs"] = remaining;
         } else {
-          delete typed["chat_template_kwargs"];
+          delete typed2["chat_template_kwargs"];
         }
       }
-      if (isDashScope && typed["tool_choice"] === "required") {
-        delete typed["tool_choice"];
-      }
+    }
+    const typed = providerRequest;
+    if (isDashScope && typed["tool_choice"] === "required" && (thinkingMandatory || typed["enable_thinking"] === true)) {
+      delete typed["tool_choice"];
     }
     return providerRequest;
   }
@@ -1513,8 +1523,8 @@ var ContentGenerationPipeline = class {
       );
       openaiRequestCaptureContext.getStore()?.(openaiRequest);
       runtimeDiagnostics.recordOpenAIWireRequest(openaiRequest);
-      reportOpenAiRequest(openaiRequest);
-      return executor(openaiRequest, context);
+      const telemetryAttempt = reportOpenAiRequest(openaiRequest);
+      return executor(openaiRequest, context, telemetryAttempt);
     }, "executeAttempt");
     try {
       return await executeAttempt();

package/chunks/{chunk-63P4EL5V.js → chunk-JMONIXMJ.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   createDebugLogger
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-L26JL52R.js → chunk-JSD33JG6.js}

@@ -3,7 +3,7 @@
 import {
   getTeammateContext,
   isTeammate
-} from "./chunk-6AM5D4ME.js";
+} from "./chunk-S6LOFUVP.js";
 import {
   collectAvailableSkillEntries,
   escapeSystemReminderTags,
@@ -11,15 +11,15 @@ import {
 } from "./chunk-JCW2R7WC.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS
-} from "./chunk-M5JM7OSF.js";
+} from "./chunk-2DN4J57Y.js";
 import {
   ToolNames
-} from "./chunk-PR75REBZ.js";
+} from "./chunk-Y6AXW2OG.js";
 import {
   createDebugLogger,
   getErrorMessage,
   isNodeError
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -27,6 +27,45 @@ import {
   __name
 } from "./chunk-J2S4EL5Y.js";
 
+// packages/core/src/config/approval-mode.ts
+init_esbuild_shims();
+var ApprovalMode = /* @__PURE__ */ ((ApprovalMode2) => {
+  ApprovalMode2["PLAN"] = "plan";
+  ApprovalMode2["DEFAULT"] = "default";
+  ApprovalMode2["AUTO_EDIT"] = "auto-edit";
+  ApprovalMode2["AUTO"] = "auto";
+  ApprovalMode2["YOLO"] = "yolo";
+  return ApprovalMode2;
+})(ApprovalMode || {});
+var APPROVAL_MODES = Object.values(ApprovalMode);
+
+// packages/core/src/subagents/types.ts
+init_esbuild_shims();
+var BUBBLE_APPROVAL_MODE = "bubble";
+var SubagentError = class extends Error {
+  constructor(message, code, subagentName) {
+    super(message);
+    this.code = code;
+    this.subagentName = subagentName;
+    this.name = "SubagentError";
+  }
+  static {
+    __name(this, "SubagentError");
+  }
+};
+var SubagentErrorCode = {
+  NOT_FOUND: "NOT_FOUND",
+  ALREADY_EXISTS: "ALREADY_EXISTS",
+  INVALID_CONFIG: "INVALID_CONFIG",
+  INVALID_NAME: "INVALID_NAME",
+  FILE_ERROR: "FILE_ERROR",
+  VALIDATION_ERROR: "VALIDATION_ERROR",
+  TOOL_NOT_FOUND: "TOOL_NOT_FOUND"
+};
+
+// packages/core/src/utils/environmentContext.ts
+init_esbuild_shims();
+
 // packages/core/src/utils/getFolderStructure.ts
 init_esbuild_shims();
 import * as fs from "node:fs/promises";
@@ -212,7 +251,6 @@ ${structureLines.join("\n")}`;
 __name(getFolderStructure, "getFolderStructure");
 
 // packages/core/src/utils/environmentContext.ts
-init_esbuild_shims();
 var debugLogger2 = createDebugLogger("ENVIRONMENT_CONTEXT");
 var SYSTEM_REMINDER_OPEN = "<system-reminder>";
 var SYSTEM_REMINDER_CLOSE = "</system-reminder>";
@@ -345,10 +383,6 @@ function buildDeferredToolsReminder(toolRegistry) {
   );
 }
 __name(buildDeferredToolsReminder, "buildDeferredToolsReminder");
-function buildAddedMcpToolsReminder(deferredTools) {
-  return buildChangedMcpToolsReminder(deferredTools, []);
-}
-__name(buildAddedMcpToolsReminder, "buildAddedMcpToolsReminder");
 function buildChangedMcpToolsReminder(addedTools, removedToolNames) {
   const mcpTools = addedTools.filter((tool) => tool.serverName);
   const removed = [...removedToolNames].sort();
@@ -451,10 +485,6 @@ ${block}
   };
 }
 __name(buildAvailableSkillsReminder, "buildAvailableSkillsReminder");
-function buildAddedSkillsReminder(entries) {
-  return buildChangedSkillsReminder(entries, []);
-}
-__name(buildAddedSkillsReminder, "buildAddedSkillsReminder");
 function buildChangedSkillsReminder(addedEntries, removedNames) {
   const removed = [...removedNames].sort();
   if (addedEntries.length === 0 && removed.length === 0) {
@@ -639,30 +669,6 @@ function stripStartupContext(history) {
 }
 __name(stripStartupContext, "stripStartupContext");
 
-// packages/core/src/subagents/types.ts
-init_esbuild_shims();
-var BUBBLE_APPROVAL_MODE = "bubble";
-var SubagentError = class extends Error {
-  constructor(message, code, subagentName) {
-    super(message);
-    this.code = code;
-    this.subagentName = subagentName;
-    this.name = "SubagentError";
-  }
-  static {
-    __name(this, "SubagentError");
-  }
-};
-var SubagentErrorCode = {
-  NOT_FOUND: "NOT_FOUND",
-  ALREADY_EXISTS: "ALREADY_EXISTS",
-  INVALID_CONFIG: "INVALID_CONFIG",
-  INVALID_NAME: "INVALID_NAME",
-  FILE_ERROR: "FILE_ERROR",
-  VALIDATION_ERROR: "VALIDATION_ERROR",
-  TOOL_NOT_FOUND: "TOOL_NOT_FOUND"
-};
-
 // packages/core/src/tools/agent/fork-subagent.ts
 init_esbuild_shims();
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -858,18 +864,6 @@ function spawnBlockReason(maxDepth) {
 }
 __name(spawnBlockReason, "spawnBlockReason");
 
-// packages/core/src/config/approval-mode.ts
-init_esbuild_shims();
-var ApprovalMode = /* @__PURE__ */ ((ApprovalMode2) => {
-  ApprovalMode2["PLAN"] = "plan";
-  ApprovalMode2["DEFAULT"] = "default";
-  ApprovalMode2["AUTO_EDIT"] = "auto-edit";
-  ApprovalMode2["AUTO"] = "auto";
-  ApprovalMode2["YOLO"] = "yolo";
-  return ApprovalMode2;
-})(ApprovalMode || {});
-var APPROVAL_MODES = Object.values(ApprovalMode);
-
 // packages/core/src/agents/runtime/subagent-plan-tool-policy.ts
 init_esbuild_shims();
 var SUBAGENT_PLAN_LIFECYCLE_TOOLS = /* @__PURE__ */ new Set([
@@ -977,30 +971,21 @@ function buildSubagentPlanToolBlockedResult(toolName, logTag, logger) {
 __name(buildSubagentPlanToolBlockedResult, "buildSubagentPlanToolBlockedResult");
 
 export {
+  APPROVAL_MODES,
+  BUBBLE_APPROVAL_MODE,
+  SubagentError,
+  SubagentErrorCode,
   getFolderStructure,
-  SYSTEM_REMINDER_OPEN,
-  SYSTEM_REMINDER_CLOSE,
   formatDateForContext,
   getDirectoryContextString,
-  getEnvironmentContext,
-  buildDeferredToolsReminder,
-  buildAddedMcpToolsReminder,
   buildChangedMcpToolsReminder,
-  buildMcpServerInstructionsReminder,
-  buildAvailableSkillsReminder,
-  buildAddedSkillsReminder,
   buildChangedSkillsReminder,
-  buildAddedAgentsReminder,
   buildChangedAgentsReminder,
-  buildStartupContextReminder,
   getInitialChatHistory,
   getStartupContextLength,
   isSystemReminderContent,
   stripSystemReminderBlocks,
   stripStartupContext,
-  BUBBLE_APPROVAL_MODE,
-  SubagentError,
-  SubagentErrorCode,
   FORK_SUBAGENT_TYPE,
   FORK_AGENT,
   FORK_DEFAULT_MAX_TURNS,
@@ -1022,8 +1007,6 @@ export {
   isTopLevelSession,
   childLaunchDepth,
   spawnBlockReason,
-  ApprovalMode,
-  APPROVAL_MODES,
   SUBAGENT_PLAN_LIFECYCLE_TOOLS,
   isSubagentLikeExecutionContext,
   isPlanRequiredTeammateContext,

package/chunks/{chunk-YBL3QUDD.js → chunk-JTV5K7NH.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   t
-} from "./chunk-LKEJ26GS.js";
+} from "./chunk-TCIFAA7K.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-RZIX2G32.js → chunk-JX27F6QS.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   getEffectiveSupportedModes
-} from "./chunk-U7M2DMGW.js";
+} from "./chunk-7AEJDLRA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";