@qwen-code/qwen-code 0.21.0 → 0.21.1

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

@@ -1,80 +1,18 @@
 // Force strict mode and setup for ESM
 "use strict";
-import {
-  useAutoAcceptIndicator
-} from "./chunk-2X55UKQE.js";
-import {
-  classifyApiError
-} from "./chunk-V7RNNPGC.js";
 import {
   buildPermissionSuggestions
 } from "./chunk-43T5WDQ7.js";
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-YPE6A4GC.js";
-import {
-  MAX_SUGGESTIONS_TO_SHOW,
-  SESSION_MENTION_PREFIX,
-  buildMcpResourceRef,
-  buildMcpServerRef,
-  buildSessionRef,
-  getExtensionSuggestions,
-  handleAtCommand,
-  matchMcpServerPrefix,
-  resolveAtCommandQuery,
-  sanitizeDisplayText
-} from "./chunk-VULLI6WQ.js";
+} from "./chunk-657BH7VM.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-BKHWX6I2.js";
-import {
-  BuiltinCommandLoader,
-  BundledSkillLoader,
-  CommandService,
-  DISPLAY_HOOK_EVENTS,
-  FileCommandLoader,
-  MAX_STACKED_SKILLS,
-  McpPromptLoader,
-  SavedWorkflowLoader,
-  SkillCommandLoader,
-  addConfigToMatcherGroup,
-  appendUserPromptExpansionAdditionalContext,
-  copyToClipboard,
-  createEmptyHookEventInfo,
-  findMidInputSlashCommand,
-  findSlashCommandTokens,
-  formatApprovalModeDescription,
-  formatApprovalModeName,
-  formatUserPromptExpansionBlockedMessage,
-  getAllConfigs,
-  getBestSlashCommandMatch,
-  getTranslatedSourceDisplayMap,
-  hasBlockingBackgroundWork,
-  hasSlashCommandPathSeparator,
-  isAtCommand,
-  isBtwCommand,
-  isMidInputCompletableCommand,
-  isSlashCommand,
-  normalizePartList,
-  parseSlashCommand,
-  parseStackedSlashCommands,
-  refreshExtensionContentRuntime,
-  resetBackgroundStateForSessionSwitch,
-  serializeUserPromptExpansionPrompt,
-  supportsMatchers
-} from "./chunk-LB6DUZ26.js";
-import "./chunk-R5AFZNQW.js";
+} from "./chunk-BPZKP57P.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-2NH6DYI4.js";
-import {
-  EXTENSION_RELOAD_FAILED_REASON,
-  ExtensionRefreshState,
-  appEvents,
-  cleanupReviewWorktreeLeases,
-  loadHierarchicalGeminiMemory
-} from "./chunk-TPRQ7RZH.js";
+} from "./chunk-MHAIJPTD.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -106,6 +44,7 @@ import {
   UIStateContext,
   USER_AGREEMENT_RATE_HIGH,
   USER_AGREEMENT_RATE_MEDIUM,
+  VirtualViewportContext,
   checkExhaustive,
   colorizeCode,
   countMarkdownSourceBlocks,
