@qwen-code/qwen-code 0.20.1 → 0.20.2-gdpval-vl-bridge.0

package/chunks/{chunk-5G2SK2OO.js → chunk-IGAR75ZK.js}

@@ -15,11 +15,12 @@ import {
   normalize,
   normalizeMcpToolName,
   normalizeToolNameForProvider,
+  preloadRuntimeFetchModule,
   relaxSchemaForFunctionCalling,
   runtimeDiagnostics,
   safeJsonParse,
   setToolCallPreparations
-} from "./chunk-JYS55H6Z.js";
+} from "./chunk-CBOQ3HY7.js";
 import {
   require_lib
 } from "./chunk-A4UCTEB5.js";
@@ -56,6 +57,7 @@ import {
   recordFileOperationMetric,
   recordMemoryDreamMetrics,
   recordMemoryExtractMetrics,
+  recordMemoryRecallDeliveryMetrics,
   recordMemoryRecallMetrics,
   recordModelSlashCommand,
   recordSubagentExecutionMetrics,
@@ -63,7 +65,7 @@ import {
   recordToolCallMetrics,
   startLLMRequestSpan,
   truncateSpanError
-} from "./chunk-IS2SBY6T.js";
+} from "./chunk-RCUEYZDE.js";
 import {
   require_src
 } from "./chunk-HTR4WV6U.js";
@@ -94,6 +96,7 @@ import {
   EVENT_MEMORY_DREAM,
   EVENT_MEMORY_EXTRACT,
   EVENT_MEMORY_RECALL,
+  EVENT_MEMORY_RECALL_DELIVERY,
   EVENT_MODEL_SLASH_COMMAND,
   EVENT_NEXT_SPEAKER_CHECK,
   EVENT_PROMPT_SUGGESTION,
@@ -114,7 +117,7 @@ import {
   SERVICE_NAME,
   isValidSensitiveSpanAttributeMaxLength,
   safeJsonStringify
-} from "./chunk-M7WBGLYP.js";
+} from "./chunk-BULDBTYC.js";
 import {
   SemanticAttributes,
   init_esm as init_esm2
@@ -10725,6 +10728,75 @@ function getAllMCPServerStatuses() {
 }
 __name(getAllMCPServerStatuses, "getAllMCPServerStatuses");
 
+// packages/core/src/services/visionBridge/image-part-utils.ts
+init_esbuild_shims();
+function normalizeParts(input) {
+  if (typeof input === "string") {
+    return [{ text: input }];
+  }
+  if (Array.isArray(input)) {
+    return input.map(
+      (part) => typeof part === "string" ? { text: part } : part
+    );
+  }
+  return [input];
+}
+__name(normalizeParts, "normalizeParts");
+function isImagePart(part) {
+  const mimeType = part.inlineData?.mimeType;
+  const data = part.inlineData?.data;
+  return typeof mimeType === "string" && mimeType.startsWith("image/") && typeof data === "string" && data.length > 0;
+}
+__name(isImagePart, "isImagePart");
+function hasImageParts(input) {
+  return normalizeParts(input).some(isImagePart);
+}
+__name(hasImageParts, "hasImageParts");
+function splitImageParts(input) {
+  const imageParts = [];
+  const nonImageParts = [];
+  for (const part of normalizeParts(input)) {
+    if (isImagePart(part)) {
+      imageParts.push(part);
+    } else {
+      nonImageParts.push(part);
+    }
+  }
+  return { imageParts, nonImageParts };
+}
+__name(splitImageParts, "splitImageParts");
+function replaceImagesWithText(input, text) {
+  const result = [];
+  let replaced = false;
+  for (const part of normalizeParts(input)) {
+    if (isImagePart(part)) {
+      if (!replaced) {
+        result.push({ text });
+        replaced = true;
+      }
+      continue;
+    }
+    result.push(part);
+  }
+  if (!replaced) {
+    result.push({ text });
+  }
+  return result;
+}
+__name(replaceImagesWithText, "replaceImagesWithText");
+function isUsableImagePart(part) {
+  const data = part.inlineData?.data;
+  if (typeof data !== "string" || data.length === 0) {
+    return false;
+  }
+  return data.length <= VISION_BRIDGE_MAX_IMAGE_BASE64_BYTES;
+}
+__name(isUsableImagePart, "isUsableImagePart");
+function collectText(parts) {
+  return parts.map((part) => typeof part.text === "string" ? part.text : "").filter((text) => text.length > 0).join("\n").trim();
+}
+__name(collectText, "collectText");
+
 // packages/core/src/tools/mcp-tool.ts
 var debugLogger4 = createDebugLogger("MCP_TOOL");
 var MCP_CONNECTION_ERROR_PATTERNS = [
@@ -10938,18 +11010,11 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
         callToolResult
       );
       if (this.isMCPToolError(rawResponseParts)) {
-        const errorMessage2 = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify({
+        const errorResult = await this.buildMcpToolError(rawResponseParts, {
           name: this.serverToolName,
           args: this.params
-        })} with response: ${safeJsonStringify(rawResponseParts)}`;
-        return {
-          llmContent: errorMessage2,
-          returnDisplay: `Error: MCP tool '${this.serverToolName}' reported an error.`,
-          error: {
-            message: errorMessage2,
-            type: "mcp_tool_error" /* MCP_TOOL_ERROR */
-          }
-        };
+        });
+        return errorResult;
       }
       const transformedParts = transformMcpContentToParts(rawResponseParts);
       const truncated = await this.truncateTextParts(transformedParts);
@@ -11007,17 +11072,11 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
         });
       });
       if (this.isMCPToolError(rawResponseParts)) {
-        const errorMessage2 = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify(
+        const errorResult = await this.buildMcpToolError(
+          rawResponseParts,
           functionCalls[0]
-        )} with response: ${safeJsonStringify(rawResponseParts)}`;
-        return {
-          llmContent: errorMessage2,
-          returnDisplay: `Error: MCP tool '${this.serverToolName}' reported an error.`,
-          error: {
-            message: errorMessage2,
-            type: "mcp_tool_error" /* MCP_TOOL_ERROR */
-          }
-        };
+        );
+        return errorResult;
       }
       const transformedParts = transformMcpContentToParts(rawResponseParts);
       const truncated = await this.truncateTextParts(transformedParts);
@@ -11033,6 +11092,34 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
       return this.handleReconnectOnError(error, signal);
     }
   }
