@qwen-code/qwen-code 0.21.6-preview.0 → 0.21.7

package/chunks/{startInteractiveUI-6BDRXSMF.js → startInteractiveUI-2QQLEKM6.js}

@@ -3,93 +3,16 @@
 import {
   buildPermissionSuggestions
 } from "./chunk-43T5WDQ7.js";
-import {
-  startPostRenderPrefetches
-} from "./chunk-N47ZM2KI.js";
-import {
-  stopAndGetCapturedInput
-} from "./chunk-KVUBYJDM.js";
-import {
-  useAutoAcceptIndicator
-} from "./chunk-WXS647W5.js";
-import {
-  classifyApiError,
-  fireSessionDeleteHook
-} from "./chunk-P5Y23G2L.js";
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-CJBRIJ7W.js";
-import {
-  MAX_SUGGESTIONS_TO_SHOW,
-  SESSION_MENTION_PREFIX,
-  buildMcpResourceRef,
-  buildMcpServerRef,
-  buildSessionRef,
-  getExtensionSuggestions,
-  handleAtCommand,
-  matchMcpServerPrefix,
-  resolveAtCommandQuery,
-  sanitizeDisplayText
-} from "./chunk-PQTK2FVO.js";
+} from "./chunk-3NB7TSE2.js";
 import {
   StreamJsonOutputAdapter
-} from "./chunk-WIPQR44Y.js";
+} from "./chunk-72LNFGUY.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,
-  recordAutoSkillCommandUsage,
-  refreshExtensionContentRuntime,
-  resetBackgroundStateForSessionSwitch,
-  serializeUserPromptExpansionPrompt,
-  supportsMatchers
-} from "./chunk-QWUYFMAR.js";
-import {
-  EXTENSION_RELOAD_FAILED_REASON,
-  ExtensionRefreshState,
-  appEvents,
-  cleanupReviewWorktreeLeases,
-  loadHierarchicalGeminiMemory
-} from "./chunk-XOZ2R6XI.js";
-import {
-  disableKittyProtocol,
-  isKittyProtocolEnabled,
-  isKittyProtocolSupported,
-  pushKittyProtocolFlags
-} from "./chunk-NYX53SV4.js";
-import "./chunk-ZH7G3A4U.js";
+  startPostRenderPrefetches
+} from "./chunk-OFI7IGST.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -167,21 +90,113 @@ import {
   useUIActions,
   useUIState,
   useVirtualViewport
-} from "./chunk-SPUDIAHX.js";
+} from "./chunk-6UWFTUQL.js";
+import {
+  GeminiRespondingSpinner,
+  GeminiSpinner,
+  ICON,
+  SCREEN_READER_USER_PREFIX,
+  SHELL_COMMAND_NAME,
+  StreamingContext,
+  applyCollapsePolicyAndSummary,
+  buildResumedHistoryItems,
+  build_default,
+  expandCollapsedHistory,
+  isCollapsibleTool,
+  shouldDisplayGoalStateCause,
+  useStreamingContext,
+  waitForGoalRuntime
+} from "./chunk-OH2VKQXH.js";
+import {
+  stopAndGetCapturedInput
+} from "./chunk-TZEZYNYD.js";
+import {
+  useAutoAcceptIndicator
+} from "./chunk-23RZCH76.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-Z5S6KH2B.js";
+} from "./chunk-MAJS7AT4.js";
+import {
+  classifyApiError,
+  fireSessionDeleteHook
+} from "./chunk-P5Y23G2L.js";
+import {
+  MAX_SUGGESTIONS_TO_SHOW,
+  SESSION_MENTION_PREFIX,
+  buildMcpResourceRef,
+  buildMcpServerRef,
+  buildSessionRef,
+  getExtensionSuggestions,
+  handleAtCommand,
+  matchMcpServerPrefix,
+  resolveAtCommandQuery,
+  sanitizeDisplayText
+} from "./chunk-KR4ZSC7K.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,
+  recordAutoSkillCommandUsage,
+  refreshExtensionContentRuntime,
+  resetBackgroundStateForSessionSwitch,
+  serializeUserPromptExpansionPrompt,
+  supportsMatchers
+} from "./chunk-RUL4S3K3.js";
+import {
+  EXTENSION_RELOAD_FAILED_REASON,
+  ExtensionRefreshState,
+  appEvents,
+  cleanupReviewWorktreeLeases,
+  loadHierarchicalGeminiMemory
+} from "./chunk-KKJJB5X6.js";
 import {
   getCommandDisplayName,
   getCommandSourceBadge
-} from "./chunk-IISDPZ5X.js";
+} from "./chunk-QETYKPMG.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-AVDEBBMI.js";
+} from "./chunk-RNVQB725.js";
+import {
+  disableKittyProtocol,
+  isKittyProtocolEnabled,
+  isKittyProtocolSupported,
+  pushKittyProtocolFlags
+} from "./chunk-NYX53SV4.js";
 import {
   BEL,
   OSC_PREFIX,
@@ -194,32 +209,19 @@ import {
   oscKittyNotify,
   saveClipboardImage,
   writeOsc52
-} from "./chunk-3LGZEYOF.js";
+} from "./chunk-YHEEE624.js";
+import "./chunk-SCI7K3GM.js";
 import "./chunk-4WGODMVR.js";