@@ -146,22 +85,111 @@ import {
   useTerminalSize,
   useTextBuffer,
   useUIActions,
-  useUIState
-} from "./chunk-SQCQ4KO2.js";
+  useUIState,
+  useVirtualViewport
+} from "./chunk-OCESJA77.js";
+import {
+  GeminiRespondingSpinner,
+  GeminiSpinner,
+  ICON,
+  SCREEN_READER_USER_PREFIX,
+  SHELL_COMMAND_NAME,
+  StreamingContext,
+  applyCollapsePolicyAndSummary,
+  buildResumedHistoryItems,
+  build_default,
+  expandCollapsedHistory,
+  isCollapsibleTool,
+  useStreamingContext
+} from "./chunk-TDL6LB4K.js";
+import {
+  stopAndGetCapturedInput
+} from "./chunk-JMONIXMJ.js";
+import {
+  useAutoAcceptIndicator
+} from "./chunk-HMRM2A3U.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-LQIW3YFY.js";
+} from "./chunk-CQL64ESB.js";
+import {
+  classifyApiError
+} from "./chunk-V7RNNPGC.js";
+import {
+  MAX_SUGGESTIONS_TO_SHOW,
+  SESSION_MENTION_PREFIX,
+  buildMcpResourceRef,
+  buildMcpServerRef,
+  buildSessionRef,
+  getExtensionSuggestions,
+  handleAtCommand,
+  matchMcpServerPrefix,
+  resolveAtCommandQuery,
+  sanitizeDisplayText
+} from "./chunk-TV64SXKD.js";
+import {
+  BuiltinCommandLoader,
+  BundledSkillLoader,
+  CommandService,
+  DISPLAY_HOOK_EVENTS,
+  FileCommandLoader,
+  MAX_STACKED_SKILLS,
+  McpPromptLoader,
+  SavedWorkflowLoader,
+  SkillCommandLoader,
+  addConfigToMatcherGroup,
+  appendUserPromptExpansionAdditionalContext,
+  copyToClipboard,
+  createEmptyHookEventInfo,
+  dayKey,
+  findMidInputSlashCommand,
+  findSlashCommandTokens,
+  formatApprovalModeDescription,
+  formatApprovalModeName,
+  formatUserPromptExpansionBlockedMessage,
+  getAllConfigs,
+  getBestSlashCommandMatch,
+  getTranslatedSourceDisplayMap,
+  hasBlockingBackgroundWork,
+  hasSlashCommandPathSeparator,
+  isAtCommand,
+  isBtwCommand,
+  isMidInputCompletableCommand,
+  isSlashCommand,
+  isStackedSkillCompletableCommand,
+  isValidStackedSkillPrefix,
+  normalizePartList,
+  parseDayKey,
+  parseSlashCommand,
+  parseStackedSlashCommands,
+  refreshExtensionContentRuntime,
+  resetBackgroundStateForSessionSwitch,
+  serializeUserPromptExpansionPrompt,
+  supportsMatchers
+} from "./chunk-J7OACQDE.js";
+import {
+  EXTENSION_RELOAD_FAILED_REASON,
+  ExtensionRefreshState,
+  appEvents,
+  cleanupReviewWorktreeLeases,
+  loadHierarchicalGeminiMemory
+} from "./chunk-7BAU433D.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-RZIX2G32.js";
+} from "./chunk-JX27F6QS.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-U7M2DMGW.js";
+} from "./chunk-7AEJDLRA.js";
+import {
+  disableKittyProtocol,
+  isKittyProtocolEnabled,
+  isKittyProtocolSupported,
+  pushKittyProtocolFlags
+} from "./chunk-PQNHRFJC.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -174,33 +202,27 @@ import {
   oscKittyNotify,
   saveClipboardImage,
   writeOsc52
-} from "./chunk-J56UI34H.js";
+} from "./chunk-M7OONWYU.js";
+import "./chunk-65PQENQP.js";
 import "./chunk-4WGODMVR.js";
+import "./chunk-JFMA7Y5M.js";
+import "./chunk-KW7NOTN6.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-FQK6JAFG.js";
-import {
-  GeminiRespondingSpinner,
-  GeminiSpinner,
-  ICON,
-  SCREEN_READER_USER_PREFIX,
-  SHELL_COMMAND_NAME,
-  StreamingContext,
-  applyCollapsePolicyAndSummary,
-  buildResumedHistoryItems,
-  build_default,
-  expandCollapsedHistory,
-  isCollapsibleTool,
-  useStreamingContext
-} from "./chunk-JXJFVC6E.js";
+} from "./chunk-U3E3UQAA.js";
 import {
   theme
-} from "./chunk-VAK25FTU.js";
+} from "./chunk-GKX7E4CO.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
+import {
+  AUTO_THEME_NAME,
+  DEFAULT_THEME,
+  themeManager
+} from "./chunk-GATT5TKW.js";
 import {
   Box_default,
   Static,
@@ -214,51 +236,36 @@ import {
   use_is_screen_reader_enabled_default,
   use_stdin_default,
   use_stdout_default
-} from "./chunk-6GMVPFB2.js";
+} from "./chunk-UWMLWVCA.js";
 import {
-  stopAndGetCapturedInput
-} from "./chunk-63P4EL5V.js";
+  require_react
+} from "./chunk-5QWWOFGG.js";
+import "./chunk-EVKE2FZL.js";
 import {
-  disableKittyProtocol,
-  isKittyProtocolEnabled,
-  isKittyProtocolSupported,
-  pushKittyProtocolFlags
-} from "./chunk-PQNHRFJC.js";
+  getErrorMessage as getErrorMessage2
+} from "./chunk-T3O2B4XO.js";
+import "./chunk-EJGJIBRS.js";
 import {
   relaunchApp
-} from "./chunk-Y34KJKDC.js";
+} from "./chunk-A2D5BAVP.js";
 import {
   setUpdateHandler
-} from "./chunk-ZFDTEDCF.js";
-import "./chunk-M4FMGVY4.js";
-import "./chunk-K36B6G2O.js";
-import {
-  AUTO_THEME_NAME,
-  DEFAULT_THEME,
-  themeManager
-} from "./chunk-L5UHQJTJ.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 {
-  getErrorMessage as getErrorMessage2
-} from "./chunk-IKYJHJNF.js";
-import "./chunk-2SCDWPXI.js";
+} from "./chunk-PB3MBFKG.js";
+import "./chunk-7DXQIJID.js";
 import "./chunk-YAF2MQZ6.js";
