@qwen-code/qwen-code 0.20.2-jobbench-no-todo-write.0 → 0.21.0

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

@@ -1,15 +1,80 @@
 // 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-3G3UUMRS.js";
+} from "./chunk-YPE6A4GC.js";
+import {
+  MAX_SUGGESTIONS_TO_SHOW,
+  SESSION_MENTION_PREFIX,
+  buildMcpResourceRef,
+  buildMcpServerRef,
+  buildSessionRef,
+  getExtensionSuggestions,
+  handleAtCommand,
+  matchMcpServerPrefix,
+  resolveAtCommandQuery,
+  sanitizeDisplayText
+} from "./chunk-VULLI6WQ.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";
 import {
   startPostRenderPrefetches
-} from "./chunk-B2HSPMD4.js";
+} from "./chunk-2NH6DYI4.js";
+import {
+  EXTENSION_RELOAD_FAILED_REASON,
+  ExtensionRefreshState,
+  appEvents,
+  cleanupReviewWorktreeLeases,
+  loadHierarchicalGeminiMemory
+} from "./chunk-TPRQ7RZH.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -62,12 +127,9 @@ import {
   loadLowlight,
   logicalPosToOffset,
   measureElementPosition,
-  osc8Hyperlink,
   removeLastGrapheme,
   renderSoftwareCursor,
-  sanitizeForOsc,
   splitFencedMarkdown,
-  supportsHyperlinks,
   truncateText,
   useArenaCommand,
   useConfig,
@@ -85,91 +147,21 @@ import {
   useTextBuffer,
   useUIActions,
   useUIState
-} from "./chunk-ZKBNRL6O.js";
-import {
-  stopAndGetCapturedInput
-} from "./chunk-E4IMU4Y5.js";
-import {
-  useAutoAcceptIndicator
-} from "./chunk-JK26TQON.js";
+} from "./chunk-SQCQ4KO2.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-6VPLV3L3.js";
-import {
-  classifyApiError
-} from "./chunk-V7RNNPGC.js";
-import {
-  MAX_SUGGESTIONS_TO_SHOW,
-  buildMcpResourceRef,
-  buildMcpServerRef,
-  getExtensionSuggestions,
-  handleAtCommand,
-  matchMcpServerPrefix,
-  resolveAtCommandQuery,
-  sanitizeDisplayText
-} from "./chunk-PLQODS7F.js";
+} from "./chunk-LQIW3YFY.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-ZUTM4LHM.js";
-import {
-  StreamJsonOutputAdapter
-} from "./chunk-7TLUW4ZE.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-26CBI4DC.js";
-import {
-  EXTENSION_RELOAD_FAILED_REASON,
-  ExtensionRefreshState,
-  appEvents,
-  cleanupReviewWorktreeLeases,
-  loadHierarchicalGeminiMemory
-} from "./chunk-ACZIBDYD.js";
+} from "./chunk-RZIX2G32.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-7MWABCXU.js";
-import {
-  disableKittyProtocol,
-  isKittyProtocolEnabled,
-  isKittyProtocolSupported
-} from "./chunk-5DTTYNB7.js";
+} from "./chunk-U7M2DMGW.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -181,20 +173,18 @@ import {
   oscITerm2Notify,
   oscKittyNotify,
   saveClipboardImage,
-  wrapForMultiplexer,
   writeOsc52
-} from "./chunk-4LVZNIDO.js";
-import "./chunk-WSYKDFYR.js";
+} from "./chunk-J56UI34H.js";
 import "./chunk-4WGODMVR.js";
-import "./chunk-KW7NOTN6.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-64EG42HV.js";
+} from "./chunk-FQK6JAFG.js";
 import {
   GeminiRespondingSpinner,
   GeminiSpinner,
+  ICON,
   SCREEN_READER_USER_PREFIX,
   SHELL_COMMAND_NAME,
   StreamingContext,
@@ -204,10 +194,10 @@ import {
   expandCollapsedHistory,
   isCollapsibleTool,
   useStreamingContext
-} from "./chunk-KBB5O3JO.js";
+} from "./chunk-JXJFVC6E.js";
 import {
   theme
-} from "./chunk-6IL7KRLE.js";
+} from "./chunk-VAK25FTU.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -224,36 +214,51 @@ import {
   use_is_screen_reader_enabled_default,
   use_stdin_default,
   use_stdout_default
-} from "./chunk-NEEB7UEN.js";
+} from "./chunk-6GMVPFB2.js";
 import {
-  require_react
-} from "./chunk-5QWWOFGG.js";
-import "./chunk-UHGNAWHK.js";
-import "./chunk-NHDKSOEY.js";
+  stopAndGetCapturedInput
+} from "./chunk-63P4EL5V.js";
+import {
+  disableKittyProtocol,
+  isKittyProtocolEnabled,
+  isKittyProtocolSupported,
+  pushKittyProtocolFlags
+} from "./chunk-PQNHRFJC.js";
 import {
   relaunchApp
-} from "./chunk-O32RMIMO.js";
+} from "./chunk-Y34KJKDC.js";
 import {
   setUpdateHandler
-} from "./chunk-ZPWJZHJ2.js";
-import "./chunk-5WDRI7US.js";
-import "./chunk-YAF2MQZ6.js";
-import "./chunk-45PO6ZIS.js";
+} from "./chunk-ZFDTEDCF.js";
+import "./chunk-M4FMGVY4.js";
+import "./chunk-K36B6G2O.js";
 import {
   AUTO_THEME_NAME,
   DEFAULT_THEME,
   themeManager
-} from "./chunk-7Z6JQEL6.js";
+} 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";
+import "./chunk-YAF2MQZ6.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-ZHERRXZJ.js";
+} from "./chunk-BJX6ZSUK.js";
 import {
   recordGoalStatusItem,
   restoreGoalFromHistory
-} from "./chunk-6NRFYMKG.js";
-import "./chunk-4K7VDKAD.js";
+} from "./chunk-EBJQ6AXW.js";
+import "./chunk-RHLZR4E5.js";
 import {
   cpLen,
   cpSlice,
@@ -265,71 +270,69 @@ import {
   sanitizeTerminalText,
   stripUnsafeCharacters,
   toCodePoints
-} from "./chunk-RS7MT2QG.js";
-import "./chunk-GN45XAAU.js";
+} from "./chunk-IPUUTYMV.js";
+import "./chunk-WCXCRJYB.js";
 import {
   stringWidth
-} from "./chunk-H2XVO6NE.js";
+} from "./chunk-2MIN6GRR.js";
 import "./chunk-QHTIBUWB.js";
 import {
   isHistoryItemVisibleAfterRestore
 } from "./chunk-QTERJVPZ.js";
 import "./chunk-3Z43GZUQ.js";
-import "./chunk-RXFQM6FQ.js";
-import "./chunk-CXIOPXRR.js";
-import "./chunk-6H67XLET.js";
-import "./chunk-4MWNZNJ4.js";
-import {
-  getErrorMessage as getErrorMessage2
-} from "./chunk-7SSWNGEJ.js";
-import {
-  getExtendedSystemInfo
-} from "./chunk-CJQ3FZ2G.js";
-import {
-  formatDuration,
-  formatMemoryUsage,
-  formatRelativeTime,
-  formatTokenCount
-} from "./chunk-E5Z2AVNV.js";
-import {
-  isInlineModelOverrideAllowed
-} from "./chunk-42W5BDEY.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isKeytermEcho,
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-LVA5OHQO.js";
+} from "./chunk-H4SBPHSA.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-7ZD5EKXE.js";
-import "./chunk-QLJUC7TG.js";
-import "./chunk-5XORMWA2.js";
+} from "./chunk-YBL3QUDD.js";
+import "./chunk-ZD6UTE4A.js";
+import "./chunk-RXFQM6FQ.js";
+import "./chunk-PSOO6YXD.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-4SCOLXTD.js";
+} from "./chunk-PC6JANNU.js";
 import "./chunk-57OAHC2Y.js";
-import "./chunk-GPMVHZP4.js";
-import "./chunk-6ZBPS62S.js";
-import "./chunk-V6WHFGST.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-64XKYOXK.js";
-import "./chunk-6RLROE6G.js";
+} from "./chunk-IO3IX5Q4.js";
+import {
+  getExtendedSystemInfo
+} from "./chunk-MVSUYZDT.js";
+import {
+  formatDuration,
+  formatMemoryUsage,
+  formatRelativeTime,
+  formatTokenCount
+} from "./chunk-E5Z2AVNV.js";
+import "./chunk-GLWP3FDB.js";
 import "./chunk-COH43MRJ.js";
-import "./chunk-QKTHJXCS.js";
-import "./chunk-TJTKSVIV.js";
-import "./chunk-M5GB774H.js";
-import "./chunk-RV4C2ZFG.js";
-import "./chunk-2LI23QA6.js";
-import "./chunk-RVLZCXEE.js";
-import "./chunk-UDXSXLER.js";
+import {
+  isInlineModelOverrideAllowed
+} from "./chunk-KMQ33DO4.js";
+import "./chunk-X5XDDSSH.js";
+import "./chunk-4WIZGAH3.js";
+import "./chunk-7ZCNENPP.js";
+import "./chunk-V6WHFGST.js";
 import {
   loadMcpApprovals
-} from "./chunk-7PIL2BYF.js";
+} from "./chunk-JVPM2ULZ.js";
+import "./chunk-DP3IHZGG.js";
+import "./chunk-ZNAUOR2I.js";
+import "./chunk-2RFKHEXL.js";
+import "./chunk-LK7CHLVP.js";
+import "./chunk-JLU636DO.js";
+import "./chunk-BK2UNYWD.js";
+import "./chunk-M5GB774H.js";
+import "./chunk-RWTEFFPU.js";
+import "./chunk-UDXSXLER.js";
+import "./chunk-BIQWWWJN.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -352,31 +355,27 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-RHYFF54J.js";
+} from "./chunk-TEHGS6UP.js";
 import "./chunk-RKUWKYED.js";
