@qwen-code/qwen-code 0.21.14 → 0.21.15

package/chunks/{chunk-DHUPMYMC.js → chunk-BORX4PBQ.js}

@@ -2,32 +2,32 @@
 "use strict";
 import {
   appEvents
-} from "./chunk-XYRBK56E.js";
+} from "./chunk-U7U3CX4K.js";
 import {
   CUSTOM_SANDBOX_IMAGE_ENV_VAR,
   HOST_UPDATE_RELAUNCH_ENV_VAR,
   SKIP_UPDATE_CHECK_ENV_VAR,
   requestUpdateOnExit
-} from "./chunk-P3AA6S7O.js";
+} from "./chunk-Y7JGWFTK.js";
 import {
   loadUndici
 } from "./chunk-3Z43GZUQ.js";
 import {
   IdeClient,
   getAllProviderBaseUrls
-} from "./chunk-OFTPCOGR.js";
+} from "./chunk-L7RG5PVT.js";
 import {
   detectRuntime,
   getOrCreateSharedDispatcher,
   preloadRuntimeFetchModule,
   redactProxyCredentials
-} from "./chunk-CPHEPGAO.js";
+} from "./chunk-722JBVVW.js";
 import {
   initializeTelemetry
-} from "./chunk-XT4RKHVE.js";
+} from "./chunk-RZ4PE3ER.js";
 import {
   createDebugLogger
-} from "./chunk-BUQDLC2G.js";
+} from "./chunk-XFRYCCVC.js";
 import {
   recordStartupEvent
 } from "./chunk-QILD6R27.js";
@@ -231,11 +231,11 @@ function startPostRenderPrefetches(config, settings, options = {}) {
         { updateEventEmitter },
         { t }
       ] = await Promise.all([
-        import("./updateCheck-MTZIVGT5.js"),
-        import("./handleAutoUpdate-KJ4SN7DM.js"),
-        import("./installationInfo-NMQIOUGY.js"),
+        import("./updateCheck-ZB2CRVVG.js"),
+        import("./handleAutoUpdate-YDMS57ZN.js"),
+        import("./installationInfo-KOUBU7MH.js"),
         import("./updateEventEmitter-5MKC7BLQ.js"),
-        import("./i18n-36SZUO4C.js")
+        import("./i18n-JIW77MSO.js")
       ]);
       const updateCheckSkippedMessage = /* @__PURE__ */ __name((error) => t("Update check skipped ({{reason}}) \u2014 run /update to retry.", {
         reason: describeUpdateCheckFailure(error)
@@ -308,7 +308,7 @@ ${t(
         state: "connecting"
       });
       try {
-        const { connectIdeForStartup } = await import("./initializer-CW5YCAOL.js");
+        const { connectIdeForStartup } = await import("./initializer-F7I7QDHK.js");
         await withTimeout(
           connectIdeForStartup(config),
           "ide_connect",
@@ -332,7 +332,7 @@ ${t(
   }
   if (config.isInteractive()) {
     runDeferredTask("background_housekeeping", async () => {
-      const { startBackgroundHousekeeping } = await import("./scheduler-GPMLVKJM.js");
+      const { startBackgroundHousekeeping } = await import("./scheduler-V6AZCQVU.js");
       startBackgroundHousekeeping(config, settings);
     });
   }

package/chunks/{chunk-5IJSFWQO.js → chunk-BUZESYJT.js}

@@ -2,19 +2,19 @@
 "use strict";
 import {
   getErrorMessage
-} from "./chunk-XITLNXLX.js";
+} from "./chunk-VWS7DWY6.js";
 import {
   extensionToOutputString,
   getExtensionManager
-} from "./chunk-U657UZJN.js";
+} from "./chunk-5WEMSDPR.js";
 import {
   loadSettings
-} from "./chunk-VFP5YOHJ.js";
+} from "./chunk-PRIX4D6T.js";
 import {
   initializeI18n,
   resolveLanguageSetting,
   t
-} from "./chunk-VTOLYFWM.js";
+} from "./chunk-W3M6P3UR.js";
 import {
   writeStderrLine,
   writeStdoutLine

package/chunks/{chunk-Y4RVDOXV.js → chunk-DF7KFKCL.js}

@@ -2,20 +2,20 @@
 "use strict";
 import {
   functionResponsePartsToString
-} from "./chunk-6RDZLBSJ.js";
+} from "./chunk-SGKUVDBX.js";
 import {
   observeHeadlessToolResultProjection,
   observeHeadlessToolResultWire,
   projectJsonStringToByteBudget
-} from "./chunk-K2Y45XXS.js";
+} from "./chunk-DFOKBPH5.js";
 import {
   parseAndFormatApiError,
   toolResultBoundaryArtifact
-} from "./chunk-OFTPCOGR.js";
+} from "./chunk-L7RG5PVT.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-KC4WMLZO.js";
+} from "./chunk-EXY6APEA.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";