+import "./chunk-TLV2IMHR.js";
+import "./chunk-KW7NOTN6.js";
 import {
   MaxSizedBox,
   OverflowProvider,
   useOverflowState
-} from "./chunk-LBWNSLJK.js";
-import {
-  GeminiRespondingSpinner,
-  GeminiSpinner,
-  ICON,
-  SCREEN_READER_USER_PREFIX,
-  SHELL_COMMAND_NAME,
-  StreamingContext,
-  applyCollapsePolicyAndSummary,
-  buildResumedHistoryItems,
-  build_default,
-  expandCollapsedHistory,
-  isCollapsibleTool,
-  shouldDisplayGoalStateCause,
-  useStreamingContext,
-  waitForGoalRuntime
-} from "./chunk-DBIEZC7T.js";
+} from "./chunk-ONSZH6VM.js";
 import {
   theme
-} from "./chunk-U25CMJYY.js";
+} from "./chunk-EKPKKXY2.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -240,36 +242,40 @@ import {
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import "./chunk-2AGOQ7QO.js";
+import "./chunk-Y4EWSQF7.js";
+import "./chunk-7UFKAV7Y.js";
+import {
+  MAX_INLINE_IMAGES_PER_ITEM,
+  collectInlineImages,
+  getInlineImageData
+} from "./chunk-2VSTGY6M.js";
 import {
   relaunchApp
-} from "./chunk-CXYBX4AL.js";
+} from "./chunk-HQB2KUAN.js";
 import {
   setUpdateHandler
-} from "./chunk-4E5PO6R7.js";
-import "./chunk-AFZTZLFB.js";
+} from "./chunk-LEMXGVEP.js";
+import "./chunk-GSS34377.js";
 import "./chunk-YAF2MQZ6.js";
-import "./chunk-XKTCA6BW.js";
 import {
   AUTO_THEME_NAME,
   DEFAULT_THEME,
   themeManager
-} from "./chunk-KKN2IE7Q.js";
-import "./chunk-KW7NOTN6.js";
-import "./chunk-WPKIU4PA.js";
+} from "./chunk-CTJLZLB5.js";
+import "./chunk-CB2464BK.js";
 import "./chunk-6H67XLET.js";
-import "./chunk-BU4BRCPX.js";
+import "./chunk-FPM27XN4.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-EHMN6SEG.js";
-import "./chunk-FDV3CXTD.js";
+} from "./chunk-TDXGKHDN.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-GTM6IHBB.js";
-import "./chunk-EKWNNQQD.js";
-import "./chunk-DYA25Y7U.js";
+} from "./chunk-Q3JQ7OSU.js";
+import "./chunk-6XJMFJ4D.js";
+import "./chunk-OWMAZHIX.js";
+import "./chunk-KXSDEOFU.js";
 import {
   cpLen,
   cpSlice,
@@ -282,7 +288,6 @@ import {
   stripUnsafeCharacters,
   toCodePoints
 } from "./chunk-4NFY2S7N.js";
-import "./chunk-NAYPZ72V.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -293,65 +298,65 @@ import {
 import "./chunk-3Z43GZUQ.js";
 import "./chunk-RXFQM6FQ.js";
 import "./chunk-HGCQ5SE7.js";
+import {
+  isInlineModelOverrideAllowed
+} from "./chunk-CSZEXZBE.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isKeytermEcho,
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-HKNSU4WX.js";
+} from "./chunk-AE77C5ZU.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-7FUVSN4D.js";
-import "./chunk-JELIWHXD.js";
+} from "./chunk-55LYDVPU.js";
+import "./chunk-AOHJKPKL.js";
 import {
   computeWorkspaceSkillListUpdates,
   resolveSkillSettings,
   skillSettingStrings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-CDHNGCJI.js";
+import "./chunk-EUQTXRKZ.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-C4GRKMUL.js";
+} from "./chunk-OHJLEW5J.js";
 import "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-3ZRS2XNY.js";
+} from "./chunk-5KH532V7.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-NYZAL2W2.js";
+} from "./chunk-SPMY6CX6.js";
 import {
   formatDuration,
   formatRelativeTime,
   formatTokenCount
 } from "./chunk-3SH53ANB.js";
-import "./chunk-GLWP3FDB.js";
+import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
-import {
-  isInlineModelOverrideAllowed
-} from "./chunk-6KEN3RIC.js";
-import "./chunk-7GYP5COR.js";
+import "./chunk-ZXU5UHMI.js";
 import "./chunk-VWOVHOTT.js";
-import "./chunk-DTAPI453.js";
+import "./chunk-IUFV6FYU.js";
 import "./chunk-V6WHFGST.js";
 import "./chunk-DP3IHZGG.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
-import "./chunk-QONSRAEV.js";
+import "./chunk-YP5KH5Y7.js";
 import "./chunk-24ER7UV4.js";
 import "./chunk-ALMR3E6Q.js";
-import "./chunk-BK2UNYWD.js";
+import "./chunk-HIBNSEJE.js";
 import "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-XC2VAFVZ.js";
+import "./chunk-UVX4Y6IN.js";
 import "./chunk-WUC6ZFXO.js";
 import "./chunk-DIEFUBV6.js";
 import "./chunk-UDXSXLER.js";
 import {
   loadMcpApprovals
-} from "./chunk-T4XY5CT4.js";
+} from "./chunk-6HVUFDS2.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -374,7 +379,7 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-YUVTZ4UH.js";
+} from "./chunk-PQBHU2IA.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
@@ -383,18 +388,18 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-546CDN6D.js";
-import "./chunk-IKXE3AAC.js";
+} from "./chunk-DBOFL3LQ.js";
+import "./chunk-VOARQPTA.js";
 import "./chunk-6PEXNQTX.js";