+  async buildMcpToolError(rawResponseParts, functionCall) {
+    const imageContent = getMcpErrorImageContent(rawResponseParts);
+    let llmContent;
+    let errorMessage2;
+    let persistedOutputFiles;
+    if (imageContent) {
+      const truncatedContent = await this.truncateTextParts(imageContent);
+      llmContent = truncatedContent.parts;
+      persistedOutputFiles = truncatedContent.persistedOutputFiles;
+      errorMessage2 = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify(
+        functionCall
+      )} with response: ${getDisplayFromParts(truncatedContent.parts)}`;
+    } else {
+      errorMessage2 = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify(
+        functionCall
+      )} with response: ${safeJsonStringify(rawResponseParts)}`;
+      llmContent = errorMessage2;
+    }
+    return {
+      llmContent,
+      returnDisplay: `Error: MCP tool '${this.serverToolName}' reported an error.`,
+      error: {
+        message: errorMessage2,
+        type: "mcp_tool_error" /* MCP_TOOL_ERROR */
+      },
+      ...persistedOutputFiles !== void 0 ? { persistedOutputFiles } : {}
+    };
+  }
   /**
    * Truncates text parts in the transformed result if they exceed the
    * configured threshold. Non-text parts (images, audio, etc.) are preserved.
@@ -11283,6 +11370,11 @@ function transformMcpContentToParts(sdkResponse) {
   return transformed.filter((part) => part !== null);
 }
 __name(transformMcpContentToParts, "transformMcpContentToParts");
+function getMcpErrorImageContent(rawResponseParts) {
+  const transformedParts = transformMcpContentToParts(rawResponseParts);
+  return transformedParts.some(isImagePart) ? transformedParts : void 0;
+}
+__name(getMcpErrorImageContent, "getMcpErrorImageContent");
 function getDisplayFromParts(parts) {
   if (parts.length === 0) {
     return "";
@@ -12412,6 +12504,29 @@ var MemoryRecallEvent = class {
     this.duration_ms = params.duration_ms;
   }
 };
+var MemoryRecallDeliveryEvent = class {
+  static {
+    __name(this, "MemoryRecallDeliveryEvent");
+  }
+  "event.name";
+  "event.timestamp";
+  phase;
+  delivery_point;
+  discard_reason;
+  strategy;
+  docs_selected;
+  latency_ms;
+  constructor(params) {
+    this["event.name"] = "qwen-code.memory.recall.delivery";
+    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
+    this.phase = params.phase;
+    this.delivery_point = params.delivery_point;
+    this.discard_reason = params.discard_reason;
+    this.strategy = params.strategy;
+    this.docs_selected = params.docs_selected;
+    this.latency_ms = params.latency_ms;
+  }
+};
 
 // packages/core/src/utils/subagentNameContext.ts
 init_esbuild_shims();
@@ -16714,14 +16829,15 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   if (!authType) {
     throw new Error("ContentGeneratorConfig must have an authType");
   }
+  await preloadRuntimeFetchModule();
   let baseGenerator;
   try {
     if (authType === "openai" /* USE_OPENAI */) {
-      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-CVEDTMDB.js");
+      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-ZQ6CYL4U.js");
       baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
     } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-J2X6E5VO.js");
