@qwen-code/qwen-code 0.21.6 → 0.21.7-nightly.20260808.4ec0371e6

package/chunks/{startInteractiveUI-YE57CJ57.js → startInteractiveUI-ROUIQ5KU.js}

@@ -6,10 +6,13 @@ import {
 import {
   TUI_CHAT_RECORDING_FAILURE_MESSAGE,
   reportChatRecordingFailureToAdapter
-} from "./chunk-ODPXHGLL.js";
+} from "./chunk-RZMGG3HP.js";
+import {
+  StreamJsonOutputAdapter
+} from "./chunk-5YT3Y33M.js";
 import {
   startPostRenderPrefetches
-} from "./chunk-N2GJU6KI.js";
+} from "./chunk-BN3OROB3.js";
 import {
   AboutBox,
   BaseSelectionList,
@@ -87,19 +90,35 @@ import {
   useUIActions,
   useUIState,
   useVirtualViewport
-} from "./chunk-XA4TMLFN.js";
+} from "./chunk-APMRLB2H.js";
+import {
+  GeminiRespondingSpinner,
+  GeminiSpinner,
+  ICON,
+  SCREEN_READER_USER_PREFIX,
+  SHELL_COMMAND_NAME,
+  StreamingContext,
+  applyCollapsePolicyAndSummary,
+  buildResumedHistoryItems,
+  build_default,
+  expandCollapsedHistory,
+  isCollapsibleTool,
+  shouldDisplayGoalStateCause,
+  useStreamingContext,
+  waitForGoalRuntime
+} from "./chunk-5PGKKSO6.js";
 import {
   stopAndGetCapturedInput
-} from "./chunk-KVUBYJDM.js";
+} from "./chunk-TZEZYNYD.js";
 import {
   useAutoAcceptIndicator
-} from "./chunk-T4JSA7KU.js";
+} from "./chunk-64YLXLMY.js";
 import {
   KeypressProvider,
   useFocus,
   useKeypress,
   useKeypressContext
-} from "./chunk-75QMRMO7.js";
+} from "./chunk-APNNM3JC.js";
 import {
   classifyApiError,
   fireSessionDeleteHook
@@ -115,14 +134,7 @@ import {
   matchMcpServerPrefix,
   resolveAtCommandQuery,
   sanitizeDisplayText
-} from "./chunk-SLSWFHDF.js";
-import {
-  getCommandDisplayName,
-  getCommandSourceBadge
-} from "./chunk-IMOQO6YL.js";
-import {
-  StreamJsonOutputAdapter
-} from "./chunk-NGJOAKJY.js";
+} from "./chunk-BJKFFPX2.js";
 import {
   BuiltinCommandLoader,
   BundledSkillLoader,
@@ -163,18 +175,22 @@ import {
   resetBackgroundStateForSessionSwitch,
   serializeUserPromptExpansionPrompt,
   supportsMatchers
-} from "./chunk-GESMMPAK.js";
+} from "./chunk-UKAYEQDU.js";
 import {
   EXTENSION_RELOAD_FAILED_REASON,
   ExtensionRefreshState,
   appEvents,
   cleanupReviewWorktreeLeases,
   loadHierarchicalGeminiMemory
-} from "./chunk-XM2O73NC.js";
+} from "./chunk-IMK3SJ43.js";
+import {
+  getCommandDisplayName,
+  getCommandSourceBadge
+} from "./chunk-4Q6N3SNL.js";
 import {
   computeSessionStats,
   levelLabel
-} from "./chunk-TOGZTG4X.js";
+} from "./chunk-MIA37QO3.js";
 import {
   disableKittyProtocol,
   isKittyProtocolEnabled,
@@ -193,34 +209,19 @@ import {
   oscKittyNotify,
   saveClipboardImage,
   writeOsc52
-} from "./chunk-3LGZEYOF.js";
-import "./chunk-SKNE3KQC.js";
+} from "./chunk-YHEEE624.js";
+import "./chunk-Z5ZAWED3.js";
 import "./chunk-4WGODMVR.js";
+import "./chunk-JRIJOZXO.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-VGFPFM4U.js";
+} from "./chunk-ONSZH6VM.js";
 import {
   theme
-} from "./chunk-U25CMJYY.js";
+} from "./chunk-EKPKKXY2.js";
 import {
   require_jsx_runtime
 } from "./chunk-SV5PQVQE.js";