+import "./chunk-GOXKNSDZ.js";
+import "./chunk-IDS7MSUP.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-V7WNRZL7.js";
-import "./chunk-UTGFTJ2H.js";
-import "./chunk-XHATNRQA.js";
-import "./chunk-XAGLQITN.js";
-import "./chunk-GOXKNSDZ.js";
-import "./chunk-QRUIS3DN.js";
-import "./chunk-2RFKHEXL.js";
-import "./chunk-IDS7MSUP.js";
-import "./chunk-XFSFZCM5.js";
+} from "./chunk-LKEJ26GS.js";
+import "./chunk-LH2BYDQ5.js";
+import "./chunk-6PEXNQTX.js";
 import "./chunk-URK542T4.js";
 import {
   getCliVersion
-} from "./chunk-3F2JUWCH.js";
+} from "./chunk-YX324OPW.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-CGIDQG6J.js";
+} from "./chunk-Z2BC6UJ5.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -385,6 +384,7 @@ import {
   clearScreen,
   writeStderrLine
 } from "./chunk-OWAK7LMW.js";
+import "./chunk-XFSFZCM5.js";
 import {
   ALIBABA_PROVIDERS,
   AsyncFzf,
@@ -491,46 +491,52 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-IWALV67J.js";
-import "./chunk-T4TZQJ7W.js";
-import "./chunk-H6XPXXMH.js";
+} from "./chunk-PHOF65IG.js";
 import "./chunk-5M6IDOMF.js";
-import "./chunk-GPSKDNEE.js";
-import "./chunk-T2L47JJK.js";
-import "./chunk-X6N25LXS.js";
-import "./chunk-E2UVIFI2.js";
-import "./chunk-Q2YKNMLS.js";
-import "./chunk-XU457J4V.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-KHOVYUHX.js";
-import "./chunk-SZRN75WQ.js";
+import "./chunk-FNQ6T3CV.js";
+import "./chunk-ZOIFNCKL.js";
+import "./chunk-PWTZEM3C.js";
+import "./chunk-KRXPRVGL.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-6FZYKBKV.js";
+} from "./chunk-MZAXJAUM.js";
+import "./chunk-SZRN75WQ.js";
+import "./chunk-HTO4JFDZ.js";
 import "./chunk-CPBF7KYF.js";
-import {
-  HOOKS_CONFIG_FIELDS
-} from "./chunk-7VUQQBR7.js";
-import "./chunk-LIZRAKPB.js";
 import {
   APPROVAL_MODES,
   getStartupContextLength,
   isSystemReminderContent,
   runOutsideAgentContext
-} from "./chunk-WHGVTP7Q.js";
+} from "./chunk-L26JL52R.js";
 import "./chunk-6AM5D4ME.js";
+import "./chunk-JZA3JUDJ.js";
+import {
+  HOOKS_CONFIG_FIELDS
+} from "./chunk-3QMGYBFN.js";
 import "./chunk-JCW2R7WC.js";
 import {
   isPathWithinRoot
-} from "./chunk-57FIIFJN.js";
-import "./chunk-HTO4JFDZ.js";
+} from "./chunk-M5JM7OSF.js";
+import "./chunk-OHNBB4XR.js";
+import "./chunk-E5TUC6CA.js";
 import {
-  qwenOAuth2Events
-} from "./chunk-HABKX6LY.js";
+  osc8Hyperlink,
+  qwenOAuth2Events,
+  sanitizeForOsc,
+  supportsHyperlinks,
+  wrapForMultiplexer
+} from "./chunk-EPDRMGT4.js";
 import "./chunk-JESCGQM3.js";
-import "./chunk-32L4D2O2.js";
-import "./chunk-SRPZG4ER.js";
+import "./chunk-NH6KE4JX.js";
+import "./chunk-USTWD7QV.js";
 import {
   REASONING_EFFORT_TIERS
 } from "./chunk-XVNQMZ2I.js";
@@ -540,12 +546,17 @@ import {
 } from "./chunk-FODK6UMO.js";
 import "./chunk-GLNBDYUX.js";
 import "./chunk-DJ2GSRLV.js";
+import "./chunk-ZJHVAS7M.js";
+import "./chunk-NIBLUX3Y.js";
+import "./chunk-BPJSQIJX.js";
+import "./chunk-P3QQPMQA.js";
+import "./chunk-6FGBXPWM.js";
+import "./chunk-LS77BEZP.js";
 import {
   ApiCancelEvent,
   AuthEvent,
   ConversationFinishedEvent,
   DiscoveredMCPTool,
-  MAINLINE_CODER_MODEL,
   ModelSlashCommandEvent,
   PromptSuggestionEvent,
   SpeculationEvent,
@@ -581,7 +592,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-H4A4A2SY.js";
+} from "./chunk-CIKQ7KKO.js";
 import "./chunk-VGC4I5JJ.js";
 import {
   AUTO_MEMORY_INDEX_FILENAME,
@@ -589,30 +600,30 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-4K56OJFJ.js";
+} from "./chunk-MUP3T3AD.js";
 import {
-  DEFAULT_TOKEN_LIMIT
-} from "./chunk-CBOQ3HY7.js";
+  MAINLINE_CODER_MODEL
+} from "./chunk-IKCX4CCL.js";
+import "./chunk-46UV252V.js";
 import "./chunk-A4UCTEB5.js";
 import "./chunk-XWRJCPHC.js";
-import "./chunk-QNLNLENL.js";
 import {
-  atomicWriteFileSync
-} from "./chunk-6X4GWOPW.js";
+  DEFAULT_TOKEN_LIMIT
+} from "./chunk-UW5EOVUN.js";
+import "./chunk-2JZBVYTU.js";
+import "./chunk-5I2IWRSH.js";
 import {
-  FinishReason
-} from "./chunk-TYQMGACW.js";
-import "./chunk-TYAMGABM.js";
-import "./chunk-FCMNKVXT.js";
-import "./chunk-7362QS5B.js";
+  atomicWriteFileSync
+} from "./chunk-A5L3JMUA.js";
+import "./chunk-MB4MZHMJ.js";
 import "./chunk-HTR4WV6U.js";
-import "./chunk-M7WBGLYP.js";
+import "./chunk-BULDBTYC.js";
 import "./chunk-U7ZFW55U.js";
-import "./chunk-NPQDJGKU.js";
+import "./chunk-UUUTRMI2.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-YM3SZTH4.js";
+} from "./chunk-PR75REBZ.js";
 import {
   Storage,
   UnauthorizedError,
@@ -624,21 +635,27 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-OQB4EXO4.js";
-import "./chunk-3EHJ44GG.js";
+} from "./chunk-NL7LTRLR.js";
+import "./chunk-QAF7NMK7.js";
+import {
+  registerCleanup,
+  runExitCleanup
+} from "./chunk-PWVFN2LF.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
 } from "./chunk-QSWDGAIC.js";
 import "./chunk-Q7YDKOGY.js";
-import {
-  registerCleanup,
-  runExitCleanup
-} from "./chunk-GSX6P2JW.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
-import "./chunk-THJNPLI4.js";
+import {
+  FinishReason
+} from "./chunk-22C7BQ6D.js";
+import "./chunk-TYAMGABM.js";
+import "./chunk-FCMNKVXT.js";
+import "./chunk-AMDSOFFV.js";
+import "./chunk-TARRHLLG.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2281,10 +2298,15 @@ function isSyntheticHistoryItem(item) {
     case "stop_hook_loop":
     case "stop_hook_system_message":
       return true;
+    // Steer messages (mid-turn user injections) are typed 'user' but
+    // carry sentToModel === false; treat them as synthetic so the
+    // cancel handler can still do a full rewind when only a steer
+    // follows the real prompt.
+    case "user":
+      return item.sentToModel === false;
     // Meaningful: user input, model text, tool runs, slash-command
     // results the user explicitly asked for. Auto-restore must bail
     // when any of these appear after the candidate user prompt.
-    case "user":
     case "user_shell":
     case "gemini":
     case "gemini_content":
