@qwen-code/qwen-code 0.21.12 → 0.21.13

package/chunks/{startInteractiveUI-KMYUJ2MU.js → startInteractiveUI-3AVH7L6H.js}

@@ -10,7 +10,7 @@ import {
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-WI6GIM2M.js";
+} from "./chunk-RIAABG2K.js";
 import {
   MAX_SUGGESTIONS_TO_SHOW,
   SESSION_MENTION_PREFIX,
@@ -22,10 +22,10 @@ import {
   matchMcpServerPrefix,
   resolveAtCommandQuery,
   sanitizeDisplayText
-} from "./chunk-X5SLJOMF.js";
+} from "./chunk-76J3IJ3M.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-MUNA4QDC.js";
+} from "./chunk-UZPM4XHR.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -69,17 +69,18 @@ import {
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt,
   supportsMatchers
-} from "./chunk-QSD4UH74.js";
+} from "./chunk-NNHNLJ2X.js";
+import "./chunk-N5YPT6PH.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-S6TCTH4Z.js";
+} from "./chunk-DGK6P3BQ.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState,
   appEvents,
   cleanupReviewWorktreeLeases,
   loadHierarchicalGeminiMemory
-} from "./chunk-IX4PWUDU.js";
+} from "./chunk-IGGGG5CX.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -157,20 +158,21 @@ import {
   useUIActions,
   useUIState,
   useVirtualViewport
-} from "./chunk-VLHR7F4E.js";
+} from "./chunk-QF2NHSPB.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-4XA4QIUA.js";
+} from "./chunk-AFSG32D5.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-MDNUCDKZ.js";
+} from "./chunk-O4D7SPJN.js";
+import "./chunk-4WGODMVR.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-CGM3E75C.js";
+} from "./chunk-BHILXOC3.js";
 import {
   GeminiRespondingSpinner,
   GeminiSpinner,
@@ -187,7 +189,7 @@ import {
   useStreamingContext,
   waitForGoalRuntime,
   wrapAnsi
-} from "./chunk-GXTMEATA.js";
+} from "./chunk-ZYBBISBY.js";
 import {
   formatDuration,
   formatRelativeTime,
@@ -195,10 +197,10 @@ import {
 } from "./chunk-3SH53ANB.js";
 import {
   theme
-} from "./chunk-OWGRUU7F.js";
+} from "./chunk-6QFDQMQX.js";
 import {
   stopAndGetCapturedInput
-} from "./chunk-TQDFSQQF.js";
+} from "./chunk-YZOSNW4R.js";
 import {
   disableKittyProtocol,
   isKittyProtocolEnabled,
@@ -207,13 +209,13 @@ import {
 } from "./chunk-NYX53SV4.js";
 import {
   useAutoAcceptIndicator
-} from "./chunk-CQ6IPDQW.js";
+} from "./chunk-MRMJCLIY.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-56HVDG3M.js";
+} from "./chunk-M732YJPW.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -226,25 +228,10 @@ import {
   oscKittyNotify,
   saveClipboardImage,
   writeOsc52
-} from "./chunk-NW2GIPG3.js";
+} from "./chunk-DXIBNLBZ.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
-import "./chunk-62X3CM7Q.js";
-import "./chunk-4WGODMVR.js";
-import {
-  setUpdateHandler
-} from "./chunk-WDVDVWJ3.js";
-import {
-  isHistoryItemVisibleAfterRestore
-} from "./chunk-EKTCKZV5.js";
-import "./chunk-B4VN3VDH.js";
-import {
-  AUTO_THEME_NAME,
-  DEFAULT_THEME,
-  themeManager
-} from "./chunk-OYWVIXHT.js";
-import "./chunk-KW7NOTN6.js";
 import {
   Box_default,
   Static,
@@ -259,34 +246,47 @@ import {
   use_stdin_default,
   use_stdout_default
 } from "./chunk-2IIJTXYF.js";
+import {
+  relaunchApp
+} from "./chunk-PQ36L4F5.js";
+import {
+  setUpdateHandler
+} from "./chunk-UKMR3CKV.js";
+import {
+  isHistoryItemVisibleAfterRestore
+} from "./chunk-EKTCKZV5.js";
+import "./chunk-AS5IN4GK.js";
+import {
+  AUTO_THEME_NAME,
+  DEFAULT_THEME,
+  themeManager
+} from "./chunk-2M55OBEB.js";
+import "./chunk-KW7NOTN6.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import "./chunk-ZQUY3ZJU.js";
+import "./chunk-GO7STP6N.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-RDVNSJQU.js";
-import "./chunk-XAFIL4BD.js";
-import "./chunk-OPVF453Q.js";
+} from "./chunk-JUEPY766.js";
+import "./chunk-U3VNBPUO.js";
+import "./chunk-NEFOOD54.js";
 import "./chunk-YAF2MQZ6.js";
-import "./chunk-ZBB5EZZV.js";
+import "./chunk-IA2K2HJE.js";
 import {
   MAX_INLINE_IMAGES_PER_ITEM,
   collectInlineImages,
   getInlineImageData
-} from "./chunk-TXP5NGG3.js";
-import {
-  relaunchApp
-} from "./chunk-DFVXU5YM.js";
-import "./chunk-TDESMS7M.js";
+} from "./chunk-SXCOEJO4.js";
+import "./chunk-QRCNA3SR.js";
 import "./chunk-6H67XLET.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-EJOGLSNJ.js";