+import "./chunk-S4WJVPZW.js";
+import "./chunk-6H67XLET.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-BJX6ZSUK.js";
+} from "./chunk-BCZFQXWK.js";
 import {
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-EBJQ6AXW.js";
-import "./chunk-RHLZR4E5.js";
+} from "./chunk-LO4ROVP4.js";
+import "./chunk-LGAOC3ZS.js";
+import "./chunk-XFZYFU3I.js";
 import {
   cpLen,
   cpSlice,
@@ -270,8 +277,7 @@ import {
   sanitizeTerminalText,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-IPUUTYMV.js";
-import "./chunk-WCXCRJYB.js";
+} from "./chunk-YDLJGZHL.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -280,31 +286,25 @@ import {
   isHistoryItemVisibleAfterRestore
 } from "./chunk-QTERJVPZ.js";
 import "./chunk-3Z43GZUQ.js";
+import "./chunk-RXFQM6FQ.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isKeytermEcho,
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-H4SBPHSA.js";
+} from "./chunk-CAPPWD3X.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-JTV5K7NH.js";
+import "./chunk-ZHBO7WVX.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-IO3IX5Q4.js";
+} from "./chunk-WUZ7H6DP.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-MVSUYZDT.js";
+} from "./chunk-QIZKCVM3.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-KCO4FLFJ.js";
 import {
-  loadMcpApprovals
-} from "./chunk-JVPM2ULZ.js";
-import "./chunk-DP3IHZGG.js";
-import "./chunk-ZNAUOR2I.js";
+  computeWorkspaceSkillListUpdates,
+  resolveSkillSettings,
+  skillSettingStrings
+} from "./chunk-Z4X5MTRT.js";
+import "./chunk-BNWB5CYE.js";
+import {
+  requestConsentInteractive,
+  requestConsentOrFail
+} from "./chunk-5MKRTI4T.js";
+import "./chunk-57OAHC2Y.js";
+import "./chunk-2XSLTRFZ.js";
+import "./chunk-TFRMVU6R.js";
+import "./chunk-XBYYDKAZ.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-GZ3RCT54.js";
+import "./chunk-ALMR3E6Q.js";
 import "./chunk-BK2UNYWD.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-RWTEFFPU.js";
+import "./chunk-4G2BISNC.js";
+import "./chunk-GEBV2JGB.js";
+import "./chunk-7I5GTCT4.js";
 import "./chunk-UDXSXLER.js";
-import "./chunk-BIQWWWJN.js";
+import {
+  loadMcpApprovals
+} from "./chunk-6RPMI2AB.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -355,36 +367,39 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-TEHGS6UP.js";
+} from "./chunk-EIF3FXTB.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-GOXKNSDZ.js";
-import "./chunk-IDS7MSUP.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-LKEJ26GS.js";
-import "./chunk-LH2BYDQ5.js";
+} from "./chunk-TCIFAA7K.js";
+import "./chunk-2N7CODY5.js";
+import "./chunk-DP3IHZGG.js";
+import "./chunk-VWOOBLTY.js";
+import "./chunk-GOXKNSDZ.js";
+import "./chunk-IDS7MSUP.js";
 import "./chunk-6PEXNQTX.js";