-      const { QwenContentGenerator } = await import("./qwenContentGenerator-Y2GRNYZQ.js");
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-YFFJOT4S.js");
+      const { QwenContentGenerator } = await import("./qwenContentGenerator-2N24PNP3.js");
       try {
         const qwenClient = await getQwenOauthClient(
           config,
@@ -16739,10 +16855,10 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
         throw new Error(error instanceof Error ? error.message : String(error));
       }
     } else if (authType === "anthropic" /* USE_ANTHROPIC */) {
-      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-NMSS7IMV.js");
+      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-HGWAHO24.js");
       baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
     } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
-      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-LB4MA2LI.js");
+      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-WWGEJKFB.js");
       baseGenerator = createGeminiContentGenerator(generatorConfig, config);
     } else {
       throw new Error(
@@ -19228,6 +19344,34 @@ function logMemoryRecall(config, event) {
   });
 }
 __name(logMemoryRecall, "logMemoryRecall");
+function logMemoryRecallDelivery(config, event) {
+  if (!isTelemetrySdkInitialized()) return;
+  const attributes = {
+    ...getCommonAttributes(config),
+    "event.name": EVENT_MEMORY_RECALL_DELIVERY,
+    "event.timestamp": event["event.timestamp"],
+    phase: event.phase,
+    delivery_point: event.delivery_point,
+    strategy: event.strategy,
+    docs_selected: event.docs_selected,
+    latency_ms: event.latency_ms
+  };
+  if (event.discard_reason) {
+    attributes["discard_reason"] = event.discard_reason;
+  }
+  const logger = import_api_logs2.logs.getLogger(SERVICE_NAME);
+  logger.emit({
+    body: `Memory recall delivery: phase=${event.phase}. delivery_point=${event.delivery_point}. Selected ${event.docs_selected} doc(s).`,
+    attributes
+  });
+  recordMemoryRecallDeliveryMetrics(config, event.latency_ms, {
+    phase: event.phase,
+    delivery_point: event.delivery_point,
+    ...event.discard_reason ? { discard_reason: event.discard_reason } : {},
+    strategy: event.strategy
+  });
+}
+__name(logMemoryRecallDelivery, "logMemoryRecallDelivery");
 
 // packages/core/src/memory/memoryAge.ts
 init_esbuild_shims();
@@ -19454,77 +19598,9 @@ async function runSideQuery(config, options) {
 }
 __name(runSideQuery, "runSideQuery");
 