-import "./chunk-UI5UGEF4.js";
-import "./chunk-TMFWI4RC.js";
+} from "./chunk-AXN7UPYQ.js";
+import "./chunk-RLKC46YT.js";
+import "./chunk-BZ263IKX.js";
 import {
   cpLen,
   cpSlice,
@@ -299,7 +299,7 @@ import {
   stripUnsafeCharacters,
   toCodePoints
 } from "./chunk-4NFY2S7N.js";
-import "./chunk-V6OBVAST.js";
+import "./chunk-3U3VAL47.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -315,40 +315,41 @@ import {
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-LCX5B364.js";
+} from "./chunk-6ORZ2EDC.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-VIFA5VJD.js";
-import "./chunk-H7TMVHKE.js";
+} from "./chunk-QIH2HAEN.js";
+import "./chunk-WGHHA7ZH.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-RQJA2YYO.js";
+} from "./chunk-XHRY7BXD.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-ROIJYS5K.js";
+} from "./chunk-ZYYTZUI2.js";
 import {
   computeWorkspaceSkillListUpdates,
   resolveSkillSettings,
   skillSettingStrings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-WM3LUQLO.js";
+import "./chunk-TUGSVUJB.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-IH4Z54RJ.js";
+} from "./chunk-QV5YN5YD.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-BSR5AXZR.js";
+import "./chunk-OD2WU5QY.js";
 import "./chunk-45NQKMYB.js";
-import "./chunk-OK47XBYH.js";
+import "./chunk-A4QRWUDE.js";
+import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-2IVYL3IF.js";
-import "./chunk-7U5G6JXI.js";
-import "./chunk-WCCLLK7X.js";
+} from "./chunk-BVJS5BSP.js";
 import "./chunk-ZLCT4C5A.js";
-import "./chunk-V6WHFGST.js";
 import "./chunk-2AUM35J5.js";
+import "./chunk-BKPPWD33.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
@@ -357,12 +358,12 @@ import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-M5GB774H.js";
 import "./chunk-3VUENPWF.js";
-import "./chunk-3AEKDXKT.js";
 import "./chunk-AW27A43Y.js";
 import "./chunk-IW6RQPQB.js";
+import "./chunk-H4A72DE5.js";
 import {
   loadMcpApprovals
-} from "./chunk-3LDGOQXZ.js";
+} from "./chunk-JOOFMXGF.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -384,11 +385,11 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-3GDBZJD6.js";
+} from "./chunk-A267JX7H.js";
 import "./chunk-RKUWKYED.js";
 import {
   TOGGLE_TYPES
-} from "./chunk-FA5K6YI2.js";
+} from "./chunk-E23IPNGS.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
 import {
@@ -396,25 +397,24 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-IRSLAS4M.js";
+} from "./chunk-HUTNYWBG.js";
 import "./chunk-5EJZE3FP.js";
-import "./chunk-XH3KAV2G.js";
+import "./chunk-MC4TLKEI.js";
 import "./chunk-MS7GNABG.js";
-import "./chunk-7KJPO7YH.js";
+import "./chunk-NF5J2WFA.js";
 import {
   getCliVersion
-} from "./chunk-OWXFBIB6.js";
+} from "./chunk-CU6GJD55.js";
 import "./chunk-WZMH7II3.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-ZMY2P4L3.js";
+} from "./chunk-IWPYVAO2.js";
 import {
   require_strip_json_comments
 } from "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
 import "./chunk-XFSFZCM5.js";
-import "./chunk-NF5J2WFA.js";
 import {
   ALIBABA_PROVIDERS,
   AsyncFzf,
@@ -520,76 +520,76 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-EBPLKY6U.js";
+} from "./chunk-4S5337WV.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import {
   stripAnsi
 } from "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
-import "./chunk-QPBFRWCP.js";
-import "./chunk-JRIVMPD2.js";
-import "./chunk-YILJKX2T.js";
-import "./chunk-D2RNVVH6.js";
+import "./chunk-DGZEMW5R.js";
+import "./chunk-WSH6GRKG.js";
+import "./chunk-CKSJECTU.js";
+import "./chunk-OVZPVYZB.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-I7BT2MME.js";
+} from "./chunk-5EYKMUUY.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-AKBFSOC5.js";
-import "./chunk-DEDESZDL.js";
+import "./chunk-Y3YCSWG5.js";
+import "./chunk-UPDOZBWO.js";
 import {
   promptIdContext
 } from "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-5RUCD4ED.js";
-import "./chunk-KRXPRVGL.js";
+import {
+  APPROVAL_MODES
+} from "./chunk-RWDNJBWN.js";
+import "./chunk-25EYDK42.js";
 import {
   HOOKS_CONFIG_FIELDS
-} from "./chunk-YBVVOSOH.js";
-import "./chunk-CPFFU46D.js";
-import "./chunk-ULNWG62W.js";
+} from "./chunk-MIPFDQAF.js";
+import "./chunk-MLXTMF7H.js";
+import "./chunk-KV27IEHM.js";
+import "./chunk-E3DYKPYZ.js";
 import {
   elapsedActiveTime,
   goalRequiresExactPermit
-} from "./chunk-DPTMKFIH.js";
-import {
-  APPROVAL_MODES
-} from "./chunk-63FNZTWG.js";
-import "./chunk-3GM5DLBI.js";
-import "./chunk-K34GJQOZ.js";
+} from "./chunk-OMLJNPBE.js";
+import "./chunk-OXCMMLED.js";
+import "./chunk-TIGA2IVL.js";
 import "./chunk-SAH4BD2J.js";