+import "./chunk-XFSFZCM5.js";
 import "./chunk-URK542T4.js";
 import {
   getCliVersion
-} from "./chunk-YX324OPW.js";
+} from "./chunk-VYOXCEPJ.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-Z2BC6UJ5.js";
+} from "./chunk-Q43KPN7X.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
 import "./chunk-MR3PXB6E.js";
 import {
   clearScreen,
-  writeStderrLine
+  writeStderrLine,
+  writeStderrLineSafe
 } from "./chunk-OWAK7LMW.js";
-import "./chunk-XFSFZCM5.js";
 import {
   ALIBABA_PROVIDERS,
   AsyncFzf,
@@ -491,67 +506,68 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-PHOF65IG.js";
-import "./chunk-5M6IDOMF.js";
+} from "./chunk-X5WNMMIA.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-5M6IDOMF.js";
+import "./chunk-UPUG4GXM.js";
+import "./chunk-64LQLPL7.js";
+import "./chunk-2LQTH543.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-BMFALVGQ.js";
+import "./chunk-CVHIL5IG.js";
+import "./chunk-IRH27ZC2.js";
+import "./chunk-QHWCP53L.js";
+import "./chunk-PONHVBRT.js";
+import "./chunk-T26EAKDL.js";
+import "./chunk-6PVPNMXU.js";
 import "./chunk-CPBF7KYF.js";
+import "./chunk-6QIGFD5W.js";
+import {
+  HOOKS_CONFIG_FIELDS
+} from "./chunk-XWWKIXVD.js";
+import "./chunk-75GFAX4R.js";
+import "./chunk-OKF7JF3R.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";
+} from "./chunk-JSD33JG6.js";
+import "./chunk-S6LOFUVP.js";
 import "./chunk-JCW2R7WC.js";
 import {
   isPathWithinRoot
-} from "./chunk-M5JM7OSF.js";
-import "./chunk-OHNBB4XR.js";
-import "./chunk-E5TUC6CA.js";
+} from "./chunk-2DN4J57Y.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-2LKVPASC.js";
+import "./chunk-NAVJD2PQ.js";
+import "./chunk-LW3RFMG7.js";
+import "./chunk-W4MIWP6M.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-5KTQXHPY.js";
+import "./chunk-75MIQ3LV.js";
+import "./chunk-2J3OJGTL.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-6FGBXPWM.js";
-import "./chunk-LS77BEZP.js";
+import "./chunk-RPLGZJV2.js";
+import "./chunk-GLCZKT5V.js";
+import "./chunk-DZLYR4U3.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -592,7 +608,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-CIKQ7KKO.js";
+} from "./chunk-PT722TDT.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
@@ -600,30 +616,27 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-MUP3T3AD.js";
+} from "./chunk-SGFT55XI.js";
+import "./chunk-Y4IHBGBP.js";
+import {
+  ToolNames,
+  isShellProgressData
+} from "./chunk-Y6AXW2OG.js";
 import {
   MAINLINE_CODER_MODEL
-} from "./chunk-IKCX4CCL.js";
+} from "./chunk-VCPIZRYH.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-WZRWHXFE.js";
+import "./chunk-A3NDJ5SB.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-7XATOOE7.js";
+import "./chunk-BGTQCTQW.js";
+import "./chunk-W4RQUHY3.js";
+import "./chunk-S7W2GKIO.js";
 import {
   Storage,
   UnauthorizedError,
@@ -635,12 +648,13 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-NL7LTRLR.js";
-import "./chunk-QAF7NMK7.js";
+} from "./chunk-UHUSJ6X7.js";
+import "./chunk-VOQXFAY5.js";
+import "./chunk-RCUQIPTN.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-PWVFN2LF.js";
+} from "./chunk-52ZSWYEG.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -655,7 +669,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";
@@ -5231,6 +5245,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 +5361,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 +5517,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 +5546,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 +5615,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 +9999,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 +10086,10 @@ function TrustDialog({
         onExit();
       }
       if (needsRestart && key.name === "r") {
-        commitTrustLevelChange();
-        relaunchApp();
-        onExit();
+        if (commitTrustLevelChange()) {
+          relaunchApp();
+          onExit();
+        }
       }
     },
     { isActive: true }