@@ -241,35 +242,40 @@ import {
 import {
   require_react
 } from "./chunk-5QWWOFGG.js";
-import "./chunk-OXX3FG2N.js";
-import "./chunk-2AGOQ7QO.js";
+import "./chunk-R2KZWK5Z.js";
+import "./chunk-S6HYI3MF.js";
+import {
+  MAX_INLINE_IMAGES_PER_ITEM,
+  collectInlineImages,
+  getInlineImageData
+} from "./chunk-PJRW65JO.js";
 import {
   relaunchApp
-} from "./chunk-SUKEUUAA.js";
+} from "./chunk-GUFY6D3E.js";
 import {
   setUpdateHandler
-} from "./chunk-EXCEQD22.js";
-import "./chunk-2POQWYM6.js";
+} from "./chunk-ZKUJ4AO7.js";
+import "./chunk-RFA6VDCR.js";
 import "./chunk-YAF2MQZ6.js";
-import "./chunk-R5RBXLNC.js";
 import {
   AUTO_THEME_NAME,
   DEFAULT_THEME,
   themeManager
-} from "./chunk-KKN2IE7Q.js";
-import "./chunk-GK2H5GRC.js";
+} from "./chunk-CTJLZLB5.js";
+import "./chunk-LMEIS6WW.js";
 import "./chunk-6H67XLET.js";
-import "./chunk-536SWZTA.js";
+import "./chunk-MV7VUCIG.js";
 import {
   getErrorMessage as getErrorMessage2
-} from "./chunk-FZFP7RZI.js";
+} from "./chunk-H2352CX2.js";
 import {
   openQwenAsrRealtimeStream,
   openVoiceStream,
   openVoiceStreamWithRetry
-} from "./chunk-WO2B5E5B.js";
-import "./chunk-W5DXUTXD.js";
-import "./chunk-DYA25Y7U.js";
+} from "./chunk-Q3JQ7OSU.js";
+import "./chunk-LDY4J4G6.js";
+import "./chunk-OWMAZHIX.js";
+import "./chunk-O7VQ3F22.js";
 import {
   cpLen,
   cpSlice,
@@ -282,7 +288,6 @@ import {
   stripUnsafeCharacters,
   toCodePoints
 } from "./chunk-4NFY2S7N.js";
-import "./chunk-RFUHDCNF.js";
 import {
   stringWidth
 } from "./chunk-2MIN6GRR.js";
@@ -295,63 +300,63 @@ import "./chunk-RXFQM6FQ.js";
 import "./chunk-HGCQ5SE7.js";
 import {
   isInlineModelOverrideAllowed
-} from "./chunk-5MJGUQU5.js";
+} from "./chunk-XIDHBXUI.js";
 import {
   assertVoiceBaseUrlNetworkAllowed,
   isKeytermEcho,
   isStreamingVoiceModel,
   resolveVoiceStreamConfig,
   transcribeVoiceAudio
-} from "./chunk-O7V7N4G7.js";
+} from "./chunk-ACHMWGC5.js";
 import {
   formatUnsupportedVoiceModelMessage,
   isSelectableVoiceModel
-} from "./chunk-C4CBJQKY.js";
-import "./chunk-JELIWHXD.js";
+} from "./chunk-LDUGDB5H.js";
+import "./chunk-AOHJKPKL.js";
 import {
   computeWorkspaceSkillListUpdates,
   resolveSkillSettings,
   skillSettingStrings
 } from "./chunk-Z4X5MTRT.js";
-import "./chunk-OWSW7EYP.js";
+import "./chunk-JACAHYEN.js";
 import {
   requestConsentInteractive,
   requestConsentOrFail
-} from "./chunk-G5NNWEYE.js";
+} from "./chunk-HY2INPTA.js";
 import "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-NKSF7HYF.js";
+} from "./chunk-AG3P2RES.js";
 import {
   getExtendedSystemInfo
-} from "./chunk-K2B3X3E7.js";
+} from "./chunk-26ISE5EG.js";
 import {
   formatDuration,
   formatRelativeTime,
   formatTokenCount
 } from "./chunk-3SH53ANB.js";
-import "./chunk-GLWP3FDB.js";
+import "./chunk-MZSJ43WV.js";
 import "./chunk-XCGIMOLN.js";