-// packages/core/src/services/visionBridge/image-part-utils.ts
-init_esbuild_shims();
-function normalizeParts(input) {
-  if (typeof input === "string") {
-    return [{ text: input }];
-  }
-  if (Array.isArray(input)) {
-    return input.map(
-      (part) => typeof part === "string" ? { text: part } : part
-    );
-  }
-  return [input];
-}
-__name(normalizeParts, "normalizeParts");
-function isImagePart(part) {
-  const mimeType = part.inlineData?.mimeType;
-  const data = part.inlineData?.data;
-  return typeof mimeType === "string" && mimeType.startsWith("image/") && typeof data === "string" && data.length > 0;
-}
-__name(isImagePart, "isImagePart");
-function hasImageParts(input) {
-  return normalizeParts(input).some(isImagePart);
-}
-__name(hasImageParts, "hasImageParts");
-function splitImageParts(input) {
-  const imageParts = [];
-  const nonImageParts = [];
-  for (const part of normalizeParts(input)) {
-    if (isImagePart(part)) {
-      imageParts.push(part);
-    } else {
-      nonImageParts.push(part);
-    }
-  }
-  return { imageParts, nonImageParts };
-}
-__name(splitImageParts, "splitImageParts");
-function replaceImagesWithText(input, text) {
-  const result = [];
-  let replaced = false;
-  for (const part of normalizeParts(input)) {
-    if (isImagePart(part)) {
-      if (!replaced) {
-        result.push({ text });
-        replaced = true;
-      }
-      continue;
-    }
-    result.push(part);
-  }
-  if (!replaced) {
-    result.push({ text });
-  }
-  return result;
-}
-__name(replaceImagesWithText, "replaceImagesWithText");
-function isUsableImagePart(part) {
-  const data = part.inlineData?.data;
-  if (typeof data !== "string" || data.length === 0) {
-    return false;
-  }
-  return data.length <= VISION_BRIDGE_MAX_IMAGE_BASE64_BYTES;
-}
-__name(isUsableImagePart, "isUsableImagePart");
-function collectText(parts) {
-  return parts.map((part) => typeof part.text === "string" ? part.text : "").filter((text) => text.length > 0).join("\n").trim();
-}
-__name(collectText, "collectText");
-
 // packages/core/src/services/visionBridge/vision-bridge-service.ts
 var debugLogger11 = createDebugLogger("VISION_BRIDGE");
+var turnImageCounts = /* @__PURE__ */ new WeakMap();
 var BRIDGE_MAX_OUTPUT_TOKENS = 2048;
 var VISION_BRIDGE_TIMEOUT_MS = 3e4;
 var VISION_BRIDGE_MAX_ATTEMPTS = 2;
@@ -19681,8 +19757,10 @@ function formatFullTurnVisionNotice(selection) {
   return `Routing this image turn to ${target}; retries and tool continuations will stay on that model until the turn ends.`;
 }
 __name(formatFullTurnVisionNotice, "formatFullTurnVisionNotice");
-function buildIntentPart(intentText, sourceContext) {
-  const sourceHint = sourceContext ? `The images are consecutive pages ${sourceContext.renderedRange.firstPage}-${sourceContext.renderedRange.lastPage} from PDF ${JSON.stringify(sourceContext.displayName)}. Transcribe each page separately and label each section with its original PDF page number.` : "";
+function buildIntentPart(intentText, sourceContext, imageParts = []) {
+  const sourceHint = sourceContext ? `The images are consecutive pages ${sourceContext.renderedRange.firstPage}-${sourceContext.renderedRange.lastPage} from PDF ${JSON.stringify(sourceContext.displayName)}. Transcribe each page separately and label each section with its original PDF page number.` : imageParts.length > 0 ? `Describe each image separately under these ordered labels: ${imageParts.map(
+    (part, index) => `${index + 1}. ${JSON.stringify(part.inlineData?.displayName?.trim() || `image ${index + 1}`)}`
+  ).join("; ")}.` : "";
   const focusHint = intentText.length > 0 ? `Focus hint \u2014 do NOT answer this, use it only to decide which details to transcribe thoroughly: ${intentText}` : "Describe the image(s) and transcribe any visible text, code, and errors.";
   return sourceHint ? `${sourceHint}
 ${focusHint}` : focusHint;
@@ -19730,7 +19808,7 @@ function failure(reason, parts, omittedCount, extra = {}) {
 }
 __name(failure, "failure");
 async function runVisionBridge(params) {
-  const { config, parts, signal, sourceContext } = params;
+  const { config, parts, signal, sourceContext, intentText } = params;
   const { imageParts, nonImageParts } = splitImageParts(parts);
   if (imageParts.length === 0) {
     return {
@@ -19741,9 +19819,14 @@ async function runVisionBridge(params) {
     };
   }
   const validImages = imageParts.filter(isUsableImagePart);
-  const toConvert = validImages.slice(0, VISION_BRIDGE_MAX_IMAGES);
+  const usedImages = turnImageCounts.get(signal) ?? 0;
+  const remainingImages = Math.max(0, VISION_BRIDGE_MAX_IMAGES - usedImages);
+  const toConvert = validImages.slice(0, remainingImages);
   const omittedCount = imageParts.length - toConvert.length;
-  const intent = collectText(nonImageParts).slice(0, BRIDGE_INTENT_MAX_CHARS);
+  const intent = (intentText ?? collectText(nonImageParts)).slice(
+    0,
+    BRIDGE_INTENT_MAX_CHARS
+  );
   const resolvedSourceContext = sourceContext ?? inferPdfSourceContext(toConvert);
   const selection = config.getDefaultVisionBridgeModel?.();
   const modelId = selection?.id;
@@ -19765,13 +19848,14 @@ async function runVisionBridge(params) {
       { modelId, ...modelEndpoint && { modelEndpoint } }
     );
   }
+  turnImageCounts.set(signal, usedImages + toConvert.length);
   const timeoutMs = config.getVisionBridgeTimeoutMs?.() ?? VISION_BRIDGE_TIMEOUT_MS;
   const requestContents = [
     {
       role: "user",
       parts: [
         ...toConvert,
-        { text: buildIntentPart(intent, resolvedSourceContext) }
+        { text: buildIntentPart(intent, resolvedSourceContext, toConvert) }
       ]
     }
   ];
@@ -19954,7 +20038,7 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
       }
       debugLogger12.debug("miss", { path: absPath, state: status.state });
     }
-    const preparePdfForVisionBridge = shouldRunVisionBridge(this.config);
+    const prepareForVisionBridge = shouldRunVisionBridge(this.config);
     let result = await processSingleFileContent(
       this.params.file_path,
       this.config,
@@ -19962,7 +20046,8 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
         offset: this.params.offset,
         limit: this.params.limit,
         pages: this.params.pages,
-        preparePdfForVisionBridge,
+        preserveUnsupportedImage: prepareForVisionBridge,
+        preparePdfForVisionBridge: prepareForVisionBridge,
         signal
       }
     );
