@qwen-code/qwen-code 0.21.12 → 0.21.14-preview.0

package/chunks/{startInteractiveUI-KMYUJ2MU.js → startInteractiveUI-PISBXWKA.js}

@@ -10,7 +10,7 @@ import {
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-WI6GIM2M.js";
+} from "./chunk-I7NTHW4C.js";
 import {
   MAX_SUGGESTIONS_TO_SHOW,
   SESSION_MENTION_PREFIX,
@@ -22,10 +22,10 @@ import {
   matchMcpServerPrefix,
   resolveAtCommandQuery,
   sanitizeDisplayText
-} from "./chunk-X5SLJOMF.js";
+} from "./chunk-NV6LW6FT.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-MUNA4QDC.js";
+} from "./chunk-6VDPDHIP.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -34,6 +34,7 @@ import {
   FileCommandLoader,
   MAX_STACKED_SKILLS,
   McpPromptLoader,
+  SLASH_COMMANDS_SKIP_RECORDING,
   SavedWorkflowLoader,
   SkillCommandLoader,
   addConfigToMatcherGroup,
@@ -69,17 +70,18 @@ import {
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt,
   supportsMatchers
-} from "./chunk-QSD4UH74.js";
+} from "./chunk-XO24LIZC.js";
+import "./chunk-X3YA3YGG.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-S6TCTH4Z.js";
+} from "./chunk-AQBHJ2IG.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState,
   appEvents,
   cleanupReviewWorktreeLeases,
   loadHierarchicalGeminiMemory
-} from "./chunk-IX4PWUDU.js";
+} from "./chunk-KSGWAYNE.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -157,20 +159,21 @@ import {
   useUIActions,
   useUIState,
   useVirtualViewport
-} from "./chunk-VLHR7F4E.js";
+} from "./chunk-U6RZRKNM.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-4XA4QIUA.js";
+} from "./chunk-PMS7O6SA.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-MDNUCDKZ.js";
+} from "./chunk-73G3Z7QS.js";
+import "./chunk-4WGODMVR.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-CGM3E75C.js";
+} from "./chunk-J63PKMYA.js";
 import {
   GeminiRespondingSpinner,
   GeminiSpinner,
@@ -187,7 +190,7 @@ import {
   useStreamingContext,
   waitForGoalRuntime,
   wrapAnsi
-} from "./chunk-GXTMEATA.js";
+} from "./chunk-LLR424CQ.js";
 import {
   formatDuration,
   formatRelativeTime,
@@ -195,10 +198,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 +210,13 @@ import {
 } from "./chunk-NYX53SV4.js";
 import {
   useAutoAcceptIndicator
-} from "./chunk-CQ6IPDQW.js";
+} from "./chunk-DZCV3ZYU.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-56HVDG3M.js";
+} from "./chunk-RXHBTKMG.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -226,25 +229,10 @@ import {
   oscKittyNotify,
   saveClipboardImage,
   writeOsc52
-} from "./chunk-NW2GIPG3.js";
+} from "./chunk-SNQZZ765.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 +247,47 @@ import {
   use_stdin_default,
   use_stdout_default
 } from "./chunk-2IIJTXYF.js";
+import {
+  relaunchApp
+} from "./chunk-MCG53LWC.js";
+import {
+  setUpdateHandler
+} from "./chunk-VHPMDDPT.js";
+import {
+  isHistoryItemVisibleAfterRestore
+} from "./chunk-EKTCKZV5.js";
+import "./chunk-2OA3JMRD.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-K3CECR5C.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-RDVNSJQU.js";
-import "./chunk-XAFIL4BD.js";
-import "./chunk-OPVF453Q.js";
+} from "./chunk-LRDB2OLB.js";
+import "./chunk-4KQ2TI2K.js";
+import "./chunk-4V4DFJBS.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-RAQBBGS6.js";
 import "./chunk-6H67XLET.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-EJOGLSNJ.js";
-import "./chunk-UI5UGEF4.js";
-import "./chunk-TMFWI4RC.js";
+} from "./chunk-WSSH2BNO.js";
+import "./chunk-EOCQCNV4.js";
+import "./chunk-OVY67CYC.js";
 import {
   cpLen,
   cpSlice,
@@ -298,8 +299,8 @@ import {
   sanitizeTerminalText,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-4NFY2S7N.js";
-import "./chunk-V6OBVAST.js";
+} from "./chunk-E7REAOTN.js";
+import "./chunk-57KOJ2KZ.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -315,40 +316,42 @@ import {
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-LCX5B364.js";
+} from "./chunk-PPTM4O4R.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-VIFA5VJD.js";
-import "./chunk-H7TMVHKE.js";
+} from "./chunk-7OCSX7FC.js";
+import "./chunk-WGHHA7ZH.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-RQJA2YYO.js";
+} from "./chunk-G6FFFICU.js";
+import "./chunk-7U5G6JXI.js";
+import "./chunk-WCCLLK7X.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-ROIJYS5K.js";
+} from "./chunk-ISRHAMNL.js";
 import {
   computeWorkspaceSkillListUpdates,
   resolveSkillSettings,
   skillSettingStrings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-WM3LUQLO.js";
+import "./chunk-2JXDFSVE.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-IH4Z54RJ.js";
+} from "./chunk-HGPMOXLZ.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-BSR5AXZR.js";
+import "./chunk-NRPXRNN4.js";
 import "./chunk-45NQKMYB.js";
-import "./chunk-OK47XBYH.js";
+import "./chunk-5IYS4WWR.js";
+import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-2IVYL3IF.js";
-import "./chunk-7U5G6JXI.js";
-import "./chunk-WCCLLK7X.js";
+} from "./chunk-FCTLOVYW.js";
 import "./chunk-ZLCT4C5A.js";
-import "./chunk-V6WHFGST.js";
 import "./chunk-2AUM35J5.js";
+import "./chunk-DRKYT2TR.js";
+import "./chunk-WP4WIUOJ.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
@@ -357,12 +360,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-QECSDJET.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -384,11 +387,11 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-3GDBZJD6.js";
+} from "./chunk-OLZSWUZR.js";
 import "./chunk-RKUWKYED.js";
 import {
   TOGGLE_TYPES
-} from "./chunk-FA5K6YI2.js";
+} from "./chunk-YFPZ3NNC.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
 import {
@@ -396,25 +399,24 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-IRSLAS4M.js";
+} from "./chunk-IOTPI425.js";
 import "./chunk-5EJZE3FP.js";