-import "./chunk-LAAFLUQV.js";
-import "./chunk-VWOVHOTT.js";
-import "./chunk-EMYZIABH.js";
+import "./chunk-P74TZRXD.js";
+import "./chunk-KJZ26VBX.js";
+import "./chunk-VDS2WYM5.js";
 import "./chunk-V6WHFGST.js";
 import "./chunk-DP3IHZGG.js";
 import "./chunk-6PLDPT2C.js";
 import "./chunk-FYJ7W2PI.js";
 import "./chunk-YP5KH5Y7.js";
-import "./chunk-24ER7UV4.js";
+import "./chunk-UFALT4LK.js";
 import "./chunk-ALMR3E6Q.js";
 import "./chunk-HIBNSEJE.js";
 import "./chunk-BKHCW2BI.js";
 import "./chunk-M5GB774H.js";
-import "./chunk-XC2VAFVZ.js";
-import "./chunk-WUC6ZFXO.js";
-import "./chunk-DIEFUBV6.js";
+import "./chunk-UVX4Y6IN.js";
+import "./chunk-ZWBUH5UP.js";
+import "./chunk-DIWZNWZT.js";
 import "./chunk-UDXSXLER.js";
 import {
   loadMcpApprovals
-} from "./chunk-3UOLYNTF.js";
+} from "./chunk-4QJJHIZ5.js";
 import {
   CORRUPTED_SUFFIX,
   SettingScope,
@@ -374,7 +379,7 @@ import {
   settingExistsInScope,
   validateSettingValue,
   writeOutputLanguageAndRegisterPath
-} from "./chunk-PPUOYL77.js";
+} from "./chunk-77WOUGCA.js";
 import "./chunk-RKUWKYED.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
@@ -383,18 +388,18 @@ import {
   localizeToolDisplayName,
   t,
   ta
-} from "./chunk-KHUA3NQV.js";
-import "./chunk-RK2EE3T7.js";
-import "./chunk-6PEXNQTX.js";
-import "./chunk-JE44IPH6.js";
+} from "./chunk-TAOSTUHI.js";
+import "./chunk-KPMB4JEZ.js";
+import "./chunk-ALFTV7GA.js";
+import "./chunk-SDUDZNF4.js";
 import {
   getCliVersion
-} from "./chunk-YMBOEAF4.js";
+} from "./chunk-Z6W3XDLN.js";
 import "./chunk-VJNBRRZG.js";
 import {
   isWorkspaceTrusted,
   loadTrustedFolders
-} from "./chunk-ACZRB7AD.js";
+} from "./chunk-3ARO4N5G.js";
 import {
   require_strip_json_comments
 } from "./chunk-ALGGS7UH.js";
@@ -447,6 +452,7 @@ import {
   createInstructionsLoadedCallback,
   customProvider,
   detectAutonomousSentinel,
+  didWriteProjectContextFile,
   fetchGitDiff,
   fetchGitDiffHunks,
   finalizeToolResponses,
@@ -475,6 +481,7 @@ import {
   isGatedMcpScope,
   isSessionRuntimeActive,
   isSettledStatus,
+  isSignalTermination,
   isSuccessStatus,
   isTerminalStatus,
   loadUsageHistory,
@@ -490,6 +497,7 @@ import {
   readWorktreeSessionMarker,
   redactUrlCredentials,
   refreshMemoryAfterManagedWrite,
+  refreshMemoryInstruction,
   resolveBaseUrl,
   resolveBranchName,
   resolveMetadataKey,
@@ -503,65 +511,72 @@ import {
   validateWorkflowName,
   watchRepoBranch,
   writeRuntimeStatus
-} from "./chunk-A4VTILZT.js";
+} from "./chunk-BFSQBXHV.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-H6XPXXMH.js";
-import "./chunk-Z7JILXGX.js";
-import "./chunk-T5U6IM4C.js";
-import "./chunk-TSERKWCX.js";
-import "./chunk-33FNCQSY.js";
+import "./chunk-2UUMVNYT.js";
+import "./chunk-MVUQRLOH.js";
+import "./chunk-XCWO3SMQ.js";
+import "./chunk-7MH4J33A.js";
 import "./chunk-6PVPNMXU.js";
 import {
   resolveModelId
-} from "./chunk-DIT4V3XH.js";
+} from "./chunk-RGTB44BO.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-MOHAWIAW.js";
-import "./chunk-3PRJYMXC.js";
+import "./chunk-GNPNYXJB.js";
+import "./chunk-HUWENAHO.js";
 import {
   promptIdContext
 } from "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
 import "./chunk-ZPJWUGCS.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-4S4OEQ6U.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
+} from "./chunk-WAUGQKUU.js";
+import "./chunk-REHWPCG2.js";
+import "./chunk-L4N6TIP7.js";
+import "./chunk-SAH4BD2J.js";
 import {
-  APPROVAL_MODES,
   runOutsideAgentContext
-} from "./chunk-6WBWIPBF.js";
+} from "./chunk-CPG6P4GG.js";
 import "./chunk-S6LOFUVP.js";
