@qwen-code/qwen-code 0.21.0 → 0.21.1-nightly.20260731.702932cc7

package/chunks/{startInteractiveUI-SLZGHRPH.js → startInteractiveUI-S27DXVAE.js}

@@ -1,8 +1,5 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  useAutoAcceptIndicator
-} from "./chunk-2X55UKQE.js";
 import {
   classifyApiError
 } from "./chunk-V7RNNPGC.js";
@@ -12,7 +9,7 @@ import {
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-YPE6A4GC.js";
+} from "./chunk-RT7FNC2O.js";
 import {
   MAX_SUGGESTIONS_TO_SHOW,
   SESSION_MENTION_PREFIX,
@@ -24,10 +21,10 @@ import {
   matchMcpServerPrefix,
   resolveAtCommandQuery,
   sanitizeDisplayText
-} from "./chunk-VULLI6WQ.js";
+} from "./chunk-QIERF2GQ.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-BKHWX6I2.js";
+} from "./chunk-A5BZ722X.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -42,6 +39,7 @@ import {
   appendUserPromptExpansionAdditionalContext,
   copyToClipboard,
   createEmptyHookEventInfo,
+  dayKey,
   findMidInputSlashCommand,
   findSlashCommandTokens,
   formatApprovalModeDescription,
@@ -56,25 +54,28 @@ import {
   isBtwCommand,
   isMidInputCompletableCommand,
   isSlashCommand,
+  isStackedSkillCompletableCommand,
+  isValidStackedSkillPrefix,
   normalizePartList,
+  parseDayKey,
   parseSlashCommand,
   parseStackedSlashCommands,
   refreshExtensionContentRuntime,
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt,
   supportsMatchers
-} from "./chunk-LB6DUZ26.js";
-import "./chunk-R5AFZNQW.js";
+} from "./chunk-BTWSGZCT.js";
+import "./chunk-VAVHTGU4.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-2NH6DYI4.js";
+} from "./chunk-VHPFWR2O.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState,
   appEvents,
   cleanupReviewWorktreeLeases,
   loadHierarchicalGeminiMemory
-} from "./chunk-TPRQ7RZH.js";
+} from "./chunk-76E5Y3UZ.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -106,6 +107,7 @@ import {
   UIStateContext,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
+  VirtualViewportContext,
   checkExhaustive,
   colorizeCode,
   countMarkdownSourceBlocks,
@@ -146,41 +148,23 @@ import {
   useTerminalSize,
   useTextBuffer,
   useUIActions,
-  useUIState
-} from "./chunk-SQCQ4KO2.js";
-import {
-  KeypressProvider,
-  useFocus,
-  useKeypress,
-  useKeypressContext
-} from "./chunk-LQIW3YFY.js";
+  useUIState,
+  useVirtualViewport
+} from "./chunk-P5DEY3NF.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-RZIX2G32.js";
+} from "./chunk-THPORXSI.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-U7M2DMGW.js";
-import {
-  BEL,
-  OSC_PREFIX,
-  cleanupOldClipboardImages,
-  clipboardHasImage,
-  detectTerminal,
-  generateKittyId,
-  oscGhosttyNotify,
-  oscITerm2Notify,
-  oscKittyNotify,
-  saveClipboardImage,
-  writeOsc52
-} from "./chunk-J56UI34H.js";
+} from "./chunk-M4MSAE7U.js";
 import "./chunk-4WGODMVR.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-FQK6JAFG.js";
+} from "./chunk-FS674JW4.js";
 import {
   GeminiRespondingSpinner,
   GeminiSpinner,
@@ -194,10 +178,41 @@ import {
   expandCollapsedHistory,
   isCollapsibleTool,
   useStreamingContext
-} from "./chunk-JXJFVC6E.js";
+} from "./chunk-5G6XUGXO.js";
 import {
   theme
-} from "./chunk-VAK25FTU.js";
+} from "./chunk-45IOTAUS.js";
+import {
+  stopAndGetCapturedInput
+} from "./chunk-TZTAV5RH.js";
+import {
+  disableKittyProtocol,
+  isKittyProtocolEnabled,
+  isKittyProtocolSupported,
+  pushKittyProtocolFlags
+} from "./chunk-PQNHRFJC.js";
+import {
+  useAutoAcceptIndicator
+} from "./chunk-2JZR3B4A.js";
+import {
+  KeypressProvider,
+  useFocus,
+  useKeypress,
+  useKeypressContext
+} from "./chunk-YJFPRUWX.js";
+import {
+  BEL,
+  OSC_PREFIX,
+  cleanupOldClipboardImages,
+  clipboardHasImage,
+  detectTerminal,
+  generateKittyId,
+  oscGhosttyNotify,
+  oscITerm2Notify,
+  oscKittyNotify,
+  saveClipboardImage,
+  writeOsc52
+} from "./chunk-NBD76HUW.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -214,51 +229,40 @@ import {
   use_is_screen_reader_enabled_default,
   use_stdin_default,
   use_stdout_default
-} from "./chunk-6GMVPFB2.js";
-import {
-  stopAndGetCapturedInput
-} from "./chunk-63P4EL5V.js";
-import {
-  disableKittyProtocol,
-  isKittyProtocolEnabled,
-  isKittyProtocolSupported,
-  pushKittyProtocolFlags
-} from "./chunk-PQNHRFJC.js";
+} from "./chunk-2IIJTXYF.js";
 import {
   relaunchApp
-} from "./chunk-Y34KJKDC.js";
+} from "./chunk-Y7BVNVVW.js";
 import {
   setUpdateHandler
-} from "./chunk-ZFDTEDCF.js";
-import "./chunk-M4FMGVY4.js";
-import "./chunk-K36B6G2O.js";
+} from "./chunk-VX22DUW2.js";
+import "./chunk-B6FOGNGH.js";
 import {
   AUTO_THEME_NAME,
   DEFAULT_THEME,
   themeManager
-} from "./chunk-L5UHQJTJ.js";
+} from "./chunk-IGTHU3T4.js";
 import "./chunk-KW7NOTN6.js";
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import "./chunk-GSN55ZRI.js";
-import "./chunk-6H67XLET.js";
-import "./chunk-7MVVZO4N.js";
+import "./chunk-6ZRWX46I.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-IKYJHJNF.js";
-import "./chunk-2SCDWPXI.js";
+} from "./chunk-VOMQ2P6B.js";
+import "./chunk-NC4U4I3Y.js";
+import "./chunk-WQP7BKWA.js";
 import "./chunk-YAF2MQZ6.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-BJX6ZSUK.js";
+} from "./chunk-YUFIEIWC.js";
 import {
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-EBJQ6AXW.js";
-import "./chunk-RHLZR4E5.js";
+} from "./chunk-ANDVK2JN.js";
+import "./chunk-675H6PLP.js";
 import {
   cpLen,
   cpSlice,
@@ -270,8 +274,8 @@ import {
   sanitizeTerminalText,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-IPUUTYMV.js";
-import "./chunk-WCXCRJYB.js";
+} from "./chunk-YDLJGZHL.js";
+import "./chunk-Z3YLHKB7.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -280,31 +284,27 @@ import {
   isHistoryItemVisibleAfterRestore
 } from "./chunk-QTERJVPZ.js";
 import "./chunk-3Z43GZUQ.js";
+import "./chunk-RXFQM6FQ.js";
+import "./chunk-ID3O7PRB.js";
+import "./chunk-6H67XLET.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isKeytermEcho,
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-H4SBPHSA.js";
+} from "./chunk-NNL7WPPK.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-YBL3QUDD.js";
-import "./chunk-ZD6UTE4A.js";
-import "./chunk-RXFQM6FQ.js";
-import "./chunk-PSOO6YXD.js";
-import {
-  requestConsentInteractive,
-  requestConsentOrFail
-} from "./chunk-PC6JANNU.js";
-import "./chunk-57OAHC2Y.js";
+} from "./chunk-NQCXWP5D.js";
+import "./chunk-CNTR4GR6.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-IO3IX5Q4.js";
+} from "./chunk-4YJQD2IO.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-MVSUYZDT.js";
+} from "./chunk-GWV7DI3S.js";
 import {
   formatDuration,
   formatMemoryUsage,
@@ -312,27 +312,39 @@ import {
   formatTokenCount
 } from "./chunk-E5Z2AVNV.js";
 import "./chunk-GLWP3FDB.js";
-import "./chunk-COH43MRJ.js";
+import "./chunk-XCGIMOLN.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-KMQ33DO4.js";
-import "./chunk-X5XDDSSH.js";
-import "./chunk-4WIZGAH3.js";
-import "./chunk-7ZCNENPP.js";
-import "./chunk-V6WHFGST.js";
+} from "./chunk-EDB7A72S.js";
 import {
-  loadMcpApprovals
-} from "./chunk-JVPM2ULZ.js";
-import "./chunk-DP3IHZGG.js";
-import "./chunk-ZNAUOR2I.js";
+  computeWorkspaceSkillListUpdates,
+  resolveSkillSettings,
+  skillSettingStrings
+} from "./chunk-Z4X5MTRT.js";
+import "./chunk-6NUWQ3R7.js";
+import {
+  requestConsentInteractive,
+  requestConsentOrFail
+} from "./chunk-HKRVXYDN.js";
+import "./chunk-57OAHC2Y.js";
+import "./chunk-I5BT7ADR.js";
+import "./chunk-FANRZEAJ.js";
+import "./chunk-KWHKHSIS.js";
+import "./chunk-V6WHFGST.js";
 import "./chunk-2RFKHEXL.js";
-import "./chunk-LK7CHLVP.js";
-import "./chunk-JLU636DO.js";
+import "./chunk-FYJ7W2PI.js";
+import "./chunk-U4VTUMMK.js";
+import "./chunk-6MPDY6ZG.js";
+import "./chunk-ALMR3E6Q.js";
 import "./chunk-BK2UNYWD.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-RWTEFFPU.js";
+import "./chunk-IIUGIWWY.js";
+import "./chunk-ZPZ7ZJEE.js";
+import "./chunk-JCJ7LKNA.js";
 import "./chunk-UDXSXLER.js";
-import "./chunk-BIQWWWJN.js";
+import {
+  loadMcpApprovals
+} from "./chunk-3XZ5SSNR.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -355,7 +367,7 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-TEHGS6UP.js";
+} from "./chunk-A5T5W7PR.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
@@ -364,27 +376,30 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-LKEJ26GS.js";
-import "./chunk-LH2BYDQ5.js";
+} from "./chunk-B3TA3IF5.js";
+import "./chunk-X2E5TFJ5.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-URK542T4.js";
-import {
-  getCliVersion
-} from "./chunk-YX324OPW.js";
-import "./chunk-VJNBRRZG.js";
+import "./chunk-DP3IHZGG.js";
+import "./chunk-BZBPT52P.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-Z2BC6UJ5.js";
+} from "./chunk-UU2B5YG6.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
+import "./chunk-XFSFZCM5.js";
+import "./chunk-URK542T4.js";
+import {
+  getCliVersion
+} from "./chunk-XDS22O52.js";
+import "./chunk-VJNBRRZG.js";
 import {
   clearScreen,
-  writeStderrLine
+  writeStderrLine,
+  writeStderrLineSafe
 } from "./chunk-OWAK7LMW.js";
-import "./chunk-XFSFZCM5.js";
 import {
   ALIBABA_PROVIDERS,
   AsyncFzf,
@@ -472,7 +487,6 @@ import {
   parseInstallSource,
   parseRule,
   parseVisionModelSetting,
-  promptIdContext,
   readWorktreeSession,
   readWorktreeSessionMarker,
   redactUrlCredentials,
@@ -491,67 +505,74 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-PHOF65IG.js";
+} from "./chunk-FRXG4ARO.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
-import "./chunk-K4XWPEWB.js";
-import "./chunk-TOFQCPDC.js";
-import "./chunk-IRH27ZC2.js";
-import "./chunk-VDDGDZMA.js";
-import "./chunk-FNQ6T3CV.js";
-import "./chunk-ZOIFNCKL.js";
-import "./chunk-PWTZEM3C.js";
+import "./chunk-AOHY3QJ3.js";
+import "./chunk-5NNHICSA.js";
+import "./chunk-SHN4KHDK.js";
+import "./chunk-JXVC2PL3.js";
 import "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-MZAXJAUM.js";
-import "./chunk-SZRN75WQ.js";
-import "./chunk-HTO4JFDZ.js";
+} from "./chunk-26JK4RPD.js";
+import "./chunk-IRH27ZC2.js";
+import "./chunk-QHWCP53L.js";
+import "./chunk-TEGJSJDF.js";
+import "./chunk-TIRRPCFS.js";
+import {
+  promptIdContext
+} from "./chunk-O6GEWCJA.js";
+import "./chunk-T26EAKDL.js";
 import "./chunk-CPBF7KYF.js";
+import "./chunk-4KP2F2TE.js";
+import {
+  HOOKS_CONFIG_FIELDS
+} from "./chunk-3APUUXRF.js";
+import "./chunk-THVU3RNH.js";
+import "./chunk-LHKCY7DY.js";
+import "./chunk-6FMJLI5M.js";
 import {
   APPROVAL_MODES,
   getStartupContextLength,
   isSystemReminderContent,
   runOutsideAgentContext
-} from "./chunk-L26JL52R.js";
-import "./chunk-6AM5D4ME.js";
-import "./chunk-JZA3JUDJ.js";
-import {
-  HOOKS_CONFIG_FIELDS
-} from "./chunk-3QMGYBFN.js";
-import "./chunk-JCW2R7WC.js";
+} from "./chunk-CBBP4BMC.js";
+import "./chunk-S6LOFUVP.js";
+import "./chunk-K623ENWT.js";
+import "./chunk-AQ37AY7B.js";
 import {
   isPathWithinRoot
-} from "./chunk-M5JM7OSF.js";
-import "./chunk-OHNBB4XR.js";
-import "./chunk-E5TUC6CA.js";
+} from "./chunk-N4ACHWNH.js";
+import "./chunk-ZPJWUGCS.js";
 import {
   osc8Hyperlink,
   qwenOAuth2Events,
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-EPDRMGT4.js";
-import "./chunk-JESCGQM3.js";
-import "./chunk-NH6KE4JX.js";
-import "./chunk-USTWD7QV.js";
+} from "./chunk-D4HTUMGX.js";
+import "./chunk-NAVJD2PQ.js";
+import "./chunk-LOY7RWQG.js";
+import "./chunk-E6CJ2SMM.js";
 import {
   REASONING_EFFORT_TIERS
-} from "./chunk-XVNQMZ2I.js";
+} from "./chunk-DGEIYUC3.js";
 import {
   getUnsupportedImageFormatWarning,
   isSupportedImageMimeType
-} from "./chunk-FODK6UMO.js";
+} from "./chunk-MPHPFVKK.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-ZJHVAS7M.js";
-import "./chunk-NIBLUX3Y.js";
-import "./chunk-BPJSQIJX.js";
+import "./chunk-2YCYFWYZ.js";
+import "./chunk-Z3S5EMOW.js";
+import "./chunk-2J3OJGTL.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-6FGBXPWM.js";
-import "./chunk-LS77BEZP.js";
+import "./chunk-XQK4XXTN.js";
+import "./chunk-GLCZKT5V.js";
+import "./chunk-QDK4F2N5.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -592,7 +613,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-CIKQ7KKO.js";
+} from "./chunk-NVFSGPIF.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
@@ -600,30 +621,27 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-MUP3T3AD.js";
+} from "./chunk-3I6DUGQD.js";
+import "./chunk-7ULQIS27.js";
+import {
+  ToolNames,
+  isShellProgressData
+} from "./chunk-MM7TH7ZM.js";
 import {
   MAINLINE_CODER_MODEL
-} from "./chunk-IKCX4CCL.js";
+} from "./chunk-DKPJUF5F.js";
 import "./chunk-46UV252V.js";
-import "./chunk-A4UCTEB5.js";
-import "./chunk-XWRJCPHC.js";
 import {
   DEFAULT_TOKEN_LIMIT
-} from "./chunk-UW5EOVUN.js";
-import "./chunk-2JZBVYTU.js";
-import "./chunk-5I2IWRSH.js";
+} from "./chunk-ZBVS26BY.js";
+import "./chunk-Q3T5KA2V.js";
+import "./chunk-R2XWGR75.js";
 import {
   atomicWriteFileSync
-} from "./chunk-A5L3JMUA.js";
-import "./chunk-MB4MZHMJ.js";
-import "./chunk-HTR4WV6U.js";
-import "./chunk-BULDBTYC.js";
-import "./chunk-U7ZFW55U.js";
-import "./chunk-UUUTRMI2.js";
-import {
-  ToolNames,
-  isShellProgressData
-} from "./chunk-PR75REBZ.js";
+} from "./chunk-HC45LTEN.js";
+import "./chunk-QARJNL2V.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-G7XXKQYS.js";
 import {
   Storage,
   UnauthorizedError,
@@ -635,12 +653,13 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-NL7LTRLR.js";
-import "./chunk-QAF7NMK7.js";
+} from "./chunk-E2BHWIDT.js";
+import "./chunk-VOQXFAY5.js";
+import "./chunk-D7CQTWRS.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-PWVFN2LF.js";
+} from "./chunk-BP2H5K25.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -655,7 +674,7 @@ import {
 import "./chunk-TYAMGABM.js";
 import "./chunk-FCMNKVXT.js";
 import "./chunk-AMDSOFFV.js";
-import "./chunk-TARRHLLG.js";
+import "./chunk-QUGAUQGJ.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -667,7 +686,7 @@ import {
 // packages/cli/src/ui/startInteractiveUI.tsx
 init_esbuild_shims();
 import { basename as basename4 } from "node:path";
-var import_react167 = __toESM(require_react(), 1);
+var import_react166 = __toESM(require_react(), 1);
 
 // packages/cli/src/dualOutput/DualOutputBridge.ts
 init_esbuild_shims();
@@ -1283,7 +1302,7 @@ var useRemoteInput = /* @__PURE__ */ __name(() => (0, import_react2.useContext)(
 
 // packages/cli/src/ui/AppContainer.tsx
 init_esbuild_shims();
-var import_react165 = __toESM(require_react(), 1);
+var import_react164 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/App.tsx
 init_esbuild_shims();
@@ -5231,6 +5250,11 @@ var SessionTab = /* @__PURE__ */ __name(() => {
     totalCached += m.tokens.cached;
   }
   const cacheRate = totalInput > 0 ? totalCached / totalInput * 100 : 0;
+  const generation = metrics.generation;
+  const lastGeneration = generation?.last;
+  const lastTps = lastGeneration && lastGeneration.generationDurationMs > 0 ? lastGeneration.outputTokens / (lastGeneration.generationDurationMs / 1e3) : void 0;
+  const averageTtft = generation && generation.timedRequests > 0 ? generation.totalTtftMs / generation.timedRequests : void 0;
+  const sessionTps = generation && generation.totalGenerationDurationMs > 0 ? generation.totalThroughputOutputTokens / (generation.totalGenerationDurationMs / 1e3) : void 0;
   const successColor = getStatusColor(computed.successRate, {
     green: TOOL_SUCCESS_RATE_HIGH,
     yellow: TOOL_SUCCESS_RATE_MEDIUM
@@ -5342,6 +5366,67 @@ var SessionTab = /* @__PURE__ */ __name(() => {
         ] })
       ] })
     ] }),
+    lastGeneration && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
+        t("Generation Metrics"),
+        " (",
+        t("Latest Request"),
+        ")"
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: labelWidth, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.secondary, children: [
+          t("Model"),
+          ":"
+        ] }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: lastGeneration.model })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: labelWidth, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.secondary, children: "TTFT:" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: formatDuration(lastGeneration.ttftMs) })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: labelWidth, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.secondary, children: [
+          t("Generation Time"),
+          ":"
+        ] }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: formatDuration(lastGeneration.generationDurationMs) })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: labelWidth, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.secondary, children: [
+          t("Output Tokens"),
+          ":"
+        ] }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: lastGeneration.outputTokens.toLocaleString() })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: labelWidth, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.secondary, children: "TPS:" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: lastTps === void 0 ? "\u2014" : `${lastTps.toFixed(1)} tok/s` })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { paddingLeft: 2, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: 26, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.secondary, children: [
+          "\xBB ",
+          t("Requests"),
+          ":"
+        ] }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: generation.timedRequests })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { paddingLeft: 2, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: 26, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.secondary, children: [
+          "\xBB ",
+          t("Average TTFT"),
+          ":"
+        ] }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: averageTtft === void 0 ? "\u2014" : formatDuration(averageTtft) })
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { paddingLeft: 2, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { width: 26, children: /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.secondary, children: [
+          "\xBB ",
+          t("Session TPS"),
+          ":"
+        ] }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.primary, children: sessionTps === void 0 ? "\u2014" : `${sessionTps.toFixed(1)} tok/s` })
+      ] })
+    ] }),
     /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Tokens") }),
       /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
@@ -5437,21 +5522,13 @@ function computeThresholds2(data) {
   return [p(0.25), p(0.5), p(0.75), p(0.9)];
 }
 __name(computeThresholds2, "computeThresholds");