-import "./chunk-XH3KAV2G.js";
-import "./chunk-MS7GNABG.js";
-import "./chunk-7KJPO7YH.js";
+import "./chunk-SGLPDKRT.js";
+import "./chunk-CXJHQVEK.js";
+import "./chunk-NF5J2WFA.js";
 import {
   getCliVersion
-} from "./chunk-OWXFBIB6.js";
+} from "./chunk-6DFPR7CS.js";
 import "./chunk-WZMH7II3.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-ZMY2P4L3.js";
+} from "./chunk-YXC7JYUI.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,
@@ -507,6 +509,7 @@ import {
   readWorktreeSessionMarker,
   refreshMemoryAfterManagedWrite,
   refreshMemoryInstruction,
+  registerSession,
   resolveBaseUrl,
   resolveBranchName,
   resolveMetadataKey,
@@ -520,88 +523,84 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-EBPLKY6U.js";
+} from "./chunk-XC377TLN.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-FS5NGKWC.js";
+import "./chunk-SLILKYV2.js";
+import "./chunk-NVRMCWTP.js";
+import "./chunk-AKBOLMUF.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-I7BT2MME.js";
+} from "./chunk-SR2LYSMT.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-AKBFSOC5.js";
-import "./chunk-DEDESZDL.js";
+import "./chunk-OBJYN4MX.js";
+import "./chunk-2C6HJMG3.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-WPVUOVYX.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-4ZMS3JCR.js";
+import "./chunk-DGJ7O55J.js";
+import "./chunk-OO4FKHLO.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-I3N2Z25H.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
 } from "./chunk-KM73TBQ4.js";
-import {
-  getUnsupportedImageFormatWarning,
-  isSupportedImageMimeType
-} from "./chunk-MPHPFVKK.js";
 import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-NLFLYSS4.js";
+import "./chunk-QFJ5JHQR.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -617,7 +616,6 @@ import {
   addMCPStatusChangeListener,
   formatFullTurnVisionNotice,
   formatVisionBridgeNotice,
-  getAllGeminiMdFilenames,
   getAllMCPServerStatuses,
   getFullTurnVisionModelSelector,
   getMCPServerStatus,
@@ -641,45 +639,52 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-4KM2SYK5.js";
+} from "./chunk-KC4WMLZO.js";
 import "./chunk-YRLW2MSX.js";
 import "./chunk-VGC4I5JJ.js";
+import {
+  getAllGeminiMdFilenames
+} from "./chunk-3PWCMXIR.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
   getAutoMemoryProjectStateDir,
   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-QIHHJKXT.js";
 import {
   MAINLINE_CODER_MODEL
 } from "./chunk-F6WFNA7U.js";
-import "./chunk-46UV252V.js";
+import "./chunk-WZAD4ZNJ.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-FPGTNKCP.js";
-import "./chunk-4AOVQPJU.js";
-import "./chunk-PZW46OTB.js";
+import {
+  getUnsupportedImageFormatWarning,
+  isSupportedImageMimeType
+} from "./chunk-YHC2EYYG.js";
+import "./chunk-CPHEPGAO.js";
+import "./chunk-DVR7XKO5.js";
 import {
   atomicWriteFileSync
-} from "./chunk-YBHUXEC6.js";
+} from "./chunk-YECDICIO.js";
 import {
   endInteractionSpan,
   getActiveInteractionSpan,
   isBinary,
   redactUrlCredentials
-} from "./chunk-N4SVADAV.js";
+} from "./chunk-XT4RKHVE.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-K5IDV3PC.js";
+import "./chunk-D34RDOLP.js";
 import {
   Storage,
   UnauthorizedError,
@@ -691,13 +696,13 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-HOSVOUDK.js";
+} from "./chunk-BUQDLC2G.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-MELQSJOU.js";
+import "./chunk-TNPWODIZ.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-OR64CU46.js";
+} from "./chunk-L6CCLB3G.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -2376,6 +2381,7 @@ function isSyntheticHistoryItem(item) {
     case "gemini_content":
     case "tool_group":
     case "btw":
+    case "advisor":
     case "memory_saved":
     case "about":
     case "help":
