@qwen-code/qwen-code 0.20.0 → 0.20.1-nightly.20260724.7d17c44a3

package/chunks/{startInteractiveUI-3RGTGEX5.js → startInteractiveUI-BXWQUXAS.js}

@@ -1,15 +1,75 @@
 // Force strict mode and setup for ESM
 "use strict";
+import {
+  classifyApiError
+} from "./chunk-V7RNNPGC.js";
+import {
+  buildPermissionSuggestions
+} from "./chunk-43T5WDQ7.js";
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-O3OCNYY5.js";
+} from "./chunk-PDYB7HG2.js";
+import {
+  MAX_SUGGESTIONS_TO_SHOW,
+  buildMcpResourceRef,
+  buildMcpServerRef,
+  getExtensionSuggestions,
+  handleAtCommand,
+  matchMcpServerPrefix,
+  resolveAtCommandQuery,
+  sanitizeDisplayText
+} from "./chunk-F5MBYZSU.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-4EP2PYYL.js";
+} from "./chunk-2G6QIHYL.js";
+import {
+  BuiltinCommandLoader,
+  BundledSkillLoader,
+  CommandService,
+  DISPLAY_HOOK_EVENTS,
+  FileCommandLoader,
+  MAX_STACKED_SKILLS,
+  McpPromptLoader,
+  SavedWorkflowLoader,
+  SkillCommandLoader,
+  addConfigToMatcherGroup,
+  appendUserPromptExpansionAdditionalContext,
+  copyToClipboard,
+  createEmptyHookEventInfo,
+  findMidInputSlashCommand,
+  findSlashCommandTokens,
+  formatApprovalModeDescription,
+  formatApprovalModeName,
+  formatUserPromptExpansionBlockedMessage,
+  getAllConfigs,
+  getBestSlashCommandMatch,
+  getTranslatedSourceDisplayMap,
+  hasBlockingBackgroundWork,
+  hasSlashCommandPathSeparator,
+  isAtCommand,
+  isBtwCommand,
+  isMidInputCompletableCommand,
+  isSlashCommand,
+  normalizePartList,
+  parseSlashCommand,
+  parseStackedSlashCommands,
+  refreshExtensionContentRuntime,
+  resetBackgroundStateForSessionSwitch,
+  serializeUserPromptExpansionPrompt,
+  supportsMatchers
+} from "./chunk-BW5Z5NOG.js";
+import "./chunk-BJBUDCM3.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-DBE4QFZS.js";
+} from "./chunk-MB7ENXPR.js";
+import {
+  EXTENSION_RELOAD_FAILED_REASON,
+  ExtensionRefreshState,
+  appEvents,
+  cleanupReviewWorktreeLeases,
+  loadHierarchicalGeminiMemory
+} from "./chunk-JKCALGYN.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -85,7 +145,21 @@ import {
   useTextBuffer,
   useUIActions,
   useUIState
-} from "./chunk-TMQ6XQCX.js";
+} from "./chunk-CK3IEEHR.js";
+import {
+  getCommandDisplayName,
+  getCommandSourceBadge
+} from "./chunk-SJEDL7DI.js";
+import {
+  computeSessionStats,
+  levelLabel
+} from "./chunk-UH7242DI.js";
+import "./chunk-4WGODMVR.js";
+import {
+  MaxSizedBox,
+  OverflowProvider,
+  useOverflowState
+} from "./chunk-UCOJC6EB.js";
 import {
   GeminiRespondingSpinner,
   GeminiSpinner,
@@ -98,87 +172,28 @@ import {
   expandCollapsedHistory,
   isCollapsibleTool,
   useStreamingContext
-} from "./chunk-PF4CHQOJ.js";
+} from "./chunk-Q6GU6TKM.js";
+import {
+  theme
+} from "./chunk-6IL7KRLE.js";
 import {
   stopAndGetCapturedInput
-} from "./chunk-5SCI6E3E.js";
+} from "./chunk-E4IMU4Y5.js";
+import {
+  disableKittyProtocol,
+  isKittyProtocolEnabled,
+  isKittyProtocolSupported,
+  pushKittyProtocolFlags
+} from "./chunk-PQNHRFJC.js";
 import {
   useAutoAcceptIndicator
-} from "./chunk-FQD7GFSV.js";
+} from "./chunk-HJJDKFL5.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-O3Z73NBP.js";
-import {
-  classifyApiError
-} from "./chunk-V7RNNPGC.js";
-import {
-  MAX_SUGGESTIONS_TO_SHOW,
-  buildMcpResourceRef,
-  buildMcpServerRef,
-  getExtensionSuggestions,
-  handleAtCommand,
-  matchMcpServerPrefix,
-  resolveAtCommandQuery,
-  sanitizeDisplayText
-} from "./chunk-IVPSS6EL.js";
-import {
-  BuiltinCommandLoader,
-  BundledSkillLoader,
-  CommandService,
-  DISPLAY_HOOK_EVENTS,
-  FileCommandLoader,
-  MAX_STACKED_SKILLS,
-  McpPromptLoader,
-  SavedWorkflowLoader,
-  SkillCommandLoader,
-  addConfigToMatcherGroup,
-  appendUserPromptExpansionAdditionalContext,
-  copyToClipboard,
-  createEmptyHookEventInfo,
-  findMidInputSlashCommand,
-  findSlashCommandTokens,
-  formatApprovalModeDescription,
-  formatApprovalModeName,
-  formatUserPromptExpansionBlockedMessage,
-  getAllConfigs,
-  getBestSlashCommandMatch,
-  getTranslatedSourceDisplayMap,
-  hasBlockingBackgroundWork,
-  hasSlashCommandPathSeparator,
-  isAtCommand,
-  isBtwCommand,
-  isMidInputCompletableCommand,
-  isSlashCommand,
-  normalizePartList,
-  parseSlashCommand,
-  parseStackedSlashCommands,
-  refreshExtensionContentRuntime,
-  resetBackgroundStateForSessionSwitch,
-  serializeUserPromptExpansionPrompt,
-  supportsMatchers
-} from "./chunk-PBWEWI4N.js";
-import {
-  EXTENSION_RELOAD_FAILED_REASON,
-  ExtensionRefreshState,
-  appEvents,
-  loadHierarchicalGeminiMemory
-} from "./chunk-4XNLIGVA.js";
-import {
-  getCommandDisplayName,
-  getCommandSourceBadge
-} from "./chunk-HZPN55E5.js";
-import {
-  computeSessionStats,
-  levelLabel
-} from "./chunk-2LL7TXB4.js";
-import {
-  disableKittyProtocol,
-  isKittyProtocolEnabled,
-  isKittyProtocolSupported
-} from "./chunk-5DTTYNB7.js";
+} from "./chunk-RW2NEXYJ.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -192,27 +207,10 @@ import {
   saveClipboardImage,
   wrapForMultiplexer,
   writeOsc52
-} from "./chunk-QKYTTBYW.js";
-import "./chunk-A5LYNIW7.js";
-import "./chunk-4WGODMVR.js";
-import "./chunk-ANPINBOF.js";
-import "./chunk-KW7NOTN6.js";
-import {
-  MaxSizedBox,
-  OverflowProvider,
-  useOverflowState
-} from "./chunk-JNWZQ27S.js";
-import {
-  theme
-} from "./chunk-GMGDLUC7.js";
+} from "./chunk-4LVZNIDO.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
-import {
-  AUTO_THEME_NAME,
-  DEFAULT_THEME,
-  themeManager
-} from "./chunk-AYCDXHZB.js";
 import {
   Box_default,
   Static,
@@ -226,33 +224,40 @@ import {
   use_is_screen_reader_enabled_default,
   use_stdin_default,
   use_stdout_default
-} from "./chunk-NEEB7UEN.js";
-import {
-  require_react
-} from "./chunk-5QWWOFGG.js";
-import "./chunk-KDC6GNQR.js";
-import "./chunk-542SK7KV.js";
-import "./chunk-NHDKSOEY.js";
+} from "./chunk-6GMVPFB2.js";
 import {
   relaunchApp
-} from "./chunk-AJSJ5TTU.js";
+} from "./chunk-LP2E4MQG.js";
 import {
   setUpdateHandler
-} from "./chunk-OEO2ERWK.js";
-import "./chunk-KG3XV6FH.js";
-import "./chunk-S2W2LVDU.js";
+} from "./chunk-Z44CVEUF.js";
+import "./chunk-H4YKEV2X.js";
+import {
+  AUTO_THEME_NAME,
+  DEFAULT_THEME,
+  themeManager
+} from "./chunk-7Z6JQEL6.js";
+import "./chunk-KW7NOTN6.js";
+import {
+  require_react
+} from "./chunk-5QWWOFGG.js";
+import "./chunk-LEEWLFHW.js";
+import {
+  getErrorMessage as getErrorMessage2
+} from "./chunk-JYUSL2V4.js";
+import "./chunk-T3452DP5.js";
+import "./chunk-WHFK6G6U.js";
 import "./chunk-YAF2MQZ6.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-GKY2OJ7R.js";
+} from "./chunk-MOHAWVLH.js";
 import {
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-PGEPSDJI.js";
-import "./chunk-KTUQMDEP.js";
-import "./chunk-D22SX43D.js";
+} from "./chunk-FWNZ7CVN.js";
+import "./chunk-4K7VDKAD.js";
 import {
   cpLen,
   cpSlice,
@@ -264,70 +269,71 @@ import {
   sanitizeTerminalText,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-RS7MT2QG.js";
+} from "./chunk-IPUUTYMV.js";
+import "./chunk-DWNZ6PVQ.js";
 import {
   stringWidth
-} from "./chunk-H2XVO6NE.js";
+} from "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import {
   isHistoryItemVisibleAfterRestore
 } from "./chunk-QTERJVPZ.js";
-import "./chunk-L573Z2QZ.js";
+import "./chunk-3Z43GZUQ.js";
+import {
+  assertVoiceBaseUrlNetworkAllowed,
+  isKeytermEcho,
+  isStreamingVoiceModel,
+  resolveVoiceStreamConfig,
+  transcribeVoiceAudio
+} from "./chunk-3FB2Y2OE.js";
+import {
+  formatUnsupportedVoiceModelMessage,
+  isSelectableVoiceModel
+} from "./chunk-KJEMJWNH.js";
+import "./chunk-QLJUC7TG.js";
 import "./chunk-RXFQM6FQ.js";
-import "./chunk-KOR3XKCA.js";
+import "./chunk-PBII2NFX.js";
 import "./chunk-6H67XLET.js";
 import {
-  getErrorMessage as getErrorMessage2
-} from "./chunk-VEXFOTEO.js";
+  createLoadedSettingsAdapter
+} from "./chunk-LA5H3LM5.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-NDMQLV4Y.js";
+} from "./chunk-LBAO2XRA.js";
 import {
   formatDuration,
   formatMemoryUsage,
   formatRelativeTime,
   formatTokenCount
 } from "./chunk-E5Z2AVNV.js";
+import "./chunk-BLFVGB7D.js";
+import "./chunk-COH43MRJ.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-NGFEPAE6.js";
-import {
-  assertVoiceBaseUrlNetworkAllowed,
-  isKeytermEcho,
-  isStreamingVoiceModel,
-  resolveVoiceStreamConfig,
-  transcribeVoiceAudio
-} from "./chunk-IR46U7RB.js";
-import {
-  formatUnsupportedVoiceModelMessage,
-  isSelectableVoiceModel
-} from "./chunk-S2PD3EZD.js";
-import "./chunk-BVLROR2T.js";
-import "./chunk-6RLROE6G.js";
-import "./chunk-COH43MRJ.js";
-import "./chunk-CB2HFGRV.js";
+} from "./chunk-WLEFWSSC.js";
+import "./chunk-PFSUKTZH.js";
+import "./chunk-UJV643E2.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-MJ6S23WZ.js";
+} from "./chunk-HZEWYOVI.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-YWEW33JY.js";
-import "./chunk-4ODB7WIB.js";
+import "./chunk-HVO55LUD.js";
+import "./chunk-QAFKR7WR.js";
 import "./chunk-V6WHFGST.js";
-import {
-  createLoadedSettingsAdapter
-} from "./chunk-CZF3E5GF.js";
-import "./chunk-W7FJ3N32.js";
-import "./chunk-Y2ENGUD6.js";
-import "./chunk-TJTKSVIV.js";
+import "./chunk-DP3IHZGG.js";
+import "./chunk-BSNWBC33.js";
+import "./chunk-2RFKHEXL.js";
+import "./chunk-UPF7PTBI.js";
+import "./chunk-JLU636DO.js";
+import "./chunk-BK2UNYWD.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-RFIAR4YL.js";
-import "./chunk-2HOVDT7W.js";
-import "./chunk-NIJEXGV6.js";
+import "./chunk-RV4C2ZFG.js";
+import "./chunk-ZXYUQXY5.js";
 import "./chunk-UDXSXLER.js";
 import {
   loadMcpApprovals
-} from "./chunk-7SXZC7ID.js";
+} from "./chunk-2WTVWAKT.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -350,7 +356,7 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-33XUAINQ.js";
+} from "./chunk-J5UKQEFG.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
@@ -359,17 +365,17 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-TKLLK6XQ.js";
-import "./chunk-TIH2ZTOC.js";
+} from "./chunk-ZT4POVWC.js";
+import "./chunk-32A4PI3E.js";
 import "./chunk-QRUIS3DN.js";
 import {
   getCliVersion
-} from "./chunk-OWCALFEG.js";
+} from "./chunk-54R2CV2G.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-I2PYAYFM.js";
+} from "./chunk-CXUFILV3.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -430,6 +436,7 @@ import {
   detectAutonomousSentinel,
   fetchGitDiff,
   fetchGitDiffHunks,
+  finalizeToolResponses,
   findExistingProviderModels,
   findProviderByCredentials,
   findProviderById,
@@ -444,7 +451,6 @@ import {
   getExtensionDisplayName,
   getGitBranch,
   getProjectSummaryInfo,
-  getStartupContextLength,
   getTimeRangeBounds,
   getToolResponseDisplayText,
   getWelcomeBackState,
@@ -457,7 +463,6 @@ import {
   isSessionRuntimeActive,
   isSettledStatus,
   isSuccessStatus,
-  isSystemReminderContent,
   isTerminalStatus,
   loadUsageHistory,
   markDuplicateProviderToolCallResponseSent,
@@ -476,7 +481,6 @@ import {
   resolveBaseUrl,
   resolveBranchName,
   resolveMetadataKey,
-  resolveModelId,
   restoreWorktreeContext,
   saveWelcomeBackRestartChoice,
   saveWorkflowScript,
@@ -488,44 +492,67 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-KX6UK4VJ.js";
+} from "./chunk-LI4I37W4.js";
 import "./chunk-5M6IDOMF.js";
-import "./chunk-T4TZQJ7W.js";
+import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
-import "./chunk-EAUYY7SS.js";
-import "./chunk-FSL5W5TI.js";
-import "./chunk-OONJNQ42.js";
-import "./chunk-D2VIDMVM.js";
-import "./chunk-E2UVIFI2.js";
-import "./chunk-XU457J4V.js";
+import "./chunk-NOAAFNTJ.js";
+import "./chunk-AFFGGOF6.js";
+import "./chunk-RGG6M2WF.js";
+import "./chunk-X6N25LXS.js";
+import "./chunk-KRXPRVGL.js";
+import "./chunk-6PVPNMXU.js";
+import {
+  resolveModelId
+} from "./chunk-UO7DCGEV.js";
+import "./chunk-IRH27ZC2.js";
 import "./chunk-VDDGDZMA.js";
-import "./chunk-EIAK6Q2B.js";
+import "./chunk-C3VHAXP2.js";
 import "./chunk-SZRN75WQ.js";
 import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
 import {
-  APPROVAL_MODES
-} from "./chunk-CPCVCKKF.js";
+  APPROVAL_MODES,
+  getStartupContextLength,
+  isSystemReminderContent,
+  runOutsideAgentContext
+} from "./chunk-XAWJ2526.js";
 import "./chunk-6AM5D4ME.js";
-import "./chunk-G45X5TRN.js";
+import "./chunk-NABLFI57.js";
 import {
   HOOKS_CONFIG_FIELDS
-} from "./chunk-PBATSWUQ.js";
+} from "./chunk-QBUDF33N.js";
+import "./chunk-JCW2R7WC.js";
 import {
   isPathWithinRoot
-} from "./chunk-ZEOZL37W.js";
-import "./chunk-OOCI5VVU.js";
+} from "./chunk-57FIIFJN.js";
+import "./chunk-LIZRAKPB.js";
 import {
   qwenOAuth2Events
-} from "./chunk-BRRF37CO.js";
-import "./chunk-BMWMT5Y2.js";
+} from "./chunk-LYTBLSSW.js";
+import "./chunk-WI3KCKZ5.js";
+import "./chunk-DP5GT2MW.js";
 import "./chunk-JESCGQM3.js";
+import {
+  REASONING_EFFORT_TIERS
+} from "./chunk-XVNQMZ2I.js";
+import {
+  getUnsupportedImageFormatWarning,
+  isSupportedImageMimeType
+} from "./chunk-FODK6UMO.js";
+import "./chunk-GLNBDYUX.js";
+import "./chunk-DJ2GSRLV.js";
+import "./chunk-R6D2CTQR.js";
+import "./chunk-AXUW635Q.js";
+import "./chunk-BPJSQIJX.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-6QHAUJUE.js";
+import "./chunk-LS77BEZP.js";
 import {
   ApiCancelEvent,
   AuthEvent,
   ConversationFinishedEvent,
   DiscoveredMCPTool,
-  MAINLINE_CODER_MODEL,
   ModelSlashCommandEvent,
   PromptSuggestionEvent,
   SpeculationEvent,
@@ -561,9 +588,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-ZFKNWQGQ.js";
-import "./chunk-4WKAA4KS.js";
-import "./chunk-CR3C7WXL.js";
+} from "./chunk-IFG6TYJ2.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
@@ -571,35 +596,30 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-JD3MKVKL.js";
-import "./chunk-UEY4AYUL.js";
+} from "./chunk-4K56OJFJ.js";
+import {
+  MAINLINE_CODER_MODEL
+} from "./chunk-36HSVBBU.js";
+import "./chunk-46UV252V.js";
+import "./chunk-A4UCTEB5.js";
+import "./chunk-XWRJCPHC.js";
+import {
+  DEFAULT_TOKEN_LIMIT
+} from "./chunk-UW5EOVUN.js";
+import "./chunk-NBQDBANR.js";
+import "./chunk-QNLNLENL.js";
 import {
   atomicWriteFileSync
-} from "./chunk-BDBMYST4.js";
-import "./chunk-EZVDJFZ7.js";
+} from "./chunk-6X4GWOPW.js";
+import "./chunk-PKL3HGNZ.js";
+import "./chunk-HTR4WV6U.js";
+import "./chunk-BULDBTYC.js";
+import "./chunk-U7ZFW55U.js";
+import "./chunk-ERLGR7GI.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-OP4MOGXF.js";
-import {
-  REASONING_EFFORT_TIERS
-} from "./chunk-XVNQMZ2I.js";
-import {
-  getUnsupportedImageFormatWarning,
-  isSupportedImageMimeType
-} from "./chunk-FEOZBUMT.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-6EFTQYW7.js";
-import {
-  DEFAULT_TOKEN_LIMIT
-} from "./chunk-MAQQGNQ5.js";
-import "./chunk-A4UCTEB5.js";
-import "./chunk-XWRJCPHC.js";
-import {
-  FinishReason
-} from "./chunk-TYQMGACW.js";
-import "./chunk-TYAMGABM.js";
-import "./chunk-FCMNKVXT.js";
+} from "./chunk-P5RRUHL7.js";
 import {
   Storage,
   UnauthorizedError,
@@ -611,21 +631,27 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-C27BYUX6.js";
-import "./chunk-VZQUV7VK.js";
+} from "./chunk-OQB4EXO4.js";
+import "./chunk-CKTMY3EP.js";
+import {
+  registerCleanup,
+  runExitCleanup
+} from "./chunk-EL2IQ2S5.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
 } from "./chunk-QSWDGAIC.js";
 import "./chunk-Q7YDKOGY.js";
-import {
-  registerCleanup,
-  runExitCleanup
-} from "./chunk-DP5GXXNZ.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-TB6UDU4T.js";
+import {
+  FinishReason
+} from "./chunk-22C7BQ6D.js";
+import "./chunk-TYAMGABM.js";
+import "./chunk-FCMNKVXT.js";
+import "./chunk-AMDSOFFV.js";
+import "./chunk-THJNPLI4.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -637,7 +663,7 @@ import {
 // packages/cli/src/ui/startInteractiveUI.tsx
 init_esbuild_shims();
 import { basename as basename4 } from "node:path";
-var import_react166 = __toESM(require_react(), 1);
+var import_react167 = __toESM(require_react(), 1);
 
 // packages/cli/src/dualOutput/DualOutputBridge.ts
 init_esbuild_shims();