@@ -20425,6 +20510,7 @@ export {
   logMemoryExtract,
   logMemoryDream,
   logMemoryRecall,
+  logMemoryRecallDelivery,
   memoryAge,
   memoryFreshnessText,
   ReadFileTool,
@@ -20494,6 +20580,7 @@ export {
   MemoryExtractEvent,
   MemoryDreamEvent,
   MemoryRecallEvent,
+  MemoryRecallDeliveryEvent,
   createOpenAIReasoningThoughtPart,
   isOpenAIReasoningThoughtPart,
   parseThought,

package/chunks/{chunk-AZD6KAV7.js → chunk-ISOHMBTV.js}

@@ -5,17 +5,17 @@ import {
 } from "./chunk-2W3OOD4W.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-BWQRDISK.js";
+} from "./chunk-2M6SP3YW.js";
 import {
   loadSettings
-} from "./chunk-7SWFAKVH.js";
+} from "./chunk-ERCSSQY3.js";
 import {
   writeStderrLine
 } from "./chunk-OWAK7LMW.js";
 import {
   SkillManager,
   isSafeModeEnv
-} from "./chunk-GEB2CGUV.js";
+} from "./chunk-QPYT2PMU.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-JO7FGOSY.js → chunk-JIK3TDIA.js}

@@ -2,15 +2,15 @@
 "use strict";
 import {
   appEvents
-} from "./chunk-D53NR4GO.js";
+} from "./chunk-ZLEQDVBN.js";
 import {
   assembleMcpServers,
   getPendingGatedMcpServers,
   getPromptableMcpServers
-} from "./chunk-Y2DAH52F.js";
+} from "./chunk-YLBIIEB3.js";
 import {
   getMCPServerStatus
-} from "./chunk-5G2SK2OO.js";
+} from "./chunk-IGAR75ZK.js";
 import {
   require_fast_deep_equal
 } from "./chunk-YM3SZTH4.js";

package/chunks/{chunk-EWXXMRMP.js → chunk-JJEBXTZW.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   delay
-} from "./chunk-PPIHLGNE.js";
+} from "./chunk-B3QY5TAE.js";
 import {
   isTlsVerificationDisabled
-} from "./chunk-5I5BM454.js";
+} from "./chunk-CBOQ3HY7.js";
 import {
   getErrorMessage
 } from "./chunk-OQB4EXO4.js";

package/chunks/{chunk-QUHJRRUA.js → chunk-KCJDKAVN.js}