@@ -2328,11 +2350,18 @@ function itemsAfterAreOnlySynthetic(history, fromIndex) {
 __name(itemsAfterAreOnlySynthetic, "itemsAfterAreOnlySynthetic");
 function findLastUserItemIndex(history) {
   for (let i = history.length - 1; i >= 0; i--) {
-    if (history[i].type === "user") return i;
+    const item = history[i];
+    if (item.type === "user" && item.sentToModel !== false) return i;
   }
   return -1;
 }
 __name(findLastUserItemIndex, "findLastUserItemIndex");
+function realUserPromptTexts(history) {
+  return history.filter(
+    (item) => item.type === "user" && item.sentToModel !== false && typeof item.text === "string" && item.text.trim() !== ""
+  ).map((item) => item.text);
+}
+__name(realUserPromptTexts, "realUserPromptTexts");
 function buildThoughtHeadIdMap(items) {
   const map = /* @__PURE__ */ new Map();
   for (let i = 0; i < items.length; i++) {
@@ -2988,9 +3017,9 @@ function VirtualizedList(props, ref) {
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { width: 1, flexDirection: "column", flexShrink: 0, children: Array.from({ length: trackLen }, (_, i) => {
       const inThumb = i >= thumbTop && i < thumbTop + thumbLen;
       if (!scrollbarThumbActive) {
-        return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { children: " " }, i);
+        return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { selectable: false, children: " " }, i);
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { dimColor: !inThumb, children: inThumb ? "\u2588" : "\u2502" }, i);
+      return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Text, { dimColor: !inThumb, selectable: false, children: inThumb ? "\u2588" : "\u2502" }, i);
     }) });
   }, [
     showScrollbar,
@@ -3288,24 +3317,79 @@ function getSelectedText(frame, selection) {
     return "";
   }
   const { sx, sy, ex, ey } = selection;
-  const lines = [];
+  let text = "";
   for (let y = sy; y <= ey; y++) {
     const row = frame.cells[y];
     if (!row) {
-      lines.push("");
+      if (y < ey) {
+        text += "\n";
+      }
       continue;
     }
     const startX = y === sy ? sx : 0;
     const endX = y === ey ? ex : row.length - 1;
-    let text = "";
     for (let x = Math.max(0, startX); x <= endX && x < row.length; x++) {
-      text += row[x].value;
+      if (row[x].selectable) {
+        text += row[x].value;
+      }
+    }
+    if (y < ey) {
+      text += boundaryJoiner(frame, selection, y);
     }
-    lines.push(text.replace(/\s+$/u, ""));
   }
-  return lines.join("\n");
+  return text;
 }
 __name(getSelectedText, "getSelectedText");
+function selectedFlows(frame, selection, y) {
+  const row = frame.cells[y] ?? [];
+  const startX = y === selection.sy ? selection.sx : 0;
+  const endX = y === selection.ey ? selection.ex : row.length - 1;
+  const flows = /* @__PURE__ */ new Set();
+  for (let x = Math.max(0, startX); x <= endX && x < row.length; x++) {
+    const cell = row[x];
+    if (cell.selectable && cell.flowId !== null) {
+      flows.add(cell.flowId);
+    }
+  }
+  if (flows.size > 0) {
+    return flows;
+  }
+  for (const boundaryY of [y - 1, y]) {
+    const boundaryRow = frame.boundaries[boundaryY] ?? [];
+    for (let x = Math.max(0, startX); x <= endX && x < boundaryRow.length; x++) {
+      const claim = boundaryRow[x];
+      if (claim?.selectable) {
+        flows.add(claim.flowId);
+      }
+    }
+  }
+  return flows;
+}
+__name(selectedFlows, "selectedFlows");
+function boundaryJoiner(frame, selection, y) {
+  const currentFlows = selectedFlows(frame, selection, y);
+  const nextFlows = selectedFlows(frame, selection, y + 1);
+  const [currentFlow] = currentFlows;
+  const [nextFlow] = nextFlows;
+  if (currentFlows.size !== 1 || nextFlows.size !== 1 || currentFlow !== nextFlow) {
+    return "\n";
+  }
+  const flowId = currentFlow;
+  const claims = (frame.boundaries[y] ?? []).filter(
+    (claim) => claim !== null && claim.selectable && claim.flowId === flowId
+  );
+  if (claims.length === 0) {
+    return "\n";
+  }
+  const first = claims[0];
+  if (claims.some(
+    (claim) => claim.kind !== first.kind || claim.joiner !== first.joiner
+  )) {
+    return "\n";
+  }
+  return first.kind === "soft" ? first.joiner : "\n";
+}
+__name(boundaryJoiner, "boundaryJoiner");
 
 // packages/cli/src/ui/selection/selection-span.ts
 init_esbuild_shims();
@@ -3646,7 +3730,7 @@ var MainContent = /* @__PURE__ */ __name(() => {
         addSourceBlockCounts(runningOffsets, item.text);
         return { item, sourceCopyIndexOffsets: offsets };
       }
-      if (item.type === "user") {
+      if (item.type === "user" && item.sentToModel !== false) {
         runningOffsets = createEmptySourceCopyOffsets();
       }
       return { item, sourceCopyIndexOffsets: void 0 };
@@ -3670,7 +3754,7 @@ var MainContent = /* @__PURE__ */ __name(() => {
         addSourceBlockCounts(runningOffsets, item.text);
         return { item, sourceCopyIndexOffsets: offsets };
       }
-      if (item.type === "user") {
+      if (item.type === "user" && item.sentToModel !== false) {
         runningOffsets = createEmptySourceCopyOffsets();
       }
       return { item, sourceCopyIndexOffsets: void 0 };
@@ -5290,7 +5374,7 @@ var SessionTab = /* @__PURE__ */ __name(() => {
     Object.keys(metrics.models).length > 0 && /* @__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("Models") }),
       Object.entries(metrics.models).map(([name, m], i) => /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: SERIES_COLORS[i % SERIES_COLORS.length], children: "\u25CF " }),
+        /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: SERIES_COLORS[i % SERIES_COLORS.length], children: ICON.CIRCLE_FILLED + " " }),
         /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Text, { color: theme.text.primary, children: [
           name,
           " "
@@ -7161,7 +7245,7 @@ function SettingsDialog({
                 Text,
                 {
                   color: isActive ? theme.status.success : theme.text.secondary,
-                  children: isActive ? "\u25CF" : ""
+                  children: isActive ? ICON.CIRCLE_FILLED : ""
                 }
               ) }),
               /* @__PURE__ */ (0, import_jsx_runtime29.jsx)(Box_default, { flexGrow: 1, flexShrink: 1, children: /* @__PURE__ */ (0, import_jsx_runtime29.jsxs)(
@@ -9067,7 +9151,7 @@ function ModelIdsStep({
         const isSelected = selectedRecommendationKeys.includes(item.key);
         const textColor = isFocused ? theme.status.success : isSelected ? theme.text.accent : theme.text.primary;
         return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Box_default, { alignItems: "flex-start", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { minWidth: 4, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: textColor, children: isSelected ? "\u25C9" : "\u25CB" }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { minWidth: 4, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: textColor, children: isSelected ? ICON.RADIO_FILLED : ICON.CIRCLE_EMPTY }) }),
           /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: textColor, children: item.label }) })
         ] }, item.key);
       }) : /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.secondary, children: t("No recommended models match.") }) }),