@@ -14666,8 +14763,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 +14801,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 +14868,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 +14936,9 @@ function SkillsManagerDialog({
     return "ok";
   }, [
     addItem,
-    allSkills,
+    initialResolved,
+    initialSelectedKeys,
+    lockedSkills,
     reloadCommands,
     selectedKeys,
     settings,
@@ -26376,7 +26489,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 +26524,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 +26692,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 +27867,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 +29153,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 +29174,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 +29412,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 +29430,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 +29459,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 +29894,7 @@ ${currentText}`);
             }
           }
           if (keyMatchers["acceptSuggestionReverseSearch" /* ACCEPT_SUGGESTION_REVERSE_SEARCH */](key)) {
+            uiActions.invalidateSubmittedPromptProvenance();
             sc.handleAutocomplete(activeSuggestionIndex);
             resetState();
             setActive(false);
@@ -29778,6 +29903,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 +30101,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 +30379,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 +30409,8 @@ ${currentText}`);
       handleSubmitAndClear,
       setExpandedSuggestionIndex,
       setCommandSearchActive,
-      setReverseSearchActive
+      setReverseSearchActive,
+      uiActions
     ]
   );
   const hasTabConsumer = shouldShowSuggestions || buffer.text.length === 0 && Boolean(availableSuggestion) || Boolean(completion.midInputGhostText?.acceptText);
@@ -31633,6 +31769,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 +31790,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 +33164,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();
@@ -33408,6 +33556,33 @@ 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);
@@ -35608,7 +35783,7 @@ init_esbuild_shims();
 var import_react134 = __toESM(require_react(), 1);
 import * as path11 from "node:path";
 var debugLogger35 = createDebugLogger("REACT_TOOL_SCHEDULER");