@@ -1,18 +1,18 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  JsonOutputAdapter
+} from "./chunk-GHERLCN5.js";
 import {
   settleChatRecording,
   subscribeToHeadlessChatRecordingFailures
-} from "./chunk-SP32MK6J.js";
-import {
-  handleAtCommand
-} from "./chunk-X7XWGRDT.js";
-import {
-  JsonOutputAdapter
-} from "./chunk-7LH6CHKG.js";
+} from "./chunk-S5OLFBI4.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-Q3GGJDYN.js";
+} from "./chunk-5VLWDXVW.js";
+import {
+  handleAtCommand
+} from "./chunk-GCEE2HJ5.js";
 import {
   buildInitialSystemReminders,
   buildSystemMessage,
@@ -24,11 +24,11 @@ import {
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-LPMBFOWH.js";
+} from "./chunk-SD4BYEST.js";
 import {
   RunBudgetEnforcer,
   cleanupReviewWorktreeLeases
-} from "./chunk-D53NR4GO.js";
+} from "./chunk-ZLEQDVBN.js";
 import {
   AlreadyReportedError,
   handleBudgetExceededError,
@@ -36,10 +36,10 @@ import {
   handleError,
   handleMaxTurnsExceededError,
   handleToolError
-} from "./chunk-MTSYH4MB.js";
+} from "./chunk-MQCQ2RPF.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-TPR35HHZ.js";
+} from "./chunk-AIAHTIQX.js";
 import {
   PLAN_MODE_ENTRY_SIBLING_SKIP_MESSAGE,
   buildSessionRecoveryPlanFromApiHistory,
@@ -57,7 +57,7 @@ import {
   partitionByConcurrencySafety,
   promptIdContext,
   restoreWorktreeContext
-} from "./chunk-GEB2CGUV.js";
+} from "./chunk-QPYT2PMU.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -66,11 +66,11 @@ import {
 } from "./chunk-WHGVTP7Q.js";
 import {
   uiTelemetryService
-} from "./chunk-5G2SK2OO.js";
+} from "./chunk-IGAR75ZK.js";
 import {
   isTelemetrySdkInitialized,
   shutdownTelemetry
-} from "./chunk-IS2SBY6T.js";
+} from "./chunk-RCUEYZDE.js";
 import {
   ToolNames
 } from "./chunk-YM3SZTH4.js";
@@ -80,7 +80,7 @@ import {
 } from "./chunk-OQB4EXO4.js";
 import {
   registerCleanup
-} from "./chunk-D6ZOVZLF.js";
+} from "./chunk-Z4KOWJRT.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -742,6 +742,10 @@ ${text}
             abortController.signal,
             {
               recordToolResult: false,
+              onToolResultFullTurnModel: /* @__PURE__ */ __name((model) => {
+                if (inlineModelOverrideActive) return false;
+                return setModelOverride(model);
+              }, "onToolResultFullTurnModel"),
               outputUpdateHandler,
               onAllToolCallsComplete: /* @__PURE__ */ __name(async (completedCalls) => {
                 for (const call of completedCalls) {
@@ -1041,9 +1045,12 @@ ${text}
             responseParts: toolResponseParts,
             repeatedDuplicateProviderToolCall
           } = await processToolCallBatch(toolCallRequests, (override) => {
-            if (!inlineModelOverrideActive) {
-              modelOverride = override;
+            if (inlineModelOverrideActive) return false;
+            if (modelOverride?.endsWith("\0") && modelOverride !== override) {
+              return false;
             }
+            modelOverride = override;
+            return true;
           });
           if (structuredSubmission !== void 0) {
             return emitStructuredSuccess();
@@ -1188,7 +1195,11 @@ ${text}
                 } = await processToolCallBatch(
                   itemToolCallRequests,
                   (override) => {
+                    if (itemModelOverride?.endsWith("\0") && itemModelOverride !== override) {
+                      return false;
+                    }
                     itemModelOverride = override;
+                    return true;
                   }
                 );
                 if (structuredSubmission !== void 0) {

package/chunks/{chunk-G6LRTI62.js → chunk-KXFNYTHD.js}

@@ -5,14 +5,14 @@ import {
 } from "./chunk-57OAHC2Y.js";
 import {
   loadSettings
-} from "./chunk-7SWFAKVH.js";
+} from "./chunk-ERCSSQY3.js";
 import {
   getCurrentLanguage,
   t
-} from "./chunk-WCFTQD7H.js";
+} from "./chunk-LX4HOTPK.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-S3YQCNJE.js";
+} from "./chunk-DZDM2LCO.js";
 import {
   writeStdoutLine
 } from "./chunk-OWAK7LMW.js";
@@ -22,7 +22,7 @@ import {
   getExtensionDisplayName,
   redactUrlCredentials,
   require_prompts
-} from "./chunk-GEB2CGUV.js";
+} from "./chunk-QPYT2PMU.js";
 import {
   stripAnsi
 } from "./chunk-T4TZQJ7W.js";