+import "./chunk-2J3OJGTL.js";
 import {
   getStartupContextLength,
   isSystemReminderContent
-} from "./chunk-WVAESIM6.js";
+} from "./chunk-IA7TGCN2.js";
 import "./chunk-K623ENWT.js";
 import "./chunk-AQ37AY7B.js";
 import {
   isPathWithinRoot
-} from "./chunk-432XCUHF.js";
-import "./chunk-HU5TUALO.js";
+} from "./chunk-EQL65XGA.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 "./chunk-P3QQPMQA.js";
+import "./chunk-M6HMMKVG.js";
 import {
   REASONING_EFFORT_TIERS
 } from "./chunk-DGEIYUC3.js";
@@ -569,15 +584,10 @@ import {
   getUnsupportedImageFormatWarning,
   isSupportedImageMimeType
 } from "./chunk-MPHPFVKK.js";
-import "./chunk-GLNBDYUX.js";
-import "./chunk-DJ2GSRLV.js";
-import "./chunk-QZKYZCN3.js";
-import "./chunk-MGSSJT27.js";
-import "./chunk-2J3OJGTL.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-6O5DVH27.js";
+import "./chunk-AXMWHKXA.js";
 import "./chunk-GLCZKT5V.js";
-import "./chunk-2DNKEBXY.js";
+import "./chunk-DJ2GSRLV.js";
+import "./chunk-EI3HZX6C.js";
 import {
   ApiCancelEvent,
   AuthEvent,
@@ -618,7 +628,7 @@ import {
   runVisionBridge,
   shouldRunVisionBridge,
   splitImageParts
-} from "./chunk-PX5DNLSA.js";
+} from "./chunk-XCG76UE6.js";
 import "./chunk-WOJZWRAZ.js";
 import "./chunk-VGC4I5JJ.js";
 import {
@@ -627,25 +637,25 @@ import {
   getAutoMemoryRoot,
   getUserAutoMemoryRoot,
   isAnyAutoMemPath
-} from "./chunk-E4WHKETF.js";
-import "./chunk-ZPPP6VCL.js";
+} from "./chunk-FVKHVJZQ.js";
+import "./chunk-6ZRFAKXK.js";
 import {
   ToolNames,
   isShellProgressData
-} from "./chunk-D7D7RXIJ.js";
+} from "./chunk-PYQADEFD.js";
 import {
   MAINLINE_CODER_MODEL
-} from "./chunk-BOGOR4HB.js";
+} from "./chunk-P7HUJDBZ.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 +669,9 @@ import {
   isNodeError,
   shortenPath,
   tildeifyPath
-} from "./chunk-3RXUYQJI.js";
+} from "./chunk-OIVKILPI.js";
 import "./chunk-VOQXFAY5.js";