package/chunks/{chunk-K2Y45XXS.js → chunk-DFOKBPH5.js}

@@ -5,33 +5,33 @@ import {
 } from "./chunk-E7REAOTN.js";
 import {
   formatHistoryGapNotice
-} from "./chunk-4SR45OM4.js";
+} from "./chunk-Q5QDZXKL.js";
 import {
   loadUndici
 } from "./chunk-3Z43GZUQ.js";
 import {
   LOAD_REPLAY_META_KEY
-} from "./chunk-WP4WIUOJ.js";
+} from "./chunk-QQUVPMMZ.js";
 import {
   observeToolResultBoundary,
   projectGoalStateToLegacy,
   toolResultBoundaryArtifact
-} from "./chunk-OFTPCOGR.js";
+} from "./chunk-L7RG5PVT.js";
 import {
   parseGoalSnapshotV2,
   parseGoalStateCause,
   projectUserTranscriptForDisplay
-} from "./chunk-4ZMS3JCR.js";
+} from "./chunk-JBSW7JA6.js";
 import {
   formatVisionBridgeNoticeDisplay,
   isVisionBridgeNoticeDisplay
-} from "./chunk-KC4WMLZO.js";
+} from "./chunk-EXY6APEA.js";
 import {
   ToolNames
-} from "./chunk-6HY6IF3Z.js";
+} from "./chunk-OUYRA764.js";
 import {
   createDebugLogger
-} from "./chunk-BUQDLC2G.js";
+} from "./chunk-XFRYCCVC.js";
 import {
   writeStderrLine,
   writeStderrLineSafe
@@ -324,20 +324,37 @@ function parseGoalStateRecordPayloadV2(value) {
 }
 __name(parseGoalStateRecordPayloadV2, "parseGoalStateRecordPayloadV2");
 function parseGoalSnapshotV22(value) {
-  if (!isRecord(value) || !hasOnlyKeys(value, ["v", "goal", "activity"]) || value["v"] !== GOAL_STATE_VERSION || !isGoalActivity(value["activity"])) {
+  if (!isRecord(value) || !hasOnlyKeys(value, ["v", "goal", "activity", "clearedGoal"]) || value["v"] !== GOAL_STATE_VERSION || !isGoalActivity(value["activity"])) {
     return void 0;
   }
   if (value["goal"] === null) {
+    const clearedGoal = parseGoalOrder(value["clearedGoal"]);
+    if (value["clearedGoal"] !== void 0 && !clearedGoal)
+      return void 0;
     return {
       v: GOAL_STATE_VERSION,
       goal: null,
-      activity: value["activity"]
+      activity: value["activity"],
+      ...clearedGoal ? { clearedGoal } : {}
     };
   }
+  if (value["clearedGoal"] !== void 0)
+    return void 0;
   const goal = parseGoalRecord(value["goal"]);
   return goal ? { v: GOAL_STATE_VERSION, goal, activity: value["activity"] } : void 0;
 }
 __name(parseGoalSnapshotV22, "parseGoalSnapshotV2");
+function parseGoalOrder(value) {
+  if (!isRecord(value) || !hasOnlyKeys(value, ["goalId", "revision", "updatedAt"]) || typeof value["goalId"] !== "string" || !value["goalId"] || !isNonNegativeInteger(value["revision"]) || value["revision"] === 0 || !isFiniteNumber(value["updatedAt"])) {
+    return void 0;
+  }
+  return {
+    goalId: value["goalId"],
+    revision: value["revision"],
+    updatedAt: value["updatedAt"]
+  };
+}
+__name(parseGoalOrder, "parseGoalOrder");
 function parseGoalStateCause2(value) {
   return isGoalStateCause(value) ? value : void 0;
 }
@@ -578,6 +595,24 @@ function replaceTextPartsForDisplay(parts, displayText) {
   return projected;
 }
 __name(replaceTextPartsForDisplay, "replaceTextPartsForDisplay");
+function stripGeneratedAttachmentTokens(displayText, payload) {
+  const references = payload?.["attachmentReferences"];
+  if (!Array.isArray(references)) return displayText;
+  const tokens = references.flatMap((reference) => {
+    if (!isObjectRecord(reference) || reference["type"] !== "resource" || typeof reference["attachmentId"] !== "string") {
+      return [];
+    }
+    return [`@attachment:///${encodeURIComponent(reference["attachmentId"])}`];
+  });
+  if (tokens.length === 0) return displayText;
+  const tokenText = tokens.join("\n");
+  if (displayText === tokenText) return "";
+  const suffix = `
+
+${tokenText}`;
+  return displayText.endsWith(suffix) ? displayText.slice(0, -suffix.length) : displayText;
+}
+__name(stripGeneratedAttachmentTokens, "stripGeneratedAttachmentTokens");
 function toTranscriptEpochMs(timestamp) {
   if (typeof timestamp === "number") {
     return Number.isFinite(timestamp) ? timestamp : void 0;
@@ -620,8 +655,8 @@ function createTranscriptImageUpdate(options) {
   };
 }
 __name(createTranscriptImageUpdate, "createTranscriptImageUpdate");
-function createTranscriptMediaReferenceUpdate(reference, options) {
-  if (reference["type"] !== "image" && reference["type"] !== "audio" || typeof reference["mediaId"] !== "string" || typeof reference["mimeType"] !== "string" || typeof reference["size"] !== "number") {
+function createTranscriptAttachmentReferenceUpdate(reference, options) {
+  if (reference["type"] !== "image" && reference["type"] !== "resource" || typeof reference["attachmentId"] !== "string" || typeof reference["mimeType"] !== "string" || typeof reference["size"] !== "number") {
     return void 0;
   }
   const meta = buildUpdateMeta(options);
@@ -629,14 +664,14 @@ function createTranscriptMediaReferenceUpdate(reference, options) {
     sessionUpdate: "user_message_chunk",
     content: {
       type: reference["type"],
-      mediaId: reference["mediaId"],
+      attachmentId: reference["attachmentId"],
       mimeType: reference["mimeType"],
       size: reference["size"]
     },
     ...meta ? { _meta: meta } : {}
   };
 }
-__name(createTranscriptMediaReferenceUpdate, "createTranscriptMediaReferenceUpdate");
+__name(createTranscriptAttachmentReferenceUpdate, "createTranscriptAttachmentReferenceUpdate");
 function createTranscriptUsageUpdate(usageMetadata, options = {}) {
   const usage = {
     inputTokens: finiteNumber(usageMetadata.promptTokenCount) ?? 0,
@@ -878,10 +913,10 @@ var DefaultTranscriptReplayMachine = class {
       }
     } : meta;
     if (record.subtype === "goal_runtime" || record.subtype === "notification" || record.subtype === "cron" || record.subtype === "mid_turn_user_message") {
-      const displayText = payload && typeof payload["displayText"] === "string" ? payload["displayText"] : void 0;
+      const displayText = payload && typeof payload["displayText"] === "string" ? stripGeneratedAttachmentTokens(payload["displayText"], payload) : void 0;
       if (record.subtype === "mid_turn_user_message" && displayText === "") {
         const media = [
-          ...this.projectUserMediaReferences(payload, emit, replayMeta)
+          ...this.projectUserAttachmentReferences(payload, emit, replayMeta)
         ];
         if (media.length > 0) {
           yield* media;
@@ -905,25 +940,26 @@ var DefaultTranscriptReplayMachine = class {
             } : record.subtype === "cron" ? { extra: { source: "cron" } } : {}
           })
         );
-        yield* this.projectUserMediaReferences(payload, emit, replayMeta);
+        yield* this.projectUserAttachmentReferences(payload, emit, replayMeta);
         return;
       }
       if (record.subtype !== "mid_turn_user_message") return;
     }
     const projection = projectUserTranscriptForDisplay(record);
     if (projection.displayText !== void 0) {
+      const displayText = stripGeneratedAttachmentTokens(
+        projection.displayText,
+        payload
+      );
       yield* this.projectMessageParts(
         record,
         "user",
         emit,
         replayMeta,
         void 0,
-        replaceTextPartsForDisplay(
-          record.message?.parts,
-          projection.displayText
-        )
+        replaceTextPartsForDisplay(record.message?.parts, displayText)
       );
-      yield* this.projectUserMediaReferences(payload, emit, replayMeta);
+      yield* this.projectUserAttachmentReferences(payload, emit, replayMeta);
       return;
     }
     yield* this.projectMessageParts(
@@ -934,14 +970,14 @@ var DefaultTranscriptReplayMachine = class {
       void 0,
       projection.parts
     );
-    yield* this.projectUserMediaReferences(payload, emit, replayMeta);
+    yield* this.projectUserAttachmentReferences(payload, emit, replayMeta);
   }
-  *projectUserMediaReferences(payload, emit, meta) {
-    const references = payload?.["mediaReferences"];
+  *projectUserAttachmentReferences(payload, emit, meta) {
+    const references = payload?.["attachmentReferences"];
     if (!Array.isArray(references)) return;
     for (const reference of references) {
       if (!isObjectRecord(reference)) continue;
-      const update = createTranscriptMediaReferenceUpdate(reference, meta);
+      const update = createTranscriptAttachmentReferenceUpdate(reference, meta);
       if (update) yield emit(update);
     }
   }
@@ -1129,9 +1165,26 @@ var DefaultTranscriptReplayMachine = class {
         payload2,
         this.goalState?.goal ?? null
       );
+      const goalControlCommand = projectGoalControlCommand(
+        payload2.cause,
+        payload2.snapshot
+      );
       this.goalState = payload2.snapshot;
       this.goalCause = payload2.cause;
       if (bookkeepingOnly) return;
+      if (goalControlCommand) {
+        yield emit(
+          createTranscriptMessageUpdate({
+            role: "user",
+            text: goalControlCommand,
+            ...meta,
+            extra: {
+              source: "goal_control",
+              "qwen.session.recordId": record.uuid
+            }
+          })
+        );
+      }
       const { type: _type, ...goalStatus } = projection.goalStatus;
       yield emit(
         createTranscriptMessageUpdate({
@@ -1274,6 +1327,35 @@ var DefaultTranscriptReplayMachine = class {
     });
   }
 };
+function projectGoalControlCommand(cause, snapshot) {
+  switch (cause) {
+    case "create":
+    case "replace":
+      return snapshot.goal ? `/goal ${snapshot.goal.objective}` : void 0;
+    case "edit":
+      return snapshot.goal ? `/goal edit ${snapshot.goal.objective}` : void 0;
+    case "pause":
+    case "resume":
+    case "clear":
+      return `/goal ${cause}`;
+    case "turn_finished":
+    case "checkpoint":
+    case "verifier_accept":
+    case "verifier_reject":
+    case "complete":
+    case "blocked":
+    case "usage_limited":
+    case "migrated":
+      return void 0;
+    default:
+      return assertNever2(cause);
+  }
+}
+__name(projectGoalControlCommand, "projectGoalControlCommand");
+function assertNever2(value) {
+  throw new Error(`Unsupported Goal state cause: ${String(value)}`);
+}
+__name(assertNever2, "assertNever");
 function parseTranscriptGoalStatus(value) {
   if (!isObjectRecord(value) || value["type"] !== "goal_status") {
     return void 0;
@@ -2853,7 +2935,7 @@ async function extractMetadata(conversation, config) {
   const gitBranch = firstRecord?.gitBranch;
   let gitRepo;
   if (cwd) {
-    const { getGitRepoName } = await import("./deferred-core-runtime-R2VWOVG3.js");
+    const { getGitRepoName } = await import("./deferred-core-runtime-Z2TLD2L7.js");
     gitRepo = getGitRepoName(cwd);
   }
   let model;

package/chunks/{chunk-3SL2P3WX.js → chunk-DIHJXVT4.js}

@@ -64,7 +64,7 @@ async function runExitCleanup(options = {}) {
 }
 __name(runExitCleanup, "runExitCleanup");
 async function cleanupCheckpoints() {
-  const { Storage } = await import("./deferred-core-runtime-R2VWOVG3.js");
+  const { Storage } = await import("./deferred-core-runtime-Z2TLD2L7.js");
   const storage = new Storage(process.cwd());
   const tempDir = storage.getProjectTempDir();
   const checkpointsDir = join(tempDir, "checkpoints");

package/chunks/{chunk-WAO53ZQF.js → chunk-DITDNF3D.js}

@@ -2,10 +2,10 @@
 "use strict";
 import {
   isGitRepository
-} from "./chunk-OFTPCOGR.js";
+} from "./chunk-L7RG5PVT.js";
 import {
   createDebugLogger
-} from "./chunk-BUQDLC2G.js";
+} from "./chunk-XFRYCCVC.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -18,6 +18,7 @@ init_esbuild_shims();
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as childProcess from "node:child_process";
+import { promisify } from "node:util";
 var PackageManager = /* @__PURE__ */ ((PackageManager2) => {
   PackageManager2["NPM"] = "npm";
   PackageManager2["YARN"] = "yarn";
@@ -106,6 +107,24 @@ function formatUpdateMessage(updateMessage, latestVersion) {
   return [message];
 }
 __name(formatUpdateMessage, "formatUpdateMessage");
+var execFileAsync = promisify(childProcess.execFile);
+var HOMEBREW_INFO_TIMEOUT_MS = 5e3;
+async function getHomebrewLatestVersion(formula = "qwen-code", run = execFileAsync) {
+  try {
+    const { stdout } = await run(
+      "brew",
+      ["info", "--json=v2", "--formula", formula],
+      { encoding: "utf8", timeout: HOMEBREW_INFO_TIMEOUT_MS }
+    );
+    const parsed = JSON.parse(String(stdout));
+    const stable = parsed.formulae?.[0]?.versions?.stable;
+    return typeof stable === "string" && stable.length > 0 ? stable : null;
+  } catch (error) {
+    debugLogger.warn("Failed to query Homebrew formula version:", error);
+    return null;
+  }
+}
+__name(getHomebrewLatestVersion, "getHomebrewLatestVersion");
 function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
   const cliPath = process.argv[1];
   if (!cliPath) {
@@ -317,6 +336,7 @@ export {
   getNpmCliPath,
   resolveUpdateCommand,
   formatUpdateInstructions,
+  getHomebrewLatestVersion,
   getInstallationInfo
 };
 /**

package/chunks/{chunk-2A6VQJYK.js → chunk-DK4HL3IB.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-F6WFNA7U.js";
 import {
   preloadRuntimeFetchModule
-} from "./chunk-CPHEPGAO.js";
+} from "./chunk-722JBVVW.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -405,18 +405,18 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   try {
     if (authType === "openai" /* USE_OPENAI */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-Z3GPWJU4.js");
+        const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-2S2UT4RR.js");
         return createOpenAIContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-EBV52DWJ.js");
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-UI2OC2RN.js");
       try {
         const qwenClient = await getQwenOauthClient(
           config,
           isInitialAuth ? { requireCachedCredentials: true } : void 0
         );
         loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-          const { QwenContentGenerator } = await import("./qwenContentGenerator-NLEMBZVU.js");
+          const { QwenContentGenerator } = await import("./qwenContentGenerator-G3H2TCXF.js");
           return new QwenContentGenerator(qwenClient, generatorConfig, config);
         }, "loadBaseGenerator");
       } catch (error) {
@@ -427,12 +427,12 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
       }
     } else if (authType === "anthropic" /* USE_ANTHROPIC */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-M7XRJMSK.js");
+        const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-CU3G53RX.js");
         return createAnthropicContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
       loadBaseGenerator = /* @__PURE__ */ __name(async () => {
-        const { createGeminiContentGenerator } = await import("./geminiContentGenerator-CS3M7SOS.js");
+        const { createGeminiContentGenerator } = await import("./geminiContentGenerator-KAFSMFA6.js");
         return createGeminiContentGenerator(generatorConfig, config);
       }, "loadBaseGenerator");
     } else {
@@ -448,7 +448,7 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
       try {
         const [baseGenerator, { LoggingContentGenerator }] = await Promise.all([
           loadBaseGenerator(),
-          import("./loggingContentGenerator-GR2QQ2C5.js")
+          import("./loggingContentGenerator-5G4ZR5D5.js")
         ]);
         return new LoggingContentGenerator(
           baseGenerator,

package/chunks/{chunk-6BJSYAML.js → chunk-DPXZUGDQ.js}

@@ -3,16 +3,16 @@
 import {
   settleChatRecording,
   subscribeToHeadlessChatRecordingFailures
-} from "./chunk-LSO6EL4Y.js";
+} from "./chunk-2MDUS4XE.js";
 import {
   handleAtCommand
-} from "./chunk-SCZU65AI.js";
+} from "./chunk-7VRNXKKK.js";
 import {
   JsonOutputAdapter
-} from "./chunk-TSMPNGBC.js";
+} from "./chunk-LBQBFRFN.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-Y4RVDOXV.js";
+} from "./chunk-DF7KFKCL.js";
 import {
   buildInitialSystemReminders,
   buildSystemMessage,
@@ -24,11 +24,11 @@ import {
   insertAfterFunctionResponses,
   isSlashCommand,
   normalizePartList
-} from "./chunk-6RDZLBSJ.js";
+} from "./chunk-SGKUVDBX.js";
 import {
   RunBudgetEnforcer,
   cleanupReviewWorktreeLeases
-} from "./chunk-XYRBK56E.js";
+} from "./chunk-U7U3CX4K.js";
 import {
   AlreadyReportedError,
   handleBudgetExceededError,
@@ -36,10 +36,10 @@ import {
   handleError,
   handleMaxTurnsExceededError,
   handleToolError
-} from "./chunk-XITLNXLX.js";
+} from "./chunk-VWS7DWY6.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-EOPBFLA5.js";
+} from "./chunk-AKN26LMT.js";
 import {
   PLAN_MODE_ENTRY_SIBLING_SKIP_MESSAGE,
   buildSessionRecoveryPlanFromApiHistory,
@@ -51,12 +51,15 @@ import {
   finalizeToolResponses,
   findPlanModeEntryBatchBoundaryIndex,
   findRepeatedDuplicateProviderToolCall,
+  getCachedToolCallFingerprint,
+  isReplayOfHandledToolCall,
   isToolCallConcurrencySafe,
   markDuplicateProviderToolCallResponseSent,
   parseAndFormatApiError,
   partitionByConcurrencySafety,
+  recordHandledToolCall,
   restoreWorktreeContext
-} from "./chunk-OFTPCOGR.js";
+} from "./chunk-L7RG5PVT.js";
 import {
   parsePositiveIntegerEnv
 } from "./chunk-6PVPNMXU.js";
@@ -65,13 +68,13 @@ import {
 } from "./chunk-O6GEWCJA.js";
 import {
   GoalPersistenceUnavailableError
-} from "./chunk-4ZMS3JCR.js";
+} from "./chunk-JBSW7JA6.js";
 import {
   addAgentOutputMessageAttributes
-} from "./chunk-OO4FKHLO.js";
+} from "./chunk-2GM44E7D.js";
 import {
   isSystemReminderContent
-} from "./chunk-SG7ZP5PG.js";
+} from "./chunk-HHNSO2Y4.js";
 import {
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
@@ -81,25 +84,25 @@ import {
   shouldRunVisionBridge,
   splitImageParts,
   uiTelemetryService
-} from "./chunk-KC4WMLZO.js";
+} from "./chunk-EXY6APEA.js";
 import {
   ToolNames,
   canonicalToolName
-} from "./chunk-6HY6IF3Z.js";
+} from "./chunk-OUYRA764.js";
 import {
   endInteractionSpan,
   getActiveInteractionSpan,
   isTelemetrySdkInitialized,
   shutdownTelemetry
-} from "./chunk-XT4RKHVE.js";
+} from "./chunk-RZ4PE3ER.js";
 import {
   FatalInputError,
   createDebugLogger,
   getErrorType
-} from "./chunk-BUQDLC2G.js";
+} from "./chunk-XFRYCCVC.js";
 import {
   registerCleanup
-} from "./chunk-3SL2P3WX.js";
+} from "./chunk-DIHJXVT4.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -1130,7 +1133,9 @@ ${text}
         });
         return 1;
       }, "emitLoopDetectedResult");