@@ -9109,7 +9193,7 @@ function AdvancedConfigStep({
     modalityPdf,
     contextWindowSize
   } = flow.state;
-  const checkmark = /* @__PURE__ */ __name((v) => v ? "\u25C9" : "\u25CB", "checkmark");
+  const checkmark = /* @__PURE__ */ __name((v) => v ? ICON.RADIO_FILLED : ICON.CIRCLE_EMPTY, "checkmark");
   const cursor = /* @__PURE__ */ __name((index) => focusedConfigIndex === index ? "\u203A" : " ", "cursor");
   const ctxIdx = modalityEnabled ? 6 : 2;
   return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Box_default, { marginTop: 1, flexDirection: "column", children: [
@@ -10857,6 +10941,7 @@ function ModelDialog({
   isFastModelMode,
   isVoiceModelMode,
   isVisionModelMode,
+  isImageModelMode,
   persistScope,
   availableTerminalHeight
 }) {
@@ -10868,10 +10953,14 @@ function ModelDialog({
   const authType = config?.getAuthType();
   const availableModelEntries = (0, import_react34.useMemo)(() => {
     const allModels = config ? config.getAllConfiguredModels() : [];
-    const runtimeModels = allModels.filter((m) => m.isRuntimeModel);
-    const registryModels = allModels.filter(
-      (m) => !m.isRuntimeModel && (m.authType !== "qwen-oauth" /* QWEN_OAUTH */ || authType === "qwen-oauth" /* QWEN_OAUTH */) && (isFastModelMode || !m.fastOnly) && (isVoiceModelMode || !m.voiceOnly)
-    );
+    const runtimeModels = isImageModelMode ? [] : allModels.filter((m) => m.isRuntimeModel);
+    const registryModels = allModels.filter((m) => {
+      const imageModelSelector = encodeVisionModelSelector(
+        buildModelSelectionKey(m.authType, m.id, m.baseUrl)
+      );
+      const isSelectableImageModel = isImageModelMode ? m.imageOnly === true && config?.resolveImageGenerationModel(imageModelSelector) !== void 0 : m.imageOnly !== true;
+      return !m.isRuntimeModel && (m.authType !== "qwen-oauth" /* QWEN_OAUTH */ || authType === "qwen-oauth" /* QWEN_OAUTH */) && isSelectableImageModel && (isFastModelMode || !m.fastOnly) && (isVoiceModelMode || !m.voiceOnly);
+    });
     const modelsByAuthTypeMap = /* @__PURE__ */ new Map();
     for (const model of registryModels) {
       const authType2 = model.authType;
@@ -10906,7 +10995,7 @@ function ModelDialog({
       }
     }
     return result;
-  }, [authType, config, isFastModelMode, isVoiceModelMode]);
+  }, [authType, config, isFastModelMode, isImageModelMode, isVoiceModelMode]);
   const MODEL_OPTIONS = (0, import_react34.useMemo)(
     () => availableModelEntries.map(
       ({ authType: t2, model, isRuntime, snapshotId }) => {
@@ -10972,7 +11061,9 @@ function ModelDialog({
   const fastModelSetting = settings?.merged?.fastModel;
   const voiceModelSetting = settings?.merged?.voiceModel;
   const visionModelSetting = settings?.merged?.visionModel;
+  const imageModelSetting = settings?.merged?.imageModel;
   const parsedVisionModelValue = parseVisionModelSetting(visionModelSetting);
+  const parsedImageModelValue = parseVisionModelSetting(imageModelSetting);
   const parsedFastModelSetting = (0, import_react34.useMemo)(() => {
     if (!isFastModelMode) return void 0;
     try {
@@ -10989,8 +11080,16 @@ function ModelDialog({
       return void 0;
     }
   }, [parsedVisionModelValue?.selector, isVisionModelMode]);
-  const preferredModelId = isFastModelMode && parsedFastModelSetting ? parsedFastModelSetting.modelId : isVisionModelMode && parsedVisionModelSetting ? parsedVisionModelSetting.modelId : config?.getModel() || MAINLINE_CODER_MODEL;
-  const activeRuntimeSnapshot = isFastModelMode || isVoiceModelMode || isVisionModelMode ? void 0 : config?.getActiveRuntimeModelSnapshot?.();
+  const parsedImageModelSetting = (0, import_react34.useMemo)(() => {
+    if (!isImageModelMode) return void 0;
+    try {
+      return resolveModelId(parsedImageModelValue?.selector);
+    } catch {
+      return void 0;
+    }
+  }, [parsedImageModelValue?.selector, isImageModelMode]);
+  const preferredModelId = isFastModelMode && parsedFastModelSetting ? parsedFastModelSetting.modelId : isVisionModelMode && parsedVisionModelSetting ? parsedVisionModelSetting.modelId : isImageModelMode && parsedImageModelSetting ? parsedImageModelSetting.modelId : config?.getModel() || MAINLINE_CODER_MODEL;
+  const activeRuntimeSnapshot = isFastModelMode || isVoiceModelMode || isVisionModelMode || isImageModelMode ? void 0 : config?.getActiveRuntimeModelSnapshot?.();
   const currentBaseUrl = config?.getModelsConfig().getGenerationConfig()?.baseUrl;
   const preferredFastModelEntry = isFastModelMode && parsedFastModelSetting ? parsedFastModelSetting.authType ? availableModelEntries.find(
     ({ authType: t2, model }) => t2 === parsedFastModelSetting.authType && model.id === parsedFastModelSetting.modelId
@@ -11006,6 +11105,11 @@ function ModelDialog({
   ) : availableModelEntries.find(
     ({ model }) => model.id === parsedVisionModelSetting.modelId && matchesVisionModelBaseUrl(model)
   ) : void 0;
+  const preferredImageModelEntry = isImageModelMode && parsedImageModelSetting ? parsedImageModelSetting.authType ? availableModelEntries.find(
+    ({ authType: t2, model }) => t2 === parsedImageModelSetting.authType && model.id === parsedImageModelSetting.modelId && (!parsedImageModelValue?.baseUrl || model.baseUrl === parsedImageModelValue.baseUrl)
+  ) : availableModelEntries.find(
+    ({ model }) => model.id === parsedImageModelSetting.modelId && (!parsedImageModelValue?.baseUrl || model.baseUrl === parsedImageModelValue.baseUrl)
+  ) : void 0;
   const preferredKey = activeRuntimeSnapshot ? activeRuntimeSnapshot.id : preferredVoiceModelEntry ? buildModelSelectionKey(
     preferredVoiceModelEntry.authType,
     preferredVoiceModelEntry.model.id,
@@ -11014,14 +11118,22 @@ function ModelDialog({
     preferredVisionModelEntry.authType,
     preferredVisionModelEntry.model.id,
     preferredVisionModelEntry.model.baseUrl
+  ) : preferredImageModelEntry ? buildModelSelectionKey(
+    preferredImageModelEntry.authType,
+    preferredImageModelEntry.model.id,
+    preferredImageModelEntry.model.baseUrl
   ) : preferredFastModelEntry ? buildModelSelectionKey(
     preferredFastModelEntry.authType,
     preferredFastModelEntry.model.id,
     preferredFastModelEntry.model.baseUrl
-  ) : authType ? buildModelSelectionKey(authType, preferredModelId, currentBaseUrl) : "";
+  ) : authType ? buildModelSelectionKey(
+    authType,
+    preferredModelId,
+    currentBaseUrl
+  ) : "";
   useKeypress(
     (key) => {
-      if (key.name === "escape" || key.name === "left" && (isFastModelMode || isVoiceModelMode || isVisionModelMode)) {
+      if (key.name === "escape" || key.name === "left" && (isFastModelMode || isVoiceModelMode || isVisionModelMode || isImageModelMode)) {
         onClose();
       }
     },
@@ -11134,6 +11246,36 @@ ${t("\u26A0 '{{model}}' is not a known image-capable model; the vision bridge ma
         onClose();
         return;
       }
+      if (isImageModelMode) {
+        if (!selectedEntry || !config) {
+          setErrorMessage(t("Selected image model is unavailable."));
+          return;
+        }
+        const imageModel = encodeVisionModelSelector(selected);
+        const imageModelDisplay = parseVisionModelSetting(imageModel)?.selector ?? imageModel;
+        if (!config.resolveImageGenerationModel(imageModel)) {
+          setErrorMessage(
+            t(
+              "'{{model}}' must declare a valid HTTPS baseUrl and credential environment variable.",
+              { model: imageModelDisplay }
+            )
+          );
+          return;
+        }
+        const scope = resolvePersistScope(settings, persistScope);
+        settings.setValue(scope, "imageModel", imageModel);
+        await config.setImageModel(imageModel);
+        const scopeSuffix = persistScope === "workspace" ? t(" (this project)") : persistScope === "user" ? t(" (global)") : "";
+        uiState?.historyManager.addItem(
+          {
+            type: "success",
+            text: `${t("Image Model")}: ${imageModelDisplay}${scopeSuffix}`
+          },
+          Date.now()
+        );
+        onClose();
+        return;
+      }
       const isQwenOAuthSelection = selected.startsWith(`${"qwen-oauth" /* QWEN_OAUTH */}::`) || selected.startsWith("$runtime|") && selected.split("|")[1] === "qwen-oauth" /* QWEN_OAUTH */;
       const isRuntimeOAuthSelection = selected.startsWith(
         `$runtime|${"qwen-oauth" /* QWEN_OAUTH */}|`
@@ -11221,6 +11363,7 @@ ${baseErrorMessage}`);
       isFastModelMode,
       isVoiceModelMode,
       isVisionModelMode,
+      isImageModelMode,
       availableModelEntries,
       persistScope
     ]
@@ -11235,7 +11378,7 @@ ${baseErrorMessage}`);
       padding: 1,
       width: "100%",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { bold: true, children: (isVoiceModelMode ? t("Select Voice Model") : isVisionModelMode ? t("Select Vision Model") : isFastModelMode ? t("Select Fast Model") : t("Select Model")) + (persistScope === "workspace" ? t(" (this project)") : persistScope === "user" ? t(" (global)") : "") }),
+        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { bold: true, children: (isVoiceModelMode ? t("Select Voice Model") : isVisionModelMode ? t("Select Vision Model") : isImageModelMode ? t("Select Image Model") : isFastModelMode ? t("Select Fast Model") : t("Select Model")) + (persistScope === "workspace" ? t(" (this project)") : persistScope === "user" ? t(" (global)") : "") }),
         !hasModels ? /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { marginTop: 1, flexDirection: "column", children: [
           /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.status.warning, children: t(
             "No models available for the current authentication type ({{authType}}).",
@@ -11331,7 +11474,9 @@ function ArenaStartDialog({
   const [selectedKeys, setSelectedKeys] = (0, import_react35.useState)([]);
   const modelItems = (0, import_react35.useMemo)(() => {
     const allModels = config.getAllConfiguredModels();
-    const selectableModels = allModels.filter((model) => !model.isRuntimeModel);
+    const selectableModels = allModels.filter(
+      (model) => !model.isRuntimeModel && !model.imageOnly
+    );
     return selectableModels.map((model) => {
       const token = `${model.authType}:${model.id}`;
       const isQwenOauth = model.authType === "qwen-oauth" /* QWEN_OAUTH */;
@@ -13925,7 +14070,7 @@ var AgentSelectionStep = /* @__PURE__ */ __name(({
   const renderAgentItem = /* @__PURE__ */ __name((agent, index, isSelected) => {
     const textColor = isSelected ? theme.text.accent : theme.text.primary;
     return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box_default, { alignItems: "center", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Text, { color: isSelected ? theme.text.accent : theme.text.primary, children: isSelected ? "\u25CF" : " " }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Text, { color: isSelected ? theme.text.accent : theme.text.primary, children: isSelected ? ICON.CIRCLE_FILLED : " " }) }),
       /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Text, { color: textColor, wrap: "truncate", children: [
         agent.name,
         agent.isBuiltin && /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Text, { color: isSelected ? theme.text.accent : theme.text.secondary, children: [
@@ -18000,7 +18145,7 @@ var InstalledTab = /* @__PURE__ */ __name(({
       const item = row.item;
       const globalIndex = indexByKey.get(item.key) ?? -1;
       const isSelected = globalIndex === selectedIndex;
-      const marker = isSelected ? "\u25CF" : " ";
+      const marker = isSelected ? ICON.CIRCLE_FILLED : " ";
       const isChild = item.kind === "mcp" && !!item.parentExtension;
       const kindBadge = item.kind === "mcp" ? t("MCP") : t("Extension v{{version}}", {
         // Persisted marketplace metadata: `version` is stored verbatim
@@ -18039,7 +18184,10 @@ var InstalledTab = /* @__PURE__ */ __name(({
             isChild ? "  \u2514 " : "",
             item.name
           ] }),
-          item.isFavorite ? /* @__PURE__ */ (0, import_jsx_runtime77.jsx)(Text, { color: theme.status.warning, children: " \u2605" }) : null
+          item.isFavorite ? /* @__PURE__ */ (0, import_jsx_runtime77.jsxs)(Text, { color: theme.status.warning, children: [
+            " ",
+            ICON.STAR
+          ] }) : null
         ] }),
         /* @__PURE__ */ (0, import_jsx_runtime77.jsxs)(Text, { color: isSelected ? theme.text.accent : theme.text.secondary, children: [
           kindBadge,
@@ -18462,7 +18610,7 @@ var SourcesTab = /* @__PURE__ */ __name(({
             count: String(installedHere.length)
           }) }),
           installedHere.slice(0, INSTALLED_PREVIEW_LIMIT).map((p) => /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)(Box_default, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: theme.status.success, children: "\u25CF" }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: theme.status.success, children: ICON.CIRCLE_FILLED }) }),
             /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: theme.text.primary, children: stripUnsafeCharacters(p.name) })
           ] }, p.name)),
           installedHere.length > INSTALLED_PREVIEW_LIMIT ? /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: theme.text.secondary, children: t("... and {{count}} more", {
@@ -18513,7 +18661,7 @@ var SourcesTab = /* @__PURE__ */ __name(({
     const isSelected = index === selectedIndex;
     const labelColor = isSelected ? theme.text.accent : isAction ? theme.text.link : theme.text.primary;
     return /* @__PURE__ */ (0, import_jsx_runtime78.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: isSelected ? theme.text.accent : theme.text.primary, children: isSelected ? "\u25CF" : " " }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Box_default, { minWidth: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: isSelected ? theme.text.accent : theme.text.primary, children: isSelected ? ICON.CIRCLE_FILLED : " " }) }),
       /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: labelColor, children: label }) }),
       rightText ? /* @__PURE__ */ (0, import_jsx_runtime78.jsx)(Text, { color: theme.text.secondary, children: rightText }) : null
     ] }, `row-${index}`);
@@ -18888,7 +19036,8 @@ var ServerListStep = /* @__PURE__ */ __name(({
     servers.some(
       (s) => s.status === "disconnected" && !s.isDisabled && !s.approvalState
     ) && /* @__PURE__ */ (0, import_jsx_runtime80.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime80.jsxs)(Text, { color: theme.status.warning, children: [
-      "\u203B ",
+      ICON.REFERENCE,
+      " ",
       t("Run qwen --debug to see error logs")
     ] }) })
   ] });
@@ -22501,7 +22650,7 @@ __name(treeRowPrefix, "treeRowPrefix");
 function statusGlyph(status) {
   switch (status) {
     case "running":
-      return "\u25CB";
+      return ICON.CIRCLE_EMPTY;
     case "paused":
       return "\u23F8";
     case "completed":
@@ -22510,7 +22659,7 @@ function statusGlyph(status) {
     case "cancelled":
       return "\u2716";
     default:
-      return "\u25CB";
+      return ICON.CIRCLE_EMPTY;
   }
 }
 __name(statusGlyph, "statusGlyph");
@@ -24133,6 +24282,7 @@ var DialogManager = /* @__PURE__ */ __name(({
         isFastModelMode: uiState.isFastModelMode,
         isVoiceModelMode: uiState.isVoiceModelMode,
         isVisionModelMode: uiState.isVisionModelMode,
+        isImageModelMode: uiState.isImageModelMode,
         persistScope: uiState.modelDialogPersistScope,
         availableTerminalHeight: listDialogHeight
       }
@@ -24664,6 +24814,23 @@ var PrepareLabel = import_react80.default.memo(_PrepareLabel);
 
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
 var import_jsx_runtime103 = __toESM(require_jsx_runtime(), 1);
+function categoryLabel(cat) {
+  switch (cat) {
+    case "all":
+      return t("All");
+    case "file":
+      return t("Files");
+    case "session":
+      return t("Sessions");
+    case "mcp":
+      return t("MCP");
+    case "extension":
+      return t("Extensions");
+    default:
+      return cat;
+  }
+}
+__name(categoryLabel, "categoryLabel");
 var MIN_DESCRIPTION_WIDTH = 12;
 var ACTIVE_MARKER_WIDTH = 2;
 function normalizeDescription(description) {
@@ -24681,27 +24848,31 @@ function SuggestionsDisplay({
   expandedIndex,
   onHoverIndex,
   onSelectIndex,
-  mouseEnabled
+  mouseEnabled,
+  activeCategory = "all",
+  availableCategories
 }) {
   const containerRef = (0, import_react81.useRef)(null);
   const itemRefs = (0, import_react81.useRef)([]);
   if (isLoading) {
     return /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { width, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: "gray", children: t("Loading suggestions...") }) });
   }
-  if (suggestions.length === 0) {
+  const filteredSuggestions = activeCategory === "all" ? suggestions : suggestions.filter((s) => (s.category ?? "file") === activeCategory);
+  const showTabBar = (availableCategories?.length ?? 0) > 2;
+  if (filteredSuggestions.length === 0) {
     return null;
   }
   const startIndex = scrollOffset;
   const endIndex = Math.min(
     scrollOffset + MAX_SUGGESTIONS_TO_SHOW,
-    suggestions.length
+    filteredSuggestions.length
   );
-  const visibleSuggestions = suggestions.slice(startIndex, endIndex);
+  const visibleSuggestions = filteredSuggestions.slice(startIndex, endIndex);
   const getFullLabel = /* @__PURE__ */ __name((s) => [s.label, s.argumentHint, s.sourceBadge].filter(Boolean).join(" "), "getFullLabel");
   const maxLabelLength = Math.max(
-    ...suggestions.map((s) => getFullLabel(s).length)
+    ...filteredSuggestions.map((s) => getFullLabel(s).length)
   );
-  const describedLabelLengths = suggestions.filter((s) => s.description).map((s) => getFullLabel(s).length);
+  const describedLabelLengths = filteredSuggestions.filter((s) => s.description).map((s) => getFullLabel(s).length);
   const contentWidth = Math.max(width - ACTIVE_MARKER_WIDTH, 1);
   const labelColumnWidth = mode === "slash" ? Math.min(maxLabelLength, Math.floor(contentWidth * 0.5)) : describedLabelLengths.length > 0 ? Math.min(
     Math.max(...describedLabelLengths),
@@ -24718,6 +24889,20 @@ function SuggestionsDisplay({
         onSelectIndex
       }
     ),
+    showTabBar && availableCategories && /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { flexDirection: "row", marginBottom: 1, children: [
+      availableCategories.map((cat, i) => {
+        const active = cat === activeCategory;
+        return /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { marginLeft: i === 0 ? 0 : 1, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(
+          Text,
+          {
+            color: active ? theme.background.primary : theme.text.secondary,
+            backgroundColor: active ? theme.text.accent : void 0,
+            children: ` ${categoryLabel(cat)} `
+          }
+        ) }, cat);
+      }),
+      /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: theme.text.secondary, children: t("(Ctrl+\u2190/\u2192 to switch)") }) })
+    ] }),
     scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
     visibleSuggestions.map((suggestion, index) => {
       const originalIndex = startIndex + index;
@@ -24783,12 +24968,12 @@ function SuggestionsDisplay({
         `${suggestion.value}-${originalIndex}`
       );
     }),
-    endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: "gray", children: "\u25BC" }),
-    suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Text, { color: "gray", children: [
+    endIndex < filteredSuggestions.length && /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Text, { color: "gray", children: "\u25BC" }),
+    filteredSuggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Text, { color: "gray", children: [
       "(",
       activeIndex + 1,
       "/",
-      suggestions.length,
+      filteredSuggestions.length,
       ")"
     ] })
   ] });
@@ -25014,8 +25199,15 @@ var import_react85 = __toESM(require_react(), 1);
 // packages/cli/src/ui/hooks/useCompletion.ts
 init_esbuild_shims();
 var import_react84 = __toESM(require_react(), 1);
+var CATEGORY_ORDER = [
+  "file",
+  "session",
+  "mcp",
+  "extension"
+];
 function useCompletion(options = {}) {
-  const [suggestions, setSuggestions] = (0, import_react84.useState)([]);
+  const [rawSuggestions, setSuggestions] = (0, import_react84.useState)([]);
+  const [activeCategory, setActiveCategory] = (0, import_react84.useState)("all");
   const [activeSuggestionIndex, setActiveSuggestionIndex] = (0, import_react84.useState)(-1);
   const [visibleStartIndex, setVisibleStartIndex] = (0, import_react84.useState)(0);
   const [showSuggestions, setShowSuggestions] = (0, import_react84.useState)(false);
@@ -25023,8 +25215,48 @@ function useCompletion(options = {}) {
   const [isPerfectMatch, setIsPerfectMatch] = (0, import_react84.useState)(false);
   const [dismissed, setDismissed] = (0, import_react84.useState)(false);
   const skipNextClearRef = (0, import_react84.useRef)(false);
+  const availableCategories = (0, import_react84.useMemo)(() => {
+    const present = new Set(rawSuggestions.map((s) => s.category ?? "file"));
+    const ordered = CATEGORY_ORDER.filter((c) => present.has(c));
+    return ordered.length > 1 ? ["all", ...ordered] : ["all"];
+  }, [rawSuggestions]);
+  const suggestions = (0, import_react84.useMemo)(
+    () => activeCategory === "all" ? rawSuggestions : rawSuggestions.filter(
+      (s) => (s.category ?? "file") === activeCategory
+    ),
+    [rawSuggestions, activeCategory]
+  );
+  (0, import_react84.useEffect)(() => {
+    if (!availableCategories.includes(activeCategory)) {
+      setActiveCategory("all");
+      setActiveSuggestionIndex(0);
+      setVisibleStartIndex(0);
+    }
+  }, [availableCategories, activeCategory]);
+  (0, import_react84.useEffect)(() => {
+    setActiveSuggestionIndex(
+      (prev) => prev >= suggestions.length && suggestions.length > 0 ? suggestions.length - 1 : prev
+    );
+    setVisibleStartIndex(
+      (prev) => prev >= suggestions.length ? Math.max(0, suggestions.length - MAX_SUGGESTIONS_TO_SHOW) : prev
+    );
+  }, [suggestions.length]);
+  const switchCategory = (0, import_react84.useCallback)(
+    (direction) => {
+      setActiveCategory((cur) => {
+        const idx = availableCategories.indexOf(cur);
+        if (idx === -1) return "all";
+        const next = (idx + direction + availableCategories.length) % availableCategories.length;
+        return availableCategories[next];
+      });
+      setActiveSuggestionIndex(0);
+      setVisibleStartIndex(0);
+    },
+    [availableCategories]
+  );
   const resetCompletionState = (0, import_react84.useCallback)(() => {
     setSuggestions([]);
+    setActiveCategory("all");
     setActiveSuggestionIndex(-1);
     setVisibleStartIndex(0);
     setShowSuggestions(false);
@@ -25098,7 +25330,10 @@ function useCompletion(options = {}) {
     resetCompletionState,
     dismissCompletion,
     navigateUp,
-    navigateDown
+    navigateDown,
+    activeCategory,
+    availableCategories,
+    switchCategory
   };
 }
 __name(useCompletion, "useCompletion");
@@ -25220,6 +25455,52 @@ var import_react88 = __toESM(require_react(), 1);
 // packages/cli/src/ui/hooks/useAtCompletion.ts
 init_esbuild_shims();
 var import_react86 = __toESM(require_react(), 1);
+
+// packages/cli/src/ui/hooks/session-completion.ts
+init_esbuild_shims();
+var MAX_SESSION_SUGGESTIONS = 20;
+var SESSION_LIST_CACHE_TTL_MS = 3e3;
+var listingCache = /* @__PURE__ */ new Map();
+async function listSessionsCached(cwd3, nowMs) {
+  const cached = listingCache.get(cwd3);
+  if (cached && cached.expiresAt > nowMs) {
+    return cached.items;
+  }
+  try {
+    const res = await new SessionService(cwd3).listSessions({
+      size: MAX_SESSION_SUGGESTIONS
+    });
+    listingCache.set(cwd3, {
+      items: res.items,
+      expiresAt: nowMs + SESSION_LIST_CACHE_TTL_MS
+    });
+    return res.items;
+  } catch {
+    return [];
+  }
+}
+__name(listSessionsCached, "listSessionsCached");
+async function getSessionSuggestions(cwd3, pattern, nowMs = Date.now()) {
+  const items = await listSessionsCached(cwd3, nowMs);
+  const stripped = pattern.startsWith(SESSION_MENTION_PREFIX) ? pattern.slice(SESSION_MENTION_PREFIX.length) : pattern.toLowerCase() === "session" ? "" : pattern;
+  const needle = stripped.trim().toLowerCase();
+  return items.map((s) => {
+    const label = s.customTitle?.trim() || s.prompt || s.sessionId;
+    const description = s.customTitle ? s.prompt : void 0;
+    return {
+      label,
+      value: buildSessionRef(s.sessionId),
+      description,
+      sourceBadge: t("Session"),
+      category: "session"
+    };
+  }).filter(
+    (sug) => needle.length === 0 ? true : `${sug.label} ${sug.description ?? ""}`.toLowerCase().includes(needle)
+  );
+}
+__name(getSessionSuggestions, "getSessionSuggestions");
+
+// packages/cli/src/ui/hooks/useAtCompletion.ts
 function rankResourceMatch(uri, friendly, query) {
   if (uri.startsWith(query)) return 0;
   if (friendly.startsWith(query)) return 1;
@@ -25464,13 +25745,21 @@ function useAtCompletion(props) {
         ...mcpServerMentionSuggestions,
         ...serverSuggestions,
         ...globalResourceSuggestions
-      ];
+      ].map((s) => ({ ...s, category: s.category ?? "mcp" }));
+      const sessionPromise = getSessionSuggestions(cwd3, state.pattern);
       if (!fileSearch.current) {
-        if (mcpSuggestions.length > 0) {
+        const sessionSuggestions = await sessionPromise.catch(
+          () => []
+        );
+        if (cancelled) {
+          return;
+        }
+        const scoped = [...mcpSuggestions, ...sessionSuggestions];
+        if (scoped.length > 0) {
           if (slowSearchTimer.current) {
             clearTimeout(slowSearchTimer.current);
           }
-          dispatch({ type: "SEARCH_SUCCESS", payload: mcpSuggestions });
+          dispatch({ type: "SEARCH_SUCCESS", payload: scoped });
         }
         return;
       }
@@ -25496,16 +25785,34 @@ function useAtCompletion(props) {
         const fileSuggestions = results.map((p) => ({
           label: p,
           value: escapePath(p),
-          isDirectory: p.endsWith("/")
+          isDirectory: p.endsWith("/"),
+          category: "file"
         }));
+        const sessionSuggestions = await sessionPromise.catch(
+          () => []
+        );
+        if (controller.signal.aborted || cancelled) {
+          return;
+        }
         dispatch({
           type: "SEARCH_SUCCESS",
-          payload: [...mcpSuggestions, ...fileSuggestions]
+          payload: [
+            ...mcpSuggestions,
+            ...fileSuggestions,
+            ...sessionSuggestions
+          ]
         });
       } catch (error) {
         if (!(error instanceof Error && error.name === "AbortError")) {
-          if (mcpSuggestions.length > 0) {
-            dispatch({ type: "SEARCH_SUCCESS", payload: mcpSuggestions });
+          const sessionSuggestions = await sessionPromise.catch(
+            () => []
+          );
+          if (cancelled) {
+            return;
+          }
+          const scoped = [...mcpSuggestions, ...sessionSuggestions];
+          if (scoped.length > 0) {
+            dispatch({ type: "SEARCH_SUCCESS", payload: scoped });
           } else {
             dispatch({ type: "ERROR" });
           }
@@ -26164,7 +26471,10 @@ function useCommandCompletion(buffer, cwd3, slashCommands, commandContext, rever
     resetCompletionState,
     dismissCompletion,
     navigateUp,
-    navigateDown
+    navigateDown,
+    activeCategory,
+    availableCategories,
+    switchCategory
   } = useCompletion({ query });
   useAtCompletion({
     enabled: completionMode === "AT" /* AT */,
@@ -26315,7 +26625,10 @@ function useCommandCompletion(buffer, cwd3, slashCommands, commandContext, rever
     navigateDown,
     handleAutocomplete,
     completionMode,
-    midInputGhostText
+    midInputGhostText,
+    activeCategory,
+    availableCategories,
+    switchCategory
   };
 }
 __name(useCommandCompletion, "useCommandCompletion");
@@ -27147,7 +27460,7 @@ var FeedbackDialog = /* @__PURE__ */ __name(() => {
   );
   return /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { flexDirection: "column", marginY: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: "cyan", children: "\u25CF " }),
+      /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { color: "cyan", children: ICON.CIRCLE_FILLED + " " }),
       /* @__PURE__ */ (0, import_jsx_runtime105.jsx)(Text, { bold: true, children: t("How is Qwen doing this session? (optional)") })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime105.jsxs)(Box_default, { marginTop: 1, children: [
@@ -29510,6 +29823,18 @@ ${currentText}`);
         return true;
       }
       if (showCompletionSuggestions) {
+        if ((completion.availableCategories?.length ?? 0) > 2) {
+          if (keyMatchers["completionTabRight" /* COMPLETION_TAB_RIGHT */](key)) {
+            completion.switchCategory(1);
+            setExpandedSuggestionIndex(-1);
+            return true;
+          }
+          if (keyMatchers["completionTabLeft" /* COMPLETION_TAB_LEFT */](key)) {
+            completion.switchCategory(-1);
+            setExpandedSuggestionIndex(-1);
+            return true;
+          }
+        }
         if (completion.suggestions.length > 1) {
           const isCompletionUpKey = keyMatchers["completionUp" /* COMPLETION_UP */](key);
           const isCompletionDownKey = keyMatchers["completionDown" /* COMPLETION_DOWN */](key);
@@ -30050,6 +30375,8 @@ ${currentText}`);
         mode: buffer.text.startsWith("/") && !reverseSearchActive && !commandSearchActive ? "slash" : "reverse",
         expandedIndex: expandedSuggestionIndex,
         mouseEnabled: mouseInteractionsEnabled,
+        activeCategory: suggestionsFromExport || commandSearchActive || reverseSearchActive ? void 0 : completion.activeCategory,
+        availableCategories: suggestionsFromExport || commandSearchActive || reverseSearchActive ? void 0 : completion.availableCategories,
         onHoverIndex: suggestionsFromExport ? void 0 : handleSuggestionHover,
         onSelectIndex: suggestionsFromExport ? void 0 : handleSuggestionSelect
       }
@@ -30847,7 +31174,8 @@ var CronPill = /* @__PURE__ */ __name(({ count }) => {
   if (count <= 0) return null;
   const noun = count === 1 ? "scheduled task" : "scheduled tasks";
   return /* @__PURE__ */ (0, import_jsx_runtime115.jsxs)(Text, { color: theme.text.accent, children: [
-    "\u25CE ",
+    ICON.BULLSEYE,
+    " ",
     count,
     " ",
     noun
@@ -30856,11 +31184,24 @@ var CronPill = /* @__PURE__ */ __name(({ count }) => {
 
 // packages/cli/src/ui/components/Footer.tsx
 var import_jsx_runtime116 = __toESM(require_jsx_runtime(), 1);
+var PasteProgressBar = /* @__PURE__ */ __name(({
+  progress
+}) => {
+  const { receivedBytes } = progress;
+  const kb = receivedBytes / 1024;
+  const label = kb >= 1 ? `${kb.toFixed(0)} KB` : `${receivedBytes} B`;
+  return /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Text, { dimColor: true, children: [
+    t("Pasting\u2026"),
+    " ",
+    label
+  ] });
+}, "PasteProgressBar");
 var Footer = /* @__PURE__ */ __name(() => {
   const uiState = useUIState();
   const config = useConfig();
   const settings = useSettings();
   const { vimEnabled, vimMode } = useVimModeState();
+  const { pasteProgress } = useKeypressContext();
   const {
     lines: statusLineLines,
     useThemeColors,
@@ -30879,7 +31220,7 @@ var Footer = /* @__PURE__ */ __name(() => {
   const debugMode = config.getDebugMode();
   const contextWindowSize = config.getContentGeneratorConfig()?.contextWindowSize;
   const suppressHint = statusLineLines.length > 0;
-  const leftBottomContent = uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("Press Ctrl+C again to exit.") }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("Press Ctrl+D again to exit.") }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Press Esc again to clear.") }) : uiState.rewindEscPending ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Press Esc again to rewind conversation.") }) : vimEnabled && vimMode === "INSERT" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: "-- INSERT --" }) : vimEnabled && vimMode === "NORMAL" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: "-- NORMAL --" }) : uiState.shellModeActive ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(ShellModeIndicator, {}) : configInitMessage ? /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Text, { color: theme.text.secondary, children: [
+  const leftBottomContent = uiState.ctrlCPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("Press Ctrl+C again to exit.") }) : uiState.ctrlDPressedOnce ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.status.warning, children: t("Press Ctrl+D again to exit.") }) : uiState.showEscapePrompt ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Press Esc again to clear.") }) : pasteProgress.active ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(PasteProgressBar, { progress: pasteProgress }) : uiState.rewindEscPending ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: t("Press Esc again to rewind conversation.") }) : vimEnabled && vimMode === "INSERT" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: "-- INSERT --" }) : vimEnabled && vimMode === "NORMAL" ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(Text, { color: theme.text.secondary, children: "-- NORMAL --" }) : uiState.shellModeActive ? /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(ShellModeIndicator, {}) : configInitMessage ? /* @__PURE__ */ (0, import_jsx_runtime116.jsxs)(Text, { color: theme.text.secondary, children: [
     /* @__PURE__ */ (0, import_jsx_runtime116.jsx)(GeminiSpinner, {}),
     " ",
     configInitMessage
@@ -31374,9 +31715,9 @@ __name(getStickyTodoMaxVisibleItemsForMode, "getStickyTodoMaxVisibleItemsForMode
 // packages/cli/src/ui/components/StickyTodoList.tsx
 var import_jsx_runtime121 = __toESM(require_jsx_runtime(), 1);
 var STATUS_ICONS = {
-  pending: "\u25CB",
-  in_progress: "\u25D0",
-  completed: "\u25CF"
+  pending: ICON.CIRCLE_EMPTY,
+  in_progress: ICON.CIRCLE_LEFT_HALF,
+  completed: ICON.CIRCLE_FILLED
 };
 function clampVisibleTodoCount(value) {
   if (!Number.isFinite(value)) {
@@ -33075,16 +33416,21 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
   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)(
     (options) => {
       const voiceModelMode = options?.voiceModelMode ?? false;
       const visionModelMode = options?.visionModelMode ?? false;
+      const imageModelMode = options?.imageModelMode ?? false;
       setIsFastModelMode(
-        voiceModelMode || visionModelMode ? false : options?.fastModelMode ?? false
+        voiceModelMode || visionModelMode || imageModelMode ? false : options?.fastModelMode ?? false
+      );
+      setIsVoiceModelMode(
+        visionModelMode || imageModelMode ? false : voiceModelMode
       );
-      setIsVoiceModelMode(visionModelMode ? false : voiceModelMode);
-      setIsVisionModelMode(visionModelMode);
+      setIsVisionModelMode(imageModelMode ? false : visionModelMode);
+      setIsImageModelMode(imageModelMode);
       setModelDialogPersistScope(options?.persistScope);
       setIsModelDialogOpen(true);
     },
@@ -33095,6 +33441,7 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
     setIsFastModelMode(false);
     setIsVoiceModelMode(false);
     setIsVisionModelMode(false);
+    setIsImageModelMode(false);
     setModelDialogPersistScope(void 0);
   }, []);
   return {
@@ -33102,6 +33449,7 @@ var useModelCommand = /* @__PURE__ */ __name(() => {
     isFastModelMode,
     isVoiceModelMode,
     isVisionModelMode,
+    isImageModelMode,
     modelDialogPersistScope,
     openModelDialog,
     closeModelDialog
@@ -33202,6 +33550,7 @@ var useEffortCommand = /* @__PURE__ */ __name((loadedSettings, config, addItem)
 init_esbuild_shims();
 var import_react126 = __toESM(require_react(), 1);
 import { randomUUID } from "node:crypto";
+var BACKGROUND_WORK_BRANCH_BLOCKED_MESSAGE = "Stop the current session's running background tasks before branching the conversation.";
 function deriveFirstPrompt(messages) {
   for (const record of messages) {
     if (record.type !== "user") continue;
@@ -33223,6 +33572,16 @@ function useBranchCommand(options) {
   const handleBranch = (0, import_react126.useCallback)(
     async (name) => {
       if (!config) return;
+      if (hasBlockingBackgroundWork(config)) {
+        historyManager.addItem(
+          {
+            type: "error",
+            text: t(BACKGROUND_WORK_BRANCH_BLOCKED_MESSAGE)
+          },
+          Date.now()
+        );
+        return;
+      }
       const oldSessionId = config.getSessionId();
       const newSessionId = randomUUID();
       const sessionService = config.getSessionService();
@@ -33276,6 +33635,7 @@ function useBranchCommand(options) {
         historyManager.clearItems();
         historyManager.loadHistory(uiHistoryItems);
         uiSwapped = true;
+        resetBackgroundStateForSessionSwitch(config);
         try {
           restoreGoalFromHistory(
             uiHistoryItems,
@@ -33394,6 +33754,7 @@ function useResumeCommand(options) {
       const oldSessionId = config.getSessionId();
       let coreSwapped = false;
       let uiSwapped = false;
+      let recoveredBackgroundAgentsNotice = null;
       try {
         const cwd3 = config.getTargetDir();
         const sessionService = new SessionService(cwd3);
@@ -33434,22 +33795,30 @@ function useResumeCommand(options) {
         await config.getGeminiClient()?.initialize?.();
         const recovered = await config.loadPausedBackgroundAgents(sessionId);
         if (recovered.length > 0) {
-          const recoveredMessage = {
-            type: "info" /* INFO */,
-            text: config.getBackgroundAgentResumeService().buildRecoveredBackgroundAgentsNotice(recovered.length)
-          };
-          addItem(recoveredMessage, Date.now());
+          recoveredBackgroundAgentsNotice = config.getBackgroundAgentResumeService().buildRecoveredBackgroundAgentsNotice(recovered.length);
         }
         startNewSession(sessionId);
         setSessionName?.(customTitle ?? null);
         clearItems();
         loadHistory(uiHistoryItems);
+        if (recoveredBackgroundAgentsNotice) {
+          addItem(
+            {
+              type: "info" /* INFO */,
+              text: recoveredBackgroundAgentsNotice
+            },
+            Date.now()
+          );
+        }
         uiSwapped = true;
         remount?.();
       } catch (error) {
         if (coreSwapped && !uiSwapped) {
           try {
+            resetBackgroundStateForSessionSwitch(config);
             config.startNewSession(oldSessionId, void 0);
+            await config.loadPausedBackgroundAgents(oldSessionId).catch(() => {
+            });
           } catch (rollbackErr) {
             config.getDebugLogger().warn(
               `Rollback after failed /resume init failed: ${rollbackErr}`
@@ -34509,6 +34878,12 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
                         persistScope: result.persistScope
                       });
                       return { type: "handled" };
+                    case "image-model":
+                      actions.openModelDialog({
+                        imageModelMode: true,
+                        persistScope: result.persistScope
+                      });
+                      return { type: "handled" };
                     case "trust":
                       actions.openTrustDialog();
                       return { type: "handled" };
@@ -35931,9 +36306,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [isResponding, toolCalls]);
   (0, import_react136.useEffect)(() => {
     if (config.getApprovalMode() === "yolo" /* YOLO */ && streamingState === "idle" /* Idle */) {
-      const lastUserMessageIndex = history.findLastIndex(
-        (item) => item.type === "user" /* USER */
-      );
+      const lastUserMessageIndex = findLastUserItemIndex(history);
       const turnCount = lastUserMessageIndex === -1 ? 0 : history.length - lastUserMessageIndex;
       if (turnCount > 0) {
         logConversationFinishedEvent(
@@ -37235,7 +37608,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             for (const sideEffect of sideEffects) sideEffect();
             config.getChatRecordingService?.()?.recordMidTurnUserMessage(parts, message);
             addItem(
-              { type: "notification" /* NOTIFICATION */, text: message },
+              {
+                type: "user" /* USER */,
+                text: message,
+                // Intentionally false: preserves isRealUserTurn/rewind semantics (steer is not a standalone user turn).
+                sentToModel: false
+              },
               Date.now()
             );
           }
@@ -37893,6 +38271,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       if (modelSwitchedFromQuotaError) {
         return;
       }
+      const backgroundTaskRegistry = config.getBackgroundTaskRegistry();
+      const backgroundLaunchExhaustedCapacity = backgroundTaskRegistry.getMaxConcurrentBackgroundAgents() === 1 && !backgroundTaskRegistry.canStartBackgroundAgent() && geminiTools.some((toolCall) => {
+        const display = toolCall.response.resultDisplay;
+        return toolCall.request.name === ToolNames.AGENT && typeof display === "object" && display !== null && "type" in display && "status" in display && display.type === "task_execution" && display.status === "background";
+      });
+      if (backgroundLaunchExhaustedCapacity) {
+        geminiClient?.addHistory({ role: "user", parts: responsesToSend });
+        return;
+      }
       const drained = turnCancelledRef.current || abortControllerRef.current?.signal.aborted ? [] : midTurnDrainRef?.current?.() ?? [];
       let drainedSteer;
       if (drained.length > 0) {
@@ -38135,7 +38522,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       notificationQueueRef.current.push({
         displayText,
         modelText,
-        sendMessageType: "notification" /* Notification */
+        sendMessageType: "notification" /* Notification */,
+        monitor: { id: meta.monitorId, status: meta.status }
       });
       setNotificationTrigger((n) => n + 1);
     });
@@ -38147,6 +38535,16 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && notificationQueueRef.current.length > 0) {
       runOutsideAgentContext(() => {
         const queue = notificationQueueRef.current;
+        const monitorRegistry = config.getMonitorRegistry();
+        for (let i = queue.length - 1; i >= 0; i--) {
+          const monitor = queue[i].monitor;
+          if (monitor?.status === "running" && monitorRegistry.get(monitor.id)?.status === "cancelled") {
+            queue.splice(i, 1);
+          }
+        }
+        if (queue.length === 0) {
+          return;
+        }
         const targetType = queue[0].sendMessageType;
         if (targetType === "cron" /* Cron */) {
           const item = queue.shift();
@@ -38180,7 +38578,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         });
       });
     }
-  }, [streamingState, submitQuery, notificationTrigger, addItem]);
+  }, [streamingState, submitQuery, notificationTrigger, addItem, config]);
   const teammateQueueRef = (0, import_react136.useRef)([]);
   const [teammateTrigger, setTeammateTrigger] = (0, import_react136.useState)(0);
   (0, import_react136.useEffect)(() => {
@@ -38215,17 +38613,19 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [config]);
   (0, import_react136.useEffect)(() => {
     if (streamingState === "idle" /* Idle */ && !isSubmittingQueryRef.current && teammateQueueRef.current.length > 0) {
-      const batch = teammateQueueRef.current.splice(0);
-      for (const entry of batch) {
-        addItem(
-          { type: "notification", text: entry.display },
-          Date.now()
-        );
-      }
-      const modelText = batch.map((e) => e.modelText).join("\n\n");
-      const display = batch.map((e) => e.display).join("; ");
-      submitQuery(modelText, "teammate" /* Teammate */, void 0, {
-        notificationDisplayText: display
+      runOutsideAgentContext(() => {
+        const batch = teammateQueueRef.current.splice(0);
+        for (const entry of batch) {
+          addItem(
+            { type: "notification", text: entry.display },
+            Date.now()
+          );
+        }
+        const modelText = batch.map((e) => e.modelText).join("\n\n");
+        const display = batch.map((e) => e.display).join("; ");
+        submitQuery(modelText, "teammate" /* Teammate */, void 0, {
+          notificationDisplayText: display
+        });
       });
     }
   }, [streamingState, submitQuery, teammateTrigger, addItem]);
@@ -39893,14 +40293,15 @@ function shouldFireRecap(history) {
   let lastRecapIndex = -1;
   for (let i = 0; i < history.length; i++) {
     const item = history[i];
-    if (item.type === "user") userMessageCount++;
+    if (item.type === "user" && item.sentToModel !== false) userMessageCount++;
     if (item.type === "away_recap") lastRecapIndex = i;
   }
   if (userMessageCount < MIN_USER_MESSAGES_TO_FIRE) return false;
   if (lastRecapIndex === -1) return true;
   let userSinceLast = 0;
   for (let i = lastRecapIndex + 1; i < history.length; i++) {
-    if (history[i].type === "user") userSinceLast++;
+    const item = history[i];
+    if (item.type === "user" && item.sentToModel !== false) userSinceLast++;
   }
   return userSinceLast >= MIN_USER_MESSAGES_SINCE_LAST_RECAP;
 }
@@ -40919,16 +41320,23 @@ var AlternateScreen = /* @__PURE__ */ __name(({
 init_esbuild_shims();
 var import_react150 = __toESM(require_react(), 1);
 var import_jsx_runtime133 = __toESM(require_jsx_runtime(), 1);
+function normalizeError(error) {
+  if (error instanceof Error) {
+    return error;
+  }
+  return new Error(String(error));
+}
+__name(normalizeError, "normalizeError");
 var ErrorBoundary = class extends import_react150.Component {
   static {
     __name(this, "ErrorBoundary");
   }
   state = { error: null };
   static getDerivedStateFromError(error) {
-    return { error };
+    return { error: normalizeError(error) };
   }
   componentDidCatch(error, info) {
-    this.props.onError?.(error, info);
+    this.props.onError?.(normalizeError(error), info);
   }
   reset = /* @__PURE__ */ __name(() => {
     this.setState({ error: null });
@@ -42112,9 +42520,9 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
   (0, import_react165.useEffect)(() => {
     const fetchUserMessages = /* @__PURE__ */ __name(async () => {
       const pastMessagesRaw = await logger?.getPreviousUserMessages() || [];
-      const currentSessionUserMessages = historyManager.history.filter(
-        (item) => item.type === "user" && typeof item.text === "string" && item.text.trim() !== ""
-      ).map((item) => item.text).reverse();
+      const currentSessionUserMessages = realUserPromptTexts(
+        historyManager.history
+      ).reverse();
       const combinedMessages = [
         ...currentSessionUserMessages,
         ...pastMessagesRaw
@@ -42243,6 +42651,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     isFastModelMode,
     isVoiceModelMode,
     isVisionModelMode,
+    isImageModelMode,
     modelDialogPersistScope,
     openModelDialog,
     closeModelDialog
@@ -42881,6 +43290,20 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         }
       }
       const userPromptText = submittedValue;
+      if (["/quit", "/exit", "exit", "quit", ":q", ":q!", ":wq", ":wq!"].includes(
+        userPromptText.trim()
+      )) {
+        void handleSlashCommand("/quit");
+        return;
+      }
+      const recoveredAgentsNotice = !isSlashCommand(userPromptText) && !isBtwCommand(userPromptText) ? config.consumePendingRecoveredAgentsNotice() : null;
+      if (recoveredAgentsNotice) {
+        submittedValue = `<system-reminder>
+${recoveredAgentsNotice}
+</system-reminder>
+
+` + submittedValue;
+      }
       const worktreeNotice = pendingWorktreeNoticeRef.current;
       if (worktreeNotice && !isSlashCommand(submittedValue)) {
         pendingWorktreeNoticeRef.current = null;
@@ -42911,12 +43334,6 @@ ${buildWorkflowSteeringNotice()}
         void submitQuery(submittedValue);
         return;
       }
-      if (["/quit", "/exit", "exit", "quit", ":q", ":q!", ":wq", ":wq!"].includes(
-        submittedValue.trim()
-      )) {
-        void handleSlashCommand("/quit");
-        return;
-      }
       const spec = speculationRef.current;
       if (spec.status !== "idle" && spec.suggestion === submittedValue && spec.status === "completed") {
         acceptSpeculation(spec, geminiClient).then((result) => {
@@ -44147,6 +44564,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       isFastModelMode,
       isVoiceModelMode,
       isVisionModelMode,
+      isImageModelMode,
       modelDialogPersistScope,
       isTrustDialogOpen,
       activeArenaDialog,
@@ -44290,6 +44708,7 @@ ${migrationResult.failedFiles.map((f) => `  \u2022 ${f.file}: ${f.error}`).join(
       isFastModelMode,
       isVoiceModelMode,
       isVisionModelMode,
+      isImageModelMode,
       modelDialogPersistScope,
       isTrustDialogOpen,
       activeArenaDialog,
@@ -44923,14 +45342,33 @@ async function startInteractiveUI(config, settings, startupWarnings, workspaceRo
   if (useVP) {
     process.stdout.setMaxListeners(0);
   }
+  const appTree = /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(
+    ErrorBoundary,
+    {
+      onError: (error, info) => {
+        debugLogger41.error(
+          `[FATAL_RENDER_ERROR] ${error.message}
+${info.componentStack ?? ""}
+${error.stack ?? ""}`
+        );
+        setTimeout(() => {
+          void runExitCleanup().then(() => process.exit(1));
+        }, 5e3);
+      },
+      children: /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(AppWrapper, {})
+    }
+  );
   const instance = render_default(
-    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(import_react167.default.StrictMode, { children: /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(AppWrapper, {}) }) : /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(AppWrapper, {}),
+    process.env["DEBUG"] ? /* @__PURE__ */ (0, import_jsx_runtime136.jsx)(import_react167.default.StrictMode, { children: appTree }) : appTree,
     {
       exitOnCtrlC: false,
       isScreenReaderEnabled: config.getScreenReader(),
       alternateScreen: useVP
     }
   );
+  if (useVP) {
+    pushKittyProtocolFlags();
+  }
   profileCheckpoint("first_paint");
   startPostRenderPrefetches(config, settings, {
     connectIde: options.postRenderConnectIde ?? false,