-import "./chunk-VSALQLT7.js";
+import "./chunk-TSYIQDG7.js";
 import {
   finalizeStartupProfile,
   profileCheckpoint
@@ -670,7 +680,7 @@ import "./chunk-Q7YDKOGY.js";
 import {
   registerCleanup,
   runExitCleanup
-} from "./chunk-RHTTKJTP.js";
+} from "./chunk-ZQGHESAS.js";
 import {
   clearScreen,
   writeStderrLine,
@@ -2518,10 +2528,11 @@ var VirtualizedListItem = (0, import_react10.memo)(
     const onHeightChangeRef = (0, import_react10.useRef)(onHeightChange);
     onHeightChangeRef.current = onHeightChange;
     (0, import_react10.useLayoutEffect)(() => {
-      if (hasMeasured && height > 0) {
-        onHeightChangeRef.current(itemKey, height);
+      const measuredHeight = itemRef.current?.yogaNode?.getComputedHeight() ?? height;
+      if (hasMeasured && measuredHeight > 0) {
+        onHeightChangeRef.current(itemKey, measuredHeight);
       }
-    }, [itemKey, height, hasMeasured]);
+    }, [itemKey, height, hasMeasured, content]);
     return /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(Box_default, { width: "100%", flexDirection: "column", flexShrink: 0, ref: itemRef, children: shouldBeStatic ? /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       StaticRender,
       {
@@ -2577,12 +2588,28 @@ function VirtualizedList(props, ref) {
   const containerHeight = props.containerHeight ?? measuredContainerHeight;
   const containerWidth = measuredContainerWidth;
   const [heights, setHeights] = (0, import_react10.useState)({});
+  const measureAtFullHeight = props.measureAtFullHeight === true;
+  const [fullHeightMeasurementPending, setFullHeightMeasurementPending] = (0, import_react10.useState)(measureAtFullHeight);
+  const [previousMeasurementInputs, setPreviousMeasurementInputs] = (0, import_react10.useState)({
+    enabled: measureAtFullHeight,
+    data,
+    renderItem
+  });
+  if (previousMeasurementInputs.enabled !== measureAtFullHeight || measureAtFullHeight && (previousMeasurementInputs.data !== data || previousMeasurementInputs.renderItem !== renderItem)) {
+    setPreviousMeasurementInputs({
+      enabled: measureAtFullHeight,
+      data,
+      renderItem
+    });
+    setFullHeightMeasurementPending(measureAtFullHeight);
+  }
   const isInitialScrollSet = (0, import_react10.useRef)(false);
   const onHeightChange = (0, import_react10.useCallback)((key, height) => {
     setHeights((prev) => {
       if (prev[key] === height) return prev;
       return { ...prev, [key]: height };
     });
+    setFullHeightMeasurementPending(false);
   }, []);
   (0, import_react10.useLayoutEffect)(() => {
     setHeights((prev) => {
@@ -3060,7 +3087,7 @@ function VirtualizedList(props, ref) {
     maxScroll,
     scrollbarThumbActive
   ]);
-  const rootHeight = props.containerHeight !== void 0 ? Math.min(props.containerHeight, totalHeight) : "100%";
+  const rootHeight = props.containerHeight !== void 0 ? fullHeightMeasurementPending ? props.containerHeight : Math.min(props.containerHeight, totalHeight) : "100%";
   return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(Box_default, { ref: rootRef, width: "100%", height: rootHeight, flexDirection: "row", children: [
     /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       Box_default,
@@ -3858,17 +3885,19 @@ var MainContent = /* @__PURE__ */ __name(() => {
   const pendingStateRef = (0, import_react14.useRef)({
     activePtyId: uiState.activePtyId,
     embeddedShellFocused: uiState.embeddedShellFocused,
-    isEditorDialogOpen: uiState.isEditorDialogOpen,
-    constrainHeight: uiState.constrainHeight,
-    availableTerminalHeight
+    isEditorDialogOpen: uiState.isEditorDialogOpen
   });
   pendingStateRef.current = {
     activePtyId: uiState.activePtyId,
     embeddedShellFocused: uiState.embeddedShellFocused,
-    isEditorDialogOpen: uiState.isEditorDialogOpen,
-    constrainHeight: uiState.constrainHeight,
-    availableTerminalHeight
+    isEditorDialogOpen: uiState.isEditorDialogOpen
   };
+  const pendingAvailableTerminalHeight = pendingHistoryItems.length > 0 && uiState.constrainHeight ? availableTerminalHeight : void 0;
+  const hasPendingPlainTextConfirmation = pendingHistoryItems.some(
+    (item) => item.type === "tool_group" && item.tools.some(
+      (tool) => tool.status === "Confirming" /* Confirming */ && tool.confirmationDetails?.type === "info" && tool.confirmationDetails.renderPromptAsPlainText === true
+    )
+  );
   const pendingSourceCopyOffsetsRef = (0, import_react14.useRef)(pendingSourceCopyOffsetsByIndex);
   pendingSourceCopyOffsetsRef.current = pendingSourceCopyOffsetsByIndex;
   const renderVirtualItem = (0, import_react14.useCallback)(
@@ -3889,7 +3918,7 @@ var MainContent = /* @__PURE__ */ __name(() => {
           {
             terminalWidth,
             mainAreaWidth,
-            availableTerminalHeight: ps.constrainHeight ? ps.availableTerminalHeight : void 0,
+            availableTerminalHeight: pendingAvailableTerminalHeight,
             item: { ...item, id: 0 },
             isPending: true,
             isFocused: !ps.isEditorDialogOpen,
@@ -3924,7 +3953,8 @@ var MainContent = /* @__PURE__ */ __name(() => {
       staticAreaMaxItemHeight,
       uiState.slashCommands,
       sourceCopyOffsetsByHistoryItem,
-      fullDetail
+      fullDetail,
+      pendingAvailableTerminalHeight
     ]
   );
   if (useVirtualScroll) {
@@ -3945,6 +3975,7 @@ var MainContent = /* @__PURE__ */ __name(() => {
           initialScrollIndex: allVirtualItems.length <= 1 ? 0 : SCROLL_TO_ITEM_END,
           isStaticItem: virtualIsStaticItem,
           containerHeight: scrollContainerHeight,
+          measureAtFullHeight: hasPendingPlainTextConfirmation,
           showScrollbar
         }
       ),
@@ -25155,7 +25186,7 @@ function SuggestionsDisplay({
               {
                 ...mode === "slash" || suggestion.description ? { width: labelColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
                 children: /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Box_default, { children: [
-                  labelElement,
+                  /* @__PURE__ */ (0, import_jsx_runtime103.jsx)(Box_default, { flexShrink: 0, children: labelElement }),
                   suggestion.argumentHint && /* @__PURE__ */ (0, import_jsx_runtime103.jsxs)(Text, { color: theme.text.secondary, children: [
                     " ",
                     suggestion.argumentHint
@@ -33892,7 +33923,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 +33995,7 @@ function useBranchCommand(options) {
           collapsePreviewCount
         );
         startNewSession(newSessionId);
+        clearPendingState?.();
         historyManager.clearItems();
         historyManager.loadHistory(uiHistoryItems);
         uiSwapped = true;
@@ -34016,6 +34055,7 @@ function useBranchCommand(options) {
       config,
       historyManager,
       startNewSession,
+      clearPendingState,
       setSessionName,
       remount,
       options.settings.merged.ui?.history?.collapseOnResume,
@@ -34049,6 +34089,7 @@ function useResumeCommand(options) {
     settings,
     historyManager,
     startNewSession,
+    clearPendingState,
     setSessionName,
     remount
   } = options;
@@ -34113,6 +34154,7 @@ function useResumeCommand(options) {
         }
         startNewSession(sessionId);
         setSessionName?.(customTitle ?? null);
+        clearPendingState?.();
         clearItems();
         loadHistory(uiHistoryItems);
         if (recoveredBackgroundAgentsNotice) {
@@ -34157,6 +34199,7 @@ function useResumeCommand(options) {
       clearItems,
       loadHistory,
       startNewSession,
+      clearPendingState,
       setSessionName,
       remount,
       settings.merged.ui?.history?.collapseOnResume,
@@ -34661,11 +34704,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,
@@ -35004,6 +35049,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
           const combinedContent = [];
           let firstModelOverride;
           const onCompleteCallbacks = [];
+          let refreshContextFilesOnWrite = false;
           for (const skill of stackedResult.skills) {
             if (!skill.action) continue;
             const skillContext = {
@@ -35018,6 +35064,9 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
             if (skillResult?.type === "submit_prompt") {
               combinedContent.push(skillResult.content);
               firstModelOverride ??= skillResult.modelOverride;
+              refreshContextFilesOnWrite ||= Boolean(
+                skillResult.refreshContextFilesOnWrite
+              );
               if (skillResult.onComplete) {
                 onCompleteCallbacks.push(skillResult.onComplete);
               }
@@ -35058,6 +35107,7 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
             type: "submit_prompt",
             content: mergedContent,
             ...firstModelOverride ? { modelOverride: firstModelOverride } : {},
+            ...refreshContextFilesOnWrite ? { refreshContextFilesOnWrite: true } : {},
             ...onCompleteCallbacks.length ? {
               onComplete: /* @__PURE__ */ __name(async () => {
                 for (const cb of onCompleteCallbacks) await cb();
@@ -35355,7 +35405,8 @@ var useSlashCommandProcessor = /* @__PURE__ */ __name((config, settings, history
                     type: "submit_prompt",
                     content,
                     onComplete: result.onComplete,
-                    modelOverride: result.modelOverride
+                    modelOverride: result.modelOverride,
+                    refreshContextFilesOnWrite: result.refreshContextFilesOnWrite
                   };
                 }
                 case "confirm_shell_commands": {
@@ -35839,7 +35890,7 @@ ${finalOutput}`;
               finalStatus = "Canceled" /* Canceled */;
               finalOutput = `Command was cancelled.
 ${finalOutput}`;
-            } else if (result2.signal) {
+            } else if (isSignalTermination(result2.signal)) {
               finalStatus = "Error" /* Error */;
               finalOutput = `Command terminated by signal: ${result2.signal}.
 ${finalOutput}`;
@@ -36158,8 +36209,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 +36231,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 +36249,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 +36800,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,11 +36846,21 @@ 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
   );
   const processedMemoryToolsRef = (0, import_react135.useRef)(/* @__PURE__ */ new Set());
   const submitPromptOnCompleteRef = (0, import_react135.useRef)(null);
+  const refreshContextFilesOnWriteRef = (0, import_react135.useRef)(false);
   const modelOverrideRef = (0, import_react135.useRef)(void 0);
   const inlineModelOverrideActiveRef = (0, import_react135.useRef)(false);
   const canUseToolResultFullTurnModel = (0, import_react135.useCallback)((model) => {
@@ -36964,7 +37059,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 +37094,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
   }, [
     streamingState,
     addItem,
-    commitItem,
+    commitItemInOrder,
     setPendingHistoryItem,
     onCancelSubmit,
     pendingHistoryItemRef,
@@ -37121,6 +37216,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "submit_prompt": {
               localQueryToSendToGemini = slashCommandResult.content;
               submitPromptOnCompleteRef.current = slashCommandResult.onComplete ?? null;
+              refreshContextFilesOnWriteRef.current = Boolean(
+                slashCommandResult.refreshContextFilesOnWrite
+              );
               if (slashCommandResult.modelOverride) {
                 if (isInlineModelOverrideAllowed(
                   config,
@@ -37232,7 +37330,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 +37338,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 +37371,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           newGeminiMessageBuffer,
           safeSplitPoint
         );
-        commitItem(
+        commitItemInOrder(
           {
             type: nextPendingType,
             text: beforeText
@@ -37324,7 +37430,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           newGeminiMessageBuffer,
           splitPoint
         );
-        commitItem(
+        commitItemInOrder(
           {
             type: nextPendingType,
             text: beforeText
@@ -37347,9 +37453,10 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       return newGeminiMessageBuffer;
     },
     [
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
+      stagePendingAssistantItem,
       terminalWidth,
       terminalHeight,
       availableTerminalHeightRef,
@@ -37479,7 +37586,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 +37604,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     [
       addItem,
       commitPendingThought,
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       setThought,
@@ -37510,7 +37620,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 +37649,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     },
     [
       commitPendingThought,
-      commitItem,
+      commitItemInOrder,
       pendingHistoryItemRef,
       setPendingHistoryItem,
       setPendingRetryErrorItem,
@@ -37554,14 +37664,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 +37723,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 +37738,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 +37803,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 +37815,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 +37833,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 +37880,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 +37983,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 +38043,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 +38052,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 +38111,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
             case "retry" /* Retry */:
               if (!event.isContinuation) {
                 discardBufferedStreamEvents();
+                setPendingAssistantItems([]);
                 if (pendingHistoryItemRef.current) {
                   setPendingHistoryItem(null);
                 }
@@ -37899,6 +38119,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 thoughtBuffer = "";
                 setThought(null);
                 geminiMessageBuffer = "";
+                assistantOutputStarted = false;
+                assistantInlineImageCount = 0;
               } else {
                 flushBufferedStreamEvents();
               }
@@ -37911,6 +38133,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
               break;
             case "model_fallback" /* ModelFallback */: {
               discardBufferedStreamEvents();
+              setPendingAssistantItems([]);
               if (pendingHistoryItemRef.current) {
                 setPendingHistoryItem(null);
               }
@@ -37918,6 +38141,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 +38159,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 +38172,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                 },
                 userMessageTimestamp
               );
+              geminiMessageBuffer = "";
+              assistantOutputStarted = false;
               break;
             case "user_prompt_submit_blocked" /* UserPromptSubmitBlocked */:
               flushBufferedStreamEvents();
@@ -37951,10 +38181,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 +38196,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 +38210,8 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
                   },
                   userMessageTimestamp
                 );
+                geminiMessageBuffer = "";
+                assistantOutputStarted = false;
               }
               break;
             default: {
@@ -38082,18 +38318,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
     ]
   );
@@ -38349,8 +38589,26 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
         duplicateProviderToolCallResponseIdsRef.current.clear();
         pendingDuplicateToolResponsesRef.current = [];
         immediateDuplicateToolResponsesRef.current = null;
+        if (submitType !== "retry" /* Retry */ && submitType !== "notification" /* Notification */ && submitType !== "goal" /* Goal */) {
+          refreshContextFilesOnWriteRef.current = false;
+        }
       }
       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 +38826,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 +38984,9 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
       processGeminiStreamEvents,
       pendingHistoryItemRef,
       addItem,
-      commitItem,
+      commitPendingAssistantItems,
+      commitItemInOrder,
+      setPendingAssistantItems,
       setPendingHistoryItem,
       setInitError,
       geminiClient,
@@ -38946,15 +39209,35 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
           "runtime"
         );
       }
-      const didRefreshManagedMemory = await refreshMemoryAfterManagedWrite(
-        config,
-        completedAndReadyToSubmitTools.map((toolCall) => ({
+      const memoryWriteCandidates = completedAndReadyToSubmitTools.map(
+        (toolCall) => ({
           toolName: toolCall.request.name,
           args: toolCall.request.args,
           status: toolCall.status
-        })),
+        })
+      );
+      const didRefreshManagedMemory = await refreshMemoryAfterManagedWrite(
+        config,
+        memoryWriteCandidates,
         { logContext: "interactive memory tool batch" }
       );
+      if (refreshContextFilesOnWriteRef.current) {
+        const matchedContextFileWrite = didWriteProjectContextFile(
+          memoryWriteCandidates,
+          config.getProjectRoot()
+        );
+        debugLogger36.debug(
+          `Checked marked context-file memory tool batch; matched=${matchedContextFileWrite}`
+        );
+        if (matchedContextFileWrite) {
+          debugLogger36.debug(
+            "Refreshing memory after context-file memory write"
+          );
+          await refreshMemoryInstruction(config, {
+            logContext: "interactive context-file memory tool batch"
+          });
+        }
+      }
       if (newSuccessfulMemorySaves.length > 0) {
         if (!didRefreshManagedMemory) {
           void performMemoryRefresh().catch((err) => {
@@ -39309,6 +39592,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     () => [
       // Reasoning renders above the streaming answer.
       pendingThoughtItem,
+      ...pendingAssistantItems,
       pendingHistoryItem,
       pendingRetryErrorItem,
       pendingRetryCountdownItem,
@@ -39316,6 +39600,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     ].filter((i) => i !== void 0 && i !== null),
     [
       pendingThoughtItem,
+      pendingAssistantItems,
       pendingHistoryItem,
       pendingRetryErrorItem,
       pendingRetryCountdownItem,
@@ -39718,6 +40003,7 @@ var useGeminiStream = /* @__PURE__ */ __name((geminiClient, history, addItem, co
     submitQuery,
     initError,
     pendingHistoryItems,
+    clearPendingState,
     thought,
     cancelOngoingRequest,
     preemptGoalTurn,
@@ -43739,6 +44025,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 +44042,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     settings,
     historyManager,
     startNewSession,
+    clearPendingState: clearPendingStateFromRef,
     setSessionName,
     remount: refreshStatic
   });
@@ -43758,6 +44051,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     settings,
     historyManager,
     startNewSession,
+    clearPendingState: clearPendingStateFromRef,
     setSessionName,
     remount: refreshStatic
   });
@@ -43922,7 +44216,8 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
       handleResume,
       handleBranch,
       openDeleteDialog,
-      openHelpDialog
+      openHelpDialog,
+      clearPendingState: /* @__PURE__ */ __name(() => clearPendingStateRef.current(), "clearPendingState")
     }),
     [
       openAuthDialog,
@@ -44154,6 +44449,7 @@ var AppContainer = /* @__PURE__ */ __name((props) => {
     submitQuery,
     initError,
     pendingHistoryItems: pendingGeminiHistoryItems,
+    clearPendingState,
     thought,
     cancelOngoingRequest,
     preemptGoalTurn,
@@ -44192,6 +44488,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 +45059,7 @@ ${currentText}` : popped.modelText
     ]
   );
   const handleClearScreen = (0, import_react161.useCallback)(() => {
+    clearPendingStateRef.current();
     historyManager.clearItems();
     clearScreen();
     remountStaticHistory();
@@ -45179,6 +45477,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) {