-import "./chunk-ZQL73PPE.js";
+import "./chunk-HYRDKNUY.js";
 import {
   getCliVersion
-} from "./chunk-NKST54XA.js";
+} from "./chunk-FZBZSYKU.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-72DZPDH4.js";
+} from "./chunk-6XU3PH66.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -503,65 +508,65 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-DOA7MCDY.js";
+} from "./chunk-Y7E5LNLO.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
-import "./chunk-Z7JILXGX.js";
-import "./chunk-I7JDGNG6.js";
-import "./chunk-A6SX5TAH.js";
-import "./chunk-33FNCQSY.js";
+import "./chunk-CNIID3TV.js";
+import "./chunk-MVUQRLOH.js";
+import "./chunk-XCWO3SMQ.js";
+import "./chunk-7MH4J33A.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-6D6V55ZQ.js";
+} from "./chunk-RMH5OWLD.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-MOHAWIAW.js";
-import "./chunk-3PRJYMXC.js";
+import "./chunk-GNPNYXJB.js";
+import "./chunk-Y4NGLFGJ.js";
 import {
   promptIdContext
 } from "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-MISUEWB4.js";
+import "./chunk-J6SZID63.js";
 import "./chunk-KRXPRVGL.js";
 import {
   HOOKS_CONFIG_FIELDS
-} from "./chunk-A5YZ3FA2.js";
-import "./chunk-YAVY33G4.js";
-import "./chunk-2UISUFHQ.js";
+} from "./chunk-GM463R2B.js";
+import "./chunk-SEZ556DZ.js";
+import "./chunk-CJXIIILK.js";
 import {
   elapsedActiveTime,
   goalRequiresExactPermit
-} from "./chunk-MBEMTXQT.js";
+} from "./chunk-3K7FH2KQ.js";
 import {
   APPROVAL_MODES,
   runOutsideAgentContext
-} from "./chunk-6WBWIPBF.js";
+} from "./chunk-BVWVWGLE.js";
 import "./chunk-S6LOFUVP.js";
 import {
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-WVAESIM6.js";
+} from "./chunk-LZC3B5N2.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
 import {
   isPathWithinRoot
-} from "./chunk-432XCUHF.js";
-import "./chunk-HU5TUALO.js";
+} from "./chunk-EQL65XGA.js";
+import "./chunk-IIJEYBNH.js";
 import {
   osc8Hyperlink,
   qwenOAuth2Events,
   sanitizeForOsc,
   supportsHyperlinks,
   wrapForMultiplexer
-} from "./chunk-XC656O42.js";
+} from "./chunk-22NBYCPD.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-QYPT3QUD.js";
-import "./chunk-QMBEW7EW.js";
+import "./chunk-3ULCB3NE.js";
+import "./chunk-BGG4MBYD.js";
 import {
   REASONING_EFFORT_TIERS
 } from "./chunk-DGEIYUC3.js";
@@ -569,15 +574,15 @@ import {
   getUnsupportedImageFormatWarning,
   isSupportedImageMimeType
 } from "./chunk-MPHPFVKK.js";
-import "./chunk-GLNBDYUX.js";
+import "./chunk-AXMWHKXA.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-AU3XNTMV.js";
-import "./chunk-MGSSJT27.js";
+import "./chunk-33ACCIIY.js";
+import "./chunk-L4N6TIP7.js";
 import "./chunk-2J3OJGTL.js";
 import "./chunk-P3QQPMQA.js";
-import "./chunk-6O5DVH27.js";
+import "./chunk-M6HMMKVG.js";
 import "./chunk-GLCZKT5V.js";
-import "./chunk-2DNKEBXY.js";
+import "./chunk-EI3HZX6C.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -618,7 +623,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-O656RSMC.js";
+} from "./chunk-2U3WZGZG.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import {
@@ -627,25 +632,25 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-E4WHKETF.js";
-import "./chunk-ZPPP6VCL.js";
+} from "./chunk-FVKHVJZQ.js";
+import "./chunk-NG2R4N5O.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-D7D7RXIJ.js";
+} from "./chunk-IC4Z6LX6.js";
 import {
   MAINLINE_CODER_MODEL
-} from "./chunk-P7LKADIT.js";
+} from "./chunk-6EOI4HOK.js";
 import "./chunk-46UV252V.js";
 import {
   DEFAULT_TOKEN_LIMIT
 } from "./chunk-ZBVS26BY.js";