-import "./chunk-KLOMACIR.js";
+import "./chunk-XLLKYULU.js";
 import {
   runOutsideAgentContext
-} from "./chunk-VPV7WBVT.js";
+} from "./chunk-PT4I7NBA.js";
 import "./chunk-S6LOFUVP.js";
 import "./chunk-2J3OJGTL.js";
 import {
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-TTRH3RTQ.js";
+} from "./chunk-SG7ZP5PG.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
 import {
   isPathWithinRoot
-} from "./chunk-FRHQQC2Z.js";
+} from "./chunk-KBXKR5R2.js";
 import {
   osc8Hyperlink,
   qwenOAuth2Events,
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-DG4IQ6JG.js";
+} from "./chunk-GMIEIY3Y.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-KEC5FHLM.js";
-import "./chunk-2ZWH53I4.js";
+import "./chunk-ROIYNTHJ.js";
+import "./chunk-2B2BF7P7.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-TB4YFWXG.js";
-import "./chunk-D7QGE3RT.js";
+import "./chunk-YZHRN3CF.js";
+import "./chunk-FAAUPSY2.js";
 import {
   REASONING_EFFORT_TIERS,
   applyReasoningEffort
@@ -601,7 +601,7 @@ import {
 import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-NLFLYSS4.js";
+import "./chunk-QFJ5JHQR.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -641,7 +641,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-4KM2SYK5.js";
+} from "./chunk-RVOJ2FBP.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
 import {
@@ -650,16 +650,16 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-G6MUFRNI.js";
+} from "./chunk-CHHABXPE.js";
 import {
   runSideQuery
-} from "./chunk-LSRI3ND3.js";
-import "./chunk-PVXEJB66.js";
+} from "./chunk-MA2HEDVP.js";
+import "./chunk-XUJNK7Y6.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-YIGGWOJE.js";
-import "./chunk-KWX56CHZ.js";
+} from "./chunk-6HY6IF3Z.js";
+import "./chunk-4PKCUT7F.js";
 import {
   MAINLINE_CODER_MODEL
 } from "./chunk-F6WFNA7U.js";