@@ -27867,6 +27873,7 @@ function AgentViewProvider({
   const switchToAgent = (0, import_react94.useCallback)(
     (agentId) => {
       if (agents.has(agentId)) {
+        setAgentShellFocused(false);
         setActiveView(agentId);
       }
     },
@@ -27876,14 +27883,24 @@ function AgentViewProvider({
     const ids = ["main", ...agents.keys()];
     const currentIndex = ids.indexOf(activeView);
     const nextIndex = (currentIndex + 1) % ids.length;
+    setAgentShellFocused(false);
     setActiveView(ids[nextIndex]);
   }, [agents, activeView]);
   const switchToPrevious = (0, import_react94.useCallback)(() => {
     const ids = ["main", ...agents.keys()];
     const currentIndex = ids.indexOf(activeView);
     const prevIndex = (currentIndex - 1 + ids.length) % ids.length;
+    setAgentShellFocused(false);
     setActiveView(ids[prevIndex]);
   }, [agents, activeView]);
+  const initialViewRef = (0, import_react94.useRef)(true);
+  (0, import_react94.useEffect)(() => {
+    if (initialViewRef.current) {
+      initialViewRef.current = false;
+      return;
+    }
+    setAgentShellFocused(false);
+  }, [activeView]);
   const registerAgent = (0, import_react94.useCallback)(
     (agentId, interactiveAgent, modelId, color, modelName) => {
       setAgents((prev) => {
@@ -33015,22 +33032,54 @@ var AgentChatMissing = /* @__PURE__ */ __name(({ label }) => /* @__PURE__ */ (0,
 
 // packages/cli/src/ui/components/agent-view/AgentChatView.tsx
 var import_jsx_runtime126 = __toESM(require_jsx_runtime(), 1);
+var debugLogger31 = createDebugLogger("AGENT_TAB_RENDER");
 var AgentChatView = /* @__PURE__ */ __name(({ agentId }) => {
   const { agents } = useAgentViewState();
+  const { setAgentShellFocused } = useAgentViewActions();
   const agent = agents.get(agentId);
   const interactiveAgent = agent?.interactiveAgent;
   const core = interactiveAgent?.getCore();
   if (!agent || !interactiveAgent || !core) {
     return /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(AgentChatMissing, { label: `Agent "${agentId}" not found.` });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
-    AgentChatContent,
-    {
-      core,
-      interactiveAgent,
-      instanceKey: agentId,
-      modelName: agent.modelName
-    }
+  return (
+    // Non-fatal per-tab containment (#9290): the app-level boundary is
+    // FATAL — a render error that reaches it logs [FATAL_RENDER_ERROR]
+    // and exits the whole session. An errored or incomplete teammate
+    // whose transcript throws during render must degrade THIS tab only,
+    // keeping the session and the other tabs alive. Keyed by agentId so
+    // switching tabs starts from fresh boundary state: one crashed tab
+    // must not strand every later tab in its fallback.
+    /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
+      ErrorBoundary,
+      {
+        fallback: (error) => /* @__PURE__ */ (0, import_jsx_runtime126.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Text, { color: theme.status.error, bold: true, children: "Something went wrong while rendering this agent tab." }),
+          /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Text, { color: theme.text.secondary, children: sanitizeTerminalText(error.message) }),
+          /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Text, { color: theme.text.secondary, dimColor: true, children: "The session is still running; other tabs are unaffected." }),
+          /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Text, { color: theme.text.secondary, dimColor: true, children: "Switch to another tab and back to retry rendering this tab." }),
+          /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(Text, { color: theme.text.secondary, dimColor: true, children: "Set QWEN_DEBUG_LOG_FILE=1 and reproduce for a full log." })
+        ] }),
+        onError: (error, info) => {
+          setAgentShellFocused(false);
+          debugLogger31.error(
+            `[AGENT_TAB_RENDER_ERROR] agentId=${agentId} ${error.message}
+${info.componentStack ?? ""}
+${error.stack ?? ""}`
+          );
+        },
+        children: /* @__PURE__ */ (0, import_jsx_runtime126.jsx)(
+          AgentChatContent,
+          {
+            core,
+            interactiveAgent,
+            instanceKey: agentId,
+            modelName: agent.modelName
+          }
+        )
+      },
+      agentId
+    )
   );
 }, "AgentChatView");
 
@@ -33857,7 +33906,7 @@ function installTerminalRedrawOptimizer(stdout) {
 __name(installTerminalRedrawOptimizer, "installTerminalRedrawOptimizer");
 
 // packages/cli/src/ui/utils/terminal-resize-reflow.ts
-var debugLogger31 = createDebugLogger("RESIZE_REFLOW");
+var debugLogger32 = createDebugLogger("RESIZE_REFLOW");
 var CLEAR_VIEWPORT = base_exports.clearViewport;
 var ESC2 = "\x1B[";
 var CLEAR_TERMINAL = base_exports.clearTerminal;
@@ -33935,7 +33984,7 @@ function installTerminalResizeReflow(stdout, options = {}) {
   let barePrintableCount = 0;
   let handoffUntil = 0;
   let clearUntil = 0;
-  debugLogger31.debug("installed", { width: lastWidth, isVP });
+  debugLogger32.debug("installed", { width: lastWidth, isVP });
   const modelFrame = /* @__PURE__ */ __name((content, bypassMin = false) => {
     if (!bypassMin && content.split("\n").length < MIN_FRAME_LINES) return;
     model.content = content;
@@ -33944,7 +33993,7 @@ function installTerminalResizeReflow(stdout, options = {}) {
   }, "modelFrame");
   const onResize = /* @__PURE__ */ __name(() => {
     const width = stdout.columns ?? lastWidth;
-    debugLogger31.debug("resize-event", {
+    debugLogger32.debug("resize-event", {
       width,
       lastWidth,
       modeled: model.content.length > 0
@@ -33955,7 +34004,7 @@ function installTerminalResizeReflow(stdout, options = {}) {
       } else {
         pendingAmplify = reflowModel(model, width);
       }
-      debugLogger31.debug("shrink", {
+      debugLogger32.debug("shrink", {
         from: lastWidth,
         to: width,
         pendingAmplify,
@@ -33983,9 +34032,9 @@ function installTerminalResizeReflow(stdout, options = {}) {
           barePrintableCount = 0;
           handoffUntil = Date.now() + HANDOFF_WINDOW_MS;
         }
-        debugLogger31.debug("match", { printable });
+        debugLogger32.debug("match", { printable });
         if (isVP && Date.now() < clearUntil) {
-          debugLogger31.debug("clear-viewport");
+          debugLogger32.debug("clear-viewport");
           chunk = chunk.slice(0, match.index) + CLEAR_VIEWPORT + chunk.slice(match.index + match[0].length);
         } else if (pendingAmplify > 0) {
           const count = countOccurrences(match[0], ERASE_LINE);
@@ -33997,7 +34046,7 @@ function installTerminalResizeReflow(stdout, options = {}) {
               CURSOR_DOWN_PATTERN,
               (_m, n) => `${ESC2}${Number(n) + delta}B`
             );
-            debugLogger31.debug("amplify", { original: count, target });
+            debugLogger32.debug("amplify", { original: count, target });
             chunk = prefix + base_exports.eraseLines(target) + chunk.slice(match.index + match[0].length);
           }
         }
@@ -34050,7 +34099,7 @@ var import_react117 = __toESM(require_react(), 1);
 import process12 from "node:process";
 import os4 from "node:os";
 import v8 from "v8";
-var debugLogger32 = createDebugLogger("MEMORY_MONITOR");
+var debugLogger33 = createDebugLogger("MEMORY_MONITOR");
 var MEMORY_WARNING_THRESHOLD = Math.min(
   7 * 1024 * 1024 * 1024,
   Math.floor(os4.totalmem() * 0.85)
@@ -34072,23 +34121,23 @@ var useMemoryMonitor = /* @__PURE__ */ __name(({
       const rss = memUsage.rss / 1024 / 1024;
       const external = memUsage.external / 1024 / 1024;
       const arrayBuffers = memUsage.arrayBuffers / 1024 / 1024;
-      if (debugLogger32.isEnabled()) {
-        debugLogger32.debug(
+      if (debugLogger33.isEnabled()) {
+        debugLogger33.debug(
           `[MEMORY_USAGE] heapUsed=${heapUsed.toFixed(1)}MB, heapTotal=${heapTotal.toFixed(1)}MB, rss=${rss.toFixed(1)}MB, external=${external.toFixed(1)}MB, arrayBuffers=${arrayBuffers.toFixed(1)}MB, heapUtilization=${(heapUsed / heapTotal * 100).toFixed(1)}%`
         );
       }
       const now = Date.now();
       if (compactOldItems && memUsage.heapUsed > MEMORY_UI_COMPACT_THRESHOLD() && now - lastCompactRef.current > UI_COMPACT_COOLDOWN_MS) {
         lastCompactRef.current = now;
-        if (debugLogger32.isEnabled()) {
-          debugLogger32.debug(
+        if (debugLogger33.isEnabled()) {
+          debugLogger33.debug(
             `[UI_COMPACT] heapUsed=${heapUsed.toFixed(1)}MB exceeds ${(MEMORY_UI_COMPACT_THRESHOLD() / 1024 / 1024).toFixed(0)}MB threshold, compacting UI history`
           );
         }
         try {
           compactOldItems();
         } catch (err) {
-          debugLogger32.error(
+          debugLogger33.error(
             `[UI_COMPACT] compactOldItems failed: ${err instanceof Error ? err.message : String(err)}`
           );
         }
@@ -34097,7 +34146,7 @@ var useMemoryMonitor = /* @__PURE__ */ __name(({
     const warningIntervalId = setInterval(() => {
       const usage = process12.memoryUsage();
       if (usage.rss > MEMORY_WARNING_THRESHOLD) {
-        debugLogger32.warn(
+        debugLogger33.warn(
           `[MEMORY_WARNING] High memory usage detected: ${(usage.rss / (1024 * 1024 * 1024)).toFixed(2)} GB`
         );
         addItem(
@@ -34250,7 +34299,7 @@ var FEEDBACK_SHOW_PROBABILITY = 0.25;
 var MIN_TOOL_CALLS = 10;
 var MIN_USER_MESSAGES = 5;
 var FEEDBACK_COOLDOWN_HOURS = 24;
-var debugLogger33 = createDebugLogger("FEEDBACK_DIALOG");
+var debugLogger34 = createDebugLogger("FEEDBACK_DIALOG");
 var lastMessageIsAIResponse = /* @__PURE__ */ __name((history) => history.length > 0 && history[history.length - 1].type === "gemini" /* GEMINI */, "lastMessageIsAIResponse");
 var getFeedbackLastShownTimestampFromFile = /* @__PURE__ */ __name(() => {
   try {
@@ -34262,7 +34311,7 @@ var getFeedbackLastShownTimestampFromFile = /* @__PURE__ */ __name(() => {
     }
   } catch (error) {
     if (isNodeError(error) && error.code !== "ENOENT") {
-      debugLogger33.warn(
+      debugLogger34.warn(
         "Failed to read feedbackLastShownTimestamp from settings file:",
         error
       );
@@ -35111,7 +35160,7 @@ __name(useDeleteCommand, "useDeleteCommand");
 init_esbuild_shims();
 var import_react129 = __toESM(require_react(), 1);
 import process15 from "node:process";
-var debugLogger34 = createDebugLogger("SLASH_COMMAND_PROCESSOR");
+var debugLogger35 = createDebugLogger("SLASH_COMMAND_PROCESSOR");
 function hasUserPromptExpansionHooks(config) {
   return !!config && !config.getDisableAllHooks?.() && (config.hasHooksForEvent?.("UserPromptExpansion") ?? false);
 }
@@ -35124,18 +35173,6 @@ function serializeHistoryItemForRecording(item) {
   return clone;
 }
 __name(serializeHistoryItemForRecording, "serializeHistoryItemForRecording");
-var SLASH_COMMANDS_SKIP_RECORDING = /* @__PURE__ */ new Set([
-  "quit",
-  "exit",
-  "clear",
-  "reset",
-  "new",
-  "resume",
-  "delete",
-  "branch",
-  "btw",
-  "history"
-]);
 var SLASH_COMMAND_ROOTS_HIDE_INVOCATION = /* @__PURE__ */ new Set([
   "auth",
   "diff",
@@ -35694,7 +35731,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
         }
         setCommands(commandService.getCommandsForMode("interactive"));
       } catch (error) {
-        debugLogger34.error("Failed to load slash commands:", error);
+        debugLogger35.error("Failed to load slash commands:", error);
       } finally {
         if (!controller.signal.aborted) {
           resolveCommandReloads(reloadTrigger);
@@ -36126,7 +36163,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
                   }
                   invocationSentToModel = true;
                   if (invocationItemId !== void 0) {
-                    debugLogger34.debug(
+                    debugLogger35.debug(
                       `Marked slash command invocation as model-sent: /${resolvedCommandPath.join(
                         " "
                       )}`
@@ -36258,7 +36295,8 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
         if (config?.getChatRecordingService) {
           const chatRecorder = config.getChatRecordingService();
           const primaryCommand = resolvedCommandPath[0] || trimmed.replace(/^[/?]/, "").split(/\s+/u)[0] || trimmed;
-          const shouldRecord = !delegatedToRecursiveInvocation && !SLASH_COMMANDS_SKIP_RECORDING.has(primaryCommand);
+          const isBuiltInAdvisor = primaryCommand === "advisor" && commandToExecute?.kind === "built-in" /* BUILT_IN */;
+          const shouldRecord = !delegatedToRecursiveInvocation && !isBuiltInAdvisor && !SLASH_COMMANDS_SKIP_RECORDING.has(primaryCommand);
           try {
             if (shouldRecord) {
               chatRecorder?.recordSlashCommand({
@@ -36275,7 +36313,7 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
               });
             }
           } catch (recordError) {
-            debugLogger34.error(
+            debugLogger35.error(
               "[slashCommand] Failed to record slash command:",
               recordError
             );
@@ -36452,7 +36490,7 @@ import os5 from "node:os";
 import fs16 from "node:fs";
 var OUTPUT_UPDATE_INTERVAL_MS = 1e3;
 var MAX_OUTPUT_LENGTH = 1e4;
-var debugLogger35 = createDebugLogger("SHELL_COMMAND_PROCESSOR");
+var debugLogger36 = createDebugLogger("SHELL_COMMAND_PROCESSOR");
 function copyString(value) {
   return value.split("").join("");
 }
@@ -36603,7 +36641,7 @@ var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPend
             config.getShouldUseNodePtyShell(),
             shellExecutionConfig
           );
-          debugLogger35.debug(terminalHeight, terminalWidth);
+          debugLogger36.debug(terminalHeight, terminalWidth);
           executionPid = pid;
           if (pid) {
             setActiveShellPtyId(pid);
@@ -36757,7 +36795,7 @@ var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
 init_esbuild_shims();
 var import_react134 = __toESM(require_react(), 1);
 import * as path11 from "node:path";
-var debugLogger36 = createDebugLogger("REACT_TOOL_SCHEDULER");
+var debugLogger37 = createDebugLogger("REACT_TOOL_SCHEDULER");
 function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose, onToolResultFullTurnModel) {
   const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react134.useState)([]);
   const outputUpdateHandler = (0, import_react134.useCallback)(
@@ -36834,7 +36872,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;
+          debugLogger37.error(
+            `Tool scheduling failed: ${error instanceof Error ? error.message : String(error)}`
+          );
+        });
         return;
       }
       void (async () => {
@@ -36844,7 +36887,7 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
           });
           await scheduler.schedule(request, signal, runtimeView);
         } catch (error) {
-          debugLogger36.error(
+          debugLogger37.error(
             `Full-turn tool scheduling failed: ${error instanceof Error ? error.message : String(error)}`
           );
           const message = "Full-turn tool scheduling failed. The tool was not executed.";
@@ -36912,7 +36955,7 @@ function mapCoreStatusToDisplayStatus(coreStatus) {
       return "Pending" /* Pending */;
     default: {
       const exhaustiveCheck = coreStatus;
-      debugLogger36.warn(`Unknown core status encountered: ${exhaustiveCheck}`);
+      debugLogger37.warn(`Unknown core status encountered: ${exhaustiveCheck}`);
       return "Error" /* Error */;
     }
   }
@@ -37260,11 +37303,11 @@ function useMessageQueue() {
 __name(useMessageQueue, "useMessageQueue");
 
 // packages/cli/src/ui/hooks/useGeminiStream.ts
-var debugLogger37 = createDebugLogger("GEMINI_STREAM");
+var debugLogger38 = createDebugLogger("GEMINI_STREAM");
 function applyModelOverride(modelOverrideRef, inlineActiveRef, value, isInline) {
   modelOverrideRef.current = value;
   inlineActiveRef.current = isInline;
-  debugLogger37.debug(
+  debugLogger38.debug(
     `model override ${value === void 0 ? "cleared" : `set to ${value}`} (inline=${isInline})`
   );
 }
@@ -37473,20 +37516,20 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               expectedRevision: binding.permit.revision
             });
           } catch (error) {
-            debugLogger37.warn("Failed to pause invalid Goal tool batch", error);
+            debugLogger38.warn("Failed to pause invalid Goal tool batch", error);
           }
         }
         try {
           await config.getChatRecordingService()?.flush();
         } catch (error) {
-          debugLogger37.warn("Failed to flush invalid Goal tool batch", error);
+          debugLogger38.warn("Failed to flush invalid Goal tool batch", error);
         }
         const currentPermit = runtime.permitForTurn(binding.turnKey);
         if (currentPermit && sameGoalPermit(currentPermit, binding.permit)) {
           await runtime.finishTurn(binding.permit);
         }
       } catch (error) {
-        debugLogger37.warn("Failed to close invalid Goal tool batch", error);
+        debugLogger38.warn("Failed to close invalid Goal tool batch", error);
       } finally {
         releaseGoalTurn(binding);
       }
@@ -37500,7 +37543,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         const runtime = await config.getGoalRuntimeReady();
         await runtime.releaseTurn(turnKey);
       } catch (error) {
-        debugLogger37.warn(
+        debugLogger38.warn(
           `Failed to release undelivered Goal turn ${turnKey}`,
           error
         );
@@ -37542,6 +37585,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 +37699,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 +37720,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 +37871,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 +37888,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) {
@@ -37881,7 +37982,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (signal.aborted) {
         return { parts: null, shouldProceed: false };
       }
-      debugLogger37.debug("vision bridge: gate matched, running conversion");
+      debugLogger38.debug("vision bridge: gate matched, running conversion");
       const fullTurnModel = config.getDefaultVisionBridgeModel();
       if (fullTurnModel?.agentCapable) {
         const fullTurnParts = (Array.isArray(parts) ? parts : [parts]).map(
@@ -37906,7 +38007,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return { parts: fullTurnParts, shouldProceed: true };
       }
       const bridgeResult = await runVisionBridge({ config, parts, signal });
-      debugLogger37.debug(
+      debugLogger38.debug(
         `vision bridge: status=${bridgeResult.status} applied=${bridgeResult.applied} model=${bridgeResult.modelId ?? "(none)"}`
       );
       if (bridgeResult.status !== "skipped" || bridgeResult.egressOccurred) {
@@ -37931,7 +38032,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 +38072,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;
@@ -37991,7 +38096,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                     true
                   );
                 } else {
-                  debugLogger37.warn(
+                  debugLogger38.warn(
                     `ignoring model override '${slashCommandResult.modelOverride}': not a model on the active provider`
                   );
                 }
@@ -38228,8 +38333,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       setThought((prev) => {
         const incomingDescription = incoming.description ? clampLoadingThoughtDescription(incoming.description) : incoming.description;
         if (!prev) {
-          if (debugLogger37.isEnabled()) {
-            debugLogger37.debug(
+          if (debugLogger38.isEnabled()) {
+            debugLogger38.debug(
               `[THOUGHT_MERGE] New thought: subjectLength=${incoming.subject?.length ?? 0}, description length=${incomingDescription?.length ?? 0}`
             );
           }
@@ -38242,8 +38347,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         const description = clampLoadingThoughtDescription(
           `${prev.description ?? ""}${incomingDescription ?? ""}`
         );
-        if (debugLogger37.isEnabled()) {
-          debugLogger37.debug(
+        if (debugLogger38.isEnabled()) {
+          debugLogger38.debug(
             `[THOUGHT_MERGE] Accumulating thought: prev length=${prev.description?.length ?? 0}, incoming length=${incomingDescription?.length ?? 0}, total length=${description.length}`
           );
         }
@@ -38404,7 +38509,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         eventValue.error.message,
         formattedErrorText
       ).catch((err) => {
-        debugLogger37.warn(`StopFailure hook failed: ${err}`);
+        debugLogger38.warn(`StopFailure hook failed: ${err}`);
       });
     },
     [
@@ -38596,7 +38701,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 +38714,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 +38838,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) {
@@ -39006,7 +39115,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           duplicateProviderToolCallResponseIdsRef.current
         );
         if (repeatedDuplicateRequest?.providerCallId) {
-          debugLogger37.debug(
+          debugLogger38.debug(
             `[processGeminiStreamEvents] Dropping batch after repeated duplicate provider tool-call id: ${repeatedDuplicateRequest.providerCallId} (tool: ${repeatedDuplicateRequest.name})`
           );
           loopDetectedRef.current = true;
@@ -39027,7 +39136,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               duplicateProviderToolCallResponseIdsRef.current
             );
             const response = createDuplicateProviderToolCallResponse(request);
-            debugLogger37.debug(
+            debugLogger38.debug(
               `[processGeminiStreamEvents] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
             );
             dualOutput?.emitToolResult(request, response);
@@ -39056,12 +39165,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 +39435,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 +39468,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 +39524,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 +39547,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 +39570,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 +39578,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 +39625,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 +39715,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 +39745,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;
@@ -39622,8 +39776,17 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                   callId: request.callId,
                   toolName: request.name,
                   responseParts: response.responseParts,
-                  persistedOutputFiles: response.persistedOutputFiles
+                  persistedOutputFiles: response.persistedOutputFiles,
+                  artifacts: response.artifacts
                 })
+              ),
+              new Map(
+                immediateDuplicateToolResponses.responses.flatMap(
+                  ({ request }) => {
+                    const promptId = request.prompt_id ?? immediateDuplicateToolResponses.promptId;
+                    return promptId ? [[request.callId, promptId]] : [];
+                  }
+                )
               )
             );
             const responseParts = finalized.flatMap(
@@ -39638,6 +39801,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                     callId: request.callId,
                     status: response.error ? "error" : "success",
                     resultDisplay: response.resultDisplay,
+                    persistedOutputFiles: finalized[index].persistedOutputFiles,
+                    artifacts: finalized[index].artifacts,
                     error: response.error,
                     errorType: response.errorType,
                     executionStatus: response.executionStatus
@@ -39679,7 +39844,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           if (onComplete) {
             submitPromptOnCompleteRef.current = null;
             void onComplete().catch((err) => {
-              debugLogger37.error("onComplete callback failed:", err);
+              debugLogger38.error("onComplete callback failed:", err);
             });
           }
           if (geminiClient) {
@@ -39731,9 +39896,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 +39916,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 +39974,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       bindGoalTurn,
       failClosedGoalTurn,
       releaseUndeliveredGoalTurn,
+      retainSubmissionActivity,
       setSubmissionInFlight
     ]
   );
@@ -39843,7 +40031,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 "proceed_once" /* ProceedOnce */
               );
             } catch (error) {
-              debugLogger37.error(
+              debugLogger38.error(
                 `Failed to auto-approve tool call ${call.request.callId}:`,
                 error
               );
@@ -39872,7 +40060,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       );
       const dedupedCallIds = dedupedTools.map((tc) => tc.request.callId);
       if (dedupedCallIds.length > 0) {
-        debugLogger37.warn(
+        debugLogger38.warn(
           `[REPAIR] Dropping ${dedupedCallIds.length} late tool result(s) whose callId already has a functionResponse in history: ${dedupedCallIds.join(", ")}`
         );
         for (const tc of dedupedTools) {
@@ -39884,10 +40072,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 +40134,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;
         }
@@ -40049,11 +40338,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           memoryWriteCandidates,
           config.getProjectRoot()
         );
-        debugLogger37.debug(
+        debugLogger38.debug(
           `Checked marked context-file memory tool batch; matched=${matchedContextFileWrite}`
         );
         if (matchedContextFileWrite) {
-          debugLogger37.debug(
+          debugLogger38.debug(
             "Refreshing memory after context-file memory write"
           );
           await refreshMemoryInstruction(config, {
@@ -40064,7 +40353,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (newSuccessfulMemorySaves.length > 0) {
         if (!didRefreshManagedMemory) {
           void performMemoryRefresh().catch((err) => {
-            debugLogger37.warn(`save_memory refresh failed: ${err}`);
+            debugLogger38.warn(`save_memory refresh failed: ${err}`);
           });
         }
         newSuccessfulMemorySaves.forEach(
@@ -40072,9 +40361,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 +40374,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) {
@@ -40169,8 +40462,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           callId: request.callId,
           toolName: request.name,
           responseParts: response.responseParts,
-          persistedOutputFiles: response.persistedOutputFiles
-        }))
+          persistedOutputFiles: response.persistedOutputFiles,
+          artifacts: response.artifacts
+        })),
+        new Map(
+          orderedResponses.flatMap(
+            ({ request }) => request.prompt_id ? [[request.callId, request.prompt_id]] : []
+          )
+        )
       );
       const responsesToSend = finalizedResponses.flatMap(
         (entry) => entry.responseParts
@@ -40183,6 +40482,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             callId: request.callId,
             status,
             resultDisplay: response.resultDisplay,
+            persistedOutputFiles: finalizedResponses[index].persistedOutputFiles,
+            artifacts: finalizedResponses[index].artifacts,
             error: response.error,
             errorType: response.errorType,
             executionStatus: response.executionStatus
@@ -40193,7 +40494,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)
         );
@@ -40236,7 +40537,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       for (const toolCall of geminiTools) {
         if ("modelOverride" in toolCall.response) {
           if (inlineModelOverrideActiveRef.current || modelOverrideRef.current?.endsWith("\0")) {
-            debugLogger37.debug(
+            debugLogger38.debug(
               `skill-tool model override (${String(
                 toolCall.response.modelOverride
               )}) blocked: ${inlineModelOverrideActiveRef.current ? "inline override active" : "full-turn override active"}`
@@ -40283,10 +40584,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 +40682,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 +40708,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 +40728,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 +40746,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             "continuation_delivery_failed"
           );
         }, "onDeliveryFailed"),
-        goalBinding: toolGoalBinding
+        goalBinding: toolGoalBinding,
+        toolContinuationOwner: continuationOwner
       });
     },
     [
@@ -40463,6 +40766,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.
@@ -40604,7 +40910,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       try {
         await scheduler.enableDurable(cronSessionIdRef.current);
       } catch (err) {
-        debugLogger37.warn(
+        debugLogger38.warn(
           `Durable cron init failed \u2014 persistent tasks will not fire in this session: ${err}`
         );
       }
@@ -40755,7 +41061,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               setNotificationTrigger((n) => n + 1);
             }, "onGoalClaimDeferred")
           }).catch((error) => {
-            debugLogger37.warn("Failed to admit cron notification", error);
+            debugLogger38.warn("Failed to admit cron notification", error);
           });
           return;
         }
@@ -40788,7 +41094,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             setNotificationTrigger((n) => n + 1);
           }, "onGoalClaimDeferred")
         }).catch((error) => {
-          debugLogger37.warn("Failed to admit background notification", error);
+          debugLogger38.warn("Failed to admit background notification", error);
         });
       });
     }
@@ -40861,7 +41167,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             setTeammateTrigger((n) => n + 1);
           }, "onGoalClaimDeferred")
         }).catch((error) => {
-          debugLogger37.warn("Failed to admit teammate notification", error);
+          debugLogger38.warn("Failed to admit teammate notification", error);
         });
       });
     }
@@ -40900,7 +41206,7 @@ var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
 var MAX_COUNT = 9999;
 var DIGIT_1_TO_9 = /^[1-9]$/;
-var debugLogger38 = createDebugLogger("VIM_MODE");
+var debugLogger39 = createDebugLogger("VIM_MODE");
 var CMD_TYPES = {
   DELETE_WORD_FORWARD: "dw",
   DELETE_WORD_BACKWARD: "db",
@@ -41043,7 +41349,7 @@ function readClipboard() {
     }
     return "";
   } catch (e) {
-    debugLogger38.warn("readClipboard failed:", e);
+    debugLogger39.warn("readClipboard failed:", e);
     return "";
   }
 }
@@ -41089,7 +41395,7 @@ function writeClipboard(text) {
       const [bin, ...args] = linuxWriteCmd;
       const child = execFile7(bin, args, { timeout: 500 }, (err) => {
         if (err && !writeOsc52(text)) {
-          debugLogger38.warn(
+          debugLogger39.warn(
             "writeClipboard: cached tool and OSC 52 both failed"
           );
         }
@@ -41098,11 +41404,11 @@ function writeClipboard(text) {
       child.unref();
     } else {
       if (!writeOsc52(text)) {
-        debugLogger38.warn("OSC 52 clipboard write failed - no TTY available");
+        debugLogger39.warn("OSC 52 clipboard write failed - no TTY available");
       }
     }
   } catch (e) {
-    debugLogger38.warn("writeClipboard failed:", e);
+    debugLogger39.warn("writeClipboard failed:", e);
   }
 }
 __name(writeClipboard, "writeClipboard");
@@ -41817,7 +42123,7 @@ function useVim(buffer, onSubmit) {
       try {
         normalizedKey = normalizeKey(key);
       } catch (error) {
-        debugLogger38.warn("Malformed key input in vim mode:", key, error);
+        debugLogger39.warn("Malformed key input in vim mode:", key, error);
         return false;
       }
       const s = stateRef.current;
@@ -43150,7 +43456,7 @@ __name(useCommandMigration, "useCommandMigration");
 
 // packages/cli/src/services/notificationService.ts
 init_esbuild_shims();
-var debugLogger39 = createDebugLogger("NOTIFICATION_SERVICE");
+var debugLogger40 = createDebugLogger("NOTIFICATION_SERVICE");
 var DEFAULT_TITLE = "Qwen Code";
 function sendNotification(opts, terminal, enabled) {
   if (!enabled) {
@@ -43178,7 +43484,7 @@ function sendNotification(opts, terminal, enabled) {
         return "terminal_bell";
     }
   } catch (error) {
-    debugLogger39.warn("Failed to send notification:", error);
+    debugLogger40.warn("Failed to send notification:", error);
     return "error";
   }
 }
@@ -44130,7 +44436,7 @@ var import_jsx_runtime132 = __toESM(require_jsx_runtime(), 1);
 var MCP_BATCH_FLUSH_MS = 16;
 var STARTUP_PROFILE_FINALIZE_CAP_MS = 35e3;
 var CTRL_EXIT_PROMPT_DURATION_MS = 1e3;
-var debugLogger40 = createDebugLogger("APP_CONTAINER");
+var debugLogger41 = createDebugLogger("APP_CONTAINER");
 function isRenderModeToggleKey(key) {
   return keyMatchers["toggleRenderMode" /* TOGGLE_RENDER_MODE */](key) || key.name === "m" && key.meta && !key.ctrl && !key.paste;
 }
@@ -44282,7 +44588,7 @@ function useQueuedSubmissionDrain({
       }
     );
     void Promise.resolve(request).catch((error) => {
-      debugLogger40.warn("Queued submission failed during admission", error);
+      debugLogger41.warn("Queued submission failed during admission", error);
     }).finally(() => {
       queueDrainingRef.current = false;
       if (!admissionFailed) {
@@ -44524,7 +44830,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const staticExtraHeight = 3;
   (0, import_react162.useEffect)(() => {
     void loadLowlight().catch((err) => {
-      debugLogger40.warn(
+      debugLogger41.warn(
         `Failed to load lowlight chunk; code blocks will render as plain text: ${err instanceof Error ? err.message : String(err)}`
       );
     });
@@ -44606,9 +44912,9 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     registerCleanup(async () => {
       try {
         await config.getHookSystem()?.fireSessionEndEvent("prompt_input_exit" /* PromptInputExit */);
-        debugLogger40.debug("SessionEnd event completed successfully!!!");
+        debugLogger41.debug("SessionEnd event completed successfully!!!");
       } catch (err) {
-        debugLogger40.error(`SessionEnd hook failed: ${err}`);
+        debugLogger41.error(`SessionEnd hook failed: ${err}`);
       }
     });
     registerCleanup(async () => {
@@ -44634,7 +44940,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         flushTimer = null;
       }
       return geminiClient2.setTools().catch((err) => {
-        debugLogger40.error(
+        debugLogger41.error(
           `setTools() batch-flush failed: ${err instanceof Error ? err.message : String(err)}`
         );
       });
@@ -44652,7 +44958,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       failureSurfaced = true;
       const failedNames = typeof config.getFailedMcpServerNames === "function" ? config.getFailedMcpServerNames() : [];
       if (failedNames.length > 0) {
-        debugLogger40.warn(
+        debugLogger41.warn(
           `MCP server(s) failed to start: ${failedNames.join(", ")}. Continuing with built-in tools and any servers that did connect.`
         );
       }
@@ -45110,7 +45416,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         try {
           cancelOngoingRequestRef.current();
         } catch (error) {
-          debugLogger40.debug("Failed to cancel request while quitting:", error);
+          debugLogger41.debug("Failed to cancel request while quitting:", error);
         }
         setQuittingMessages(messages);
         config.getGeminiClient()?.requestShutdown();
@@ -45328,7 +45634,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         },
         Date.now()
       );
-      debugLogger40.debug(
+      debugLogger41.debug(
         `[DEBUG] Refreshed memory content in config: ${memoryContent.substring(
           0,
           200
@@ -45343,7 +45649,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         },
         Date.now()
       );
-      debugLogger40.error("Error refreshing memory:", error);
+      debugLogger41.error("Error refreshing memory:", error);
     }
   }, [config, historyManager, settings.merged]);
   const cancelHandlerRef = (0, import_react162.useRef)(() => {
@@ -45513,7 +45819,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         );
       });
       goalReservationSettlementRef.current = settlement.catch((error) => {
-        debugLogger40.warn(
+        debugLogger41.warn(
           `Failed to release queued Goal turns: ${getErrorMessage(error)}`
         );
       });
@@ -45704,14 +46010,14 @@ ${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);
+          debugLogger41.warn("Failed to admit /btw submission", error);
         });
         return;
       }
@@ -45805,7 +46111,7 @@ ${buildWorkflowSteeringNotice()}
             submittedPrompt === void 0 ? void 0 : { submittedPrompt }
           )
         ).catch((error) => {
-          debugLogger40.warn("Failed to admit slash command", error);
+          debugLogger41.warn("Failed to admit slash command", error);
         });
         return;
       }
@@ -45882,18 +46188,18 @@ ${currentText}` : popped.modelText
         geminiClient?.stripOrphanedUserEntriesFromHistory?.();
       }
       if (!draftWasEmpty) {
-        debugLogger40.debug("auto-restore bail: buffer was non-empty");
+        debugLogger41.debug("auto-restore bail: buffer was non-empty");
         return;
       }
       if (popped !== null) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore bail: queue had items (drained to buffer)"
         );
         return;
       }
       const cancelledTurnUserItem = info?.lastTurnUserItem;
       if (cancelledTurnUserItem == null) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore bail: cancelled turn did not add a user history item"
         );
         return;
@@ -45907,20 +46213,20 @@ ${currentText}` : popped.modelText
         buffer.setText(cancelledTurnUserItem.text);
       }, "restoreCancelledPrompt");
       if (pendingHistoryItems2.some((item) => item.type === "tool_group")) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore bail: tool execution is pending or committed"
         );
         return;
       }
       if (info?.turnProducedMeaningfulContent) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore: preserving streamed output and restoring prompt text"
         );
         restoreCancelledPrompt();
         return;
       }
       if (pendingHistoryItems2.some((item) => !isSyntheticHistoryItem(item))) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore bail: pending stream item has meaningful content"
         );
         return;
@@ -45928,11 +46234,11 @@ ${currentText}` : popped.modelText
       const history = historyRef.current;
       const lastUserIdx = findLastUserItemIndex(history);
       if (lastUserIdx === -1) {
-        debugLogger40.debug("auto-restore bail: no user item in history");
+        debugLogger41.debug("auto-restore bail: no user item in history");
         return;
       }
       if (!itemsAfterAreOnlySynthetic(history, lastUserIdx)) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore: preserving committed output and restoring prompt text"
         );
         restoreCancelledPrompt();
@@ -45940,18 +46246,18 @@ ${currentText}` : popped.modelText
       }
       const lastUserItem = history[lastUserIdx];
       if (lastUserItem.type !== "user") {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore bail: lastUserItem type narrowing failed (unexpected)"
         );
         return;
       }
       if (lastUserItem.id !== cancelledTurnUserItem.id || lastUserItem.text !== cancelledTurnUserItem.text) {
-        debugLogger40.debug(
+        debugLogger41.debug(
           "auto-restore bail: lastUserItem identity does not match cancelled-turn user item"
         );
         return;
       }
-      debugLogger40.debug(
+      debugLogger41.debug(
         "auto-restore: rewinding cancelled turn and restoring prompt"
       );
       historyManager.truncateToItem(lastUserItem.id);
@@ -45960,7 +46266,7 @@ ${currentText}` : popped.modelText
       geminiClient?.stripOrphanedUserEntriesFromHistory?.();
       if (info?.canUndoLastLoggedUserMessage) {
         void logger?.removeLastUserMessage().catch((err) => {
-          debugLogger40.debug("Failed to undo cancelled prompt from log:", err);
+          debugLogger41.debug("Failed to undo cancelled prompt from log:", err);
         });
       }
     },
@@ -46051,7 +46357,13 @@ ${currentText}` : popped.modelText
       suggestionAbortRef.current = ac;
       const conversationHistory = geminiClient.getHistoryTail(40, true);
       generatePromptSuggestion(config, conversationHistory, ac.signal, {
-        enableCacheSharing: settings.merged.ui?.enableCacheSharing === true
+        // On by default: the schema declares `default: true`, but
+        // `mergeSettings` doesn't apply schema defaults, so an unset value is
+        // `undefined` and a `=== true` gate left the cache-aware fork as dead
+        // code unless the flag was explicitly set (#9230). Same treatment as
+        // `enableFollowupSuggestions` above — only an explicit `false` opts
+        // out.
+        enableCacheSharing: settings.merged.ui?.enableCacheSharing !== false
       }).then((result) => {
         if (ac.signal.aborted) return;
         if (result.suggestion) {
@@ -46676,7 +46988,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
   const handleGlobalKeypress = (0, import_react162.useCallback)(
     (key) => {
       if (settings.merged.general?.debugKeystrokeLogging) {
-        debugLogger40.debug("[DEBUG] Keystroke:", JSON.stringify(key));
+        debugLogger41.debug("[DEBUG] Keystroke:", JSON.stringify(key));
       }
       if (keyMatchers["toggleThinkingExpanded" /* TOGGLE_THINKING_EXPANDED */](key)) {
         setThoughtExpanded((prev) => !prev);
@@ -46794,7 +47106,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
         );
         if (promotableShells.length === 1) {
           const executingShell = promotableShells[0];
-          debugLogger40.debug(
+          debugLogger41.debug(
             `Ctrl+B promote: matched executing shell tool call ${executingShell.request.callId}`
           );
           executingShell.promoteAbortController.abort({
@@ -46802,7 +47114,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
           });
           return;
         }
-        debugLogger40.debug(
+        debugLogger41.debug(
           `Ctrl+B promote: expected exactly one executing shell tool call; falling through (streamingState=${streamingState}, pendingToolCalls=${pendingToolCallsRef.current.length}, promotableShells=${promotableShells.length})`
         );
       }
@@ -47493,7 +47805,7 @@ __name(installSynchronizedOutput, "installSynchronizedOutput");
 
 // packages/cli/src/ui/startInteractiveUI.tsx
 var import_jsx_runtime133 = __toESM(require_jsx_runtime(), 1);
-var debugLogger41 = createDebugLogger("STARTUP");
+var debugLogger42 = createDebugLogger("STARTUP");
 var PRESSURE_CHECK_INTERVAL_MS = 3e4;
 async function startInteractiveUI(config, settings, startupWarnings, workspaceRoot = process.cwd(), initializationResult, options = {}) {
   const version = await getCliVersion();
@@ -47531,7 +47843,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
       );
     }
   } catch (err) {
-    debugLogger41.error("Failed to initialize dual output bridge:", err);
+    debugLogger42.error("Failed to initialize dual output bridge:", err);
     writeStderrLine(
       `Warning: dual output disabled \u2014 ${err instanceof Error ? err.message : String(err)}`
     );
@@ -47542,7 +47854,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     try {
       remoteInputWatcher = new RemoteInputWatcher(inputFile);
     } catch (err) {
-      debugLogger41.error("Failed to initialize remote input watcher:", err);
+      debugLogger42.error("Failed to initialize remote input watcher:", err);
       writeStderrLine(
         `Warning: remote input disabled \u2014 ${err instanceof Error ? err.message : String(err)}`
       );
@@ -47593,7 +47905,7 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     {
       recordForExitEcho: true,
       onError: (error, info) => {
-        debugLogger41.error(
+        debugLogger42.error(
           `[FATAL_RENDER_ERROR] ${error.message}
 ${info.componentStack ?? ""}
 ${error.stack ?? ""}`
@@ -47671,6 +47983,14 @@ qwen --resume ${sessionId}`
     } catch {
     }
   });
+  config.trackSessionRegistration(
+    registerSession({
+      sessionId: config.getSessionId(),
+      cwd: config.getTargetDir(),
+      qwenVersion: version
+    })
+  );
+  registerCleanup(() => config.unregisterSessionRegistry());
 }
 __name(startInteractiveUI, "startInteractiveUI");
 function setWindowTitle(settings, folderName) {