-import "./chunk-BFHXDAR7.js";
-import "./chunk-TYERNYH4.js";
+import "./chunk-KKBPOU75.js";
+import "./chunk-EUNWC2VS.js";
 import {
   atomicWriteFileSync
-} from "./chunk-UH7Z7Y45.js";
-import "./chunk-5L6CQ4ZU.js";
+} from "./chunk-FOGU3LJX.js";
+import "./chunk-6M26GBKX.js";
 import "./chunk-W4RQUHY3.js";
 import "./chunk-LKRMNRSN.js";
 import {
@@ -659,9 +664,9 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-WVRJKSIG.js";
+import "./chunk-PJOBIWUG.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -670,12 +675,12 @@ import "./chunk-Q7YDKOGY.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-QG2ACINA.js";
+} from "./chunk-EORNAQDT.js";
 import {
   clearScreen,
   writeStderrLine,
   writeStderrLineSafe
-} from "./chunk-OWAK7LMW.js";
+} from "./chunk-KGJGEEVR.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -33892,7 +33897,14 @@ function deriveFirstPrompt(messages) {
 }
 __name(deriveFirstPrompt, "deriveFirstPrompt");
 function useBranchCommand(options) {
-  const { config, historyManager, startNewSession, setSessionName, remount } = options;
+  const {
+    config,
+    historyManager,
+    startNewSession,
+    clearPendingState,
+    setSessionName,
+    remount
+  } = options;
   const handleBranch = (0, import_react125.useCallback)(
     async (name) => {
       if (!config) return;
@@ -33957,6 +33969,7 @@ function useBranchCommand(options) {
           collapsePreviewCount
         );
         startNewSession(newSessionId);
+        clearPendingState?.();
         historyManager.clearItems();
         historyManager.loadHistory(uiHistoryItems);
         uiSwapped = true;
@@ -34016,6 +34029,7 @@ function useBranchCommand(options) {
       config,
       historyManager,
       startNewSession,
+      clearPendingState,
       setSessionName,
       remount,
       options.settings.merged.ui?.history?.collapseOnResume,
@@ -34049,6 +34063,7 @@ function useResumeCommand(options) {
     settings,
     historyManager,
     startNewSession,
+    clearPendingState,
     setSessionName,
     remount
   } = options;
@@ -34113,6 +34128,7 @@ function useResumeCommand(options) {
         }
         startNewSession(sessionId);
         setSessionName?.(customTitle ?? null);
+        clearPendingState?.();
         clearItems();
         loadHistory(uiHistoryItems);
         if (recoveredBackgroundAgentsNotice) {
@@ -34157,6 +34173,7 @@ function useResumeCommand(options) {
       clearItems,
       loadHistory,
       startNewSession,
+      clearPendingState,
       setSessionName,
       remount,
       settings.merged.ui?.history?.collapseOnResume,
@@ -34661,11 +34678,13 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
         addItem,
         clear: /* @__PURE__ */ __name(() => {
           cancelBtw();
+          actions.clearPendingState();
           clearItems();
           clearScreen();
           refreshStatic();
           setSessionName?.(null);
         }, "clear"),
+        clearPendingState: actions.clearPendingState,
         loadHistory,
         refreshStatic,
         setDebugMessage: actions.setDebugMessage,
@@ -36158,8 +36177,9 @@ function mapToDisplay(toolOrTools, projectRoot) {
           projectRoot
         ) : void 0
       };
+      const inlineImageCollection = trackedCall.status === "success" || trackedCall.status === "error" || trackedCall.status === "cancelled" ? collectInlineImages(trackedCall.response.responseParts) : null;
       switch (trackedCall.status) {
-        case "success":
+        case "success": {
           return {
             ...baseDisplayProperties,
             status: mapCoreStatusToDisplayStatus(trackedCall.status),
@@ -36179,9 +36199,15 @@ function mapToDisplay(toolOrTools, projectRoot) {
             // that the renderer would never use. Mirrors ToolMessage's
             // `usingDetailedDisplay` gate, which also keys off the display name.
             detailedDisplay: isCollapsibleTool(displayName) ? getToolResponseDisplayText(trackedCall.response.responseParts) : void 0,
+            ...inlineImageCollection?.images.length ? { images: inlineImageCollection.images } : {},
+            ...inlineImageCollection?.omittedImageCount ? {
+              omittedImageCount: inlineImageCollection.omittedImageCount
+            } : {},
             confirmationDetails: void 0
           };
+        }
         case "error":
+        case "cancelled": {
           return {
             ...baseDisplayProperties,
             status: mapCoreStatusToDisplayStatus(trackedCall.status),
@@ -36191,20 +36217,13 @@ function mapToDisplay(toolOrTools, projectRoot) {
             ...trackedCall.response.visionBridgeNotice !== void 0 ? {
               visionBridgeNotice: trackedCall.response.visionBridgeNotice
             } : {},
-            confirmationDetails: void 0
-          };
-        case "cancelled":
-          return {
-            ...baseDisplayProperties,
-            status: mapCoreStatusToDisplayStatus(trackedCall.status),
-            resultDisplay: compactToolResultDisplayForHistory(
-              trackedCall.response.resultDisplay
-            ),
-            ...trackedCall.response.visionBridgeNotice !== void 0 ? {
-              visionBridgeNotice: trackedCall.response.visionBridgeNotice
+            ...inlineImageCollection?.images.length ? { images: inlineImageCollection.images } : {},
+            ...inlineImageCollection?.omittedImageCount ? {
+              omittedImageCount: inlineImageCollection.omittedImageCount
             } : {},
             confirmationDetails: void 0
           };
+        }
         case "awaiting_approval":
           return {
             ...baseDisplayProperties,
@@ -36749,6 +36768,40 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [history]);
   const auxiliaryAbortRefsRef = (0, import_react135.useRef)(/* @__PURE__ */ new Set());
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
+  const [
+    pendingAssistantItems,
+    pendingAssistantItemsRef,
+    setPendingAssistantItems
+  ] = useStateAndRef([]);
+  const commitPendingAssistantItems = (0, import_react135.useCallback)(
+    (userMessageTimestamp) => {
+      const items = pendingAssistantItemsRef.current;
+      if (items.length === 0) {
+        return;
+      }
+      for (const item of items) {
+        commitItem(item, userMessageTimestamp);
+      }
+      setPendingAssistantItems([]);
+    },
+    [commitItem, pendingAssistantItemsRef, setPendingAssistantItems]
+  );
+  const commitItemInOrder = (0, import_react135.useCallback)(
+    (item, userMessageTimestamp) => {
+      commitPendingAssistantItems(userMessageTimestamp);
+      return commitItem(item, userMessageTimestamp);
+    },
+    [commitItem, commitPendingAssistantItems]
+  );
+  const stagePendingAssistantItem = (0, import_react135.useCallback)(() => {
+    const item = pendingHistoryItemRef.current;
+    if (item?.type !== "gemini" && item?.type !== "gemini_content") {
+      return false;
+    }
+    setPendingAssistantItems((items) => [...items, item]);
+    setPendingHistoryItem(null);
+    return true;
+  }, [pendingHistoryItemRef, setPendingAssistantItems, setPendingHistoryItem]);
   const [pendingThoughtItem, pendingThoughtItemRef, setPendingThoughtItem] = useStateAndRef(null);
   const thoughtStartTimeRef = (0, import_react135.useRef)(null);
   const [
@@ -36761,6 +36814,15 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     pendingRetryCountdownItemRef,
     setPendingRetryCountdownItem
   ] = useStateAndRef(null);
+  const clearPendingState = (0, import_react135.useCallback)(() => {
+    setPendingAssistantItems([]);
+    setPendingHistoryItem(null);
+    setPendingRetryErrorItem(null);
+  }, [
+    setPendingAssistantItems,
+    setPendingHistoryItem,
+    setPendingRetryErrorItem
+  ]);
   const retryCountdownTimerRef = (0, import_react135.useRef)(
     null
   );
@@ -36964,7 +37026,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     );
     logApiCancel(config, cancellationEvent);
     if (pendingHistoryItemRef.current) {
-      commitItem(pendingHistoryItemRef.current, Date.now());
+      commitItemInOrder(pendingHistoryItemRef.current, Date.now());
     }
     addItem(
       {
@@ -36999,7 +37061,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [
     streamingState,
     addItem,
-    commitItem,
+    commitItemInOrder,
     setPendingHistoryItem,
     onCancelSubmit,
     pendingHistoryItemRef,
@@ -37232,7 +37294,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ]
   );
   const handleContentEvent = (0, import_react135.useCallback)(
-    (eventValue, currentGeminiMessageBuffer, userMessageTimestamp) => {
+    (eventValue, currentGeminiMessageBuffer, userMessageTimestamp, startAsContinuation = false) => {
       if (turnCancelledRef.current) {
         return "";
       }
@@ -37240,21 +37302,29 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       setIsReceivingContent(true);
       turnSawContentEventRef.current = true;
       let newGeminiMessageBuffer = currentGeminiMessageBuffer + eventValue;
+      const pendingItem = pendingHistoryItemRef.current;
+      if ((pendingItem?.type === "gemini" || pendingItem?.type === "gemini_content") && (pendingItem.images?.length || pendingItem.omittedImageCount)) {
+        if (newGeminiMessageBuffer.trim().length === 0) {
+          return newGeminiMessageBuffer;
+        }
+        stagePendingAssistantItem();
+      }
       if (pendingHistoryItemRef.current?.type !== "gemini" && pendingHistoryItemRef.current?.type !== "gemini_content") {
         if (newGeminiMessageBuffer.trim().length === 0) {
           return newGeminiMessageBuffer;
         }
         if (pendingHistoryItemRef.current) {
-          commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+          commitItemInOrder(
+            pendingHistoryItemRef.current,
+            userMessageTimestamp
+          );
         }
-        setPendingHistoryItem({
-          type: "gemini",
-          text: "",
-          timestamp: Date.now()
-        });
+        setPendingHistoryItem(
+          startAsContinuation ? { type: "gemini_content", text: "" } : { type: "gemini", text: "", timestamp: Date.now() }
+        );
         newGeminiMessageBuffer = stripLeadingBlankLines(newGeminiMessageBuffer);
       }
-      let nextPendingType = pendingHistoryItemRef.current?.type;
+      let nextPendingType = pendingHistoryItemRef.current?.type === "gemini_content" ? "gemini_content" : pendingHistoryItemRef.current?.type === "gemini" ? "gemini" : startAsContinuation ? "gemini_content" : "gemini";
       while (newGeminiMessageBuffer.length > STREAM_PENDING_ITEM_MAX_CHARS) {
         const splitPoint = findLastSafeSplitPoint(
           newGeminiMessageBuffer,
@@ -37265,7 +37335,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           newGeminiMessageBuffer,
           safeSplitPoint
         );
-        commitItem(
+        commitItemInOrder(
           {
             type: nextPendingType,
             text: beforeText
@@ -37324,7 +37394,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           newGeminiMessageBuffer,
           splitPoint
         );
-        commitItem(
+        commitItemInOrder(
           {
             type: nextPendingType,
             text: beforeText
@@ -37347,9 +37417,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       return newGeminiMessageBuffer;
     },
     [
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
+      stagePendingAssistantItem,
       terminalWidth,
       terminalHeight,
       availableTerminalHeightRef,
@@ -37479,7 +37550,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           };
           addItem(pendingItem, userMessageTimestamp);
         } else {
-          commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+          commitItemInOrder(
+            pendingHistoryItemRef.current,
+            userMessageTimestamp
+          );
         }
         setPendingHistoryItem(null);
       }
@@ -37494,7 +37568,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [
       addItem,
       commitPendingThought,
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       setThought,
@@ -37510,7 +37584,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       }
       commitPendingThought(userMessageTimestamp);
       if (pendingHistoryItemRef.current) {
-        commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+        commitItemInOrder(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       const isShowingAutoRetry = retryCountdownTimerRef.current !== null;
@@ -37539,7 +37613,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [
       commitPendingThought,
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       setPendingRetryErrorItem,
@@ -37554,14 +37628,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         return;
       }
       if (pendingHistoryItemRef.current) {
-        commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+        commitItemInOrder(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       addItem({ type: "info" /* INFO */, text }, userMessageTimestamp);
     },
     [
       addItem,
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       settings
@@ -37613,7 +37687,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     (eventValue, userMessageTimestamp) => {
       autonomousLoopTickResolverRef.current?.resetCache();
       if (pendingHistoryItemRef.current) {
-        commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+        commitItemInOrder(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       const activeModel = modelOverrideRef.current ?? config.getModel();
@@ -37628,7 +37702,13 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         Date.now()
       );
     },
-    [addItem, commitItem, config, pendingHistoryItemRef, setPendingHistoryItem]
+    [
+      addItem,
+      commitItemInOrder,
+      config,
+      pendingHistoryItemRef,
+      setPendingHistoryItem
+    ]
   );
   const handleMaxSessionTurnsEvent = (0, import_react135.useCallback)(
     () => addItem(
@@ -37687,7 +37767,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   const handleUserPromptSubmitBlockedEvent = (0, import_react135.useCallback)(
     (value, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
-        commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+        commitItemInOrder(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       addItem(
@@ -37699,12 +37779,12 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         userMessageTimestamp
       );
     },
-    [addItem, commitItem, pendingHistoryItemRef, setPendingHistoryItem]
+    [addItem, commitItemInOrder, pendingHistoryItemRef, setPendingHistoryItem]
   );
   const handleStopHookLoopEvent = (0, import_react135.useCallback)(
     (value, userMessageTimestamp) => {
       if (pendingHistoryItemRef.current) {
-        commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+        commitItemInOrder(pendingHistoryItemRef.current, userMessageTimestamp);
         setPendingHistoryItem(null);
       }
       addItem(
@@ -37717,13 +37797,21 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         userMessageTimestamp
       );
     },
-    [addItem, commitItem, pendingHistoryItemRef, setPendingHistoryItem]
+    [addItem, commitItemInOrder, pendingHistoryItemRef, setPendingHistoryItem]
   );
   const processGeminiStreamEvents = (0, import_react135.useCallback)(
     async (stream, userMessageTimestamp, signal, submitType, turnAdmission) => {
       let geminiMessageBuffer = "";
       let thoughtBuffer = "";
       let scheduledToolContinuation = false;
+      let assistantOutputStarted = pendingHistoryItemRef.current?.type === "gemini" || pendingHistoryItemRef.current?.type === "gemini_content";
+      let assistantInlineImageCount = [
+        ...pendingAssistantItemsRef.current,
+        pendingHistoryItemRef.current
+      ].reduce(
+        (count, item) => item?.type === "gemini" || item?.type === "gemini_content" ? count + (item.images?.length ?? 0) : count,
+        0
+      );
       const toolCallRequests = [];
       const bufferedEvents = [];
       let flushTimer = null;
@@ -37756,8 +37844,59 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             geminiMessageBuffer = handleContentEvent(
               contentParts.join(""),
               geminiMessageBuffer,
-              userMessageTimestamp
+              userMessageTimestamp,
+              assistantOutputStarted
             );
+            if (contentParts.some((part) => part.trim().length > 0)) {
+              assistantOutputStarted = true;
+            }
+            continue;
+          }
+          if (nextEvent.kind === "image") {
+            if (turnCancelledRef.current) {
+              continue;
+            }
+            setIsReceivingContent(true);
+            turnSawContentEventRef.current = true;
+            const pendingItem = pendingHistoryItemRef.current;
+            const isOverflowOnlyItem = (pendingItem?.type === "gemini" || pendingItem?.type === "gemini_content") && pendingItem.text.length === 0 && !pendingItem.images?.length && Boolean(pendingItem.omittedImageCount);
+            const shouldDisplayImage = assistantInlineImageCount < MAX_INLINE_IMAGES_PER_ITEM;
+            if (!shouldDisplayImage && isOverflowOnlyItem) {
+              setPendingHistoryItem({
+                ...pendingItem,
+                omittedImageCount: (pendingItem.omittedImageCount ?? 0) + 1
+              });
+              geminiMessageBuffer = "";
+              assistantOutputStarted = true;
+              continue;
+            }
+            if (pendingHistoryItemRef.current) {
+              if (!stagePendingAssistantItem()) {
+                commitItemInOrder(
+                  pendingHistoryItemRef.current,
+                  userMessageTimestamp
+                );
+                setPendingHistoryItem(null);
+              }
+            }
+            geminiMessageBuffer = "";
+            if (shouldDisplayImage) {
+              setPendingHistoryItem({
+                type: assistantOutputStarted ? "gemini_content" : "gemini",
+                text: "",
+                images: [nextEvent.value],
+                ...!assistantOutputStarted ? { timestamp: Date.now() } : {}
+              });
+              assistantInlineImageCount++;
+            } else {
+              setPendingHistoryItem({
+                type: assistantOutputStarted ? "gemini_content" : "gemini",
+                text: "",
+                omittedImageCount: 1,
+                ...!assistantOutputStarted ? { timestamp: Date.now() } : {}
+              });
+            }
+            assistantOutputStarted = true;
             continue;
           }
           let subject = nextEvent.value.subject;
@@ -37808,16 +37947,31 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 scheduleBufferedStreamFlush();
               }
               break;
-            case "content" /* Content */:
+            case "content" /* Content */: {
               if (pendingThoughtItemRef.current || bufferedEvents.some((e) => e.kind === "thought")) {
                 flushBufferedStreamEvents();
                 commitPendingThought(userMessageTimestamp);
                 thoughtBuffer = "";
               }
               setThought((prev) => prev ? null : prev);
-              bufferedEvents.push({ kind: "content", value: event.value });
+              const displayParts = event.parts ?? [{ text: event.value }];
+              for (const part of displayParts) {
+                if ("text" in part) {
+                  if (part.text.length > 0) {
+                    bufferedEvents.push({ kind: "content", value: part.text });
+                  }
+                } else {
+                  const image = getInlineImageData({
+                    inlineData: part.inlineData
+                  });
+                  if (image) {
+                    bufferedEvents.push({ kind: "image", value: image });
+                  }
+                }
+              }
               scheduleBufferedStreamFlush();
               break;
+            }
             case "tool_call_request" /* ToolCallRequest */:
               flushBufferedStreamEvents();
               commitPendingThought(userMessageTimestamp);
@@ -37853,6 +38007,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "chat_compressed" /* ChatCompressed */:
               flushBufferedStreamEvents();
               handleChatCompressionEvent(event.value, userMessageTimestamp);
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "tool_call_confirmation" /* ToolCallConfirmation */:
             case "tool_call_response" /* ToolCallResponse */:
@@ -37860,30 +38016,57 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               break;
             case "max_session_turns" /* MaxSessionTurns */:
               flushBufferedStreamEvents();
+              if (pendingHistoryItemRef.current) {
+                commitItemInOrder(
+                  pendingHistoryItemRef.current,
+                  userMessageTimestamp
+                );
+                setPendingHistoryItem(null);
+              }
               handleMaxSessionTurnsEvent();
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "session_token_limit_exceeded" /* SessionTokenLimitExceeded */:
               flushBufferedStreamEvents();
+              if (pendingHistoryItemRef.current) {
+                commitItemInOrder(
+                  pendingHistoryItemRef.current,
+                  userMessageTimestamp
+                );
+                setPendingHistoryItem(null);
+              }
               handleSessionTokenLimitExceededEvent(event.value);
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "finished" /* Finished */:
               flushBufferedStreamEvents();
               commitPendingThought(userMessageTimestamp);
-              handleFinishedEvent(
-                event,
-                userMessageTimestamp
-              );
               if (pendingHistoryItemRef.current) {
-                commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+                commitItemInOrder(
+                  pendingHistoryItemRef.current,
+                  userMessageTimestamp
+                );
                 setPendingHistoryItem(null);
               }
               geminiMessageBuffer = "";
               thoughtBuffer = "";
+              assistantOutputStarted = false;
+              assistantInlineImageCount = 0;
               setThought(null);
+              handleFinishedEvent(
+                event,
+                userMessageTimestamp
+              );
               break;
             case "citation" /* Citation */:
               flushBufferedStreamEvents();
               handleCitationEvent(event.value, userMessageTimestamp);
+              if (showCitations(settings)) {
+                geminiMessageBuffer = "";
+                assistantOutputStarted = false;
+              }
               break;
             case "loop_detected" /* LoopDetected */:
               flushBufferedStreamEvents();
@@ -37892,6 +38075,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "retry" /* Retry */:
               if (!event.isContinuation) {
                 discardBufferedStreamEvents();
+                setPendingAssistantItems([]);
                 if (pendingHistoryItemRef.current) {
                   setPendingHistoryItem(null);
                 }
@@ -37899,6 +38083,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 thoughtBuffer = "";
                 setThought(null);
                 geminiMessageBuffer = "";
+                assistantOutputStarted = false;
+                assistantInlineImageCount = 0;
               } else {
                 flushBufferedStreamEvents();
               }
@@ -37911,6 +38097,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               break;
             case "model_fallback" /* ModelFallback */: {
               discardBufferedStreamEvents();
+              setPendingAssistantItems([]);
               if (pendingHistoryItemRef.current) {
                 setPendingHistoryItem(null);
               }
@@ -37918,6 +38105,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               thoughtBuffer = "";
               setThought(null);
               geminiMessageBuffer = "";
+              assistantOutputStarted = false;
+              assistantInlineImageCount = 0;
               toolCallRequests.length = 0;
               clearRetryCountdown();
               const fromModel = sanitizeDisplayText(event.fromModel) ?? "(unknown)";
@@ -37934,7 +38123,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "hook_system_message" /* HookSystemMessage */:
               flushBufferedStreamEvents();
               if (pendingHistoryItemRef.current) {
-                commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+                commitItemInOrder(
+                  pendingHistoryItemRef.current,
+                  userMessageTimestamp
+                );
                 setPendingHistoryItem(null);
               }
               addItem(
@@ -37944,6 +38136,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 },
                 userMessageTimestamp
               );
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "user_prompt_submit_blocked" /* UserPromptSubmitBlocked */:
               flushBufferedStreamEvents();
@@ -37951,10 +38145,14 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 event.value,
                 userMessageTimestamp
               );
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "stop_hook_loop" /* StopHookLoop */:
               flushBufferedStreamEvents();
               handleStopHookLoopEvent(event.value, userMessageTimestamp);
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "active_goal" /* ActiveGoal */:
               break;
@@ -37962,7 +38160,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               if (event.cause && shouldDisplayGoalStateCause(event.cause)) {
                 flushBufferedStreamEvents();
                 if (pendingHistoryItemRef.current) {
-                  commitItem(
+                  commitItemInOrder(
                     pendingHistoryItemRef.current,
                     userMessageTimestamp
                   );
@@ -37976,6 +38174,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                   },
                   userMessageTimestamp
                 );
+                geminiMessageBuffer = "";
+                assistantOutputStarted = false;
               }
               break;
             default: {
@@ -38082,18 +38282,22 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       handleMaxSessionTurnsEvent,
       handleSessionTokenLimitExceededEvent,
       handleCitationEvent,
+      settings,
       startRetryCountdown,
       clearRetryCountdown,
       setThought,
       commitPendingThought,
       pendingHistoryItemRef,
+      pendingAssistantItemsRef,
       pendingThoughtItemRef,
       setPendingHistoryItem,
       handleUserPromptSubmitBlockedEvent,
       handleStopHookLoopEvent,
       bindGoalTurn,
       addItem,
-      commitItem,
+      commitItemInOrder,
+      stagePendingAssistantItem,
+      setPendingAssistantItems,
       dualOutput
     ]
   );
@@ -38351,6 +38555,21 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         immediateDuplicateToolResponsesRef.current = null;
       }
       const userMessageTimestamp = Date.now();
+      if (submitType === "retry" /* Retry */) {
+        setPendingAssistantItems([]);
+        const pendingItem = pendingHistoryItemRef.current;
+        if (pendingItem?.type === "gemini" || pendingItem?.type === "gemini_content") {
+          setPendingHistoryItem(null);
+        }
+      } else if (!isTurnContinuation && !allowConcurrentBtwDuringResponse) {
+        const pendingItem = pendingHistoryItemRef.current;
+        if (pendingItem?.type === "gemini" || pendingItem?.type === "gemini_content") {
+          commitItemInOrder(pendingItem, userMessageTimestamp);
+          setPendingHistoryItem(null);
+        } else {
+          commitPendingAssistantItems(userMessageTimestamp);
+        }
+      }
       if (!isTurnContinuation && submitType !== "notification" /* Notification */ && submitType !== "goal" /* Goal */ && !allowConcurrentBtwDuringResponse) {
         setModelSwitchedFromQuotaError(false);
         const droppingInlineOverrideOnRetry = submitType === "retry" /* Retry */ && inlineModelOverrideActiveRef.current;
@@ -38568,7 +38787,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             return;
           }
           if (pendingHistoryItemRef.current) {
-            commitItem(pendingHistoryItemRef.current, userMessageTimestamp);
+            commitItemInOrder(
+              pendingHistoryItemRef.current,
+              userMessageTimestamp
+            );
             setPendingHistoryItem(null);
           }
           const immediateDuplicateToolResponses = immediateDuplicateToolResponsesRef.current;
@@ -38723,7 +38945,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       processGeminiStreamEvents,
       pendingHistoryItemRef,
       addItem,
-      commitItem,
+      commitPendingAssistantItems,
+      commitItemInOrder,
+      setPendingAssistantItems,
       setPendingHistoryItem,
       setInitError,
       geminiClient,
@@ -39309,6 +39533,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     () => [
       // Reasoning renders above the streaming answer.
       pendingThoughtItem,
+      ...pendingAssistantItems,
       pendingHistoryItem,
       pendingRetryErrorItem,
       pendingRetryCountdownItem,
@@ -39316,6 +39541,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ].filter((i) => i !== void 0 && i !== null),
     [
       pendingThoughtItem,
+      pendingAssistantItems,
       pendingHistoryItem,
       pendingRetryErrorItem,
       pendingRetryCountdownItem,
@@ -39718,6 +39944,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     submitQuery,
     initError,
     pendingHistoryItems,
+    clearPendingState,
     thought,
     cancelOngoingRequest,
     preemptGoalTurn,
@@ -43393,7 +43620,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
         );
         historyManager.loadHistory(historyItems);
         const userTurnCount = resumedSessionData.conversation.messages.filter(
-          (m) => m.type === "user" && m.subtype !== "mid_turn_user_message"
+          (m) => m.type === "user" && m.subtype !== "mid_turn_user_message" && m.subtype !== "realtime_message"
         ).length;
         if (userTurnCount > 0) {
           seedPromptCount(userTurnCount);
@@ -43739,6 +43966,12 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       );
     });
   }, [addHistoryItem, config]);
+  const clearPendingStateRef = (0, import_react161.useRef)(() => {
+  });
+  const clearPendingStateFromRef = (0, import_react161.useCallback)(
+    () => clearPendingStateRef.current(),
+    []
+  );
   const {
     isResumeDialogOpen,
     resumeMatchedSessions,
@@ -43750,6 +43983,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     settings,
     historyManager,
     startNewSession,
+    clearPendingState: clearPendingStateFromRef,
     setSessionName,
     remount: refreshStatic
   });
@@ -43758,6 +43992,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     settings,
     historyManager,
     startNewSession,
+    clearPendingState: clearPendingStateFromRef,
     setSessionName,
     remount: refreshStatic
   });
@@ -43922,7 +44157,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       handleResume,
       handleBranch,
       openDeleteDialog,
-      openHelpDialog
+      openHelpDialog,
+      clearPendingState: /* @__PURE__ */ __name(() => clearPendingStateRef.current(), "clearPendingState")
     }),
     [
       openAuthDialog,
@@ -44154,6 +44390,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     submitQuery,
     initError,
     pendingHistoryItems: pendingGeminiHistoryItems,
+    clearPendingState,
     thought,
     cancelOngoingRequest,
     preemptGoalTurn,
@@ -44192,6 +44429,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     goalQueueRef
   );
   cancelOngoingRequestRef.current = cancelOngoingRequest;
+  clearPendingStateRef.current = clearPendingState;
   isIdleRef.current = streamingState === "idle" /* Idle */;
   (0, import_react161.useEffect)(() => {
     if (streamingState === "idle" /* Idle */) {
@@ -44762,6 +45000,7 @@ ${currentText}` : popped.modelText
     ]
   );
   const handleClearScreen = (0, import_react161.useCallback)(() => {
+    clearPendingStateRef.current();
     historyManager.clearItems();
     clearScreen();
     remountStaticHistory();
@@ -45179,6 +45418,7 @@ ${currentText}` : popped.modelText
           const truncatedUi = expandCollapsedHistory(
             originalHistory.filter((h) => h.id < userItem.id)
           );
+          clearPendingStateRef.current();
           historyManager.loadHistory(truncatedUi);
           refreshStatic();
           if (userItem.type === "user" && userItem.text) {