@@ -667,17 +667,17 @@ import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-4AOVQPJU.js";
-import "./chunk-PZW46OTB.js";
+import "./chunk-CPHEPGAO.js";
+import "./chunk-P7MPQI75.js";
 import {
   atomicWriteFileSync
-} from "./chunk-YBHUXEC6.js";
+} from "./chunk-FDGGZIYW.js";
 import {
   endInteractionSpan,
   getActiveInteractionSpan,
   isBinary,
   redactUrlCredentials
-} from "./chunk-N4SVADAV.js";
+} from "./chunk-EL5SXY3T.js";
 import "./chunk-HHJLM3WQ.js";
 import "./chunk-K5IDV3PC.js";
 import {
@@ -691,13 +691,13 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-HOSVOUDK.js";
+} from "./chunk-BUQDLC2G.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-MELQSJOU.js";
+import "./chunk-AW4TRXOC.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-OR64CU46.js";
+} from "./chunk-X26JYGTD.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -36834,7 +36834,12 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
   const schedule = (0, import_react134.useCallback)(
     (request, signal, modelOverride) => {
       if (!modelOverride?.endsWith("\0")) {
-        void scheduler.schedule(request, signal);
+        void scheduler.schedule(request, signal).catch((error) => {
+          if (signal.aborted) return;
+          debugLogger36.error(
+            `Tool scheduling failed: ${error instanceof Error ? error.message : String(error)}`
+          );
+        });
         return;
       }
       void (async () => {
@@ -37542,6 +37547,38 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const dualOutput = useDualOutput();
   const [isResponding, setIsResponding] = (0, import_react136.useState)(false);
   const activeModelStreamsRef = (0, import_react136.useRef)(0);
+  const submissionActivitiesByGenerationRef = (0, import_react136.useRef)(/* @__PURE__ */ new Map());
+  const settleSubmissionStateIfIdle = (0, import_react136.useCallback)(() => {
+    const currentGeneration = submissionLeaseGenerationRef.current;
+    if ((submissionActivitiesByGenerationRef.current.get(currentGeneration) ?? 0) === 0 && activeModelStreamsRef.current === 0) {
+      setIsResponding(false);
+      setSubmissionInFlight(false);
+    }
+  }, [setSubmissionInFlight]);
+  const retainSubmissionActivity = (0, import_react136.useCallback)(
+    (generation) => {
+      submissionActivitiesByGenerationRef.current.set(
+        generation,
+        (submissionActivitiesByGenerationRef.current.get(generation) ?? 0) + 1
+      );
+      return () => {
+        const remainingActivities = Math.max(
+          0,
+          (submissionActivitiesByGenerationRef.current.get(generation) ?? 1) - 1
+        );
+        if (remainingActivities === 0) {
+          submissionActivitiesByGenerationRef.current.delete(generation);
+        } else {
+          submissionActivitiesByGenerationRef.current.set(
+            generation,
+            remainingActivities
+          );
+        }
+        settleSubmissionStateIfIdle();
+      };
+    },
+    [settleSubmissionStateIfIdle]
+  );
   const [thought, setThought] = (0, import_react136.useState)(null);
   const historyRef = (0, import_react136.useRef)(history);
   (0, import_react136.useLayoutEffect)(() => {
@@ -37624,6 +37661,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const interactionOwnersByToolCallIdRef = (0, import_react136.useRef)(
     /* @__PURE__ */ new Map()
   );
+  const continuationOwnersByToolCallIdRef = (0, import_react136.useRef)(
+    /* @__PURE__ */ new Map()
+  );
+  const detachedToolContinuationAbortControllersRef = (0, import_react136.useRef)(
+    /* @__PURE__ */ new Set()
+  );
+  const pendingCompletedToolBatchesRef = (0, import_react136.useRef)([]);
+  const handleCompletedToolsRef = (0, import_react136.useRef)(async () => {
+  });
   const immediateDuplicateToolResponsesRef = (0, import_react136.useRef)(null);
   const streamingResponseLengthRef = (0, import_react136.useRef)(0);
   const [isReceivingContent, setIsReceivingContent] = (0, import_react136.useState)(false);
@@ -37636,15 +37682,20 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const [toolCalls, scheduleToolCalls, markToolsAsSubmitted] = useReactToolScheduler(
     async (completedToolCallsFromScheduler) => {
       if (completedToolCallsFromScheduler.length > 0) {
-        const projectRoot = config.getProjectRoot();
-        const toolGroupDisplay = mapToDisplay(
-          completedToolCallsFromScheduler,
-          projectRoot
-        );
-        addItem(toolGroupDisplay, Date.now());
-        await handleCompletedTools(
-          completedToolCallsFromScheduler
-        );
+        const releaseToolCompletionActivity = isSubmittingQueryRef.current ? retainSubmissionActivity(submissionLeaseGenerationRef.current) : void 0;
+        try {
+          const projectRoot = config.getProjectRoot();
+          const toolGroupDisplay = mapToDisplay(
+            completedToolCallsFromScheduler,
+            projectRoot
+          );
+          addItem(toolGroupDisplay, Date.now());
+          await handleCompletedTools(
+            completedToolCallsFromScheduler
+          );
+        } finally {
+          releaseToolCompletionActivity?.();
+        }
       }
     },
     config,
@@ -37782,10 +37833,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
   }, [streamingState, config, history]);
   const cancelOngoingRequest = (0, import_react136.useCallback)(() => {
-    if (streamingState !== "responding" /* Responding */) {
+    if (turnCancelledRef.current) {
+      for (const controller of detachedToolContinuationAbortControllersRef.current) {
+        controller.abort();
+      }
+      detachedToolContinuationAbortControllersRef.current.clear();
       return;
     }
-    if (turnCancelledRef.current) {
+    if (streamingState !== "responding" /* Responding */) {
       return;
     }
     for (const flushBufferedStreamEvents of flushBufferedStreamEventsRef.current) {
@@ -37795,7 +37850,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     turnCancelledRef.current = true;
     submissionLeaseGenerationRef.current += 1;
     setSubmissionInFlight(false);
-    abortControllerRef.current?.abort();
+    const foregroundAbortController = abortControllerRef.current;
+    if (foregroundAbortController && !foregroundAbortController.signal.aborted) {
+      foregroundAbortController.abort();
+    } else {
+      for (const controller of detachedToolContinuationAbortControllersRef.current) {
+        controller.abort();
+      }
+      detachedToolContinuationAbortControllersRef.current.clear();
+    }
     const activeInteractionPromptId = activeInteractionPromptIdRef.current;
     const activeInteractionOwner = activeInteractionOwnerRef.current;
     if (activeInteractionPromptId && activeInteractionOwner && getActiveInteractionSpan(activeInteractionPromptId) === activeInteractionOwner) {
@@ -37931,7 +37994,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   );
   const prepareQueryForGemini = (0, import_react136.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id, submitType, submittedPrompt, preserveTurnOwnership) => {
-      if (turnCancelledRef.current) {
+      if (turnCancelledRef.current && !preserveTurnOwnership) {
         return { queryToSend: null, shouldProceed: false };
       }
       if (typeof query === "string" && query.trim().length === 0) {
@@ -37971,7 +38034,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 prompt_id
               };
               scheduleToolCalls([toolCallRequest], abortSignal);
-              return { queryToSend: null, shouldProceed: false };
+              return {
+                queryToSend: null,
+                shouldProceed: false,
+                scheduledToolCallId: toolCallRequest.callId
+              };
             }
             case "submit_prompt": {
               localQueryToSendToGemini = slashCommandResult.content;
@@ -38596,7 +38663,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [addItem, commitItemInOrder, pendingHistoryItemRef, setPendingHistoryItem]
   );
   const processGeminiStreamEvents = (0, import_react136.useCallback)(
-    async (stream, userMessageTimestamp, signal, submitType, turnAdmission, promptId, trackInteractionOwner = true) => {
+    async (stream, userMessageTimestamp, signal, submitType, turnAdmission, promptId, trackInteractionOwner = true, toolContinuationOwner) => {
       let geminiMessageBuffer = "";
       let thoughtBuffer = "";
       let scheduledToolContinuation = false;
@@ -38609,6 +38676,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         0
       );
       const toolCallRequests = [];
+      let streamInteractionOwner = trackInteractionOwner ? activeInteractionOwnerRef.current : void 0;
       const bufferedEvents = [];
       let flushTimer = null;
       const discardBufferedStreamEvents = /* @__PURE__ */ __name(() => {
@@ -38732,8 +38800,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       dualOutput?.startAssistantMessage();
       try {
         for await (const event of stream) {
-          if (trackInteractionOwner && promptId) {
-            activeInteractionOwnerRef.current ??= getActiveInteractionSpan(promptId);
+          if (!streamInteractionOwner && promptId) {
+            streamInteractionOwner = getActiveInteractionSpan(promptId);
+            if (trackInteractionOwner && streamInteractionOwner) {
+              activeInteractionOwnerRef.current ??= streamInteractionOwner;
+            }
           }
           dualOutput?.processEvent(event);
           switch (event.type) {
@@ -39056,12 +39127,19 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           }
         }
         if (executableToolCallRequests.length > 0) {
-          const interactionOwner = activeInteractionOwnerRef.current;
-          if (trackInteractionOwner && interactionOwner) {
+          if (toolContinuationOwner) {
+            for (const request of executableToolCallRequests) {
+              continuationOwnersByToolCallIdRef.current.set(
+                request.callId,
+                toolContinuationOwner
+              );
+            }
+          }
+          if (streamInteractionOwner) {
             for (const request of executableToolCallRequests) {
               interactionOwnersByToolCallIdRef.current.set(
                 request.callId,
-                interactionOwner
+                streamInteractionOwner
               );
             }
           }
@@ -39319,7 +39397,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   );
   const submitQuery = (0, import_react136.useCallback)(
     async (query, submitType = "userQuery" /* UserQuery */, prompt_id, metadata) => {
-      const allowConcurrentBtwDuringResponse = submitType === "userQuery" /* UserQuery */ && streamingState === "responding" /* Responding */ && typeof query === "string" && isBtwCommand(query) && !activeGoalAdmissionRef.current;
+      const allowConcurrentBtwDuringResponse = submitType === "userQuery" /* UserQuery */ && streamingState === "responding" /* Responding */ && activeModelStreamsRef.current > 0 && typeof query === "string" && isBtwCommand(query) && !activeGoalAdmissionRef.current;
       let ownsSubmissionLease = false;
       let submissionLeaseGeneration;
       const acquireSubmissionLease = /* @__PURE__ */ __name(() => {
@@ -39352,6 +39430,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return;
       }
       acquireSubmissionLease();
+      const submissionGeneration = submissionLeaseGenerationRef.current;
       loopDetectedRef.current = false;
       if (!isTurnContinuation && !allowConcurrentBtwDuringResponse) {
         lastTurnUserItemRef.current = null;
@@ -39407,7 +39486,17 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
       const abortController = new AbortController();
       const abortSignal = abortController.signal;
-      if (!allowConcurrentBtwDuringResponse) {
+      const inheritedToolContinuationOwner = metadata?.toolContinuationOwner;
+      const isDetachedToolContinuation = inheritedToolContinuationOwner?.survivesGenerationChange === true;
+      const detachedAbortController = inheritedToolContinuationOwner?.detachedAbortController ?? (allowConcurrentBtwDuringResponse ? abortController : void 0);
+      const foregroundAbortController = allowConcurrentBtwDuringResponse || isDetachedToolContinuation ? void 0 : abortController;
+      let keepToolContinuationAbortController = false;
+      if (detachedAbortController) {
+        detachedToolContinuationAbortControllersRef.current.add(
+          detachedAbortController
+        );
+      }
+      if (!allowConcurrentBtwDuringResponse && !isDetachedToolContinuation) {
         abortControllerRef.current = abortController;
         turnCancelledRef.current = false;
       }
@@ -39420,7 +39509,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           activeInteractionOwnerRef.current = void 0;
         }
       }
-      return promptIdContext.run(prompt_id, async () => {
+      const releaseSubmissionActivity = retainSubmissionActivity(submissionGeneration);
+      const submission = promptIdContext.run(prompt_id, async () => {
         let queuedGoal = metadata?.goal;
         let preparedQuery;
         try {
@@ -39442,7 +39532,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             prompt_id,
             submitType,
             submittedPrompt,
-            allowConcurrentBtwDuringResponse
+            allowConcurrentBtwDuringResponse || isDetachedToolContinuation
           );
         } catch (error) {
           await releaseUndeliveredGoalTurn(metadata?.userAdmission?.turnKey);
@@ -39450,7 +39540,16 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           metadata?.onAdmissionFailed?.();
           throw error;
         }
-        const { queryToSend, shouldProceed } = preparedQuery;
+        const { queryToSend, shouldProceed, scheduledToolCallId } = preparedQuery;
+        if (scheduledToolCallId && foregroundAbortController) {
+          keepToolContinuationAbortController = true;
+          continuationOwnersByToolCallIdRef.current.set(scheduledToolCallId, {
+            promptId: prompt_id,
+            signal: abortSignal,
+            survivesGenerationChange: false,
+            foregroundAbortController
+          });
+        }
         if (!shouldProceed || queryToSend === null) {
           await releaseUndeliveredGoalTurn(metadata?.userAdmission?.turnKey);
           releaseSubmissionLease();
@@ -39488,7 +39587,21 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         ) : void 0);
         const turnKey = goalBinding?.turnKey ?? userAdmission?.turnKey;
         const turnController = goalBinding?.controller ?? (turnKey ? new AbortController() : void 0);
-        const processingSignal = turnController ? AbortSignal.any([abortSignal, turnController.signal]) : abortSignal;
+        const processingSignals = [abortSignal];
+        if (turnController) {
+          processingSignals.push(turnController.signal);
+        }
+        if (inheritedToolContinuationOwner) {
+          processingSignals.push(inheritedToolContinuationOwner.signal);
+        }
+        const processingSignal = processingSignals.length > 1 ? AbortSignal.any(processingSignals) : abortSignal;
+        const toolContinuationOwner = {
+          promptId: prompt_id,
+          signal: processingSignal,
+          survivesGenerationChange: allowConcurrentBtwDuringResponse || inheritedToolContinuationOwner?.survivesGenerationChange === true,
+          detachedAbortController,
+          foregroundAbortController
+        };
         const turnAdmission = turnKey && turnController ? {
           turnKey,
           controller: turnController,
@@ -39564,11 +39677,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             modelOverride: modelOverrideRef.current,
             steerInput: metadata?.steerInput,
             ...submittedPrompt !== void 0 ? { submittedPrompt } : {},
-            ...!allowConcurrentBtwDuringResponse && midTurnDrainRef ? { getSteerInput: drainSteerAtBoundary } : {}
+            ...!allowConcurrentBtwDuringResponse && !isDetachedToolContinuation && midTurnDrainRef ? { getSteerInput: drainSteerAtBoundary } : {}
           };
+          const providerSignal = inheritedToolContinuationOwner ? processingSignal : abortSignal;
           const stream = geminiClient.sendMessageStream(
             finalQueryToSend,
-            abortSignal,
+            providerSignal,
             prompt_id,
             {
               ...sendOptions,
@@ -39593,12 +39707,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             submitType,
             turnAdmission,
             prompt_id,
-            !allowConcurrentBtwDuringResponse
+            !allowConcurrentBtwDuringResponse,
+            toolContinuationOwner
           );
           if (!goalBinding && turnAdmission && activeGoalTurnRef.current?.controller === turnAdmission.controller && activeGoalTurnRef.current.turnKey === turnAdmission.turnKey) {
             goalBinding = activeGoalTurnRef.current;
           }
           keepGoalBinding = processingResult.scheduledToolContinuation;
+          keepToolContinuationAbortController = processingResult.scheduledToolContinuation;
           if (processingResult.status === 1 /* UserCancelled */) {
             cleanupReviewLease = true;
             submitPromptOnCompleteRef.current = null;
@@ -39731,9 +39847,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             0,
             activeModelStreamsRef.current - 1
           );
-          if (activeModelStreamsRef.current === 0) {
-            setIsResponding(false);
-          }
+          const shouldDrainCompletedToolBatches = activeModelStreamsRef.current === 0;
           if (goalBinding) {
             let retainGoalBinding = keepGoalBinding && !goalBinding.controller.signal.aborted;
             if (retainGoalBinding) {
@@ -39753,7 +39867,31 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           if (turnAdmission && !goalBinding && activeGoalAdmissionRef.current?.controller === turnAdmission.controller && activeGoalAdmissionRef.current.turnKey === turnAdmission.turnKey) {
             activeGoalAdmissionRef.current = null;
           }
-          releaseSubmissionLease();
+          if (shouldDrainCompletedToolBatches) {
+            const pendingCompletedToolBatches = pendingCompletedToolBatchesRef.current.splice(0);
+            const pendingCompletedTools = /* @__PURE__ */ new Map();
+            for (const pendingBatch of pendingCompletedToolBatches) {
+              for (const toolCall of pendingBatch) {
+                pendingCompletedTools.set(toolCall.request.callId, toolCall);
+              }
+            }
+            if (pendingCompletedTools.size > 0) {
+              await handleCompletedToolsRef.current([
+                ...pendingCompletedTools.values()
+              ]);
+            }
+          }
+        }
+      });
+      return submission.finally(() => {
+        releaseSubmissionActivity();
+        if (detachedAbortController && !keepToolContinuationAbortController) {
+          detachedToolContinuationAbortControllersRef.current.delete(
+            detachedAbortController
+          );
+        }
+        if (foregroundAbortController && !keepToolContinuationAbortController && abortControllerRef.current === foregroundAbortController) {
+          abortControllerRef.current = null;
         }
       });
     },
@@ -39787,6 +39925,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       bindGoalTurn,
       failClosedGoalTurn,
       releaseUndeliveredGoalTurn,
+      retainSubmissionActivity,
       setSubmissionInFlight
     ]
   );
@@ -39884,10 +40023,59 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           );
         }
         markToolsAsSubmitted(dedupedCallIds);
+        const detachedAbortControllers = /* @__PURE__ */ new Set();
+        const foregroundAbortControllers = /* @__PURE__ */ new Set();
+        for (const callId of dedupedCallIds) {
+          const continuationOwner2 = continuationOwnersByToolCallIdRef.current.get(callId);
+          if (continuationOwner2?.detachedAbortController) {
+            detachedAbortControllers.add(
+              continuationOwner2.detachedAbortController
+            );
+          }
+          if (continuationOwner2?.foregroundAbortController) {
+            foregroundAbortControllers.add(
+              continuationOwner2.foregroundAbortController
+            );
+          }
+          interactionOwnersByToolCallIdRef.current.delete(callId);
+          continuationOwnersByToolCallIdRef.current.delete(callId);
+        }
+        for (const controller of detachedAbortControllers) {
+          const isStillOwned = [
+            ...continuationOwnersByToolCallIdRef.current.values()
+          ].some((owner) => owner.detachedAbortController === controller);
+          if (!isStillOwned) {
+            detachedToolContinuationAbortControllersRef.current.delete(
+              controller
+            );
+          }
+        }
+        for (const controller of foregroundAbortControllers) {
+          const isStillOwned = [
+            ...continuationOwnersByToolCallIdRef.current.values()
+          ].some((owner) => owner.foregroundAbortController === controller);
+          if (!isStillOwned && abortControllerRef.current === controller) {
+            abortControllerRef.current = null;
+          }
+        }
       }
       if (activeModelStreamsRef.current > 0) {
+        const deferredTools = completedAndReadyToSubmitTools.filter(
+          (toolCall) => !historyCallIdsWithResponse.has(toolCall.request.callId)
+        );
+        if (deferredTools.length > 0) {
+          pendingCompletedToolBatchesRef.current.push(deferredTools);
+        }
         return;
       }
+      const continuationOwner = completedAndReadyToSubmitTools.filter(
+        (toolCall) => !historyCallIdsWithResponse.has(toolCall.request.callId)
+      ).map(
+        (toolCall) => continuationOwnersByToolCallIdRef.current.get(
+          toolCall.request.callId
+        )
+      ).find((owner) => owner !== void 0);
+      const continuationWasCancelled = /* @__PURE__ */ __name(() => continuationOwner ? continuationOwner.signal.aborted : turnCancelledRef.current || abortControllerRef.current?.signal.aborted === true, "continuationWasCancelled");
       const clientTools = completedAndReadyToSubmitTools.filter(
         (t2) => t2.request.isClientInitiated && !historyCallIdsWithResponse.has(t2.request.callId)
       );
@@ -39897,25 +40085,77 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       const newSuccessfulMemorySaves = completedAndReadyToSubmitTools.filter(
         (t2) => t2.request.name === "save_memory" && t2.status === "success" && !processedMemoryToolsRef.current.has(t2.request.callId)
       );
-      const geminiTools = completedAndReadyToSubmitTools.filter(
+      let geminiTools = completedAndReadyToSubmitTools.filter(
         (t2) => !t2.request.isClientInitiated && !historyCallIdsWithResponse.has(t2.request.callId)
       );
       const terminalPromptId = completedAndReadyToSubmitTools.find(
         (toolCall) => !toolCall.request.isClientInitiated
       )?.request.prompt_id;
-      const ownerToolCall = geminiTools[0] ?? completedAndReadyToSubmitTools.find(
+      const ownerForToolCall = /* @__PURE__ */ __name((toolCall) => interactionOwnersByToolCallIdRef.current.get(toolCall.request.callId) ?? (activeInteractionPromptIdRef.current === toolCall.request.prompt_id ? activeInteractionOwnerRef.current : void 0), "ownerForToolCall");
+      const liveOwnerForToolCall = /* @__PURE__ */ __name((toolCall) => {
+        const owner = ownerForToolCall(toolCall);
+        const ownerPromptId = toolCall.request.prompt_id;
+        return owner && ownerPromptId && getActiveInteractionSpan(ownerPromptId) === owner ? owner : void 0;
+      }, "liveOwnerForToolCall");
+      const liveActiveInteractionOwner = activeInteractionPromptIdRef.current && activeInteractionOwnerRef.current && getActiveInteractionSpan(activeInteractionPromptIdRef.current) === activeInteractionOwnerRef.current ? activeInteractionOwnerRef.current : void 0;
+      const ownerToolCall = (liveActiveInteractionOwner ? geminiTools.find(
+        (toolCall) => liveOwnerForToolCall(toolCall) === liveActiveInteractionOwner
+      ) : void 0) ?? geminiTools.find((toolCall) => liveOwnerForToolCall(toolCall)) ?? geminiTools[0] ?? completedAndReadyToSubmitTools.find(
         (toolCall) => !toolCall.request.isClientInitiated
       );
-      const interactionOwner = ownerToolCall ? interactionOwnersByToolCallIdRef.current.get(
-        ownerToolCall.request.callId
-      ) ?? (activeInteractionPromptIdRef.current === ownerToolCall.request.prompt_id ? activeInteractionOwnerRef.current : void 0) : void 0;
+      const interactionOwner = ownerToolCall ? liveOwnerForToolCall(ownerToolCall) : void 0;
+      const secondaryInteractionOwners = /* @__PURE__ */ new Map();
+      const secondaryTools = interactionOwner ? geminiTools.filter(
+        (toolCall) => ownerForToolCall(toolCall) !== interactionOwner
+      ) : [];
+      for (const toolCall of secondaryTools) {
+        const secondaryOwner = ownerForToolCall(toolCall);
+        if (secondaryOwner && toolCall.request.prompt_id) {
+          secondaryInteractionOwners.set(
+            secondaryOwner,
+            toolCall.request.prompt_id
+          );
+        }
+        if (toolCall.status !== "cancelled") {
+          geminiClient?.recordCompletedToolCall(
+            toolCall.request.name,
+            toolCall.request.args
+          );
+        }
+        dualOutput?.emitToolResult(toolCall.request, toolCall.response);
+      }
+      if (secondaryTools.length > 0) {
+        const secondaryCallIds2 = new Set(
+          secondaryTools.map((toolCall) => toolCall.request.callId)
+        );
+        markToolsAsSubmitted([...secondaryCallIds2]);
+        geminiTools = geminiTools.filter(
+          (toolCall) => !secondaryCallIds2.has(toolCall.request.callId)
+        );
+      }
       for (const toolCall of completedAndReadyToSubmitTools) {
         interactionOwnersByToolCallIdRef.current.delete(
           toolCall.request.callId
         );
+        continuationOwnersByToolCallIdRef.current.delete(
+          toolCall.request.callId
+        );
       }
-      let promptId = geminiTools[0]?.request.prompt_id;
+      for (const [owner, ownerPromptId] of secondaryInteractionOwners) {
+        if (getActiveInteractionSpan(ownerPromptId) === owner) {
+          endInteractionSpan("cancelled", { promptId: ownerPromptId });
+        }
+      }
+      let promptId = ownerToolCall?.request.prompt_id ?? continuationOwner?.promptId;
       const endToolInteraction = /* @__PURE__ */ __name((status, errorMessage, errorType) => {
+        if (continuationOwner?.detachedAbortController) {
+          detachedToolContinuationAbortControllersRef.current.delete(
+            continuationOwner.detachedAbortController
+          );
+        }
+        if (continuationOwner?.foregroundAbortController && abortControllerRef.current === continuationOwner.foregroundAbortController) {
+          abortControllerRef.current = null;
+        }
         if (!promptId || !interactionOwner || getActiveInteractionSpan(promptId) !== interactionOwner) {
           return;
         }
@@ -40072,9 +40312,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         );
       }
       const completedCallIds = new Set(
-        completedAndReadyToSubmitTools.map(
-          (toolCall) => toolCall.request.callId
-        )
+        geminiTools.map((toolCall) => toolCall.request.callId)
+      );
+      const secondaryCallIds = new Set(
+        secondaryTools.map((toolCall) => toolCall.request.callId)
       );
       const readyDuplicateBatches = [];
       pendingDuplicateToolResponsesRef.current = pendingDuplicateToolResponsesRef.current.filter((batch) => {
@@ -40084,10 +40325,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         if (isReady) {
           readyDuplicateBatches.push(batch);
         }
-        return !isReady;
+        const belongsToSecondaryOwner = [...batch.executableCallIds].some(
+          (callId) => secondaryCallIds.has(callId)
+        );
+        return !isReady && !belongsToSecondaryOwner;
       });
-      const pendingDuplicateResponses = readyDuplicateBatches.flatMap(
-        (batch) => batch.duplicateResponses
+      const pendingDuplicateResponses = readyDuplicateBatches.flatMap((batch) => batch.duplicateResponses).filter(
+        ({ request }) => !interactionOwner || !request.prompt_id || request.prompt_id === promptId
       );
       const pendingDuplicatePromptId = readyDuplicateBatches[0]?.promptId;
       if (!promptId && pendingDuplicatePromptId) {
@@ -40193,7 +40437,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           } : { goalContext: { ...goalContext } } : void 0
         );
       });
-      if (turnCancelledRef.current || abortControllerRef.current?.signal.aborted) {
+      if (continuationWasCancelled()) {
         markToolsAsSubmitted(
           geminiTools.map((toolCall) => toolCall.request.callId)
         );
@@ -40283,10 +40527,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             }
           }
         } catch (error) {
+          const errorMessage = getErrorMessage(error);
           goalFinishFailed = true;
           await failClosedGoalTurn(
             toolGoalBinding,
-            `Goal turn could not finish: ${getErrorMessage(error)}`
+            `Goal turn could not finish: ${errorMessage}`
           );
         } finally {
           releaseGoalTurn(toolGoalBinding);
@@ -40380,7 +40625,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         );
         return;
       }
-      const drained = turnCancelledRef.current || abortControllerRef.current?.signal.aborted ? [] : midTurnDrainRef?.current?.(
+      const drained = continuationOwner?.survivesGenerationChange || continuationWasCancelled() ? [] : midTurnDrainRef?.current?.(
         false,
         Boolean(activeGoalAdmissionRef.current)
       ) ?? [];
@@ -40406,7 +40651,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           }
         }
       }
-      if (turnCancelledRef.current || abortControllerRef.current?.signal.aborted) {
+      if (continuationWasCancelled()) {
         drainedSteer?.restore();
         if (toolGoalBinding) {
           await failClosedGoalTurn(
@@ -40426,7 +40671,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         endToolInteraction("cancelled");
         return;
       }
-      void submitQuery(responsesToSend, "toolResult" /* ToolResult */, promptId, {
+      await submitQuery(responsesToSend, "toolResult" /* ToolResult */, promptId, {
         steerInput: drainedSteer,
         onDelivered: drainedSteer?.accept,
         onAdmissionFailed: /* @__PURE__ */ __name(() => {
@@ -40444,7 +40689,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             "continuation_delivery_failed"
           );
         }, "onDeliveryFailed"),
-        goalBinding: toolGoalBinding
+        goalBinding: toolGoalBinding,
+        toolContinuationOwner: continuationOwner
       });
     },
     [
@@ -40463,6 +40709,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       releaseGoalTurn
     ]
   );
+  (0, import_react136.useLayoutEffect)(() => {
+    handleCompletedToolsRef.current = handleCompletedTools;
+  }, [handleCompletedTools]);
   const pendingHistoryItems = (0, import_react136.useMemo)(
     () => [
       // Reasoning renders above the streaming answer.
@@ -45704,12 +45953,12 @@ ${buildWorkflowSteeringNotice()}
       }
       if (streamingState === "responding" /* Responding */ && isBtwCommand(submittedValue)) {
         void Promise.resolve(
-          submitQuery(
-            submittedValue,
-            "userQuery" /* UserQuery */,
-            void 0,
-            submittedPrompt === void 0 ? void 0 : { submittedPrompt }
-          )
+          submitQuery(submittedValue, "userQuery" /* UserQuery */, void 0, {
+            ...submittedPrompt === void 0 ? {} : { submittedPrompt },
+            onAdmissionFailed: /* @__PURE__ */ __name(() => {
+              addMessage(submittedValue, true, submittedPrompt);
+            }, "onAdmissionFailed")
+          })
         ).catch((error) => {
           debugLogger40.warn("Failed to admit /btw submission", error);
         });