mixdog 0.9.46 → 0.9.49

package/src/tui/components/Markdown.jsx

@@ -28,6 +28,7 @@ export {
   resetStreamingMarkdownStablePrefix,
   resetAllStreamingMarkdownStablePrefixes,
   streamingLayoutText,
+  windowPlainStreamingText,
 } from '../markdown/streaming-markdown.mjs';
 export {
   measureMarkdownRenderedRows,
@@ -82,7 +83,11 @@ export function Markdown({ children, themeEpoch = 0, trimPartialFences = false,
 export function StreamingMarkdown({ children, themeEpoch = 0, columns, streamKey }) {
   const parts = resolveStreamingMarkdownParts(children, streamKey);
   if (parts.plain) {
-    return <Markdown themeEpoch={themeEpoch} columns={columns}>{parts.unstableForRender}</Markdown>;
+    // Plain streaming text has no markdown tokens to style. Sending a growing
+    // multi-line tail through renderTokenAnsiSegments/marked on every delta
+    // reparses the whole response and dominates frame time; Ink can wrap the
+    // identical visible text directly.
+    return <Text color={theme.text} wrap="wrap">{parts.unstableForRender}</Text>;
   }
   return (
     <Box flexDirection="column" gap={1}>

package/src/tui/components/Message.jsx

@@ -15,7 +15,12 @@
 import React from 'react';
 import { Box, Text } from 'ink';
 import { theme, TURN_MARKER } from '../theme.mjs';
-import { Markdown, StreamingMarkdown, resetStreamingMarkdownStablePrefix } from './Markdown.jsx';
+import {
+  Markdown,
+  StreamingMarkdown,
+  resetStreamingMarkdownStablePrefix,
+  windowPlainStreamingText,
+} from './Markdown.jsx';
 import { assistantBodyWidth } from '../markdown/table-layout.mjs';
 
 // `themeEpoch` is a memo-busting prop (threaded from App): the active theme
@@ -28,6 +33,7 @@ export const AssistantMessage = React.memo(function AssistantMessage({
   columns = 80,
   themeEpoch = 0,
   assistantId,
+  streamingWindowRows = 0,
 }) {
   // The body column needs an EXPLICIT numeric width. Without it, ink/Yoga
   // measures the wrapped markdown body before the row's available width is
@@ -43,6 +49,9 @@ export const AssistantMessage = React.memo(function AssistantMessage({
   }, [streaming, assistantId]);
 
   const bodyWidth = assistantBodyWidth(columns);
+  const renderText = streaming && streamingWindowRows > 0
+    ? windowPlainStreamingText(text, bodyWidth, streamingWindowRows)
+    : text;
   return (
     <Box flexDirection="row" marginTop={1}>
       <Box flexShrink={0} minWidth={2}>
@@ -50,7 +59,7 @@ export const AssistantMessage = React.memo(function AssistantMessage({
       </Box>
       <Box flexDirection="column" flexShrink={0} width={bodyWidth}>
         {streaming
-          ? <StreamingMarkdown themeEpoch={themeEpoch} columns={bodyWidth} streamKey={assistantId}>{text}</StreamingMarkdown>
+          ? <StreamingMarkdown themeEpoch={themeEpoch} columns={bodyWidth} streamKey={assistantId}>{renderText}</StreamingMarkdown>
           : <Markdown themeEpoch={themeEpoch} columns={bodyWidth}>{text}</Markdown>}
       </Box>
     </Box>

package/src/tui/components/PromptInput.jsx

@@ -49,6 +49,10 @@ import {
   isModifiedEnterSequence,
   isAnyModifiedEnterSequence,
 } from './prompt-input/edit-helpers.mjs';
+import {
+  cancelPromptImmediateFlush,
+  schedulePromptImmediateFlush,
+} from './prompt-input/immediate-render.mjs';
 
 // Windows Terminal IME composition can clip a glyph that starts exactly at the
 // left edge of the editable text node. The rounded prompt box already adds a
@@ -108,6 +112,7 @@ export function PromptInput({
   });
   const [, bumpCursorAnchorEpoch] = useState(0);
   const draftRef = useRef(draft);
+  const interruptActiveRef = useRef(interruptActive);
   const lastReportedValueRef = useRef(draft.value);
   // Bumped on every submit/draftOverride replace/unmount so an async paste
   // (clipboard read or onPasteText promise) that resolves after the draft
@@ -132,6 +137,7 @@ export function PromptInput({
   const undoRef = useRef({ past: [], future: [], lastPushAt: 0, lastValue: null });
   const { value, cursor } = draft;
   draftRef.current = draft;
+  interruptActiveRef.current = interruptActive;
   if (selectionRef) {
     const range = selectionRange(draft);
     selectionRef.current = range
@@ -158,30 +164,22 @@ export function PromptInput({
     }
   };
 
-  // commitDraft fires on every keystroke; a raw queueMicrotask(flushImmediate)
-  // per commit bypassed ink's maxFps and forced an unthrottled render for each
-  // char (a burst of paste/held-key edits = a render storm). Coalesce to a
-  // frame budget: flush the first keystroke immediately (no caret lag) and
-  // batch the rest to one flush per ~16ms, with a trailing flush so the final
-  // char of a burst always lands.
-  const FLUSH_INTERVAL_MS = 16;
+  // During an active turn, ink is already painting streaming updates at its
+  // 60fps budget. A second unthrottled input render competes with those frames
+  // and makes key echo slower, so busy input stays on ink's normal render path.
+  // Idle input keeps the leading+trailing immediate flush for crisp caret echo.
   const scheduleImmediateFlush = () => {
-    const t = flushThrottleRef.current;
-    const now = Date.now();
-    const elapsed = now - t.lastAt;
-    if (elapsed >= FLUSH_INTERVAL_MS) {
-      if (t.timer !== null) { clearTimeout(t.timer); t.timer = null; }
-      t.lastAt = now;
-      queueMicrotask(flushImmediate);
-    } else if (t.timer === null) {
-      t.timer = setTimeout(() => {
-        t.timer = null;
-        t.lastAt = Date.now();
-        flushImmediate();
-      }, FLUSH_INTERVAL_MS - elapsed);
-    }
+    schedulePromptImmediateFlush({
+      throttle: flushThrottleRef.current,
+      isSuppressed: () => interruptActiveRef.current,
+      flush: flushImmediate,
+    });
   };
 
+  useEffect(() => () => {
+    cancelPromptImmediateFlush(flushThrottleRef.current);
+  }, []);
+
   const commitDraft = (next, options = {}) => {
     const sameDraft = draftStateEqual(draftRef.current, next);
     if (!options.keepPreferredColumn) preferredColumnRef.current = null;

package/src/tui/components/Spinner.jsx

@@ -15,7 +15,7 @@
  *     is mode-driven: up while requesting, down otherwise. Input totals hidden.
  *   - elided duration formatting ("0:25" after 60s).
  *   - mode prop: 'responding' | 'thinking' | 'tool-use' | 'tool-input' |
- *     'requesting' | 'compacting' | 'resuming' (default 'responding').
+ *     'requesting' | 'reconnecting' | 'compacting' | 'resuming' (default 'responding').
  */
 import React, { useRef } from 'react';
 import { Box, Text } from 'ink';
@@ -40,7 +40,7 @@ const SHOW_TOKENS_AFTER_MS = 30_000;
 const THINKING_DELAY_MS = 3000;
 
 // One-way shimmer. The tail runs past the final character before restarting.
-const GLIMMER_SPEED_MS = { requesting: 70, compacting: 120, 'auto-clear': 120, resuming: 120, 'tool-use': 120, responding: 120, thinking: 120, 'tool-input': 120 };
+const GLIMMER_SPEED_MS = { requesting: 70, reconnecting: 70, compacting: 120, 'auto-clear': 120, resuming: 120, 'tool-use': 120, responding: 120, thinking: 120, 'tool-input': 120 };
 const GLIMMER_TRAIL = 4;
 const THINKING_GLIMMER_SPEED_MS = 120;
 const THINKING_GLIMMER_TRAIL = 4;
@@ -230,7 +230,7 @@ export function Spinner({ verb = 'Working', startedAt, outputTokens = 0, tokens
     : theme.spinnerGlyph;
 
   // --- Verb shimmer (traveling highlight) ---
-  if (!displayVerbRef.current) {
+  if (!displayVerbRef.current || displayVerbModeRef.current !== mode) {
     displayVerbRef.current = stableModeVerb(mode, verb);
     nextVerbCheckRef.current = nextVerbCheckAt(now);
   }
@@ -240,7 +240,7 @@ export function Spinner({ verb = 'Working', startedAt, outputTokens = 0, tokens
     nextVerbCheckRef.current = nextVerbCheckAt(now);
   }
   const displayVerb = displayVerbRef.current;
-  const messageText = `${displayVerb}…`;
+  const messageText = mode === 'reconnecting' ? displayVerb : `${displayVerb}…`;
   const messageLen = messageText.length;
 
   // Glimmer speed per mode.

package/src/tui/components/StatusLine.jsx

@@ -152,18 +152,18 @@ function localContextPct({
   compactBoundaryTokens = 0,
   autoCompactTokenLimit = 0,
 } = {}) {
-  const baseWindow = localNum(compactBoundaryTokens) > 0
+  const boundary = localNum(compactBoundaryTokens) > 0
     ? localNum(compactBoundaryTokens)
     : (localNum(displayContextWindow) > 0
       ? localNum(displayContextWindow)
       : (localNum(contextWindow) > 0
         ? localNum(contextWindow)
         : (localNum(rawContextWindow) > 0 ? localNum(rawContextWindow) : 200_000)));
-  // Boundary-only denominator (mirrors ui/statusline.mjs resolveContextUsedPct):
-  // context % is always measured against the single compaction boundary value,
-  // never a separate auto-compact trigger — statusline and gateway stay on the
-  // same denominator with no before/after trigger semantics.
-  const window = baseWindow;
+  // The trigger is the denominator used by the pre-send auto-compact decision,
+  // so the local boot gauge reaches 100% at the exact same pressure.
+  const window = localNum(autoCompactTokenLimit) > 0
+    ? localNum(autoCompactTokenLimit)
+    : boundary;
   const s = stats && typeof stats === 'object' ? stats : {};
   const source = String(s.currentContextSource || '').toLowerCase();
   const estimated = localNum(s.currentEstimatedContextTokens);

package/src/tui/components/TranscriptItem.jsx

@@ -61,7 +61,7 @@ export function ToolHookDenialCard({ item, columns = 80 }) {
 // transcript row (which reads theme.* directly) to re-render. Threading the
 // epoch through Item → AssistantMessage/UserMessage/ToolExecution breaks
 // React.memo's shallow equality on a theme change without a broad refactor.
-export const Item = React.memo(function Item({ item, prevKind, columns, toolOutputExpanded, rightMessage = '', rightTone = 'info', rightMessageWidth = 24, themeEpoch = 0 }) {
+export const Item = React.memo(function Item({ item, prevKind, columns, toolOutputExpanded, rightMessage = '', rightTone = 'info', rightMessageWidth = 24, themeEpoch = 0, streamingWindowRows = 0 }) {
   const hintOnTurnDoneRow = item.kind === 'turndone' || item.kind === 'statusdone';
   let node = null;
   switch (item.kind) {
@@ -69,7 +69,7 @@ export const Item = React.memo(function Item({ item, prevKind, columns, toolOutp
       node = <UserMessage text={item.text} attached={prevKind === 'user'} columns={columns} themeEpoch={themeEpoch} />;
       break;
     case 'assistant':
-      node = <AssistantMessage text={item.text} streaming={item.streaming} columns={columns} themeEpoch={themeEpoch} assistantId={item.id} />;
+      node = <AssistantMessage text={item.text} streaming={item.streaming} columns={columns} themeEpoch={themeEpoch} assistantId={item.id} streamingWindowRows={streamingWindowRows} />;
       break;
     case 'tool': {
       if (shouldSuppressFullyFailedToolItem(item)) return null;

package/src/tui/components/prompt-input/immediate-render.mjs

@@ -0,0 +1,47 @@
+function suppressed(value) {
+  return typeof value === 'function' ? value() === true : value === true;
+}
+
+export function cancelPromptImmediateFlush(throttle, clearTimer = clearTimeout) {
+  if (!throttle || throttle.timer === null) return false;
+  clearTimer(throttle.timer);
+  throttle.timer = null;
+  return true;
+}
+
+export function schedulePromptImmediateFlush({
+  throttle,
+  isSuppressed = false,
+  flush,
+  intervalMs = 16,
+  now = Date.now,
+  enqueue = queueMicrotask,
+  setTimer = setTimeout,
+  clearTimer = clearTimeout,
+}) {
+  if (!throttle || typeof flush !== 'function') {
+    throw new TypeError('schedulePromptImmediateFlush requires throttle state and a flush function');
+  }
+  if (suppressed(isSuppressed)) {
+    cancelPromptImmediateFlush(throttle, clearTimer);
+    return false;
+  }
+
+  const current = now();
+  const elapsed = current - throttle.lastAt;
+  if (elapsed >= intervalMs) {
+    cancelPromptImmediateFlush(throttle, clearTimer);
+    throttle.lastAt = current;
+    enqueue(flush);
+    return true;
+  }
+  if (throttle.timer !== null) return false;
+
+  throttle.timer = setTimer(() => {
+    throttle.timer = null;
+    if (suppressed(isSuppressed)) return;
+    throttle.lastAt = now();
+    flush();
+  }, intervalMs - elapsed);
+  return true;
+}

package/src/tui/components/tool-execution/surface-detail.mjs

@@ -353,19 +353,24 @@ export function toolSearchLoadedSummary(resultText) {
     parsed = JSON.parse(String(resultText || ''));
   } catch {
     const text = String(resultText || '');
-    const match = /^Loaded deferred tools:\s*(.+)$/m.exec(text);
-    if (!match) return '';
-    return [...new Set(match[1].split(',').map((name) => name.trim()).filter(Boolean))].join(', ');
+    const loaded = /^Loaded deferred tools:\s*(.+)$/m.exec(text)?.[1] || '';
+    const already = /^Already active:\s*(.+)$/m.exec(text)?.[1] || '';
+    return [
+      ...(loaded ? [`Loaded: ${loaded}`] : []),
+      ...(already ? [`Already active: ${already}`] : []),
+    ].join(' · ');
   }
   const tools = parsed?.selected?.tools;
   if (!tools || typeof tools !== 'object') return '';
-  const names = [
-    ...(Array.isArray(tools.added) ? tools.added : []),
-    ...(Array.isArray(tools.already) ? tools.already : []),
-  ]
+  const uniqueNames = (names) => [...new Set((Array.isArray(names) ? names : [])
     .map((name) => String(name || '').trim())
-    .filter(Boolean);
-  return [...new Set(names)].join(', ');
+    .filter(Boolean))];
+  const loaded = uniqueNames(tools.added);
+  const already = uniqueNames(tools.already);
+  return [
+    ...(loaded.length ? [`Loaded: ${loaded.join(', ')}`] : []),
+    ...(already.length ? [`Already active: ${already.join(', ')}`] : []),
+  ].join(' · ');
 }
 
 export function agentTerminalDetail(status, isError, elapsed, error = '') {

package/src/tui/dist/index.mjs

@@ -3512,7 +3512,7 @@ var STALL_TIMEOUT_MS = 3e3;
 var STALL_FADE_MS = 2e3;
 var SHOW_TOKENS_AFTER_MS = 3e4;
 var THINKING_DELAY_MS = 3e3;
-var GLIMMER_SPEED_MS = { requesting: 70, compacting: 120, "auto-clear": 120, resuming: 120, "tool-use": 120, responding: 120, thinking: 120, "tool-input": 120 };
+var GLIMMER_SPEED_MS = { requesting: 70, reconnecting: 70, compacting: 120, "auto-clear": 120, resuming: 120, "tool-use": 120, responding: 120, thinking: 120, "tool-input": 120 };
 var GLIMMER_TRAIL = 4;
 var THINKING_GLIMMER_SPEED_MS = 120;
 var THINKING_GLIMMER_TRAIL = 4;
@@ -3649,7 +3649,7 @@ function Spinner({ verb = "Working", startedAt, outputTokens = 0, tokens = 0, th
     STALL_RGB,
     stalledIntensity
   )) : theme.spinnerGlyph;
-  if (!displayVerbRef.current) {
+  if (!displayVerbRef.current || displayVerbModeRef.current !== mode) {
     displayVerbRef.current = stableModeVerb(mode, verb);
     nextVerbCheckRef.current = nextVerbCheckAt(now);
   }
@@ -3659,7 +3659,7 @@ function Spinner({ verb = "Working", startedAt, outputTokens = 0, tokens = 0, th
     nextVerbCheckRef.current = nextVerbCheckAt(now);
   }
   const displayVerb = displayVerbRef.current;
-  const messageText = `${displayVerb}\u2026`;
+  const messageText = mode === "reconnecting" ? displayVerb : `${displayVerb}\u2026`;
   const messageLen = messageText.length;
   const glimmerSpeed = GLIMMER_SPEED_MS[mode] ?? 200;
   const shimmerSpan = Math.max(1, messageLen + GLIMMER_TRAIL);
@@ -4057,8 +4057,8 @@ function localContextPct({
   compactBoundaryTokens = 0,
   autoCompactTokenLimit = 0
 } = {}) {
-  const baseWindow = localNum(compactBoundaryTokens) > 0 ? localNum(compactBoundaryTokens) : localNum(displayContextWindow) > 0 ? localNum(displayContextWindow) : localNum(contextWindow) > 0 ? localNum(contextWindow) : localNum(rawContextWindow) > 0 ? localNum(rawContextWindow) : 2e5;
-  const window = baseWindow;
+  const boundary = localNum(compactBoundaryTokens) > 0 ? localNum(compactBoundaryTokens) : localNum(displayContextWindow) > 0 ? localNum(displayContextWindow) : localNum(contextWindow) > 0 ? localNum(contextWindow) : localNum(rawContextWindow) > 0 ? localNum(rawContextWindow) : 2e5;
+  const window = localNum(autoCompactTokenLimit) > 0 ? localNum(autoCompactTokenLimit) : boundary;
   const s = stats && typeof stats === "object" ? stats : {};
   const source = String(s.currentContextSource || "").toLowerCase();
   const estimated = localNum(s.currentEstimatedContextTokens);
@@ -4784,6 +4784,51 @@ function isAnyModifiedEnterSequence(input) {
   return Boolean(modifyOtherKeys && Number(modifyOtherKeys[1]) - 1 !== 0);
 }
 
+// src/tui/components/prompt-input/immediate-render.mjs
+function suppressed(value) {
+  return typeof value === "function" ? value() === true : value === true;
+}
+function cancelPromptImmediateFlush(throttle, clearTimer = clearTimeout) {
+  if (!throttle || throttle.timer === null) return false;
+  clearTimer(throttle.timer);
+  throttle.timer = null;
+  return true;
+}
+function schedulePromptImmediateFlush({
+  throttle,
+  isSuppressed = false,
+  flush,
+  intervalMs = 16,
+  now = Date.now,
+  enqueue = queueMicrotask,
+  setTimer = setTimeout,
+  clearTimer = clearTimeout
+}) {
+  if (!throttle || typeof flush !== "function") {
+    throw new TypeError("schedulePromptImmediateFlush requires throttle state and a flush function");
+  }
+  if (suppressed(isSuppressed)) {
+    cancelPromptImmediateFlush(throttle, clearTimer);
+    return false;
+  }
+  const current = now();
+  const elapsed = current - throttle.lastAt;
+  if (elapsed >= intervalMs) {
+    cancelPromptImmediateFlush(throttle, clearTimer);
+    throttle.lastAt = current;
+    enqueue(flush);
+    return true;
+  }
+  if (throttle.timer !== null) return false;
+  throttle.timer = setTimer(() => {
+    throttle.timer = null;
+    if (suppressed(isSuppressed)) return;
+    throttle.lastAt = now();
+    flush();
+  }, intervalMs - elapsed);
+  return true;
+}
+
 // src/tui/components/PromptInput.jsx
 import { Fragment as Fragment2, jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var IME_LEFT_GUARD_COLUMNS = 0;
@@ -4832,6 +4877,7 @@ function PromptInput({
   });
   const [, bumpCursorAnchorEpoch] = useState3(0);
   const draftRef = useRef4(draft);
+  const interruptActiveRef = useRef4(interruptActive);
   const lastReportedValueRef = useRef4(draft.value);
   const pasteGenerationRef = useRef4(0);
   if (valueRef) valueRef.current = draftRef.current.value;
@@ -4844,6 +4890,7 @@ function PromptInput({
   const undoRef = useRef4({ past: [], future: [], lastPushAt: 0, lastValue: null });
   const { value, cursor } = draft;
   draftRef.current = draft;
+  interruptActiveRef.current = interruptActive;
   if (selectionRef) {
     const range = selectionRange(draft);
     selectionRef.current = range ? { range, text: mask ? "" : draft.value.slice(range.start, range.end) } : null;
@@ -4859,26 +4906,16 @@ function PromptInput({
       node = node.parentNode;
     }
   };
-  const FLUSH_INTERVAL_MS = 16;
   const scheduleImmediateFlush = () => {
-    const t = flushThrottleRef.current;
-    const now = Date.now();
-    const elapsed = now - t.lastAt;
-    if (elapsed >= FLUSH_INTERVAL_MS) {
-      if (t.timer !== null) {
-        clearTimeout(t.timer);
-        t.timer = null;
-      }
-      t.lastAt = now;
-      queueMicrotask(flushImmediate);
-    } else if (t.timer === null) {
-      t.timer = setTimeout(() => {
-        t.timer = null;
-        t.lastAt = Date.now();
-        flushImmediate();
-      }, FLUSH_INTERVAL_MS - elapsed);
-    }
+    schedulePromptImmediateFlush({
+      throttle: flushThrottleRef.current,
+      isSuppressed: () => interruptActiveRef.current,
+      flush: flushImmediate
+    });
   };
+  useEffect3(() => () => {
+    cancelPromptImmediateFlush(flushThrottleRef.current);
+  }, []);
   const commitDraft = (next, options = {}) => {
     const sameDraft = draftStateEqual(draftRef.current, next);
     if (!options.keepPreferredColumn) preferredColumnRef.current = null;
@@ -8114,14 +8151,14 @@ function parseMemoryCoreRows(text) {
       currentProjectId = label === "COMMON" ? null : label;
       return null;
     }
-    const match = raw.match(/^id=(\d+)\s+\[([^\]]*)\]\s+(.+?)(?:\s+—\s+(.+))?$/);
+    const match = raw.match(/^id=(\d+)\s+(.+?)(?:\s+—\s+(.+))?$/);
     if (match) {
-      const [, id, category, element, summary = ""] = match;
+      const [, id, element, summary = ""] = match;
       return {
         value: `core-${id}`,
         // Display is summary-first: session injection only ever uses the
-        // summary sentence (buildSessionCoreMemoryPayload), so id/category/
-        // element are UI noise. They stay in the hidden _fields for
+        // summary sentence (buildSessionCoreMemoryPayload), so id/element
+        // are UI noise. The element stays in the hidden fields for
         // edit/delete plumbing.
         label: `#${id}`,
         meta: currentProjectId || "",
@@ -8129,7 +8166,6 @@ function parseMemoryCoreRows(text) {
         _line: raw,
         _action: "core-entry",
         _id: Number(id),
-        _category: category,
         _element: element,
         _summary: summary || element,
         _projectId: currentProjectId,
@@ -9293,6 +9329,24 @@ var STABLE_PREFIX_LRU_MAX = 32;
 function streamingLayoutText(text) {
   return String(text ?? "").replace(/^\n+|\n+$/g, "");
 }
+function windowPlainStreamingText(text, columns, maxRows) {
+  const value = streamingLayoutText(text);
+  const rowBudget = Math.max(0, Math.floor(Number(maxRows) || 0));
+  if (!value || rowBudget <= 0 || hasMarkdownSyntax(value)) return value;
+  const lines = value.split("\n");
+  const width = Math.max(1, Math.floor(Number(columns) || 80));
+  let rows = 0;
+  let start = lines.length;
+  while (start > 0) {
+    const line = lines[start - 1];
+    const lineRows = Math.max(1, Math.ceil(displayWidth(line) / width));
+    if (rows > 0 && rows + lineRows > rowBudget) break;
+    rows += lineRows;
+    start -= 1;
+    if (rows >= rowBudget) break;
+  }
+  return start > 0 ? lines.slice(start).join("\n") : value;
+}
 function isWhitespaceOnlyText(text) {
   return !String(text ?? "").trim();
 }
@@ -9532,7 +9586,7 @@ function measureStreamingMarkdownRenderedRows(text, columns, streamKey) {
   if (!value) return 1;
   const parts = resolveStreamingMarkdownParts(value, streamKey);
   if (parts.plain) {
-    return measureMarkdownRenderedRows(value, columns, { trimPartialFences: false });
+    return estimateWrappedRowsFallback(parts.unstableForRender, columns, 3);
   }
   let rows = 0;
   let childCount = 0;
@@ -18532,7 +18586,7 @@ function Markdown({ children, themeEpoch = 0, trimPartialFences = false, columns
 function StreamingMarkdown({ children, themeEpoch = 0, columns, streamKey }) {
   const parts = resolveStreamingMarkdownParts(children, streamKey);
   if (parts.plain) {
-    return /* @__PURE__ */ jsx13(Markdown, { themeEpoch, columns, children: parts.unstableForRender });
+    return /* @__PURE__ */ jsx13(Text13, { color: theme.text, wrap: "wrap", children: parts.unstableForRender });
   }
   return /* @__PURE__ */ jsxs9(Box11, { flexDirection: "column", gap: 1, children: [
     parts.stablePrefix ? /* @__PURE__ */ jsx13(Markdown, { themeEpoch, columns, children: parts.stablePrefix }) : null,
@@ -18547,15 +18601,17 @@ var AssistantMessage = React14.memo(function AssistantMessage2({
   streaming = false,
   columns = 80,
   themeEpoch = 0,
-  assistantId
+  assistantId,
+  streamingWindowRows = 0
 }) {
   React14.useEffect(() => {
     if (!streaming && assistantId) resetStreamingMarkdownStablePrefix(assistantId);
   }, [streaming, assistantId]);
   const bodyWidth = assistantBodyWidth(columns);
+  const renderText = streaming && streamingWindowRows > 0 ? windowPlainStreamingText(text, bodyWidth, streamingWindowRows) : text;
   return /* @__PURE__ */ jsxs10(Box12, { flexDirection: "row", marginTop: 1, children: [
     /* @__PURE__ */ jsx14(Box12, { flexShrink: 0, minWidth: 2, children: /* @__PURE__ */ jsx14(Text14, { color: theme.text, children: TURN_MARKER }) }),
-    /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", flexShrink: 0, width: bodyWidth, children: streaming ? /* @__PURE__ */ jsx14(StreamingMarkdown, { themeEpoch, columns: bodyWidth, streamKey: assistantId, children: text }) : /* @__PURE__ */ jsx14(Markdown, { themeEpoch, columns: bodyWidth, children: text }) })
+    /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", flexShrink: 0, width: bodyWidth, children: streaming ? /* @__PURE__ */ jsx14(StreamingMarkdown, { themeEpoch, columns: bodyWidth, streamKey: assistantId, children: renderText }) : /* @__PURE__ */ jsx14(Markdown, { themeEpoch, columns: bodyWidth, children: text }) })
   ] });
 });
 var UserMessage = React14.memo(function UserMessage2({ text, attached = false, columns, themeEpoch = 0 }) {
@@ -19009,17 +19065,22 @@ function toolSearchLoadedSummary(resultText) {
     parsed = JSON.parse(String(resultText || ""));
   } catch {
     const text = String(resultText || "");
-    const match = /^Loaded deferred tools:\s*(.+)$/m.exec(text);
-    if (!match) return "";
-    return [...new Set(match[1].split(",").map((name) => name.trim()).filter(Boolean))].join(", ");
+    const loaded2 = /^Loaded deferred tools:\s*(.+)$/m.exec(text)?.[1] || "";
+    const already2 = /^Already active:\s*(.+)$/m.exec(text)?.[1] || "";
+    return [
+      ...loaded2 ? [`Loaded: ${loaded2}`] : [],
+      ...already2 ? [`Already active: ${already2}`] : []
+    ].join(" \xB7 ");
   }
   const tools = parsed?.selected?.tools;
   if (!tools || typeof tools !== "object") return "";
-  const names = [
-    ...Array.isArray(tools.added) ? tools.added : [],
-    ...Array.isArray(tools.already) ? tools.already : []
-  ].map((name) => String(name || "").trim()).filter(Boolean);
-  return [...new Set(names)].join(", ");
+  const uniqueNames = (names) => [...new Set((Array.isArray(names) ? names : []).map((name) => String(name || "").trim()).filter(Boolean))];
+  const loaded = uniqueNames(tools.added);
+  const already = uniqueNames(tools.already);
+  return [
+    ...loaded.length ? [`Loaded: ${loaded.join(", ")}`] : [],
+    ...already.length ? [`Already active: ${already.join(", ")}`] : []
+  ].join(" \xB7 ");
 }
 function agentTerminalDetail(status, isError, elapsed, error = "") {
   const failureDetail = isError && error ? backgroundTaskFailureStatusLabel(status, error, { surface: "agent" }) : "";
@@ -19424,7 +19485,7 @@ function ToolHookDenialCard({ item, columns = 80 }) {
     ] }) : null
   ] });
 }
-var Item = React19.memo(function Item2({ item, prevKind, columns, toolOutputExpanded, rightMessage = "", rightTone = "info", rightMessageWidth = 24, themeEpoch = 0 }) {
+var Item = React19.memo(function Item2({ item, prevKind, columns, toolOutputExpanded, rightMessage = "", rightTone = "info", rightMessageWidth = 24, themeEpoch = 0, streamingWindowRows = 0 }) {
   const hintOnTurnDoneRow = item.kind === "turndone" || item.kind === "statusdone";
   let node = null;
   switch (item.kind) {
@@ -19432,7 +19493,7 @@ var Item = React19.memo(function Item2({ item, prevKind, columns, toolOutputExpa
       node = /* @__PURE__ */ jsx19(UserMessage, { text: item.text, attached: prevKind === "user", columns, themeEpoch });
       break;
     case "assistant":
-      node = /* @__PURE__ */ jsx19(AssistantMessage, { text: item.text, streaming: item.streaming, columns, themeEpoch, assistantId: item.id });
+      node = /* @__PURE__ */ jsx19(AssistantMessage, { text: item.text, streaming: item.streaming, columns, themeEpoch, assistantId: item.id, streamingWindowRows });
       break;
     case "tool": {
       if (shouldSuppressFullyFailedToolItem(item)) return null;
@@ -21712,7 +21773,8 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
                         rightMessage: attachOverlayHint ? inputHint : "",
                         rightTone: attachOverlayHint ? inputHintTone : "info",
                         rightMessageWidth: attachOverlayHint ? guardHintWidth || transientStatusWidth || 24 : 24,
-                        themeEpoch: state.themeEpoch || 0
+                        themeEpoch: state.themeEpoch || 0,
+                        streamingWindowRows: transcriptTailPinned && item.id === state.streamingTail?.id ? transcriptContentHeight + TRANSCRIPT_WINDOW_TAIL_OVERSCAN_ROWS : 0
                       }
                     );
                     return measureRef ? /* @__PURE__ */ jsx20(Box18, { ref: measureRef, flexDirection: "column", flexShrink: 0, children: itemNode }, item.id) : /* @__PURE__ */ jsx20(React20.Fragment, { children: itemNode }, item.id);
@@ -23520,6 +23582,9 @@ function createAgentJobFeed({
   const terminalExecutionNotificationKeys = /* @__PURE__ */ new Set();
   const terminalExecutionResponseKeys = /* @__PURE__ */ new Set();
   const executionNotificationKeys = /* @__PURE__ */ new Map();
+  const AGENT_STATUS_COALESCE_MS = 16;
+  let agentStatusRefreshTimer = null;
+  let agentStatusRefreshForce = false;
   const clearExecutionDedupState = () => {
     displayedExecutionNotificationKeys.clear();
     displayedExecutionResponseStates.clear();
@@ -23668,7 +23733,16 @@ function createAgentJobFeed({
     if (!parsed?.taskId) return;
     const status = String(parsed.status || "").toLowerCase();
     const terminal = /^(completed|complete|done|success|succeeded|ok|failed|error|timeout|killed|cancelled|canceled|denied)$/.test(status);
-    set(agentStatusState(terminal ? { force: true } : void 0));
+    agentStatusRefreshForce = agentStatusRefreshForce || terminal;
+    if (agentStatusRefreshTimer) return;
+    agentStatusRefreshTimer = setTimeout(() => {
+      agentStatusRefreshTimer = null;
+      if (getDisposed()) return;
+      const force = agentStatusRefreshForce;
+      agentStatusRefreshForce = false;
+      set(agentStatusState(force ? { force: true } : void 0));
+    }, AGENT_STATUS_COALESCE_MS);
+    agentStatusRefreshTimer.unref?.();
   }
   function subscribeRuntimeNotifications() {
     if (typeof runtime.onNotification !== "function") return null;
@@ -23780,6 +23854,9 @@ function createAgentJobFeed({
       try {
         unsubscribe?.();
       } finally {
+        if (agentStatusRefreshTimer) clearTimeout(agentStatusRefreshTimer);
+        agentStatusRefreshTimer = null;
+        agentStatusRefreshForce = false;
         clearExecutionDedupState();
       }
     };
@@ -25460,8 +25537,9 @@ function createRunTurn(bag) {
             label: compactEventLabel(event),
             detail: compactEventDetail(event)
           });
+          syncContextStats({ allowEstimated: true });
         },
-        onStageChange: async (stage) => {
+        onStageChange: async (stage, detail = null) => {
           if (!markTurnProgress(`stage:${String(stage || "")}`)) return;
           if (!getState().spinner) return;
           const value = String(stage || "");
@@ -25484,6 +25562,13 @@ function createRunTurn(bag) {
             await yieldToRenderer();
             return;
           }
+          if (value === "reconnecting") {
+            compactingActive = false;
+            const retryVerb = String(detail?.message || "Reconnecting");
+            set({ spinner: { ...getState().spinner, mode: "reconnecting", verb: retryVerb } });
+            await yieldToRenderer();
+            return;
+          }
           if (value === "requesting" || value === "streaming") compactingActive = false;
           const mode = value === "requesting" ? "requesting" : value === "streaming" ? getState().spinner.thinking ? "thinking" : "responding" : null;
           if (!mode || getState().spinner.mode === mode) return;