-      const handledProviderToolCallIds = geminiClient.getHistoryFunctionResponseIds();
+      const handledToolCallFingerprints = new Map(
+        geminiClient.getHistoryToolCallFingerprints()
+      );
       const duplicateProviderToolCallResponseIds = /* @__PURE__ */ new Set();
       const processToolCallBatch = /* @__PURE__ */ __name(async (batchRequests, setModelOverride, runtimeView) => {
         let terminateTurn = false;
@@ -1156,10 +1161,22 @@ ${text}
           }
           return true;
         });
+        const isReplayOfHandledRequest = /* @__PURE__ */ __name((request) => {
+          const providerCallId = getProviderResponseId(request);
+          return providerCallId ? isReplayOfHandledToolCall(
+            handledToolCallFingerprints,
+            providerCallId,
+            getCachedToolCallFingerprint(
+              request,
+              request.name,
+              request.args
+            )
+          ) : false;
+        }, "isReplayOfHandledRequest");
         const repeatedDuplicateRequest = findRepeatedDuplicateProviderToolCall(
           [...uniqueBatchRequests, ...duplicateBatchRequests],
           getProviderResponseId,
-          handledProviderToolCallIds,
+          isReplayOfHandledRequest,
           duplicateProviderToolCallResponseIds
         );
         if (repeatedDuplicateRequest) {
@@ -1181,8 +1198,16 @@ ${text}
             executableBatchRequests.push(requestInfo);
             continue;
           }
-          if (!handledProviderToolCallIds.has(providerCallId)) {
-            handledProviderToolCallIds.add(providerCallId);
+          if (!isReplayOfHandledRequest(requestInfo)) {
+            recordHandledToolCall(
+              handledToolCallFingerprints,
+              providerCallId,
+              getCachedToolCallFingerprint(
+                requestInfo,
+                requestInfo.name,
+                requestInfo.args
+              )
+            );
             executableBatchRequests.push(requestInfo);
             continue;
           }