-function formatDateKey(d) {
-  const y = d.getFullYear();
-  const m = String(d.getMonth() + 1).padStart(2, "0");
-  const day = String(d.getDate()).padStart(2, "0");
-  return `${y}-${m}-${day}`;
-}
-__name(formatDateKey, "formatDateKey");
 function buildHeatmapData(data, weeks = 52, monthOffset = 0) {
   const now = /* @__PURE__ */ new Date();
   now.setHours(0, 0, 0, 0);
   const dataKeys = Object.keys(data).filter((k) => data[k] > 0).sort();
   let endDate = new Date(now);
   if (dataKeys.length > 0) {
-    const latest = new Date(dataKeys[dataKeys.length - 1]);
-    latest.setHours(0, 0, 0, 0);
+    const latest = parseDayKey(dataKeys[dataKeys.length - 1]);
     if (latest.getTime() > endDate.getTime()) endDate = latest;
   }
   if (monthOffset > 0) {
@@ -5474,12 +5551,12 @@ function buildHeatmapData(data, weeks = 52, monthOffset = 0) {
   }
   let col = 0;
   const colMondays = [];
-  const todayKey = formatDateKey(/* @__PURE__ */ new Date());
+  const todayKey = dayKey(/* @__PURE__ */ new Date());
   const cursor = new Date(startDate);
   while (cursor <= endDate) {
     const dayOfWeek = cursor.getDay();
     const row = dayOfWeek === 0 ? 6 : dayOfWeek - 1;
-    const key = formatDateKey(cursor);
+    const key = dayKey(cursor);
     const count = data[key] || 0;
     const level = intensityLevel(count, thresholds);
     const isToday = key === todayKey;
@@ -5543,8 +5620,8 @@ function buildHeatmapData(data, weeks = 52, monthOffset = 0) {
   return {
     colLabels,
     totalCols: maxCells,
-    startDate: formatDateKey(startDate),
-    endDate: formatDateKey(endDate),
+    startDate: dayKey(startDate),
+    endDate: dayKey(endDate),
     rows
   };
 }
@@ -9927,19 +10004,43 @@ var useTrustModify = /* @__PURE__ */ __name((onExit, addItem) => {
         setPendingTrustLevel(trustLevel);
         setNeedsRestart(true);
       } else {
+        setPendingTrustLevel(void 0);
+        setNeedsRestart(false);
         const folders = loadTrustedFolders();
-        folders.setValue(cwd3, trustLevel);
+        try {
+          folders.setValue(cwd3, trustLevel);
+        } catch (error) {
+          addItem(
+            {
+              type: "error" /* ERROR */,
+              text: `Could not update workspace trust: ${error instanceof Error ? error.message : String(error)}`
+            },
+            Date.now()
+          );
+          return;
+        }
         onExit();
       }
     },
     [cwd3, settings.merged, onExit, addItem]
   );
   const commitTrustLevelChange = (0, import_react32.useCallback)(() => {
-    if (pendingTrustLevel) {
-      const folders = loadTrustedFolders();
+    if (!pendingTrustLevel) return false;
+    const folders = loadTrustedFolders();
+    try {
       folders.setValue(cwd3, pendingTrustLevel);
+      return true;
+    } catch (error) {
+      addItem(
+        {
+          type: "error" /* ERROR */,
+          text: `Could not update workspace trust: ${error instanceof Error ? error.message : String(error)}`
+        },
+        Date.now()
+      );
+      return false;
     }
-  }, [cwd3, pendingTrustLevel]);
+  }, [addItem, cwd3, pendingTrustLevel]);
   return {
     cwd: cwd3,
     currentTrustLevel,
@@ -9990,9 +10091,10 @@ function TrustDialog({
         onExit();
       }
       if (needsRestart && key.name === "r") {
-        commitTrustLevelChange();
-        relaunchApp();
-        onExit();
+        if (commitTrustLevelChange()) {
+          relaunchApp();
+          onExit();
+        }
       }
     },
     { isActive: true }
@@ -14666,8 +14768,8 @@ function SkillsManagerDialog({
   const [loadError, setLoadError] = (0, import_react52.useState)(null);
   const [query, setQuery] = (0, import_react52.useState)("");
   const [activeValue, setActiveValue] = (0, import_react52.useState)(null);
-  const initialWorkspaceDisabled = (0, import_react52.useMemo)(
-    () => new Set(normalizeNames(namesFromScope(settings, "Workspace" /* Workspace */))),
+  const initialResolved = (0, import_react52.useMemo)(
+    () => resolveSkillSettings(settings),
     [settings]
   );
   const higher = (0, import_react52.useMemo)(() => buildHigherDisabled(settings), [settings]);
@@ -14704,12 +14806,19 @@ function SkillsManagerDialog({
     () => allSkills.filter((s) => !higher.set.has(lower(s.name))),
     [allSkills, higher.set]
   );
+  const initialSelectedKeys = (0, import_react52.useMemo)(
+    () => new Set(
+      unlockedSkills.filter(
+        (skill) => !initialResolved.disabledNames.has(lower(skill.name))
+      ).map((skill) => skill.name)
+    ),
+    [initialResolved, unlockedSkills]
+  );
   const [selectedKeys, setSelectedKeys] = (0, import_react52.useState)(null);
   (0, import_react52.useEffect)(() => {
     if (selectedKeys !== null || unlockedSkills.length === 0) return;
-    const initial = unlockedSkills.filter((s) => !initialWorkspaceDisabled.has(lower(s.name))).map((s) => s.name);
-    setSelectedKeys(initial);
-  }, [unlockedSkills, initialWorkspaceDisabled, selectedKeys]);
+    setSelectedKeys([...initialSelectedKeys]);
+  }, [unlockedSkills, initialSelectedKeys, selectedKeys]);
   const filteredUnlocked = (0, import_react52.useMemo)(() => {
     const normalizedQuery = query.trim().toLowerCase();
     if (!normalizedQuery) return unlockedSkills;
@@ -14764,33 +14873,40 @@ function SkillsManagerDialog({
       return "untrusted";
     }
     const selected = new Set(selectedKeys ?? []);
-    const previousWorkspace = namesFromScope(settings, "Workspace" /* Workspace */);
-    const previousStrings = previousWorkspace.filter(
-      (n) => typeof n === "string"
+    const workspaceDisabled = namesFromScope(
+      settings,
+      "Workspace" /* Workspace */
+    ).filter((name) => typeof name === "string");
+    const lockedNames = new Set(lockedSkills.map((skill) => lower(skill.name)));
+    const { disabled, enabled, disabledChanged, enabledChanged } = computeWorkspaceSkillListUpdates(
+      workspaceDisabled,
+      lockedNames,
+      skillSettingStrings(settings, "Workspace" /* Workspace */, "enabled"),
+      unlockedSkills.map((skill) => ({
+        name: skill.name,
+        wasEnabled: initialSelectedKeys.has(skill.name),
+        isEnabled: selected.has(skill.name),
+        defaultDisabled: initialResolved.defaultDisabledNames.has(lower(skill.name)) && !initialResolved.enabledNames.has(lower(skill.name))
+      }))
     );
-    const previousMap = new Map(previousStrings.map((n) => [lower(n), n]));
-    const nextDisabled = [];
-    const allKnownLower = new Set(allSkills.map((s) => lower(s.name)));
-    for (const prev of previousStrings) {
-      if (!allKnownLower.has(lower(prev))) {
-        nextDisabled.push(prev);
-      }
-    }
-    for (const s of unlockedSkills) {
-      if (selected.has(s.name)) continue;
-      const existing = previousMap.get(lower(s.name));
-      nextDisabled.push(existing ?? s.name);
-    }
-    const prevNormalized = normalizeNames(previousWorkspace).sort();
-    const nextNormalized = normalizeNames(nextDisabled).sort();
-    const unchanged = prevNormalized.length === nextNormalized.length && prevNormalized.every((n, i) => n === nextNormalized[i]);
-    if (unchanged) return "ok";
+    if (!disabledChanged && !enabledChanged) return "ok";
     try {
-      settings.setValue(
-        "Workspace" /* Workspace */,
-        "skills.disabled",
-        nextDisabled.length > 0 ? nextDisabled : void 0
-      );
+      settings.setValues([
+        ...disabledChanged ? [
+          {
+            scope: "Workspace" /* Workspace */,
+            key: "skills.disabled",
+            value: disabled.length > 0 ? disabled : void 0
+          }
+        ] : [],
+        ...enabledChanged ? [
+          {
+            scope: "Workspace" /* Workspace */,
+            key: "skills.enabled",
+            value: enabled.length > 0 ? enabled : void 0
+          }
+        ] : []
+      ]);
     } catch (e) {
       addItem(
         {
@@ -14825,7 +14941,9 @@ function SkillsManagerDialog({
     return "ok";
   }, [
     addItem,
-    allSkills,
+    initialResolved,
+    initialSelectedKeys,
+    lockedSkills,
     reloadCommands,
     selectedKeys,
     settings,
@@ -26376,7 +26494,7 @@ function useCommandCompletion(buffer, cwd3, slashCommands, commandContext, rever
     query,
     completionStart,
     completionEnd,
-    isMidInputSlashCompletion
+    slashCompletionContext
   } = (0, import_react88.useMemo)(() => {
     const currentLine = buffer.lines[cursorRow] || "";
     const codePoints = toCodePoints(currentLine);
@@ -26411,49 +26529,61 @@ function useCommandCompletion(buffer, cwd3, slashCommands, commandContext, rever
           query: partialPath,
           completionStart: pathStart,
           completionEnd: end,
-          isMidInputSlashCompletion: false
+          slashCompletionContext: null
         };
       }
     }
-    if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
-      return {
-        completionMode: "SLASH" /* SLASH */,
-        query: currentLine,
-        completionStart: 0,
-        completionEnd: currentLine.length,
-        isMidInputSlashCompletion: false
-      };
-    }
     const cursorOffset = logicalPosToOffset(buffer.lines, cursorRow, cursorCol);
     const midCmd = findMidInputSlashCommand(buffer.text, cursorOffset);
-    if (midCmd && !isExactMidInputModelInvocableCommand(
-      midCmd.partialCommand,
-      slashCommands
-    )) {
+    if (midCmd) {
       const lineStartOffset = logicalPosToOffset(buffer.lines, cursorRow, 0);
       const startOnLine = midCmd.startPos - lineStartOffset;
-      if (startOnLine >= 0) {
+      const isInitialCommandOnFirstLine = cursorRow === 0 && isSlashCommand(currentLine.trim()) && startOnLine >= 0 && codePoints.slice(0, startOnLine).join("").trim().length === 0;
+      const inputCodePoints = toCodePoints(buffer.text);
+      const prefix = inputCodePoints.slice(0, midCmd.startPos).join("");
+      const isStackedSkill = !isInitialCommandOnFirstLine && isValidStackedSkillPrefix(prefix, slashCommands);
+      const isSlashLedInput = isSlashCommand(prefix.trimStart());
+      const isRegularMidInput = !isInitialCommandOnFirstLine && !isSlashLedInput;
+      if (startOnLine >= 0 && (isStackedSkill || isRegularMidInput && !isExactMidInputModelInvocableCommand(
+        midCmd.partialCommand,
+        slashCommands
+      ))) {
         return {
           completionMode: "SLASH" /* SLASH */,
           query: midCmd.token,
           completionStart: startOnLine,
           completionEnd: startOnLine + midCmd.token.length,
-          isMidInputSlashCompletion: true
+          slashCompletionContext: isStackedSkill ? "stacked-skill" /* STACKED_SKILL */ : "mid-input" /* MID_INPUT */
         };
       }
     }
+    if (cursorRow === 0 && isSlashCommand(currentLine.trim())) {
+      return {
+        completionMode: "SLASH" /* SLASH */,
+        query: currentLine,
+        completionStart: 0,
+        completionEnd: currentLine.length,
+        slashCompletionContext: "line-start" /* LINE_START */
+      };
+    }
     return {
       completionMode: "IDLE" /* IDLE */,
       query: null,
       completionStart: -1,
       completionEnd: -1,
-      isMidInputSlashCompletion: false
+      slashCompletionContext: null
     };
   }, [cursorRow, cursorCol, buffer.lines, buffer.text, slashCommands]);
-  const slashCommandsForCompletion = (0, import_react88.useMemo)(
-    () => isMidInputSlashCompletion ? slashCommands.filter(isMidInputCompletableCommand) : slashCommands,
-    [isMidInputSlashCompletion, slashCommands]
-  );
+  const isMidInputSlashCompletion = slashCompletionContext === "mid-input" /* MID_INPUT */ || slashCompletionContext === "stacked-skill" /* STACKED_SKILL */;
+  const slashCommandsForCompletion = (0, import_react88.useMemo)(() => {
+    if (slashCompletionContext === "stacked-skill" /* STACKED_SKILL */) {
+      return slashCommands.filter(isStackedSkillCompletableCommand);
+    }
+    if (slashCompletionContext === "mid-input" /* MID_INPUT */) {
+      return slashCommands.filter(isMidInputCompletableCommand);
+    }
+    return slashCommands;
+  }, [slashCompletionContext, slashCommands]);
   const {
     suggestions,
     activeSuggestionIndex,
@@ -26567,6 +26697,8 @@ function useCommandCompletion(buffer, cwd3, slashCommands, commandContext, rever
     const midCmd = findMidInputSlashCommand(buffer.text, cursorOffset);
     if (midCmd) {
       if (isMidInputSlashCompletion) return null;
+      const prefix = toCodePoints(buffer.text).slice(0, midCmd.startPos).join("");
+      if (isSlashCommand(prefix.trimStart())) return null;
       const match = getBestSlashCommandMatch(
         midCmd.partialCommand,
         slashCommands,
@@ -27740,10 +27872,7 @@ var BaseTextInput = /* @__PURE__ */ __name(({
     linesToRender,
     prefixWidth
   });
-  (0, import_react96.useInsertionEffect)(() => {
-    setCursorPosition(cursorPosition);
-    return () => setCursorPosition(void 0);
-  }, [setCursorPosition, cursorPosition]);
+  setCursorPosition(cursorPosition);
   const resolvedBorderColor = borderColor ?? theme.border.focused;
   const resolvedPrefix = prefix ?? /* @__PURE__ */ (0, import_jsx_runtime106.jsx)(Text, { color: theme.text.accent, children: "> " });
   const columns = process.stdout.columns || 80;
@@ -29029,7 +29158,9 @@ var InputPrompt = /* @__PURE__ */ __name(({
   const uiState = useUIState();
   const uiActions = useUIActions();
   const settings = useSettings();
-  const mouseInteractionsEnabled = !!settings.merged.ui?.useTerminalBuffer;
+  const mouseInteractionsEnabled = useVirtualViewport(
+    settings.merged.ui?.useTerminalBuffer
+  );
   const { pasteWorkaround } = useKeypressContext();
   const { agents, agentTabBarFocused } = useAgentViewState();
   const { setAgentTabBarFocused } = useAgentViewActions();
@@ -29048,7 +29179,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
     setPillFocused: setBgPillFocused
   } = useBackgroundTaskViewActions();
   const hasAgents = agents.size > 0;
-  const liveAgentPanelMaxRows = settings.merged.ui?.useTerminalBuffer ? getLiveAgentPanelVpMaxRows(uiState.terminalHeight) : LIVE_AGENT_PANEL_MAX_ROWS;
+  const liveAgentPanelMaxRows = uiState.useTerminalBuffer ? getLiveAgentPanelVpMaxRows(uiState.terminalHeight) : LIVE_AGENT_PANEL_MAX_ROWS;
   const getVisibleBgAgents = (0, import_react98.useCallback)(
     () => panelDisplayOrder(
       bgEntries.filter((e) => isLiveAgentPanelVisibleEntry(e, Date.now()))
@@ -29286,6 +29417,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
   const handleSubmitAndClear = (0, import_react98.useCallback)(
     (submittedValue, deferUntilIdle = false) => {
       exportCompletion.reset();
+      const submittedPrompt = submittedValue;
       let finalValue = submittedValue;
       if (pendingPastes.size > 0) {
         finalValue = expandPendingPastePlaceholders(finalValue, pendingPastes);
@@ -29303,11 +29435,7 @@ ${finalValue.trim()}`;
       }
       buffer.setText("");
       clearPromptStash(targetDir);
-      if (deferUntilIdle) {
-        onSubmit(finalValue, { deferUntilIdle: true });
-      } else {
-        onSubmit(finalValue);
-      }
+      onSubmit(finalValue, { deferUntilIdle, submittedPrompt });
       resetHistoryNavRef.current();
       followup.dismiss();
       onPromptSuggestionDismiss?.();
@@ -29336,10 +29464,11 @@ ${finalValue.trim()}`;
   voiceSubmitRef.current = (text) => handleSubmitAndClear(text);
   const customSetTextAndResetCompletionSignal = (0, import_react98.useCallback)(
     (newText) => {
+      uiActions.invalidateSubmittedPromptProvenance();
       buffer.setText(newText);
       setHistoryRestoredText(newText);
     },
-    [buffer]
+    [buffer, uiActions]
   );
   const inputHistory = useInputHistory({
     userMessages,
@@ -29770,6 +29899,7 @@ ${currentText}`);
             }
           }
           if (keyMatchers["acceptSuggestionReverseSearch" /* ACCEPT_SUGGESTION_REVERSE_SEARCH */](key)) {
+            uiActions.invalidateSubmittedPromptProvenance();
             sc.handleAutocomplete(activeSuggestionIndex);
             resetState();
             setActive(false);
@@ -29778,6 +29908,9 @@ ${currentText}`);
         }
         if (keyMatchers["submitReverseSearch" /* SUBMIT_REVERSE_SEARCH */](key)) {
           const textToSubmit = showSuggestions && activeSuggestionIndex > -1 ? suggestions[activeSuggestionIndex].value : buffer.text;
+          if (showSuggestions && activeSuggestionIndex > -1) {
+            uiActions.invalidateSubmittedPromptProvenance();
+          }
           handleSubmitAndClear(textToSubmit);
           resetState();
           setActive(false);
@@ -29973,12 +30106,18 @@ ${currentText}`);
       } else {
         if (keyMatchers["navigationUp" /* NAVIGATION_UP */](key)) {
           const prevCommand = shellHistory.getPreviousCommand();
-          if (prevCommand !== null) buffer.setText(prevCommand);
+          if (prevCommand !== null) {
+            uiActions.invalidateSubmittedPromptProvenance();
+            buffer.setText(prevCommand);
+          }
           return true;
         }
         if (keyMatchers["navigationDown" /* NAVIGATION_DOWN */](key)) {
           const nextCommand = shellHistory.getNextCommand();
-          if (nextCommand !== null) buffer.setText(nextCommand);
+          if (nextCommand !== null) {
+            uiActions.invalidateSubmittedPromptProvenance();
+            buffer.setText(nextCommand);
+          }
           return true;
         }
       }
@@ -30245,6 +30384,7 @@ ${currentText}`);
       if (commandSearchActive || reverseSearchActive) {
         const isCommandSearch = commandSearchActive;
         const sc = isCommandSearch ? commandSearchCompletion : reverseSearchCompletion;
+        uiActions.invalidateSubmittedPromptProvenance();
         sc.handleAutocomplete(index);
         sc.resetCompletionState();
         (isCommandSearch ? setCommandSearchActive : setReverseSearchActive)(
@@ -30274,7 +30414,8 @@ ${currentText}`);
       handleSubmitAndClear,
       setExpandedSuggestionIndex,
       setCommandSearchActive,
-      setReverseSearchActive
+      setReverseSearchActive,
+      uiActions
     ]
   );
   const hasTabConsumer = shouldShowSuggestions || buffer.text.length === 0 && Boolean(availableSuggestion) || Boolean(completion.midInputGhostText?.acceptText);
@@ -31633,6 +31774,15 @@ function isRecentHistoryTodoSnapshot(snapshotItemIndex, historyLength) {
   return historyItemsAfterSnapshot < MIN_HISTORY_ITEMS_AFTER_TODO_BEFORE_STICKY;
 }
 __name(isRecentHistoryTodoSnapshot, "isRecentHistoryTodoSnapshot");
+function hasUserMessageAfter(items, afterIndex) {
+  for (let i = afterIndex + 1; i < items.length; i++) {
+    if (items[i].type === "user") {
+      return true;
+    }
+  }
+  return false;
+}
+__name(hasUserMessageAfter, "hasUserMessageAfter");
 function getStickyTodos(history, pendingHistoryItems) {
   const pendingSnapshot = findLatestTodoSnapshot(pendingHistoryItems);
   if (pendingSnapshot !== void 0) {
@@ -31645,6 +31795,9 @@ function getStickyTodos(history, pendingHistoryItems) {
   if (isRecentHistoryTodoSnapshot(historySnapshot.itemIndex, history.length)) {
     return null;
   }
+  if (hasUserMessageAfter(history, historySnapshot.itemIndex)) {
+    return null;
+  }
   if (areAllTodosCompleted(historySnapshot.todos)) {
     return null;
   }
@@ -33016,7 +33169,7 @@ var App = /* @__PURE__ */ __name(() => {
 }, "App");
 
 // packages/cli/src/ui/AppContainer.tsx
-import process16 from "node:process";
+import process17 from "node:process";
 
 // packages/cli/src/ui/hooks/useMemoryMonitor.ts
 init_esbuild_shims();
@@ -33091,34 +33244,15 @@ var useMemoryMonitor = /* @__PURE__ */ __name(({
   }, [addItem, compactOldItems]);
 }, "useMemoryMonitor");
 
-// packages/cli/src/ui/hooks/useResizeSettleRepaint.ts
-init_esbuild_shims();
-var import_react117 = __toESM(require_react(), 1);
-var RESIZE_REPAINT_SETTLE_MS = 200;
-function useResizeSettleRepaint(terminalWidth, refreshStatic) {
-  const settledTerminalWidthRef = (0, import_react117.useRef)(terminalWidth);
-  (0, import_react117.useEffect)(() => {
-    if (settledTerminalWidthRef.current === terminalWidth) {
-      return;
-    }
-    const timer = setTimeout(() => {
-      settledTerminalWidthRef.current = terminalWidth;
-      refreshStatic();
-    }, RESIZE_REPAINT_SETTLE_MS);
-    return () => clearTimeout(timer);
-  }, [terminalWidth, refreshStatic]);
-}
-__name(useResizeSettleRepaint, "useResizeSettleRepaint");
-
 // packages/cli/src/ui/hooks/use-wake-repaint.ts
 init_esbuild_shims();
-var import_react118 = __toESM(require_react(), 1);
+var import_react117 = __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);
+  const repaintRef = (0, import_react117.useRef)(repaint);
   repaintRef.current = repaint;
-  (0, import_react118.useEffect)(() => {
+  (0, import_react117.useEffect)(() => {
     let lastTick = Date.now();
     const timer = setInterval(() => {
       const now = Date.now();
@@ -33144,12 +33278,12 @@ __name(useWakeRepaint, "useWakeRepaint");
 
 // packages/cli/src/ui/hooks/useThemeCommand.ts
 init_esbuild_shims();
-var import_react119 = __toESM(require_react(), 1);
+var import_react118 = __toESM(require_react(), 1);
 import process13 from "node:process";
 var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, addItem, initialThemeError) => {
-  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react119.useState)(!!initialThemeError);
-  const [themeBeforeDialogOpen, setThemeBeforeDialogOpen] = (0, import_react119.useState)(themeManager.getActiveTheme().name);
-  const openThemeDialog = (0, import_react119.useCallback)(() => {
+  const [isThemeDialogOpen, setIsThemeDialogOpen] = (0, import_react118.useState)(!!initialThemeError);
+  const [themeBeforeDialogOpen, setThemeBeforeDialogOpen] = (0, import_react118.useState)(themeManager.getActiveTheme().name);
+  const openThemeDialog = (0, import_react118.useCallback)(() => {
     if (process13.env["NO_COLOR"]) {
       addItem(
         {
@@ -33165,7 +33299,7 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
     setThemeBeforeDialogOpen(themeManager.getActiveTheme().name);
     setIsThemeDialogOpen(true);
   }, [addItem]);
-  const applyTheme = (0, import_react119.useCallback)(
+  const applyTheme = (0, import_react118.useCallback)(
     (themeName) => {
       if (!themeManager.setActiveTheme(themeName)) {
         setIsThemeDialogOpen(true);
@@ -33180,13 +33314,13 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
     },
     [setThemeError]
   );
-  const handleThemeHighlight = (0, import_react119.useCallback)(
+  const handleThemeHighlight = (0, import_react118.useCallback)(
     (themeName) => {
       applyTheme(themeName);
     },
     [applyTheme]
   );
-  const handleThemeSelect = (0, import_react119.useCallback)(
+  const handleThemeSelect = (0, import_react118.useCallback)(
     (themeName, scope) => {
       if (themeName === void 0) {
         applyTheme(themeBeforeDialogOpen);
@@ -33233,7 +33367,7 @@ var useThemeCommand = /* @__PURE__ */ __name((loadedSettings, setThemeError, add
 
 // packages/cli/src/ui/hooks/useFeedbackDialog.ts
 init_esbuild_shims();
-var import_react120 = __toESM(require_react(), 1);
+var import_react119 = __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;
@@ -33279,20 +33413,20 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
   history,
   sessionStats
 }) => {
-  const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = (0, import_react120.useState)(false);
-  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = (0, import_react120.useState)(false);
-  const openFeedbackDialog = (0, import_react120.useCallback)(() => {
+  const [isFeedbackDialogOpen, setIsFeedbackDialogOpen] = (0, import_react119.useState)(false);
+  const [isFeedbackDismissedTemporarily, setIsFeedbackDismissedTemporarily] = (0, import_react119.useState)(false);
+  const openFeedbackDialog = (0, import_react119.useCallback)(() => {
     setIsFeedbackDialogOpen(true);
   }, []);
-  const closeFeedbackDialog = (0, import_react120.useCallback)(
+  const closeFeedbackDialog = (0, import_react119.useCallback)(
     () => setIsFeedbackDialogOpen(false),
     []
   );
-  const temporaryCloseFeedbackDialog = (0, import_react120.useCallback)(() => {
+  const temporaryCloseFeedbackDialog = (0, import_react119.useCallback)(() => {
     setIsFeedbackDialogOpen(false);
     setIsFeedbackDismissedTemporarily(true);
   }, []);
-  const submitFeedback = (0, import_react120.useCallback)(
+  const submitFeedback = (0, import_react119.useCallback)(
     (rating) => {
       if (rating >= FEEDBACK_OPTIONS.GOOD && rating <= FEEDBACK_OPTIONS.FINE) {
         const feedbackEvent = new UserFeedbackEvent(
@@ -33312,7 +33446,7 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
     },
     [closeFeedbackDialog, sessionStats.sessionId, config, settings]
   );
-  (0, import_react120.useEffect)(() => {
+  (0, import_react119.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) {
@@ -33334,7 +33468,7 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
     settings.merged.ui?.enableUserFeedback,
     config
   ]);
-  (0, import_react120.useEffect)(() => {
+  (0, import_react119.useEffect)(() => {
     if (streamingState === "responding" /* Responding */ && isFeedbackDismissedTemporarily) {
       setIsFeedbackDismissedTemporarily(false);
     }
@@ -33350,13 +33484,13 @@ var useFeedbackDialog = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/hooks/useEditorSettings.ts
 init_esbuild_shims();
-var import_react121 = __toESM(require_react(), 1);
+var import_react120 = __toESM(require_react(), 1);
 var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError, addItem) => {
-  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react121.useState)(false);
-  const openEditorDialog = (0, import_react121.useCallback)(() => {
+  const [isEditorDialogOpen, setIsEditorDialogOpen] = (0, import_react120.useState)(false);
+  const openEditorDialog = (0, import_react120.useCallback)(() => {
     setIsEditorDialogOpen(true);
   }, []);
-  const handleEditorSelect = (0, import_react121.useCallback)(
+  const handleEditorSelect = (0, import_react120.useCallback)(
     (editorType, scope) => {
       if (editorType && (!checkHasEditorType(editorType) || !allowEditorTypeInSandbox(editorType))) {
         return;
@@ -33378,7 +33512,7 @@ var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError,
     },
     [loadedSettings, setEditorError, addItem]
   );
-  const exitEditorDialog = (0, import_react121.useCallback)(() => {
+  const exitEditorDialog = (0, import_react120.useCallback)(() => {
     setIsEditorDialogOpen(false);
   }, []);
   return {
@@ -33391,13 +33525,13 @@ var useEditorSettings = /* @__PURE__ */ __name((loadedSettings, setEditorError,
 
 // packages/cli/src/ui/hooks/useSettingsCommand.ts
 init_esbuild_shims();
-var import_react122 = __toESM(require_react(), 1);
+var import_react121 = __toESM(require_react(), 1);
 function useSettingsCommand() {
-  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react122.useState)(false);
-  const openSettingsDialog = (0, import_react122.useCallback)(() => {
+  const [isSettingsDialogOpen, setIsSettingsDialogOpen] = (0, import_react121.useState)(false);
+  const openSettingsDialog = (0, import_react121.useCallback)(() => {
     setIsSettingsDialogOpen(true);
   }, []);
-  const closeSettingsDialog = (0, import_react122.useCallback)(() => {
+  const closeSettingsDialog = (0, import_react121.useCallback)(() => {
     setIsSettingsDialogOpen(false);
   }, []);
   return {
@@ -33408,17 +33542,44 @@ function useSettingsCommand() {
 }
 __name(useSettingsCommand, "useSettingsCommand");
 
+// packages/cli/src/ui/utils/terminal-buffer.ts
+init_esbuild_shims();
+import process14 from "node:process";
+function isCiEnvKey(key) {
+  return key === "CI" || key === "CONTINUOUS_INTEGRATION" || key.startsWith("CI_");
+}
+__name(isCiEnvKey, "isCiEnvKey");
+function isActiveCiValue(value) {
+  const normalizedValue = value?.toLowerCase();
+  return value !== void 0 && value !== "" && normalizedValue !== "0" && normalizedValue !== "false";
+}
+__name(isActiveCiValue, "isActiveCiValue");
+function isCiEnvironment(env) {
+  return Object.keys(env).some(
+    (key) => isCiEnvKey(key) && isActiveCiValue(env[key])
+  );
+}
+__name(isCiEnvironment, "isCiEnvironment");
+function isInteractiveTerminal(stdoutIsTTY = process14.stdout.isTTY, env = process14.env) {
+  return Boolean(stdoutIsTTY) && !isCiEnvironment(env) && env["TERM"]?.toLowerCase() !== "dumb";
+}
+__name(isInteractiveTerminal, "isInteractiveTerminal");
+function shouldUseVirtualViewport(useTerminalBuffer, screenReader, terminalInteractive) {
+  return terminalInteractive && (useTerminalBuffer ?? true) && !screenReader;
+}
+__name(shouldUseVirtualViewport, "shouldUseVirtualViewport");
+
 // packages/cli/src/ui/hooks/useModelCommand.ts
 init_esbuild_shims();
-var import_react123 = __toESM(require_react(), 1);
+var import_react122 = __toESM(require_react(), 1);
 var useModelCommand = /* @__PURE__ */ __name(() => {
-  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 [isImageModelMode, setIsImageModelMode] = (0, import_react123.useState)(false);
-  const [modelDialogPersistScope, setModelDialogPersistScope] = (0, import_react123.useState)(void 0);
-  const openModelDialog = (0, import_react123.useCallback)(
+  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 [isImageModelMode, setIsImageModelMode] = (0, import_react122.useState)(false);
+  const [modelDialogPersistScope, setModelDialogPersistScope] = (0, import_react122.useState)(void 0);
+  const openModelDialog = (0, import_react122.useCallback)(
     (options) => {
       const voiceModelMode = options?.voiceModelMode ?? false;
       const visionModelMode = options?.visionModelMode ?? false;
@@ -33436,7 +33597,7 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
     },
     []
   );
-  const closeModelDialog = (0, import_react123.useCallback)(() => {
+  const closeModelDialog = (0, import_react122.useCallback)(() => {
     setIsModelDialogOpen(false);
     setIsFastModelMode(false);
     setIsVoiceModelMode(false);
@@ -33458,13 +33619,13 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useApprovalModeCommand.ts
 init_esbuild_shims();
-var import_react124 = __toESM(require_react(), 1);
+var import_react123 = __toESM(require_react(), 1);
 var useApprovalModeCommand = /* @__PURE__ */ __name((loadedSettings, config) => {
-  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = (0, import_react124.useState)(false);
-  const openApprovalModeDialog = (0, import_react124.useCallback)(() => {
+  const [isApprovalModeDialogOpen, setIsApprovalModeDialogOpen] = (0, import_react123.useState)(false);
+  const openApprovalModeDialog = (0, import_react123.useCallback)(() => {
     setIsApprovalModeDialogOpen(true);
   }, []);
-  const handleApprovalModeSelect = (0, import_react124.useCallback)(
+  const handleApprovalModeSelect = (0, import_react123.useCallback)(
     (mode, scope) => {
       try {
         if (!mode) {
@@ -33490,13 +33651,13 @@ var useApprovalModeCommand = /* @__PURE__ */ __name((loadedSettings, config) =>
 
 // packages/cli/src/ui/hooks/use-effort-command.ts
 init_esbuild_shims();
-var import_react125 = __toESM(require_react(), 1);
+var import_react124 = __toESM(require_react(), 1);
 var useEffortCommand = /* @__PURE__ */ __name((loadedSettings, config, addItem) => {
-  const [isEffortDialogOpen, setIsEffortDialogOpen] = (0, import_react125.useState)(false);
-  const openEffortDialog = (0, import_react125.useCallback)(() => {
+  const [isEffortDialogOpen, setIsEffortDialogOpen] = (0, import_react124.useState)(false);
+  const openEffortDialog = (0, import_react124.useCallback)(() => {
     setIsEffortDialogOpen(true);
   }, []);
-  const handleEffortSelect = (0, import_react125.useCallback)(
+  const handleEffortSelect = (0, import_react124.useCallback)(
     (effort) => {
       try {
         if (!effort) {
@@ -33548,7 +33709,7 @@ var useEffortCommand = /* @__PURE__ */ __name((loadedSettings, config, addItem)
 
 // packages/cli/src/ui/hooks/useBranchCommand.ts
 init_esbuild_shims();
-var import_react126 = __toESM(require_react(), 1);
+var import_react125 = __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) {
@@ -33569,7 +33730,7 @@ function deriveFirstPrompt(messages) {
 __name(deriveFirstPrompt, "deriveFirstPrompt");
 function useBranchCommand(options) {
   const { config, historyManager, startNewSession, setSessionName, remount } = options;
-  const handleBranch = (0, import_react126.useCallback)(
+  const handleBranch = (0, import_react125.useCallback)(
     async (name) => {
       if (!config) return;
       if (hasBlockingBackgroundWork(config)) {
@@ -33711,19 +33872,19 @@ __name(useBranchCommand, "useBranchCommand");
 
 // packages/cli/src/ui/hooks/useResumeCommand.ts
 init_esbuild_shims();
-var import_react127 = __toESM(require_react(), 1);
+var import_react126 = __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_react127.useState)(false);
-  const [resumeMatchedSessions, setResumeMatchedSessions] = (0, import_react127.useState)();
-  const openResumeDialog = (0, import_react127.useCallback)(
+  const [isResumeDialogOpen, setIsResumeDialogOpen] = (0, import_react126.useState)(false);
+  const [resumeMatchedSessions, setResumeMatchedSessions] = (0, import_react126.useState)();
+  const openResumeDialog = (0, import_react126.useCallback)(
     (matchedSessions) => {
       setResumeMatchedSessions(matchedSessions);
       setIsResumeDialogOpen(true);
     },
     []
   );
-  const closeResumeDialog = (0, import_react127.useCallback)(() => {
+  const closeResumeDialog = (0, import_react126.useCallback)(() => {
     setIsResumeDialogOpen(false);
     setResumeMatchedSessions(void 0);
   }, []);
@@ -33736,7 +33897,7 @@ function useResumeCommand(options) {
     remount
   } = options;
   const { addItem, clearItems, loadHistory } = historyManager;
-  const handleResume = (0, import_react127.useCallback)(
+  const handleResume = (0, import_react126.useCallback)(
     async (sessionId) => {
       if (!config) {
         return;
@@ -33861,18 +34022,18 @@ __name(useResumeCommand, "useResumeCommand");
 
 // packages/cli/src/ui/hooks/useDeleteCommand.ts
 init_esbuild_shims();
-var import_react128 = __toESM(require_react(), 1);
+var import_react127 = __toESM(require_react(), 1);
 function useDeleteCommand(options) {
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = (0, import_react128.useState)(false);
-  const openDeleteDialog = (0, import_react128.useCallback)(() => {
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = (0, import_react127.useState)(false);
+  const openDeleteDialog = (0, import_react127.useCallback)(() => {
     setIsDeleteDialogOpen(true);
   }, []);
-  const closeDeleteDialog = (0, import_react128.useCallback)(() => {
+  const closeDeleteDialog = (0, import_react127.useCallback)(() => {
     setIsDeleteDialogOpen(false);
   }, []);
   const { config, addItem } = options ?? {};
-  const isDeletingManyRef = (0, import_react128.useRef)(false);
-  const handleDelete = (0, import_react128.useCallback)(
+  const isDeletingManyRef = (0, import_react127.useRef)(false);
+  const handleDelete = (0, import_react127.useCallback)(
     async (sessionId) => {
       if (!config) {
         return;
@@ -33931,7 +34092,7 @@ function useDeleteCommand(options) {
     },
     [closeDeleteDialog, config, addItem]
   );
-  const handleDeleteMany = (0, import_react128.useCallback)(
+  const handleDeleteMany = (0, import_react127.useCallback)(
     async (sessionIds) => {
       if (!config) {
         return;
@@ -34063,7 +34224,7 @@ __name(useDeleteCommand, "useDeleteCommand");
 
 // packages/cli/src/ui/hooks/slashCommandProcessor.ts
 init_esbuild_shims();
-var import_react129 = __toESM(require_react(), 1);
+var import_react128 = __toESM(require_react(), 1);
 var debugLogger33 = createDebugLogger("SLASH_COMMAND_PROCESSOR");
 function hasUserPromptExpansionHooks(config) {
   return !!config && !config.getDisableAllHooks?.() && (config.hasHooksForEvent?.("UserPromptExpansion") ?? false);
@@ -34095,33 +34256,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_react129.useRef)(
+  const fallbackExtensionRefreshStateRef = (0, import_react128.useRef)(
     null
   );
   if (!fallbackExtensionRefreshStateRef.current) {
     fallbackExtensionRefreshStateRef.current = new ExtensionRefreshState();
   }
   const activeExtensionRefreshState = extensionRefreshState ?? fallbackExtensionRefreshStateRef.current;
-  const historyRef = (0, import_react129.useRef)(history);
-  (0, import_react129.useLayoutEffect)(() => {
+  const historyRef = (0, import_react128.useRef)(history);
+  (0, import_react128.useLayoutEffect)(() => {
     historyRef.current = history;
   }, [history]);
   const { stats: sessionStats, startNewSession } = useSessionStats();
-  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)(() => {
+  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)(() => {
     mountedRef.current = true;
     return () => {
       mountedRef.current = false;
     };
   }, []);
-  const resolveCommandReloads = (0, import_react129.useCallback)((completedTrigger) => {
+  const resolveCommandReloads = (0, import_react128.useCallback)((completedTrigger) => {
     if (commandReloadResolversRef.current.length === 0) {
       return;
     }
@@ -34135,7 +34296,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     }
     commandReloadResolversRef.current = remaining;
   }, []);
-  const reloadCommands = (0, import_react129.useCallback)(() => {
+  const reloadCommands = (0, import_react128.useCallback)(() => {
     if (!config) {
       return Promise.resolve();
     }
@@ -34150,14 +34311,14 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       });
     });
   }, [config]);
-  const clearPendingExtensionContentRefresh = (0, import_react129.useCallback)(() => {
+  const clearPendingExtensionContentRefresh = (0, import_react128.useCallback)(() => {
     if (!extensionContentRefreshTimerRef.current) {
       return;
     }
     clearTimeout(extensionContentRefreshTimerRef.current);
     extensionContentRefreshTimerRef.current = null;
   }, []);
-  const showExtensionContentRefreshError = (0, import_react129.useCallback)(
+  const showExtensionContentRefreshError = (0, import_react128.useCallback)(
     (error) => {
       if (!mountedRef.current) {
         return;
@@ -34177,7 +34338,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     },
     [addItem]
   );
-  const runExtensionContentRefresh = (0, import_react129.useCallback)(async () => {
+  const runExtensionContentRefresh = (0, import_react128.useCallback)(async () => {
     if (!config) {
       return;
     }
@@ -34221,23 +34382,23 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     reloadCommands,
     showExtensionContentRefreshError
   ]);
-  const [shellConfirmationRequest, setShellConfirmationRequest] = (0, import_react129.useState)(null);
-  const [confirmationRequest, setConfirmationRequest] = (0, import_react129.useState)(null);
-  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react129.useState)(
+  const [shellConfirmationRequest, setShellConfirmationRequest] = (0, import_react128.useState)(null);
+  const [confirmationRequest, setConfirmationRequest] = (0, import_react128.useState)(null);
+  const [sessionShellAllowlist, setSessionShellAllowlist] = (0, import_react128.useState)(
     /* @__PURE__ */ new Set()
   );
-  const [pendingItem, setPendingItem] = (0, import_react129.useState)(
+  const [pendingItem, setPendingItem] = (0, import_react128.useState)(
     null
   );
-  const [btwItem, setBtwItem] = (0, import_react129.useState)(null);
-  const btwAbortControllerRef = (0, import_react129.useRef)(null);
-  const cancelBtw = (0, import_react129.useCallback)(() => {
+  const [btwItem, setBtwItem] = (0, import_react128.useState)(null);
+  const btwAbortControllerRef = (0, import_react128.useRef)(null);
+  const cancelBtw = (0, import_react128.useCallback)(() => {
     btwAbortControllerRef.current?.abort();
     btwAbortControllerRef.current = null;
     setBtwItem(null);
   }, []);
-  const abortControllerRef = (0, import_react129.useRef)(null);
-  const cancelSlashCommand = (0, import_react129.useCallback)(() => {
+  const abortControllerRef = (0, import_react128.useRef)(null);
+  const cancelSlashCommand = (0, import_react128.useCallback)(() => {
     cancelBtw();
     if (!abortControllerRef.current) {
       return;
@@ -34261,14 +34422,14 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     },
     { isActive: isProcessing }
   );
-  const pendingHistoryItems = (0, import_react129.useMemo)(() => {
+  const pendingHistoryItems = (0, import_react128.useMemo)(() => {
     const items = [];
     if (pendingItem != null) {
       items.push(pendingItem);
     }
     return items;
   }, [pendingItem]);
-  const addMessage = (0, import_react129.useCallback)(
+  const addMessage = (0, import_react128.useCallback)(
     (message) => {
       let historyItemContent;
       if (message.type === "about" /* ABOUT */) {
@@ -34328,7 +34489,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     },
     [addItem]
   );
-  const commandContext = (0, import_react129.useMemo)(
+  const commandContext = (0, import_react128.useMemo)(
     () => ({
       services: {
         config,
@@ -34400,7 +34561,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       activeExtensionRefreshState
     ]
   );
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -34418,7 +34579,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       })();
     };
   }, [config, reloadCommands]);
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -34443,7 +34604,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       }
     };
   }, [config, reloadCommands]);
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     if (!isConfigInitialized) {
       return;
     }
@@ -34458,7 +34619,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       reloadCommands();
     });
   }, [config, isConfigInitialized, reloadCommands]);
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     const listener = /* @__PURE__ */ __name((reason) => {
       clearPendingExtensionContentRefresh();
       addItem(
@@ -34485,7 +34646,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     addItem,
     clearPendingExtensionContentRefresh
   ]);
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     activeExtensionRefreshState.on(
       "extensions-reload-started" /* ExtensionsReloadStarted */,
       clearPendingExtensionContentRefresh
@@ -34505,7 +34666,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
       );
     };
   }, [activeExtensionRefreshState, clearPendingExtensionContentRefresh]);
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     if (!config) {
       return;
     }
@@ -34531,7 +34692,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     activeExtensionRefreshState,
     runExtensionContentRefresh
   ]);
-  (0, import_react129.useEffect)(() => {
+  (0, import_react128.useEffect)(() => {
     const controller = new AbortController();
     const load = /* @__PURE__ */ __name(async () => {
       try {
@@ -34628,7 +34789,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
     settings,
     resolveCommandReloads
   ]);
-  const handleSlashCommand = (0, import_react129.useCallback)(
+  const handleSlashCommand = (0, import_react128.useCallback)(
     async (rawQuery, oneTimeShellAllowlist, overwriteConfirmed, existingInvocationItemId) => {
       if (typeof rawQuery !== "string") {
         return false;
@@ -35190,11 +35351,11 @@ ${commandToExecute.subCommands.map((sc) => `  - ${sc.name}: ${sc.description ||
 
 // packages/cli/src/ui/hooks/useDoublePress.ts
 init_esbuild_shims();
-var import_react130 = __toESM(require_react(), 1);
+var import_react129 = __toESM(require_react(), 1);
 var DOUBLE_PRESS_TIMEOUT_MS = 800;
 function useDoublePress(onDoublePress, onPending) {
-  const timeoutRef = (0, import_react130.useRef)(null);
-  (0, import_react130.useEffect)(
+  const timeoutRef = (0, import_react129.useRef)(null);
+  (0, import_react129.useEffect)(
     () => () => {
       if (timeoutRef.current !== null) {
         clearTimeout(timeoutRef.current);
@@ -35203,7 +35364,7 @@ function useDoublePress(onDoublePress, onPending) {
     },
     []
   );
-  return (0, import_react130.useCallback)(() => {
+  return (0, import_react129.useCallback)(() => {
     if (timeoutRef.current !== null) {
       clearTimeout(timeoutRef.current);
       timeoutRef.current = null;
@@ -35267,10 +35428,10 @@ __name(formatSessionWindowTitle, "formatSessionWindowTitle");
 
 // packages/cli/src/ui/hooks/useLogger.ts
 init_esbuild_shims();
-var import_react131 = __toESM(require_react(), 1);
+var import_react130 = __toESM(require_react(), 1);
 var useLogger = /* @__PURE__ */ __name((storage, sessionId) => {
-  const [logger, setLogger] = (0, import_react131.useState)(null);
-  (0, import_react131.useEffect)(() => {
+  const [logger, setLogger] = (0, import_react130.useState)(null);
+  (0, import_react130.useEffect)(() => {
     if (!sessionId) {
       return;
     }
@@ -35291,11 +35452,11 @@ var useLogger = /* @__PURE__ */ __name((storage, sessionId) => {
 
 // packages/cli/src/ui/hooks/useGeminiStream.ts
 init_esbuild_shims();
-var import_react136 = __toESM(require_react(), 1);
+var import_react135 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/shellCommandProcessor.ts
 init_esbuild_shims();
-var import_react132 = __toESM(require_react(), 1);
+var import_react131 = __toESM(require_react(), 1);
 import crypto2 from "node:crypto";
 import path10 from "node:path";
 import os5 from "node:os";
@@ -35328,8 +35489,8 @@ ${modelContent}
 }
 __name(addShellCommandToGeminiHistory, "addShellCommandToGeminiHistory");
 var useShellCommandProcessor = /* @__PURE__ */ __name((addItemToHistory, setPendingHistoryItem, onExec, onDebugMessage, config, geminiClient, setShellInputFocused, terminalWidth, terminalHeight) => {
-  const [activeShellPtyId, setActiveShellPtyId] = (0, import_react132.useState)(null);
-  const handleShellCommand = (0, import_react132.useCallback)(
+  const [activeShellPtyId, setActiveShellPtyId] = (0, import_react131.useState)(null);
+  const handleShellCommand = (0, import_react131.useCallback)(
     (rawQuery, abortSignal) => {
       if (typeof rawQuery !== "string" || rawQuery.trim() === "") {
         return false;
@@ -35583,11 +35744,11 @@ ${finalOutput}`;
 
 // packages/cli/src/ui/hooks/useStateAndRef.ts
 init_esbuild_shims();
-var import_react133 = __toESM(require_react(), 1);
+var import_react132 = __toESM(require_react(), 1);
 var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
-  const [state, setState] = import_react133.default.useState(initialValue);
-  const ref = import_react133.default.useRef(initialValue);
-  const setStateInternal = import_react133.default.useCallback(
+  const [state, setState] = import_react132.default.useState(initialValue);
+  const ref = import_react132.default.useRef(initialValue);
+  const setStateInternal = import_react132.default.useCallback(
     (newStateOrCallback) => {
       let newValue;
       if (typeof newStateOrCallback === "function") {
@@ -35605,12 +35766,12 @@ var useStateAndRef = /* @__PURE__ */ __name((initialValue) => {
 
 // packages/cli/src/ui/hooks/useReactToolScheduler.ts
 init_esbuild_shims();
-var import_react134 = __toESM(require_react(), 1);
+var import_react133 = __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_react134.useState)([]);
-  const outputUpdateHandler = (0, import_react134.useCallback)(
+function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose, onToolResultFullTurnModel) {
+  const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react133.useState)([]);
+  const outputUpdateHandler = (0, import_react133.useCallback)(
     (toolCallId, outputChunk) => {
       if (isShellProgressData(outputChunk)) {
         return;
@@ -35628,13 +35789,13 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     []
   );
-  const allToolCallsCompleteHandler = (0, import_react134.useCallback)(
+  const allToolCallsCompleteHandler = (0, import_react133.useCallback)(
     async (completedToolCalls) => {
       await onComplete(completedToolCalls);
     },
     [onComplete]
   );
-  const toolCallsUpdateHandler = (0, import_react134.useCallback)(
+  const toolCallsUpdateHandler = (0, import_react133.useCallback)(
     (updatedCoreToolCalls) => {
       setToolCallsForDisplay(
         (prevTrackedCalls) => updatedCoreToolCalls.map((coreTc) => {
@@ -35661,14 +35822,15 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     [setToolCallsForDisplay]
   );
-  const scheduler = (0, import_react134.useMemo)(
+  const scheduler = (0, import_react133.useMemo)(
     () => new CoreToolScheduler({
       config,
       outputUpdateHandler,
       onAllToolCallsComplete: allToolCallsCompleteHandler,
       onToolCallsUpdate: toolCallsUpdateHandler,
       getPreferredEditor,
-      onEditorClose
+      onEditorClose,
+      onToolResultFullTurnModel
     }),
     [
       config,
@@ -35676,10 +35838,11 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
       allToolCallsCompleteHandler,
       toolCallsUpdateHandler,
       getPreferredEditor,
-      onEditorClose
+      onEditorClose,
+      onToolResultFullTurnModel
     ]
   );
-  const schedule = (0, import_react134.useCallback)(
+  const schedule = (0, import_react133.useCallback)(
     (request, signal, modelOverride) => {
       if (!modelOverride?.endsWith("\0")) {
         void scheduler.schedule(request, signal);
@@ -35728,7 +35891,7 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
     },
     [allToolCallsCompleteHandler, config, scheduler]
   );
-  const markToolsAsSubmitted = (0, import_react134.useCallback)(
+  const markToolsAsSubmitted = (0, import_react133.useCallback)(
     (callIdsToMark) => {
       setToolCallsForDisplay(
         (prevCalls) => prevCalls.map(
@@ -35811,6 +35974,9 @@ function mapToDisplay(toolOrTools, projectRoot) {
             resultDisplay: compactToolResultDisplayForHistory(
               trackedCall.response.resultDisplay
             ),
+            ...trackedCall.response.visionBridgeNotice !== void 0 ? {
+              visionBridgeNotice: trackedCall.response.visionBridgeNotice
+            } : {},
             // Full detail for the Ctrl+O transcript (§4.9): derived from the
             // already-persisted functionResponse parts; NOT char-capped (the
             // bound is whatever core already applied). Consumed ONLY by the
@@ -35830,6 +35996,9 @@ function mapToDisplay(toolOrTools, projectRoot) {
             resultDisplay: compactToolResultDisplayForHistory(
               trackedCall.response.resultDisplay
             ),
+            ...trackedCall.response.visionBridgeNotice !== void 0 ? {
+              visionBridgeNotice: trackedCall.response.visionBridgeNotice
+            } : {},
             confirmationDetails: void 0
           };
         case "cancelled":
@@ -35839,6 +36008,9 @@ function mapToDisplay(toolOrTools, projectRoot) {
             resultDisplay: compactToolResultDisplayForHistory(
               trackedCall.response.resultDisplay
             ),
+            ...trackedCall.response.visionBridgeNotice !== void 0 ? {
+              visionBridgeNotice: trackedCall.response.visionBridgeNotice
+            } : {},
             confirmationDetails: void 0
           };
         case "awaiting_approval":
@@ -35893,74 +36065,90 @@ __name(mapToDisplay, "mapToDisplay");
 // packages/cli/src/ui/hooks/useGeminiStream.ts
 import { promises as fs17 } from "node:fs";
 import path12 from "node:path";
-import process14 from "node:process";
+import process15 from "node:process";
 
 // packages/cli/src/ui/hooks/useMessageQueue.ts
 init_esbuild_shims();
-var import_react135 = __toESM(require_react(), 1);
+var import_react134 = __toESM(require_react(), 1);
 var GOAL_COMMAND_RE = /^\/goal(?:\s|$)/;
+function aggregateMessages(messages) {
+  const modelText = messages.map((message) => message.modelText).join("\n\n");
+  const submittedPrompts = messages.map((message) => message.submittedPrompt);
+  return submittedPrompts.every(
+    (submittedPrompt) => submittedPrompt !== void 0
+  ) ? { modelText, submittedPrompt: submittedPrompts.join("\n\n") } : { modelText };
+}
+__name(aggregateMessages, "aggregateMessages");
 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)(() => {
+  const [queuedMessages, setQueuedMessages] = (0, import_react134.useState)([]);
+  const queueRef = (0, import_react134.useRef)([]);
+  const addMessage = (0, import_react134.useCallback)(
+    (message, deferUntilIdle = false, submittedPrompt) => {
+      const modelText = message.trim();
+      if (modelText.length > 0) {
+        queueRef.current = [
+          ...queueRef.current,
+          { modelText, deferUntilIdle, submittedPrompt }
+        ];
+        setQueuedMessages(queueRef.current);
+      }
+    },
+    []
+  );
+  const clearQueue = (0, import_react134.useCallback)(() => {
     queueRef.current = [];
     setQueuedMessages([]);
   }, []);
-  const getQueuedMessagesText = (0, import_react135.useCallback)(() => {
+  const getQueuedMessagesText = (0, import_react134.useCallback)(() => {
     if (queuedMessages.length === 0) return "";
-    return queuedMessages.map(({ text }) => text).join("\n\n");
+    return queuedMessages.map(({ modelText }) => modelText).join("\n\n");
   }, [queuedMessages]);
-  const popAllMessages = (0, import_react135.useCallback)(() => {
+  const popAllMessages = (0, import_react134.useCallback)(() => {
     const current = queueRef.current;
     if (current.length === 0) return null;
     queueRef.current = [];
     setQueuedMessages([]);
-    return current.map(({ text }) => text).join("\n\n");
+    return aggregateMessages(current);
   }, []);
-  const restoreMessages = (0, import_react135.useCallback)((messages) => {
-    const restored = messages.map((text) => text.trim()).filter(Boolean).map((text) => ({ text, deferUntilIdle: false }));
+  const restoreMessages = (0, import_react134.useCallback)((messages) => {
+    const restored = messages.map((text) => text.trim()).filter(Boolean).map((modelText) => ({ modelText, deferUntilIdle: false }));
     if (restored.length === 0) return;
     queueRef.current = [...restored, ...queueRef.current];
     setQueuedMessages(queueRef.current);
   }, []);
-  const drainQueue = (0, import_react135.useCallback)((includeDeferred = false) => {
+  const drainQueue = (0, import_react134.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 shouldDrain = /* @__PURE__ */ __name((message) => (!isSlashCommand(message.modelText) || !includeDeferred && GOAL_COMMAND_RE.test(message.modelText)) && (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);
+    return drained.map(({ modelText }) => modelText);
   }, []);
-  const popNextSegment = (0, import_react135.useCallback)(() => {
+  const popNextTurn = (0, import_react134.useCallback)(() => {
     const current = queueRef.current;
     if (current.length === 0) return null;
-    const [head, ...rest] = current;
+    const plainMessages = current.filter(
+      (message) => !isSlashCommand(message.modelText)
+    );
+    const messages = plainMessages.length > 0 ? plainMessages : [current[0]];
+    const selected = new Set(messages);
+    const rest = current.filter((message) => !selected.has(message));
     queueRef.current = rest;
     setQueuedMessages(rest);
-    return head.text;
+    return aggregateMessages(messages);
   }, []);
   return {
-    messageQueue: queuedMessages.map(({ text }) => text),
+    messageQueue: queuedMessages.map(({ modelText }) => modelText),
     addMessage,
     clearQueue,
     getQueuedMessagesText,
     popAllMessages,
     restoreMessages,
     drainQueue,
-    popNextSegment
+    popNextTurn
   };
 }
 __name(useMessageQueue, "useMessageQueue");
@@ -36108,16 +36296,17 @@ 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_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)(
+  const [initError, setInitError] = (0, import_react135.useState)(null);
+  const abortControllerRef = (0, import_react135.useRef)(null);
+  const flushBufferedStreamEventsRef = (0, import_react135.useRef)(/* @__PURE__ */ new Set());
+  const turnCancelledRef = (0, import_react135.useRef)(false);
+  const isSubmittingQueryRef = (0, import_react135.useRef)(false);
+  const lastPromptRef = (0, import_react135.useRef)(null);
+  const lastTurnUserItemRef = (0, import_react135.useRef)(null);
+  const canUndoLastLoggedUserMessageRef = (0, import_react135.useRef)(false);
+  const turnSawContentEventRef = (0, import_react135.useRef)(false);
+  const lastPromptErroredRef = (0, import_react135.useRef)(false);
+  const commitItem = (0, import_react135.useCallback)(
     (item, userMessageTimestamp) => {
       if (item.type === "gemini" && !item.timestamp) {
         item.timestamp = Date.now();
@@ -36127,17 +36316,17 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [addItem]
   );
   const dualOutput = useDualOutput();
-  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)(() => {
+  const [isResponding, setIsResponding] = (0, import_react135.useState)(false);
+  const activeModelStreamsRef = (0, import_react135.useRef)(0);
+  const [thought, setThought] = (0, import_react135.useState)(null);
+  const historyRef = (0, import_react135.useRef)(history);
+  (0, import_react135.useLayoutEffect)(() => {
     historyRef.current = history;
   }, [history]);
-  const auxiliaryAbortRefsRef = (0, import_react136.useRef)(/* @__PURE__ */ new Set());
+  const auxiliaryAbortRefsRef = (0, import_react135.useRef)(/* @__PURE__ */ new Set());
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
   const [pendingThoughtItem, pendingThoughtItemRef, setPendingThoughtItem] = useStateAndRef(null);
-  const thoughtStartTimeRef = (0, import_react136.useRef)(null);
+  const thoughtStartTimeRef = (0, import_react135.useRef)(null);
   const [
     pendingRetryErrorItem,
     pendingRetryErrorItemRef,
@@ -36148,21 +36337,25 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     pendingRetryCountdownItemRef,
     setPendingRetryCountdownItem
   ] = useStateAndRef(null);
-  const retryCountdownTimerRef = (0, import_react136.useRef)(
+  const retryCountdownTimerRef = (0, import_react135.useRef)(
     null
   );
-  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)(
+  const processedMemoryToolsRef = (0, import_react135.useRef)(/* @__PURE__ */ new Set());
+  const submitPromptOnCompleteRef = (0, import_react135.useRef)(null);
+  const modelOverrideRef = (0, import_react135.useRef)(void 0);
+  const inlineModelOverrideActiveRef = (0, import_react135.useRef)(false);
+  const canUseToolResultFullTurnModel = (0, import_react135.useCallback)((model) => {
+    const current = modelOverrideRef.current;
+    return !inlineModelOverrideActiveRef.current && (!current?.endsWith("\0") || current === model);
+  }, []);
+  const handledProviderToolCallIdsRef = (0, import_react135.useRef)(/* @__PURE__ */ new Set());
+  const duplicateProviderToolCallResponseIdsRef = (0, import_react135.useRef)(
     /* @__PURE__ */ new Set()
   );
-  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 pendingDuplicateToolResponsesRef = (0, import_react135.useRef)([]);
+  const immediateDuplicateToolResponsesRef = (0, import_react135.useRef)(null);
+  const streamingResponseLengthRef = (0, import_react135.useRef)(0);
+  const [isReceivingContent, setIsReceivingContent] = (0, import_react135.useState)(false);
   const {
     startNewPrompt,
     getPromptCount,
@@ -36185,13 +36378,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     config,
     getPreferredEditor,
-    onEditorClose
+    onEditorClose,
+    canUseToolResultFullTurnModel
   );
-  const pendingToolCallGroupDisplay = (0, import_react136.useMemo)(
+  const pendingToolCallGroupDisplay = (0, import_react135.useMemo)(
     () => toolCalls.length ? mapToDisplay(toolCalls, config.getProjectRoot()) : void 0,
     [toolCalls, config]
   );
-  const activeToolPtyId = (0, import_react136.useMemo)(() => {
+  const activeToolPtyId = (0, import_react135.useMemo)(() => {
     const executingShellTool = toolCalls?.find(
       (tc) => tc.status === "executing" && tc.request.name === "run_shell_command"
     );
@@ -36200,18 +36394,18 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
     return void 0;
   }, [toolCalls]);
-  const loopDetectedRef = (0, import_react136.useRef)(false);
+  const loopDetectedRef = (0, import_react135.useRef)(false);
   const [
     loopDetectionConfirmationRequest,
     setLoopDetectionConfirmationRequest
-  ] = (0, import_react136.useState)(null);
-  const stopRetryCountdownTimer = (0, import_react136.useCallback)(() => {
+  ] = (0, import_react135.useState)(null);
+  const stopRetryCountdownTimer = (0, import_react135.useCallback)(() => {
     if (retryCountdownTimerRef.current) {
       clearInterval(retryCountdownTimerRef.current);
       retryCountdownTimerRef.current = null;
     }
   }, []);
-  const clearRetryCountdown = (0, import_react136.useCallback)(() => {
+  const clearRetryCountdown = (0, import_react135.useCallback)(() => {
     stopRetryCountdownTimer();
     skipRetryDelayRef.current = null;
     setPendingRetryErrorItem(null);
@@ -36221,8 +36415,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     setPendingRetryCountdownItem,
     stopRetryCountdownTimer
   ]);
-  const skipRetryDelayRef = (0, import_react136.useRef)(null);
-  const startRetryCountdown = (0, import_react136.useCallback)(
+  const skipRetryDelayRef = (0, import_react135.useRef)(null);
+  const startRetryCountdown = (0, import_react135.useCallback)(
     (retryInfo) => {
       stopRetryCountdownTimer();
       skipRetryDelayRef.current = retryInfo.skipDelay;
@@ -36263,8 +36457,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       stopRetryCountdownTimer
     ]
   );
-  (0, import_react136.useEffect)(() => () => stopRetryCountdownTimer(), [stopRetryCountdownTimer]);
-  const onExec = (0, import_react136.useCallback)(async (done) => {
+  (0, import_react135.useEffect)(() => () => stopRetryCountdownTimer(), [stopRetryCountdownTimer]);
+  const onExec = (0, import_react135.useCallback)(async (done) => {
     setIsResponding(true);
     await done;
     setIsResponding(false);
@@ -36281,12 +36475,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     terminalHeight
   );
   const activePtyId = activeShellPtyId || activeToolPtyId;
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     if (!activePtyId) {
       setShellInputFocused(false);
     }
   }, [activePtyId, setShellInputFocused]);
-  const streamingState = (0, import_react136.useMemo)(() => {
+  const streamingState = (0, import_react135.useMemo)(() => {
     if (toolCalls.some((tc) => tc.status === "awaiting_approval")) {
       return "waiting_for_confirmation" /* WaitingForConfirmation */;
     }
@@ -36304,7 +36498,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }
     return "idle" /* Idle */;
   }, [isResponding, toolCalls]);
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
       const lastUserMessageIndex = findLastUserItemIndex(history);
       const turnCount = lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
@@ -36316,7 +36510,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     }
   }, [streamingState, config, history]);
-  const cancelOngoingRequest = (0, import_react136.useCallback)(() => {
+  const cancelOngoingRequest = (0, import_react135.useCallback)(() => {
     if (streamingState !== "responding" /* Responding */) {
       return;
     }
@@ -36369,6 +36563,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       onCancelSubmit({
         pendingItem: pendingItemAtCancel,
         lastTurnUserItem: lastTurnUserItemRef.current,
+        canUndoLastLoggedUserMessage: canUndoLastLoggedUserMessageRef.current,
         turnProducedMeaningfulContent: turnSawContentEventRef.current
       });
     } finally {
@@ -36387,7 +36582,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     config,
     getPromptCount
   ]);
-  const applyVisionBridgeIfNeeded = (0, import_react136.useCallback)(
+  const applyVisionBridgeIfNeeded = (0, import_react135.useCallback)(
     async (parts, timestamp, signal) => {
       if (parts === null || !hasImageParts(parts)) {
         return { parts, shouldProceed: true };
@@ -36452,15 +36647,17 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, config]
   );
-  const prepareQueryForGemini = (0, import_react136.useCallback)(
-    async (query, userMessageTimestamp, abortSignal, prompt_id, submitType) => {
+  const prepareQueryForGemini = (0, import_react135.useCallback)(
+    async (query, userMessageTimestamp, abortSignal, prompt_id, submitType, submittedPrompt, preserveTurnOwnership) => {
       if (turnCancelledRef.current) {
         return { queryToSend: null, shouldProceed: false };
       }
       if (typeof query === "string" && query.trim().length === 0) {
         return { queryToSend: null, shouldProceed: false };
       }
-      lastTurnUserItemRef.current = null;
+      if (!preserveTurnOwnership) {
+        lastTurnUserItemRef.current = null;
+      }
       let localQueryToSendToGemini = null;
       if (typeof query === "string") {
         const trimmedQuery = query.trim();
@@ -36478,6 +36675,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         }
         onDebugMessage(`Received user query (${trimmedQuery.length} chars)`);
         await logger?.logMessage("user" /* USER */, trimmedQuery);
+        canUndoLastLoggedUserMessageRef.current = !preserveTurnOwnership && logger != null;
         const slashCommandResult = isSlashCommand(trimmedQuery) ? await handleSlashCommand(trimmedQuery) : false;
         if (slashCommandResult) {
           switch (slashCommandResult.type) {
@@ -36551,10 +36749,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             },
             userMessageTimestamp
           );
-          lastTurnUserItemRef.current = {
-            id: insertedId,
-            text: trimmedQuery
-          };
+          if (!preserveTurnOwnership) {
+            lastTurnUserItemRef.current = {
+              id: insertedId,
+              text: trimmedQuery,
+              ...submittedPrompt === void 0 ? {} : { submittedPrompt }
+            };
+          }
           await new Promise((r) => setImmediate(r));
         }
         if (isAtCommand(trimmedQuery)) {
@@ -36603,7 +36804,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       applyVisionBridgeIfNeeded
     ]
   );
-  const handleContentEvent = (0, import_react136.useCallback)(
+  const handleContentEvent = (0, import_react135.useCallback)(
     (eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return "";
@@ -36728,7 +36929,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       terminalWidthRef
     ]
   );
-  const mergeThought = (0, import_react136.useCallback)(
+  const mergeThought = (0, import_react135.useCallback)(
     (incoming) => {
       setThought((prev) => {
         const incomingDescription = incoming.description ? clampLoadingThoughtDescription(incoming.description) : incoming.description;
@@ -36757,7 +36958,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [setThought]
   );
-  const handleThoughtEvent = (0, import_react136.useCallback)(
+  const handleThoughtEvent = (0, import_react135.useCallback)(
     (eventValue, currentThoughtBuffer, userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return "";
@@ -36819,7 +37020,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, mergeThought, pendingThoughtItemRef, setPendingThoughtItem]
   );
-  const commitPendingThought = (0, import_react136.useCallback)(
+  const commitPendingThought = (0, import_react135.useCallback)(
     (userMessageTimestamp) => {
       if (pendingThoughtItemRef.current) {
         const item = { ...pendingThoughtItemRef.current };
@@ -36833,7 +37034,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, pendingThoughtItemRef, setPendingThoughtItem]
   );
-  const handleUserCancelledEvent = (0, import_react136.useCallback)(
+  const handleUserCancelledEvent = (0, import_react135.useCallback)(
     (userMessageTimestamp) => {
       if (turnCancelledRef.current) {
         return;
@@ -36873,7 +37074,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       clearRetryCountdown
     ]
   );
-  const handleErrorEvent = (0, import_react136.useCallback)(
+  const handleErrorEvent = (0, import_react135.useCallback)(
     (eventValue, userMessageTimestamp) => {
       lastPromptErroredRef.current = true;
       commitPendingThought(userMessageTimestamp);
@@ -36916,7 +37117,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       clearRetryCountdown
     ]
   );
-  const handleCitationEvent = (0, import_react136.useCallback)(
+  const handleCitationEvent = (0, import_react135.useCallback)(
     (text, userMessageTimestamp) => {
       if (!showCitations(settings)) {
         return;
@@ -36935,7 +37136,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       settings
     ]
   );
-  const handleFinishedEvent = (0, import_react136.useCallback)(
+  const handleFinishedEvent = (0, import_react135.useCallback)(
     (event, userMessageTimestamp) => {
       const finishReason = event.value.reason;
       if (!finishReason) {
@@ -36976,8 +37177,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, clearRetryCountdown]
   );
-  const autonomousLoopTickResolverRef = (0, import_react136.useRef)(null);
-  const handleChatCompressionEvent = (0, import_react136.useCallback)(
+  const autonomousLoopTickResolverRef = (0, import_react135.useRef)(null);
+  const handleChatCompressionEvent = (0, import_react135.useCallback)(
     (eventValue, userMessageTimestamp) => {
       autonomousLoopTickResolverRef.current?.resetCache();
       if (pendingHistoryItemRef.current) {
@@ -36996,7 +37197,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItem, config, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleMaxSessionTurnsEvent = (0, import_react136.useCallback)(
+  const handleMaxSessionTurnsEvent = (0, import_react135.useCallback)(
     () => addItem(
       {
         type: "info",
@@ -37006,7 +37207,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ),
     [addItem, config]
   );
-  const handleSessionTokenLimitExceededEvent = (0, import_react136.useCallback)(
+  const handleSessionTokenLimitExceededEvent = (0, import_react135.useCallback)(
     (value) => addItem(
       {
         type: "error",
@@ -37021,7 +37222,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ),
     [addItem]
   );
-  const handleLoopDetectionConfirmation = (0, import_react136.useCallback)(
+  const handleLoopDetectionConfirmation = (0, import_react135.useCallback)(
     (result) => {
       setLoopDetectionConfirmationRequest(null);
       if (result.userSelection === "disable") {
@@ -37045,12 +37246,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [config, addItem]
   );
-  const handleLoopDetectedEvent = (0, import_react136.useCallback)(() => {
+  const handleLoopDetectedEvent = (0, import_react135.useCallback)(() => {
     setLoopDetectionConfirmationRequest({
       onComplete: handleLoopDetectionConfirmation
     });
   }, [handleLoopDetectionConfirmation]);
-  const handleUserPromptSubmitBlockedEvent = (0, import_react136.useCallback)(
+  const handleUserPromptSubmitBlockedEvent = (0, import_react135.useCallback)(
     (value, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -37067,7 +37268,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItem, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleStopHookLoopEvent = (0, import_react136.useCallback)(
+  const handleStopHookLoopEvent = (0, import_react135.useCallback)(
     (value, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
         commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
@@ -37101,7 +37302,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [addItem, commitItem, config, pendingHistoryItemRef, setPendingHistoryItem]
   );
-  const handleActiveGoalEvent = (0, import_react136.useCallback)(
+  const handleActiveGoalEvent = (0, import_react135.useCallback)(
     (activeGoal) => {
       const sessionId = config.getSessionId();
       const currentActiveGoal = getActiveGoal(sessionId);
@@ -37119,7 +37320,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [config]
   );
-  const processGeminiStreamEvents = (0, import_react136.useCallback)(
+  const processGeminiStreamEvents = (0, import_react135.useCallback)(
     async (stream, userMessageTimestamp, signal) => {
       let geminiMessageBuffer = "";
       let thoughtBuffer = "";
@@ -37347,6 +37548,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "active_goal" /* ActiveGoal */:
               handleActiveGoalEvent(event.value);
               break;
+            case "goal_state" /* GoalState */:
+              break;
             default: {
               const unreachable = event;
               return unreachable;
@@ -37459,7 +37662,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       dualOutput
     ]
   );
-  const resolveSteeredMessages = (0, import_react136.useCallback)(
+  const resolveSteeredMessages = (0, import_react135.useCallback)(
     async (messages, signal) => {
       const resolvedSegments = [];
       const resolvedForRecording = [];
@@ -37628,7 +37831,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       onDebugMessage
     ]
   );
-  const resolveDrainedSteerMessages = (0, import_react136.useCallback)(
+  const resolveDrainedSteerMessages = (0, import_react135.useCallback)(
     async (messages, signal) => {
       try {
         const resolved = await resolveSteeredMessages(messages, signal);
@@ -37665,7 +37868,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [midTurnRestoreRef, onDebugMessage, resolveSteeredMessages]
   );
-  const drainSteerAtBoundary = (0, import_react136.useCallback)(
+  const drainSteerAtBoundary = (0, import_react135.useCallback)(
     async (signal) => {
       const messages = midTurnDrainRef?.current?.() ?? [];
       if (messages.length === 0) return void 0;
@@ -37673,10 +37876,11 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [midTurnDrainRef, resolveDrainedSteerMessages]
   );
-  const submitQuery = (0, import_react136.useCallback)(
+  const submitQuery = (0, import_react135.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 */;
+      const submittedPrompt = submitType === "userQuery" /* UserQuery */ ? metadata?.submittedPrompt : void 0;
       if (isSubmittingQueryRef.current && !isTurnContinuation && !allowConcurrentBtwDuringResponse) {
         metadata?.onDeliveryFailed?.();
         return;
@@ -37689,6 +37893,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       loopDetectedRef.current = false;
       if (!isTurnContinuation && !allowConcurrentBtwDuringResponse) {
         lastTurnUserItemRef.current = null;
+        canUndoLastLoggedUserMessageRef.current = false;
         turnSawContentEventRef.current = false;
         handledProviderToolCallIdsRef.current.clear();
         duplicateProviderToolCallResponseIdsRef.current.clear();
@@ -37735,7 +37940,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           userMessageTimestamp,
           abortSignal,
           prompt_id,
-          submitType
+          submitType,
+          submittedPrompt,
+          allowConcurrentBtwDuringResponse
         );
         if (!shouldProceed || queryToSend === null) {
           isSubmittingQueryRef.current = false;
@@ -37793,17 +38000,20 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             );
             dualOutput.emitUserMessage(userParts);
           }
+          const sendOptions = {
+            type: submitType,
+            notificationDisplayText: metadata?.notificationDisplayText,
+            todoWorkChainId: metadata?.todoWorkChainId,
+            modelOverride: modelOverrideRef.current,
+            steerInput: metadata?.steerInput,
+            ...submittedPrompt !== void 0 ? { submittedPrompt } : {},
+            ...!allowConcurrentBtwDuringResponse && midTurnDrainRef ? { getSteerInput: drainSteerAtBoundary } : {}
+          };
           const stream = geminiClient.sendMessageStream(
             finalQueryToSend,
             abortSignal,
             prompt_id,
-            {
-              type: submitType,
-              notificationDisplayText: metadata?.notificationDisplayText,
-              modelOverride: modelOverrideRef.current,
-              steerInput: metadata?.steerInput,
-              ...!allowConcurrentBtwDuringResponse && midTurnDrainRef ? { getSteerInput: drainSteerAtBoundary } : {}
-            }
+            sendOptions
           );
           const processingStatus = await processGeminiStreamEvents(
             stream,
@@ -37857,6 +38067,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           }
           if (retryCountdownTimerRef.current) {
             clearRetryCountdown();
+          } else if (pendingRetryErrorItemRef.current && !lastPromptErroredRef.current) {
+            clearRetryCountdown();
           }
           const loopDetected = loopDetectedRef.current;
           if (loopDetected) {
@@ -37956,7 +38168,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       midTurnDrainRef
     ]
   );
-  const retryLastPrompt = (0, import_react136.useCallback)(async () => {
+  const retryLastPrompt = (0, import_react135.useCallback)(async () => {
     if (skipRetryDelayRef.current) {
       skipRetryDelayRef.current();
       skipRetryDelayRef.current = null;
@@ -37980,7 +38192,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     clearRetryCountdown();
     await submitQuery(lastPrompt, "retry" /* Retry */);
   }, [streamingState, addItem, clearRetryCountdown, submitQuery]);
-  const handleApprovalModeChange = (0, import_react136.useCallback)(
+  const handleApprovalModeChange = (0, import_react135.useCallback)(
     async (newApprovalMode) => {
       if (newApprovalMode === "yolo" /* YOLO */ || newApprovalMode === "auto-edit" /* AUTO_EDIT */) {
         let awaitingApprovalCalls = toolCalls.filter(
@@ -38015,7 +38227,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [toolCalls]
   );
-  const handleCompletedTools = (0, import_react136.useCallback)(
+  const handleCompletedTools = (0, import_react135.useCallback)(
     async (completedToolCallsFromScheduler) => {
       const completedAndReadyToSubmitTools = completedToolCallsFromScheduler.filter(
         (tc) => {
@@ -38326,7 +38538,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       resolveDrainedSteerMessages
     ]
   );
-  const pendingHistoryItems = (0, import_react136.useMemo)(
+  const pendingHistoryItems = (0, import_react135.useMemo)(
     () => [
       // Reasoning renders above the streaming answer.
       pendingThoughtItem,
@@ -38343,7 +38555,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       pendingToolCallGroupDisplay
     ]
   );
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     const saveRestorableToolCalls = /* @__PURE__ */ __name(async () => {
       if (!config.getFileCheckpointingEnabled()) {
         return;
@@ -38414,14 +38626,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     }, "saveRestorableToolCalls");
     saveRestorableToolCalls();
   }, [toolCalls, config, onDebugMessage, history, geminiClient, storage]);
-  const notificationQueueRef = (0, import_react136.useRef)([]);
-  const [notificationTrigger, setNotificationTrigger] = (0, import_react136.useState)(0);
-  const getAutonomousLoopTickResolver = (0, import_react136.useCallback)(() => {
+  const notificationQueueRef = (0, import_react135.useRef)([]);
+  const [notificationTrigger, setNotificationTrigger] = (0, import_react135.useState)(0);
+  const getAutonomousLoopTickResolver = (0, import_react135.useCallback)(() => {
     autonomousLoopTickResolverRef.current ??= new AutonomousLoopTickResolver();
     return autonomousLoopTickResolverRef.current;
   }, []);
-  const notificationQueueSessionIdRef = (0, import_react136.useRef)(sessionStates.sessionId);
-  (0, import_react136.useEffect)(() => {
+  const notificationQueueSessionIdRef = (0, import_react135.useRef)(sessionStates.sessionId);
+  (0, import_react135.useEffect)(() => {
     if (notificationQueueSessionIdRef.current === sessionStates.sessionId) {
       return;
     }
@@ -38429,9 +38641,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     notificationQueueRef.current = [];
     autonomousLoopTickResolverRef.current?.resetCache();
   }, [sessionStates.sessionId]);
-  const cronSessionIdRef = (0, import_react136.useRef)(sessionStates.sessionId);
+  const cronSessionIdRef = (0, import_react135.useRef)(sessionStates.sessionId);
   cronSessionIdRef.current = sessionStates.sessionId;
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     if (!isConfigInitialized) return;
     if (!config.isCronEnabled()) return;
     const scheduler = config.getCronScheduler();
@@ -38461,6 +38673,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               displayText: `${job.missed ? "Missed" : source}: ${label}`,
               modelText,
               sendMessageType: "cron" /* Cron */,
+              todoWorkChainId: job.todoWorkChainId,
               onDelivered: /* @__PURE__ */ __name(() => resolver.markDelivered(), "onDelivered")
             });
             setNotificationTrigger((n) => n + 1);
@@ -38469,7 +38682,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           notificationQueueRef.current.push({
             displayText: `${job.missed ? "Missed" : source}: ${label}`,
             modelText,
-            sendMessageType: "cron" /* Cron */
+            sendMessageType: "cron" /* Cron */,
+            todoWorkChainId: job.todoWorkChainId
           });
           setNotificationTrigger((n) => n + 1);
         }
@@ -38480,17 +38694,18 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       const summary = scheduler.getExitSummary();
       scheduler.stop();
       if (summary) {
-        process14.stderr.write(summary + "\n");
+        process15.stderr.write(summary + "\n");
       }
     };
   }, [config, getAutonomousLoopTickResolver, isConfigInitialized]);
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     const registry = config.getBackgroundTaskRegistry();
-    registry.setNotificationCallback((displayText, modelText) => {
+    registry.setNotificationCallback((displayText, modelText, meta) => {
       notificationQueueRef.current.push({
         displayText,
         modelText,
-        sendMessageType: "notification" /* Notification */
+        sendMessageType: "notification" /* Notification */,
+        todoWorkChainId: meta?.todoWorkChainId
       });
       setNotificationTrigger((n) => n + 1);
     });
@@ -38498,13 +38713,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       registry.setNotificationCallback(void 0);
     };
   }, [config]);
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     const registry = config.getBackgroundShellRegistry();
-    registry.setNotificationCallback((displayText, modelText) => {
+    registry.setNotificationCallback((displayText, modelText, meta) => {
       notificationQueueRef.current.push({
         displayText,
         modelText,
-        sendMessageType: "notification" /* Notification */
+        sendMessageType: "notification" /* Notification */,
+        todoWorkChainId: meta?.todoWorkChainId
       });
       setNotificationTrigger((n) => n + 1);
     });
@@ -38512,7 +38728,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       registry.setNotificationCallback(void 0);
     };
   }, [config]);
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     const registry = config.getMonitorRegistry();
     registry.setNotificationCallback((displayText, modelText, meta) => {
       if (meta.status === "running" && typeof registry.get === "function") {
@@ -38523,7 +38739,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         displayText,
         modelText,
         sendMessageType: "notification" /* Notification */,
-        monitor: { id: meta.monitorId, status: meta.status }
+        monitor: { id: meta.monitorId, status: meta.status },
+        todoWorkChainId: meta.todoWorkChainId
       });
       setNotificationTrigger((n) => n + 1);
     });
@@ -38531,7 +38748,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       registry.setNotificationCallback(void 0);
     };
   }, [config]);
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && notificationQueueRef.current.length > 0) {
       runOutsideAgentContext(() => {
         const queue = notificationQueueRef.current;
@@ -38554,13 +38771,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           );
           submitQuery(item.modelText, item.sendMessageType, void 0, {
             notificationDisplayText: item.displayText,
+            todoWorkChainId: item.todoWorkChainId,
             onDelivered: item.onDelivered,
             onDeliveryFailed: item.onDeliveryFailed
           });
           return;
         }
         let splitIdx = 0;
-        while (splitIdx < queue.length && queue[splitIdx].sendMessageType === targetType) {
+        while (splitIdx < queue.length && queue[splitIdx].sendMessageType === targetType && queue[splitIdx].todoWorkChainId === queue[0].todoWorkChainId) {
           splitIdx++;
         }
         const batch = queue.splice(0, splitIdx);
@@ -38574,14 +38792,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         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
+          notificationDisplayText: combinedDisplayText,
+          todoWorkChainId: batch[0]?.todoWorkChainId
         });
       });
     }
   }, [streamingState, submitQuery, notificationTrigger, addItem, config]);
-  const teammateQueueRef = (0, import_react136.useRef)([]);
-  const [teammateTrigger, setTeammateTrigger] = (0, import_react136.useState)(0);
-  (0, import_react136.useEffect)(() => {
+  const teammateQueueRef = (0, import_react135.useRef)([]);
+  const [teammateTrigger, setTeammateTrigger] = (0, import_react135.useState)(0);
+  (0, import_react135.useEffect)(() => {
     let boundManager = null;
     const handleManagerChange = /* @__PURE__ */ __name((manager) => {
       if (boundManager && boundManager !== manager) {
@@ -38611,7 +38830,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
     };
   }, [config]);
-  (0, import_react136.useEffect)(() => {
+  (0, import_react135.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && teammateQueueRef.current.length > 0) {
       runOutsideAgentContext(() => {
         const batch = teammateQueueRef.current.splice(0);
@@ -38648,7 +38867,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
 
 // packages/cli/src/ui/hooks/vim.ts
 init_esbuild_shims();
-var import_react137 = __toESM(require_react(), 1);
+var import_react136 = __toESM(require_react(), 1);
 import { execFile as execFile7, execFileSync as execFileSync2 } from "child_process";
 var DIGIT_MULTIPLIER = 10;
 var DEFAULT_COUNT = 1;
@@ -38884,26 +39103,26 @@ __name(findCharInLineReverse, "findCharInLineReverse");
 function useVim(buffer, onSubmit) {
   const { vimEnabled, vimMode } = useVimModeState();
   const { setVimMode } = useVimModeActions();
-  const [state, dispatch] = (0, import_react137.useReducer)(vimReducer, initialVimState);
-  const bufferRef = (0, import_react137.useRef)(buffer);
-  const stateRef = (0, import_react137.useRef)(state);
+  const [state, dispatch] = (0, import_react136.useReducer)(vimReducer, initialVimState);
+  const bufferRef = (0, import_react136.useRef)(buffer);
+  const stateRef = (0, import_react136.useRef)(state);
   bufferRef.current = buffer;
   stateRef.current = state;
-  (0, import_react137.useEffect)(() => {
+  (0, import_react136.useEffect)(() => {
     dispatch({ type: "SET_MODE", mode: vimMode });
   }, [vimMode]);
-  const updateMode = (0, import_react137.useCallback)(
+  const updateMode = (0, import_react136.useCallback)(
     (mode) => {
       setVimMode(mode);
       dispatch({ type: "SET_MODE", mode });
     },
     [setVimMode]
   );
-  const getCurrentCount = (0, import_react137.useCallback)(
+  const getCurrentCount = (0, import_react136.useCallback)(
     () => stateRef.current.count || DEFAULT_COUNT,
     []
   );
-  const yankRange = (0, import_react137.useCallback)(
+  const yankRange = (0, import_react136.useCallback)(
     (startRow, startCol, endRow, endCol, linewise) => {
       const lines = bufferRef.current.lines;
       let text = "";
@@ -38918,7 +39137,7 @@ function useVim(buffer, onSubmit) {
     },
     []
   );
-  const executeCommand = (0, import_react137.useCallback)(
+  const executeCommand = (0, import_react136.useCallback)(
     (cmdType, count) => {
       switch (cmdType) {
         case CMD_TYPES.DELETE_WORD_FORWARD:
@@ -39319,7 +39538,7 @@ function useVim(buffer, onSubmit) {
     return { text, linewise: movement === "j" || movement === "k" };
   }
   __name(extractMovementText, "extractMovementText");
-  const executeFind = (0, import_react137.useCallback)(
+  const executeFind = (0, import_react136.useCallback)(
     (findType, char, count = 1) => {
       const [startRow, startCol] = buffer.cursor;
       const line = buffer.lines[startRow] ?? "";
@@ -39355,7 +39574,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch]
   );
-  const handleCharRead = (0, import_react137.useCallback)(
+  const handleCharRead = (0, import_react136.useCallback)(
     (char) => {
       const readType = state.pendingCharRead;
       if (!readType) return false;
@@ -39398,7 +39617,7 @@ function useVim(buffer, onSubmit) {
     },
     [state.pendingCharRead, buffer, dispatch, executeFind]
   );
-  const handleInsertModeInput = (0, import_react137.useCallback)(
+  const handleInsertModeInput = (0, import_react136.useCallback)(
     (normalizedKey) => {
       if (normalizedKey.name === "escape") {
         buffer.vimEscapeInsertMode();
@@ -39429,7 +39648,7 @@ function useVim(buffer, onSubmit) {
     },
     [buffer, dispatch, updateMode, onSubmit]
   );
-  const normalizeKey = (0, import_react137.useCallback)(
+  const normalizeKey = (0, import_react136.useCallback)(
     (key) => ({
       name: key.name || "",
       sequence: key.sequence || "",
@@ -39440,7 +39659,7 @@ function useVim(buffer, onSubmit) {
     }),
     []
   );
-  const handleChangeMovement = (0, import_react137.useCallback)(
+  const handleChangeMovement = (0, import_react136.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       dispatch({ type: "CLEAR_COUNT" });
@@ -39461,7 +39680,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer, updateMode]
   );
-  const handleDeleteMovement = (0, import_react137.useCallback)(
+  const handleDeleteMovement = (0, import_react136.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       const [row, col] = bufferRef.current.cursor;
@@ -39496,7 +39715,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch, buffer]
   );
-  const handleYankMovement = (0, import_react137.useCallback)(
+  const handleYankMovement = (0, import_react136.useCallback)(
     (movement) => {
       const count = getCurrentCount();
       const [row, col] = bufferRef.current.cursor;
@@ -39530,7 +39749,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, dispatch]
   );
-  const handleOperatorMotion = (0, import_react137.useCallback)(
+  const handleOperatorMotion = (0, import_react136.useCallback)(
     (operator, motion) => {
       const count = getCurrentCount();
       const commandMap = {
@@ -39562,7 +39781,7 @@ function useVim(buffer, onSubmit) {
     },
     [getCurrentCount, executeCommand, dispatch]
   );
-  const handleInput = (0, import_react137.useCallback)(
+  const handleInput = (0, import_react136.useCallback)(
     (key) => {
       if (!vimEnabled) {
         return false;
@@ -40284,7 +40503,7 @@ __name(buildWorkflowSteeringNotice, "buildWorkflowSteeringNotice");
 
 // packages/cli/src/ui/hooks/useAwaySummary.ts
 init_esbuild_shims();
-var import_react138 = __toESM(require_react(), 1);
+var import_react137 = __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;
@@ -40316,15 +40535,15 @@ function useAwaySummary(options) {
     history,
     awayThresholdMinutes
   } = options;
-  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);
+  const blurredAtRef = (0, import_react137.useRef)(null);
+  const recapPendingRef = (0, import_react137.useRef)(false);
+  const inFlightRef = (0, import_react137.useRef)(null);
+  const isIdleRef = (0, import_react137.useRef)(isIdle);
   isIdleRef.current = isIdle;
-  const historyRef = (0, import_react138.useRef)(history);
+  const historyRef = (0, import_react137.useRef)(history);
   historyRef.current = history;
   const thresholdMs = (awayThresholdMinutes && awayThresholdMinutes > 0 ? awayThresholdMinutes : DEFAULT_AWAY_THRESHOLD_MINUTES) * 60 * 1e3;
-  (0, import_react138.useEffect)(() => {
+  (0, import_react137.useEffect)(() => {
     if (!enabled || !config) {
       inFlightRef.current?.abort();
       inFlightRef.current = null;
@@ -40376,7 +40595,7 @@ function useAwaySummary(options) {
       recapPendingRef.current = false;
     });
   }, [enabled, config, isFocused, isIdle, addItem, thresholdMs]);
-  (0, import_react138.useEffect)(
+  (0, import_react137.useEffect)(
     () => () => {
       inFlightRef.current?.abort();
     },
@@ -40387,14 +40606,14 @@ __name(useAwaySummary, "useAwaySummary");
 
 // packages/cli/src/ui/hooks/useBracketedPaste.ts
 init_esbuild_shims();
-var import_react139 = __toESM(require_react(), 1);
+var import_react138 = __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_react139.useEffect)(() => {
+  (0, import_react138.useEffect)(() => {
     process.stdout.write(ENABLE_BRACKETED_PASTE);
     process.on("exit", cleanup);
     process.on("SIGINT", cleanup);
@@ -40413,23 +40632,23 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/hooks/usePhraseCycler.ts
 init_esbuild_shims();
-var import_react140 = __toESM(require_react(), 1);
+var import_react139 = __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_react140.useMemo)(() => {
+  const loadingPhrases = (0, import_react139.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_react140.useState)(
+  const [currentLoadingPhrase, setCurrentLoadingPhrase] = (0, import_react139.useState)(
     loadingPhrases[0]
   );
-  const phraseIntervalRef = (0, import_react140.useRef)(null);
-  (0, import_react140.useEffect)(() => {
+  const phraseIntervalRef = (0, import_react139.useRef)(null);
+  (0, import_react139.useEffect)(() => {
     if (isWaiting) {
       setCurrentLoadingPhrase(t("Waiting for user confirmation..."));
       if (phraseIntervalRef.current) {
@@ -40466,9 +40685,9 @@ var usePhraseCycler = /* @__PURE__ */ __name((isActive, isWaiting, customPhrases
 }, "usePhraseCycler");
 
 // packages/cli/src/ui/hooks/useLoadingIndicator.ts
-var import_react141 = __toESM(require_react(), 1);
+var import_react140 = __toESM(require_react(), 1);
 var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhrases, currentCandidatesTokens, currentStreamingChars, isToolExecuting2 = false) => {
-  const [timerResetKey, setTimerResetKey] = (0, import_react141.useState)(0);
+  const [timerResetKey, setTimerResetKey] = (0, import_react140.useState)(0);
   const isTimerActive = streamingState === "responding" /* Responding */;
   const elapsedTimeFromTimer = useTimer(
     isTimerActive,
@@ -40482,17 +40701,17 @@ var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhr
     isWaiting,
     customWittyPhrases
   );
-  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 [retainedElapsedTime, setRetainedElapsedTime] = (0, import_react140.useState)(0);
+  const [taskStartTokens, setTaskStartTokensState] = (0, import_react140.useState)(0);
+  const [taskStartStreamingChars, setTaskStartStreamingCharsState] = (0, import_react140.useState)(0);
+  const taskStartTokensRef = (0, import_react140.useRef)(0);
+  const taskStartStreamingCharsRef = (0, import_react140.useRef)(0);
+  const pauseStartTokensRef = (0, import_react140.useRef)(null);
+  const pauseStartStreamingCharsRef = (0, import_react140.useRef)(null);
+  const pauseBaseTaskStartTokensRef = (0, import_react140.useRef)(0);
+  const pauseBaseTaskStartStreamingCharsRef = (0, import_react140.useRef)(0);
+  const prevStreamingStateRef = (0, import_react140.useRef)(null);
+  (0, import_react140.useEffect)(() => {
     const currentTokens = currentCandidatesTokens ?? 0;
     const currentChars = currentStreamingChars ?? 0;
     const setTaskStartTokens = /* @__PURE__ */ __name((tokens) => {
@@ -40563,7 +40782,7 @@ var useLoadingIndicator = /* @__PURE__ */ __name((streamingState, customWittyPhr
 
 // packages/cli/src/ui/hooks/useTerminalProgress.ts
 init_esbuild_shims();
-var import_react142 = __toESM(require_react(), 1);
+var import_react141 = __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() {
@@ -40578,13 +40797,13 @@ function isProgressBarSupported() {
 __name(isProgressBarSupported, "isProgressBarSupported");
 function useTerminalProgress(streamingState, hasToolExecuting) {
   const { stdout } = use_stdout_default();
-  const writeProgress = (0, import_react142.useCallback)(
+  const writeProgress = (0, import_react141.useCallback)(
     (seq) => {
       stdout?.write(seq);
     },
     [stdout]
   );
-  (0, import_react142.useEffect)(() => {
+  (0, import_react141.useEffect)(() => {
     if (!isProgressBarSupported()) return;
     if (streamingState === "responding" /* Responding */ && hasToolExecuting) {
       writeProgress(PROGRESS_INDETERMINATE);
@@ -40595,7 +40814,7 @@ function useTerminalProgress(streamingState, hasToolExecuting) {
       writeProgress(PROGRESS_CLEAR);
     };
   }, [streamingState, hasToolExecuting, writeProgress]);
-  (0, import_react142.useEffect)(() => {
+  (0, import_react141.useEffect)(() => {
     if (!isProgressBarSupported()) return;
     const clearOnExit = /* @__PURE__ */ __name(() => {
       stdout?.write(PROGRESS_CLEAR);
@@ -40610,23 +40829,23 @@ __name(useTerminalProgress, "useTerminalProgress");
 
 // packages/cli/src/ui/hooks/useFolderTrust.ts
 init_esbuild_shims();
-var import_react143 = __toESM(require_react(), 1);
-import * as process15 from "node:process";
+var import_react142 = __toESM(require_react(), 1);
+import * as process16 from "node:process";
 var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
-  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 [isTrusted, setIsTrusted] = (0, import_react142.useState)(void 0);
+  const [isFolderTrustDialogOpen, setIsFolderTrustDialogOpen] = (0, import_react142.useState)(false);
+  const [isRestarting, setIsRestarting] = (0, import_react142.useState)(false);
   const folderTrust = settings.merged.security?.folderTrust?.enabled;
-  (0, import_react143.useEffect)(() => {
+  (0, import_react142.useEffect)(() => {
     const { isTrusted: trusted } = isWorkspaceTrusted(settings.merged);
     setIsTrusted(trusted);
     setIsFolderTrustDialogOpen(trusted === void 0);
     onTrustChange(trusted);
   }, [folderTrust, onTrustChange, settings.merged]);
-  const handleFolderTrustSelect = (0, import_react143.useCallback)(
+  const handleFolderTrustSelect = (0, import_react142.useCallback)(
     (choice) => {
       const trustedFolders = loadTrustedFolders();
-      const cwd3 = process15.cwd();
+      const cwd3 = process16.cwd();
       let trustLevel;
       const wasTrusted = isTrusted ?? true;
       switch (choice) {
@@ -40642,7 +40861,15 @@ var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
         default:
           return;
       }
-      trustedFolders.setValue(cwd3, trustLevel);
+      try {
+        trustedFolders.setValue(cwd3, trustLevel);
+      } catch (error) {
+        writeStderrLineSafe("Error saving trusted folders file.");
+        writeStderrLineSafe(
+          error instanceof Error ? error.message : String(error)
+        );
+        return;
+      }
       const currentIsTrusted = trustLevel === "TRUST_FOLDER" /* TRUST_FOLDER */ || trustLevel === "TRUST_PARENT" /* TRUST_PARENT */;
       setIsTrusted(currentIsTrusted);
       onTrustChange(currentIsTrusted);
@@ -40666,7 +40893,7 @@ var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
 
 // packages/cli/src/ui/hooks/useMcpApproval.ts
 init_esbuild_shims();
-var import_react144 = __toESM(require_react(), 1);
+var import_react143 = __toESM(require_react(), 1);
 function sourceLabel(scope) {
   switch (scope) {
     case "workspace":
@@ -40702,8 +40929,8 @@ function summarize(config) {
 }
 __name(summarize, "summarize");
 var useMcpApproval = /* @__PURE__ */ __name((config) => {
-  const [queue, setQueue] = (0, import_react144.useState)([]);
-  const computePending = (0, import_react144.useCallback)(() => {
+  const [queue, setQueue] = (0, import_react143.useState)([]);
+  const computePending = (0, import_react143.useCallback)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */) return [];
     const servers = config.getMcpServers() ?? {};
     const approvals = loadMcpApprovals();
@@ -40715,10 +40942,10 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
       source: sourceLabel(c.scope)
     }));
   }, [config]);
-  (0, import_react144.useEffect)(() => {
+  (0, import_react143.useEffect)(() => {
     setQueue(computePending());
   }, [computePending]);
-  (0, import_react144.useEffect)(() => {
+  (0, import_react143.useEffect)(() => {
     const onPendingChanged = /* @__PURE__ */ __name(() => {
       setQueue(computePending());
     }, "onPendingChanged");
@@ -40727,7 +40954,7 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
       appEvents.off("mcp-pending-approval-changed" /* McpPendingApprovalChanged */, onPendingChanged);
     };
   }, [computePending]);
-  const reconnect = (0, import_react144.useCallback)(
+  const reconnect = (0, import_react143.useCallback)(
     (name) => {
       config.approveMcpServerForSession(name);
       const registry = config.getToolRegistry();
@@ -40739,7 +40966,7 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
     },
     [config]
   );
-  const handleMcpApprovalSelect = (0, import_react144.useCallback)(
+  const handleMcpApprovalSelect = (0, import_react143.useCallback)(
     async (choice) => {
       const approvals = loadMcpApprovals();
       const root = config.getWorkingDir();
@@ -40791,7 +41018,7 @@ var useMcpApproval = /* @__PURE__ */ __name((config) => {
 
 // packages/cli/src/ui/hooks/useCommandMigration.ts
 init_esbuild_shims();
-var import_react145 = __toESM(require_react(), 1);
+var import_react144 = __toESM(require_react(), 1);
 
 // packages/cli/src/services/command-migration-tool.ts
 init_esbuild_shims();
@@ -40862,9 +41089,9 @@ __name(migrateTomlCommands, "migrateTomlCommands");
 
 // packages/cli/src/ui/hooks/useCommandMigration.ts
 function useCommandMigration(settings, storage) {
-  const [showMigrationNudge, setShowMigrationNudge] = (0, import_react145.useState)(false);
-  const [tomlFiles, setTomlFiles] = (0, import_react145.useState)([]);
-  (0, import_react145.useEffect)(() => {
+  const [showMigrationNudge, setShowMigrationNudge] = (0, import_react144.useState)(false);
+  const [tomlFiles, setTomlFiles] = (0, import_react144.useState)([]);
+  (0, import_react144.useEffect)(() => {
     let cancelled = false;
     const checkTomlCommands = /* @__PURE__ */ __name(async () => {
       const allFiles = [];
@@ -40932,15 +41159,23 @@ __name(sendNotification, "sendNotification");
 
 // packages/cli/src/ui/hooks/useGitBranchName.ts
 init_esbuild_shims();
-var import_react146 = __toESM(require_react(), 1);
+var import_react145 = __toESM(require_react(), 1);
+var BRANCH_POLL_INTERVAL_MS = 5e3;
 function useGitBranchName(cwd3) {
-  const [branchName, setBranchName] = (0, import_react146.useState)(void 0);
-  (0, import_react146.useEffect)(() => {
+  const [branchName, setBranchName] = (0, import_react145.useState)(void 0);
+  const branchNameRef = (0, import_react145.useRef)(branchName);
+  branchNameRef.current = branchName;
+  (0, import_react145.useEffect)(() => {
     let cancelled = false;
     let dispose;
+    let pollTimer;
+    let refreshGeneration = 0;
     const refresh = /* @__PURE__ */ __name(async () => {
+      const generation = ++refreshGeneration;
       const name = await resolveBranchName(cwd3);
-      if (!cancelled) setBranchName(name);
+      if (!cancelled && generation === refreshGeneration && name !== branchNameRef.current) {
+        setBranchName(name);
+      }
     }, "refresh");
     const init = /* @__PURE__ */ __name(async () => {
       await refresh();
@@ -40954,12 +41189,20 @@ function useGitBranchName(cwd3) {
       } else {
         dispose = disposer;
       }
+      if (!cancelled) {
+        pollTimer = setInterval(() => {
+          void refresh().catch(() => {
+          });
+        }, BRANCH_POLL_INTERVAL_MS);
+        pollTimer.unref?.();
+      }
     }, "init");
     void init().catch(() => {
     });
     return () => {
       cancelled = true;
       dispose?.();
+      if (pollTimer) clearInterval(pollTimer);
     };
   }, [cwd3]);
   return branchName;
@@ -40968,13 +41211,13 @@ __name(useGitBranchName, "useGitBranchName");
 
 // packages/cli/src/ui/hooks/useWorktreeSession.ts
 init_esbuild_shims();
-var import_react147 = __toESM(require_react(), 1);
+var import_react146 = __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_react147.useState)(null);
-  (0, import_react147.useEffect)(() => {
+  const [session, setSession] = (0, import_react146.useState)(null);
+  (0, import_react146.useEffect)(() => {
     let cancelled = false;
     const safeLoad = /* @__PURE__ */ __name(async () => {
       try {
@@ -41014,7 +41257,7 @@ __name(useWorktreeSession, "useWorktreeSession");
 
 // packages/cli/src/ui/hooks/useExtensionUpdates.ts
 init_esbuild_shims();
-var import_react148 = __toESM(require_react(), 1);
+var import_react147 = __toESM(require_react(), 1);
 function confirmationRequestsReducer(state, action) {
   switch (action.type) {
     case "add":
@@ -41031,8 +41274,8 @@ var useConfirmUpdateRequests = /* @__PURE__ */ __name(() => {
   const [
     confirmUpdateExtensionRequests,
     dispatchConfirmUpdateExtensionRequests
-  ] = (0, import_react148.useReducer)(confirmationRequestsReducer, []);
-  const addConfirmUpdateExtensionRequest = (0, import_react148.useCallback)(
+  ] = (0, import_react147.useReducer)(confirmationRequestsReducer, []);
+  const addConfirmUpdateExtensionRequest = (0, import_react147.useCallback)(
     (original) => {
       const wrappedRequest = {
         prompt: original.prompt,
@@ -41070,11 +41313,11 @@ function settingInputRequestsReducer(state, action) {
 }
 __name(settingInputRequestsReducer, "settingInputRequestsReducer");
 var useSettingInputRequests = /* @__PURE__ */ __name(() => {
-  const [settingInputRequests, dispatchSettingInputRequests] = (0, import_react148.useReducer)(
+  const [settingInputRequests, dispatchSettingInputRequests] = (0, import_react147.useReducer)(
     settingInputRequestsReducer,
     []
   );
-  const addSettingInputRequest = (0, import_react148.useCallback)(
+  const addSettingInputRequest = (0, import_react147.useCallback)(
     (original) => {
       const wrappedRequest = {
         settingName: original.settingName,
@@ -41121,11 +41364,11 @@ function pluginChoiceRequestsReducer(state, action) {
 }
 __name(pluginChoiceRequestsReducer, "pluginChoiceRequestsReducer");
 var usePluginChoiceRequests = /* @__PURE__ */ __name(() => {
-  const [pluginChoiceRequests, dispatchPluginChoiceRequests] = (0, import_react148.useReducer)(
+  const [pluginChoiceRequests, dispatchPluginChoiceRequests] = (0, import_react147.useReducer)(
     pluginChoiceRequestsReducer,
     []
   );
-  const addPluginChoiceRequest = (0, import_react148.useCallback)(
+  const addPluginChoiceRequest = (0, import_react147.useCallback)(
     (original) => {
       const wrappedRequest = {
         marketplaceName: original.marketplaceName,
@@ -41159,12 +41402,12 @@ var usePluginChoiceRequests = /* @__PURE__ */ __name(() => {
   };
 }, "usePluginChoiceRequests");
 var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd3) => {
-  const [extensionsUpdateState, dispatchExtensionStateUpdate] = (0, import_react148.useReducer)(
+  const [extensionsUpdateState, dispatchExtensionStateUpdate] = (0, import_react147.useReducer)(
     extensionUpdatesReducer,
     initialExtensionUpdatesState
   );
   const extensions = extensionManager.getLoadedExtensions();
-  (0, import_react148.useEffect)(() => {
+  (0, import_react147.useEffect)(() => {
     (async () => {
       const extensionsToCheck = extensions.filter((extension) => {
         const currentStatus = extensionsUpdateState.extensionStatuses.get(
@@ -41192,7 +41435,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd
     extensionsUpdateState.extensionStatuses,
     dispatchExtensionStateUpdate
   ]);
-  (0, import_react148.useEffect)(() => {
+  (0, import_react147.useEffect)(() => {
     if (extensionsUpdateState.batchChecksInProgress > 0) {
       return;
     }
@@ -41261,7 +41504,7 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd
       );
     }
   }, [extensions, extensionManager, extensionsUpdateState, addItem, cwd3]);
-  const extensionsUpdateStateComputed = (0, import_react148.useMemo)(() => {
+  const extensionsUpdateStateComputed = (0, import_react147.useMemo)(() => {
     const result = /* @__PURE__ */ new Map();
     for (const [
       key,
@@ -41280,11 +41523,11 @@ var useExtensionUpdates = /* @__PURE__ */ __name((extensionManager, addItem, cwd
 
 // packages/cli/src/ui/components/TranscriptView.tsx
 init_esbuild_shims();
-var import_react151 = __toESM(require_react(), 1);
+var import_react150 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/AlternateScreen.tsx
 init_esbuild_shims();
-var import_react149 = __toESM(require_react(), 1);
+var import_react148 = __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";
@@ -41297,7 +41540,7 @@ var AlternateScreen = /* @__PURE__ */ __name(({
 }) => {
   const writeRaw = useTerminalOutput();
   const { rows } = useTerminalSize();
-  (0, import_react149.useEffect)(() => {
+  (0, import_react148.useEffect)(() => {
     if (disabled || !process.stdout.isTTY) return;
     const safeWrite = /* @__PURE__ */ __name((data) => {
       try {
@@ -41318,7 +41561,7 @@ var AlternateScreen = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/shared/ErrorBoundary.tsx
 init_esbuild_shims();
-var import_react150 = __toESM(require_react(), 1);
+var import_react149 = __toESM(require_react(), 1);
 var import_jsx_runtime133 = __toESM(require_jsx_runtime(), 1);
 function normalizeError(error) {
   if (error instanceof Error) {
@@ -41327,7 +41570,7 @@ function normalizeError(error) {
   return new Error(String(error));
 }
 __name(normalizeError, "normalizeError");
-var ErrorBoundary = class extends import_react150.Component {
+var ErrorBoundary = class extends import_react149.Component {
   static {
     __name(this, "ErrorBoundary");
   }
@@ -41386,11 +41629,11 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
   const headerHeight = 1;
   const footerHeight = 1;
   const contentHeight = Math.max(rows - headerHeight - footerHeight, 1);
-  const estimatedItemHeight = (0, import_react151.useCallback)(
+  const estimatedItemHeight = (0, import_react150.useCallback)(
     (index) => estimateTranscriptItemHeight(items[index]),
     [items]
   );
-  const renderItem = (0, import_react151.useCallback)(
+  const renderItem = (0, import_react150.useCallback)(
     ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
       HistoryItemDisplay,
       {
@@ -41403,7 +41646,7 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     [columns]
   );
   const title = t("Transcript");
-  const content = (0, import_react151.useMemo)(
+  const content = (0, import_react150.useMemo)(
     () => /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(OverflowProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime134.jsx)(
       ScrollableListWithForwardRef,
       {
@@ -41418,7 +41661,7 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     ) }),
     [items, renderItem, estimatedItemHeight, contentHeight]
   );
-  const errorFallback = (0, import_react151.useCallback)(
+  const errorFallback = (0, import_react150.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) }),
@@ -41429,7 +41672,7 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     ] }),
     []
   );
-  const onRenderError = (0, import_react151.useCallback)((error, info) => {
+  const onRenderError = (0, import_react150.useCallback)((error, info) => {
     debugLogger39.error(
       `render error: ${error.message}`,
       info.componentStack ?? ""
@@ -41453,19 +41696,19 @@ var TranscriptViewImpl = /* @__PURE__ */ __name(({
     ] }) })
   ] }) });
 }, "TranscriptViewImpl");
-var TranscriptView = (0, import_react151.memo)(TranscriptViewImpl);
+var TranscriptView = (0, import_react150.memo)(TranscriptViewImpl);
 TranscriptView.displayName = "TranscriptView";
 
 // packages/cli/src/ui/hooks/useWelcomeBack.ts
 init_esbuild_shims();
-var import_react152 = __toESM(require_react(), 1);
+var import_react151 = __toESM(require_react(), 1);
 function useWelcomeBack(config, submitQuery, buffer, settings) {
-  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 () => {
+  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 () => {
     if (settings.ui?.enableWelcomeBack === false) {
       return;
     }
@@ -41484,7 +41727,7 @@ function useWelcomeBack(config, submitQuery, buffer, settings) {
       config.getDebugLogger().debug("Welcome back check failed:", error);
     }
   }, [config, settings.ui?.enableWelcomeBack]);
-  const handleWelcomeBackSelection = (0, import_react152.useCallback)(
+  const handleWelcomeBackSelection = (0, import_react151.useCallback)(
     (choice) => {
       setWelcomeBackChoice(choice);
       setShowWelcomeBackDialog(false);
@@ -41508,21 +41751,21 @@ function useWelcomeBack(config, submitQuery, buffer, settings) {
     },
     [config, welcomeBackInfo]
   );
-  const handleWelcomeBackClose = (0, import_react152.useCallback)(() => {
+  const handleWelcomeBackClose = (0, import_react151.useCallback)(() => {
     setWelcomeBackChoice("restart");
     setShowWelcomeBackDialog(false);
   }, []);
-  const clearInputFill = (0, import_react152.useCallback)(() => {
+  const clearInputFill = (0, import_react151.useCallback)(() => {
     setShouldFillInput(false);
     setInputFillText(null);
   }, []);
-  (0, import_react152.useEffect)(() => {
+  (0, import_react151.useEffect)(() => {
     if (shouldFillInput && inputFillText) {
       buffer.setText(inputFillText);
       clearInputFill();
     }
   }, [shouldFillInput, inputFillText, buffer, clearInputFill]);
-  (0, import_react152.useEffect)(() => {
+  (0, import_react151.useEffect)(() => {
     checkWelcomeBack();
   }, [checkWelcomeBack]);
   return {
@@ -41543,9 +41786,9 @@ __name(useWelcomeBack, "useWelcomeBack");
 
 // packages/cli/src/ui/hooks/useDialogClose.ts
 init_esbuild_shims();
-var import_react153 = __toESM(require_react(), 1);
+var import_react152 = __toESM(require_react(), 1);
 function useDialogClose(options) {
-  const closeAnyOpenDialog = (0, import_react153.useCallback)(() => {
+  const closeAnyOpenDialog = (0, import_react152.useCallback)(() => {
     if (options.isThemeDialogOpen) {
       options.handleThemeSelect(void 0, "User" /* User */);
       return true;
@@ -41617,14 +41860,14 @@ __name(useDialogClose, "useDialogClose");
 
 // packages/cli/src/ui/hooks/useInitializationAuthError.ts
 init_esbuild_shims();
-var import_react154 = __toESM(require_react(), 1);
+var import_react153 = __toESM(require_react(), 1);
 var useInitializationAuthError = /* @__PURE__ */ __name((authError, onAuthError) => {
-  const hasHandled = (0, import_react154.useRef)(false);
-  const authErrorRef = (0, import_react154.useRef)(authError);
-  const onAuthErrorRef = (0, import_react154.useRef)(onAuthError);
+  const hasHandled = (0, import_react153.useRef)(false);
+  const authErrorRef = (0, import_react153.useRef)(authError);
+  const onAuthErrorRef = (0, import_react153.useRef)(onAuthError);
   authErrorRef.current = authError;
   onAuthErrorRef.current = onAuthError;
-  (0, import_react154.useEffect)(() => {
+  (0, import_react153.useEffect)(() => {
     if (hasHandled.current) {
       return;
     }
@@ -41637,13 +41880,13 @@ var useInitializationAuthError = /* @__PURE__ */ __name((authError, onAuthError)
 
 // packages/cli/src/ui/hooks/useSubagentCreateDialog.ts
 init_esbuild_shims();
-var import_react155 = __toESM(require_react(), 1);
+var import_react154 = __toESM(require_react(), 1);
 function useSubagentCreateDialog() {
-  const [isSubagentCreateDialogOpen, setIsSubagentCreateDialogOpen] = (0, import_react155.useState)(false);
-  const openSubagentCreateDialog = (0, import_react155.useCallback)(() => {
+  const [isSubagentCreateDialogOpen, setIsSubagentCreateDialogOpen] = (0, import_react154.useState)(false);
+  const openSubagentCreateDialog = (0, import_react154.useCallback)(() => {
     setIsSubagentCreateDialogOpen(true);
   }, []);
-  const closeSubagentCreateDialog = (0, import_react155.useCallback)(() => {
+  const closeSubagentCreateDialog = (0, import_react154.useCallback)(() => {
     setIsSubagentCreateDialogOpen(false);
   }, []);
   return {
@@ -41656,13 +41899,13 @@ __name(useSubagentCreateDialog, "useSubagentCreateDialog");
 
 // packages/cli/src/ui/hooks/useAgentsManagerDialog.ts
 init_esbuild_shims();
-var import_react156 = __toESM(require_react(), 1);
+var import_react155 = __toESM(require_react(), 1);
 var useAgentsManagerDialog = /* @__PURE__ */ __name(() => {
-  const [isAgentsManagerDialogOpen, setIsAgentsManagerDialogOpen] = (0, import_react156.useState)(false);
-  const openAgentsManagerDialog = (0, import_react156.useCallback)(() => {
+  const [isAgentsManagerDialogOpen, setIsAgentsManagerDialogOpen] = (0, import_react155.useState)(false);
+  const openAgentsManagerDialog = (0, import_react155.useCallback)(() => {
     setIsAgentsManagerDialogOpen(true);
   }, []);
-  const closeAgentsManagerDialog = (0, import_react156.useCallback)(() => {
+  const closeAgentsManagerDialog = (0, import_react155.useCallback)(() => {
     setIsAgentsManagerDialogOpen(false);
   }, []);
   return {
@@ -41674,13 +41917,13 @@ var useAgentsManagerDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useSkillsManagerDialog.ts
 init_esbuild_shims();
-var import_react157 = __toESM(require_react(), 1);
+var import_react156 = __toESM(require_react(), 1);
 var useSkillsManagerDialog = /* @__PURE__ */ __name(() => {
-  const [isSkillsManagerDialogOpen, setIsSkillsManagerDialogOpen] = (0, import_react157.useState)(false);
-  const openSkillsManagerDialog = (0, import_react157.useCallback)(() => {
+  const [isSkillsManagerDialogOpen, setIsSkillsManagerDialogOpen] = (0, import_react156.useState)(false);
+  const openSkillsManagerDialog = (0, import_react156.useCallback)(() => {
     setIsSkillsManagerDialogOpen(true);
   }, []);
-  const closeSkillsManagerDialog = (0, import_react157.useCallback)(() => {
+  const closeSkillsManagerDialog = (0, import_react156.useCallback)(() => {
     setIsSkillsManagerDialogOpen(false);
   }, []);
   return {
@@ -41692,13 +41935,13 @@ var useSkillsManagerDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useExtensionsManagerDialog.ts
 init_esbuild_shims();
-var import_react158 = __toESM(require_react(), 1);
+var import_react157 = __toESM(require_react(), 1);
 var useExtensionsManagerDialog = /* @__PURE__ */ __name(() => {
-  const [isExtensionsManagerDialogOpen, setIsExtensionsManagerDialogOpen] = (0, import_react158.useState)(false);
-  const openExtensionsManagerDialog = (0, import_react158.useCallback)(() => {
+  const [isExtensionsManagerDialogOpen, setIsExtensionsManagerDialogOpen] = (0, import_react157.useState)(false);
+  const openExtensionsManagerDialog = (0, import_react157.useCallback)(() => {
     setIsExtensionsManagerDialogOpen(true);
   }, []);
-  const closeExtensionsManagerDialog = (0, import_react158.useCallback)(() => {
+  const closeExtensionsManagerDialog = (0, import_react157.useCallback)(() => {
     setIsExtensionsManagerDialogOpen(false);
   }, []);
   return {
@@ -41710,13 +41953,13 @@ var useExtensionsManagerDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useMcpDialog.ts
 init_esbuild_shims();
-var import_react159 = __toESM(require_react(), 1);
+var import_react158 = __toESM(require_react(), 1);
 var useMcpDialog = /* @__PURE__ */ __name(() => {
-  const [isMcpDialogOpen, setIsMcpDialogOpen] = (0, import_react159.useState)(false);
-  const openMcpDialog = (0, import_react159.useCallback)(() => {
+  const [isMcpDialogOpen, setIsMcpDialogOpen] = (0, import_react158.useState)(false);
+  const openMcpDialog = (0, import_react158.useCallback)(() => {
     setIsMcpDialogOpen(true);
   }, []);
-  const closeMcpDialog = (0, import_react159.useCallback)(() => {
+  const closeMcpDialog = (0, import_react158.useCallback)(() => {
     setIsMcpDialogOpen(false);
   }, []);
   return {
@@ -41728,13 +41971,13 @@ var useMcpDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useHooksDialog.ts
 init_esbuild_shims();
-var import_react160 = __toESM(require_react(), 1);
+var import_react159 = __toESM(require_react(), 1);
 var useHooksDialog = /* @__PURE__ */ __name(() => {
-  const [isHooksDialogOpen, setIsHooksDialogOpen] = (0, import_react160.useState)(false);
-  const openHooksDialog = (0, import_react160.useCallback)(() => {
+  const [isHooksDialogOpen, setIsHooksDialogOpen] = (0, import_react159.useState)(false);
+  const openHooksDialog = (0, import_react159.useCallback)(() => {
     setIsHooksDialogOpen(true);
   }, []);
-  const closeHooksDialog = (0, import_react160.useCallback)(() => {
+  const closeHooksDialog = (0, import_react159.useCallback)(() => {
     setIsHooksDialogOpen(false);
   }, []);
   return {
@@ -41746,23 +41989,23 @@ var useHooksDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useStatsDialog.ts
 init_esbuild_shims();
-var import_react161 = __toESM(require_react(), 1);
+var import_react160 = __toESM(require_react(), 1);
 var useStatsDialog = /* @__PURE__ */ __name(() => {
-  const [isStatsDialogOpen, setIsStatsDialogOpen] = (0, import_react161.useState)(false);
-  const openStatsDialog = (0, import_react161.useCallback)(() => setIsStatsDialogOpen(true), []);
-  const closeStatsDialog = (0, import_react161.useCallback)(() => setIsStatsDialogOpen(false), []);
+  const [isStatsDialogOpen, setIsStatsDialogOpen] = (0, import_react160.useState)(false);
+  const openStatsDialog = (0, import_react160.useCallback)(() => setIsStatsDialogOpen(true), []);
+  const closeStatsDialog = (0, import_react160.useCallback)(() => setIsStatsDialogOpen(false), []);
   return { isStatsDialogOpen, openStatsDialog, closeStatsDialog };
 }, "useStatsDialog");
 
 // packages/cli/src/ui/hooks/useMemoryDialog.ts
 init_esbuild_shims();
-var import_react162 = __toESM(require_react(), 1);
+var import_react161 = __toESM(require_react(), 1);
 var useMemoryDialog = /* @__PURE__ */ __name(() => {
-  const [isMemoryDialogOpen, setIsMemoryDialogOpen] = (0, import_react162.useState)(false);
-  const openMemoryDialog = (0, import_react162.useCallback)(() => {
+  const [isMemoryDialogOpen, setIsMemoryDialogOpen] = (0, import_react161.useState)(false);
+  const openMemoryDialog = (0, import_react161.useCallback)(() => {
     setIsMemoryDialogOpen(true);
   }, []);
-  const closeMemoryDialog = (0, import_react162.useCallback)(() => {
+  const closeMemoryDialog = (0, import_react161.useCallback)(() => {
     setIsMemoryDialogOpen(false);
   }, []);
   return {
@@ -41774,7 +42017,7 @@ var useMemoryDialog = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useAttentionNotifications.ts
 init_esbuild_shims();
-var import_react163 = __toESM(require_react(), 1);
+var import_react162 = __toESM(require_react(), 1);
 var LONG_TASK_NOTIFICATION_THRESHOLD_SECONDS = 20;
 var NOTIFICATION_TITLE = "Qwen Code";
 var useAttentionNotifications = /* @__PURE__ */ __name(({
@@ -41789,16 +42032,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_react163.useRef)(false);
-  const respondingElapsedRef = (0, import_react163.useRef)(0);
-  const idleNotificationSentRef = (0, import_react163.useRef)(false);
-  const awaitingToolName = (0, import_react163.useMemo)(() => {
+  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 awaitingTool = pendingToolCalls?.find(
       (tc) => tc.status === "awaiting_approval"
     );
     return awaitingTool?.request.name;
   }, [pendingToolCalls]);
-  (0, import_react163.useEffect)(() => {
+  (0, import_react162.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(
@@ -41819,7 +42062,7 @@ var useAttentionNotifications = /* @__PURE__ */ __name(({
     terminal,
     awaitingToolName
   ]);
-  (0, import_react163.useEffect)(() => {
+  (0, import_react162.useEffect)(() => {
     if (streamingState === "responding" /* Responding */) {
       respondingElapsedRef.current = elapsedTime;
       idleNotificationSentRef.current = false;
@@ -41972,7 +42215,7 @@ __name(buildTerminalNotification, "buildTerminalNotification");
 
 // packages/cli/src/ui/hooks/useContextualTips.ts
 init_esbuild_shims();
-var import_react164 = __toESM(require_react(), 1);
+var import_react163 = __toESM(require_react(), 1);
 function useContextualTips({
   streamingState,
   lastPromptTokenCount,
@@ -41982,9 +42225,9 @@ function useContextualTips({
   addItem,
   hideTips
 }) {
-  const prevStreamingState = (0, import_react164.useRef)("idle" /* Idle */);
-  const hadResponsePhase = (0, import_react164.useRef)(false);
-  (0, import_react164.useEffect)(() => {
+  const prevStreamingState = (0, import_react163.useRef)("idle" /* Idle */);
+  const hadResponsePhase = (0, import_react163.useRef)(false);
+  (0, import_react163.useEffect)(() => {
     if (streamingState === "responding" /* Responding */ || prevStreamingState.current === "responding" /* Responding */ && streamingState === "waiting_for_confirmation" /* WaitingForConfirmation */) {
       hadResponsePhase.current = true;
     }
@@ -42120,7 +42363,7 @@ function getResponseCandidateTokens(pendingGeminiHistoryItems) {
 __name(getResponseCandidateTokens, "getResponseCandidateTokens");
 function useStableStickyTodos(todos) {
   const renderKey = getStickyTodosRenderKey(todos);
-  const stableTodosRef = (0, import_react165.useRef)(null);
+  const stableTodosRef = (0, import_react164.useRef)(null);
   if (stableTodosRef.current?.renderKey !== renderKey) {
     stableTodosRef.current = { renderKey, todos };
   }
@@ -42150,30 +42393,30 @@ __name(shouldAutoOpenSkillReview, "shouldAutoOpenSkillReview");
 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_react165.useMemo)(
+  const { settings, config, initializationResult, initialUseVirtualViewport } = props;
+  const extensionRefreshState = (0, import_react164.useMemo)(
     () => props.extensionRefreshState ?? new ExtensionRefreshState(),
     [props.extensionRefreshState]
   );
   const historyManager = useHistory();
-  const historyRef = (0, import_react165.useRef)(historyManager.history);
+  const historyRef = (0, import_react164.useRef)(historyManager.history);
   historyRef.current = historyManager.history;
   useMemoryMonitor(historyManager);
-  const [debugMessage, setDebugMessage] = (0, import_react165.useState)("");
-  const [quittingMessages, setQuittingMessages] = (0, import_react165.useState)(null);
-  const [themeError, setThemeError] = (0, import_react165.useState)(
+  const [debugMessage, setDebugMessage] = (0, import_react164.useState)("");
+  const [quittingMessages, setQuittingMessages] = (0, import_react164.useState)(null);
+  const [themeError, setThemeError] = (0, import_react164.useState)(
     initializationResult.themeError
   );
-  const [isProcessing, setIsProcessing] = (0, import_react165.useState)(false);
-  const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react165.useState)(false);
-  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react165.useState)(
+  const [isProcessing, setIsProcessing] = (0, import_react164.useState)(false);
+  const [embeddedShellFocused, setEmbeddedShellFocused] = (0, import_react164.useState)(false);
+  const [geminiMdFileCount, setGeminiMdFileCount] = (0, import_react164.useState)(
     initializationResult.geminiMdFileCount
   );
-  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)(
+  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)(
     config.isTrustedFolder()
   );
   const extensionManager = config.getExtensionManager();
@@ -42232,31 +42475,31 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     config,
     historyManager.addItem
   );
-  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)(
+  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)(
     () => setPermissionsDialogOpen(true),
     []
   );
-  const closePermissionsDialog = (0, import_react165.useCallback)(
+  const closePermissionsDialog = (0, import_react164.useCallback)(
     () => setPermissionsDialogOpen(false),
     []
   );
-  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 [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 isTranscriptOpen = transcriptFreeze != null;
-  const isTranscriptOpenRef = (0, import_react165.useRef)(isTranscriptOpen);
+  const isTranscriptOpenRef = (0, import_react164.useRef)(isTranscriptOpen);
   isTranscriptOpenRef.current = isTranscriptOpen;
-  const closeTranscript = (0, import_react165.useCallback)(() => {
+  const closeTranscript = (0, import_react164.useCallback)(() => {
     setTranscriptFreeze(null);
   }, []);
-  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) => {
+  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) => {
     setExpandedThoughtHeadIds((prev) => {
       const next = new Set(prev);
       if (next.has(headId)) {
@@ -42270,10 +42513,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_react165.useCallback)((data) => {
-    process16.stdout.write(data);
+  const writeRaw = (0, import_react164.useCallback)((data) => {
+    process17.stdout.write(data);
   }, []);
-  const terminal = (0, import_react165.useMemo)(
+  const terminal = (0, import_react164.useMemo)(
     () => buildTerminalNotification(writeRaw),
     [writeRaw]
   );
@@ -42287,10 +42530,10 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   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)(
+  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)(
     () => worktreeSession ? {
       slug: worktreeSession.slug,
       branch: worktreeSession.worktreeBranch,
@@ -42301,20 +42544,20 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     } : null,
     [worktreeSession]
   );
-  const mainControlsRef = (0, import_react165.useRef)(null);
-  const lastTitleRef = (0, import_react165.useRef)(null);
-  const [startupWarnings, setStartupWarnings] = (0, import_react165.useState)(
+  const mainControlsRef = (0, import_react164.useRef)(null);
+  const lastTitleRef = (0, import_react164.useRef)(null);
+  const [startupWarnings, setStartupWarnings] = (0, import_react164.useState)(
     () => props.startupWarnings || []
   );
   const staticExtraHeight = 3;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.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_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     (async () => {
       profileCheckpoint("config_initialize_start");
       await config.initialize();
@@ -42404,7 +42647,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       await ideClient.disconnect();
     });
   }, [config]);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (!isConfigInitialized) return void 0;
     const geminiClient2 = config.getGeminiClient();
     if (!geminiClient2) return void 0;
@@ -42468,11 +42711,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       clearTimeout(finalizeCap);
     };
   }, [isConfigInitialized, config]);
-  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 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 handler = setUpdateHandler(
       historyManager.addItem,
       setUpdateInfo,
@@ -42481,13 +42724,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     updateHandlerRef.current = handler;
     return () => handler?.cleanup();
   }, [historyManager.addItem]);
-  const { inputWidth, suggestionsWidth } = (0, import_react165.useMemo)(() => {
+  const { inputWidth, suggestionsWidth } = (0, import_react164.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_react165.useCallback)((filePath) => {
+  const isValidPath = (0, import_react164.useCallback)((filePath) => {
     try {
       return fs20.existsSync(filePath) && fs20.statSync(filePath).isFile();
     } catch (_e) {
@@ -42495,6 +42738,27 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }
   }, []);
   const preferredEditor = usePreferredEditor();
+  const restoredSubmissionRef = (0, import_react164.useRef)(null);
+  const submittedPromptProvenanceUnavailableRef = (0, import_react164.useRef)(false);
+  const setBufferTextRef = (0, import_react164.useRef)(null);
+  const invalidateSubmittedPromptProvenance = (0, import_react164.useCallback)(() => {
+    restoredSubmissionRef.current = null;
+    submittedPromptProvenanceUnavailableRef.current = true;
+  }, []);
+  const handleBufferChange = (0, import_react164.useCallback)((text) => {
+    if (text.length === 0) {
+      if (restoredSubmissionRef.current !== null || submittedPromptProvenanceUnavailableRef.current) {
+        setBufferTextRef.current?.("", { clearUndoHistory: true });
+      }
+      restoredSubmissionRef.current = null;
+      submittedPromptProvenanceUnavailableRef.current = false;
+      return;
+    }
+    if (restoredSubmissionRef.current !== null && restoredSubmissionRef.current.modelText !== text) {
+      restoredSubmissionRef.current = null;
+      submittedPromptProvenanceUnavailableRef.current = true;
+    }
+  }, []);
   const buffer = useTextBuffer({
     initialText: "",
     viewport: { height: 10, width: inputWidth },
@@ -42502,22 +42766,25 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     setRawMode,
     isValidPath,
     shellModeActive,
-    preferredEditor
+    preferredEditor,
+    onChange: handleBufferChange
   });
-  const restoredPromptStashTargetsRef = (0, import_react165.useRef)(/* @__PURE__ */ new Set());
+  const setBufferText = buffer.setText;
+  setBufferTextRef.current = setBufferText;
+  const restoredPromptStashTargetsRef = (0, import_react164.useRef)(/* @__PURE__ */ new Set());
   const promptStashTargetDir = config.getTargetDir();
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (restoredPromptStashTargetsRef.current.has(promptStashTargetDir)) {
       return;
     }
     restoredPromptStashTargetsRef.current.add(promptStashTargetDir);
-    restorePromptStash(
-      promptStashTargetDir,
-      buffer.text,
-      (text) => buffer.setText(text)
-    );
+    restorePromptStash(promptStashTargetDir, buffer.text, (text) => {
+      restoredSubmissionRef.current = null;
+      submittedPromptProvenanceUnavailableRef.current = true;
+      buffer.setText(text);
+    });
   }, [buffer, promptStashTargetDir]);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     const fetchUserMessages = /* @__PURE__ */ __name(async () => {
       const pastMessagesRaw = await logger?.getPreviousUserMessages() || [];
       const currentSessionUserMessages = realUserPromptTexts(
@@ -42531,12 +42798,18 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }, "fetchUserMessages");
     fetchUserMessages();
   }, [historyManager.history, logger]);
-  const remountStaticHistory = (0, import_react165.useCallback)(() => {
+  const remountStaticHistory = (0, import_react164.useCallback)(() => {
     setHistoryRemountKey((prev) => prev + 1);
   }, []);
-  const useTerminalBuffer = settings.merged.ui?.useTerminalBuffer ?? false;
+  const [useTerminalBuffer] = (0, import_react164.useState)(
+    () => initialUseVirtualViewport ?? shouldUseVirtualViewport(
+      settings.merged.ui?.useTerminalBuffer,
+      config.getScreenReader(),
+      isInteractiveTerminal()
+    )
+  );
   const showScrollbar = settings.merged.ui?.showScrollbar ?? true;
-  const refreshStatic = (0, import_react165.useCallback)(() => {
+  const refreshStatic = (0, import_react164.useCallback)(() => {
     if (isTranscriptOpenRef.current) {
       return;
     }
@@ -42545,15 +42818,15 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }
     remountStaticHistory();
   }, [useTerminalBuffer, remountStaticHistory, stdout]);
-  const prevTranscriptOpenRef = (0, import_react165.useRef)(isTranscriptOpen);
+  const prevTranscriptOpenRef = (0, import_react164.useRef)(isTranscriptOpen);
   const wasOpenPrevRender = prevTranscriptOpenRef.current;
   prevTranscriptOpenRef.current = isTranscriptOpen;
-  const transcriptCloseCountRef = (0, import_react165.useRef)(0);
+  const transcriptCloseCountRef = (0, import_react164.useRef)(0);
   if (wasOpenPrevRender && !isTranscriptOpen) {
     transcriptCloseCountRef.current += 1;
   }
   const transcriptCloseCount = transcriptCloseCountRef.current;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (transcriptCloseCount === 0 || useTerminalBuffer) {
       return void 0;
     }
@@ -42566,8 +42839,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }, 0);
     return () => clearTimeout(id);
   }, [transcriptCloseCount, useTerminalBuffer, stdout, remountStaticHistory]);
-  const lastNotifiedModelRef = (0, import_react165.useRef)(currentModel);
-  (0, import_react165.useEffect)(() => {
+  const lastNotifiedModelRef = (0, import_react164.useRef)(currentModel);
+  (0, import_react164.useEffect)(() => {
     const unsubscribe = config.onModelChange((model) => {
       if (lastNotifiedModelRef.current === model) {
         return;
@@ -42605,7 +42878,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const { onAuthError, openAuthDialog, closeAuthDialog } = authActions;
   const { isAuthDialogOpen, isAuthenticating, pendingAuthType } = authState;
   useInitializationAuthError(initializationResult.authError, onAuthError);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     const currentAuthType = config.getModelsConfig().getCurrentAuthType();
     if (settings.merged.security?.auth?.enforcedType && currentAuthType && settings.merged.security?.auth.enforcedType !== currentAuthType) {
       onAuthError(
@@ -42619,7 +42892,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       );
     }
   }, [settings.merged.security?.auth?.enforcedType, config, onAuthError]);
-  const [editorError, setEditorError] = (0, import_react165.useState)(null);
+  const [editorError, setEditorError] = (0, import_react164.useState)(null);
   const {
     isEditorDialogOpen,
     openEditorDialog,
@@ -42627,18 +42900,18 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     exitEditorDialog
   } = useEditorSettings(settings, setEditorError, historyManager.addItem);
   const { isSettingsDialogOpen, openSettingsDialog, closeSettingsDialog } = useSettingsCommand();
-  const [isStatusLineDialogOpen, setStatusLineDialogOpen] = (0, import_react165.useState)(false);
-  const openStatusLineDialog = (0, import_react165.useCallback)(
+  const [isStatusLineDialogOpen, setStatusLineDialogOpen] = (0, import_react164.useState)(false);
+  const openStatusLineDialog = (0, import_react164.useCallback)(
     () => setStatusLineDialogOpen(true),
     []
   );
-  const closeStatusLineDialog = (0, import_react165.useCallback)(
+  const closeStatusLineDialog = (0, import_react164.useCallback)(
     () => setStatusLineDialogOpen(false),
     []
   );
-  const [statusLineSettingsVersion, setStatusLineSettingsVersion] = (0, import_react165.useState)(0);
-  const [statusLineConfigOverride, setStatusLineConfigOverride] = (0, import_react165.useState)(void 0);
-  const notifyStatusLineSettingsChanged = (0, import_react165.useCallback)(
+  const [statusLineSettingsVersion, setStatusLineSettingsVersion] = (0, import_react164.useState)(0);
+  const [statusLineConfigOverride, setStatusLineConfigOverride] = (0, import_react164.useState)(void 0);
+  const notifyStatusLineSettingsChanged = (0, import_react164.useCallback)(
     (newConfig) => {
       setStatusLineConfigOverride(newConfig);
       setStatusLineSettingsVersion((version) => version + 1);
@@ -42657,8 +42930,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     closeModelDialog
   } = useModelCommand();
   const { activeArenaDialog, openArenaDialog, closeArenaDialog } = useArenaCommand();
-  const [sessionName, setSessionName] = (0, import_react165.useState)(null);
-  (0, import_react165.useEffect)(() => {
+  const [sessionName, setSessionName] = (0, import_react164.useState)(null);
+  (0, import_react164.useEffect)(() => {
     const chatRecordingService = config.getChatRecordingService();
     if (!chatRecordingService?.setTitleRecordedCallback) return;
     const existingCallback = chatRecordingService.getTitleRecordedCallback();
@@ -42675,7 +42948,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     };
   }, [config]);
   const addHistoryItem = historyManager.addItem;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (typeof config.onChatRecordingFailure !== "function") return;
     return config.onChatRecordingFailure(() => {
       addHistoryItem(
@@ -42719,12 +42992,17 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     config,
     addItem: historyManager.addItem
   });
-  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 [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 { vimEnabled, vimMode } = useVimModeState();
   const { toggleVimEnabled } = useVimModeActions();
+  (0, import_react164.useLayoutEffect)(() => {
+    if (vimEnabled && buffer.text.length > 0) {
+      invalidateSubmittedPromptProvenance();
+    }
+  }, [buffer.text, invalidateSubmittedPromptProvenance, vimEnabled]);
   const {
     isSubagentCreateDialogOpen,
     openSubagentCreateDialog,
@@ -42748,31 +43026,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_react165.useRef)(() => {
+  const openRewindSelectorRef = (0, import_react164.useRef)(() => {
   });
-  const cancelOngoingRequestRef = (0, import_react165.useRef)(() => {
+  const cancelOngoingRequestRef = (0, import_react164.useRef)(() => {
   });
-  const [isDiffDialogOpen, setIsDiffDialogOpen] = (0, import_react165.useState)(false);
-  const openDiffDialog = (0, import_react165.useCallback)(() => {
+  const [isDiffDialogOpen, setIsDiffDialogOpen] = (0, import_react164.useState)(false);
+  const openDiffDialog = (0, import_react164.useCallback)(() => {
     setIsDiffDialogOpen(true);
   }, []);
-  const closeDiffDialog = (0, import_react165.useCallback)(() => {
+  const closeDiffDialog = (0, import_react164.useCallback)(() => {
     setIsDiffDialogOpen(false);
   }, []);
-  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)(() => {
+  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)(() => {
     if (skillReviewPending) {
       skillReviewDismissedTaskIdsRef.current.add(skillReviewPending.taskId);
     }
     setIsSkillReviewDialogOpen(false);
   }, [skillReviewPending]);
-  const closeSkillReviewDialog = (0, import_react165.useCallback)(
+  const closeSkillReviewDialog = (0, import_react164.useCallback)(
     () => setIsSkillReviewDialogOpen(false),
     []
   );
-  const acceptPendingSkill = (0, import_react165.useCallback)(
+  const acceptPendingSkill = (0, import_react164.useCallback)(
     (skillName) => {
       if (!skillReviewPending) return;
       void config.getMemoryManager().acceptPendingSkillFromTask(skillReviewPending.taskId, skillName).catch(() => {
@@ -42780,7 +43058,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     },
     [config, skillReviewPending]
   );
-  const rejectPendingSkill = (0, import_react165.useCallback)(
+  const rejectPendingSkill = (0, import_react164.useCallback)(
     (skillName) => {
       if (!skillReviewPending) return;
       void config.getMemoryManager().rejectPendingSkillFromTask(skillReviewPending.taskId, skillName).catch(() => {
@@ -42788,7 +43066,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     },
     [config, skillReviewPending]
   );
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     const mgr = config.getMemoryManager();
     const projectRoot = config.getProjectRoot();
     let lastSig = "";
@@ -42822,7 +43100,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     refresh();
     return unsub;
   }, [config]);
-  const slashCommandActions = (0, import_react165.useMemo)(
+  const slashCommandActions = (0, import_react164.useMemo)(
     () => ({
       openAuthDialog,
       openThemeDialog,
@@ -42846,7 +43124,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         config.getGeminiClient()?.requestShutdown();
         setTimeout(async () => {
           await runExitCleanup();
-          process16.exit(0);
+          process17.exit(0);
         }, 100);
       }, "quit"),
       setDebugMessage,
@@ -42932,13 +43210,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     setSessionName,
     extensionRefreshState
   );
-  const onDebugMessage = (0, import_react165.useCallback)(
+  const onDebugMessage = (0, import_react164.useCallback)(
     (message) => {
       config.getDebugLogger().debug(message);
     },
     [config]
   );
-  const handleWorktreeExit = (0, import_react165.useCallback)(
+  const handleWorktreeExit = (0, import_react164.useCallback)(
     async (choice) => {
       if (choice === "cancel") {
         setShowWorktreeExitDialog(false);
@@ -43003,7 +43281,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     },
     [activeWorktree, config, handleSlashCommand, historyManager]
   );
-  const performMemoryRefresh = (0, import_react165.useCallback)(async () => {
+  const performMemoryRefresh = (0, import_react164.useCallback)(async () => {
     if (config.isSafeMode()) {
       config.setUserMemory("");
       config.setGeminiMdFileCount(0);
@@ -43029,7 +43307,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     );
     try {
       const { memoryContent, fileCount, conditionalRules, projectRoot } = await loadHierarchicalGeminiMemory(
-        process16.cwd(),
+        process17.cwd(),
         settings.merged.context?.loadFromIncludeDirectories ? config.getWorkspaceContext().getDirectories() : [],
         config.getFileService(),
         config.getExtensionContextFilePaths(),
@@ -43075,10 +43353,10 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       debugLogger40.error("Error refreshing memory:", error);
     }
   }, [config, historyManager, settings.merged]);
-  const cancelHandlerRef = (0, import_react165.useRef)(() => {
+  const cancelHandlerRef = (0, import_react164.useRef)(() => {
   });
-  const midTurnDrainRef = (0, import_react165.useRef)(null);
-  const midTurnRestoreRef = (0, import_react165.useRef)(null);
+  const midTurnDrainRef = (0, import_react164.useRef)(null);
+  const midTurnRestoreRef = (0, import_react164.useRef)(null);
   const {
     streamingState,
     submitQuery,
@@ -43121,13 +43399,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   );
   cancelOngoingRequestRef.current = cancelOngoingRequest;
   isIdleRef.current = streamingState === "idle" /* Idle */;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (streamingState === "idle" /* Idle */) {
       updateHandlerRef.current?.flush();
       setWorkflowKeywordActive(false);
     }
   }, [streamingState]);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (shouldAutoOpenSkillReview({
       pending: skillReviewPending,
       streamingState,
@@ -43139,7 +43417,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }
   }, [skillReviewPending, streamingState, isMemoryDialogOpen, config]);
   const tipsDisabled = !!(settings.merged.ui?.hideTips || config.getScreenReader());
-  const tipHistory = (0, import_react165.useMemo)(
+  const tipHistory = (0, import_react164.useMemo)(
     () => tipsDisabled ? null : getTipHistory(),
     [tipsDisabled]
   );
@@ -43152,7 +43430,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     addItem: historyManager.addItem,
     hideTips: tipsDisabled
   });
-  const [hasTabConsumer, setHasTabConsumer] = (0, import_react165.useState)(false);
+  const [hasTabConsumer, setHasTabConsumer] = (0, import_react164.useState)(false);
   const agentViewState = useAgentViewState();
   const {
     dialogOpen: bgTasksDialogOpen,
@@ -43160,11 +43438,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     livePanelFocused: bgLivePanelFocused
   } = useBackgroundTaskViewState();
   const { closeDialog: closeBgTasksDialog } = useBackgroundTaskViewActions();
-  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)(() => {
+  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)(() => {
     suggestionAbortRef.current?.abort();
     suggestionAbortRef.current = null;
     if (speculationRef.current.status !== "idle") {
@@ -43188,26 +43466,42 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     popAllMessages,
     restoreMessages,
     drainQueue,
-    popNextSegment
+    popNextTurn
   } = useMessageQueue();
+  const submitUserQuery = (0, import_react164.useCallback)(
+    (submission) => submitQuery(
+      submission.modelText,
+      "userQuery" /* UserQuery */,
+      void 0,
+      submission.submittedPrompt === void 0 ? void 0 : { submittedPrompt: submission.submittedPrompt }
+    ),
+    [submitQuery]
+  );
+  const popAllQueuedMessages = (0, import_react164.useCallback)(() => {
+    const submission = popAllMessages();
+    if (submission === null) return null;
+    restoredSubmissionRef.current = submission;
+    submittedPromptProvenanceUnavailableRef.current = false;
+    return submission.modelText;
+  }, [popAllMessages]);
   midTurnDrainRef.current = drainQueue;
   midTurnRestoreRef.current = restoreMessages;
   const remoteInput = useRemoteInput();
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (!remoteInput) return;
     remoteInput.setSubmitFn((text) => submitQuery(text));
   }, [remoteInput, submitQuery]);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (!remoteInput) return;
     if (streamingState === "idle" /* Idle */) {
       remoteInput.notifyIdle();
     }
   }, [remoteInput, streamingState]);
   const dualOutput = useDualOutput();
-  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)(() => {
+  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)(() => {
     if (!dualOutput || !dualOutput.isConnected) return;
     for (const tc of pendingToolCalls) {
       if (tc.status === "awaiting_approval" && !confirmEmitted.current.has(tc.request.callId)) {
@@ -43236,11 +43530,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       }
     }
   }, [dualOutput, pendingToolCalls]);
-  const pendingToolCallsRef = (0, import_react165.useRef)(pendingToolCalls);
+  const pendingToolCallsRef = (0, import_react164.useRef)(pendingToolCalls);
   pendingToolCallsRef.current = pendingToolCalls;
-  const dualOutputRef = (0, import_react165.useRef)(dualOutput);
+  const dualOutputRef = (0, import_react164.useRef)(dualOutput);
   dualOutputRef.current = dualOutput;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (!remoteInput) return;
     remoteInput.setConfirmationHandler(
       (requestId, allowed) => {
@@ -43280,8 +43574,22 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       });
     };
   }, [remoteInput]);
-  const handleFinalSubmit = (0, import_react165.useCallback)(
+  const handleFinalSubmit = (0, import_react164.useCallback)(
     (submittedValue, options) => {
+      const consumesComposerState = options !== void 0;
+      const restoredSubmission = consumesComposerState ? restoredSubmissionRef.current : null;
+      const submittedPromptProvenanceUnavailable = consumesComposerState && submittedPromptProvenanceUnavailableRef.current;
+      if (consumesComposerState) {
+        restoredSubmissionRef.current = null;
+        submittedPromptProvenanceUnavailableRef.current = false;
+      }
+      const submittedPromptCandidate = options?.submittedPrompt;
+      const provenanceEnabled = !vimEnabled && submittedPromptCandidate !== void 0;
+      const trimmedSubmittedPrompt = submittedPromptCandidate?.trim();
+      const submittedPrompt = submittedPromptProvenanceUnavailable || !provenanceEnabled ? void 0 : restoredSubmission === null ? trimmedSubmittedPrompt || void 0 : restoredSubmission.modelText === submittedValue ? restoredSubmission.submittedPrompt : void 0;
+      if (restoredSubmission !== null || submittedPromptProvenanceUnavailable) {
+        setBufferText("", { clearUndoHistory: true });
+      }
       if (agentViewState.activeView !== "main") {
         const agent = agentViewState.agents.get(agentViewState.activeView);
         if (agent) {
@@ -43327,11 +43635,14 @@ ${buildWorkflowSteeringNotice()}
 ` + submittedValue;
       }
       if (options?.deferUntilIdle) {
-        addMessage(submittedValue, true);
+        addMessage(submittedValue, true, submittedPrompt);
         return;
       }
       if (streamingState === "responding" /* Responding */ && isBtwCommand(submittedValue)) {
-        void submitQuery(submittedValue);
+        void submitUserQuery({
+          modelText: submittedValue,
+          submittedPrompt
+        });
         return;
       }
       const spec = speculationRef.current;
@@ -43405,7 +43716,7 @@ ${buildWorkflowSteeringNotice()}
             setPromptSuggestion(result.nextSuggestion);
           }
         }).catch(() => {
-          addMessage(submittedValue);
+          addMessage(submittedValue, false, submittedPrompt);
         });
         speculationRef.current = IDLE_SPECULATION;
         return;
@@ -43416,25 +43727,30 @@ ${buildWorkflowSteeringNotice()}
         speculationRef.current = IDLE_SPECULATION;
       }
       if (streamingState === "idle" /* Idle */ && !isProcessing && isSlashCommand(submittedValue)) {
-        void submitQuery(submittedValue);
+        void submitUserQuery({
+          modelText: submittedValue,
+          submittedPrompt
+        });
         return;
       }
-      addMessage(submittedValue);
+      addMessage(submittedValue, false, submittedPrompt);
     },
     [
       addMessage,
       agentViewState,
       streamingState,
       isProcessing,
-      submitQuery,
+      submitUserQuery,
       handleSlashCommand,
       config,
       geminiClient,
       historyManager,
-      settings.merged.ui?.disableWorkflowKeywordTrigger
+      settings.merged.ui?.disableWorkflowKeywordTrigger,
+      setBufferText,
+      vimEnabled
     ]
   );
-  const handleArenaModelsSelected = (0, import_react165.useCallback)(
+  const handleArenaModelsSelected = (0, import_react164.useCallback)(
     (models) => {
       const value = models.join(",");
       buffer.setText(`/arena start --models ${value} `);
@@ -43449,15 +43765,15 @@ ${buildWorkflowSteeringNotice()}
     handleWelcomeBackSelection,
     handleWelcomeBackClose
   } = useWelcomeBack(config, handleFinalSubmit, buffer, settings.merged);
-  const pendingHistoryItems = (0, import_react165.useMemo)(
+  const pendingHistoryItems = (0, import_react164.useMemo)(
     () => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems],
     [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]
   );
-  const historyForTranscriptRef = (0, import_react165.useRef)(historyManager.history);
+  const historyForTranscriptRef = (0, import_react164.useRef)(historyManager.history);
   historyForTranscriptRef.current = historyManager.history;
-  const pendingForTranscriptRef = (0, import_react165.useRef)(pendingHistoryItems);
+  const pendingForTranscriptRef = (0, import_react164.useRef)(pendingHistoryItems);
   pendingForTranscriptRef.current = pendingHistoryItems;
-  const openTranscript = (0, import_react165.useCallback)(() => {
+  const openTranscript = (0, import_react164.useCallback)(() => {
     setTranscriptFreeze({
       // Share MainContent's visibility predicate so the transcript shows exactly
       // what the main view shows. Items collapsed on session resume
@@ -43469,7 +43785,7 @@ ${buildWorkflowSteeringNotice()}
       pendingItems: [...pendingForTranscriptRef.current]
     });
   }, []);
-  const transcriptItems = (0, import_react165.useMemo)(() => {
+  const transcriptItems = (0, import_react164.useMemo)(() => {
     if (!transcriptFreeze) return EMPTY_HISTORY_ITEMS;
     return [
       ...transcriptFreeze.committedItems,
@@ -43481,7 +43797,7 @@ ${buildWorkflowSteeringNotice()}
       }))
     ];
   }, [transcriptFreeze]);
-  const rawStickyTodos = (0, import_react165.useMemo)(
+  const rawStickyTodos = (0, import_react164.useMemo)(
     () => getStickyTodos(historyManager.history, pendingHistoryItems),
     [historyManager.history, pendingHistoryItems]
   );
@@ -43489,7 +43805,7 @@ ${buildWorkflowSteeringNotice()}
   const hasExecutingTool = isToolExecuting(pendingHistoryItems);
   const hasPendingCompression = isCompressionPending(pendingHistoryItems);
   useTerminalProgress(streamingState, hasExecutingTool);
-  cancelHandlerRef.current = (0, import_react165.useCallback)(
+  cancelHandlerRef.current = (0, import_react164.useCallback)(
     (info) => {
       const pendingHistoryItems2 = [
         ...pendingSlashCommandHistoryItems,
@@ -43501,9 +43817,13 @@ ${buildWorkflowSteeringNotice()}
       const draftWasEmpty = buffer.text.length === 0;
       const popped = popAllMessages();
       if (popped) {
+        restoredSubmissionRef.current = popped;
+        submittedPromptProvenanceUnavailableRef.current = false;
         const currentText = buffer.text;
-        buffer.setText(currentText ? `${popped}
-${currentText}` : popped);
+        buffer.setText(
+          currentText ? `${popped.modelText}
+${currentText}` : popped.modelText
+        );
       }
       if (!draftWasEmpty) {
         debugLogger40.debug("auto-restore bail: buffer was non-empty");
@@ -43522,6 +43842,14 @@ ${currentText}` : popped);
         );
         return;
       }
+      const restoreCancelledPrompt = /* @__PURE__ */ __name(() => {
+        restoredSubmissionRef.current = {
+          modelText: cancelledTurnUserItem.text,
+          ...cancelledTurnUserItem.submittedPrompt === void 0 ? {} : { submittedPrompt: cancelledTurnUserItem.submittedPrompt }
+        };
+        submittedPromptProvenanceUnavailableRef.current = false;
+        buffer.setText(cancelledTurnUserItem.text);
+      }, "restoreCancelledPrompt");
       if (pendingHistoryItems2.some((item) => item.type === "tool_group")) {
         debugLogger40.debug(
           "auto-restore bail: tool execution is pending or committed"
@@ -43532,7 +43860,7 @@ ${currentText}` : popped);
         debugLogger40.debug(
           "auto-restore: preserving streamed output and restoring prompt text"
         );
-        buffer.setText(cancelledTurnUserItem.text);
+        restoreCancelledPrompt();
         return;
       }
       if (pendingHistoryItems2.some((item) => !isSyntheticHistoryItem(item))) {
@@ -43551,7 +43879,7 @@ ${currentText}` : popped);
         debugLogger40.debug(
           "auto-restore: preserving committed output and restoring prompt text"
         );
-        buffer.setText(cancelledTurnUserItem.text);
+        restoreCancelledPrompt();
         return;
       }
       const lastUserItem = history[lastUserIdx];
@@ -43572,11 +43900,13 @@ ${currentText}` : popped);
       );
       historyManager.truncateToItem(lastUserItem.id);
       refreshStatic();
-      buffer.setText(lastUserItem.text);
+      restoreCancelledPrompt();
       geminiClient?.stripOrphanedUserEntriesFromHistory?.();
-      void logger?.removeLastUserMessage().catch((err) => {
-        debugLogger40.debug("Failed to undo cancelled prompt from log:", err);
-      });
+      if (info?.canUndoLastLoggedUserMessage) {
+        void logger?.removeLastUserMessage().catch((err) => {
+          debugLogger40.debug("Failed to undo cancelled prompt from log:", err);
+        });
+      }
     },
     [
       buffer,
@@ -43589,7 +43919,7 @@ ${currentText}` : popped);
       pendingGeminiHistoryItems
     ]
   );
-  const handleClearScreen = (0, import_react165.useCallback)(() => {
+  const handleClearScreen = (0, import_react164.useCallback)(() => {
     historyManager.clearItems();
     clearScreen();
     remountStaticHistory();
@@ -43612,13 +43942,13 @@ ${currentText}` : popped);
     history: historyManager.history,
     awayThresholdMinutes: settings.merged.general?.sessionRecapAwayThresholdMinutes
   });
-  const contextFileNames = (0, import_react165.useMemo)(() => {
+  const contextFileNames = (0, import_react164.useMemo)(() => {
     const fromSettings = settings.merged.context?.fileName;
     return fromSettings ? Array.isArray(fromSettings) ? fromSettings : [fromSettings] : getAllGeminiMdFilenames();
   }, [settings.merged.context?.fileName]);
-  const initialPrompt = (0, import_react165.useMemo)(() => config.getQuestion(), [config]);
-  const initialPromptSubmitted = (0, import_react165.useRef)(false);
-  (0, import_react165.useEffect)(() => {
+  const initialPrompt = (0, import_react164.useMemo)(() => config.getQuestion(), [config]);
+  const initialPromptSubmitted = (0, import_react164.useRef)(false);
+  (0, import_react164.useEffect)(() => {
     if (initialPrompt && isConfigInitialized && !initialPromptSubmitted.current && !isAuthenticating && !isAuthDialogOpen && !isThemeDialogOpen && !isEditorDialogOpen && !showWelcomeBackDialog && welcomeBackChoice !== "restart" && geminiClient?.isInitialized?.()) {
       handleFinalSubmit(initialPrompt);
       initialPromptSubmitted.current = true;
@@ -43636,7 +43966,7 @@ ${currentText}` : popped);
     geminiClient
   ]);
   const followupSuggestionsEnabled = settings.merged.ui?.enableFollowupSuggestions !== false;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (!followupSuggestionsEnabled) {
       suggestionAbortRef.current?.abort();
       setPromptSuggestion(null);
@@ -43705,17 +44035,17 @@ ${currentText}` : popped);
     isPermissionsDialogOpen,
     settingInputRequests
   ]);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (!promptSuggestion && speculationRef.current.status !== "idle") {
       abortSpeculation(speculationRef.current).catch(() => {
       });
       speculationRef.current = IDLE_SPECULATION;
     }
   }, [promptSuggestion]);
-  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 [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 getIde = /* @__PURE__ */ __name(async () => {
       const ideClient = await IdeClient.getInstance();
       const currentIde = ideClient.getCurrentIde();
@@ -43731,40 +44061,40 @@ ${currentText}` : popped);
     tomlFiles: commandMigrationTomlFiles,
     setShowMigrationNudge: setShowCommandMigrationNudge
   } = useCommandMigration(settings, config.storage);
-  const [showToolDescriptions, setShowToolDescriptions] = (0, import_react165.useState)(false);
+  const [showToolDescriptions, setShowToolDescriptions] = (0, import_react164.useState)(false);
   const configuredRenderMode = settings.merged.ui?.renderMode;
-  const [renderMode, setRenderMode] = (0, import_react165.useState)(
+  const [renderMode, setRenderMode] = (0, import_react164.useState)(
     configuredRenderMode === "raw" ? "raw" : "render"
   );
-  const renderModeConfigMountedRef = (0, import_react165.useRef)(false);
-  (0, import_react165.useEffect)(() => {
+  const renderModeConfigMountedRef = (0, import_react164.useRef)(false);
+  (0, import_react164.useEffect)(() => {
     if (!renderModeConfigMountedRef.current) {
       renderModeConfigMountedRef.current = true;
       return;
     }
     setRenderMode(configuredRenderMode === "raw" ? "raw" : "render");
   }, [configuredRenderMode]);
-  const renderModeMountedRef = (0, import_react165.useRef)(false);
-  (0, import_react165.useEffect)(() => {
+  const renderModeMountedRef = (0, import_react164.useRef)(false);
+  (0, import_react164.useEffect)(() => {
     if (!renderModeMountedRef.current) {
       renderModeMountedRef.current = true;
       return;
     }
     refreshStatic();
   }, [renderMode, refreshStatic]);
-  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 [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 { isFolderTrustDialogOpen, handleFolderTrustSelect, isRestarting } = useFolderTrust(settings, setIsTrustedFolder);
   const {
     isMcpApprovalDialogOpen,
@@ -43793,7 +44123,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_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (needsBlockingInput && isTranscriptOpen) {
       closeTranscript();
     }
@@ -43809,12 +44139,12 @@ ${currentText}` : popped);
     stickyTodoWidth,
     stickyTodoMaxVisibleItems
   ) : "hidden";
-  const [controlsHeight, setControlsHeight] = (0, import_react165.useState)(0);
+  const [controlsHeight, setControlsHeight] = (0, import_react164.useState)(0);
   const liveAgentPanelLayoutKey = getLiveAgentPanelLayoutKey(
     bgTaskEntries,
     bgLivePanelFocused
   );
-  (0, import_react165.useLayoutEffect)(() => {
+  (0, import_react164.useLayoutEffect)(() => {
     if (!mainControlsRef.current) {
       setControlsHeight(
         (previousHeight) => previousHeight === 0 ? previousHeight : 0
@@ -43861,7 +44191,7 @@ ${currentText}` : popped);
     pager: settings.merged.tools?.shell?.pager,
     showColor: settings.merged.tools?.shell?.showColor
   });
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (activePtyId) {
       ShellExecutionService.resizePty(
         activePtyId,
@@ -43870,19 +44200,18 @@ ${currentText}` : popped);
       );
     }
   }, [terminalWidth, availableTerminalHeight, activePtyId]);
-  useResizeSettleRepaint(terminalWidth, refreshStatic);
   useWakeRepaint(refreshStatic);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (ideNeedsRestart) {
       setShowIdeRestartPrompt(true);
     }
   }, [ideNeedsRestart]);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     const unsubscribe = ideContextStore.subscribe(setIdeContextState);
     setIdeContextState(ideContextStore.get());
     return unsubscribe;
   }, []);
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     const listener = /* @__PURE__ */ __name((status) => {
       setStartupIdeConnectionStatus(status);
     }, "listener");
@@ -43891,10 +44220,10 @@ ${currentText}` : popped);
       appEvents.off("startup-ide-connection-status-changed" /* StartupIdeConnectionStatusChanged */, listener);
     };
   }, []);
-  const handleEscapePromptChange = (0, import_react165.useCallback)((showPrompt) => {
+  const handleEscapePromptChange = (0, import_react164.useCallback)((showPrompt) => {
     setShowEscapePrompt(showPrompt);
   }, []);
-  const openRewindSelector = (0, import_react165.useCallback)(() => {
+  const openRewindSelector = (0, import_react164.useCallback)(() => {
     if (streamingState !== "idle" /* Idle */) return;
     if (dialogsVisibleRef.current) return;
     if (config.getIdeMode()) {
@@ -43912,10 +44241,10 @@ ${currentText}` : popped);
     setIsRewindSelectorOpen(true);
   }, [streamingState, config, historyManager]);
   openRewindSelectorRef.current = openRewindSelector;
-  const closeRewindSelector = (0, import_react165.useCallback)(() => {
+  const closeRewindSelector = (0, import_react164.useCallback)(() => {
     setIsRewindSelectorOpen(false);
   }, []);
-  const handleRewindConfirm = (0, import_react165.useCallback)(
+  const handleRewindConfirm = (0, import_react164.useCallback)(
     async (userItem, option) => {
       try {
         const needsConversation = option === "conversation" || option === "both";
@@ -44017,6 +44346,8 @@ ${currentText}` : popped);
           historyManager.loadHistory(truncatedUi);
           refreshStatic();
           if (userItem.type === "user" && userItem.text) {
+            restoredSubmissionRef.current = null;
+            submittedPromptProvenanceUnavailableRef.current = true;
             buffer.setText(userItem.text);
           }
           historyManager.addItem(
@@ -44077,7 +44408,7 @@ ${currentText}` : popped);
     openRewindSelector,
     (pending) => setRewindEscPending(pending)
   );
-  const handleIdePromptComplete = (0, import_react165.useCallback)(
+  const handleIdePromptComplete = (0, import_react164.useCallback)(
     (result) => {
       if (result.userSelection === "yes") {
         if (result.isExtensionPreInstalled) {
@@ -44093,7 +44424,7 @@ ${currentText}` : popped);
     },
     [handleSlashCommand, settings]
   );
-  const handleCommandMigrationComplete = (0, import_react165.useCallback)(
+  const handleCommandMigrationComplete = (0, import_react164.useCallback)(
     async (result) => {
       setShowCommandMigrationNudge(false);
       if (result.userSelection === "yes") {
@@ -44185,7 +44516,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     pendingToolCalls
   });
   const workflowBellEnabled = settings.merged.general?.terminalBell ?? true;
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     const registry = config.getWorkflowRunRegistry?.();
     if (!registry?.setNotificationCallback) return;
     registry.setNotificationCallback((entry) => {
@@ -44235,7 +44566,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     showWorktreeExitDialog,
     closeWorktreeExitDialog: /* @__PURE__ */ __name(() => setShowWorktreeExitDialog(false), "closeWorktreeExitDialog")
   });
-  const handleExit = (0, import_react165.useCallback)(
+  const handleExit = (0, import_react164.useCallback)(
     (pressedOnce, setPressedOnce, timerRef) => {
       if (pressedOnce) {
         if (timerRef.current) {
@@ -44288,7 +44619,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       activeWorktree
     ]
   );
-  const handleGlobalKeypress = (0, import_react165.useCallback)(
+  const handleGlobalKeypress = (0, import_react164.useCallback)(
     (key) => {
       if (settings.merged.general?.debugKeystrokeLogging) {
         debugLogger40.debug("[DEBUG] Keystroke:", JSON.stringify(key));
@@ -44478,7 +44809,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     ]
   );
   useKeypress(handleGlobalKeypress, { isActive: true });
-  (0, import_react165.useEffect)(() => {
+  (0, import_react164.useEffect)(() => {
     if (settings.merged.ui?.hideWindowTitle) {
       return;
     }
@@ -44487,7 +44818,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
         lastTitleRef.current = null;
         const folderName2 = basename3(config.getTargetDir());
         writeTerminalTitle(
-          (value) => process16.stdout.write(value),
+          (value) => process17.stdout.write(value),
           formatSessionWindowTitle(null, folderName2)
         );
       }
@@ -44497,7 +44828,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     const title = formatSessionWindowTitle(sessionName, folderName);
     if (lastTitleRef.current !== title) {
       lastTitleRef.current = title;
-      writeTerminalTitle((value) => process16.stdout.write(value), title);
+      writeTerminalTitle((value) => process17.stdout.write(value), title);
     }
   }, [
     sessionName,
@@ -44505,9 +44836,9 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     settings.merged.ui?.showStatusInTitle,
     config
   ]);
-  const queueDrainingRef = (0, import_react165.useRef)(false);
-  const [queueDrainNonce, setQueueDrainNonce] = (0, import_react165.useState)(0);
-  (0, import_react165.useEffect)(() => {
+  const queueDrainingRef = (0, import_react164.useRef)(false);
+  const [queueDrainNonce, setQueueDrainNonce] = (0, import_react164.useState)(0);
+  (0, import_react164.useEffect)(() => {
     if (queueDrainingRef.current) return;
     if (!shouldDrainMessageQueue({
       isConfigInitialized,
@@ -44519,11 +44850,10 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       return;
     }
     if (isTranscriptOpenRef.current) return;
-    const plainPrompts = drainQueue(true);
-    const submission = plainPrompts.length > 0 ? plainPrompts.join("\n\n") : popNextSegment();
+    const submission = popNextTurn();
     if (submission === null) return;
     queueDrainingRef.current = true;
-    Promise.resolve(submitQuery(submission)).finally(() => {
+    Promise.resolve(submitUserQuery(submission)).finally(() => {
       queueDrainingRef.current = false;
       setQueueDrainNonce((n) => n + 1);
     });
@@ -44535,13 +44865,12 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     // Re-run the drain when the transcript closes so queued messages resume.
     isTranscriptOpen,
     messageQueue,
-    drainQueue,
-    popNextSegment,
-    submitQuery,
+    popNextTurn,
+    submitUserQuery,
     queueDrainNonce
   ]);
   const nightly = props.version.includes("nightly");
-  const uiState = (0, import_react165.useMemo)(
+  const uiState = (0, import_react164.useMemo)(
     () => ({
       history: historyManager.history,
       historyManager,
@@ -44834,7 +45163,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       isDiffDialogOpen
     ]
   );
-  const uiActions = (0, import_react165.useMemo)(
+  const uiActions = (0, import_react164.useMemo)(
     () => ({
       openThemeDialog,
       openEditorDialog,
@@ -44875,7 +45204,8 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       handleFinalSubmit,
       handleRetryLastPrompt: retryLastPrompt,
       handleClearScreen,
-      popAllQueuedMessages: popAllMessages,
+      popAllQueuedMessages,
+      invalidateSubmittedPromptProvenance,
       // Welcome back dialog
       handleWelcomeBackSelection,
       handleWelcomeBackClose,
@@ -44965,7 +45295,8 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       handleFinalSubmit,
       retryLastPrompt,
       handleClearScreen,
-      popAllMessages,
+      popAllQueuedMessages,
+      invalidateSubmittedPromptProvenance,
       handleWelcomeBackSelection,
       handleWelcomeBackClose,
       handleWorktreeExit,
@@ -45015,11 +45346,11 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       closeDiffDialog
     ]
   );
-  const renderModeValue = (0, import_react165.useMemo)(
+  const renderModeValue = (0, import_react164.useMemo)(
     () => ({ renderMode, setRenderMode }),
     [renderMode, setRenderMode]
   );
-  const thoughtExpandedValue = (0, import_react165.useMemo)(
+  const thoughtExpandedValue = (0, import_react164.useMemo)(
     () => ({
       allExpanded: thoughtExpanded,
       expandedHeadIds: expandedThoughtHeadIds,
@@ -45027,7 +45358,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
     }),
     [thoughtExpanded, expandedThoughtHeadIds, toggleThoughtExpanded]
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(VirtualViewportContext.Provider, { value: useTerminalBuffer, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(UIStateContext.Provider, { value: uiState, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(UIActionsContext.Provider, { value: uiActions, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(ConfigContext.Provider, { value: config, children: /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(
     AppContext.Provider,
     {
       value: {
@@ -45051,14 +45382,14 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
         ) })
       ) : /* @__PURE__ */ (0, import_jsx_runtime135.jsx)(App, {}) }) }) }) })
     }
-  ) }) }) });
+  ) }) }) }) });
 }, "AppContainer");
 
 // packages/cli/src/ui/hooks/useKittyKeyboardProtocol.ts
 init_esbuild_shims();
-var import_react166 = __toESM(require_react(), 1);
+var import_react165 = __toESM(require_react(), 1);
 function useKittyKeyboardProtocol() {
-  const [status] = (0, import_react166.useState)({
+  const [status] = (0, import_react165.useState)({
     supported: isKittyProtocolSupported(),
     enabled: isKittyProtocolEnabled(),
     checking: false
@@ -45312,6 +45643,11 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
     }
   }
   const initialCapturedInput = stopAndGetCapturedInput();
+  const useVP = shouldUseVirtualViewport(
+    settings.merged.ui?.useTerminalBuffer,
+    config.getScreenReader(),
+    isInteractiveTerminal()
+  );
   const AppWrapper = /* @__PURE__ */ __name(() => {
     const kittyProtocolStatus = useKittyKeyboardProtocol();
     const nodeMajorVersion = parseInt(process.versions.node.split(".")[0], 10);
@@ -45331,13 +45667,13 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
             startupWarnings,
             version,
             initializationResult,
+            initialUseVirtualViewport: useVP,
             extensionRefreshState: options.extensionRefreshState
           }
         ) }) }) }) })
       }
     ) }) }) });
   }, "AppWrapper");
-  const useVP = settings.merged.ui?.useTerminalBuffer ?? false;
   const stdoutMaxListeners = process.stdout.getMaxListeners();
   if (useVP) {
     process.stdout.setMaxListeners(0);
@@ -45359,7 +45695,7 @@ ${error.stack ?? ""}`
     }
   );
   const instance = render_default(
-    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(import_react167.default.StrictMode, { children: appTree }) : appTree,
+    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(import_react166.default.StrictMode, { children: appTree }) : appTree,
     {
       exitOnCtrlC: false,
       isScreenReaderEnabled: config.getScreenReader(),