@@ -830,7 +856,7 @@ var DualOutputBridge = class {
    * Emits a `can_use_tool` permission request so an external consumer can
    * approve or deny the tool call. Pairs with {@link emitControlResponse}.
    */
-  emitPermissionRequest(requestId, toolName, toolUseId, input, blockedPath = null) {
+  emitPermissionRequest(requestId, toolName, toolUseId, input, blockedPath = null, permissionSuggestions = null) {
     if (!this.active) return;
     this.disableIfBufferOverflowed();
     if (!this.active) return;
@@ -840,7 +866,8 @@ var DualOutputBridge = class {
         toolName,
         toolUseId,
         input,
-        blockedPath
+        blockedPath,
+        permissionSuggestions
       );
     } catch (err) {
       debugLogger.error("DualOutput emitPermissionRequest error:", err);
@@ -1252,7 +1279,7 @@ var useRemoteInput = /* @__PURE__ */ __name(() => (0, import_react2.useContext)(
 
 // packages/cli/src/ui/AppContainer.tsx
 init_esbuild_shims();
-var import_react164 = __toESM(require_react(), 1);
+var import_react165 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/App.tsx
 init_esbuild_shims();
@@ -1382,30 +1409,15 @@ var useAppContext = /* @__PURE__ */ __name(() => {
   return context;
 }, "useAppContext");
 
-// packages/cli/src/ui/components/UpdateNotification.tsx
-init_esbuild_shims();
-var import_jsx_runtime3 = __toESM(require_jsx_runtime(), 1);
-var UpdateNotification = /* @__PURE__ */ __name(({ message }) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-  Box_default,
-  {
-    borderStyle: "round",
-    borderColor: theme.status.warning,
-    paddingX: 1,
-    marginY: 1,
-    children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color: theme.status.warning, children: message })
-  }
-), "UpdateNotification");
-
 // packages/cli/src/ui/components/Notifications.tsx
-var import_jsx_runtime4 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime3 = __toESM(require_jsx_runtime(), 1);
 var Notifications = /* @__PURE__ */ __name(() => {
   const { startupWarnings } = useAppContext();
-  const { initError, streamingState, updateInfo } = useUIState();
+  const { initError, streamingState } = useUIState();
   const showStartupWarnings = startupWarnings.length > 0;
   const showInitError = initError && streamingState !== "responding" /* Responding */;
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
-    updateInfo && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(UpdateNotification, { message: updateInfo.message }),
-    showStartupWarnings && /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
+    showStartupWarnings && /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       Box_default,
       {
         borderStyle: "round",
@@ -1413,10 +1425,10 @@ var Notifications = /* @__PURE__ */ __name(() => {
         paddingX: 1,
         marginY: 1,
         flexDirection: "column",
-        children: startupWarnings.map((warning, index) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Text, { color: theme.status.warning, children: warning }, index))
+        children: startupWarnings.map((warning, index) => /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(Text, { color: theme.status.warning, children: warning }, index))
       }
     ),
-    showInitError && /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
+    showInitError && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
       Box_default,
       {
         borderStyle: "round",
@@ -1424,11 +1436,11 @@ var Notifications = /* @__PURE__ */ __name(() => {
         paddingX: 1,
         marginBottom: 1,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: theme.status.error, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { color: theme.status.error, children: [
             "Initialization Error: ",
             initError
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(Text, { color: theme.status.error, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(Text, { color: theme.status.error, children: [
             " ",
             "Please check API key and configuration."
           ] })
@@ -1438,6 +1450,20 @@ var Notifications = /* @__PURE__ */ __name(() => {
   ] });
 }, "Notifications");
 
+// packages/cli/src/ui/components/UpdateNotification.tsx
+init_esbuild_shims();
+var import_jsx_runtime4 = __toESM(require_jsx_runtime(), 1);
+var UpdateNotification = /* @__PURE__ */ __name(({ message }) => /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+  Box_default,
+  {
+    borderStyle: "round",
+    borderColor: theme.status.warning,
+    paddingX: 1,
+    marginY: 1,
+    children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Text, { color: theme.status.warning, children: message })
+  }
+), "UpdateNotification");
+
 // packages/cli/src/ui/components/MainContent.tsx
 init_esbuild_shims();
 var import_react14 = __toESM(require_react(), 1);
@@ -2268,10 +2294,15 @@ function isSyntheticHistoryItem(item) {
     case "stop_hook_loop":
     case "stop_hook_system_message":
       return true;
+    // Steer messages (mid-turn user injections) are typed 'user' but
+    // carry sentToModel === false; treat them as synthetic so the
+    // cancel handler can still do a full rewind when only a steer
+    // follows the real prompt.
+    case "user":
+      return item.sentToModel === false;
     // Meaningful: user input, model text, tool runs, slash-command
     // results the user explicitly asked for. Auto-restore must bail
     // when any of these appear after the candidate user prompt.
-    case "user":
     case "user_shell":
     case "gemini":
     case "gemini_content":
@@ -2315,11 +2346,18 @@ function itemsAfterAreOnlySynthetic(history, fromIndex) {
 __name(itemsAfterAreOnlySynthetic, "itemsAfterAreOnlySynthetic");
 function findLastUserItemIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
-    if (history[i].type === "user") return i;
+    const item = history[i];
+    if (item.type === "user" && item.sentToModel !== false) return i;
   }
   return -1;
 }
 __name(findLastUserItemIndex, "findLastUserItemIndex");
+function realUserPromptTexts(history) {
+  return history.filter(
+    (item) => item.type === "user" && item.sentToModel !== false && typeof item.text === "string" && item.text.trim() !== ""
+  ).map((item) => item.text);
+}
+__name(realUserPromptTexts, "realUserPromptTexts");
 function buildThoughtHeadIdMap(items) {
   const map = /* @__PURE__ */ new Map();
   for (let i = 0; i < items.length; i++) {
@@ -2975,9 +3013,9 @@ function VirtualizedList(props, ref) {
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { width: 1, flexDirection: "column", flexShrink: 0, children: Array.from({ length: trackLen }, (_, i) => {
       const inThumb = i >= thumbTop && i < thumbTop + thumbLen;
       if (!scrollbarThumbActive) {
-        return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { children: " " }, i);
+        return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { selectable: false, children: " " }, i);
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { dimColor: !inThumb, children: inThumb ? "\u2588" : "\u2502" }, i);
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { dimColor: !inThumb, selectable: false, children: inThumb ? "\u2588" : "\u2502" }, i);
     }) });
   }, [
     showScrollbar,
@@ -3275,24 +3313,79 @@ function getSelectedText(frame, selection) {
     return "";
   }
   const { sx, sy, ex, ey } = selection;
-  const lines = [];
+  let text = "";
   for (let y = sy; y <= ey; y++) {
     const row = frame.cells[y];
     if (!row) {
-      lines.push("");
+      if (y < ey) {
+        text += "\n";
+      }
       continue;
     }
     const startX = y === sy ? sx : 0;
     const endX = y === ey ? ex : row.length - 1;
-    let text = "";
     for (let x = Math.max(0, startX); x <= endX && x < row.length; x++) {
-      text += row[x].value;
+      if (row[x].selectable) {
+        text += row[x].value;
+      }
+    }
+    if (y < ey) {
+      text += boundaryJoiner(frame, selection, y);
     }
-    lines.push(text.replace(/\s+$/u, ""));
   }
-  return lines.join("\n");
+  return text;
 }
 __name(getSelectedText, "getSelectedText");
+function selectedFlows(frame, selection, y) {
+  const row = frame.cells[y] ?? [];
+  const startX = y === selection.sy ? selection.sx : 0;
+  const endX = y === selection.ey ? selection.ex : row.length - 1;
+  const flows = /* @__PURE__ */ new Set();
+  for (let x = Math.max(0, startX); x <= endX && x < row.length; x++) {
+    const cell = row[x];
+    if (cell.selectable && cell.flowId !== null) {
+      flows.add(cell.flowId);
+    }
+  }
+  if (flows.size > 0) {
+    return flows;
+  }
+  for (const boundaryY of [y - 1, y]) {
+    const boundaryRow = frame.boundaries[boundaryY] ?? [];
+    for (let x = Math.max(0, startX); x <= endX && x < boundaryRow.length; x++) {
+      const claim = boundaryRow[x];
+      if (claim?.selectable) {
+        flows.add(claim.flowId);
+      }
+    }
+  }
+  return flows;
+}
+__name(selectedFlows, "selectedFlows");
+function boundaryJoiner(frame, selection, y) {
+  const currentFlows = selectedFlows(frame, selection, y);
+  const nextFlows = selectedFlows(frame, selection, y + 1);
+  const [currentFlow] = currentFlows;
+  const [nextFlow] = nextFlows;
+  if (currentFlows.size !== 1 || nextFlows.size !== 1 || currentFlow !== nextFlow) {
+    return "\n";
+  }
+  const flowId = currentFlow;
+  const claims = (frame.boundaries[y] ?? []).filter(
+    (claim) => claim !== null && claim.selectable && claim.flowId === flowId
+  );
+  if (claims.length === 0) {
+    return "\n";
+  }
+  const first = claims[0];
+  if (claims.some(
+    (claim) => claim.kind !== first.kind || claim.joiner !== first.joiner
+  )) {
+    return "\n";
+  }
+  return first.kind === "soft" ? first.joiner : "\n";
+}
+__name(boundaryJoiner, "boundaryJoiner");
 
 // packages/cli/src/ui/selection/selection-span.ts
 init_esbuild_shims();
@@ -3633,7 +3726,7 @@ var MainContent = /* @__PURE__ */ __name(() => {
         addSourceBlockCounts(runningOffsets, item.text);
         return { item, sourceCopyIndexOffsets: offsets };
       }
-      if (item.type === "user") {
+      if (item.type === "user" && item.sentToModel !== false) {
         runningOffsets = createEmptySourceCopyOffsets();
       }
       return { item, sourceCopyIndexOffsets: void 0 };
@@ -3657,7 +3750,7 @@ var MainContent = /* @__PURE__ */ __name(() => {
         addSourceBlockCounts(runningOffsets, item.text);
         return { item, sourceCopyIndexOffsets: offsets };
       }
-      if (item.type === "user") {
+      if (item.type === "user" && item.sentToModel !== false) {
         runningOffsets = createEmptySourceCopyOffsets();
       }
       return { item, sourceCopyIndexOffsets: void 0 };
@@ -30876,7 +30969,13 @@ var Footer = /* @__PURE__ */ __name(() => {
     t("IDE connecting... context may be unavailable")
   ] }) : uiState.startupIdeConnectionStatus.state === "failed" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("IDE connection unavailable: {{message}}", {
     message: uiState.startupIdeConnectionStatus.message
-  }) }) : uiState.streamingState === "responding" /* Responding */ ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Enter to steer \xB7 Ctrl+Q to queue") }) : showAutoAcceptIndicator !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator }) : suppressHint ? null : /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("? for shortcuts") });
+  }) }) : uiState.streamingState === "responding" /* Responding */ ? /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Text, { color: theme.text.secondary, children: [
+    t("Enter to steer \xB7 Ctrl+Q to queue"),
+    showAutoAcceptIndicator !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(import_jsx_runtime116.Fragment, { children: [
+      " \xB7 ",
+      /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator })
+    ] })
+  ] }) : showAutoAcceptIndicator !== void 0 ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(AutoAcceptIndicator, { approvalMode: showAutoAcceptIndicator }) : suppressHint ? null : /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("? for shortcuts") });
   const rightItems = [];
   if (sandboxInfo) {
     rightItems.push({
@@ -31456,6 +31555,7 @@ var ScreenReaderAppLayout = /* @__PURE__ */ __name(() => {
   const dialogHeight = uiState.constrainHeight ? dialogMaxHeight : void 0;
   const shouldShowStickyTodos = uiState.stickyTodos !== null && !uiState.dialogsVisible && !uiState.isFeedbackDialogOpen && uiState.streamingState === "responding" /* Responding */;
   return /* @__PURE__ */ (0, import_jsx_runtime122.jsxs)(Box_default, { flexDirection: "column", width: "90%", height: "100%", children: [
+    !uiState.dialogsVisible && uiState.updateInfo && /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(UpdateNotification, { message: uiState.updateInfo.message }),
     /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Notifications, {}),
     /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Footer, {}),
     /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(Box_default, { flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ (0, import_jsx_runtime122.jsx)(MainContent, {}) }),
@@ -32537,12 +32637,14 @@ var DefaultAppLayout = /* @__PURE__ */ __name(() => {
     isAgentTab ? /* @__PURE__ */ (0, import_jsx_runtime130.jsxs)(import_jsx_runtime130.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(AgentChatView, { agentId: activeView }),
       /* @__PURE__ */ (0, import_jsx_runtime130.jsxs)(Box_default, { flexDirection: "column", ref: uiState.mainControlsRef, children: [
+        !uiState.dialogsVisible && uiState.updateInfo && /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(UpdateNotification, { message: uiState.updateInfo.message }),
         /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(AgentComposer, { agentId: activeView }, activeView),
         /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(ExitWarning, {})
       ] })
     ] }) : /* @__PURE__ */ (0, import_jsx_runtime130.jsxs)(import_jsx_runtime130.Fragment, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(MainContent, {}),
       /* @__PURE__ */ (0, import_jsx_runtime130.jsxs)(Box_default, { flexDirection: "column", ref: uiState.mainControlsRef, children: [
+        !uiState.dialogsVisible && uiState.updateInfo && /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(UpdateNotification, { message: uiState.updateInfo.message }),
         uiState.dialogsVisible ? /* @__PURE__ */ (0, import_jsx_runtime130.jsx)(
           Box_default,
           {
@@ -32747,14 +32849,46 @@ function useResizeSettleRepaint(terminalWidth, refreshStatic) {
 }
 __name(useResizeSettleRepaint, "useResizeSettleRepaint");
 
-// packages/cli/src/ui/hooks/useThemeCommand.ts
+// packages/cli/src/ui/hooks/use-wake-repaint.ts
 init_esbuild_shims();
 var import_react118 = __toESM(require_react(), 1);
+var HEARTBEAT_INTERVAL_MS = 5e3;
+var WAKE_THRESHOLD_MS = HEARTBEAT_INTERVAL_MS * 2;
+function useWakeRepaint(repaint) {
+  const repaintRef = (0, import_react118.useRef)(repaint);
+  repaintRef.current = repaint;
+  (0, import_react118.useEffect)(() => {
+    let lastTick = Date.now();
+    const timer = setInterval(() => {
+      const now = Date.now();
+      const elapsed = now - lastTick;
+      lastTick = now;
+      if (elapsed > WAKE_THRESHOLD_MS) {
+        repaintRef.current();
+      }
+    }, HEARTBEAT_INTERVAL_MS);
+    timer.unref?.();
+    const onSigcont = /* @__PURE__ */ __name(() => {
+      lastTick = Date.now();
+      repaintRef.current();
+    }, "onSigcont");
+    process.on("SIGCONT", onSigcont);
+    return () => {
+      clearInterval(timer);
+      process.removeListener("SIGCONT", onSigcont);
+    };
+  }, []);
+}
+__name(useWakeRepaint, "useWakeRepaint");
+
+// packages/cli/src/ui/hooks/useThemeCommand.ts
+init_esbuild_shims();
+var import_react119 = __toESM(require_react(), 1);
 import process13 from "node:process";
 var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, addItem, initialThemeError) => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react118.useState)(!!initialThemeError);
-  const [themeBeforeDialogOpen, setThemeBeforeDialogOpen] = (0, import_react118.useState)(themeManager.getActiveTheme().name);
-  const openThemeDialog = (0, import_react118.useCallback)(() => {
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react119.useState)(!!initialThemeError);
+  const [themeBeforeDialogOpen, setThemeBeforeDialogOpen] = (0, import_react119.useState)(themeManager.getActiveTheme().name);
+  const openThemeDialog = (0, import_react119.useCallback)(() => {
     if (process13.env["NO_COLOR"]) {
       addItem(
         {
@@ -32770,7 +32904,7 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
     setThemeBeforeDialogOpen(themeManager.getActiveTheme().name);
     setIsThemeDialogOpen(true);
   }, [addItem]);
-  const applyTheme = (0, import_react118.useCallback)(
+  const applyTheme = (0, import_react119.useCallback)(
     (themeName) => {
       if (!themeManager.setActiveTheme(themeName)) {
         setIsThemeDialogOpen(true);
@@ -32785,13 +32919,13 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
     },
     [setThemeError]
   );
-  const handleThemeHighlight = (0, import_react118.useCallback)(
+  const handleThemeHighlight = (0, import_react119.useCallback)(
     (themeName) => {
       applyTheme(themeName);
     },
     [applyTheme]
   );
-  const handleThemeSelect = (0, import_react118.useCallback)(
+  const handleThemeSelect = (0, import_react119.useCallback)(
     (themeName, scope) => {
       if (themeName === void 0) {
         applyTheme(themeBeforeDialogOpen);
@@ -32838,7 +32972,7 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
 
 // packages/cli/src/ui/hooks/useFeedbackDialog.ts
 init_esbuild_shims();
-var import_react119 = __toESM(require_react(), 1);
+var import_react120 = __toESM(require_react(), 1);
 import * as fs15 from "node:fs";
 var import_strip_json_comments = __toESM(require_strip_json_comments(), 1);
 var FEEDBACK_SHOW_PROBABILITY = 0.25;
@@ -32884,20 +33018,20 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
   history,
   sessionStats
 }) => {
-  const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = (0, import_react119.useState)(false);
-  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = (0, import_react119.useState)(false);
-  const openFeedbackDialog = (0, import_react119.useCallback)(() => {
+  const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = (0, import_react120.useState)(false);
+  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = (0, import_react120.useState)(false);
+  const openFeedbackDialog = (0, import_react120.useCallback)(() => {
     setIsFeedbackDialogOpen(true);
   }, []);
-  const closeFeedbackDialog = (0, import_react119.useCallback)(
+  const closeFeedbackDialog = (0, import_react120.useCallback)(
     () => setIsFeedbackDialogOpen(false),
     []
   );
-  const temporaryCloseFeedbackDialog = (0, import_react119.useCallback)(() => {
+  const temporaryCloseFeedbackDialog = (0, import_react120.useCallback)(() => {
     setIsFeedbackDialogOpen(false);
     setIsFeedbackDismissedTemporarily(true);
   }, []);
-  const submitFeedback = (0, import_react119.useCallback)(
+  const submitFeedback = (0, import_react120.useCallback)(
     (rating) => {
       if (rating >= FEEDBACK_OPTIONS.GOOD && rating <= FEEDBACK_OPTIONS.FINE) {
         const feedbackEvent = new UserFeedbackEvent(
@@ -32917,7 +33051,7 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
     },
     [closeFeedbackDialog, sessionStats.sessionId, config, settings]
   );
-  (0, import_react119.useEffect)(() => {
+  (0, import_react120.useEffect)(() => {
     const checkAndShowFeedback = /* @__PURE__ */ __name(() => {
       if (streamingState === "idle" /* Idle */ && history.length > 0) {
         if (!config.getUsageStatisticsEnabled() || settings.merged.ui?.enableUserFeedback === false || !lastMessageIsAIResponse(history) || Math.random() > FEEDBACK_SHOW_PROBABILITY || !meetsMinimumSessionRequirements(sessionStats) || isFeedbackDismissedTemporarily) {
@@ -32939,7 +33073,7 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
     settings.merged.ui?.enableUserFeedback,
     config
   ]);
-  (0, import_react119.useEffect)(() => {
+  (0, import_react120.useEffect)(() => {
     if (streamingState === "responding" /* Responding */ && isFeedbackDismissedTemporarily) {
       setIsFeedbackDismissedTemporarily(false);
     }
@@ -32955,13 +33089,13 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/hooks/useEditorSettings.ts
 init_esbuild_shims();
-var import_react120 = __toESM(require_react(), 1);
+var import_react121 = __toESM(require_react(), 1);
 var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError, addItem) => {
-  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react120.useState)(false);
-  const openEditorDialog = (0, import_react120.useCallback)(() => {
+  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react121.useState)(false);
+  const openEditorDialog = (0, import_react121.useCallback)(() => {
     setIsEditorDialogOpen(true);
   }, []);
-  const handleEditorSelect = (0, import_react120.useCallback)(
+  const handleEditorSelect = (0, import_react121.useCallback)(
     (editorType, scope) => {
       if (editorType && (!checkHasEditorType(editorType) || !allowEditorTypeInSandbox(editorType))) {
         return;
@@ -32983,7 +33117,7 @@ var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError,
     },
     [loadedSettings, setEditorError, addItem]
   );
-  const exitEditorDialog = (0, import_react120.useCallback)(() => {
+  const exitEditorDialog = (0, import_react121.useCallback)(() => {
     setIsEditorDialogOpen(false);
   }, []);
   return {
@@ -32996,13 +33130,13 @@ var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError,
 
 // packages/cli/src/ui/hooks/useSettingsCommand.ts
 init_esbuild_shims();
-var import_react121 = __toESM(require_react(), 1);
+var import_react122 = __toESM(require_react(), 1);
 function useSettingsCommand() {
-  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react121.useState)(false);
-  const openSettingsDialog = (0, import_react121.useCallback)(() => {
+  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react122.useState)(false);
+  const openSettingsDialog = (0, import_react122.useCallback)(() => {
     setIsSettingsDialogOpen(true);
   }, []);
-  const closeSettingsDialog = (0, import_react121.useCallback)(() => {
+  const closeSettingsDialog = (0, import_react122.useCallback)(() => {
     setIsSettingsDialogOpen(false);
   }, []);
   return {
@@ -33015,14 +33149,14 @@ __name(useSettingsCommand, "useSettingsCommand");
 
 // packages/cli/src/ui/hooks/useModelCommand.ts
 init_esbuild_shims();
-var import_react122 = __toESM(require_react(), 1);
+var import_react123 = __toESM(require_react(), 1);
 var useModelCommand = /* @__PURE__ */ __name(() => {
-  const [isModelDialogOpen, setIsModelDialogOpen] = (0, import_react122.useState)(false);
-  const [isFastModelMode, setIsFastModelMode] = (0, import_react122.useState)(false);
-  const [isVoiceModelMode, setIsVoiceModelMode] = (0, import_react122.useState)(false);
-  const [isVisionModelMode, setIsVisionModelMode] = (0, import_react122.useState)(false);
-  const [modelDialogPersistScope, setModelDialogPersistScope] = (0, import_react122.useState)(void 0);
-  const openModelDialog = (0, import_react122.useCallback)(
+  const [isModelDialogOpen, setIsModelDialogOpen] = (0, import_react123.useState)(false);
+  const [isFastModelMode, setIsFastModelMode] = (0, import_react123.useState)(false);
+  const [isVoiceModelMode, setIsVoiceModelMode] = (0, import_react123.useState)(false);
+  const [isVisionModelMode, setIsVisionModelMode] = (0, import_react123.useState)(false);
+  const [modelDialogPersistScope, setModelDialogPersistScope] = (0, import_react123.useState)(void 0);
+  const openModelDialog = (0, import_react123.useCallback)(
     (options) => {
       const voiceModelMode = options?.voiceModelMode ?? false;
       const visionModelMode = options?.visionModelMode ?? false;
@@ -33036,7 +33170,7 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
     },
     []
   );
-  const closeModelDialog = (0, import_react122.useCallback)(() => {
+  const closeModelDialog = (0, import_react123.useCallback)(() => {
     setIsModelDialogOpen(false);
     setIsFastModelMode(false);
     setIsVoiceModelMode(false);
@@ -33056,13 +33190,13 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useApprovalModeCommand.ts
 init_esbuild_shims();
-var import_react123 = __toESM(require_react(), 1);
+var import_react124 = __toESM(require_react(), 1);
 var useApprovalModeCommand = /* @__PURE__ */ __name((loadedSettings, config) => {
-  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = (0, import_react123.useState)(false);
-  const openApprovalModeDialog = (0, import_react123.useCallback)(() => {
+  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = (0, import_react124.useState)(false);
+  const openApprovalModeDialog = (0, import_react124.useCallback)(() => {
     setIsApprovalModeDialogOpen(true);
   }, []);
-  const handleApprovalModeSelect = (0, import_react123.useCallback)(
+  const handleApprovalModeSelect = (0, import_react124.useCallback)(
     (mode, scope) => {
       try {
         if (!mode) {
@@ -33088,13 +33222,13 @@ var useApprovalModeCommand = /* @__PURE__ */ __name((loadedSettings, config) =>
 
 // packages/cli/src/ui/hooks/use-effort-command.ts
 init_esbuild_shims();
-var import_react124 = __toESM(require_react(), 1);
+var import_react125 = __toESM(require_react(), 1);
 var useEffortCommand = /* @__PURE__ */ __name((loadedSettings, config, addItem) => {
-  const [isEffortDialogOpen, setIsEffortDialogOpen] = (0, import_react124.useState)(false);
-  const openEffortDialog = (0, import_react124.useCallback)(() => {
+  const [isEffortDialogOpen, setIsEffortDialogOpen] = (0, import_react125.useState)(false);
+  const openEffortDialog = (0, import_react125.useCallback)(() => {
     setIsEffortDialogOpen(true);
   }, []);
-  const handleEffortSelect = (0, import_react124.useCallback)(
+  const handleEffortSelect = (0, import_react125.useCallback)(
     (effort) => {
       try {
         if (!effort) {
@@ -33146,8 +33280,9 @@ var useEffortCommand = /* @__PURE__ */ __name((loadedSettings, config, addItem)
 
 // packages/cli/src/ui/hooks/useBranchCommand.ts
 init_esbuild_shims();
-var import_react125 = __toESM(require_react(), 1);
+var import_react126 = __toESM(require_react(), 1);
 import { randomUUID } from "node:crypto";
+var BACKGROUND_WORK_BRANCH_BLOCKED_MESSAGE = "Stop the current session's running background tasks before branching the conversation.";
 function deriveFirstPrompt(messages) {
   for (const record of messages) {
     if (record.type !== "user") continue;
@@ -33166,9 +33301,19 @@ function deriveFirstPrompt(messages) {
 __name(deriveFirstPrompt, "deriveFirstPrompt");
 function useBranchCommand(options) {
   const { config, historyManager, startNewSession, setSessionName, remount } = options;
-  const handleBranch = (0, import_react125.useCallback)(
+  const handleBranch = (0, import_react126.useCallback)(
     async (name) => {
       if (!config) return;
+      if (hasBlockingBackgroundWork(config)) {
+        historyManager.addItem(
+          {
+            type: "error",
+            text: t(BACKGROUND_WORK_BRANCH_BLOCKED_MESSAGE)
+          },
+          Date.now()
+        );
+        return;
+      }
       const oldSessionId = config.getSessionId();
       const newSessionId = randomUUID();
       const sessionService = config.getSessionService();
@@ -33222,6 +33367,7 @@ function useBranchCommand(options) {
         historyManager.clearItems();
         historyManager.loadHistory(uiHistoryItems);
         uiSwapped = true;
+        resetBackgroundStateForSessionSwitch(config);
         try {
           restoreGoalFromHistory(
             uiHistoryItems,
@@ -33297,19 +33443,19 @@ __name(useBranchCommand, "useBranchCommand");
 
 // packages/cli/src/ui/hooks/useResumeCommand.ts
 init_esbuild_shims();
-var import_react126 = __toESM(require_react(), 1);
+var import_react127 = __toESM(require_react(), 1);
 var BACKGROUND_WORK_SWITCH_BLOCKED_MESSAGE = "Stop the current session's running background tasks before resuming another session.";
 function useResumeCommand(options) {
-  const [isResumeDialogOpen, setIsResumeDialogOpen] = (0, import_react126.useState)(false);
-  const [resumeMatchedSessions, setResumeMatchedSessions] = (0, import_react126.useState)();
-  const openResumeDialog = (0, import_react126.useCallback)(
+  const [isResumeDialogOpen, setIsResumeDialogOpen] = (0, import_react127.useState)(false);
+  const [resumeMatchedSessions, setResumeMatchedSessions] = (0, import_react127.useState)();
+  const openResumeDialog = (0, import_react127.useCallback)(
     (matchedSessions) => {
       setResumeMatchedSessions(matchedSessions);
       setIsResumeDialogOpen(true);
     },
     []
   );
-  const closeResumeDialog = (0, import_react126.useCallback)(() => {
+  const closeResumeDialog = (0, import_react127.useCallback)(() => {
     setIsResumeDialogOpen(false);
     setResumeMatchedSessions(void 0);
   }, []);
@@ -33322,7 +33468,7 @@ function useResumeCommand(options) {
     remount
   } = options;
   const { addItem, clearItems, loadHistory } = historyManager;
-  const handleResume = (0, import_react126.useCallback)(
+  const handleResume = (0, import_react127.useCallback)(
     async (sessionId) => {
       if (!config) {
         return;
@@ -33340,6 +33486,7 @@ function useResumeCommand(options) {
       const oldSessionId = config.getSessionId();
       let coreSwapped = false;
       let uiSwapped = false;
+      let recoveredBackgroundAgentsNotice = null;
       try {
         const cwd3 = config.getTargetDir();
         const sessionService = new SessionService(cwd3);
@@ -33380,22 +33527,30 @@ function useResumeCommand(options) {
         await config.getGeminiClient()?.initialize?.();
         const recovered = await config.loadPausedBackgroundAgents(sessionId);
         if (recovered.length > 0) {
-          const recoveredMessage = {
-            type: "info" /* INFO */,
-            text: config.getBackgroundAgentResumeService().buildRecoveredBackgroundAgentsNotice(recovered.length)
-          };
-          addItem(recoveredMessage, Date.now());
+          recoveredBackgroundAgentsNotice = config.getBackgroundAgentResumeService().buildRecoveredBackgroundAgentsNotice(recovered.length);
         }
         startNewSession(sessionId);
         setSessionName?.(customTitle ?? null);
         clearItems();
         loadHistory(uiHistoryItems);
+        if (recoveredBackgroundAgentsNotice) {
+          addItem(
+            {
+              type: "info" /* INFO */,
+              text: recoveredBackgroundAgentsNotice
+            },
+            Date.now()
+          );
+        }
         uiSwapped = true;
         remount?.();
       } catch (error) {
         if (coreSwapped && !uiSwapped) {
           try {
+            resetBackgroundStateForSessionSwitch(config);
             config.startNewSession(oldSessionId, void 0);
+            await config.loadPausedBackgroundAgents(oldSessionId).catch(() => {
+            });
           } catch (rollbackErr) {
             config.getDebugLogger().warn(
               `Rollback after failed /resume init failed: ${rollbackErr}`
@@ -33438,18 +33593,18 @@ __name(useResumeCommand, "useResumeCommand");
 
 // packages/cli/src/ui/hooks/useDeleteCommand.ts
 init_esbuild_shims();
-var import_react127 = __toESM(require_react(), 1);
+var import_react128 = __toESM(require_react(), 1);
 function useDeleteCommand(options) {
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = (0, import_react127.useState)(false);
-  const openDeleteDialog = (0, import_react127.useCallback)(() => {
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = (0, import_react128.useState)(false);
+  const openDeleteDialog = (0, import_react128.useCallback)(() => {
     setIsDeleteDialogOpen(true);
   }, []);
-  const closeDeleteDialog = (0, import_react127.useCallback)(() => {
+  const closeDeleteDialog = (0, import_react128.useCallback)(() => {
     setIsDeleteDialogOpen(false);
   }, []);
   const { config, addItem } = options ?? {};
-  const isDeletingManyRef = (0, import_react127.useRef)(false);
-  const handleDelete = (0, import_react127.useCallback)(
+  const isDeletingManyRef = (0, import_react128.useRef)(false);
+  const handleDelete = (0, import_react128.useCallback)(
     async (sessionId) => {
       if (!config) {
         return;
@@ -33508,7 +33663,7 @@ function useDeleteCommand(options) {
     },
     [closeDeleteDialog, config, addItem]
   );
-  const handleDeleteMany = (0, import_react127.useCallback)(
+  const handleDeleteMany = (0, import_react128.useCallback)(
     async (sessionIds) => {
       if (!config) {
         return;
@@ -33640,7 +33795,7 @@ __name(useDeleteCommand, "useDeleteCommand");
 
 // packages/cli/src/ui/hooks/slashCommandProcessor.ts
 init_esbuild_shims();
-var import_react128 = __toESM(require_react(), 1);
+var import_react129 = __toESM(require_react(), 1);
 var debugLogger33 = createDebugLogger("SLASH_COMMAND_PROCESSOR");
 function hasUserPromptExpansionHooks(config) {
   return !!config && !config.getDisableAllHooks?.() && (config.hasHooksForEvent?.("UserPromptExpansion") ?? false);
@@ -33672,33 +33827,33 @@ function getSkillCommandName(command) {
 }
 __name(getSkillCommandName, "getSkillCommandName");
 var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history, addItem, clearItems, loadHistory, refreshStatic, toggleVimEnabled, isProcessing, setIsProcessing, isIdleRef, setGeminiMdFileCount, actions, extensionsUpdateState, isConfigInitialized, logger, updateItem, setSessionName, extensionRefreshState) => {
-  const fallbackExtensionRefreshStateRef = (0, import_react128.useRef)(
+  const fallbackExtensionRefreshStateRef = (0, import_react129.useRef)(
     null
   );
   if (!fallbackExtensionRefreshStateRef.current) {
     fallbackExtensionRefreshStateRef.current = new ExtensionRefreshState();
   }
   const activeExtensionRefreshState = extensionRefreshState ?? fallbackExtensionRefreshStateRef.current;
-  const historyRef = (0, import_react128.useRef)(history);
-  (0, import_react128.useLayoutEffect)(() => {
+  const historyRef = (0, import_react129.useRef)(history);
+  (0, import_react129.useLayoutEffect)(() => {
     historyRef.current = history;
   }, [history]);
   const { stats: sessionStats, startNewSession } = useSessionStats();
-  const [commands, setCommands] = (0, import_react128.useState)([]);
-  const [recentCommands, setRecentCommands] = (0, import_react128.useState)(/* @__PURE__ */ new Map());
-  const [reloadTrigger, setReloadTrigger] = (0, import_react128.useState)(0);
-  const commandReloadResolversRef = (0, import_react128.useRef)([]);
-  const extensionContentRefreshTimerRef = (0, import_react128.useRef)(null);
-  const extensionContentRefreshRunningRef = (0, import_react128.useRef)(false);
-  const extensionContentRefreshPendingRef = (0, import_react128.useRef)(false);
-  const mountedRef = (0, import_react128.useRef)(true);
-  (0, import_react128.useEffect)(() => {
+  const [commands, setCommands] = (0, import_react129.useState)([]);
+  const [recentCommands, setRecentCommands] = (0, import_react129.useState)(/* @__PURE__ */ new Map());
+  const [reloadTrigger, setReloadTrigger] = (0, import_react129.useState)(0);
+  const commandReloadResolversRef = (0, import_react129.useRef)([]);
+  const extensionContentRefreshTimerRef = (0, import_react129.useRef)(null);
+  const extensionContentRefreshRunningRef = (0, import_react129.useRef)(false);
+  const extensionContentRefreshPendingRef = (0, import_react129.useRef)(false);
+  const mountedRef = (0, import_react129.useRef)(true);
+  (0, import_react129.useEffect)(() => {
     mountedRef.current = true;
     return () => {
       mountedRef.current = false;
     };
   }, []);
-  const resolveCommandReloads = (0, import_react128.useCallback)((completedTrigger) => {
+  const resolveCommandReloads = (0, import_react129.useCallback)((completedTrigger) => {
     if (commandReloadResolversRef.current.length === 0) {
       return;
     }
@@ -33712,7 +33867,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     }
     commandReloadResolversRef.current = remaining;
   }, []);
-  const reloadCommands = (0, import_react128.useCallback)(() => {
+  const reloadCommands = (0, import_react129.useCallback)(() => {
     if (!config) {
       return Promise.resolve();
     }
@@ -33727,14 +33882,14 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       });
     });
   }, [config]);
-  const clearPendingExtensionContentRefresh = (0, import_react128.useCallback)(() => {
+  const clearPendingExtensionContentRefresh = (0, import_react129.useCallback)(() => {
     if (!extensionContentRefreshTimerRef.current) {
       return;
     }
     clearTimeout(extensionContentRefreshTimerRef.current);
     extensionContentRefreshTimerRef.current = null;
   }, []);
-  const showExtensionContentRefreshError = (0, import_react128.useCallback)(
+  const showExtensionContentRefreshError = (0, import_react129.useCallback)(
     (error) => {
       if (!mountedRef.current) {
         return;
@@ -33754,7 +33909,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     },
     [addItem]
   );
-  const runExtensionContentRefresh = (0, import_react128.useCallback)(async () => {
+  const runExtensionContentRefresh = (0, import_react129.useCallback)(async () => {
     if (!config) {
       return;
     }
@@ -33798,23 +33953,23 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     reloadCommands,
     showExtensionContentRefreshError
   ]);
-  const [shellConfirmationRequest, setShellConfirmationRequest] = (0, import_react128.useState)(null);
-  const [confirmationRequest, setConfirmationRequest] = (0, import_react128.useState)(null);
-  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react128.useState)(
+  const [shellConfirmationRequest, setShellConfirmationRequest] = (0, import_react129.useState)(null);
+  const [confirmationRequest, setConfirmationRequest] = (0, import_react129.useState)(null);
+  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react129.useState)(
     /* @__PURE__ */ new Set()
   );
-  const [pendingItem, setPendingItem] = (0, import_react128.useState)(
+  const [pendingItem, setPendingItem] = (0, import_react129.useState)(
     null
   );
-  const [btwItem, setBtwItem] = (0, import_react128.useState)(null);
-  const btwAbortControllerRef = (0, import_react128.useRef)(null);
-  const cancelBtw = (0, import_react128.useCallback)(() => {
+  const [btwItem, setBtwItem] = (0, import_react129.useState)(null);
+  const btwAbortControllerRef = (0, import_react129.useRef)(null);
+  const cancelBtw = (0, import_react129.useCallback)(() => {
     btwAbortControllerRef.current?.abort();
     btwAbortControllerRef.current = null;
     setBtwItem(null);
   }, []);
-  const abortControllerRef = (0, import_react128.useRef)(null);
-  const cancelSlashCommand = (0, import_react128.useCallback)(() => {
+  const abortControllerRef = (0, import_react129.useRef)(null);
+  const cancelSlashCommand = (0, import_react129.useCallback)(() => {
     cancelBtw();
     if (!abortControllerRef.current) {
       return;
@@ -33838,14 +33993,14 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     },
     { isActive: isProcessing }
   );
-  const pendingHistoryItems = (0, import_react128.useMemo)(() => {
+  const pendingHistoryItems = (0, import_react129.useMemo)(() => {
     const items = [];
     if (pendingItem != null) {
       items.push(pendingItem);
     }
     return items;
   }, [pendingItem]);
-  const addMessage = (0, import_react128.useCallback)(
+  const addMessage = (0, import_react129.useCallback)(
     (message) => {
       let historyItemContent;
       if (message.type === "about" /* ABOUT */) {
@@ -33905,7 +34060,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     },
     [addItem]
   );
-  const commandContext = (0, import_react128.useMemo)(
+  const commandContext = (0, import_react129.useMemo)(
     () => ({
       services: {
         config,
@@ -33977,7 +34132,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       activeExtensionRefreshState
     ]
   );
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -33995,7 +34150,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       })();
     };
   }, [config, reloadCommands]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -34020,7 +34175,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       }
     };
   }, [config, reloadCommands]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     if (!isConfigInitialized) {
       return;
     }
@@ -34035,7 +34190,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       reloadCommands();
     });
   }, [config, isConfigInitialized, reloadCommands]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     const listener = /* @__PURE__ */ __name((reason) => {
       clearPendingExtensionContentRefresh();
       addItem(
@@ -34062,7 +34217,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     addItem,
     clearPendingExtensionContentRefresh
   ]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     activeExtensionRefreshState.on(
       "extensions-reload-started" /* ExtensionsReloadStarted */,
       clearPendingExtensionContentRefresh
@@ -34082,7 +34237,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       );
     };
   }, [activeExtensionRefreshState, clearPendingExtensionContentRefresh]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -34108,7 +34263,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     activeExtensionRefreshState,
     runExtensionContentRefresh
   ]);
-  (0, import_react128.useEffect)(() => {
+  (0, import_react129.useEffect)(() => {
     const controller = new AbortController();
     const load = /* @__PURE__ */ __name(async () => {
       try {
@@ -34205,7 +34360,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     settings,
     resolveCommandReloads
   ]);
-  const handleSlashCommand = (0, import_react128.useCallback)(
+  const handleSlashCommand = (0, import_react129.useCallback)(
     async (rawQuery, oneTimeShellAllowlist, overwriteConfirmed, existingInvocationItemId) => {
       if (typeof rawQuery !== "string") {
         return false;
@@ -34761,11 +34916,11 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
 
 // packages/cli/src/ui/hooks/useDoublePress.ts
 init_esbuild_shims();
-var import_react129 = __toESM(require_react(), 1);
+var import_react130 = __toESM(require_react(), 1);
 var DOUBLE_PRESS_TIMEOUT_MS = 800;
 function useDoublePress(onDoublePress, onPending) {
-  const timeoutRef = (0, import_react129.useRef)(null);
-  (0, import_react129.useEffect)(
+  const timeoutRef = (0, import_react130.useRef)(null);
+  (0, import_react130.useEffect)(
     () => () => {
       if (timeoutRef.current !== null) {
         clearTimeout(timeoutRef.current);
@@ -34774,7 +34929,7 @@ function useDoublePress(onDoublePress, onPending) {
     },
     []
   );
-  return (0, import_react129.useCallback)(() => {
+  return (0, import_react130.useCallback)(() => {
     if (timeoutRef.current !== null) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = null;
@@ -34838,10 +34993,10 @@ __name(formatSessionWindowTitle, "formatSessionWindowTitle");
 
 // packages/cli/src/ui/hooks/useLogger.ts
 init_esbuild_shims();
-var import_react130 = __toESM(require_react(), 1);
+var import_react131 = __toESM(require_react(), 1);
 var useLogger = /* @__PURE__ */ __name((storage, sessionId) => {
-  const [logger, setLogger] = (0, import_react130.useState)(null);
-  (0, import_react130.useEffect)(() => {
+  const [logger, setLogger] = (0, import_react131.useState)(null);
+  (0, import_react131.useEffect)(() => {
     if (!sessionId) {
       return;
     }
@@ -34862,11 +35017,11 @@ var useLogger = /* @__PURE__ */ __name((storage, sessionId) => {
 
 // packages/cli/src/ui/hooks/useGeminiStream.ts
 init_esbuild_shims();
-var import_react134 = __toESM(require_react(), 1);
+var import_react136 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/shellCommandProcessor.ts
 init_esbuild_shims();
-var import_react131 = __toESM(require_react(), 1);
+var import_react132 = __toESM(require_react(), 1);
 import crypto2 from "node:crypto";
 import path10 from "node:path";
 import os5 from "node:os";
@@ -34899,8 +35054,8 @@ ${modelContent}
 }
 __name(addShellCommandToGeminiHistory, "addShellCommandToGeminiHistory");
 var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight) => {
-  const [activeShellPtyId, setActiveShellPtyId] = (0, import_react131.useState)(null);
-  const handleShellCommand = (0, import_react131.useCallback)(
+  const [activeShellPtyId, setActiveShellPtyId] = (0, import_react132.useState)(null);
+  const handleShellCommand = (0, import_react132.useCallback)(
     (rawQuery, abortSignal) => {
       if (typeof rawQuery !== "string" || rawQuery.trim() === "") {
         return false;
@@ -35154,11 +35309,11 @@ ${finalOutput}`;
 
 // packages/cli/src/ui/hooks/useStateAndRef.ts
 init_esbuild_shims();
-var import_react132 = __toESM(require_react(), 1);
+var import_react133 = __toESM(require_react(), 1);
 var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
-  const [state, setState] = import_react132.default.useState(initialValue);
-  const ref = import_react132.default.useRef(initialValue);
-  const setStateInternal = import_react132.default.useCallback(
+  const [state, setState] = import_react133.default.useState(initialValue);
+  const ref = import_react133.default.useRef(initialValue);
+  const setStateInternal = import_react133.default.useCallback(
     (newStateOrCallback) => {
       let newValue;
       if (typeof newStateOrCallback === "function") {
@@ -35176,12 +35331,12 @@ var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
 
 // packages/cli/src/ui/hooks/useReactToolScheduler.ts
 init_esbuild_shims();
-var import_react133 = __toESM(require_react(), 1);
+var import_react134 = __toESM(require_react(), 1);
 import * as path11 from "node:path";
 var debugLogger35 = createDebugLogger("REACT_TOOL_SCHEDULER");
 function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose) {
-  const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react133.useState)([]);
-  const outputUpdateHandler = (0, import_react133.useCallback)(
+  const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react134.useState)([]);
+  const outputUpdateHandler = (0, import_react134.useCallback)(
     (toolCallId, outputChunk) => {
       if (isShellProgressData(outputChunk)) {
         return;
@@ -35199,13 +35354,13 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     []
   );
-  const allToolCallsCompleteHandler = (0, import_react133.useCallback)(
+  const allToolCallsCompleteHandler = (0, import_react134.useCallback)(
     async (completedToolCalls) => {
       await onComplete(completedToolCalls);
     },
     [onComplete]
   );
-  const toolCallsUpdateHandler = (0, import_react133.useCallback)(
+  const toolCallsUpdateHandler = (0, import_react134.useCallback)(
     (updatedCoreToolCalls) => {
       setToolCallsForDisplay(
         (prevTrackedCalls) => updatedCoreToolCalls.map((coreTc) => {
@@ -35232,10 +35387,9 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     [setToolCallsForDisplay]
   );
-  const scheduler = (0, import_react133.useMemo)(
+  const scheduler = (0, import_react134.useMemo)(
     () => new CoreToolScheduler({
       config,
-      chatRecordingService: config.getChatRecordingService(),
       outputUpdateHandler,
       onAllToolCallsComplete: allToolCallsCompleteHandler,
       onToolCallsUpdate: toolCallsUpdateHandler,
@@ -35251,7 +35405,7 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
       onEditorClose
     ]
   );
-  const schedule = (0, import_react133.useCallback)(
+  const schedule = (0, import_react134.useCallback)(
     (request, signal, modelOverride) => {
       if (!modelOverride?.endsWith("\0")) {
         void scheduler.schedule(request, signal);
@@ -35278,13 +35432,6 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
                 message,
                 message
               );
-              config.getChatRecordingService()?.recordToolResult(responseParts, {
-                callId: toolRequest.callId,
-                status: "error",
-                resultDisplay: message,
-                error: toolError,
-                errorType: "unhandled_exception" /* UNHANDLED_EXCEPTION */
-              });
               return {
                 status: "error",
                 request: toolRequest,
@@ -35307,7 +35454,7 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     [allToolCallsCompleteHandler, config, scheduler]
   );
-  const markToolsAsSubmitted = (0, import_react133.useCallback)(
+  const markToolsAsSubmitted = (0, import_react134.useCallback)(
     (callIdsToMark) => {
       setToolCallsForDisplay(
         (prevCalls) => prevCalls.map(
@@ -35473,6 +35620,78 @@ __name(mapToDisplay, "mapToDisplay");
 import { promises as fs17 } from "node:fs";
 import path12 from "node:path";
 import process14 from "node:process";
+
+// packages/cli/src/ui/hooks/useMessageQueue.ts
+init_esbuild_shims();
+var import_react135 = __toESM(require_react(), 1);
+var GOAL_COMMAND_RE = /^\/goal(?:\s|$)/;
+function useMessageQueue() {
+  const [queuedMessages, setQueuedMessages] = (0, import_react135.useState)([]);
+  const queueRef = (0, import_react135.useRef)([]);
+  const addMessage = (0, import_react135.useCallback)((message, deferUntilIdle = false) => {
+    const trimmedMessage = message.trim();
+    if (trimmedMessage.length > 0) {
+      queueRef.current = [
+        ...queueRef.current,
+        { text: trimmedMessage, deferUntilIdle }
+      ];
+      setQueuedMessages(queueRef.current);
+    }
+  }, []);
+  const clearQueue = (0, import_react135.useCallback)(() => {
+    queueRef.current = [];
+    setQueuedMessages([]);
+  }, []);
+  const getQueuedMessagesText = (0, import_react135.useCallback)(() => {
+    if (queuedMessages.length === 0) return "";
+    return queuedMessages.map(({ text }) => text).join("\n\n");
+  }, [queuedMessages]);
+  const popAllMessages = (0, import_react135.useCallback)(() => {
+    const current = queueRef.current;
+    if (current.length === 0) return null;
+    queueRef.current = [];
+    setQueuedMessages([]);
+    return current.map(({ text }) => text).join("\n\n");
+  }, []);
+  const restoreMessages = (0, import_react135.useCallback)((messages) => {
+    const restored = messages.map((text) => text.trim()).filter(Boolean).map((text) => ({ text, deferUntilIdle: false }));
+    if (restored.length === 0) return;
+    queueRef.current = [...restored, ...queueRef.current];
+    setQueuedMessages(queueRef.current);
+  }, []);
+  const drainQueue = (0, import_react135.useCallback)((includeDeferred = false) => {
+    const current = queueRef.current;
+    if (current.length === 0) return [];
+    const shouldDrain = /* @__PURE__ */ __name((message) => (!isSlashCommand(message.text) || !includeDeferred && GOAL_COMMAND_RE.test(message.text)) && (includeDeferred || !message.deferUntilIdle), "shouldDrain");
+    const drained = current.filter(shouldDrain);
+    if (drained.length === 0) return [];
+    const rest = current.filter((message) => !shouldDrain(message));
+    queueRef.current = rest;
+    setQueuedMessages(rest);
+    return drained.map(({ text }) => text);
+  }, []);
+  const popNextSegment = (0, import_react135.useCallback)(() => {
+    const current = queueRef.current;
+    if (current.length === 0) return null;
+    const [head, ...rest] = current;
+    queueRef.current = rest;
+    setQueuedMessages(rest);
+    return head.text;
+  }, []);
+  return {
+    messageQueue: queuedMessages.map(({ text }) => text),
+    addMessage,
+    clearQueue,
+    getQueuedMessagesText,
+    popAllMessages,
+    restoreMessages,
+    drainQueue,
+    popNextSegment
+  };
+}
+__name(useMessageQueue, "useMessageQueue");
+
+// packages/cli/src/ui/hooks/useGeminiStream.ts
 var debugLogger36 = createDebugLogger("GEMINI_STREAM");
 function applyModelOverride(modelOverrideRef, inlineActiveRef, value, isInline) {
   modelOverrideRef.current = value;
@@ -35615,16 +35834,16 @@ function charIndexAfterLine(text, keptLines) {
 }
 __name(charIndexAfterLine, "charIndexAfterLine");
 var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, config, isConfigInitialized, settings, onDebugMessage, handleSlashCommand, shellModeActive, getPreferredEditor, onAuthError, performMemoryRefresh, modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError, onEditorClose, onCancelSubmit, setShellInputFocused, terminalWidth, terminalHeight, midTurnDrainRef, logger, availableTerminalHeightRef, terminalWidthRef, midTurnRestoreRef) => {
-  const [initError, setInitError] = (0, import_react134.useState)(null);
-  const abortControllerRef = (0, import_react134.useRef)(null);
-  const flushBufferedStreamEventsRef = (0, import_react134.useRef)(/* @__PURE__ */ new Set());
-  const turnCancelledRef = (0, import_react134.useRef)(false);
-  const isSubmittingQueryRef = (0, import_react134.useRef)(false);
-  const lastPromptRef = (0, import_react134.useRef)(null);
-  const lastTurnUserItemRef = (0, import_react134.useRef)(null);
-  const turnSawContentEventRef = (0, import_react134.useRef)(false);
-  const lastPromptErroredRef = (0, import_react134.useRef)(false);
-  const commitItem = (0, import_react134.useCallback)(
+  const [initError, setInitError] = (0, import_react136.useState)(null);
+  const abortControllerRef = (0, import_react136.useRef)(null);
+  const flushBufferedStreamEventsRef = (0, import_react136.useRef)(/* @__PURE__ */ new Set());
+  const turnCancelledRef = (0, import_react136.useRef)(false);
+  const isSubmittingQueryRef = (0, import_react136.useRef)(false);
+  const lastPromptRef = (0, import_react136.useRef)(null);
+  const lastTurnUserItemRef = (0, import_react136.useRef)(null);
+  const turnSawContentEventRef = (0, import_react136.useRef)(false);
+  const lastPromptErroredRef = (0, import_react136.useRef)(false);
+  const commitItem = (0, import_react136.useCallback)(
     (item, userMessageTimestamp) => {
       if (item.type === "gemini" && !item.timestamp) {
         item.timestamp = Date.now();
@@ -35634,17 +35853,17 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [addItem]
   );
   const dualOutput = useDualOutput();
-  const [isResponding, setIsResponding] = (0, import_react134.useState)(false);
-  const activeModelStreamsRef = (0, import_react134.useRef)(0);
-  const [thought, setThought] = (0, import_react134.useState)(null);
-  const historyRef = (0, import_react134.useRef)(history);
-  (0, import_react134.useLayoutEffect)(() => {
+  const [isResponding, setIsResponding] = (0, import_react136.useState)(false);
+  const activeModelStreamsRef = (0, import_react136.useRef)(0);
+  const [thought, setThought] = (0, import_react136.useState)(null);
+  const historyRef = (0, import_react136.useRef)(history);
+  (0, import_react136.useLayoutEffect)(() => {
     historyRef.current = history;
   }, [history]);
-  const auxiliaryAbortRefsRef = (0, import_react134.useRef)(/* @__PURE__ */ new Set());
+  const auxiliaryAbortRefsRef = (0, import_react136.useRef)(/* @__PURE__ */ new Set());
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
   const [pendingThoughtItem, pendingThoughtItemRef, setPendingThoughtItem] = useStateAndRef(null);
-  const thoughtStartTimeRef = (0, import_react134.useRef)(null);
+  const thoughtStartTimeRef = (0, import_react136.useRef)(null);
   const [
     pendingRetryErrorItem,
     pendingRetryErrorItemRef,
@@ -35655,21 +35874,21 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     pendingRetryCountdownItemRef,
     setPendingRetryCountdownItem
   ] = useStateAndRef(null);
-  const retryCountdownTimerRef = (0, import_react134.useRef)(
+  const retryCountdownTimerRef = (0, import_react136.useRef)(
     null
   );
-  const processedMemoryToolsRef = (0, import_react134.useRef)(/* @__PURE__ */ new Set());
-  const submitPromptOnCompleteRef = (0, import_react134.useRef)(null);
-  const modelOverrideRef = (0, import_react134.useRef)(void 0);
-  const inlineModelOverrideActiveRef = (0, import_react134.useRef)(false);
-  const handledProviderToolCallIdsRef = (0, import_react134.useRef)(/* @__PURE__ */ new Set());
-  const duplicateProviderToolCallResponseIdsRef = (0, import_react134.useRef)(
+  const processedMemoryToolsRef = (0, import_react136.useRef)(/* @__PURE__ */ new Set());
+  const submitPromptOnCompleteRef = (0, import_react136.useRef)(null);
+  const modelOverrideRef = (0, import_react136.useRef)(void 0);
+  const inlineModelOverrideActiveRef = (0, import_react136.useRef)(false);
+  const handledProviderToolCallIdsRef = (0, import_react136.useRef)(/* @__PURE__ */ new Set());
+  const duplicateProviderToolCallResponseIdsRef = (0, import_react136.useRef)(
     /* @__PURE__ */ new Set()
   );
-  const pendingDuplicateToolResponsesRef = (0, import_react134.useRef)([]);
-  const immediateDuplicateToolResponsesRef = (0, import_react134.useRef)(null);
-  const streamingResponseLengthRef = (0, import_react134.useRef)(0);
-  const [isReceivingContent, setIsReceivingContent] = (0, import_react134.useState)(false);
+  const pendingDuplicateToolResponsesRef = (0, import_react136.useRef)([]);
+  const immediateDuplicateToolResponsesRef = (0, import_react136.useRef)(null);
+  const streamingResponseLengthRef = (0, import_react136.useRef)(0);
+  const [isReceivingContent, setIsReceivingContent] = (0, import_react136.useState)(false);
   const {
     startNewPrompt,
     getPromptCount,
@@ -35694,11 +35913,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     getPreferredEditor,
     onEditorClose
   );
-  const pendingToolCallGroupDisplay = (0, import_react134.useMemo)(
+  const pendingToolCallGroupDisplay = (0, import_react136.useMemo)(
     () => toolCalls.length ? mapToDisplay(toolCalls, config.getProjectRoot()) : void 0,
     [toolCalls, config]
   );
-  const activeToolPtyId = (0, import_react134.useMemo)(() => {
+  const activeToolPtyId = (0, import_react136.useMemo)(() => {
     const executingShellTool = toolCalls?.find(
       (tc) => tc.status === "executing" && tc.request.name === "run_shell_command"
     );
@@ -35707,18 +35926,18 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
     return void 0;
   }, [toolCalls]);
-  const loopDetectedRef = (0, import_react134.useRef)(false);
+  const loopDetectedRef = (0, import_react136.useRef)(false);
   const [
     loopDetectionConfirmationRequest,
     setLoopDetectionConfirmationRequest
-  ] = (0, import_react134.useState)(null);
-  const stopRetryCountdownTimer = (0, import_react134.useCallback)(() => {
+  ] = (0, import_react136.useState)(null);
+  const stopRetryCountdownTimer = (0, import_react136.useCallback)(() => {
     if (retryCountdownTimerRef.current) {
       clearInterval(retryCountdownTimerRef.current);
       retryCountdownTimerRef.current = null;
     }
   }, []);
-  const clearRetryCountdown = (0, import_react134.useCallback)(() => {
+  const clearRetryCountdown = (0, import_react136.useCallback)(() => {
     stopRetryCountdownTimer();
     skipRetryDelayRef.current = null;
     setPendingRetryErrorItem(null);
@@ -35728,8 +35947,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     setPendingRetryCountdownItem,
     stopRetryCountdownTimer
   ]);
-  const skipRetryDelayRef = (0, import_react134.useRef)(null);
-  const startRetryCountdown = (0, import_react134.useCallback)(
+  const skipRetryDelayRef = (0, import_react136.useRef)(null);
+  const startRetryCountdown = (0, import_react136.useCallback)(
     (retryInfo) => {
       stopRetryCountdownTimer();
       skipRetryDelayRef.current = retryInfo.skipDelay;
@@ -35770,8 +35989,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       stopRetryCountdownTimer
     ]
   );
-  (0, import_react134.useEffect)(() => () => stopRetryCountdownTimer(), [stopRetryCountdownTimer]);
-  const onExec = (0, import_react134.useCallback)(async (done) => {
+  (0, import_react136.useEffect)(() => () => stopRetryCountdownTimer(), [stopRetryCountdownTimer]);
+  const onExec = (0, import_react136.useCallback)(async (done) => {
     setIsResponding(true);
     await done;
     setIsResponding(false);
@@ -35788,12 +36007,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     terminalHeight
   );
   const activePtyId = activeShellPtyId || activeToolPtyId;
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     if (!activePtyId) {
       setShellInputFocused(false);
     }
   }, [activePtyId, setShellInputFocused]);
-  const streamingState = (0, import_react134.useMemo)(() => {
+  const streamingState = (0, import_react136.useMemo)(() => {
     if (toolCalls.some((tc) => tc.status === "awaiting_approval")) {
       return "waiting_for_confirmation" /* WaitingForConfirmation */;
     }
@@ -35811,11 +36030,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
     return "idle" /* Idle */;
   }, [isResponding, toolCalls]);
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
-      const lastUserMessageIndex = history.findLastIndex(
-        (item) => item.type === "user" /* USER */
-      );
+      const lastUserMessageIndex = findLastUserItemIndex(history);
       const turnCount = lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
       if (turnCount > 0) {
         logConversationFinishedEvent(
@@ -35825,7 +36042,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     }
   }, [streamingState, config, history]);
-  const cancelOngoingRequest = (0, import_react134.useCallback)(() => {
+  const cancelOngoingRequest = (0, import_react136.useCallback)(() => {
     if (streamingState !== "responding" /* Responding */) {
       return;
     }
@@ -35896,7 +36113,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     config,
     getPromptCount
   ]);
-  const applyVisionBridgeIfNeeded = (0, import_react134.useCallback)(
+  const applyVisionBridgeIfNeeded = (0, import_react136.useCallback)(
     async (parts, timestamp, signal) => {
       if (parts === null || !hasImageParts(parts)) {
         return { parts, shouldProceed: true };
@@ -35961,7 +36178,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, config]
   );
-  const prepareQueryForGemini = (0, import_react134.useCallback)(
+  const prepareQueryForGemini = (0, import_react136.useCallback)(
     async (query, userMessageTimestamp, abortSignal, prompt_id, submitType) => {
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
@@ -36112,7 +36329,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       applyVisionBridgeIfNeeded
     ]
   );
-  const handleContentEvent = (0, import_react134.useCallback)(
+  const handleContentEvent = (0, import_react136.useCallback)(
     (eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return "";
@@ -36237,7 +36454,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       terminalWidthRef
     ]
   );
-  const mergeThought = (0, import_react134.useCallback)(
+  const mergeThought = (0, import_react136.useCallback)(
     (incoming) => {
       setThought((prev) => {
         const incomingDescription = incoming.description ? clampLoadingThoughtDescription(incoming.description) : incoming.description;
@@ -36266,7 +36483,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [setThought]
   );
-  const handleThoughtEvent = (0, import_react134.useCallback)(
+  const handleThoughtEvent = (0, import_react136.useCallback)(
     (eventValue, currentThoughtBuffer, userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return "";
@@ -36328,7 +36545,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, mergeThought, pendingThoughtItemRef, setPendingThoughtItem]
   );
-  const commitPendingThought = (0, import_react134.useCallback)(
+  const commitPendingThought = (0, import_react136.useCallback)(
     (userMessageTimestamp) => {
       if (pendingThoughtItemRef.current) {
         const item = { ...pendingThoughtItemRef.current };
@@ -36342,7 +36559,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, pendingThoughtItemRef, setPendingThoughtItem]
   );
-  const handleUserCancelledEvent = (0, import_react134.useCallback)(
+  const handleUserCancelledEvent = (0, import_react136.useCallback)(
     (userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return;
@@ -36382,7 +36599,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       clearRetryCountdown
     ]
   );
-  const handleErrorEvent = (0, import_react134.useCallback)(
+  const handleErrorEvent = (0, import_react136.useCallback)(
     (eventValue, userMessageTimestamp) => {
       lastPromptErroredRef.current = true;
       commitPendingThought(userMessageTimestamp);
@@ -36425,7 +36642,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       clearRetryCountdown
     ]
   );
-  const handleCitationEvent = (0, import_react134.useCallback)(
+  const handleCitationEvent = (0, import_react136.useCallback)(
     (text, userMessageTimestamp) => {
       if (!showCitations(settings)) {
         return;
@@ -36444,7 +36661,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       settings
     ]
   );
-  const handleFinishedEvent = (0, import_react134.useCallback)(
+  const handleFinishedEvent = (0, import_react136.useCallback)(
     (event, userMessageTimestamp) => {
       const finishReason = event.value.reason;
       if (!finishReason) {
@@ -36485,8 +36702,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, clearRetryCountdown]
   );
-  const autonomousLoopTickResolverRef = (0, import_react134.useRef)(null);
-  const handleChatCompressionEvent = (0, import_react134.useCallback)(
+  const autonomousLoopTickResolverRef = (0, import_react136.useRef)(null);
+  const handleChatCompressionEvent = (0, import_react136.useCallback)(
     (eventValue, userMessageTimestamp) => {
       autonomousLoopTickResolverRef.current?.resetCache();
       if (pendingHistoryItemRef.current) {
@@ -36505,7 +36722,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItem, config, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleMaxSessionTurnsEvent = (0, import_react134.useCallback)(
+  const handleMaxSessionTurnsEvent = (0, import_react136.useCallback)(
     () => addItem(
       {
         type: "info",
@@ -36515,7 +36732,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ),
     [addItem, config]
   );
-  const handleSessionTokenLimitExceededEvent = (0, import_react134.useCallback)(
+  const handleSessionTokenLimitExceededEvent = (0, import_react136.useCallback)(
     (value) => addItem(
       {
         type: "error",
@@ -36530,7 +36747,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ),
     [addItem]
   );
-  const handleLoopDetectionConfirmation = (0, import_react134.useCallback)(
+  const handleLoopDetectionConfirmation = (0, import_react136.useCallback)(
     (result) => {
       setLoopDetectionConfirmationRequest(null);
       if (result.userSelection === "disable") {
@@ -36554,12 +36771,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [config, addItem]
   );
-  const handleLoopDetectedEvent = (0, import_react134.useCallback)(() => {
+  const handleLoopDetectedEvent = (0, import_react136.useCallback)(() => {
     setLoopDetectionConfirmationRequest({
       onComplete: handleLoopDetectionConfirmation
     });
   }, [handleLoopDetectionConfirmation]);
-  const handleUserPromptSubmitBlockedEvent = (0, import_react134.useCallback)(
+  const handleUserPromptSubmitBlockedEvent = (0, import_react136.useCallback)(
     (value, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -36576,7 +36793,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItem, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleStopHookLoopEvent = (0, import_react134.useCallback)(
+  const handleStopHookLoopEvent = (0, import_react136.useCallback)(
     (value, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -36610,7 +36827,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItem, config, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleActiveGoalEvent = (0, import_react134.useCallback)(
+  const handleActiveGoalEvent = (0, import_react136.useCallback)(
     (activeGoal) => {
       const sessionId = config.getSessionId();
       const currentActiveGoal = getActiveGoal(sessionId);
@@ -36628,7 +36845,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [config]
   );
-  const processGeminiStreamEvents = (0, import_react134.useCallback)(
+  const processGeminiStreamEvents = (0, import_react136.useCallback)(
     async (stream, userMessageTimestamp, signal) => {
       let geminiMessageBuffer = "";
       let thoughtBuffer = "";
@@ -36742,7 +36959,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               flushBufferedStreamEvents();
               toolCallRequests.length = 0;
               handleUserCancelledEvent(userMessageTimestamp);
-              break;
+              return 1 /* UserCancelled */;
             case "error" /* Error */:
               flushBufferedStreamEvents();
               handleErrorEvent(event.value, userMessageTimestamp);
@@ -36867,11 +37084,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         commitPendingThought(userMessageTimestamp);
         discardBufferedStreamEvents();
         flushBufferedStreamEventsRef.current.delete(flushBufferedStreamEvents);
+        dualOutput?.finalizeAssistantMessage();
       }
-      dualOutput?.finalizeAssistantMessage();
       if (toolCallRequests.length > 0 && !signal.aborted && !loopDetectedRef.current) {
         const executableToolCallRequests = [];
-        const duplicateResponseParts = [];
+        const duplicateResponses = [];
         let duplicatePromptId;
         const historyCallIdsWithResponse = geminiClient ? geminiClient.getHistoryFunctionResponseIds() : /* @__PURE__ */ new Set();
         const handledProviderIds = /* @__PURE__ */ new Set([
@@ -36907,26 +37124,27 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               `[processGeminiStreamEvents] Suppressing duplicate provider tool-call id: ${providerCallId} (tool: ${request.name})`
             );
             dualOutput?.emitToolResult(request, response);
-            duplicateResponseParts.push(...response.responseParts);
+            duplicateResponses.push({ request, response });
             duplicatePromptId ??= request.prompt_id;
             continue;
           }
           handledProviderToolCallIdsRef.current.add(providerCallId);
           executableToolCallRequests.push(request);
         }
-        if (duplicateResponseParts.length > 0) {
+        if (duplicateResponses.length > 0) {
           if (executableToolCallRequests.length > 0) {
             pendingDuplicateToolResponsesRef.current.push({
               executableCallIds: new Set(
                 executableToolCallRequests.map((request) => request.callId)
               ),
               promptId: duplicatePromptId ?? executableToolCallRequests[0]?.prompt_id,
-              responseParts: duplicateResponseParts
+              callOrder: toolCallRequests.map((request) => request.callId),
+              duplicateResponses
             });
           } else {
             immediateDuplicateToolResponsesRef.current = {
               promptId: duplicatePromptId,
-              responseParts: duplicateResponseParts
+              responses: duplicateResponses
             };
           }
         }
@@ -36967,14 +37185,38 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       dualOutput
     ]
   );
-  const resolveSteeredMessages = (0, import_react134.useCallback)(
+  const resolveSteeredMessages = (0, import_react136.useCallback)(
     async (messages, signal) => {
-      const resolvedMessages = [];
+      const resolvedSegments = [];
       const resolvedForRecording = [];
+      const restoreMessages = [];
+      let pendingGoalSegmentIndex;
       const timestamp = Date.now();
       for (let index = 0; index < messages.length; index += 1) {
-        if (signal.aborted) break;
+        if (signal.aborted) {
+          restoreMessages.push(...messages.slice(index));
+          break;
+        }
         const message = messages[index];
+        if (GOAL_COMMAND_RE.test(message)) {
+          const activeGoalBeforeCommand = getActiveGoal(config.getSessionId());
+          const result = await handleSlashCommand(message);
+          const activeGoalAfterCommand = getActiveGoal(config.getSessionId());
+          if (result && result.type === "submit_prompt") {
+            if (pendingGoalSegmentIndex !== void 0) {
+              resolvedSegments[pendingGoalSegmentIndex] = [];
+            }
+            pendingGoalSegmentIndex = resolvedSegments.length;
+            resolvedSegments.push(normalizePartList(result.content));
+          } else if (activeGoalBeforeCommand?.hookId !== activeGoalAfterCommand?.hookId) {
+            if (pendingGoalSegmentIndex !== void 0) {
+              resolvedSegments[pendingGoalSegmentIndex] = [];
+              pendingGoalSegmentIndex = void 0;
+            }
+          }
+          continue;
+        }
+        restoreMessages.push(message);
         const sideEffects = [];
         let resolvedQuery = [{ text: message }];
         if (isAtCommand(message)) {
@@ -37037,7 +37279,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           } finally {
             clearTimeout(timeoutId);
           }
-          if (signal.aborted) break;
+          if (signal.aborted) {
+            restoreMessages.push(...messages.slice(index + 1));
+            break;
+          }
         }
         const bridgeResult = await applyVisionBridgeIfNeeded(
           resolvedQuery,
@@ -37045,7 +37290,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           signal
         );
         if (!bridgeResult.shouldProceed) {
-          if (signal.aborted) break;
+          if (signal.aborted) {
+            restoreMessages.push(...messages.slice(index + 1));
+            break;
+          }
           continue;
         }
         const messageParts = normalizePartList(
@@ -37063,42 +37311,60 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             )
           );
         }
-        if (resolvedMessages.length > 0 && messageParts.length > 0) {
-          resolvedMessages.push({ text: "\n\n" });
-        }
-        resolvedMessages.push(...messageParts);
+        resolvedSegments.push(messageParts);
         resolvedForRecording.push({
           message,
           parts: messageParts,
           sideEffects
         });
       }
-      if (signal.aborted) return void 0;
+      const resolvedMessages = [];
+      for (const segment of resolvedSegments) {
+        if (segment.length === 0) continue;
+        if (resolvedMessages.length > 0) {
+          resolvedMessages.push({ text: "\n\n" });
+        }
+        resolvedMessages.push(...segment);
+      }
       return {
         parts: resolvedMessages,
+        restoreMessages,
         accept: /* @__PURE__ */ __name(() => {
           for (const { message, parts, sideEffects } of resolvedForRecording) {
             for (const sideEffect of sideEffects) sideEffect();
             config.getChatRecordingService?.()?.recordMidTurnUserMessage(parts, message);
             addItem(
-              { type: "notification" /* NOTIFICATION */, text: message },
+              {
+                type: "user" /* USER */,
+                text: message,
+                // Intentionally false: preserves isRealUserTurn/rewind semantics (steer is not a standalone user turn).
+                sentToModel: false
+              },
               Date.now()
             );
           }
         }, "accept")
       };
     },
-    [addItem, applyVisionBridgeIfNeeded, config, onDebugMessage]
+    [
+      addItem,
+      applyVisionBridgeIfNeeded,
+      config,
+      handleSlashCommand,
+      onDebugMessage
+    ]
   );
-  const resolveDrainedSteerMessages = (0, import_react134.useCallback)(
+  const resolveDrainedSteerMessages = (0, import_react136.useCallback)(
     async (messages, signal) => {
       try {
         const resolved = await resolveSteeredMessages(messages, signal);
         if (signal.aborted) {
-          midTurnRestoreRef?.current?.(messages);
+          if (resolved.restoreMessages.length > 0) {
+            midTurnRestoreRef?.current?.(resolved.restoreMessages);
+          }
           return void 0;
         }
-        if (!resolved || resolved.parts.length === 0) return void 0;
+        if (resolved.parts.length === 0) return void 0;
         let settled = false;
         return {
           parts: resolved.parts,
@@ -37110,7 +37376,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           restore: /* @__PURE__ */ __name(() => {
             if (settled) return;
             settled = true;
-            midTurnRestoreRef?.current?.(messages);
+            if (resolved.restoreMessages.length > 0) {
+              midTurnRestoreRef?.current?.(resolved.restoreMessages);
+            }
           }, "restore")
         };
       } catch (error) {
@@ -37123,7 +37391,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [midTurnRestoreRef, onDebugMessage, resolveSteeredMessages]
   );
-  const drainSteerAtBoundary = (0, import_react134.useCallback)(
+  const drainSteerAtBoundary = (0, import_react136.useCallback)(
     async (signal) => {
       const messages = midTurnDrainRef?.current?.() ?? [];
       if (messages.length === 0) return void 0;
@@ -37131,7 +37399,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [midTurnDrainRef, resolveDrainedSteerMessages]
   );
-  const submitQuery = (0, import_react134.useCallback)(
+  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);
       const isTurnContinuation = submitType === "toolResult" /* ToolResult */ || submitType === "steer" /* Steer */;
@@ -37242,6 +37510,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         if (!isTurnContinuation) {
           streamingResponseLengthRef.current = 0;
         }
+        let cleanupReviewLease = false;
         try {
           if (dualOutput && submitType !== "toolResult" /* ToolResult */) {
             const rawParts = typeof finalQueryToSend === "string" ? [finalQueryToSend] : Array.isArray(finalQueryToSend) ? finalQueryToSend : [finalQueryToSend];
@@ -37268,6 +37537,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             abortSignal
           );
           if (processingStatus === 1 /* UserCancelled */) {
+            cleanupReviewLease = true;
             submitPromptOnCompleteRef.current = null;
             isSubmittingQueryRef.current = false;
             metadata?.onDeliveryFailed?.();
@@ -37280,8 +37550,33 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           const immediateDuplicateToolResponses = immediateDuplicateToolResponsesRef.current;
           if (immediateDuplicateToolResponses) {
             immediateDuplicateToolResponsesRef.current = null;
+            const finalized = await finalizeToolResponses(
+              config,
+              immediateDuplicateToolResponses.responses.map(
+                ({ request, response }) => ({
+                  callId: request.callId,
+                  toolName: request.name,
+                  responseParts: response.responseParts,
+                  persistedOutputFiles: response.persistedOutputFiles
+                })
+              )
+            );
+            const responseParts = finalized.flatMap(
+              (entry) => entry.responseParts
+            );
+            immediateDuplicateToolResponses.responses.forEach(
+              ({ request, response }, index) => {
+                config.getChatRecordingService?.()?.recordToolResult?.(finalized[index].responseParts, {
+                  callId: request.callId,
+                  status: response.error ? "error" : "success",
+                  resultDisplay: response.resultDisplay,
+                  error: response.error,
+                  errorType: response.errorType
+                });
+              }
+            );
             await submitQuery(
-              immediateDuplicateToolResponses.responseParts,
+              responseParts,
               "toolResult" /* ToolResult */,
               immediateDuplicateToolResponses.promptId
             );
@@ -37291,6 +37586,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           }
           const loopDetected = loopDetectedRef.current;
           if (loopDetected) {
+            cleanupReviewLease = true;
             loopDetectedRef.current = false;
             handleLoopDetectedEvent();
           }
@@ -37324,6 +37620,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             }
           }
         } catch (error) {
+          cleanupReviewLease = true;
           metadata?.onDeliveryFailed?.();
           if (error instanceof UnauthorizedError) {
             onAuthError("Session expired or is unauthorized.");
@@ -37340,6 +37637,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             });
           }
         } finally {
+          if (cleanupReviewLease) {
+            cleanupReviewWorktreeLeases({
+              sessionId: config.getSessionId(),
+              promptId: prompt_id,
+              repositoryRoot: config.getProjectRoot()
+            });
+          }
           submitPromptOnCompleteRef.current = null;
           activeModelStreamsRef.current = Math.max(
             0,
@@ -37378,7 +37682,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       midTurnDrainRef
     ]
   );
-  const retryLastPrompt = (0, import_react134.useCallback)(async () => {
+  const retryLastPrompt = (0, import_react136.useCallback)(async () => {
     if (skipRetryDelayRef.current) {
       skipRetryDelayRef.current();
       skipRetryDelayRef.current = null;
@@ -37402,7 +37706,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     clearRetryCountdown();
     await submitQuery(lastPrompt, "retry" /* Retry */);
   }, [streamingState, addItem, clearRetryCountdown, submitQuery]);
-  const handleApprovalModeChange = (0, import_react134.useCallback)(
+  const handleApprovalModeChange = (0, import_react136.useCallback)(
     async (newApprovalMode) => {
       if (newApprovalMode === "yolo" /* YOLO */ || newApprovalMode === "auto-edit" /* AUTO_EDIT */) {
         let awaitingApprovalCalls = toolCalls.filter(
@@ -37437,7 +37741,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [toolCalls]
   );
-  const handleCompletedTools = (0, import_react134.useCallback)(
+  const handleCompletedTools = (0, import_react136.useCallback)(
     async (completedToolCallsFromScheduler) => {
       const completedAndReadyToSubmitTools = completedToolCallsFromScheduler.filter(
         (tc) => {
@@ -37517,8 +37821,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
         return !isReady;
       });
-      const pendingDuplicateResponseParts = readyDuplicateBatches.flatMap(
-        (batch) => batch.responseParts
+      const pendingDuplicateResponses = readyDuplicateBatches.flatMap(
+        (batch) => batch.duplicateResponses
       );
       const pendingDuplicatePromptId = readyDuplicateBatches[0]?.promptId;
       for (const toolCall of geminiTools) {
@@ -37527,9 +37831,67 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           toolCall.request.args
         );
       }
-      if (geminiTools.length === 0 && pendingDuplicateResponseParts.length === 0) {
+      if (geminiTools.length === 0 && pendingDuplicateResponses.length === 0) {
         return;
       }
+      const executableQueues = /* @__PURE__ */ new Map();
+      for (const toolCall of geminiTools) {
+        const queue = executableQueues.get(toolCall.request.callId) ?? [];
+        queue.push({
+          request: toolCall.request,
+          response: toolCall.response,
+          status: toolCall.status
+        });
+        executableQueues.set(toolCall.request.callId, queue);
+      }
+      const duplicateQueues = /* @__PURE__ */ new Map();
+      for (const duplicate of pendingDuplicateResponses) {
+        const queue = duplicateQueues.get(duplicate.request.callId) ?? [];
+        queue.push({
+          ...duplicate,
+          status: duplicate.response.error ? "error" : "success"
+        });
+        duplicateQueues.set(duplicate.request.callId, queue);
+      }
+      const orderedResponses = [];
+      for (const batch of readyDuplicateBatches) {
+        for (const callId of batch.callOrder) {
+          const executable = executableQueues.get(callId)?.shift();
+          if (executable) {
+            orderedResponses.push(executable);
+            continue;
+          }
+          const duplicate = duplicateQueues.get(callId)?.shift();
+          if (duplicate) orderedResponses.push(duplicate);
+        }
+      }
+      for (const queue of executableQueues.values()) {
+        orderedResponses.push(...queue);
+      }
+      for (const queue of duplicateQueues.values()) {
+        orderedResponses.push(...queue);
+      }
+      const finalizedResponses = await finalizeToolResponses(
+        config,
+        orderedResponses.map(({ request, response }) => ({
+          callId: request.callId,
+          toolName: request.name,
+          responseParts: response.responseParts,
+          persistedOutputFiles: response.persistedOutputFiles
+        }))
+      );
+      const responsesToSend = finalizedResponses.flatMap(
+        (entry) => entry.responseParts
+      );
+      orderedResponses.forEach(({ request, response, status }, index) => {
+        config.getChatRecordingService?.()?.recordToolResult?.(finalizedResponses[index].responseParts, {
+          callId: request.callId,
+          status,
+          resultDisplay: response.resultDisplay,
+          error: response.error,
+          errorType: response.errorType
+        });
+      });
       if (turnCancelledRef.current || abortControllerRef.current?.signal.aborted) {
         markToolsAsSubmitted(
           geminiTools.map((toolCall) => toolCall.request.callId)
@@ -37539,14 +37901,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       const allToolsCancelled = geminiTools.every(
         (tc) => tc.status === "cancelled"
       );
-      if (allToolsCancelled && pendingDuplicateResponseParts.length === 0) {
+      if (allToolsCancelled && pendingDuplicateResponses.length === 0) {
         if (geminiClient) {
-          const combinedParts = geminiTools.flatMap(
-            (toolCall) => toolCall.response.responseParts
-          );
           geminiClient.addHistory({
             role: "user",
-            parts: combinedParts
+            parts: responsesToSend
           });
           config.getArenaAgentClient()?.reportCancelled();
         }
@@ -37556,10 +37915,6 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         markToolsAsSubmitted(callIdsToMarkAsSubmitted2);
         return;
       }
-      const responsesToSend = geminiTools.flatMap(
-        (toolCall) => toolCall.response.responseParts
-      );
-      responsesToSend.push(...pendingDuplicateResponseParts);
       const callIdsToMarkAsSubmitted = geminiTools.map(
         (toolCall) => toolCall.request.callId
       );
@@ -37642,6 +37997,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (modelSwitchedFromQuotaError) {
         return;
       }
+      const backgroundTaskRegistry = config.getBackgroundTaskRegistry();
+      const backgroundLaunchExhaustedCapacity = backgroundTaskRegistry.getMaxConcurrentBackgroundAgents() === 1 && !backgroundTaskRegistry.canStartBackgroundAgent() && geminiTools.some((toolCall) => {
+        const display = toolCall.response.resultDisplay;
+        return toolCall.request.name === ToolNames.AGENT && typeof display === "object" && display !== null && "type" in display && "status" in display && display.type === "task_execution" && display.status === "background";
+      });
+      if (backgroundLaunchExhaustedCapacity) {
+        geminiClient?.addHistory({ role: "user", parts: responsesToSend });
+        return;
+      }
       const drained = turnCancelledRef.current || abortControllerRef.current?.signal.aborted ? [] : midTurnDrainRef?.current?.() ?? [];
       let drainedSteer;
       if (drained.length > 0) {
@@ -37688,7 +38052,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       resolveDrainedSteerMessages
     ]
   );
-  const pendingHistoryItems = (0, import_react134.useMemo)(
+  const pendingHistoryItems = (0, import_react136.useMemo)(
     () => [
       // Reasoning renders above the streaming answer.
       pendingThoughtItem,
@@ -37705,7 +38069,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       pendingToolCallGroupDisplay
     ]
   );
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     const saveRestorableToolCalls = /* @__PURE__ */ __name(async () => {
       if (!config.getFileCheckpointingEnabled()) {
         return;
@@ -37776,14 +38140,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }, "saveRestorableToolCalls");
     saveRestorableToolCalls();
   }, [toolCalls, config, onDebugMessage, history, geminiClient, storage]);
-  const notificationQueueRef = (0, import_react134.useRef)([]);
-  const [notificationTrigger, setNotificationTrigger] = (0, import_react134.useState)(0);
-  const getAutonomousLoopTickResolver = (0, import_react134.useCallback)(() => {
+  const notificationQueueRef = (0, import_react136.useRef)([]);
+  const [notificationTrigger, setNotificationTrigger] = (0, import_react136.useState)(0);
+  const getAutonomousLoopTickResolver = (0, import_react136.useCallback)(() => {
     autonomousLoopTickResolverRef.current ??= new AutonomousLoopTickResolver();
     return autonomousLoopTickResolverRef.current;
   }, []);
-  const notificationQueueSessionIdRef = (0, import_react134.useRef)(sessionStates.sessionId);
-  (0, import_react134.useEffect)(() => {
+  const notificationQueueSessionIdRef = (0, import_react136.useRef)(sessionStates.sessionId);
+  (0, import_react136.useEffect)(() => {
     if (notificationQueueSessionIdRef.current === sessionStates.sessionId) {
       return;
     }
@@ -37791,9 +38155,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     notificationQueueRef.current = [];
     autonomousLoopTickResolverRef.current?.resetCache();
   }, [sessionStates.sessionId]);
-  const cronSessionIdRef = (0, import_react134.useRef)(sessionStates.sessionId);
+  const cronSessionIdRef = (0, import_react136.useRef)(sessionStates.sessionId);
   cronSessionIdRef.current = sessionStates.sessionId;
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     if (!isConfigInitialized) return;
     if (!config.isCronEnabled()) return;
     const scheduler = config.getCronScheduler();
@@ -37846,7 +38210,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     };
   }, [config, getAutonomousLoopTickResolver, isConfigInitialized]);
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     const registry = config.getBackgroundTaskRegistry();
     registry.setNotificationCallback((displayText, modelText) => {
       notificationQueueRef.current.push({
@@ -37860,7 +38224,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       registry.setNotificationCallback(void 0);
     };
   }, [config]);
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     const registry = config.getBackgroundShellRegistry();
     registry.setNotificationCallback((displayText, modelText) => {
       notificationQueueRef.current.push({
@@ -37874,7 +38238,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       registry.setNotificationCallback(void 0);
     };
   }, [config]);
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     const registry = config.getMonitorRegistry();
     registry.setNotificationCallback((displayText, modelText, meta) => {
       if (meta.status === "running" && typeof registry.get === "function") {
@@ -37884,7 +38248,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       notificationQueueRef.current.push({
         displayText,
         modelText,
-        sendMessageType: "notification" /* Notification */
+        sendMessageType: "notification" /* Notification */,
+        monitor: { id: meta.monitorId, status: meta.status }
       });
       setNotificationTrigger((n) => n + 1);
     });
@@ -37892,42 +38257,57 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       registry.setNotificationCallback(void 0);
     };
   }, [config]);
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && notificationQueueRef.current.length > 0) {
-      const queue = notificationQueueRef.current;
-      const targetType = queue[0].sendMessageType;
-      if (targetType === "cron" /* Cron */) {
-        const item = queue.shift();
-        addItem(
-          { type: "notification", text: item.displayText },
-          Date.now()
-        );
-        submitQuery(item.modelText, item.sendMessageType, void 0, {
-          notificationDisplayText: item.displayText,
-          onDelivered: item.onDelivered,
-          onDeliveryFailed: item.onDeliveryFailed
+      runOutsideAgentContext(() => {
+        const queue = notificationQueueRef.current;
+        const monitorRegistry = config.getMonitorRegistry();
+        for (let i = queue.length - 1; i >= 0; i--) {
+          const monitor = queue[i].monitor;
+          if (monitor?.status === "running" && monitorRegistry.get(monitor.id)?.status === "cancelled") {
+            queue.splice(i, 1);
+          }
+        }
+        if (queue.length === 0) {
+          return;
+        }
+        const targetType = queue[0].sendMessageType;
+        if (targetType === "cron" /* Cron */) {
+          const item = queue.shift();
+          addItem(
+            { type: "notification", text: item.displayText },
+            Date.now()
+          );
+          submitQuery(item.modelText, item.sendMessageType, void 0, {
+            notificationDisplayText: item.displayText,
+            onDelivered: item.onDelivered,
+            onDeliveryFailed: item.onDeliveryFailed
+          });
+          return;
+        }
+        let splitIdx = 0;
+        while (splitIdx < queue.length && queue[splitIdx].sendMessageType === targetType) {
+          splitIdx++;
+        }
+        const batch = queue.splice(0, splitIdx);
+        const now = Date.now();
+        for (const item of batch) {
+          addItem(
+            { type: "notification", text: item.displayText },
+            now
+          );
+        }
+        const combinedModelText = batch.map((e) => e.modelText).join("\n\n");
+        const combinedDisplayText = batch.map((e) => e.displayText).join("; ");
+        submitQuery(combinedModelText, targetType, void 0, {
+          notificationDisplayText: combinedDisplayText
         });
-        return;
-      }
-      let splitIdx = 0;
-      while (splitIdx < queue.length && queue[splitIdx].sendMessageType === targetType) {
-        splitIdx++;
-      }
-      const batch = queue.splice(0, splitIdx);
-      const now = Date.now();
-      for (const item of batch) {
-        addItem({ type: "notification", text: item.displayText }, now);
-      }
-      const combinedModelText = batch.map((e) => e.modelText).join("\n\n");
-      const combinedDisplayText = batch.map((e) => e.displayText).join("; ");
-      submitQuery(combinedModelText, targetType, void 0, {
-        notificationDisplayText: combinedDisplayText
       });
     }
-  }, [streamingState, submitQuery, notificationTrigger, addItem]);
-  const teammateQueueRef = (0, import_react134.useRef)([]);
-  const [teammateTrigger, setTeammateTrigger] = (0, import_react134.useState)(0);
-  (0, import_react134.useEffect)(() => {
+  }, [streamingState, submitQuery, notificationTrigger, addItem, config]);
+  const teammateQueueRef = (0, import_react136.useRef)([]);
+  const [teammateTrigger, setTeammateTrigger] = (0, import_react136.useState)(0);
+  (0, import_react136.useEffect)(() => {
     let boundManager = null;
     const handleManagerChange = /* @__PURE__ */ __name((manager) => {
       if (boundManager && boundManager !== manager) {
@@ -37957,19 +38337,21 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     };
   }, [config]);
-  (0, import_react134.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && teammateQueueRef.current.length > 0) {
-      const batch = teammateQueueRef.current.splice(0);
-      for (const entry of batch) {
-        addItem(
-          { type: "notification", text: entry.display },
-          Date.now()
-        );
-      }
-      const modelText = batch.map((e) => e.modelText).join("\n\n");
-      const display = batch.map((e) => e.display).join("; ");
-      submitQuery(modelText, "teammate" /* Teammate */, void 0, {
-        notificationDisplayText: display
+      runOutsideAgentContext(() => {
+        const batch = teammateQueueRef.current.splice(0);
+        for (const entry of batch) {
+          addItem(
+            { type: "notification", text: entry.display },
+            Date.now()
+          );
+        }
+        const modelText = batch.map((e) => e.modelText).join("\n\n");
+        const display = batch.map((e) => e.display).join("; ");
+        submitQuery(modelText, "teammate" /* Teammate */, void 0, {
+          notificationDisplayText: display
+        });
       });
     }
   }, [streamingState, submitQuery, teammateTrigger, addItem]);
@@ -37992,7 +38374,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
 
 // packages/cli/src/ui/hooks/vim.ts
 init_esbuild_shims();
-var import_react135 = __toESM(require_react(), 1);
+var import_react137 = __toESM(require_react(), 1);
 import { execFile as execFile7, execFileSync as execFileSync2 } from "child_process";
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
@@ -38228,26 +38610,26 @@ __name(findCharInLineReverse, "findCharInLineReverse");
 function useVim(buffer, onSubmit) {
   const { vimEnabled, vimMode } = useVimModeState();
   const { setVimMode } = useVimModeActions();
-  const [state, dispatch] = (0, import_react135.useReducer)(vimReducer, initialVimState);
-  const bufferRef = (0, import_react135.useRef)(buffer);
-  const stateRef = (0, import_react135.useRef)(state);
+  const [state, dispatch] = (0, import_react137.useReducer)(vimReducer, initialVimState);
+  const bufferRef = (0, import_react137.useRef)(buffer);
+  const stateRef = (0, import_react137.useRef)(state);
   bufferRef.current = buffer;
   stateRef.current = state;
-  (0, import_react135.useEffect)(() => {
+  (0, import_react137.useEffect)(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
-  const updateMode = (0, import_react135.useCallback)(
+  const updateMode = (0, import_react137.useCallback)(
     (mode) => {
       setVimMode(mode);
       dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode]
   );
-  const getCurrentCount = (0, import_react135.useCallback)(
+  const getCurrentCount = (0, import_react137.useCallback)(
     () => stateRef.current.count || DEFAULT_COUNT,
     []
   );
-  const yankRange = (0, import_react135.useCallback)(
+  const yankRange = (0, import_react137.useCallback)(
     (startRow, startCol, endRow, endCol, linewise) => {
       const lines = bufferRef.current.lines;
       let text = "";
@@ -38262,7 +38644,7 @@ function useVim(buffer, onSubmit) {
     },
     []
   );
-  const executeCommand = (0, import_react135.useCallback)(
+  const executeCommand = (0, import_react137.useCallback)(
     (cmdType, count) => {
       switch (cmdType) {
         case CMD_TYPES.DELETE_WORD_FORWARD:
@@ -38663,7 +39045,7 @@ function useVim(buffer, onSubmit) {
     return { text, linewise: movement === "j" || movement === "k" };
   }
   __name(extractMovementText, "extractMovementText");
-  const executeFind = (0, import_react135.useCallback)(
+  const executeFind = (0, import_react137.useCallback)(
     (findType, char, count = 1) => {
       const [startRow, startCol] = buffer.cursor;
       const line = buffer.lines[startRow] ?? "";
@@ -38699,7 +39081,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch]
   );
-  const handleCharRead = (0, import_react135.useCallback)(
+  const handleCharRead = (0, import_react137.useCallback)(
     (char) => {
       const readType = state.pendingCharRead;
       if (!readType) return false;
@@ -38742,7 +39124,7 @@ function useVim(buffer, onSubmit) {
     },
     [state.pendingCharRead, buffer, dispatch, executeFind]
   );
-  const handleInsertModeInput = (0, import_react135.useCallback)(
+  const handleInsertModeInput = (0, import_react137.useCallback)(
     (normalizedKey) => {
       if (normalizedKey.name === "escape") {
         buffer.vimEscapeInsertMode();
@@ -38773,7 +39155,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch, updateMode, onSubmit]
   );
-  const normalizeKey = (0, import_react135.useCallback)(
+  const normalizeKey = (0, import_react137.useCallback)(
     (key) => ({
       name: key.name || "",
       sequence: key.sequence || "",
@@ -38784,7 +39166,7 @@ function useVim(buffer, onSubmit) {
     }),
     []
   );
-  const handleChangeMovement = (0, import_react135.useCallback)(
+  const handleChangeMovement = (0, import_react137.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -38805,7 +39187,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer, updateMode]
   );
-  const handleDeleteMovement = (0, import_react135.useCallback)(
+  const handleDeleteMovement = (0, import_react137.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       const [row, col] = bufferRef.current.cursor;
@@ -38840,7 +39222,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer]
   );
-  const handleYankMovement = (0, import_react135.useCallback)(
+  const handleYankMovement = (0, import_react137.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       const [row, col] = bufferRef.current.cursor;
@@ -38874,7 +39256,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch]
   );
-  const handleOperatorMotion = (0, import_react135.useCallback)(
+  const handleOperatorMotion = (0, import_react137.useCallback)(
     (operator, motion) => {
       const count = getCurrentCount();
       const commandMap = {
@@ -38906,7 +39288,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, executeCommand, dispatch]
   );
-  const handleInput = (0, import_react135.useCallback)(
+  const handleInput = (0, import_react137.useCallback)(
     (key) => {
       if (!vimEnabled) {
         return false;
@@ -39628,7 +40010,7 @@ __name(buildWorkflowSteeringNotice, "buildWorkflowSteeringNotice");
 
 // packages/cli/src/ui/hooks/useAwaySummary.ts
 init_esbuild_shims();
-var import_react136 = __toESM(require_react(), 1);
+var import_react138 = __toESM(require_react(), 1);
 var DEFAULT_AWAY_THRESHOLD_MINUTES = 5;
 var MIN_USER_MESSAGES_TO_FIRE = 3;
 var MIN_USER_MESSAGES_SINCE_LAST_RECAP = 2;
@@ -39637,14 +40019,15 @@ function shouldFireRecap(history) {
   let lastRecapIndex = -1;
   for (let i = 0; i < history.length; i++) {
     const item = history[i];
-    if (item.type === "user") userMessageCount++;
+    if (item.type === "user" && item.sentToModel !== false) userMessageCount++;
     if (item.type === "away_recap") lastRecapIndex = i;
   }
   if (userMessageCount < MIN_USER_MESSAGES_TO_FIRE) return false;
   if (lastRecapIndex === -1) return true;
   let userSinceLast = 0;
   for (let i = lastRecapIndex + 1; i < history.length; i++) {
-    if (history[i].type === "user") userSinceLast++;
+    const item = history[i];
+    if (item.type === "user" && item.sentToModel !== false) userSinceLast++;
   }
   return userSinceLast >= MIN_USER_MESSAGES_SINCE_LAST_RECAP;
 }
@@ -39659,15 +40042,15 @@ function useAwaySummary(options) {
     history,
     awayThresholdMinutes
   } = options;
-  const blurredAtRef = (0, import_react136.useRef)(null);
-  const recapPendingRef = (0, import_react136.useRef)(false);
-  const inFlightRef = (0, import_react136.useRef)(null);
-  const isIdleRef = (0, import_react136.useRef)(isIdle);
+  const blurredAtRef = (0, import_react138.useRef)(null);
+  const recapPendingRef = (0, import_react138.useRef)(false);
+  const inFlightRef = (0, import_react138.useRef)(null);
+  const isIdleRef = (0, import_react138.useRef)(isIdle);
   isIdleRef.current = isIdle;
-  const historyRef = (0, import_react136.useRef)(history);
+  const historyRef = (0, import_react138.useRef)(history);
   historyRef.current = history;
   const thresholdMs = (awayThresholdMinutes && awayThresholdMinutes > 0 ? awayThresholdMinutes : DEFAULT_AWAY_THRESHOLD_MINUTES) * 60 * 1e3;
-  (0, import_react136.useEffect)(() => {
+  (0, import_react138.useEffect)(() => {
     if (!enabled || !config) {
       inFlightRef.current?.abort();
       inFlightRef.current = null;
@@ -39719,7 +40102,7 @@ function useAwaySummary(options) {
       recapPendingRef.current = false;
     });
   }, [enabled, config, isFocused, isIdle, addItem, thresholdMs]);
-  (0, import_react136.useEffect)(
+  (0, import_react138.useEffect)(
     () => () => {
       inFlightRef.current?.abort();
     },
@@ -39730,14 +40113,14 @@ __name(useAwaySummary, "useAwaySummary");
 
 // packages/cli/src/ui/hooks/useBracketedPaste.ts
 init_esbuild_shims();
-var import_react137 = __toESM(require_react(), 1);
+var import_react139 = __toESM(require_react(), 1);
 var ENABLE_BRACKETED_PASTE = "\x1B[?2004h";
 var DISABLE_BRACKETED_PASTE = "\x1B[?2004l";
 var useBracketedPaste = /* @__PURE__ */ __name(() => {
   const cleanup = /* @__PURE__ */ __name(() => {
     process.stdout.write(DISABLE_BRACKETED_PASTE);
   }, "cleanup");
-  (0, import_react137.useEffect)(() => {
+  (0, import_react139.useEffect)(() => {
     process.stdout.write(ENABLE_BRACKETED_PASTE);
     process.on("exit", cleanup);
     process.on("SIGINT", cleanup);
@@ -39756,23 +40139,23 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/hooks/usePhraseCycler.ts
 init_esbuild_shims();
-var import_react138 = __toESM(require_react(), 1);
+var import_react140 = __toESM(require_react(), 1);
 var WITTY_LOADING_PHRASES = ["I'm Feeling Lucky"];
 var PHRASE_CHANGE_INTERVAL_MS = 15e3;
 var usePhraseCycler = /* @__PURE__ */ __name((isActive, isWaiting, customPhrases) => {
   const currentLanguage = getCurrentLanguage();
-  const loadingPhrases = (0, import_react138.useMemo)(() => {
+  const loadingPhrases = (0, import_react140.useMemo)(() => {
     if (customPhrases && customPhrases.length > 0) {
       return customPhrases;
     }
     const translatedPhrases = ta("WITTY_LOADING_PHRASES");
     return translatedPhrases.length > 0 ? translatedPhrases : WITTY_LOADING_PHRASES;
   }, [customPhrases, currentLanguage]);
-  const [currentLoadingPhrase, setCurrentLoadingPhrase] = (0, import_react138.useState)(
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = (0, import_react140.useState)(
     loadingPhrases[0]
   );
-  const phraseIntervalRef = (0, import_react138.useRef)(null);
-  (0, import_react138.useEffect)(() => {
+  const phraseIntervalRef = (0, import_react140.useRef)(null);
+  (0, import_react140.useEffect)(() => {
     if (isWaiting) {
       setCurrentLoadingPhrase(t("Waiting for user confirmation..."));
       if (phraseIntervalRef.current) {
@@ -39809,9 +40192,9 @@ var usePhraseCycler = /* @__PURE__ */ __name((isActive, isWaiting, customPhrases
 }, "usePhraseCycler");
 
 // packages/cli/src/ui/hooks/useLoadingIndicator.ts
-var import_react139 = __toESM(require_react(), 1);
+var import_react141 = __toESM(require_react(), 1);
 var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhrases, currentCandidatesTokens, currentStreamingChars, isToolExecuting2 = false) => {
-  const [timerResetKey, setTimerResetKey] = (0, import_react139.useState)(0);
+  const [timerResetKey, setTimerResetKey] = (0, import_react141.useState)(0);
   const isTimerActive = streamingState === "responding" /* Responding */;
   const elapsedTimeFromTimer = useTimer(
     isTimerActive,
@@ -39825,17 +40208,17 @@ var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhr
     isWaiting,
     customWittyPhrases
   );
-  const [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react139.useState)(0);
-  const [taskStartTokens, setTaskStartTokensState] = (0, import_react139.useState)(0);
-  const [taskStartStreamingChars, setTaskStartStreamingCharsState] = (0, import_react139.useState)(0);
-  const taskStartTokensRef = (0, import_react139.useRef)(0);
-  const taskStartStreamingCharsRef = (0, import_react139.useRef)(0);
-  const pauseStartTokensRef = (0, import_react139.useRef)(null);
-  const pauseStartStreamingCharsRef = (0, import_react139.useRef)(null);
-  const pauseBaseTaskStartTokensRef = (0, import_react139.useRef)(0);
-  const pauseBaseTaskStartStreamingCharsRef = (0, import_react139.useRef)(0);
-  const prevStreamingStateRef = (0, import_react139.useRef)(null);
-  (0, import_react139.useEffect)(() => {
+  const [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react141.useState)(0);
+  const [taskStartTokens, setTaskStartTokensState] = (0, import_react141.useState)(0);
+  const [taskStartStreamingChars, setTaskStartStreamingCharsState] = (0, import_react141.useState)(0);
+  const taskStartTokensRef = (0, import_react141.useRef)(0);
+  const taskStartStreamingCharsRef = (0, import_react141.useRef)(0);
+  const pauseStartTokensRef = (0, import_react141.useRef)(null);
+  const pauseStartStreamingCharsRef = (0, import_react141.useRef)(null);
+  const pauseBaseTaskStartTokensRef = (0, import_react141.useRef)(0);
+  const pauseBaseTaskStartStreamingCharsRef = (0, import_react141.useRef)(0);
+  const prevStreamingStateRef = (0, import_react141.useRef)(null);
+  (0, import_react141.useEffect)(() => {
     const currentTokens = currentCandidatesTokens ?? 0;
     const currentChars = currentStreamingChars ?? 0;
     const setTaskStartTokens = /* @__PURE__ */ __name((tokens) => {
@@ -39906,7 +40289,7 @@ var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhr
 
 // packages/cli/src/ui/hooks/useTerminalProgress.ts
 init_esbuild_shims();
-var import_react140 = __toESM(require_react(), 1);
+var import_react142 = __toESM(require_react(), 1);
 var PROGRESS_CLEAR = wrapForMultiplexer(`${OSC_PREFIX}9;4;0;${BEL}`);
 var PROGRESS_INDETERMINATE = wrapForMultiplexer(`${OSC_PREFIX}9;4;3;;${BEL}`);
 function isProgressBarSupported() {
@@ -39921,13 +40304,13 @@ function isProgressBarSupported() {
 __name(isProgressBarSupported, "isProgressBarSupported");
 function useTerminalProgress(streamingState, hasToolExecuting) {
   const { stdout } = use_stdout_default();
-  const writeProgress = (0, import_react140.useCallback)(
+  const writeProgress = (0, import_react142.useCallback)(
     (seq) => {
       stdout?.write(seq);
     },
     [stdout]
   );
-  (0, import_react140.useEffect)(() => {
+  (0, import_react142.useEffect)(() => {
     if (!isProgressBarSupported()) return;
     if (streamingState === "responding" /* Responding */ && hasToolExecuting) {
       writeProgress(PROGRESS_INDETERMINATE);
@@ -39938,7 +40321,7 @@ function useTerminalProgress(streamingState, hasToolExecuting) {
       writeProgress(PROGRESS_CLEAR);
     };
   }, [streamingState, hasToolExecuting, writeProgress]);
-  (0, import_react140.useEffect)(() => {
+  (0, import_react142.useEffect)(() => {
     if (!isProgressBarSupported()) return;
     const clearOnExit = /* @__PURE__ */ __name(() => {
       stdout?.write(PROGRESS_CLEAR);
@@ -39953,20 +40336,20 @@ __name(useTerminalProgress, "useTerminalProgress");
 
 // packages/cli/src/ui/hooks/useFolderTrust.ts
 init_esbuild_shims();
-var import_react141 = __toESM(require_react(), 1);
+var import_react143 = __toESM(require_react(), 1);
 import * as process15 from "node:process";
 var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
-  const [isTrusted, setIsTrusted] = (0, import_react141.useState)(void 0);
-  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react141.useState)(false);
-  const [isRestarting, setIsRestarting] = (0, import_react141.useState)(false);
+  const [isTrusted, setIsTrusted] = (0, import_react143.useState)(void 0);
+  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react143.useState)(false);
+  const [isRestarting, setIsRestarting] = (0, import_react143.useState)(false);
   const folderTrust = settings.merged.security?.folderTrust?.enabled;
-  (0, import_react141.useEffect)(() => {
+  (0, import_react143.useEffect)(() => {
     const { isTrusted: trusted } = isWorkspaceTrusted(settings.merged);
     setIsTrusted(trusted);
     setIsFolderTrustDialogOpen(trusted === void 0);
     onTrustChange(trusted);
   }, [folderTrust, onTrustChange, settings.merged]);
-  const handleFolderTrustSelect = (0, import_react141.useCallback)(
+  const handleFolderTrustSelect = (0, import_react143.useCallback)(
     (choice) => {
       const trustedFolders = loadTrustedFolders();
       const cwd3 = process15.cwd();
@@ -40009,7 +40392,7 @@ var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
 
 // packages/cli/src/ui/hooks/useMcpApproval.ts
 init_esbuild_shims();
-var import_react142 = __toESM(require_react(), 1);
+var import_react144 = __toESM(require_react(), 1);
 function sourceLabel(scope) {
   switch (scope) {
     case "workspace":
@@ -40045,8 +40428,8 @@ function summarize(config) {
 }
 __name(summarize, "summarize");
 var useMcpApproval = /* @__PURE__ */ __name((config) => {
-  const [queue, setQueue] = (0, import_react142.useState)([]);
-  const computePending = (0, import_react142.useCallback)(() => {
+  const [queue, setQueue] = (0, import_react144.useState)([]);
+  const computePending = (0, import_react144.useCallback)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */) return [];
     const servers = config.getMcpServers() ?? {};
     const approvals = loadMcpApprovals();
@@ -40058,10 +40441,10 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
       source: sourceLabel(c.scope)
     }));
   }, [config]);
-  (0, import_react142.useEffect)(() => {
+  (0, import_react144.useEffect)(() => {
     setQueue(computePending());
   }, [computePending]);
-  (0, import_react142.useEffect)(() => {
+  (0, import_react144.useEffect)(() => {
     const onPendingChanged = /* @__PURE__ */ __name(() => {
       setQueue(computePending());
     }, "onPendingChanged");
@@ -40070,7 +40453,7 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
       appEvents.off("mcp-pending-approval-changed" /* McpPendingApprovalChanged */, onPendingChanged);
     };
   }, [computePending]);
-  const reconnect = (0, import_react142.useCallback)(
+  const reconnect = (0, import_react144.useCallback)(
     (name) => {
       config.approveMcpServerForSession(name);
       const registry = config.getToolRegistry();
@@ -40082,7 +40465,7 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
     },
     [config]
   );
-  const handleMcpApprovalSelect = (0, import_react142.useCallback)(
+  const handleMcpApprovalSelect = (0, import_react144.useCallback)(
     async (choice) => {
       const approvals = loadMcpApprovals();
       const root = config.getWorkingDir();
@@ -40134,7 +40517,7 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
 
 // packages/cli/src/ui/hooks/useCommandMigration.ts
 init_esbuild_shims();
-var import_react143 = __toESM(require_react(), 1);
+var import_react145 = __toESM(require_react(), 1);
 
 // packages/cli/src/services/command-migration-tool.ts
 init_esbuild_shims();
@@ -40205,9 +40588,9 @@ __name(migrateTomlCommands, "migrateTomlCommands");
 
 // packages/cli/src/ui/hooks/useCommandMigration.ts
 function useCommandMigration(settings, storage) {
-  const [showMigrationNudge, setShowMigrationNudge] = (0, import_react143.useState)(false);
-  const [tomlFiles, setTomlFiles] = (0, import_react143.useState)([]);
-  (0, import_react143.useEffect)(() => {
+  const [showMigrationNudge, setShowMigrationNudge] = (0, import_react145.useState)(false);
+  const [tomlFiles, setTomlFiles] = (0, import_react145.useState)([]);
+  (0, import_react145.useEffect)(() => {
     let cancelled = false;
     const checkTomlCommands = /* @__PURE__ */ __name(async () => {
       const allFiles = [];
@@ -40273,81 +40656,12 @@ function sendNotification(opts, terminal, enabled) {
 }
 __name(sendNotification, "sendNotification");
 
-// packages/cli/src/ui/hooks/useMessageQueue.ts
-init_esbuild_shims();
-var import_react144 = __toESM(require_react(), 1);
-function useMessageQueue() {
-  const [queuedMessages, setQueuedMessages] = (0, import_react144.useState)([]);
-  const queueRef = (0, import_react144.useRef)([]);
-  const addMessage = (0, import_react144.useCallback)((message, deferUntilIdle = false) => {
-    const trimmedMessage = message.trim();
-    if (trimmedMessage.length > 0) {
-      queueRef.current = [
-        ...queueRef.current,
-        { text: trimmedMessage, deferUntilIdle }
-      ];
-      setQueuedMessages(queueRef.current);
-    }
-  }, []);
-  const clearQueue = (0, import_react144.useCallback)(() => {
-    queueRef.current = [];
-    setQueuedMessages([]);
-  }, []);
-  const getQueuedMessagesText = (0, import_react144.useCallback)(() => {
-    if (queuedMessages.length === 0) return "";
-    return queuedMessages.map(({ text }) => text).join("\n\n");
-  }, [queuedMessages]);
-  const popAllMessages = (0, import_react144.useCallback)(() => {
-    const current = queueRef.current;
-    if (current.length === 0) return null;
-    queueRef.current = [];
-    setQueuedMessages([]);
-    return current.map(({ text }) => text).join("\n\n");
-  }, []);
-  const restoreMessages = (0, import_react144.useCallback)((messages) => {
-    const restored = messages.map((text) => text.trim()).filter(Boolean).map((text) => ({ text, deferUntilIdle: false }));
-    if (restored.length === 0) return;
-    queueRef.current = [...restored, ...queueRef.current];
-    setQueuedMessages(queueRef.current);
-  }, []);
-  const drainQueue = (0, import_react144.useCallback)((includeDeferred = false) => {
-    const current = queueRef.current;
-    if (current.length === 0) return [];
-    const shouldDrain = /* @__PURE__ */ __name((message) => !isSlashCommand(message.text) && (includeDeferred || !message.deferUntilIdle), "shouldDrain");
-    const drained = current.filter(shouldDrain);
-    if (drained.length === 0) return [];
-    const rest = current.filter((message) => !shouldDrain(message));
-    queueRef.current = rest;
-    setQueuedMessages(rest);
-    return drained.map(({ text }) => text);
-  }, []);
-  const popNextSegment = (0, import_react144.useCallback)(() => {
-    const current = queueRef.current;
-    if (current.length === 0) return null;
-    const [head, ...rest] = current;
-    queueRef.current = rest;
-    setQueuedMessages(rest);
-    return head.text;
-  }, []);
-  return {
-    messageQueue: queuedMessages.map(({ text }) => text),
-    addMessage,
-    clearQueue,
-    getQueuedMessagesText,
-    popAllMessages,
-    restoreMessages,
-    drainQueue,
-    popNextSegment
-  };
-}
-__name(useMessageQueue, "useMessageQueue");
-
 // packages/cli/src/ui/hooks/useGitBranchName.ts
 init_esbuild_shims();
-var import_react145 = __toESM(require_react(), 1);
+var import_react146 = __toESM(require_react(), 1);
 function useGitBranchName(cwd3) {
-  const [branchName, setBranchName] = (0, import_react145.useState)(void 0);
-  (0, import_react145.useEffect)(() => {
+  const [branchName, setBranchName] = (0, import_react146.useState)(void 0);
+  (0, import_react146.useEffect)(() => {
     let cancelled = false;
     let dispose;
     const refresh = /* @__PURE__ */ __name(async () => {
@@ -40380,13 +40694,13 @@ __name(useGitBranchName, "useGitBranchName");
 
 // packages/cli/src/ui/hooks/useWorktreeSession.ts
 init_esbuild_shims();
-var import_react146 = __toESM(require_react(), 1);
+var import_react147 = __toESM(require_react(), 1);
 import fs19 from "node:fs";
 import fsPromises from "node:fs/promises";
 import path14 from "node:path";
 function useWorktreeSession(config) {
-  const [session, setSession] = (0, import_react146.useState)(null);
-  (0, import_react146.useEffect)(() => {
+  const [session, setSession] = (0, import_react147.useState)(null);
+  (0, import_react147.useEffect)(() => {
     let cancelled = false;
     const safeLoad = /* @__PURE__ */ __name(async () => {
       try {
@@ -40426,7 +40740,7 @@ __name(useWorktreeSession, "useWorktreeSession");
 
 // packages/cli/src/ui/hooks/useExtensionUpdates.ts
 init_esbuild_shims();
-var import_react147 = __toESM(require_react(), 1);
+var import_react148 = __toESM(require_react(), 1);
 function confirmationRequestsReducer(state, action) {
   switch (action.type) {
     case "add":
@@ -40443,8 +40757,8 @@ var useConfirmUpdateRequests = /* @__PURE__ */ __name(() => {
   const [
     confirmUpdateExtensionRequests,
     dispatchConfirmUpdateExtensionRequests
-  ] = (0, import_react147.useReducer)(confirmationRequestsReducer, []);
-  const addConfirmUpdateExtensionRequest = (0, import_react147.useCallback)(
+  ] = (0, import_react148.useReducer)(confirmationRequestsReducer, []);
+  const addConfirmUpdateExtensionRequest = (0, import_react148.useCallback)(
     (original) => {
       const wrappedRequest = {
         prompt: original.prompt,
@@ -40482,11 +40796,11 @@ function settingInputRequestsReducer(state, action) {
 }
 __name(settingInputRequestsReducer, "settingInputRequestsReducer");
 var useSettingInputRequests = /* @__PURE__ */ __name(() => {
-  const [settingInputRequests, dispatchSettingInputRequests] = (0, import_react147.useReducer)(
+  const [settingInputRequests, dispatchSettingInputRequests] = (0, import_react148.useReducer)(
     settingInputRequestsReducer,
     []
   );
-  const addSettingInputRequest = (0, import_react147.useCallback)(
+  const addSettingInputRequest = (0, import_react148.useCallback)(
     (original) => {
       const wrappedRequest = {
         settingName: original.settingName,
@@ -40533,11 +40847,11 @@ function pluginChoiceRequestsReducer(state, action) {
 }
 __name(pluginChoiceRequestsReducer, "pluginChoiceRequestsReducer");
 var usePluginChoiceRequests = /* @__PURE__ */ __name(() => {
-  const [pluginChoiceRequests, dispatchPluginChoiceRequests] = (0, import_react147.useReducer)(
+  const [pluginChoiceRequests, dispatchPluginChoiceRequests] = (0, import_react148.useReducer)(
     pluginChoiceRequestsReducer,
     []
   );
-  const addPluginChoiceRequest = (0, import_react147.useCallback)(
+  const addPluginChoiceRequest = (0, import_react148.useCallback)(
     (original) => {
       const wrappedRequest = {
         marketplaceName: original.marketplaceName,
@@ -40571,12 +40885,12 @@ var usePluginChoiceRequests = /* @__PURE__ */ __name(() => {
   };
 }, "usePluginChoiceRequests");
 var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd3) => {
-  const [extensionsUpdateState, dispatchExtensionStateUpdate] = (0, import_react147.useReducer)(
+  const [extensionsUpdateState, dispatchExtensionStateUpdate] = (0, import_react148.useReducer)(
     extensionUpdatesReducer,
     initialExtensionUpdatesState
   );
   const extensions = extensionManager.getLoadedExtensions();
-  (0, import_react147.useEffect)(() => {
+  (0, import_react148.useEffect)(() => {
     (async () => {
       const extensionsToCheck = extensions.filter((extension) => {
         const currentStatus = extensionsUpdateState.extensionStatuses.get(
@@ -40604,7 +40918,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd
     extensionsUpdateState.extensionStatuses,
     dispatchExtensionStateUpdate
   ]);
-  (0, import_react147.useEffect)(() => {
+  (0, import_react148.useEffect)(() => {
     if (extensionsUpdateState.batchChecksInProgress > 0) {
       return;
     }
@@ -40673,7 +40987,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd
       );
     }
   }, [extensions, extensionManager, extensionsUpdateState, addItem, cwd3]);
-  const extensionsUpdateStateComputed = (0, import_react147.useMemo)(() => {
+  const extensionsUpdateStateComputed = (0, import_react148.useMemo)(() => {
     const result = /* @__PURE__ */ new Map();
     for (const [
       key,
@@ -40692,11 +41006,11 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd
 
 // packages/cli/src/ui/components/TranscriptView.tsx
 init_esbuild_shims();
-var import_react150 = __toESM(require_react(), 1);
+var import_react151 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/AlternateScreen.tsx
 init_esbuild_shims();
-var import_react148 = __toESM(require_react(), 1);
+var import_react149 = __toESM(require_react(), 1);
 var import_jsx_runtime132 = __toESM(require_jsx_runtime(), 1);
 var ENTER_ALT_SCREEN = "\x1B[?1049h";
 var EXIT_ALT_SCREEN = "\x1B[?1049l";
@@ -40709,7 +41023,7 @@ var AlternateScreen = /* @__PURE__ */ __name(({
 }) => {
   const writeRaw = useTerminalOutput();
   const { rows } = useTerminalSize();
-  (0, import_react148.useEffect)(() => {
+  (0, import_react149.useEffect)(() => {
     if (disabled || !process.stdout.isTTY) return;
     const safeWrite = /* @__PURE__ */ __name((data) => {
       try {
@@ -40730,18 +41044,25 @@ var AlternateScreen = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/shared/ErrorBoundary.tsx
 init_esbuild_shims();
-var import_react149 = __toESM(require_react(), 1);
+var import_react150 = __toESM(require_react(), 1);
 var import_jsx_runtime133 = __toESM(require_jsx_runtime(), 1);
-var ErrorBoundary = class extends import_react149.Component {
+function normalizeError(error) {
+  if (error instanceof Error) {
+    return error;
+  }
+  return new Error(String(error));
+}
+__name(normalizeError, "normalizeError");
+var ErrorBoundary = class extends import_react150.Component {
   static {
     __name(this, "ErrorBoundary");
   }
   state = { error: null };
   static getDerivedStateFromError(error) {
-    return { error };
+    return { error: normalizeError(error) };
   }
   componentDidCatch(error, info) {
-    this.props.onError?.(error, info);
+    this.props.onError?.(normalizeError(error), info);
   }
   reset = /* @__PURE__ */ __name(() => {
     this.setState({ error: null });
@@ -40791,11 +41112,11 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
   const headerHeight = 1;
   const footerHeight = 1;
   const contentHeight = Math.max(rows - headerHeight - footerHeight, 1);
-  const estimatedItemHeight = (0, import_react150.useCallback)(
+  const estimatedItemHeight = (0, import_react151.useCallback)(
     (index) => estimateTranscriptItemHeight(items[index]),
     [items]
   );
-  const renderItem = (0, import_react150.useCallback)(
+  const renderItem = (0, import_react151.useCallback)(
     ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
       HistoryItemDisplay,
       {
@@ -40808,7 +41129,7 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     [columns]
   );
   const title = t("Transcript");
-  const content = (0, import_react150.useMemo)(
+  const content = (0, import_react151.useMemo)(
     () => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
       ScrollableListWithForwardRef,
       {
@@ -40823,7 +41144,7 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     ) }),
     [items, renderItem, estimatedItemHeight, contentHeight]
   );
-  const errorFallback = (0, import_react150.useCallback)(
+  const errorFallback = (0, import_react151.useCallback)(
     (error) => /* @__PURE__ */ (0, import_jsx_runtime134.jsxs)(Box_default, { flexDirection: "column", paddingX: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(Text, { color: theme.status.error, bold: true, children: t("Failed to render transcript.") }),
       /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(Text, { color: theme.text.secondary, children: sanitizeTerminalText(error.message) }),
@@ -40834,7 +41155,7 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     ] }),
     []
   );
-  const onRenderError = (0, import_react150.useCallback)((error, info) => {
+  const onRenderError = (0, import_react151.useCallback)((error, info) => {
     debugLogger39.error(
       `render error: ${error.message}`,
       info.componentStack ?? ""
@@ -40858,19 +41179,19 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     ] }) })
   ] }) });
 }, "TranscriptViewImpl");
-var TranscriptView = (0, import_react150.memo)(TranscriptViewImpl);
+var TranscriptView = (0, import_react151.memo)(TranscriptViewImpl);
 TranscriptView.displayName = "TranscriptView";
 
 // packages/cli/src/ui/hooks/useWelcomeBack.ts
 init_esbuild_shims();
-var import_react151 = __toESM(require_react(), 1);
+var import_react152 = __toESM(require_react(), 1);
 function useWelcomeBack(config, submitQuery, buffer, settings) {
-  const [welcomeBackInfo, setWelcomeBackInfo] = (0, import_react151.useState)(null);
-  const [showWelcomeBackDialog, setShowWelcomeBackDialog] = (0, import_react151.useState)(false);
-  const [welcomeBackChoice, setWelcomeBackChoice] = (0, import_react151.useState)(null);
-  const [shouldFillInput, setShouldFillInput] = (0, import_react151.useState)(false);
-  const [inputFillText, setInputFillText] = (0, import_react151.useState)(null);
-  const checkWelcomeBack = (0, import_react151.useCallback)(async () => {
+  const [welcomeBackInfo, setWelcomeBackInfo] = (0, import_react152.useState)(null);
+  const [showWelcomeBackDialog, setShowWelcomeBackDialog] = (0, import_react152.useState)(false);
+  const [welcomeBackChoice, setWelcomeBackChoice] = (0, import_react152.useState)(null);
+  const [shouldFillInput, setShouldFillInput] = (0, import_react152.useState)(false);
+  const [inputFillText, setInputFillText] = (0, import_react152.useState)(null);
+  const checkWelcomeBack = (0, import_react152.useCallback)(async () => {
     if (settings.ui?.enableWelcomeBack === false) {
       return;
     }
@@ -40889,7 +41210,7 @@ function useWelcomeBack(config, submitQuery, buffer, settings) {
       config.getDebugLogger().debug("Welcome back check failed:", error);
     }
   }, [config, settings.ui?.enableWelcomeBack]);
-  const handleWelcomeBackSelection = (0, import_react151.useCallback)(
+  const handleWelcomeBackSelection = (0, import_react152.useCallback)(
     (choice) => {
       setWelcomeBackChoice(choice);
       setShowWelcomeBackDialog(false);
@@ -40913,21 +41234,21 @@ function useWelcomeBack(config, submitQuery, buffer, settings) {
     },
     [config, welcomeBackInfo]
   );
-  const handleWelcomeBackClose = (0, import_react151.useCallback)(() => {
+  const handleWelcomeBackClose = (0, import_react152.useCallback)(() => {
     setWelcomeBackChoice("restart");
     setShowWelcomeBackDialog(false);
   }, []);
-  const clearInputFill = (0, import_react151.useCallback)(() => {
+  const clearInputFill = (0, import_react152.useCallback)(() => {
     setShouldFillInput(false);
     setInputFillText(null);
   }, []);
-  (0, import_react151.useEffect)(() => {
+  (0, import_react152.useEffect)(() => {
     if (shouldFillInput && inputFillText) {
       buffer.setText(inputFillText);
       clearInputFill();
     }
   }, [shouldFillInput, inputFillText, buffer, clearInputFill]);
-  (0, import_react151.useEffect)(() => {
+  (0, import_react152.useEffect)(() => {
     checkWelcomeBack();
   }, [checkWelcomeBack]);
   return {
@@ -40948,9 +41269,9 @@ __name(useWelcomeBack, "useWelcomeBack");
 
 // packages/cli/src/ui/hooks/useDialogClose.ts
 init_esbuild_shims();
-var import_react152 = __toESM(require_react(), 1);
+var import_react153 = __toESM(require_react(), 1);
 function useDialogClose(options) {
-  const closeAnyOpenDialog = (0, import_react152.useCallback)(() => {
+  const closeAnyOpenDialog = (0, import_react153.useCallback)(() => {
     if (options.isThemeDialogOpen) {
       options.handleThemeSelect(void 0, "User" /* User */);
       return true;
@@ -41022,14 +41343,14 @@ __name(useDialogClose, "useDialogClose");
 
 // packages/cli/src/ui/hooks/useInitializationAuthError.ts
 init_esbuild_shims();
-var import_react153 = __toESM(require_react(), 1);
+var import_react154 = __toESM(require_react(), 1);
 var useInitializationAuthError = /* @__PURE__ */ __name((authError, onAuthError) => {
-  const hasHandled = (0, import_react153.useRef)(false);
-  const authErrorRef = (0, import_react153.useRef)(authError);
-  const onAuthErrorRef = (0, import_react153.useRef)(onAuthError);
+  const hasHandled = (0, import_react154.useRef)(false);
+  const authErrorRef = (0, import_react154.useRef)(authError);
+  const onAuthErrorRef = (0, import_react154.useRef)(onAuthError);
   authErrorRef.current = authError;
   onAuthErrorRef.current = onAuthError;
-  (0, import_react153.useEffect)(() => {
+  (0, import_react154.useEffect)(() => {
     if (hasHandled.current) {
       return;
     }
@@ -41042,13 +41363,13 @@ var useInitializationAuthError = /* @__PURE__ */ __name((authError, onAuthError)
 
 // packages/cli/src/ui/hooks/useSubagentCreateDialog.ts
 init_esbuild_shims();
-var import_react154 = __toESM(require_react(), 1);
+var import_react155 = __toESM(require_react(), 1);
 function useSubagentCreateDialog() {
-  const [isSubagentCreateDialogOpen, setIsSubagentCreateDialogOpen] = (0, import_react154.useState)(false);
-  const openSubagentCreateDialog = (0, import_react154.useCallback)(() => {
+  const [isSubagentCreateDialogOpen, setIsSubagentCreateDialogOpen] = (0, import_react155.useState)(false);
+  const openSubagentCreateDialog = (0, import_react155.useCallback)(() => {
     setIsSubagentCreateDialogOpen(true);
   }, []);
-  const closeSubagentCreateDialog = (0, import_react154.useCallback)(() => {
+  const closeSubagentCreateDialog = (0, import_react155.useCallback)(() => {
     setIsSubagentCreateDialogOpen(false);
   }, []);
   return {
@@ -41061,13 +41382,13 @@ __name(useSubagentCreateDialog, "useSubagentCreateDialog");
 
 // packages/cli/src/ui/hooks/useAgentsManagerDialog.ts
 init_esbuild_shims();
-var import_react155 = __toESM(require_react(), 1);
+var import_react156 = __toESM(require_react(), 1);
 var useAgentsManagerDialog = /* @__PURE__ */ __name(() => {
-  const [isAgentsManagerDialogOpen, setIsAgentsManagerDialogOpen] = (0, import_react155.useState)(false);
-  const openAgentsManagerDialog = (0, import_react155.useCallback)(() => {
+  const [isAgentsManagerDialogOpen, setIsAgentsManagerDialogOpen] = (0, import_react156.useState)(false);
+  const openAgentsManagerDialog = (0, import_react156.useCallback)(() => {
     setIsAgentsManagerDialogOpen(true);
   }, []);
-  const closeAgentsManagerDialog = (0, import_react155.useCallback)(() => {
+  const closeAgentsManagerDialog = (0, import_react156.useCallback)(() => {
     setIsAgentsManagerDialogOpen(false);
   }, []);
   return {
@@ -41079,13 +41400,13 @@ var useAgentsManagerDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useSkillsManagerDialog.ts
 init_esbuild_shims();
-var import_react156 = __toESM(require_react(), 1);
+var import_react157 = __toESM(require_react(), 1);
 var useSkillsManagerDialog = /* @__PURE__ */ __name(() => {
-  const [isSkillsManagerDialogOpen, setIsSkillsManagerDialogOpen] = (0, import_react156.useState)(false);
-  const openSkillsManagerDialog = (0, import_react156.useCallback)(() => {
+  const [isSkillsManagerDialogOpen, setIsSkillsManagerDialogOpen] = (0, import_react157.useState)(false);
+  const openSkillsManagerDialog = (0, import_react157.useCallback)(() => {
     setIsSkillsManagerDialogOpen(true);
   }, []);
-  const closeSkillsManagerDialog = (0, import_react156.useCallback)(() => {
+  const closeSkillsManagerDialog = (0, import_react157.useCallback)(() => {
     setIsSkillsManagerDialogOpen(false);
   }, []);
   return {
@@ -41097,13 +41418,13 @@ var useSkillsManagerDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useExtensionsManagerDialog.ts
 init_esbuild_shims();
-var import_react157 = __toESM(require_react(), 1);
+var import_react158 = __toESM(require_react(), 1);
 var useExtensionsManagerDialog = /* @__PURE__ */ __name(() => {
-  const [isExtensionsManagerDialogOpen, setIsExtensionsManagerDialogOpen] = (0, import_react157.useState)(false);
-  const openExtensionsManagerDialog = (0, import_react157.useCallback)(() => {
+  const [isExtensionsManagerDialogOpen, setIsExtensionsManagerDialogOpen] = (0, import_react158.useState)(false);
+  const openExtensionsManagerDialog = (0, import_react158.useCallback)(() => {
     setIsExtensionsManagerDialogOpen(true);
   }, []);
-  const closeExtensionsManagerDialog = (0, import_react157.useCallback)(() => {
+  const closeExtensionsManagerDialog = (0, import_react158.useCallback)(() => {
     setIsExtensionsManagerDialogOpen(false);
   }, []);
   return {
@@ -41115,13 +41436,13 @@ var useExtensionsManagerDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useMcpDialog.ts
 init_esbuild_shims();
-var import_react158 = __toESM(require_react(), 1);
+var import_react159 = __toESM(require_react(), 1);
 var useMcpDialog = /* @__PURE__ */ __name(() => {
-  const [isMcpDialogOpen, setIsMcpDialogOpen] = (0, import_react158.useState)(false);
-  const openMcpDialog = (0, import_react158.useCallback)(() => {
+  const [isMcpDialogOpen, setIsMcpDialogOpen] = (0, import_react159.useState)(false);
+  const openMcpDialog = (0, import_react159.useCallback)(() => {
     setIsMcpDialogOpen(true);
   }, []);
-  const closeMcpDialog = (0, import_react158.useCallback)(() => {
+  const closeMcpDialog = (0, import_react159.useCallback)(() => {
     setIsMcpDialogOpen(false);
   }, []);
   return {
@@ -41133,13 +41454,13 @@ var useMcpDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useHooksDialog.ts
 init_esbuild_shims();
-var import_react159 = __toESM(require_react(), 1);
+var import_react160 = __toESM(require_react(), 1);
 var useHooksDialog = /* @__PURE__ */ __name(() => {
-  const [isHooksDialogOpen, setIsHooksDialogOpen] = (0, import_react159.useState)(false);
-  const openHooksDialog = (0, import_react159.useCallback)(() => {
+  const [isHooksDialogOpen, setIsHooksDialogOpen] = (0, import_react160.useState)(false);
+  const openHooksDialog = (0, import_react160.useCallback)(() => {
     setIsHooksDialogOpen(true);
   }, []);
-  const closeHooksDialog = (0, import_react159.useCallback)(() => {
+  const closeHooksDialog = (0, import_react160.useCallback)(() => {
     setIsHooksDialogOpen(false);
   }, []);
   return {
@@ -41151,23 +41472,23 @@ var useHooksDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useStatsDialog.ts
 init_esbuild_shims();
-var import_react160 = __toESM(require_react(), 1);
+var import_react161 = __toESM(require_react(), 1);
 var useStatsDialog = /* @__PURE__ */ __name(() => {
-  const [isStatsDialogOpen, setIsStatsDialogOpen] = (0, import_react160.useState)(false);
-  const openStatsDialog = (0, import_react160.useCallback)(() => setIsStatsDialogOpen(true), []);
-  const closeStatsDialog = (0, import_react160.useCallback)(() => setIsStatsDialogOpen(false), []);
+  const [isStatsDialogOpen, setIsStatsDialogOpen] = (0, import_react161.useState)(false);
+  const openStatsDialog = (0, import_react161.useCallback)(() => setIsStatsDialogOpen(true), []);
+  const closeStatsDialog = (0, import_react161.useCallback)(() => setIsStatsDialogOpen(false), []);
   return { isStatsDialogOpen, openStatsDialog, closeStatsDialog };
 }, "useStatsDialog");
 
 // packages/cli/src/ui/hooks/useMemoryDialog.ts
 init_esbuild_shims();
-var import_react161 = __toESM(require_react(), 1);
+var import_react162 = __toESM(require_react(), 1);
 var useMemoryDialog = /* @__PURE__ */ __name(() => {
-  const [isMemoryDialogOpen, setIsMemoryDialogOpen] = (0, import_react161.useState)(false);
-  const openMemoryDialog = (0, import_react161.useCallback)(() => {
+  const [isMemoryDialogOpen, setIsMemoryDialogOpen] = (0, import_react162.useState)(false);
+  const openMemoryDialog = (0, import_react162.useCallback)(() => {
     setIsMemoryDialogOpen(true);
   }, []);
-  const closeMemoryDialog = (0, import_react161.useCallback)(() => {
+  const closeMemoryDialog = (0, import_react162.useCallback)(() => {
     setIsMemoryDialogOpen(false);
   }, []);
   return {
@@ -41179,7 +41500,7 @@ var useMemoryDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useAttentionNotifications.ts
 init_esbuild_shims();
-var import_react162 = __toESM(require_react(), 1);
+var import_react163 = __toESM(require_react(), 1);
 var LONG_TASK_NOTIFICATION_THRESHOLD_SECONDS = 20;
 var NOTIFICATION_TITLE = "Qwen Code";
 var useAttentionNotifications = /* @__PURE__ */ __name(({
@@ -41194,16 +41515,16 @@ var useAttentionNotifications = /* @__PURE__ */ __name(({
   const terminalBellEnabled = settings?.merged?.general?.terminalBell ?? true;
   const notificationMode = settings?.merged?.general?.notificationMode === "task-complete" ? "task-complete" : "all";
   const approvalNotificationsEnabled = notificationMode === "all";
-  const awaitingNotificationSentRef = (0, import_react162.useRef)(false);
-  const respondingElapsedRef = (0, import_react162.useRef)(0);
-  const idleNotificationSentRef = (0, import_react162.useRef)(false);
-  const awaitingToolName = (0, import_react162.useMemo)(() => {
+  const awaitingNotificationSentRef = (0, import_react163.useRef)(false);
+  const respondingElapsedRef = (0, import_react163.useRef)(0);
+  const idleNotificationSentRef = (0, import_react163.useRef)(false);
+  const awaitingToolName = (0, import_react163.useMemo)(() => {
     const awaitingTool = pendingToolCalls?.find(
       (tc) => tc.status === "awaiting_approval"
     );
     return awaitingTool?.request.name;
   }, [pendingToolCalls]);
-  (0, import_react162.useEffect)(() => {
+  (0, import_react163.useEffect)(() => {
     if (streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */ && !isFocused && !awaitingNotificationSentRef.current && terminalBellEnabled && approvalNotificationsEnabled) {
       const message = awaitingToolName ? `Qwen Code needs your permission to use ${awaitingToolName}` : "Qwen Code is waiting for your input";
       sendNotification(
@@ -41224,7 +41545,7 @@ var useAttentionNotifications = /* @__PURE__ */ __name(({
     terminal,
     awaitingToolName
   ]);
-  (0, import_react162.useEffect)(() => {
+  (0, import_react163.useEffect)(() => {
     if (streamingState === "responding" /* Responding */) {
       respondingElapsedRef.current = elapsedTime;
       idleNotificationSentRef.current = false;
@@ -41377,7 +41698,7 @@ __name(buildTerminalNotification, "buildTerminalNotification");
 
 // packages/cli/src/ui/hooks/useContextualTips.ts
 init_esbuild_shims();
-var import_react163 = __toESM(require_react(), 1);
+var import_react164 = __toESM(require_react(), 1);
 function useContextualTips({
   streamingState,
   lastPromptTokenCount,
@@ -41387,9 +41708,9 @@ function useContextualTips({
   addItem,
   hideTips
 }) {
-  const prevStreamingState = (0, import_react163.useRef)("idle" /* Idle */);
-  const hadResponsePhase = (0, import_react163.useRef)(false);
-  (0, import_react163.useEffect)(() => {
+  const prevStreamingState = (0, import_react164.useRef)("idle" /* Idle */);
+  const hadResponsePhase = (0, import_react164.useRef)(false);
+  (0, import_react164.useEffect)(() => {
     if (streamingState === "responding" /* Responding */ || prevStreamingState.current === "responding" /* Responding */ && streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */) {
       hadResponsePhase.current = true;
     }
@@ -41525,7 +41846,7 @@ function getResponseCandidateTokens(pendingGeminiHistoryItems) {
 __name(getResponseCandidateTokens, "getResponseCandidateTokens");
 function useStableStickyTodos(todos) {
   const renderKey = getStickyTodosRenderKey(todos);
-  const stableTodosRef = (0, import_react164.useRef)(null);
+  const stableTodosRef = (0, import_react165.useRef)(null);
   if (stableTodosRef.current?.renderKey !== renderKey) {
     stableTodosRef.current = { renderKey, todos };
   }
@@ -41556,29 +41877,29 @@ var SHELL_WIDTH_FRACTION = 0.89;
 var SHELL_HEIGHT_PADDING = 10;
 var AppContainer = /* @__PURE__ */ __name((props) => {
   const { settings, config, initializationResult } = props;
-  const extensionRefreshState = (0, import_react164.useMemo)(
+  const extensionRefreshState = (0, import_react165.useMemo)(
     () => props.extensionRefreshState ?? new ExtensionRefreshState(),
     [props.extensionRefreshState]
   );
   const historyManager = useHistory();
-  const historyRef = (0, import_react164.useRef)(historyManager.history);
+  const historyRef = (0, import_react165.useRef)(historyManager.history);
   historyRef.current = historyManager.history;
   useMemoryMonitor(historyManager);
-  const [debugMessage, setDebugMessage] = (0, import_react164.useState)("");
-  const [quittingMessages, setQuittingMessages] = (0, import_react164.useState)(null);
-  const [themeError, setThemeError] = (0, import_react164.useState)(
+  const [debugMessage, setDebugMessage] = (0, import_react165.useState)("");
+  const [quittingMessages, setQuittingMessages] = (0, import_react165.useState)(null);
+  const [themeError, setThemeError] = (0, import_react165.useState)(
     initializationResult.themeError
   );
-  const [isProcessing, setIsProcessing] = (0, import_react164.useState)(false);
-  const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react164.useState)(false);
-  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react164.useState)(
+  const [isProcessing, setIsProcessing] = (0, import_react165.useState)(false);
+  const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react165.useState)(false);
+  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react165.useState)(
     initializationResult.geminiMdFileCount
   );
-  const [shellModeActive, setShellModeActive] = (0, import_react164.useState)(false);
-  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = (0, import_react164.useState)(false);
-  const [historyRemountKey, setHistoryRemountKey] = (0, import_react164.useState)(0);
-  const [updateInfo, setUpdateInfo] = (0, import_react164.useState)(null);
-  const [isTrustedFolder, setIsTrustedFolder] = (0, import_react164.useState)(
+  const [shellModeActive, setShellModeActive] = (0, import_react165.useState)(false);
+  const [modelSwitchedFromQuotaError, setModelSwitchedFromQuotaError] = (0, import_react165.useState)(false);
+  const [historyRemountKey, setHistoryRemountKey] = (0, import_react165.useState)(0);
+  const [updateInfo, setUpdateInfo] = (0, import_react165.useState)(null);
+  const [isTrustedFolder, setIsTrustedFolder] = (0, import_react165.useState)(
     config.isTrustedFolder()
   );
   const extensionManager = config.getExtensionManager();
@@ -41637,31 +41958,31 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     config,
     historyManager.addItem
   );
-  const [isTrustDialogOpen, setTrustDialogOpen] = (0, import_react164.useState)(false);
-  const openTrustDialog = (0, import_react164.useCallback)(() => setTrustDialogOpen(true), []);
-  const closeTrustDialog = (0, import_react164.useCallback)(() => setTrustDialogOpen(false), []);
-  const [isPermissionsDialogOpen, setPermissionsDialogOpen] = (0, import_react164.useState)(false);
-  const openPermissionsDialog = (0, import_react164.useCallback)(
+  const [isTrustDialogOpen, setTrustDialogOpen] = (0, import_react165.useState)(false);
+  const openTrustDialog = (0, import_react165.useCallback)(() => setTrustDialogOpen(true), []);
+  const closeTrustDialog = (0, import_react165.useCallback)(() => setTrustDialogOpen(false), []);
+  const [isPermissionsDialogOpen, setPermissionsDialogOpen] = (0, import_react165.useState)(false);
+  const openPermissionsDialog = (0, import_react165.useCallback)(
     () => setPermissionsDialogOpen(true),
     []
   );
-  const closePermissionsDialog = (0, import_react164.useCallback)(
+  const closePermissionsDialog = (0, import_react165.useCallback)(
     () => setPermissionsDialogOpen(false),
     []
   );
-  const [currentModel, setCurrentModel] = (0, import_react164.useState)(() => config.getModel());
-  const [isConfigInitialized, setConfigInitialized] = (0, import_react164.useState)(false);
-  const [userMessages, setUserMessages] = (0, import_react164.useState)([]);
-  const [transcriptFreeze, setTranscriptFreeze] = (0, import_react164.useState)(null);
+  const [currentModel, setCurrentModel] = (0, import_react165.useState)(() => config.getModel());
+  const [isConfigInitialized, setConfigInitialized] = (0, import_react165.useState)(false);
+  const [userMessages, setUserMessages] = (0, import_react165.useState)([]);
+  const [transcriptFreeze, setTranscriptFreeze] = (0, import_react165.useState)(null);
   const isTranscriptOpen = transcriptFreeze != null;
-  const isTranscriptOpenRef = (0, import_react164.useRef)(isTranscriptOpen);
+  const isTranscriptOpenRef = (0, import_react165.useRef)(isTranscriptOpen);
   isTranscriptOpenRef.current = isTranscriptOpen;
-  const closeTranscript = (0, import_react164.useCallback)(() => {
+  const closeTranscript = (0, import_react165.useCallback)(() => {
     setTranscriptFreeze(null);
   }, []);
-  const [thoughtExpanded, setThoughtExpanded] = (0, import_react164.useState)(false);
-  const [expandedThoughtHeadIds, setExpandedThoughtHeadIds] = (0, import_react164.useState)(() => /* @__PURE__ */ new Set());
-  const toggleThoughtExpanded = (0, import_react164.useCallback)((headId) => {
+  const [thoughtExpanded, setThoughtExpanded] = (0, import_react165.useState)(false);
+  const [expandedThoughtHeadIds, setExpandedThoughtHeadIds] = (0, import_react165.useState)(() => /* @__PURE__ */ new Set());
+  const toggleThoughtExpanded = (0, import_react165.useCallback)((headId) => {
     setExpandedThoughtHeadIds((prev) => {
       const next = new Set(prev);
       if (next.has(headId)) {
@@ -41675,10 +41996,10 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const { columns: terminalWidth, rows: terminalHeight } = useTerminalSize();
   const { stdin, setRawMode } = use_stdin_default();
   const { stdout } = use_stdout_default();
-  const writeRaw = (0, import_react164.useCallback)((data) => {
+  const writeRaw = (0, import_react165.useCallback)((data) => {
     process16.stdout.write(data);
   }, []);
-  const terminal = (0, import_react164.useMemo)(
+  const terminal = (0, import_react165.useMemo)(
     () => buildTerminalNotification(writeRaw),
     [writeRaw]
   );
@@ -41688,12 +42009,14 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     seedPromptCount
   } = useSessionStats();
   const logger = useLogger(config.storage, sessionStats.sessionId);
-  const branchName = useGitBranchName(config.getTargetDir());
   const worktreeSession = useWorktreeSession(config);
-  const [showWorktreeExitDialog, setShowWorktreeExitDialog] = (0, import_react164.useState)(false);
-  const [workflowKeywordActive, setWorkflowKeywordActive] = (0, import_react164.useState)(false);
-  const pendingWorktreeNoticeRef = (0, import_react164.useRef)(null);
-  const activeWorktree = (0, import_react164.useMemo)(
+  const branchName = useGitBranchName(
+    worktreeSession?.worktreePath ?? config.getTargetDir()
+  );
+  const [showWorktreeExitDialog, setShowWorktreeExitDialog] = (0, import_react165.useState)(false);
+  const [workflowKeywordActive, setWorkflowKeywordActive] = (0, import_react165.useState)(false);
+  const pendingWorktreeNoticeRef = (0, import_react165.useRef)(null);
+  const activeWorktree = (0, import_react165.useMemo)(
     () => worktreeSession ? {
       slug: worktreeSession.slug,
       branch: worktreeSession.worktreeBranch,
@@ -41704,20 +42027,20 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     } : null,
     [worktreeSession]
   );
-  const mainControlsRef = (0, import_react164.useRef)(null);
-  const lastTitleRef = (0, import_react164.useRef)(null);
-  const [startupWarnings, setStartupWarnings] = (0, import_react164.useState)(
+  const mainControlsRef = (0, import_react165.useRef)(null);
+  const lastTitleRef = (0, import_react165.useRef)(null);
+  const [startupWarnings, setStartupWarnings] = (0, import_react165.useState)(
     () => props.startupWarnings || []
   );
   const staticExtraHeight = 3;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     void loadLowlight().catch((err) => {
       debugLogger40.warn(
         `Failed to load lowlight chunk; code blocks will render as plain text: ${err instanceof Error ? err.message : String(err)}`
       );
     });
   }, []);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     (async () => {
       profileCheckpoint("config_initialize_start");
       await config.initialize();
@@ -41807,7 +42130,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       await ideClient.disconnect();
     });
   }, [config]);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (!isConfigInitialized) return void 0;
     const geminiClient2 = config.getGeminiClient();
     if (!geminiClient2) return void 0;
@@ -41871,11 +42194,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       clearTimeout(finalizeCap);
     };
   }, [isConfigInitialized, config]);
-  const isIdleRef = (0, import_react164.useRef)(true);
-  const availableTerminalHeightRef = (0, import_react164.useRef)(0);
-  const terminalWidthRef = (0, import_react164.useRef)(0);
-  const updateHandlerRef = (0, import_react164.useRef)(null);
-  (0, import_react164.useEffect)(() => {
+  const isIdleRef = (0, import_react165.useRef)(true);
+  const availableTerminalHeightRef = (0, import_react165.useRef)(0);
+  const terminalWidthRef = (0, import_react165.useRef)(0);
+  const updateHandlerRef = (0, import_react165.useRef)(null);
+  (0, import_react165.useEffect)(() => {
     const handler = setUpdateHandler(
       historyManager.addItem,
       setUpdateInfo,
@@ -41884,13 +42207,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     updateHandlerRef.current = handler;
     return () => handler?.cleanup();
   }, [historyManager.addItem]);
-  const { inputWidth, suggestionsWidth } = (0, import_react164.useMemo)(() => {
+  const { inputWidth, suggestionsWidth } = (0, import_react165.useMemo)(() => {
     const { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 } = calculatePromptWidths(terminalWidth);
     return { inputWidth: inputWidth2, suggestionsWidth: suggestionsWidth2 };
   }, [terminalWidth]);
   const mainAreaWidth = Math.min(terminalWidth - 4, 100);
   const staticAreaMaxItemHeight = Math.max(terminalHeight * 4, 100);
-  const isValidPath = (0, import_react164.useCallback)((filePath) => {
+  const isValidPath = (0, import_react165.useCallback)((filePath) => {
     try {
       return fs20.existsSync(filePath) && fs20.statSync(filePath).isFile();
     } catch (_e) {
@@ -41907,9 +42230,9 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     shellModeActive,
     preferredEditor
   });
-  const restoredPromptStashTargetsRef = (0, import_react164.useRef)(/* @__PURE__ */ new Set());
+  const restoredPromptStashTargetsRef = (0, import_react165.useRef)(/* @__PURE__ */ new Set());
   const promptStashTargetDir = config.getTargetDir();
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (restoredPromptStashTargetsRef.current.has(promptStashTargetDir)) {
       return;
     }
@@ -41920,12 +42243,12 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       (text) => buffer.setText(text)
     );
   }, [buffer, promptStashTargetDir]);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     const fetchUserMessages = /* @__PURE__ */ __name(async () => {
       const pastMessagesRaw = await logger?.getPreviousUserMessages() || [];
-      const currentSessionUserMessages = historyManager.history.filter(
-        (item) => item.type === "user" && typeof item.text === "string" && item.text.trim() !== ""
-      ).map((item) => item.text).reverse();
+      const currentSessionUserMessages = realUserPromptTexts(
+        historyManager.history
+      ).reverse();
       const combinedMessages = [
         ...currentSessionUserMessages,
         ...pastMessagesRaw
@@ -41934,12 +42257,12 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }, "fetchUserMessages");
     fetchUserMessages();
   }, [historyManager.history, logger]);
-  const remountStaticHistory = (0, import_react164.useCallback)(() => {
+  const remountStaticHistory = (0, import_react165.useCallback)(() => {
     setHistoryRemountKey((prev) => prev + 1);
   }, []);
   const useTerminalBuffer = settings.merged.ui?.useTerminalBuffer ?? false;
   const showScrollbar = settings.merged.ui?.showScrollbar ?? true;
-  const refreshStatic = (0, import_react164.useCallback)(() => {
+  const refreshStatic = (0, import_react165.useCallback)(() => {
     if (isTranscriptOpenRef.current) {
       return;
     }
@@ -41948,15 +42271,15 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }
     remountStaticHistory();
   }, [useTerminalBuffer, remountStaticHistory, stdout]);
-  const prevTranscriptOpenRef = (0, import_react164.useRef)(isTranscriptOpen);
+  const prevTranscriptOpenRef = (0, import_react165.useRef)(isTranscriptOpen);
   const wasOpenPrevRender = prevTranscriptOpenRef.current;
   prevTranscriptOpenRef.current = isTranscriptOpen;
-  const transcriptCloseCountRef = (0, import_react164.useRef)(0);
+  const transcriptCloseCountRef = (0, import_react165.useRef)(0);
   if (wasOpenPrevRender && !isTranscriptOpen) {
     transcriptCloseCountRef.current += 1;
   }
   const transcriptCloseCount = transcriptCloseCountRef.current;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (transcriptCloseCount === 0 || useTerminalBuffer) {
       return void 0;
     }
@@ -41969,8 +42292,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }, 0);
     return () => clearTimeout(id);
   }, [transcriptCloseCount, useTerminalBuffer, stdout, remountStaticHistory]);
-  const lastNotifiedModelRef = (0, import_react164.useRef)(currentModel);
-  (0, import_react164.useEffect)(() => {
+  const lastNotifiedModelRef = (0, import_react165.useRef)(currentModel);
+  (0, import_react165.useEffect)(() => {
     const unsubscribe = config.onModelChange((model) => {
       if (lastNotifiedModelRef.current === model) {
         return;
@@ -42008,7 +42331,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const { onAuthError, openAuthDialog, closeAuthDialog } = authActions;
   const { isAuthDialogOpen, isAuthenticating, pendingAuthType } = authState;
   useInitializationAuthError(initializationResult.authError, onAuthError);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     const currentAuthType = config.getModelsConfig().getCurrentAuthType();
     if (settings.merged.security?.auth?.enforcedType && currentAuthType && settings.merged.security?.auth.enforcedType !== currentAuthType) {
       onAuthError(
@@ -42022,7 +42345,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       );
     }
   }, [settings.merged.security?.auth?.enforcedType, config, onAuthError]);
-  const [editorError, setEditorError] = (0, import_react164.useState)(null);
+  const [editorError, setEditorError] = (0, import_react165.useState)(null);
   const {
     isEditorDialogOpen,
     openEditorDialog,
@@ -42030,18 +42353,18 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     exitEditorDialog
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
   const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
-  const [isStatusLineDialogOpen, setStatusLineDialogOpen] = (0, import_react164.useState)(false);
-  const openStatusLineDialog = (0, import_react164.useCallback)(
+  const [isStatusLineDialogOpen, setStatusLineDialogOpen] = (0, import_react165.useState)(false);
+  const openStatusLineDialog = (0, import_react165.useCallback)(
     () => setStatusLineDialogOpen(true),
     []
   );
-  const closeStatusLineDialog = (0, import_react164.useCallback)(
+  const closeStatusLineDialog = (0, import_react165.useCallback)(
     () => setStatusLineDialogOpen(false),
     []
   );
-  const [statusLineSettingsVersion, setStatusLineSettingsVersion] = (0, import_react164.useState)(0);
-  const [statusLineConfigOverride, setStatusLineConfigOverride] = (0, import_react164.useState)(void 0);
-  const notifyStatusLineSettingsChanged = (0, import_react164.useCallback)(
+  const [statusLineSettingsVersion, setStatusLineSettingsVersion] = (0, import_react165.useState)(0);
+  const [statusLineConfigOverride, setStatusLineConfigOverride] = (0, import_react165.useState)(void 0);
+  const notifyStatusLineSettingsChanged = (0, import_react165.useCallback)(
     (newConfig) => {
       setStatusLineConfigOverride(newConfig);
       setStatusLineSettingsVersion((version) => version + 1);
@@ -42059,8 +42382,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     closeModelDialog
   } = useModelCommand();
   const { activeArenaDialog, openArenaDialog, closeArenaDialog } = useArenaCommand();
-  const [sessionName, setSessionName] = (0, import_react164.useState)(null);
-  (0, import_react164.useEffect)(() => {
+  const [sessionName, setSessionName] = (0, import_react165.useState)(null);
+  (0, import_react165.useEffect)(() => {
     const chatRecordingService = config.getChatRecordingService();
     if (!chatRecordingService?.setTitleRecordedCallback) return;
     const existingCallback = chatRecordingService.getTitleRecordedCallback();
@@ -42077,7 +42400,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     };
   }, [config]);
   const addHistoryItem = historyManager.addItem;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (typeof config.onChatRecordingFailure !== "function") return;
     return config.onChatRecordingFailure(() => {
       addHistoryItem(
@@ -42121,10 +42444,10 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     config,
     addItem: historyManager.addItem
   });
-  const [isHelpDialogOpen, setHelpDialogOpen] = (0, import_react164.useState)(false);
-  const [activeHelpTab, setHelpTab] = (0, import_react164.useState)("general");
-  const openHelpDialog = (0, import_react164.useCallback)(() => setHelpDialogOpen(true), []);
-  const closeHelpDialog = (0, import_react164.useCallback)(() => setHelpDialogOpen(false), []);
+  const [isHelpDialogOpen, setHelpDialogOpen] = (0, import_react165.useState)(false);
+  const [activeHelpTab, setHelpTab] = (0, import_react165.useState)("general");
+  const openHelpDialog = (0, import_react165.useCallback)(() => setHelpDialogOpen(true), []);
+  const closeHelpDialog = (0, import_react165.useCallback)(() => setHelpDialogOpen(false), []);
   const { vimEnabled, vimMode } = useVimModeState();
   const { toggleVimEnabled } = useVimModeActions();
   const {
@@ -42150,31 +42473,31 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const { isMcpDialogOpen, openMcpDialog, closeMcpDialog } = useMcpDialog();
   const { isHooksDialogOpen, openHooksDialog, closeHooksDialog } = useHooksDialog();
   const { isStatsDialogOpen, openStatsDialog, closeStatsDialog } = useStatsDialog();
-  const openRewindSelectorRef = (0, import_react164.useRef)(() => {
+  const openRewindSelectorRef = (0, import_react165.useRef)(() => {
   });
-  const cancelOngoingRequestRef = (0, import_react164.useRef)(() => {
+  const cancelOngoingRequestRef = (0, import_react165.useRef)(() => {
   });
-  const [isDiffDialogOpen, setIsDiffDialogOpen] = (0, import_react164.useState)(false);
-  const openDiffDialog = (0, import_react164.useCallback)(() => {
+  const [isDiffDialogOpen, setIsDiffDialogOpen] = (0, import_react165.useState)(false);
+  const openDiffDialog = (0, import_react165.useCallback)(() => {
     setIsDiffDialogOpen(true);
   }, []);
-  const closeDiffDialog = (0, import_react164.useCallback)(() => {
+  const closeDiffDialog = (0, import_react165.useCallback)(() => {
     setIsDiffDialogOpen(false);
   }, []);
-  const [isSkillReviewDialogOpen, setIsSkillReviewDialogOpen] = (0, import_react164.useState)(false);
-  const [skillReviewPending, setSkillReviewPending] = (0, import_react164.useState)(null);
-  const skillReviewDismissedTaskIdsRef = (0, import_react164.useRef)(/* @__PURE__ */ new Set());
-  const dismissSkillReviewDialog = (0, import_react164.useCallback)(() => {
+  const [isSkillReviewDialogOpen, setIsSkillReviewDialogOpen] = (0, import_react165.useState)(false);
+  const [skillReviewPending, setSkillReviewPending] = (0, import_react165.useState)(null);
+  const skillReviewDismissedTaskIdsRef = (0, import_react165.useRef)(/* @__PURE__ */ new Set());
+  const dismissSkillReviewDialog = (0, import_react165.useCallback)(() => {
     if (skillReviewPending) {
       skillReviewDismissedTaskIdsRef.current.add(skillReviewPending.taskId);
     }
     setIsSkillReviewDialogOpen(false);
   }, [skillReviewPending]);
-  const closeSkillReviewDialog = (0, import_react164.useCallback)(
+  const closeSkillReviewDialog = (0, import_react165.useCallback)(
     () => setIsSkillReviewDialogOpen(false),
     []
   );
-  const acceptPendingSkill = (0, import_react164.useCallback)(
+  const acceptPendingSkill = (0, import_react165.useCallback)(
     (skillName) => {
       if (!skillReviewPending) return;
       void config.getMemoryManager().acceptPendingSkillFromTask(skillReviewPending.taskId, skillName).catch(() => {
@@ -42182,7 +42505,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     },
     [config, skillReviewPending]
   );
-  const rejectPendingSkill = (0, import_react164.useCallback)(
+  const rejectPendingSkill = (0, import_react165.useCallback)(
     (skillName) => {
       if (!skillReviewPending) return;
       void config.getMemoryManager().rejectPendingSkillFromTask(skillReviewPending.taskId, skillName).catch(() => {
@@ -42190,7 +42513,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     },
     [config, skillReviewPending]
   );
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     const mgr = config.getMemoryManager();
     const projectRoot = config.getProjectRoot();
     let lastSig = "";
@@ -42224,7 +42547,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     refresh();
     return unsub;
   }, [config]);
-  const slashCommandActions = (0, import_react164.useMemo)(
+  const slashCommandActions = (0, import_react165.useMemo)(
     () => ({
       openAuthDialog,
       openThemeDialog,
@@ -42334,13 +42657,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     setSessionName,
     extensionRefreshState
   );
-  const onDebugMessage = (0, import_react164.useCallback)(
+  const onDebugMessage = (0, import_react165.useCallback)(
     (message) => {
       config.getDebugLogger().debug(message);
     },
     [config]
   );
-  const handleWorktreeExit = (0, import_react164.useCallback)(
+  const handleWorktreeExit = (0, import_react165.useCallback)(
     async (choice) => {
       if (choice === "cancel") {
         setShowWorktreeExitDialog(false);
@@ -42405,7 +42728,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     },
     [activeWorktree, config, handleSlashCommand, historyManager]
   );
-  const performMemoryRefresh = (0, import_react164.useCallback)(async () => {
+  const performMemoryRefresh = (0, import_react165.useCallback)(async () => {
     if (config.isSafeMode()) {
       config.setUserMemory("");
       config.setGeminiMdFileCount(0);
@@ -42477,10 +42800,10 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       debugLogger40.error("Error refreshing memory:", error);
     }
   }, [config, historyManager, settings.merged]);
-  const cancelHandlerRef = (0, import_react164.useRef)(() => {
+  const cancelHandlerRef = (0, import_react165.useRef)(() => {
   });
-  const midTurnDrainRef = (0, import_react164.useRef)(null);
-  const midTurnRestoreRef = (0, import_react164.useRef)(null);
+  const midTurnDrainRef = (0, import_react165.useRef)(null);
+  const midTurnRestoreRef = (0, import_react165.useRef)(null);
   const {
     streamingState,
     submitQuery,
@@ -42523,13 +42846,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   );
   cancelOngoingRequestRef.current = cancelOngoingRequest;
   isIdleRef.current = streamingState === "idle" /* Idle */;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (streamingState === "idle" /* Idle */) {
       updateHandlerRef.current?.flush();
       setWorkflowKeywordActive(false);
     }
   }, [streamingState]);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (shouldAutoOpenSkillReview({
       pending: skillReviewPending,
       streamingState,
@@ -42541,7 +42864,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }
   }, [skillReviewPending, streamingState, isMemoryDialogOpen, config]);
   const tipsDisabled = !!(settings.merged.ui?.hideTips || config.getScreenReader());
-  const tipHistory = (0, import_react164.useMemo)(
+  const tipHistory = (0, import_react165.useMemo)(
     () => tipsDisabled ? null : getTipHistory(),
     [tipsDisabled]
   );
@@ -42554,7 +42877,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     addItem: historyManager.addItem,
     hideTips: tipsDisabled
   });
-  const [hasTabConsumer, setHasTabConsumer] = (0, import_react164.useState)(false);
+  const [hasTabConsumer, setHasTabConsumer] = (0, import_react165.useState)(false);
   const agentViewState = useAgentViewState();
   const {
     dialogOpen: bgTasksDialogOpen,
@@ -42562,11 +42885,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     livePanelFocused: bgLivePanelFocused
   } = useBackgroundTaskViewState();
   const { closeDialog: closeBgTasksDialog } = useBackgroundTaskViewActions();
-  const [promptSuggestion, setPromptSuggestion] = (0, import_react164.useState)(null);
-  const prevStreamingStateRef = (0, import_react164.useRef)("idle" /* Idle */);
-  const speculationRef = (0, import_react164.useRef)(IDLE_SPECULATION);
-  const suggestionAbortRef = (0, import_react164.useRef)(null);
-  const abortPromptSuggestion = (0, import_react164.useCallback)(() => {
+  const [promptSuggestion, setPromptSuggestion] = (0, import_react165.useState)(null);
+  const prevStreamingStateRef = (0, import_react165.useRef)("idle" /* Idle */);
+  const speculationRef = (0, import_react165.useRef)(IDLE_SPECULATION);
+  const suggestionAbortRef = (0, import_react165.useRef)(null);
+  const abortPromptSuggestion = (0, import_react165.useCallback)(() => {
     suggestionAbortRef.current?.abort();
     suggestionAbortRef.current = null;
     if (speculationRef.current.status !== "idle") {
@@ -42595,21 +42918,21 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   midTurnDrainRef.current = drainQueue;
   midTurnRestoreRef.current = restoreMessages;
   const remoteInput = useRemoteInput();
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (!remoteInput) return;
     remoteInput.setSubmitFn((text) => submitQuery(text));
   }, [remoteInput, submitQuery]);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (!remoteInput) return;
     if (streamingState === "idle" /* Idle */) {
       remoteInput.notifyIdle();
     }
   }, [remoteInput, streamingState]);
   const dualOutput = useDualOutput();
-  const confirmRequestMap = (0, import_react164.useRef)(/* @__PURE__ */ new Map());
-  const confirmCallIdMap = (0, import_react164.useRef)(/* @__PURE__ */ new Map());
-  const confirmEmitted = (0, import_react164.useRef)(/* @__PURE__ */ new Set());
-  (0, import_react164.useEffect)(() => {
+  const confirmRequestMap = (0, import_react165.useRef)(/* @__PURE__ */ new Map());
+  const confirmCallIdMap = (0, import_react165.useRef)(/* @__PURE__ */ new Map());
+  const confirmEmitted = (0, import_react165.useRef)(/* @__PURE__ */ new Set());
+  (0, import_react165.useEffect)(() => {
     if (!dualOutput || !dualOutput.isConnected) return;
     for (const tc of pendingToolCalls) {
       if (tc.status === "awaiting_approval" && !confirmEmitted.current.has(tc.request.callId)) {
@@ -42621,7 +42944,9 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
           requestId,
           tc.request.name,
           tc.request.callId,
-          tc.request.args
+          tc.request.args,
+          null,
+          buildPermissionSuggestions(tc.confirmationDetails)
         );
       }
     }
@@ -42636,11 +42961,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       }
     }
   }, [dualOutput, pendingToolCalls]);
-  const pendingToolCallsRef = (0, import_react164.useRef)(pendingToolCalls);
+  const pendingToolCallsRef = (0, import_react165.useRef)(pendingToolCalls);
   pendingToolCallsRef.current = pendingToolCalls;
-  const dualOutputRef = (0, import_react164.useRef)(dualOutput);
+  const dualOutputRef = (0, import_react165.useRef)(dualOutput);
   dualOutputRef.current = dualOutput;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (!remoteInput) return;
     remoteInput.setConfirmationHandler(
       (requestId, allowed) => {
@@ -42680,7 +43005,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       });
     };
   }, [remoteInput]);
-  const handleFinalSubmit = (0, import_react164.useCallback)(
+  const handleFinalSubmit = (0, import_react165.useCallback)(
     (submittedValue, options) => {
       if (agentViewState.activeView !== "main") {
         const agent = agentViewState.agents.get(agentViewState.activeView);
@@ -42690,6 +43015,20 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         }
       }
       const userPromptText = submittedValue;
+      if (["/quit", "/exit", "exit", "quit", ":q", ":q!", ":wq", ":wq!"].includes(
+        userPromptText.trim()
+      )) {
+        void handleSlashCommand("/quit");
+        return;
+      }
+      const recoveredAgentsNotice = !isSlashCommand(userPromptText) && !isBtwCommand(userPromptText) ? config.consumePendingRecoveredAgentsNotice() : null;
+      if (recoveredAgentsNotice) {
+        submittedValue = `<system-reminder>
+${recoveredAgentsNotice}
+</system-reminder>
+
+` + submittedValue;
+      }
       const worktreeNotice = pendingWorktreeNoticeRef.current;
       if (worktreeNotice && !isSlashCommand(submittedValue)) {
         pendingWorktreeNoticeRef.current = null;
@@ -42720,12 +43059,6 @@ ${buildWorkflowSteeringNotice()}
         void submitQuery(submittedValue);
         return;
       }
-      if (["/quit", "/exit", "exit", "quit", ":q", ":q!", ":wq", ":wq!"].includes(
-        submittedValue.trim()
-      )) {
-        void handleSlashCommand("/quit");
-        return;
-      }
       const spec = speculationRef.current;
       if (spec.status !== "idle" && spec.suggestion === submittedValue && spec.status === "completed") {
         acceptSpeculation(spec, geminiClient).then((result) => {
@@ -42826,7 +43159,7 @@ ${buildWorkflowSteeringNotice()}
       settings.merged.ui?.disableWorkflowKeywordTrigger
     ]
   );
-  const handleArenaModelsSelected = (0, import_react164.useCallback)(
+  const handleArenaModelsSelected = (0, import_react165.useCallback)(
     (models) => {
       const value = models.join(",");
       buffer.setText(`/arena start --models ${value} `);
@@ -42841,15 +43174,15 @@ ${buildWorkflowSteeringNotice()}
     handleWelcomeBackSelection,
     handleWelcomeBackClose
   } = useWelcomeBack(config, handleFinalSubmit, buffer, settings.merged);
-  const pendingHistoryItems = (0, import_react164.useMemo)(
+  const pendingHistoryItems = (0, import_react165.useMemo)(
     () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]
   );
-  const historyForTranscriptRef = (0, import_react164.useRef)(historyManager.history);
+  const historyForTranscriptRef = (0, import_react165.useRef)(historyManager.history);
   historyForTranscriptRef.current = historyManager.history;
-  const pendingForTranscriptRef = (0, import_react164.useRef)(pendingHistoryItems);
+  const pendingForTranscriptRef = (0, import_react165.useRef)(pendingHistoryItems);
   pendingForTranscriptRef.current = pendingHistoryItems;
-  const openTranscript = (0, import_react164.useCallback)(() => {
+  const openTranscript = (0, import_react165.useCallback)(() => {
     setTranscriptFreeze({
       // Share MainContent's visibility predicate so the transcript shows exactly
       // what the main view shows. Items collapsed on session resume
@@ -42861,7 +43194,7 @@ ${buildWorkflowSteeringNotice()}
       pendingItems: [...pendingForTranscriptRef.current]
     });
   }, []);
-  const transcriptItems = (0, import_react164.useMemo)(() => {
+  const transcriptItems = (0, import_react165.useMemo)(() => {
     if (!transcriptFreeze) return EMPTY_HISTORY_ITEMS;
     return [
       ...transcriptFreeze.committedItems,
@@ -42873,7 +43206,7 @@ ${buildWorkflowSteeringNotice()}
       }))
     ];
   }, [transcriptFreeze]);
-  const rawStickyTodos = (0, import_react164.useMemo)(
+  const rawStickyTodos = (0, import_react165.useMemo)(
     () => getStickyTodos(historyManager.history, pendingHistoryItems),
     [historyManager.history, pendingHistoryItems]
   );
@@ -42881,7 +43214,7 @@ ${buildWorkflowSteeringNotice()}
   const hasExecutingTool = isToolExecuting(pendingHistoryItems);
   const hasPendingCompression = isCompressionPending(pendingHistoryItems);
   useTerminalProgress(streamingState, hasExecutingTool);
-  cancelHandlerRef.current = (0, import_react164.useCallback)(
+  cancelHandlerRef.current = (0, import_react165.useCallback)(
     (info) => {
       const pendingHistoryItems2 = [
         ...pendingSlashCommandHistoryItems,
@@ -42981,7 +43314,7 @@ ${currentText}` : popped);
       pendingGeminiHistoryItems
     ]
   );
-  const handleClearScreen = (0, import_react164.useCallback)(() => {
+  const handleClearScreen = (0, import_react165.useCallback)(() => {
     historyManager.clearItems();
     clearScreen();
     remountStaticHistory();
@@ -43004,13 +43337,13 @@ ${currentText}` : popped);
     history: historyManager.history,
     awayThresholdMinutes: settings.merged.general?.sessionRecapAwayThresholdMinutes
   });
-  const contextFileNames = (0, import_react164.useMemo)(() => {
+  const contextFileNames = (0, import_react165.useMemo)(() => {
     const fromSettings = settings.merged.context?.fileName;
     return fromSettings ? Array.isArray(fromSettings) ? fromSettings : [fromSettings] : getAllGeminiMdFilenames();
   }, [settings.merged.context?.fileName]);
-  const initialPrompt = (0, import_react164.useMemo)(() => config.getQuestion(), [config]);
-  const initialPromptSubmitted = (0, import_react164.useRef)(false);
-  (0, import_react164.useEffect)(() => {
+  const initialPrompt = (0, import_react165.useMemo)(() => config.getQuestion(), [config]);
+  const initialPromptSubmitted = (0, import_react165.useRef)(false);
+  (0, import_react165.useEffect)(() => {
     if (initialPrompt && isConfigInitialized && !initialPromptSubmitted.current && !isAuthenticating && !isAuthDialogOpen && !isThemeDialogOpen && !isEditorDialogOpen && !showWelcomeBackDialog && welcomeBackChoice !== "restart" && geminiClient?.isInitialized?.()) {
       handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
@@ -43028,7 +43361,7 @@ ${currentText}` : popped);
     geminiClient
   ]);
   const followupSuggestionsEnabled = settings.merged.ui?.enableFollowupSuggestions !== false;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (!followupSuggestionsEnabled) {
       suggestionAbortRef.current?.abort();
       setPromptSuggestion(null);
@@ -43097,17 +43430,17 @@ ${currentText}` : popped);
     isPermissionsDialogOpen,
     settingInputRequests
   ]);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (!promptSuggestion && speculationRef.current.status !== "idle") {
       abortSpeculation(speculationRef.current).catch(() => {
       });
       speculationRef.current = IDLE_SPECULATION;
     }
   }, [promptSuggestion]);
-  const [idePromptAnswered, setIdePromptAnswered] = (0, import_react164.useState)(false);
-  const [currentIDE, setCurrentIDE] = (0, import_react164.useState)(null);
-  const [startupIdeConnectionStatus, setStartupIdeConnectionStatus] = (0, import_react164.useState)({ state: "idle" });
-  (0, import_react164.useEffect)(() => {
+  const [idePromptAnswered, setIdePromptAnswered] = (0, import_react165.useState)(false);
+  const [currentIDE, setCurrentIDE] = (0, import_react165.useState)(null);
+  const [startupIdeConnectionStatus, setStartupIdeConnectionStatus] = (0, import_react165.useState)({ state: "idle" });
+  (0, import_react165.useEffect)(() => {
     const getIde = /* @__PURE__ */ __name(async () => {
       const ideClient = await IdeClient.getInstance();
       const currentIde = ideClient.getCurrentIde();
@@ -43123,40 +43456,40 @@ ${currentText}` : popped);
     tomlFiles: commandMigrationTomlFiles,
     setShowMigrationNudge: setShowCommandMigrationNudge
   } = useCommandMigration(settings, config.storage);
-  const [showToolDescriptions, setShowToolDescriptions] = (0, import_react164.useState)(false);
+  const [showToolDescriptions, setShowToolDescriptions] = (0, import_react165.useState)(false);
   const configuredRenderMode = settings.merged.ui?.renderMode;
-  const [renderMode, setRenderMode] = (0, import_react164.useState)(
+  const [renderMode, setRenderMode] = (0, import_react165.useState)(
     configuredRenderMode === "raw" ? "raw" : "render"
   );
-  const renderModeConfigMountedRef = (0, import_react164.useRef)(false);
-  (0, import_react164.useEffect)(() => {
+  const renderModeConfigMountedRef = (0, import_react165.useRef)(false);
+  (0, import_react165.useEffect)(() => {
     if (!renderModeConfigMountedRef.current) {
       renderModeConfigMountedRef.current = true;
       return;
     }
     setRenderMode(configuredRenderMode === "raw" ? "raw" : "render");
   }, [configuredRenderMode]);
-  const renderModeMountedRef = (0, import_react164.useRef)(false);
-  (0, import_react164.useEffect)(() => {
+  const renderModeMountedRef = (0, import_react165.useRef)(false);
+  (0, import_react165.useEffect)(() => {
     if (!renderModeMountedRef.current) {
       renderModeMountedRef.current = true;
       return;
     }
     refreshStatic();
   }, [renderMode, refreshStatic]);
-  const [ctrlCPressedOnce, setCtrlCPressedOnce] = (0, import_react164.useState)(false);
-  const ctrlCTimerRef = (0, import_react164.useRef)(null);
-  const [ctrlDPressedOnce, setCtrlDPressedOnce] = (0, import_react164.useState)(false);
-  const ctrlDTimerRef = (0, import_react164.useRef)(null);
-  const [escapePressedOnce, setEscapePressedOnce] = (0, import_react164.useState)(false);
-  const escapeTimerRef = (0, import_react164.useRef)(null);
-  const dialogsVisibleRef = (0, import_react164.useRef)(false);
-  const [isRewindSelectorOpen, setIsRewindSelectorOpen] = (0, import_react164.useState)(false);
-  const [rewindEscPending, setRewindEscPending] = (0, import_react164.useState)(false);
-  const [constrainHeight, setConstrainHeight] = (0, import_react164.useState)(true);
-  const [ideContextState, setIdeContextState] = (0, import_react164.useState)();
-  const [showEscapePrompt, setShowEscapePrompt] = (0, import_react164.useState)(false);
-  const [showIdeRestartPrompt, setShowIdeRestartPrompt] = (0, import_react164.useState)(false);
+  const [ctrlCPressedOnce, setCtrlCPressedOnce] = (0, import_react165.useState)(false);
+  const ctrlCTimerRef = (0, import_react165.useRef)(null);
+  const [ctrlDPressedOnce, setCtrlDPressedOnce] = (0, import_react165.useState)(false);
+  const ctrlDTimerRef = (0, import_react165.useRef)(null);
+  const [escapePressedOnce, setEscapePressedOnce] = (0, import_react165.useState)(false);
+  const escapeTimerRef = (0, import_react165.useRef)(null);
+  const dialogsVisibleRef = (0, import_react165.useRef)(false);
+  const [isRewindSelectorOpen, setIsRewindSelectorOpen] = (0, import_react165.useState)(false);
+  const [rewindEscPending, setRewindEscPending] = (0, import_react165.useState)(false);
+  const [constrainHeight, setConstrainHeight] = (0, import_react165.useState)(true);
+  const [ideContextState, setIdeContextState] = (0, import_react165.useState)();
+  const [showEscapePrompt, setShowEscapePrompt] = (0, import_react165.useState)(false);
+  const [showIdeRestartPrompt, setShowIdeRestartPrompt] = (0, import_react165.useState)(false);
   const { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder);
   const {
     isMcpApprovalDialogOpen,
@@ -43185,7 +43518,7 @@ ${currentText}` : popped);
   const dialogsVisible = showWelcomeBackDialog || shouldShowIdePrompt || shouldShowCommandMigrationNudge || isFolderTrustDialogOpen || isMcpApprovalDialogOpen || !!shellConfirmationRequest || !!confirmationRequest || confirmUpdateExtensionRequests.length > 0 || !!providerUpdateRequest || settingInputRequests.length > 0 || pluginChoiceRequests.length > 0 || !!loopDetectionConfirmationRequest || isThemeDialogOpen || isSettingsDialogOpen || isStatusLineDialogOpen || isMemoryDialogOpen || isModelDialogOpen || isTrustDialogOpen || activeArenaDialog !== null || isPermissionsDialogOpen || isAuthDialogOpen || isAuthenticating || isEditorDialogOpen || showIdeRestartPrompt || isSubagentCreateDialogOpen || isAgentsManagerDialogOpen || isSkillsManagerDialogOpen || isMcpDialogOpen || isHooksDialogOpen || isStatsDialogOpen || isApprovalModeDialogOpen || isEffortDialogOpen || isResumeDialogOpen || isDeleteDialogOpen || isHelpDialogOpen || isExtensionsManagerDialogOpen || isRewindSelectorOpen || isDiffDialogOpen || isSkillReviewDialogOpen || bgTasksDialogOpen || showWorktreeExitDialog || !!(settings.corruptedPath && !settings.corruptionDialogDismissed);
   dialogsVisibleRef.current = dialogsVisible;
   const needsBlockingInput = dialogsVisible || streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (needsBlockingInput && isTranscriptOpen) {
       closeTranscript();
     }
@@ -43201,12 +43534,12 @@ ${currentText}` : popped);
     stickyTodoWidth,
     stickyTodoMaxVisibleItems
   ) : "hidden";
-  const [controlsHeight, setControlsHeight] = (0, import_react164.useState)(0);
+  const [controlsHeight, setControlsHeight] = (0, import_react165.useState)(0);
   const liveAgentPanelLayoutKey = getLiveAgentPanelLayoutKey(
     bgTaskEntries,
     bgLivePanelFocused
   );
-  (0, import_react164.useLayoutEffect)(() => {
+  (0, import_react165.useLayoutEffect)(() => {
     if (!mainControlsRef.current) {
       setControlsHeight(
         (previousHeight) => previousHeight === 0 ? previousHeight : 0
@@ -43225,10 +43558,13 @@ ${currentText}` : popped);
     dialogsVisible,
     stickyTodosLayoutKey,
     liveAgentPanelLayoutKey,
-    // Composer height also shifts with these; without them the footer isn't
-    // re-measured during a streaming turn and the VP viewport bottom clips.
+    // Composer and update notification height also shift with these; without
+    // them the footer isn't re-measured during a streaming turn and the VP
+    // viewport bottom clips.
     // (elapsedTime/currentLoadingPhrase excluded: they tick without changing rows.)
     streamingState,
+    updateInfo,
+    agentViewState.activeView,
     embeddedShellFocused,
     messageQueue.length,
     isInputActive
@@ -43250,7 +43586,7 @@ ${currentText}` : popped);
     pager: settings.merged.tools?.shell?.pager,
     showColor: settings.merged.tools?.shell?.showColor
   });
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (activePtyId) {
       ShellExecutionService.resizePty(
         activePtyId,
@@ -43260,17 +43596,18 @@ ${currentText}` : popped);
     }
   }, [terminalWidth, availableTerminalHeight, activePtyId]);
   useResizeSettleRepaint(terminalWidth, refreshStatic);
-  (0, import_react164.useEffect)(() => {
+  useWakeRepaint(refreshStatic);
+  (0, import_react165.useEffect)(() => {
     if (ideNeedsRestart) {
       setShowIdeRestartPrompt(true);
     }
   }, [ideNeedsRestart]);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     const unsubscribe = ideContextStore.subscribe(setIdeContextState);
     setIdeContextState(ideContextStore.get());
     return unsubscribe;
   }, []);
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     const listener = /* @__PURE__ */ __name((status) => {
       setStartupIdeConnectionStatus(status);
     }, "listener");
@@ -43279,10 +43616,10 @@ ${currentText}` : popped);
       appEvents.off("startup-ide-connection-status-changed" /* StartupIdeConnectionStatusChanged */, listener);
     };
   }, []);
-  const handleEscapePromptChange = (0, import_react164.useCallback)((showPrompt) => {
+  const handleEscapePromptChange = (0, import_react165.useCallback)((showPrompt) => {
     setShowEscapePrompt(showPrompt);
   }, []);
-  const openRewindSelector = (0, import_react164.useCallback)(() => {
+  const openRewindSelector = (0, import_react165.useCallback)(() => {
     if (streamingState !== "idle" /* Idle */) return;
     if (dialogsVisibleRef.current) return;
     if (config.getIdeMode()) {
@@ -43300,10 +43637,10 @@ ${currentText}` : popped);
     setIsRewindSelectorOpen(true);
   }, [streamingState, config, historyManager]);
   openRewindSelectorRef.current = openRewindSelector;
-  const closeRewindSelector = (0, import_react164.useCallback)(() => {
+  const closeRewindSelector = (0, import_react165.useCallback)(() => {
     setIsRewindSelectorOpen(false);
   }, []);
-  const handleRewindConfirm = (0, import_react164.useCallback)(
+  const handleRewindConfirm = (0, import_react165.useCallback)(
     async (userItem, option) => {
       try {
         const needsConversation = option === "conversation" || option === "both";
@@ -43465,7 +43802,7 @@ ${currentText}` : popped);
     openRewindSelector,
     (pending) => setRewindEscPending(pending)
   );
-  const handleIdePromptComplete = (0, import_react164.useCallback)(
+  const handleIdePromptComplete = (0, import_react165.useCallback)(
     (result) => {
       if (result.userSelection === "yes") {
         if (result.isExtensionPreInstalled) {
@@ -43481,7 +43818,7 @@ ${currentText}` : popped);
     },
     [handleSlashCommand, settings]
   );
-  const handleCommandMigrationComplete = (0, import_react164.useCallback)(
+  const handleCommandMigrationComplete = (0, import_react165.useCallback)(
     async (result) => {
       setShowCommandMigrationNudge(false);
       if (result.userSelection === "yes") {
@@ -43573,7 +43910,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     pendingToolCalls
   });
   const workflowBellEnabled = settings.merged.general?.terminalBell ?? true;
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     const registry = config.getWorkflowRunRegistry?.();
     if (!registry?.setNotificationCallback) return;
     registry.setNotificationCallback((entry) => {
@@ -43623,7 +43960,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     showWorktreeExitDialog,
     closeWorktreeExitDialog: /* @__PURE__ */ __name(() => setShowWorktreeExitDialog(false), "closeWorktreeExitDialog")
   });
-  const handleExit = (0, import_react164.useCallback)(
+  const handleExit = (0, import_react165.useCallback)(
     (pressedOnce, setPressedOnce, timerRef) => {
       if (pressedOnce) {
         if (timerRef.current) {
@@ -43676,7 +44013,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       activeWorktree
     ]
   );
-  const handleGlobalKeypress = (0, import_react164.useCallback)(
+  const handleGlobalKeypress = (0, import_react165.useCallback)(
     (key) => {
       if (settings.merged.general?.debugKeystrokeLogging) {
         debugLogger40.debug("[DEBUG] Keystroke:", JSON.stringify(key));
@@ -43866,7 +44203,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     ]
   );
   useKeypress(handleGlobalKeypress, { isActive: true });
-  (0, import_react164.useEffect)(() => {
+  (0, import_react165.useEffect)(() => {
     if (settings.merged.ui?.hideWindowTitle) {
       return;
     }
@@ -43893,9 +44230,9 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     settings.merged.ui?.showStatusInTitle,
     config
   ]);
-  const queueDrainingRef = (0, import_react164.useRef)(false);
-  const [queueDrainNonce, setQueueDrainNonce] = (0, import_react164.useState)(0);
-  (0, import_react164.useEffect)(() => {
+  const queueDrainingRef = (0, import_react165.useRef)(false);
+  const [queueDrainNonce, setQueueDrainNonce] = (0, import_react165.useState)(0);
+  (0, import_react165.useEffect)(() => {
     if (queueDrainingRef.current) return;
     if (!shouldDrainMessageQueue({
       isConfigInitialized,
@@ -43929,7 +44266,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     queueDrainNonce
   ]);
   const nightly = props.version.includes("nightly");
-  const uiState = (0, import_react164.useMemo)(
+  const uiState = (0, import_react165.useMemo)(
     () => ({
       history: historyManager.history,
       historyManager,
@@ -44220,7 +44557,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       isDiffDialogOpen
     ]
   );
-  const uiActions = (0, import_react164.useMemo)(
+  const uiActions = (0, import_react165.useMemo)(
     () => ({
       openThemeDialog,
       openEditorDialog,
@@ -44401,11 +44738,11 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       closeDiffDialog
     ]
   );
-  const renderModeValue = (0, import_react164.useMemo)(
+  const renderModeValue = (0, import_react165.useMemo)(
     () => ({ renderMode, setRenderMode }),
     [renderMode, setRenderMode]
   );
-  const thoughtExpandedValue = (0, import_react164.useMemo)(
+  const thoughtExpandedValue = (0, import_react165.useMemo)(
     () => ({
       allExpanded: thoughtExpanded,
       expandedHeadIds: expandedThoughtHeadIds,
@@ -44442,9 +44779,9 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
 
 // packages/cli/src/ui/hooks/useKittyKeyboardProtocol.ts
 init_esbuild_shims();
-var import_react165 = __toESM(require_react(), 1);
+var import_react166 = __toESM(require_react(), 1);
 function useKittyKeyboardProtocol() {
-  const [status] = (0, import_react165.useState)({
+  const [status] = (0, import_react166.useState)({
     supported: isKittyProtocolSupported(),
     enabled: isKittyProtocolEnabled(),
     checking: false
@@ -44728,14 +45065,33 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   if (useVP) {
     process.stdout.setMaxListeners(0);
   }
+  const appTree = /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(
+    ErrorBoundary,
+    {
+      onError: (error, info) => {
+        debugLogger41.error(
+          `[FATAL_RENDER_ERROR] ${error.message}
+${info.componentStack ?? ""}
+${error.stack ?? ""}`
+        );
+        setTimeout(() => {
+          void runExitCleanup().then(() => process.exit(1));
+        }, 5e3);
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(AppWrapper, {})
+    }
+  );
   const instance = render_default(
-    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(import_react166.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(import_react167.default.StrictMode, { children: appTree }) : appTree,
     {
       exitOnCtrlC: false,
       isScreenReaderEnabled: config.getScreenReader(),
       alternateScreen: useVP
     }
   );
+  if (useVP) {
+    pushKittyProtocolFlags();
+  }
   profileCheckpoint("first_paint");
   startPostRenderPrefetches(config, settings, {
     connectIde: options.postRenderConnectIde ?? false,