-function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose) {
+function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorClose, onToolResultFullTurnModel) {
   const [toolCallsForDisplay, setToolCallsForDisplay] = (0, import_react134.useState)([]);
   const outputUpdateHandler = (0, import_react134.useCallback)(
     (toolCallId, outputChunk) => {
@@ -35668,7 +35843,8 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
       onAllToolCallsComplete: allToolCallsCompleteHandler,
       onToolCallsUpdate: toolCallsUpdateHandler,
       getPreferredEditor,
-      onEditorClose
+      onEditorClose,
+      onToolResultFullTurnModel
     }),
     [
       config,
@@ -35676,7 +35852,8 @@ function useReactToolScheduler(onComplete, config, getPreferredEditor, onEditorC
       allToolCallsCompleteHandler,
       toolCallsUpdateHandler,
       getPreferredEditor,
-      onEditorClose
+      onEditorClose,
+      onToolResultFullTurnModel
     ]
   );
   const schedule = (0, import_react134.useCallback)(
@@ -35811,6 +35988,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 +36010,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 +36022,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,42 +36079,53 @@ __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 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 addMessage = (0, import_react135.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_react135.useCallback)(() => {
     queueRef.current = [];
     setQueuedMessages([]);
   }, []);
   const getQueuedMessagesText = (0, import_react135.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 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 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);
@@ -35936,31 +36133,36 @@ function useMessageQueue() {
   const drainQueue = (0, import_react135.useCallback)((includeDeferred = false) => {
     const current = queueRef.current;
     if (current.length === 0) return [];
-    const shouldDrain = /* @__PURE__ */ __name((message) => (!isSlashCommand(message.text) || !includeDeferred && GOAL_COMMAND_RE.test(message.text)) && (includeDeferred || !message.deferUntilIdle), "shouldDrain");
+    const 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_react135.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");
@@ -36115,6 +36317,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const isSubmittingQueryRef = (0, import_react136.useRef)(false);
   const lastPromptRef = (0, import_react136.useRef)(null);
   const lastTurnUserItemRef = (0, import_react136.useRef)(null);
+  const canUndoLastLoggedUserMessageRef = (0, import_react136.useRef)(false);
   const turnSawContentEventRef = (0, import_react136.useRef)(false);
   const lastPromptErroredRef = (0, import_react136.useRef)(false);
   const commitItem = (0, import_react136.useCallback)(
@@ -36155,6 +36358,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const submitPromptOnCompleteRef = (0, import_react136.useRef)(null);
   const modelOverrideRef = (0, import_react136.useRef)(void 0);
   const inlineModelOverrideActiveRef = (0, import_react136.useRef)(false);
+  const canUseToolResultFullTurnModel = (0, import_react136.useCallback)((model) => {
+    const current = modelOverrideRef.current;
+    return !inlineModelOverrideActiveRef.current && (!current?.endsWith("\0") || current === model);
+  }, []);
   const handledProviderToolCallIdsRef = (0, import_react136.useRef)(/* @__PURE__ */ new Set());
   const duplicateProviderToolCallResponseIdsRef = (0, import_react136.useRef)(
     /* @__PURE__ */ new Set()
@@ -36185,7 +36392,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     config,
     getPreferredEditor,
-    onEditorClose
+    onEditorClose,
+    canUseToolResultFullTurnModel
   );
   const pendingToolCallGroupDisplay = (0, import_react136.useMemo)(
     () => toolCalls.length ? mapToDisplay(toolCalls, config.getProjectRoot()) : void 0,
@@ -36369,6 +36577,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       onCancelSubmit({
         pendingItem: pendingItemAtCancel,
         lastTurnUserItem: lastTurnUserItemRef.current,
+        canUndoLastLoggedUserMessage: canUndoLastLoggedUserMessageRef.current,
         turnProducedMeaningfulContent: turnSawContentEventRef.current
       });
     } finally {
@@ -36453,14 +36662,16 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [addItem, config]
   );
   const prepareQueryForGemini = (0, import_react136.useCallback)(
-    async (query, userMessageTimestamp, abortSignal, prompt_id, submitType) => {
+    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 +36689,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 +36763,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)) {
@@ -37677,6 +37892,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     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 +37905,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 +37952,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 +38012,19 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             );
             dualOutput.emitUserMessage(userParts);
           }
+          const sendOptions = {
+            type: submitType,
+            notificationDisplayText: metadata?.notificationDisplayText,
+            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 +38078,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) {
@@ -38480,7 +38703,7 @@ 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]);
@@ -40611,7 +40834,7 @@ __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";
+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);
@@ -40626,7 +40849,7 @@ var useFolderTrust = /* @__PURE__ */ __name((settings, onTrustChange) => {
   const handleFolderTrustSelect = (0, import_react143.useCallback)(
     (choice) => {
       const trustedFolders = loadTrustedFolders();
-      const cwd3 = process15.cwd();
+      const cwd3 = process16.cwd();
       let trustLevel;
       const wasTrusted = isTrusted ?? true;
       switch (choice) {
@@ -40642,7 +40865,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);
@@ -40933,14 +41164,22 @@ __name(sendNotification, "sendNotification");
 // packages/cli/src/ui/hooks/useGitBranchName.ts
 init_esbuild_shims();
 var import_react146 = __toESM(require_react(), 1);
+var BRANCH_POLL_INTERVAL_MS = 5e3;
 function useGitBranchName(cwd3) {
   const [branchName, setBranchName] = (0, import_react146.useState)(void 0);
+  const branchNameRef = (0, import_react146.useRef)(branchName);
+  branchNameRef.current = branchName;
   (0, import_react146.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 +41193,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;
@@ -42150,7 +42397,7 @@ __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 { settings, config, initializationResult, initialUseVirtualViewport } = props;
   const extensionRefreshState = (0, import_react165.useMemo)(
     () => props.extensionRefreshState ?? new ExtensionRefreshState(),
     [props.extensionRefreshState]
@@ -42271,7 +42518,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const { stdin, setRawMode } = use_stdin_default();
   const { stdout } = use_stdout_default();
   const writeRaw = (0, import_react165.useCallback)((data) => {
-    process16.stdout.write(data);
+    process17.stdout.write(data);
   }, []);
   const terminal = (0, import_react165.useMemo)(
     () => buildTerminalNotification(writeRaw),
@@ -42495,6 +42742,27 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     }
   }, []);
   const preferredEditor = usePreferredEditor();
+  const restoredSubmissionRef = (0, import_react165.useRef)(null);
+  const submittedPromptProvenanceUnavailableRef = (0, import_react165.useRef)(false);
+  const setBufferTextRef = (0, import_react165.useRef)(null);
+  const invalidateSubmittedPromptProvenance = (0, import_react165.useCallback)(() => {
+    restoredSubmissionRef.current = null;
+    submittedPromptProvenanceUnavailableRef.current = true;
+  }, []);
+  const handleBufferChange = (0, import_react165.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,8 +42770,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     setRawMode,
     isValidPath,
     shellModeActive,
-    preferredEditor
+    preferredEditor,
+    onChange: handleBufferChange
   });
+  const setBufferText = buffer.setText;
+  setBufferTextRef.current = setBufferText;
   const restoredPromptStashTargetsRef = (0, import_react165.useRef)(/* @__PURE__ */ new Set());
   const promptStashTargetDir = config.getTargetDir();
   (0, import_react165.useEffect)(() => {
@@ -42511,11 +42782,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       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)(() => {
     const fetchUserMessages = /* @__PURE__ */ __name(async () => {
@@ -42534,7 +42805,13 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const remountStaticHistory = (0, import_react165.useCallback)(() => {
     setHistoryRemountKey((prev) => prev + 1);
   }, []);
-  const useTerminalBuffer = settings.merged.ui?.useTerminalBuffer ?? false;
+  const [useTerminalBuffer] = (0, import_react165.useState)(
+    () => initialUseVirtualViewport ?? shouldUseVirtualViewport(
+      settings.merged.ui?.useTerminalBuffer,
+      config.getScreenReader(),
+      isInteractiveTerminal()
+    )
+  );
   const showScrollbar = settings.merged.ui?.showScrollbar ?? true;
   const refreshStatic = (0, import_react165.useCallback)(() => {
     if (isTranscriptOpenRef.current) {
@@ -42725,6 +43002,11 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   const closeHelpDialog = (0, import_react165.useCallback)(() => setHelpDialogOpen(false), []);
   const { vimEnabled, vimMode } = useVimModeState();
   const { toggleVimEnabled } = useVimModeActions();
+  (0, import_react165.useLayoutEffect)(() => {
+    if (vimEnabled && buffer.text.length > 0) {
+      invalidateSubmittedPromptProvenance();
+    }
+  }, [buffer.text, invalidateSubmittedPromptProvenance, vimEnabled]);
   const {
     isSubagentCreateDialogOpen,
     openSubagentCreateDialog,
@@ -42846,7 +43128,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         config.getGeminiClient()?.requestShutdown();
         setTimeout(async () => {
           await runExitCleanup();
-          process16.exit(0);
+          process17.exit(0);
         }, 100);
       }, "quit"),
       setDebugMessage,
@@ -43029,7 +43311,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(),
@@ -43188,8 +43470,24 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     popAllMessages,
     restoreMessages,
     drainQueue,
-    popNextSegment
+    popNextTurn
   } = useMessageQueue();
+  const submitUserQuery = (0, import_react165.useCallback)(
+    (submission) => submitQuery(
+      submission.modelText,
+      "userQuery" /* UserQuery */,
+      void 0,
+      submission.submittedPrompt === void 0 ? void 0 : { submittedPrompt: submission.submittedPrompt }
+    ),
+    [submitQuery]
+  );
+  const popAllQueuedMessages = (0, import_react165.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();
@@ -43282,6 +43580,20 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   }, [remoteInput]);
   const handleFinalSubmit = (0, import_react165.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 +43639,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 +43720,7 @@ ${buildWorkflowSteeringNotice()}
             setPromptSuggestion(result.nextSuggestion);
           }
         }).catch(() => {
-          addMessage(submittedValue);
+          addMessage(submittedValue, false, submittedPrompt);
         });
         speculationRef.current = IDLE_SPECULATION;
         return;
@@ -43416,22 +43731,27 @@ ${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)(
@@ -43501,9 +43821,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 +43846,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 +43864,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 +43883,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 +43904,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,
@@ -44017,6 +44351,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(
@@ -44487,7 +44823,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 +44833,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,
@@ -44519,11 +44855,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,9 +44870,8 @@ ${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");
@@ -44875,7 +45209,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 +45300,8 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       handleFinalSubmit,
       retryLastPrompt,
       handleClearScreen,
-      popAllMessages,
+      popAllQueuedMessages,
+      invalidateSubmittedPromptProvenance,
       handleWelcomeBackSelection,
       handleWelcomeBackClose,
       handleWorktreeExit,
@@ -45027,7 +45363,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,7 +45387,7 @@ ${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
@@ -45312,6 +45648,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 +45672,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);