mixdog 0.9.38 → 0.9.40

package/src/tui/dist/index.mjs

@@ -1976,10 +1976,11 @@ function bridgeAgentModelSummary(args) {
   ]);
 }
 function summarizeLineWindow(a) {
+  const hasOffset = a.offset != null;
   const offset = a.offset ?? a.start_line ?? a.startLine ?? a.line;
   const limit = a.limit ?? a.line_count ?? a.lineCount ?? a.lines;
   if (offset == null && limit == null) return "";
-  const start = Number(offset);
+  const start = Number(offset) + (hasOffset ? 1 : 0);
   const count = Number(limit);
   if (Number.isFinite(start) && Number.isFinite(count) && count > 0) {
     return `lines ${start}-${Math.max(start, start + count - 1)}`;
@@ -2839,7 +2840,9 @@ function toolWorkUnit(name, args = {}, category = "") {
     case "read_mcp_resource":
       return unitDescriptor("Read", { count: queryCount(a, "uri", "uris") || 1, noun: "resource" });
     case "apply_patch": {
-      const creating = a.old_string === "";
+      const patchText = String(a.patch ?? "");
+      const creating = a.old_string === "" || /^\*\*\*\s+Add File:/mi.test(patchText);
+      const deleting = !creating && a.new_string === "" && a.old_string != null || /^\*\*\*\s+Delete File:/mi.test(patchText);
       if (a.dry_run === true) {
         return unitDescriptor("Patch", {
           count: patchFileCount(a) || 1,
@@ -2850,8 +2853,8 @@ function toolWorkUnit(name, args = {}, category = "") {
       }
       return unitDescriptor("Patch", {
         count: patchFileCount(a) || 1,
-        active: creating ? "Creating" : "Editing",
-        done: creating ? "Created" : "Edited",
+        active: creating ? "Creating" : deleting ? "Deleting" : "Editing",
+        done: creating ? "Created" : deleting ? "Deleted" : "Edited",
         noun: "file"
       });
     }
@@ -10233,6 +10236,7 @@ function toolHasDisplayResultForRows(item) {
 }
 function toolExpandedRawTextForRows(item, rawRt) {
   if (item?.aggregate) return rawRt;
+  if (item?.agentResponseAggregate) return rawRt;
   const hasDisplayResult = toolHasDisplayResultForRows(item);
   if (hasDisplayResult) return toolDisplayedResultTextForRows(item);
   return stripLeadingStatusMarkerFromTextForRows(rawRt || "");
@@ -10433,22 +10437,6 @@ function fnv1a32(str) {
   }
   return h >>> 0;
 }
-function fnvStepA(hash, str) {
-  let h = hash >>> 0;
-  for (let i = 0; i < str.length; i++) {
-    h ^= str.charCodeAt(i);
-    h = h + ((h << 1) + (h << 4) + (h << 7) + (h << 8) + (h << 24)) >>> 0;
-  }
-  return h >>> 0;
-}
-function fnvStepB(hash, str) {
-  let h = hash >>> 0;
-  for (let i = 0; i < str.length; i++) {
-    h = Math.imul(h ^ str.charCodeAt(i), 2246822519) >>> 0;
-    h = (h ^ h >>> 13) >>> 0;
-  }
-  return h >>> 0;
-}
 function textShapeFingerprint(value) {
   if (value == null) return "z";
   const text = String(value);
@@ -10633,7 +10621,7 @@ function buildTranscriptRowIndexIncremental(items, {
   suppressMeasuredRowHeights = false,
   measuredRowsVersion = 0,
   cacheRef = null,
-  prefixSig = null
+  prefixRevision = null
 } = {}) {
   const allItems = Array.isArray(items) ? items : [];
   const tail = trailingStreamingItem(allItems);
@@ -10648,7 +10636,7 @@ function buildTranscriptRowIndexIncremental(items, {
   }
   const prefixLen = allItems.length - 1;
   const cache = holder.current;
-  if (cache && cache.columns === columns && cache.toolExpanded === (toolOutputExpanded ? 1 : 0) && cache.suppress === suppressMeasuredRowHeights && cache.version === measuredRowsVersion && cache.prefixLen === prefixLen && prefixSig != null && cache.prefixSig === prefixSig && cache.tailId === tail.id) {
+  if (cache && cache.columns === columns && cache.toolExpanded === (toolOutputExpanded ? 1 : 0) && cache.suppress === suppressMeasuredRowHeights && cache.version === measuredRowsVersion && cache.prefixLen === prefixLen && prefixRevision != null && cache.prefixRevision === prefixRevision && cache.tailId === tail.id) {
     {
       const tailMeasured = suppressMeasuredRowHeights ? null : measuredTranscriptRows(tail, columns, toolOutputExpanded);
       const tailRows = tailMeasured != null ? tailMeasured : estimateTranscriptItemRowsCached(tail, columns, toolOutputExpanded);
@@ -10670,7 +10658,7 @@ function buildTranscriptRowIndexIncremental(items, {
     suppress: suppressMeasuredRowHeights,
     version: measuredRowsVersion,
     prefixLen,
-    prefixSig,
+    prefixRevision,
     tailId: tail.id,
     prefixRowsArr: full.rows.slice(0, prefixLen),
     prefixPrefixRows: full.prefixRows.slice(0, prefixLen + 1),
@@ -10678,36 +10666,6 @@ function buildTranscriptRowIndexIncremental(items, {
   };
   return full;
 }
-var transcriptSigPartCache = /* @__PURE__ */ new WeakMap();
-function transcriptStructureSignature(items, columns, toolOutputExpanded) {
-  const list = Array.isArray(items) ? items : [];
-  let hA = fnvStepA(2166136261, `${list.length}|${columns}|${toolOutputExpanded ? 1 : 0}`);
-  let hB = fnvStepB(3421674724, `${list.length}|${columns}|${toolOutputExpanded ? 1 : 0}`);
-  for (let i = 0; i < list.length; i++) {
-    const it = list[i];
-    let sigPart;
-    if (!it) {
-      sigPart = "_";
-    } else if (it.kind === "assistant" && it.streaming) {
-      const resolvedRows = estimateTranscriptItemRowsCached(it, columns, toolOutputExpanded);
-      sigPart = `a${it.id}:${resolvedRows}`;
-    } else {
-      const variantKey = transcriptItemVariantKey(it);
-      const cached = transcriptSigPartCache.get(it);
-      if (cached && cached.variantKey === variantKey && cached.columns === columns && cached.id === it.id && cached.kind === it.kind) {
-        sigPart = cached.sigPart;
-      } else {
-        sigPart = `${it.kind?.[0] || "?"}${it.id}:${variantKey}`;
-        transcriptSigPartCache.set(it, { id: it.id, kind: it.kind, variantKey, columns, sigPart });
-      }
-    }
-    hA = fnvStepA(hA, `;${i};`);
-    hA = fnvStepA(hA, sigPart);
-    hB = fnvStepB(hB, `;${i};`);
-    hB = fnvStepB(hB, sigPart);
-  }
-  return `${hA.toString(36)}.${hB.toString(36)}`;
-}
 function transcriptRenderWindow(items, { scrollOffset = 0, viewportHeight = 24, columns = 80, toolOutputExpanded = false, rowIndex = null } = {}) {
   const allItems = Array.isArray(items) ? items : [];
   const itemCount = allItems.length;
@@ -11701,7 +11659,9 @@ function useTranscriptScroll({
 // src/tui/app/use-transcript-window.mjs
 import { useCallback as useCallback4, useEffect as useEffect9, useLayoutEffect as useLayoutEffect3, useMemo, useRef as useRef9, useState as useState7 } from "react";
 function useTranscriptWindow({
-  items,
+  items: settledItems,
+  structureRevision,
+  streamingTail,
   themeEpoch,
   frameColumns,
   toolOutputExpanded,
@@ -11759,41 +11719,34 @@ function useTranscriptWindow({
     }
     return fn;
   }, []);
-  const streamingTailItem = useMemo(() => {
-    const last = (items || []).length > 0 ? items[items.length - 1] : null;
-    return last && last.kind === "assistant" && last.streaming ? last : null;
-  }, [items]);
-  const prefixLen = streamingTailItem ? (items || []).length - 1 : (items || []).length;
-  const prefixSig = useMemo(
-    () => transcriptStructureSignature(
-      streamingTailItem ? (items || []).slice(0, prefixLen) : items || [],
-      frameColumns,
-      toolOutputExpanded
-    ),
-    [items, streamingTailItem, prefixLen, frameColumns, toolOutputExpanded]
-  );
+  const streamingTailItem = streamingTail?.kind === "assistant" && streamingTail.streaming ? streamingTail : null;
   const scrolledUpRowsForPin = Math.max(0, Number(scrollTargetRef.current) || 0);
   const transcriptPinnedForStreaming = followingRef.current || scrolledUpRowsForPin <= transcriptBottomSlackRows;
   setStreamingBottomPinned(transcriptPinnedForStreaming);
-  const tailSig = streamingTailItem ? `a${streamingTailItem.id}:${estimateTranscriptItemRowsCached(streamingTailItem, frameColumns, toolOutputExpanded)}` : "_";
-  const transcriptStructureSig = `${prefixSig}#${tailSig}`;
-  const transcriptStreamingActive = (items || []).some(
-    (item) => item?.kind === "assistant" && item?.streaming
+  const tailRows = streamingTailItem ? estimateTranscriptItemRowsCached(streamingTailItem, frameColumns, toolOutputExpanded) : 0;
+  const tailSig = streamingTailItem ? `${streamingTailItem.id}:${tailRows}` : "_";
+  const revision = Math.max(0, Number(structureRevision) || 0);
+  const transcriptItems = useMemo(
+    () => streamingTailItem ? [...settledItems || [], streamingTailItem] : settledItems || [],
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- tail text at the same resolved height is injected into the bounded visible slice below
+    [settledItems, revision, streamingTailItem?.id, tailRows]
   );
+  const transcriptStructureSig = `${revision}#${tailSig}`;
+  const transcriptStreamingActive = !!streamingTailItem;
   const scrolledUpForStreamingMeasure = scrolledUpRowsForPin > transcriptBottomSlackRows;
   const prevEstimateGeometry = transcriptGeomRef.current?.suppressMeasuredRowHeights === true;
   const hasStreamingReadingAnchor = !!transcriptAnchorRef.current || transcriptAnchorDirtyRef.current;
   const bottomPinnedForMeasure = transcriptPinnedForStreaming;
   const suppressMeasuredRowHeights = bottomPinnedForMeasure || transcriptStreamingActive && (scrolledUpForStreamingMeasure && hasStreamingReadingAnchor || scrolledUpForStreamingMeasure && prevEstimateGeometry && !transcriptPinnedForStreaming);
-  const transcriptRowIndex = useMemo(() => buildTranscriptRowIndexIncremental(items, {
+  const transcriptRowIndex = useMemo(() => buildTranscriptRowIndexIncremental(transcriptItems, {
     columns: frameColumns,
     toolOutputExpanded,
     suppressMeasuredRowHeights,
     measuredRowsVersion,
     cacheRef: incrementalRowIndexCacheRef,
-    prefixSig
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: prefixSig/tailSig capture the relevant item changes (raw `items` dropped so a tail-only flush never re-enters the builder via array identity); measuredRowsVersion folds in app-level measured height corrections
-  }), [prefixSig, tailSig, measuredRowsVersion, suppressMeasuredRowHeights]);
+    prefixRevision: revision
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- revision/tail height capture structural geometry; measuredRowsVersion folds in measured corrections
+  }), [revision, tailSig, frameColumns, toolOutputExpanded, measuredRowsVersion, suppressMeasuredRowHeights]);
   const hasReadingAnchor = !!transcriptAnchorRef.current && !transcriptAnchorDirtyRef.current;
   const scrolledUpRows = Math.max(0, Number(scrollTargetRef.current) || 0);
   const scrolledUp = scrolledUpRows > transcriptBottomSlackRows;
@@ -11808,7 +11761,7 @@ function useTranscriptWindow({
   if (anchorLockActive) {
     const locked = resolveAnchorScrollOffset({
       anchor: transcriptAnchorRef.current,
-      items,
+      items: transcriptItems,
       curPrefix: curPrefixForLock,
       totalRows: lockTotalRows,
       viewRows: lockViewRows,
@@ -11832,7 +11785,7 @@ function useTranscriptWindow({
         const captured = { id: anchorItem.id, offset: Math.max(0, prevTopRow - (prevPrefix[idx] || 0)) };
         const locked = resolveAnchorScrollOffset({
           anchor: captured,
-          items,
+          items: transcriptItems,
           curPrefix: curPrefixForLock,
           totalRows: lockTotalRows,
           viewRows: lockViewRows,
@@ -11865,7 +11818,7 @@ function useTranscriptWindow({
         const captured = { id: anchorItem.id, offset: Math.max(0, prevTopRow - (prevPrefix[idx] || 0)) };
         const locked = resolveAnchorScrollOffset({
           anchor: captured,
-          items,
+          items: transcriptItems,
           curPrefix: curPrefixForLock,
           totalRows: lockTotalRows,
           viewRows: lockViewRows,
@@ -11884,7 +11837,7 @@ function useTranscriptWindow({
     floatingPanelRows: Number(floatingPanelRows) || 0
   };
   if (scrolledUp && !followingRef.current) {
-    const growth = streamingTailMountedGrowth(items, frameColumns, toolOutputExpanded);
+    const growth = streamingTailMountedGrowth(transcriptItems, frameColumns, toolOutputExpanded);
     if (growth && growth.delta > 0) {
       const maxOffsetKeepingTailMounted = growth.tailRows + TRANSCRIPT_WINDOW_OVERSCAN_ROWS - 1;
       if (renderScrollOffset <= maxOffsetKeepingTailMounted) {
@@ -11892,7 +11845,7 @@ function useTranscriptWindow({
       }
     }
   }
-  const transcriptWindow = useMemo(() => transcriptRenderWindow(items, {
+  const transcriptWindow = useMemo(() => transcriptRenderWindow(transcriptItems, {
     scrollOffset: renderScrollOffset,
     viewportHeight: transcriptContentHeight,
     columns: frameColumns,
@@ -11929,7 +11882,7 @@ function useTranscriptWindow({
     prefixRows: transcriptRowIndex?.prefixRows || null,
     totalRows: Math.max(0, Number(transcriptWindow.totalRows) || 0),
     viewRows: Math.max(1, Number(transcriptContentHeight) || 1),
-    items: items || null,
+    items: transcriptItems || null,
     // The offset THIS frame actually rendered with. The same-frame anchor
     // CAPTURE for a missing/dirty anchor (above) reads this from the PREVIOUS
     // frame to reconstruct the exact top-edge row that was on screen, so the
@@ -11941,10 +11894,16 @@ function useTranscriptWindow({
     renderOffset: Math.max(0, Number(transcriptWindow.effectiveScrollOffset) || 0),
     suppressMeasuredRowHeights
   };
-  const transcriptVisibleItems = (items || []).slice(
+  const transcriptVisibleItems = (transcriptItems || []).slice(
     transcriptWindow.startIndex,
     transcriptWindow.endIndex
   );
+  if (streamingTailItem && transcriptVisibleItems.length > 0) {
+    const last = transcriptVisibleItems.length - 1;
+    if (transcriptVisibleItems[last]?.id === streamingTailItem.id) {
+      transcriptVisibleItems[last] = streamingTailItem;
+    }
+  }
   const renderedTranscriptItems = transcriptVisibleItems;
   let overlayHintAttachItemIndex = -1;
   for (let i = renderedTranscriptItems.length - 1; i >= 0; i--) {
@@ -12064,7 +12023,7 @@ function useTranscriptWindow({
       return;
     }
     const viewRows = Math.max(1, Number(transcriptContentHeight) || 1);
-    const itemList = items || [];
+    const itemList = transcriptItems || [];
     let anchor = transcriptAnchorRef.current;
     if (!followingRef.current && (!anchor || transcriptAnchorDirtyRef.current)) {
       if (curPrefix && curPrefix.length > 1) {
@@ -12383,10 +12342,11 @@ var compareModelRecency = (a, b) => {
   }
   const ta = releaseTime(a);
   const tb = releaseTime(b);
-  if (ta !== tb) return tb - ta;
-  if (!!a?.latest !== !!b?.latest) return a?.latest ? -1 : 1;
   const versionDelta = compareModelVersion(a, b);
+  if (ta > 0 && tb > 0 && ta !== tb) return tb - ta;
   if (versionDelta) return versionDelta;
+  if (!!a?.latest !== !!b?.latest) return a?.latest ? -1 : 1;
+  if (ta !== tb) return tb - ta;
   return String(a?.display || a?.id || "").localeCompare(String(b?.display || b?.id || ""));
 };
 var modelFamily = (m) => {
@@ -15835,11 +15795,9 @@ function createModelPicker({
     setChannelPrompt(null);
     setHookPrompt(null);
     setSettingsPrompt(null);
-    const modelPickerRequest = ++modelPickerRequestRef.current;
+    modelPickerRequestRef.current += 1;
     let modelPickerClosed = false;
-    let activeModelProvider = null;
     let providerListHighlightProvider = null;
-    const isActiveModelPicker = () => !modelPickerClosed && modelPickerRequestRef.current === modelPickerRequest;
     const returnTo = typeof options.returnTo === "function" ? options.returnTo : null;
     const returnLabel = String(options.returnLabel || "Agents");
     const returnOnNestedCancel = options.returnOnNestedCancel === true;
@@ -15853,7 +15811,6 @@ function createModelPicker({
     let providerModels = Array.isArray(cacheRef.current.models) ? cacheRef.current.models : [];
     let refreshModelsPromise = null;
     let renderedQuickModels = false;
-    let renderActiveProviderModels = null;
     if (!providerModels.length || options.refreshModels === true) {
       setPicker({
         title: options.title || "Model",
@@ -15904,16 +15861,12 @@ function createModelPicker({
         providerListHighlightProvider = renderOptions.highlightProvider;
       }
       const highlightProvider = renderOptions.highlightProvider || providerListHighlightProvider || null;
-      activeModelProvider = null;
-      renderActiveProviderModels = null;
       const openProviderModelsPicker = (provider) => {
         if (!provider) return;
-        activeModelProvider = provider;
-        renderActiveProviderModels = () => openProviderModelsPicker(provider);
         const providerModels2 = models.filter((model) => model.provider === provider);
         const preferredEffort = (values = []) => {
           const allowed = values.filter(Boolean);
-          for (const value of ["high", "medium", "low", "none", "xhigh", "max"]) {
+          for (const value of ["high", "medium", "low", "none", "xhigh", "max", "ultra"]) {
             if (allowed.includes(value)) return value;
           }
           return allowed[0] || null;
@@ -15986,6 +15939,7 @@ ${model?.id || ""}`;
           if (value === "medium") return "\u25D1";
           if (value === "high") return "\u25D5";
           if (value === "max") return "\u25C6";
+          if (value === "ultra") return "\u2726";
           return "\u25CF";
         };
         const effortColor = (value) => {
@@ -15994,6 +15948,7 @@ ${model?.id || ""}`;
           if (value === "medium") return theme.claude;
           if (value === "high") return theme.error;
           if (value === "max") return theme.permission;
+          if (value === "ultra") return theme.permission;
           return theme.error;
         };
         const modelFooter = (model = null) => {
@@ -16128,33 +16083,23 @@ ${model?.id || ""}`;
       });
     };
     renderModelPicker();
-    const applyFreshModels = (freshModels) => {
-      if (!isActiveModelPicker()) return;
+    const adoptFreshModels = (freshModels) => {
       if (!Array.isArray(freshModels) || freshModels.length === 0) return;
-      providerModels = freshModels;
-      models = normalizeModelOptions(providerModels);
-      cacheRef.current = { models: providerModels, at: Date.now() };
-      if (activeModelProvider === null) {
-        renderModelPicker();
-      } else if (typeof renderActiveProviderModels === "function") {
-        renderActiveProviderModels();
-      }
+      cacheRef.current = { models: freshModels, at: Date.now() };
     };
     if (renderedQuickModels && refreshModelsPromise) {
-      void refreshModelsPromise.then(applyFreshModels).catch(() => {
+      void refreshModelsPromise.then(adoptFreshModels).catch(() => {
       });
     } else if (cacheIsStale) {
       if (!providerModelsTtlRefreshPromise) {
         providerModelsTtlRefreshPromise = Promise.resolve(loadModels({ force: true })).then((freshModels) => {
-          if (Array.isArray(freshModels) && freshModels.length > 0) {
-            cacheRef.current = { models: freshModels, at: Date.now() };
-          }
+          adoptFreshModels(freshModels);
           return freshModels;
         }).finally(() => {
           providerModelsTtlRefreshPromise = null;
         });
       }
-      void providerModelsTtlRefreshPromise.then(applyFreshModels).catch(() => {
+      void providerModelsTtlRefreshPromise.catch(() => {
       });
     }
   };
@@ -18531,6 +18476,29 @@ import stringWidth9 from "string-width";
 
 // src/tui/components/tool-execution/text-format.mjs
 import stripAnsi6 from "strip-ansi";
+
+// src/runtime/shared/tool-status.mjs
+function normalizeToolTerminalStatus(value) {
+  const raw = String(value || "").trim().toLowerCase();
+  if (!raw) return "";
+  if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return "running";
+  if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return "completed";
+  if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return "failed";
+  if (/^(cancelled|canceled|cancel)$/.test(raw)) return "cancelled";
+  if (/^(denied|deny|refused|rejected)$/.test(raw)) return "denied";
+  return "";
+}
+function toolResultTerminalStatus(text) {
+  const body = String(text || "");
+  const tagged = body.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
+  if (tagged) return normalizeToolTerminalStatus(tagged);
+  const bracketed = body.match(/^\[status:\s*([^\]]*)\]/mi)?.[1]?.trim();
+  if (bracketed) return normalizeToolTerminalStatus(bracketed);
+  const inline = body.match(/^(?:status|state):\s*([^\s·,;]+)/mi)?.[1]?.trim();
+  return normalizeToolTerminalStatus(inline);
+}
+
+// src/tui/components/tool-execution/text-format.mjs
 var MIN_RESULT_LINE_CHARS = 24;
 var RESULT_LINE_HARD_MAX = 80;
 var SUMMARY_MAX_CHARS = 48;
@@ -18600,30 +18568,20 @@ function shellResultStatus(value) {
   return match ? String(match[1] || "").toLowerCase() : "";
 }
 function normalizeTerminalStatus(value) {
-  const raw = String(value || "").trim().toLowerCase();
-  if (!raw) return "";
-  if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return "running";
-  if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return "completed";
-  if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return "failed";
-  if (/^(cancelled|canceled|cancel)$/.test(raw)) return "cancelled";
-  return "";
+  return normalizeToolTerminalStatus(value);
 }
 function displayTerminalStatus(value) {
+  if (String(value || "").trim().toLowerCase() === "exit") return "Exit";
   const status = normalizeTerminalStatus(value);
   if (status === "running") return "Running";
   if (status === "completed") return "Finished";
   if (status === "failed") return "Failed";
   if (status === "cancelled") return "Cancelled";
+  if (status === "denied") return "Denied";
   return "";
 }
 function resultTerminalStatus(value) {
-  const text = String(value || "");
-  const tagged = text.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
-  if (tagged) return normalizeTerminalStatus(tagged);
-  const bracketed = text.match(/^\[status:\s*([^\]]*)\]/mi)?.[1]?.trim();
-  if (bracketed) return normalizeTerminalStatus(bracketed);
-  const inline = text.match(/^(?:status|state):\s*([^\s·,;]+)/mi)?.[1]?.trim();
-  return normalizeTerminalStatus(inline);
+  return toolResultTerminalStatus(value);
 }
 var LEADING_STATUS_MARKER_LINE_RE2 = /^\[status:\s*[^\]]*\]\s*$/i;
 function stripLeadingStatusMarkerLines(lines) {
@@ -18647,11 +18605,15 @@ function isShellTool(normalizedName, label = "") {
   const l = String(label || "").toLowerCase();
   return n === "shell" || n === "bash" || n === "bash_session" || n === "shell_command" || n === "job_wait" || l === "run";
 }
-function shellDisplayStatus({ pending = false, failedCount = 0, isError = false, result = "" } = {}) {
+function shellDisplayStatus({ pending = false, failedCount = 0, exitFailedCount = 0, isError = false, result = "" } = {}) {
   const status = shellResultStatus(result);
   if (pending || /^(running|pending|queued)$/.test(status)) return "running";
   if (/^cancel/.test(status)) return "cancelled";
-  if (/^(failed|error|killed|timeout)$/.test(status) || isError || failedCount > 0) return "failed";
+  if (/^(failed|error|killed|timeout)$/.test(status)) return "failed";
+  const realFailed = Math.max(0, Number(failedCount) - Number(exitFailedCount));
+  if (realFailed > 0) return "failed";
+  if (Number(exitFailedCount) > 0) return "exit";
+  if (isError || failedCount > 0) return "failed";
   return "completed";
 }
 function shellHeader(status, count = 1) {
@@ -18707,7 +18669,9 @@ function withModelAndTag(label, args) {
 function joinActionAgent(action, agent) {
   return agent ? `${action} ${agent}` : action;
 }
-function agentResponseTitle(args) {
+function agentResponseTitle(args, count = 1) {
+  const total = Math.max(1, Number(count) || 1);
+  if (total > 1) return `Responses ${total} agents`;
   const name = titleizeAgentName(args?.agent || args?.subagent_type || args?.name || "");
   return withModelAndTag(joinActionAgent("Response", name), args);
 }
@@ -18962,13 +18926,17 @@ function clampFailureCount(errorCount, groupCount, isError) {
   if (Number.isFinite(explicit)) return Math.max(0, Math.min(groupCount, Math.floor(explicit)));
   return isError ? groupCount : 0;
 }
-function toolStatusColor({ pending, groupCount, callFailedCount = 0, terminalStatus = "" }) {
+function toolStatusColor({ pending, groupCount, callFailedCount = 0, exitFailedCount = 0, terminalStatus = "" }) {
   if (pending) return theme.text;
   const status = normalizeTerminalStatus(terminalStatus);
   if (status === "cancelled") return theme.warning;
-  if (callFailedCount <= 0) return theme.success;
-  if (groupCount > 1 && callFailedCount < groupCount) return theme.mixdogOrange || theme.warning;
-  return theme.error;
+  if (status === "denied") return theme.warning;
+  if (callFailedCount > 0) {
+    if (groupCount > 1 && callFailedCount < groupCount) return theme.mixdogOrange || theme.warning;
+    return theme.error;
+  }
+  if (exitFailedCount > 0) return theme.warning;
+  return theme.success;
 }
 
 // src/tui/components/tool-execution/ResultBody.jsx
@@ -18999,7 +18967,7 @@ var TOOL_ANIM_TICK_MS = TOOL_BLINK_MS;
 function statusCopy(name, label, count, doneCount, pending, isError, args = {}) {
   return formatToolActionHeader(name, args, { pending, count });
 }
-function ToolExecution({ name, args, result, rawResult, isError, errorCount, callErrorCount, expanded, columns = 80, attached = false, count = 1, completedCount = 0, startedAt = 0, completedAt = 0, aggregate = false, categories = {}, doneCategories = null, headerFinalized = true, deferredDisplayReady = false }) {
+function ToolExecution({ name, args, result, rawResult, isError, errorCount, callErrorCount, exitErrorCount, expanded, columns = 80, attached = false, count = 1, completedCount = 0, startedAt = 0, completedAt = 0, aggregate = false, categories = {}, doneCategories = null, headerFinalized = true, deferredDisplayReady = false, agentResponseAggregate = false }) {
   const rowWidth = Math.max(1, Number(columns || 80));
   const groupCount = Math.max(1, Number(count || 1));
   const doneCount = Math.max(0, Math.min(groupCount, Number(completedCount || (result == null ? 0 : groupCount))));
@@ -19023,6 +18991,7 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, cal
   const elapsed = elapsedMs >= 1e3 ? formatElapsed(elapsedMs) : "";
   const failedCount = clampFailureCount(errorCount, groupCount, isError);
   const callFailedCount = clampFailureCount(callErrorCount, groupCount, false);
+  const exitFailedCount = clampFailureCount(exitErrorCount, groupCount, false);
   const displayGroupCount = groupCount;
   const displayCategories = normalizeCountMap(categories || {});
   const normalizedDoneCategories = doneCategories ? normalizeCountMap(doneCategories) : displayCategories;
@@ -19048,7 +19017,7 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, cal
       detailText = "";
     }
     const aggregateTerminalStatus = pending ? "running" : resultTerminalStatus(rt) || (isError || failedCount > 0 ? "failed" : "completed");
-    const dotColor2 = toolStatusColor({ pending, groupCount, callFailedCount, terminalStatus: aggregateTerminalStatus });
+    const dotColor2 = toolStatusColor({ pending, groupCount, callFailedCount, exitFailedCount, terminalStatus: aggregateTerminalStatus });
     const dotText2 = pending && !blinkOn ? " " : TURN_MARKER;
     const gutter2 = 2;
     const showHeaderExpandHint2 = hasRawResult;
@@ -19103,7 +19072,7 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, cal
   const firstResultLine = hasDisplayResult ? String(lines[0] ?? "") : "";
   const firstResultLineClipped = hasDisplayBody && stringWidth9(firstResultLine) > maxResultChars;
   const hasHiddenDetail = !pending && hasDisplayBody && (totalLines > 1 || firstResultLineClipped || Boolean(resultSummary));
-  const shellStatus = isShellSurface ? shellDisplayStatus({ pending, failedCount, isError, result: displayedResultText }) : "";
+  const shellStatus = isShellSurface ? shellDisplayStatus({ pending, failedCount, exitFailedCount, isError, result: displayedResultText }) : "";
   const shellElapsed = isShellSurface ? shellResultElapsed(displayedResultText) || elapsed : "";
   const backgroundElapsed = backgroundMeta ? backgroundTaskElapsed(backgroundMeta, elapsed) : isBackgroundTaskTool(normalizedName) ? backgroundTaskElapsed(parsedArgs, elapsed) : "";
   const toolArgPath = parsedArgs?.path ?? parsedArgs?.file_path ?? parsedArgs?.file ?? "";
@@ -19128,7 +19097,7 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, cal
   const collapsedDetail = pending ? pendingDetailPlaceholder : isShellSurface ? prefixElapsed(mergeTerminalDetail(shellStatus, shellCollapsedSummary), shellElapsed) : mergeTerminalDetail(terminalStatus, nonShellDetail);
   const backgroundMetadataExpandable = isBackgroundMetadataResult && hasRawResult && !pending;
   const showRawResult = expanded && (hasDisplayBody || hasRawResult) && (!isBackgroundMetadataResult || hasRawResult);
-  const detailLines = showRawResult ? hasDisplayBody ? lines : rawRt ? stripLeadingStatusMarkerLines(rawRt.split("\n")) : [] : collapsedDetail ? [collapsedDetail] : [];
+  const detailLines = showRawResult ? agentResponseAggregate && hasRawResult ? stripLeadingStatusMarkerLines(rawRt.split("\n")) : hasDisplayBody ? lines : rawRt ? stripLeadingStatusMarkerLines(rawRt.split("\n")) : [] : collapsedDetail ? [collapsedDetail] : [];
   const isPendingPlaceholderDetail = !showRawResult && Boolean(pendingDetailPlaceholder);
   const detailColor = isPendingPlaceholderDetail ? theme.subtle : theme.text;
   const isAgentResult = !isBackgroundResult && !pending && isAgentTool(normalizedName) && hasDisplayResult;
@@ -19148,14 +19117,14 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, cal
     const keepAgentDetail = (isError || agentFailureText) && !(agentHeaderFailure && !agentSurfaceBrief);
     visibleDetailLines = keepAgentDetail ? [agentDetailLine] : [];
   }
-  const finalStatusColor = toolStatusColor({ pending, groupCount, callFailedCount, terminalStatus });
+  const finalStatusColor = toolStatusColor({ pending, groupCount, callFailedCount, exitFailedCount, terminalStatus });
   const dotColor = finalStatusColor;
   const markerGlyph = isAgentResponse ? AGENT_RESPONSE_MARKER : isAgentSurfaceCard ? AGENT_CALL_MARKER : TURN_MARKER;
   const isDirectionalMarker = isAgentResponse || isAgentSurfaceCard;
   const markerText = isDirectionalMarker ? `${markerGlyph} ` : markerGlyph;
   const dotText = pending && !blinkOn ? " " : markerText;
   let labelText;
-  if (isAgentResponse) labelText = agentResponseTitle(parsedArgs);
+  if (isAgentResponse) labelText = agentResponseTitle(parsedArgs, displayGroupCount);
   else if (isBackgroundResponse) labelText = backgroundTaskResultTitle(normalizedName, backgroundMeta || parsedArgs);
   else if (isBackgroundMetadataResult) labelText = backgroundTaskActionTitle(normalizedName, backgroundMeta);
   else if (isShellSurface) labelText = shellHeader(shellStatus, displayGroupCount);
@@ -19364,7 +19333,7 @@ var Item = React19.memo(function Item2({ item, prevKind, columns, toolOutputExpa
         node = /* @__PURE__ */ jsx19(ToolHookDenialCard, { item, columns });
         break;
       }
-      node = /* @__PURE__ */ jsx19(ToolExecution, { name: item.name, args: item.args, result: item.result, rawResult: item.rawResult, isError: item.isError, errorCount: item.errorCount, callErrorCount: item.callErrorCount, expanded: toolOutputExpanded || item.expanded, columns, attached: false, count: item.count, completedCount: item.completedCount, startedAt: item.startedAt, completedAt: item.completedAt, aggregate: item.aggregate, categories: item.categories, doneCategories: item.doneCategories, headerFinalized: item.headerFinalized, deferredDisplayReady: item.deferredDisplayReady });
+      node = /* @__PURE__ */ jsx19(ToolExecution, { name: item.name, args: item.args, result: item.result, rawResult: item.rawResult, isError: item.isError, errorCount: item.errorCount, callErrorCount: item.callErrorCount, exitErrorCount: item.exitErrorCount, expanded: toolOutputExpanded || item.expanded, columns, attached: false, count: item.count, completedCount: item.completedCount, startedAt: item.startedAt, completedAt: item.completedAt, aggregate: item.aggregate, categories: item.categories, doneCategories: item.doneCategories, headerFinalized: item.headerFinalized, deferredDisplayReady: item.deferredDisplayReady, agentResponseAggregate: item.agentResponseAggregate });
       break;
     }
     case "notice":
@@ -19672,6 +19641,32 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
       searchModelsCacheRef.current = { models: null, at: 0 };
     }
   }, []);
+  useEffect10(() => {
+    let alive = true;
+    const timer2 = setTimeout(async () => {
+      const seq = onboardingPrefetchSeqRef.current;
+      try {
+        const models = await Promise.resolve(store.listProviderModels?.() || []);
+        if (alive && seq === onboardingPrefetchSeqRef.current && Array.isArray(models) && models.length > 0 && !Array.isArray(providerModelsCacheRef.current.models)) {
+          providerModelsCacheRef.current = { models, at: Date.now() };
+        }
+      } catch {
+      }
+      if (!alive) return;
+      try {
+        const searchModels = await Promise.resolve(store.listSearchModels?.() || []);
+        if (alive && Array.isArray(searchModels) && searchModels.length > 0 && !Array.isArray(searchModelsCacheRef.current.models)) {
+          searchModelsCacheRef.current = { models: searchModels, at: Date.now() };
+        }
+      } catch {
+      }
+    }, 1500);
+    timer2.unref?.();
+    return () => {
+      alive = false;
+      clearTimeout(timer2);
+    };
+  }, [store]);
   const { onboardingWarnReopen, openOnboardingAuthStep } = createOnboardingSteps({
     store,
     setPicker,
@@ -21435,6 +21430,8 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     transcriptMeasureRef
   } = useTranscriptWindow({
     items: state.items,
+    structureRevision: state.structureRevision,
+    streamingTail: state.streamingTail,
     themeEpoch: state.themeEpoch,
     frameColumns,
     toolOutputExpanded,
@@ -22507,18 +22504,6 @@ function bracketField(text, name) {
   const re = new RegExp(`^\\[${name}:\\s*([^\\]]*)\\]`, "mi");
   return re.exec(String(text ?? ""))?.[1]?.trim() || "";
 }
-function toolResultStatus(text) {
-  const value = String(text ?? "");
-  const tagged = textBetweenTag2(value, "status");
-  if (tagged) return tagged.trim();
-  const bracketed = bracketField(value, "status");
-  if (bracketed) return bracketed.trim();
-  const inline = /^(?:status|state):\s*([^\s·,;]+)/mi.exec(value);
-  return inline ? inline[1].trim() : "";
-}
-function isErrorToolStatus(status) {
-  return /^(failed|error|timeout|cancelled|canceled|killed)$/i.test(String(status || "").trim());
-}
 function parseSyntheticAgentMessage(text) {
   const value = String(text ?? "").trim();
   if (!value) return null;
@@ -22771,6 +22756,13 @@ function notificationQueueKey(event, text, parsed) {
   const hasBody = /\n\s*\n[\s\S]*\S/.test(String(text || "")) ? "b1" : "b0";
   return [id, type || fallbackKind, status, hasBody].filter(Boolean).join(":");
 }
+function executionCardKey(event, text, parsed) {
+  const meta = event?.meta && typeof event.meta === "object" ? event.meta : {};
+  const executionId = String(meta.execution_id || "").trim();
+  if (!executionId) return notificationQueueKey(event, text, parsed);
+  const hasBody = /\n\s*\n[\s\S]*\S/.test(String(text || "")) ? "b1" : "b0";
+  return `card:${executionId}:${hasBody}`;
+}
 function isExecutionNotification(event, text, parsed) {
   const meta = event?.meta && typeof event.meta === "object" ? event.meta : {};
   if (meta.execution_id || meta.execution_surface) return true;
@@ -22869,23 +22861,43 @@ var yieldToRenderer = ({ frames = 1 } = {}) => new Promise((resolve5) => {
 
 // src/tui/engine/tool-result-status.mjs
 var CANCELLED_RESULT_STATUS_LINE = "[status: cancelled]";
+function shellCommandExitCode(text) {
+  const body = String(text || "");
+  if (!/^\s*(?:Error:\s*)?\[shell-run-failed\]/i.test(body)) return null;
+  const header = body.split("\n", 1)[0] || "";
+  if (/\[timeout:|\[signal:|timed out|aborted|interrupted/i.test(header)) return null;
+  const m = header.match(/\[exit code:\s*(\d+)\]/i);
+  if (!m) return null;
+  const code = Number(m[1]);
+  return Number.isFinite(code) ? code : null;
+}
+function toolCallOutcome(message, rawText) {
+  const exitCode = shellCommandExitCode(rawText);
+  if (exitCode != null) {
+    return { isCallError: false, isExitError: true, exitCode };
+  }
+  const isCallError = message?.isError === true || message?.toolKind === "error";
+  return {
+    isCallError,
+    isExitError: false,
+    exitCode
+  };
+}
+function failureDetailText({ succeeded = 0, realErrors = 0, exitErrors = 0, exitCode } = {}) {
+  const parts = [];
+  if (succeeded > 0) parts.push(`${succeeded} Ok`);
+  if (realErrors > 0) parts.push(`${realErrors} Failed`);
+  if (exitErrors > 0) {
+    const solo = exitErrors === 1 && realErrors === 0 && succeeded === 0;
+    parts.push(solo && Number.isFinite(exitCode) ? `Exit ${exitCode}` : `${exitErrors} Exit`);
+  }
+  return parts.join(" \xB7 ");
+}
 function normalizedResultStatusToken(value) {
-  const raw = String(value || "").trim().toLowerCase();
-  if (!raw) return "";
-  if (/^(running|pending|queued|in_progress|in-progress)$/.test(raw)) return "running";
-  if (/^(completed|complete|done|success|succeeded|ok)$/.test(raw)) return "completed";
-  if (/^(failed|fail|error|errored|timeout|timed_out|killed)$/.test(raw)) return "failed";
-  if (/^(cancelled|canceled|cancel)$/.test(raw)) return "cancelled";
-  return "";
+  return normalizeToolTerminalStatus(value);
 }
 function resultTextTerminalStatus(text) {
-  const body = String(text || "");
-  const tagged = body.match(/<status[^>]*>([\s\S]*?)<\/status>/i)?.[1]?.trim();
-  if (tagged) return normalizedResultStatusToken(tagged);
-  const bracketed = body.match(/^\[status:\s*([^\]]*)\]/mi)?.[1]?.trim();
-  if (bracketed) return normalizedResultStatusToken(bracketed);
-  const inline = body.match(/^(?:status|state):\s*([^\s·,;]+)/mi)?.[1]?.trim();
-  return normalizedResultStatusToken(inline);
+  return toolResultTerminalStatus(text);
 }
 function itemHasKnownTerminalStatus(item, texts = []) {
   const settled = (token) => token === "completed" || token === "failed" || token === "cancelled";
@@ -22907,11 +22919,14 @@ ${body}`;
 function groupedToolResultText(group) {
   const completed = Math.min(group.count, group.completed);
   if (group.count <= 1) return group.results.at(-1)?.text ?? "";
-  if (group.errors > 0) {
-    const succeeded = Math.max(0, completed - group.errors);
-    const reasons = group.results.filter((result) => result?.isError).map((result) => firstErrorLine(result?.text)).filter(Boolean);
+  const exitErrors = Number(group.exitErrors || 0);
+  if (group.errors > 0 || exitErrors > 0) {
+    const realErrors = Math.max(0, Number(group.callErrors || group.errors || 0));
+    const succeeded = Math.max(0, completed - group.errors - exitErrors);
+    const exitCode = group.results.find((result) => result?.isExitError)?.exitCode;
+    const reasons = group.results.filter((result) => result?.isError && !result?.isExitError).map((result) => firstErrorLine(result?.text)).filter(Boolean);
     const uniqueReasons = [...new Set(reasons)].slice(0, 2);
-    const base = succeeded > 0 ? `${succeeded} Ok \xB7 ${group.errors} Failed` : `${group.errors} Failed`;
+    const base = failureDetailText({ succeeded, realErrors, exitErrors, exitCode });
     return [
       `${base}${uniqueReasons[0] ? ` \xB7 ${uniqueReasons[0]}` : ""}`,
       ...uniqueReasons.slice(1)
@@ -22945,9 +22960,10 @@ ${text}`);
   }
   return chunks.join("\n\n");
 }
-function aggregateBucketForCategory(category) {
+function aggregateBucketForCategory(category, { agentBatch = "" } = {}) {
   const key = String(category || "").trim();
   if (key === "Read" || key === "Search") return "category:Read+Search";
+  if (key === "Agent") return agentBatch ? `category:Agent:${agentBatch}` : "category:Agent";
   return key ? `category:${key}` : "default";
 }
 function aggregateSummaries(aggregate) {
@@ -23064,13 +23080,24 @@ function createToolCardResults({
   markToolCallDone,
   updateAgentJobCard,
   buildAgentJobCardPatch,
-  agentStatusState
+  agentStatusState,
+  itemIndexById
 }) {
+  const itemById = (id) => {
+    const index = itemIndexById?.get(id);
+    return Number.isInteger(index) ? getState().items[index]?.id === id ? getState().items[index] : null : null;
+  };
+  function finalizedErrorFallbackBody(body, text, exitCode) {
+    if (String(body || "").trim()) return body;
+    if (String(text || "").trim()) return text;
+    if (exitCode != null) return `Exit ${exitCode}`;
+    return "Failed";
+  }
   function patchToolItem(id, patch) {
-    const prev = getState().items.find((it) => it.id === id);
+    const prev = itemById(id);
     const ok = patchItem(id, patch);
     if (!ok || !prev) return ok;
-    const next = getState().items.find((it) => it.id === id);
+    const next = itemById(id);
     if (next && next !== prev) carryTranscriptMeasuredRowsCache(prev, next);
     return ok;
   }
@@ -23083,10 +23110,8 @@ function createToolCardResults({
     const rawText = toolResultText(message?.content);
     const aggregate = card.aggregate;
     const callRec = aggregate && callId ? aggregate.calls.get(callId) : null;
-    const isMemoryCall = classifyToolCategory(callRec?.name || card?.name || "", callRec?.args || {}) === "Memory";
-    const isCallError = message?.isError === true || message?.toolKind === "error";
-    const isResultError = /^\s*\[?error/i.test(rawText) || isErrorToolStatus(toolResultStatus(rawText)) || isMemoryCall && memoryCoreResultErrorText(rawText) != null;
-    const isError = isCallError || isResultError;
+    const { exitCode, isExitError, isCallError } = toolCallOutcome(message, rawText);
+    const isError = isCallError;
     const text = isError ? toolErrorDisplay(rawText, card?.name || "tool") : rawText;
     if (aggregate && card.itemId === aggregate.itemId) {
       if (!callRec) return false;
@@ -23099,15 +23124,18 @@ function createToolCardResults({
       assignAggregateSummaryOrder(aggregate, callRec);
       callRec.isError = isError;
       callRec.isCallError = isCallError;
+      callRec.isExitError = isExitError;
+      callRec.exitCode = exitCode;
       callRec.resultText = text;
       callRec.resolved = true;
       const allCalls = [...aggregate.calls.values()];
       const completed = allCalls.filter((r) => r.resolved).length;
       const errors = allCalls.filter((r) => r.isError).length;
       const callErrors = allCalls.filter((r) => r.isCallError).length;
-      const succeeded = completed - errors;
-      const detailText = errors > 0 ? succeeded > 0 ? `${succeeded} Ok \xB7 ${errors} Failed` : `${errors} Failed` : formatAggregateDetail(aggregateSummaries(aggregate));
-      const currentItem = getState().items.find((it) => it.id === card.itemId);
+      const exitErrors = allCalls.filter((r) => r.isExitError).length;
+      const succeeded = Math.max(0, completed - errors - exitErrors);
+      const detailText = errors > 0 || exitErrors > 0 ? failureDetailText({ succeeded, realErrors: callErrors, exitErrors, exitCode: allCalls.find((r) => r.isExitError)?.exitCode }) : formatAggregateDetail(aggregateSummaries(aggregate));
+      const currentItem = itemById(card.itemId);
       const earlyCompleted = allCalls.filter((r) => r.resolved || r.completedEarly).length;
       const visualCompleted = Math.max(completed, earlyCompleted, Math.min(allCalls.length, Number(currentItem?.completedCount || 0)));
       const rawResult = aggregateRawResult(allCalls);
@@ -23119,6 +23147,7 @@ function createToolCardResults({
         isError: errors > 0,
         errorCount: errors,
         callErrorCount: callErrors,
+        exitErrorCount: exitErrors,
         count: allCalls.length,
         completedCount: visualCompleted,
         doneCategories: aggregateDoneCategories(allCalls),
@@ -23128,20 +23157,25 @@ function createToolCardResults({
       if (callId) done.add(callId);
       return true;
     }
-    const group = toolGroups.get(card.itemId) || { count: 1, completed: 0, errors: 0, callErrors: 0, results: [] };
+    const group = toolGroups.get(card.itemId) || { count: 1, completed: 0, errors: 0, callErrors: 0, exitErrors: 0, results: [] };
     group.completed = Math.min(group.count, group.completed + 1);
     group.errors += isError ? 1 : 0;
     group.callErrors = (group.callErrors || 0) + (isCallError ? 1 : 0);
-    group.results.push({ text, isError });
+    group.exitErrors = (group.exitErrors || 0) + (isExitError ? 1 : 0);
+    group.results.push({ text, isError, isExitError, exitCode });
     toolGroups.set(card.itemId, group);
     const resultText = groupedToolResultText(group);
-    const displayResult = toolGroupedDisplayFallback(resultText, text, rawText);
+    let displayResult = toolGroupedDisplayFallback(resultText, text, rawText);
+    if (group.errors > 0 && !String(displayResult || "").trim()) {
+      displayResult = finalizedErrorFallbackBody(displayResult, text, exitCode);
+    }
     const patch = {
       result: displayResult,
       text: displayResult,
       isError: group.errors > 0,
       errorCount: group.errors,
       callErrorCount: group.callErrors || 0,
+      exitErrorCount: group.exitErrors || 0,
       count: group.count,
       completedCount: group.completed,
       completedAt: Date.now()
@@ -23154,6 +23188,9 @@ function createToolCardResults({
         set(agentStatusState({ force: true }));
       }
       Object.assign(patch, buildAgentJobCardPatch(card.itemId, rawText, isError));
+      if (group.errors > 0 && !String(patch.result || "").trim()) {
+        patch.result = patch.text = finalizedErrorFallbackBody(patch.result, text, exitCode);
+      }
     }
     patchToolItem(card.itemId, patch);
     card.done = true;
@@ -23204,11 +23241,12 @@ function createToolCardResults({
         const totalCompleted = completed;
         const errors = allCalls.filter((r) => r.isError).length;
         const callErrors = allCalls.filter((r) => r.isCallError).length;
-        const succeeded = completed - errors;
+        const exitErrors = allCalls.filter((r) => r.isExitError).length;
+        const succeeded = Math.max(0, completed - errors - exitErrors);
         const rawResult = aggregateRawResult(allCalls);
-        let displayDetail = errors > 0 ? succeeded > 0 ? `${succeeded} Ok \xB7 ${errors} Failed` : `${errors} Failed` : formatAggregateDetail(aggregateSummaries(aggregate));
+        let displayDetail = errors > 0 || exitErrors > 0 ? failureDetailText({ succeeded, realErrors: callErrors, exitErrors, exitCode: allCalls.find((r) => r.isExitError)?.exitCode }) : formatAggregateDetail(aggregateSummaries(aggregate));
         if (cancelled) {
-          const currentItem = getState().items.find((it) => it.id === card.itemId);
+          const currentItem = itemById(card.itemId);
           displayDetail = withCancelledResultMarker(displayDetail, currentItem);
         }
         patchToolItem(card.itemId, {
@@ -23218,6 +23256,7 @@ function createToolCardResults({
           isError: errors > 0,
           errorCount: errors,
           callErrorCount: callErrors,
+          exitErrorCount: exitErrors,
           count: allCalls.length,
           completedCount: totalCompleted,
           doneCategories: aggregateDoneCategories(allCalls),
@@ -23230,15 +23269,19 @@ function createToolCardResults({
         }
         continue;
       }
-      const group = toolGroups.get(card.itemId) || { count: 1, completed: 0, errors: 0, results: [] };
+      const group = toolGroups.get(card.itemId) || { count: 1, completed: 0, errors: 0, exitErrors: 0, results: [] };
       group.completed = Math.min(group.count, group.completed + 1);
       toolGroups.set(card.itemId, group);
       let resultText = groupedToolResultText(group);
+      if (group.errors > 0 && !String(resultText || "").trim()) {
+        const exitRec = (group.results || []).find((r) => r && r.isExitError);
+        resultText = finalizedErrorFallbackBody(resultText, exitRec?.text, exitRec?.exitCode);
+      }
       if (cancelled) {
-        const currentItem = getState().items.find((it) => it.id === card.itemId);
+        const currentItem = itemById(card.itemId);
         resultText = withCancelledResultMarker(resultText, currentItem);
       }
-      patchToolItem(card.itemId, { result: resultText, text: resultText, isError: group.errors > 0, errorCount: group.errors, callErrorCount: group.callErrors || 0, count: group.count, completedCount: group.completed, completedAt: Date.now() });
+      patchToolItem(card.itemId, { result: resultText, text: resultText, isError: group.errors > 0, errorCount: group.errors, callErrorCount: group.callErrors || 0, exitErrorCount: group.exitErrors || 0, count: group.count, completedCount: group.completed, completedAt: Date.now() });
       card.done = true;
       if (card.callId) done.add(card.callId);
     }
@@ -23246,6 +23289,73 @@ function createToolCardResults({
   return { patchToolCardResult, flushToolResults };
 }
 
+// src/runtime/agent/orchestrator/session/manager/delivered-completions.mjs
+import { createHash as createHash3 } from "node:crypto";
+var DELIVERED_TTL_MS = 6 * 60 * 60 * 1e3;
+var DELIVERED_MAX_ENTRIES = 512;
+var _delivered = /* @__PURE__ */ new Map();
+function hashCompletionText(text) {
+  const value = String(text ?? "").trim();
+  if (!value) return null;
+  return createHash3("sha1").update(value).digest("hex");
+}
+function execKey(executionId) {
+  const id = executionId == null ? "" : String(executionId).trim();
+  return id ? `id:${id}` : null;
+}
+function textKey(text) {
+  const h = hashCompletionText(text);
+  return h ? `tx:${h}` : null;
+}
+function pruneExpired(now) {
+  for (const [key, expiresAt] of _delivered) {
+    if (expiresAt <= now) _delivered.delete(key);
+  }
+}
+function enforceBound() {
+  while (_delivered.size > DELIVERED_MAX_ENTRIES) {
+    const oldest = _delivered.keys().next().value;
+    if (oldest === void 0) break;
+    _delivered.delete(oldest);
+  }
+}
+function recordDeliveredCompletion({ executionId, text } = {}) {
+  const now = Date.now();
+  pruneExpired(now);
+  const expiresAt = now + DELIVERED_TTL_MS;
+  let recorded = false;
+  for (const key of [execKey(executionId), textKey(text)]) {
+    if (!key) continue;
+    _delivered.delete(key);
+    _delivered.set(key, expiresAt);
+    recorded = true;
+  }
+  if (recorded) enforceBound();
+  return recorded;
+}
+function isDeliveredCompletion({ executionId, text } = {}) {
+  const now = Date.now();
+  const keys = [execKey(executionId), textKey(text)].filter(Boolean);
+  let hit = false;
+  for (const key of keys) {
+    const expiresAt2 = _delivered.get(key);
+    if (expiresAt2 === void 0) continue;
+    if (expiresAt2 <= now) {
+      _delivered.delete(key);
+      continue;
+    }
+    hit = true;
+  }
+  if (!hit) return false;
+  const expiresAt = now + DELIVERED_TTL_MS;
+  for (const key of keys) {
+    if (!_delivered.has(key)) continue;
+    _delivered.delete(key);
+    _delivered.set(key, expiresAt);
+  }
+  return true;
+}
+
 // src/tui/engine/agent-job-feed.mjs
 function parseInboundImagePaths(raw) {
   if (typeof raw !== "string" || !raw) return [];
@@ -23266,16 +23376,111 @@ function createAgentJobFeed({
   enqueue,
   drain,
   pushUserOrSyntheticItem,
+  pushAsyncAgentResponse,
   makeQueueEntry,
   getPending,
   agentStatusState,
   displayedExecutionNotificationKeys,
-  pushNotice
+  itemIndexById,
+  pushNotice,
+  now = () => Date.now(),
+  executionResumeTombstoneTtlMs = 3e4,
+  executionResumeTombstoneLimit = 128
 }) {
+  const executionDedupLimit = 256;
   let executionResumeKickDeferred = false;
+  const discardedExecutionResumeKeys = /* @__PURE__ */ new Map();
+  const displayedExecutionResponseStates = /* @__PURE__ */ new Map();
+  const terminalExecutionNotificationKeys = /* @__PURE__ */ new Set();
+  const terminalExecutionResponseKeys = /* @__PURE__ */ new Set();
+  const executionNotificationKeys = /* @__PURE__ */ new Map();
+  const clearExecutionDedupState = () => {
+    displayedExecutionNotificationKeys.clear();
+    displayedExecutionResponseStates.clear();
+    terminalExecutionNotificationKeys.clear();
+    terminalExecutionResponseKeys.clear();
+    executionNotificationKeys.clear();
+  };
+  const rememberDisplayedExecutionNotificationKey = (key, terminal = false, executionId = "") => {
+    if (!key) return;
+    displayedExecutionNotificationKeys.delete(key);
+    if (executionId) executionNotificationKeys.set(key, executionId);
+    if (terminal) terminalExecutionNotificationKeys.add(key);
+    else terminalExecutionNotificationKeys.delete(key);
+    while (displayedExecutionNotificationKeys.size >= executionDedupLimit) {
+      const oldestTerminal = [...displayedExecutionNotificationKeys].find((candidate) => terminalExecutionNotificationKeys.has(candidate));
+      if (oldestTerminal == null) break;
+      displayedExecutionNotificationKeys.delete(oldestTerminal);
+      terminalExecutionNotificationKeys.delete(oldestTerminal);
+      executionNotificationKeys.delete(oldestTerminal);
+    }
+    displayedExecutionNotificationKeys.add(key);
+  };
+  const promoteExecutionNotificationKeys = (executionId) => {
+    if (!executionId) return;
+    for (const [key, keyExecutionId] of executionNotificationKeys) {
+      if (keyExecutionId !== executionId || !displayedExecutionNotificationKeys.has(key)) continue;
+      terminalExecutionNotificationKeys.add(key);
+    }
+  };
+  const promoteExecutionDedupState = (executionId) => {
+    if (!executionId) return;
+    promoteExecutionNotificationKeys(executionId);
+    const responseState = displayedExecutionResponseStates.get(executionId);
+    if (responseState) rememberDisplayedExecutionResponseState(executionId, responseState, true);
+  };
+  const rememberDisplayedExecutionResponseState = (key, value, terminal = false) => {
+    if (!key) return;
+    displayedExecutionResponseStates.delete(key);
+    if (terminal) terminalExecutionResponseKeys.add(key);
+    else terminalExecutionResponseKeys.delete(key);
+    while (displayedExecutionResponseStates.size >= executionDedupLimit) {
+      const oldestTerminal = [...displayedExecutionResponseStates.keys()].find((candidate) => terminalExecutionResponseKeys.has(candidate));
+      if (oldestTerminal == null) break;
+      displayedExecutionResponseStates.delete(oldestTerminal);
+      terminalExecutionResponseKeys.delete(oldestTerminal);
+    }
+    displayedExecutionResponseStates.set(key, value);
+  };
   const executionResumeKickBodies = [];
-  function kickExecutionPendingResume(body = "") {
-    if (body) executionResumeKickBodies.push(body);
+  function executionResumeKey(body, completionKey = "") {
+    if (completionKey && typeof completionKey === "object") {
+      completionKey = completionKey.executionId || completionKey.key || "";
+    }
+    const explicitKey = String(completionKey || "").trim();
+    if (explicitKey.startsWith("execution:") || explicitKey.startsWith("body:")) return explicitKey;
+    if (explicitKey) return `execution:${explicitKey}`;
+    const value = String(body || "").trim();
+    return value ? `body:${shortTextFingerprint(value)}` : "";
+  }
+  function pruneDiscardedExecutionResumeKeys() {
+    const nowMs = Number(now()) || Date.now();
+    for (const [key, expiresAt] of discardedExecutionResumeKeys) {
+      if (expiresAt <= nowMs) discardedExecutionResumeKeys.delete(key);
+    }
+  }
+  function isDiscardedExecutionResumeKey(key) {
+    if (!key) return false;
+    pruneDiscardedExecutionResumeKeys();
+    return discardedExecutionResumeKeys.has(key);
+  }
+  function rememberDiscardedExecutionResumeKey(key) {
+    if (!key) return;
+    pruneDiscardedExecutionResumeKeys();
+    const limit = Math.max(1, Number(executionResumeTombstoneLimit) || 128);
+    while (!discardedExecutionResumeKeys.has(key) && discardedExecutionResumeKeys.size >= limit) {
+      const oldest = discardedExecutionResumeKeys.keys().next().value;
+      if (oldest == null) break;
+      discardedExecutionResumeKeys.delete(oldest);
+    }
+    const ttlMs = Math.max(1, Number(executionResumeTombstoneTtlMs) || 3e4);
+    discardedExecutionResumeKeys.delete(key);
+    discardedExecutionResumeKeys.set(key, (Number(now()) || Date.now()) + ttlMs);
+  }
+  function kickExecutionPendingResume(body = "", completionKey = "") {
+    const key = executionResumeKey(body, completionKey);
+    if (body && isDiscardedExecutionResumeKey(key)) return;
+    if (body) executionResumeKickBodies.push({ body, key });
     if (getDisposed()) return;
     if (getState().busy) {
       executionResumeKickDeferred = true;
@@ -23287,20 +23492,39 @@ function createAgentJobFeed({
       return;
     }
     executionResumeKickDeferred = false;
-    const resumeBody = executionResumeKickBodies.splice(0).filter(Boolean).join("\n\n");
-    pending.push(makeQueueEntry(resumeBody, { mode: "pending-resume", priority: "next" }));
+    const resumeBodies = executionResumeKickBodies.splice(0);
+    const resumeBody = resumeBodies.map(({ body: value }) => value).filter(Boolean).join("\n\n");
+    const resumeCompletionKeys = resumeBodies.map(({ key: key2 }) => key2).filter(Boolean);
+    pending.push(makeQueueEntry(resumeBody, {
+      mode: "pending-resume",
+      priority: "next",
+      abortDiscardOnAbort: true,
+      resumeCompletionKeys
+    }));
     void drain();
   }
   function flushDeferredExecutionPendingResumeKick() {
     if (!executionResumeKickDeferred || getDisposed() || getState().busy) return;
     kickExecutionPendingResume();
   }
-  function scheduleExecutionPendingResumeKick(body = "") {
-    queueMicrotask(() => kickExecutionPendingResume(body));
+  function scheduleExecutionPendingResumeKick(body = "", completionKey = "") {
+    queueMicrotask(() => kickExecutionPendingResume(body, completionKey));
+  }
+  function discardExecutionPendingResume(completionKeys = []) {
+    const keys = (Array.isArray(completionKeys) ? completionKeys : [completionKeys]).map((key) => executionResumeKey("", key)).filter(Boolean);
+    if (keys.length === 0) return;
+    for (const key of keys) rememberDiscardedExecutionResumeKey(key);
+    for (let i = executionResumeKickBodies.length - 1; i >= 0; i -= 1) {
+      if (isDiscardedExecutionResumeKey(executionResumeKickBodies[i].key)) {
+        executionResumeKickBodies.splice(i, 1);
+      }
+    }
+    executionResumeKickDeferred = executionResumeKickBodies.length > 0;
   }
   function buildAgentJobCardPatch(itemId, text, isError = false) {
     const parsed = parseAgentJob(text);
-    const current = getState().items.find((it) => it.id === itemId);
+    const index = itemIndexById?.get(itemId);
+    const current = Number.isInteger(index) && getState().items[index]?.id === itemId ? getState().items[index] : null;
     const rawDisplayText = agentJobResultText(text, parsed) || String(text ?? "").trim();
     const displayText = isError ? toolErrorDisplay(rawDisplayText, "agent") : rawDisplayText;
     return {
@@ -23314,53 +23538,81 @@ function createAgentJobFeed({
   function updateAgentJobCard(itemId, text, isError = false) {
     patchItem(itemId, buildAgentJobCardPatch(itemId, text, isError));
   }
+  function refreshAgentStatus(parsed) {
+    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));
+  }
   function subscribeRuntimeNotifications() {
     if (typeof runtime.onNotification !== "function") return null;
-    return runtime.onNotification((event) => {
+    const unsubscribe = runtime.onNotification((event) => {
       if (getDisposed()) return;
       const text = String(event?.content ?? event?.text ?? event ?? "").trim();
       if (!text) return;
       const parsed = parseAgentJob(text);
       const notificationKey = notificationQueueKey(event, text, parsed);
       const delivery = resolveTuiRuntimeNotificationDelivery(event, text);
+      const executionId = String(event?.meta?.execution_id || parsed?.taskId || "").trim();
+      const status = String(event?.meta?.status || parsed?.status || "").toLowerCase();
+      const terminalStatus = /^(completed|complete|done|success|succeeded|ok|failed|error|timeout|killed|cancelled|canceled|denied)$/.test(status);
+      if (terminalStatus) promoteExecutionDedupState(executionId);
       if (delivery.action === "ignore") return;
       if (delivery.action === "notice") {
         pushNotice?.(delivery.displayText, delivery.tone || "info", { transcript: delivery.transcript === true });
         return true;
       }
       if (delivery.action === "status-only") {
-        if (parsed?.taskId) set(agentStatusState({ force: true }));
+        refreshAgentStatus(parsed);
         return true;
       }
       if (delivery.action === "execution-ui") {
-        const firstDelivery = !notificationKey || !displayedExecutionNotificationKeys.has(notificationKey);
-        if (firstDelivery) {
-          if (notificationKey) displayedExecutionNotificationKeys.add(notificationKey);
-          pushUserOrSyntheticItem(delivery.displayText, nextId2());
+        const cardKey = executionCardKey(event, text, parsed);
+        const firstDelivery = !cardKey || !displayedExecutionNotificationKeys.has(cardKey);
+        const hasBody = /\n\s*\n[\s\S]*\S/.test(text);
+        const isFailure = /^(failed|error|timeout|killed|cancelled|canceled|denied)$/.test(status);
+        const successfulPreview = !hasBody && !isFailure && /^(completed|complete|done|success|succeeded|ok)$/.test(status);
+        const terminal = terminalStatus;
+        const responseState = executionId ? displayedExecutionResponseStates.get(executionId) : "";
+        const bodyAlreadyDisplayed = responseState === "body";
+        if (cardKey && terminal && displayedExecutionNotificationKeys.has(cardKey)) {
+          rememberDisplayedExecutionNotificationKey(cardKey, true, executionId);
+        }
+        if (terminal) promoteExecutionDedupState(executionId);
+        if (firstDelivery && !successfulPreview && !bodyAlreadyDisplayed) {
+          if (cardKey) rememberDisplayedExecutionNotificationKey(cardKey, terminal, executionId);
+          if (executionId) rememberDisplayedExecutionResponseState(executionId, hasBody ? "body" : "preview", terminal);
+          (pushAsyncAgentResponse || pushUserOrSyntheticItem)(delivery.displayText, nextId2(), "injected", { responseKey: executionId });
         }
-        if (parsed?.taskId) set(agentStatusState({ force: true }));
+        refreshAgentStatus(parsed);
         const resumeBody = String(delivery.modelContent || "").trim();
         if (resumeBody) {
-          enqueue(resumeBody, {
+          const completionKey = executionResumeKey(resumeBody, executionId);
+          if (isDiscardedExecutionResumeKey(completionKey) || isDeliveredCompletion({ executionId, text: resumeBody })) {
+            if (event && typeof event === "object") event.modelVisibleDelivered = true;
+            return true;
+          }
+          const enqueued = enqueue(resumeBody, {
             mode: "task-notification",
             // Claude Code parity: live execution completions are queued as
             // task notifications so the active loop can attach them after the
             // next tool batch; no special pending-resume bypass.
             priority: "next",
             key: notificationKey || void 0,
+            abortDiscardOnAbort: true,
+            resumeCompletionKeys: completionKey ? [completionKey] : [],
             displayText: delivery.displayText || text,
             // The immediate Response card was already pushed above
             // (pushUserOrSyntheticItem). Keep this queued twin model-visible
             // but suppress its drain-time transcript card to avoid a duplicate.
             suppressDisplay: true
           });
+          if (enqueued) recordDeliveredCompletion({ executionId, text: resumeBody });
           if (event && typeof event === "object") event.modelVisibleDelivered = true;
         }
         return true;
       }
-      if (parsed?.taskId) {
-        set(agentStatusState({ force: true }));
-      }
+      refreshAgentStatus(parsed);
       const modelContent = String(delivery.modelContent ?? delivery.displayText ?? text).trim();
       const imagePaths = parseInboundImagePaths(event?.meta?.image_paths);
       if (!modelContent && imagePaths.length === 0) return true;
@@ -23398,14 +23650,78 @@ function createAgentJobFeed({
       enqueue(modelContent, enqueueOpts);
       return true;
     });
+    return () => {
+      try {
+        unsubscribe?.();
+      } finally {
+        clearExecutionDedupState();
+      }
+    };
   }
   return {
     kickExecutionPendingResume,
     flushDeferredExecutionPendingResumeKick,
     scheduleExecutionPendingResumeKick,
+    discardExecutionPendingResume,
     updateAgentJobCard,
     buildAgentJobCardPatch,
-    subscribeRuntimeNotifications
+    subscribeRuntimeNotifications,
+    clearExecutionDedupState
+  };
+}
+
+// src/tui/engine/agent-response-tail.mjs
+function responseEntry(response = {}) {
+  return {
+    key: String(response.key || ""),
+    raw: String(response.rawResult ?? response.raw ?? "").trim(),
+    result: response.result,
+    hasBody: response.hasBody === true,
+    isError: response.isError === true
+  };
+}
+function formatAgentResponseRaw(entries = []) {
+  return entries.map((entry, index) => {
+    const raw = String(entry?.raw || "").trim();
+    return raw ? `${index + 1}. agent
+${raw}` : "";
+  }).filter(Boolean).join("\n\n");
+}
+function priorEntries(previous) {
+  if (Array.isArray(previous?.agentResponseEntries) && previous.agentResponseEntries.length) {
+    return previous.agentResponseEntries.map(responseEntry);
+  }
+  return [responseEntry({
+    key: previous?.agentResponseKey,
+    rawResult: previous?.rawResult ?? previous?.result,
+    result: previous?.result,
+    hasBody: previous?.agentResponseHasBody,
+    isError: previous?.isError
+  })];
+}
+function appendAgentResponseTail(previous, response, now = Date.now()) {
+  if (previous?.kind !== "tool" || previous.agentDirection !== "inbound") return null;
+  const next = responseEntry(response);
+  const entries = priorEntries(previous);
+  const existingIndex = next.key ? entries.findIndex((entry) => entry.key === next.key) : -1;
+  if (existingIndex >= 0) {
+    entries[existingIndex] = next;
+  } else {
+    if (previous.agentResponseHasBody !== next.hasBody) return null;
+    entries.push(next);
+  }
+  return {
+    args: response.args,
+    result: response.result,
+    rawResult: formatAgentResponseRaw(entries) || null,
+    isError: entries.some((entry) => entry.isError),
+    count: entries.length,
+    completedCount: entries.length,
+    completedAt: now,
+    agentResponseEntries: entries,
+    agentResponseKeys: entries.map((entry) => entry.key).filter(Boolean),
+    agentResponseHasBody: entries.every((entry) => entry.hasBody),
+    agentResponseAggregate: entries.length > 1
   };
 }
 
@@ -23737,6 +24053,7 @@ function createSessionFlow(bag) {
     pending,
     pendingNotificationKeys,
     displayedExecutionNotificationKeys,
+    clearExecutionDedupState,
     getState,
     set,
     pushItem,
@@ -23778,6 +24095,10 @@ function createSessionFlow(bag) {
       skipSlashCommands: options.skipSlashCommands === true,
       displayText: mode === "task-notification" ? notificationDisplayText(displayText) : String(displayText || ""),
       suppressDisplay: options.suppressDisplay === true,
+      // Completion resumes are consumed exactly once: Esc abandons their
+      // uncommitted body instead of putting it back at the queue front.
+      abortDiscardOnAbort: options.abortDiscardOnAbort === true,
+      resumeCompletionKeys: Array.isArray(options.resumeCompletionKeys) ? options.resumeCompletionKeys.filter((key) => key != null && String(key).trim()) : [],
       steeringPersistId: options.steeringPersistId || null,
       steeringPersistRestored: options.steeringPersistRestored === true
     };
@@ -23831,6 +24152,7 @@ function createSessionFlow(bag) {
       if (predicate(entry) && (entry.mode || "prompt") === targetMode && queuePriorityValue(entry.priority) === bestPriority) {
         batch.push(entry);
         pending.splice(i, 1);
+        if (entry.mode === "task-notification" && entry.key) pendingNotificationKeys.delete(entry.key);
         if (batch.length >= limit) break;
       } else {
         i += 1;
@@ -23893,6 +24215,13 @@ function createSessionFlow(bag) {
           pushUserOrSyntheticItem(entry.text, entry.id, isQueuedEntryEditable(entry) ? "user" : "injected");
         }
         const nonEditable = batch.filter((entry) => !isQueuedEntryEditable(entry));
+        const discardOnAbort = nonEditable.filter(
+          (entry) => entry?.abortDiscardOnAbort === true || entry?.mode === "pending-resume"
+        );
+        const requeueOnAbort = nonEditable.filter((entry) => !discardOnAbort.includes(entry));
+        const discardExecutionPendingResumeKeys = discardOnAbort.flatMap(
+          (entry) => Array.isArray(entry?.resumeCompletionKeys) ? entry.resumeCompletionKeys : []
+        );
         const batchPastedImages = mergePastedImages(batch);
         const batchPastedTexts = mergePastedTexts(batch);
         const turnStatus = await bag.runTurn(merged, {
@@ -23902,7 +24231,8 @@ function createSessionFlow(bag) {
           onCommitted: () => commitSteeringQueueEntries(batch),
           submittedIds: [...ids],
           restorable: nonEditable.length === 0,
-          requeueOnAbort: nonEditable
+          requeueOnAbort,
+          discardExecutionPendingResumeKeys
         });
         if (flags.drainEpoch !== drainEpoch) return;
         flushDeferredClearedSessionUi();
@@ -24120,6 +24450,7 @@ function createSessionFlow(bag) {
     getState().busy = false;
     pendingNotificationKeys.clear();
     displayedExecutionNotificationKeys.clear();
+    clearExecutionDedupState?.();
   };
   const applyClearedSessionUi = (doneLabel) => {
     resetStats();
@@ -24215,6 +24546,9 @@ function createRunTurn(bag) {
     set,
     pushItem,
     patchItem,
+    updateStreamingTail: updateStreamingTailFromStore,
+    settleStreamingTail: settleStreamingTailFromStore,
+    clearStreamingTail: clearStreamingTailFromStore,
     pushNotice,
     pushUserOrSyntheticItem,
     markToolCallActive,
@@ -24231,6 +24565,21 @@ function createRunTurn(bag) {
     drain,
     drainPendingSteering
   } = bag;
+  const updateStreamingTail = updateStreamingTailFromStore || ((id, patch = {}) => {
+    set({ streamingTail: { ...getState().streamingTail || {}, ...patch, kind: "assistant", id, streaming: true } });
+    return true;
+  });
+  const settleStreamingTail = settleStreamingTailFromStore || ((id, patch = {}) => {
+    const tail = getState().streamingTail;
+    if (!tail || tail.id !== id) return false;
+    pushItem({ ...tail, ...patch, kind: "assistant", id, streaming: false });
+    set({ streamingTail: null });
+    return true;
+  });
+  const clearStreamingTail = clearStreamingTailFromStore || ((id = null) => {
+    if (id == null || getState().streamingTail?.id === id) set({ streamingTail: null });
+    return true;
+  });
   async function runTurn(userText, options = {}) {
     const turnIndex = getState().stats.turns || 0;
     const startedAt = Date.now();
@@ -24250,7 +24599,8 @@ function createRunTurn(bag) {
       submittedIds,
       reclaimed: false,
       committed: false,
-      requeueEntries: Array.isArray(options.requeueOnAbort) ? options.requeueOnAbort.slice() : []
+      requeueEntries: Array.isArray(options.requeueOnAbort) ? options.requeueOnAbort.slice() : [],
+      discardExecutionPendingResumeKeys: Array.isArray(options.discardExecutionPendingResumeKeys) ? options.discardExecutionPendingResumeKeys.slice() : []
     };
     set({ busy: true, lastTurn: null, spinner: { active: true, verb: pickVerb(turnIndex), startedAt, responseLength: 0, inputTokens: 0, outputTokens: 0, mode: "requesting" } });
     let assistantText = "";
@@ -24261,6 +24611,9 @@ function createRunTurn(bag) {
     let watchdogGraceTimer = null;
     let lastProgressAt = startedAt;
     let lastProgressLabel = "start";
+    let watchdogDeferralCeilingAt = 0;
+    const configuredLeadToolMaxMs = Number(process.env.MIXDOG_LEAD_TOOL_MAX_MS);
+    const leadToolMaxMs = Number.isFinite(configuredLeadToolMaxMs) && configuredLeadToolMaxMs > 0 ? configuredLeadToolMaxMs : 30 * 60 * 1e3;
     const clearWatchdog = () => {
       if (watchdogTimer) {
         clearTimeout(watchdogTimer);
@@ -24271,21 +24624,57 @@ function createRunTurn(bag) {
         watchdogGraceTimer = null;
       }
     };
+    const refreshWatchdogFromRuntimeLiveness = () => {
+      let liveness;
+      try {
+        liveness = runtime.getTurnLiveness?.();
+      } catch {
+        return false;
+      }
+      if (liveness?.stage !== "tool_running") watchdogDeferralCeilingAt = 0;
+      const progressAt = Number(liveness?.lastProgressAt);
+      const now = Date.now();
+      if (!liveness || !Number.isFinite(progressAt) || progressAt <= now - LEAD_TURN_TIMEOUT_MS2) return false;
+      if (liveness.stage === "tool_running") {
+        watchdogDeferralCeilingAt = 0;
+        const toolStartedAt = Number(liveness.toolStartedAt);
+        if (!Number.isFinite(toolStartedAt) || toolStartedAt <= 0) return false;
+        const toolSelfDeadlineMs = Number(liveness.toolSelfDeadlineMs);
+        const toolCeilingMs = Math.max(
+          Number.isFinite(toolSelfDeadlineMs) && toolSelfDeadlineMs > 0 ? toolSelfDeadlineMs + 6e4 : 0,
+          leadToolMaxMs
+        );
+        if (now - toolStartedAt >= toolCeilingMs) return false;
+        watchdogDeferralCeilingAt = toolStartedAt + toolCeilingMs;
+      }
+      lastProgressAt = progressAt;
+      lastProgressLabel = `orchestrator:${String(liveness.stage || "unknown")}`;
+      armWatchdog();
+      return true;
+    };
     const armWatchdog = () => {
       if (watchdogTimer) {
         clearTimeout(watchdogTimer);
         watchdogTimer = null;
       }
       if (watchdogTripped) return;
-      const remaining = Math.max(1, LEAD_TURN_TIMEOUT_MS2 - Math.max(0, Date.now() - lastProgressAt));
+      const now = Date.now();
+      const remaining = Math.max(1, LEAD_TURN_TIMEOUT_MS2 - Math.max(0, now - lastProgressAt));
+      const ceilingRemaining = watchdogDeferralCeilingAt > 0 ? Math.max(1, watchdogDeferralCeilingAt - now) : Infinity;
+      const delay = Math.min(remaining, ceilingRemaining);
       watchdogTimer = setTimeout(() => {
         if (!isCurrentTurn()) return;
         if (watchdogTripped) return;
-        const idleMs = Date.now() - lastProgressAt;
+        const now2 = Date.now();
+        const idleMs = now2 - lastProgressAt;
         if (idleMs < LEAD_TURN_TIMEOUT_MS2) {
-          armWatchdog();
-          return;
-        }
+          if (watchdogDeferralCeilingAt > 0 && now2 >= watchdogDeferralCeilingAt) {
+            if (refreshWatchdogFromRuntimeLiveness()) return;
+          } else {
+            armWatchdog();
+            return;
+          }
+        } else if (refreshWatchdogFromRuntimeLiveness()) return;
         watchdogTripped = true;
         if (_batchTimer !== null) {
           clearTimeout(_batchTimer);
@@ -24296,7 +24685,7 @@ function createRunTurn(bag) {
         _pendingThinkingLastEndedAt = 0;
         const elapsed = Date.now() - startedAt;
         tuiDebug2(`runTurn WATCHDOG TRIP turn=${turnIndex} elapsedMs=${elapsed} idleMs=${idleMs} lastProgress=${lastProgressLabel} \u2014 aborting stuck turn`);
-        pushNotice(`Turn timed out after ${Math.round(idleMs / 1e3)}s idle \u2014 aborting stuck request. Input will be released shortly if abort does not unwind.`, "warn", { transcript: true });
+        pushNotice(`Turn timed out after ${Math.round(idleMs / 1e3)}s idle (last progress: ${lastProgressLabel}) \u2014 aborting stuck request. Input will be released shortly if abort does not unwind.`, "warn", { transcript: true });
         try {
           runtime.abort("cli-react-abort-watchdog");
         } catch {
@@ -24312,6 +24701,11 @@ function createRunTurn(bag) {
           finalizeToolHeaders();
           clearDeferredTimers();
           flags.flushDeferredBeforeImmediatePush = null;
+          if (currentAssistantId && currentAssistantText.trim()) {
+            settleStreamingTail(currentAssistantId, { text: currentAssistantText });
+          } else {
+            clearStreamingTail(currentAssistantId);
+          }
           flags.leadTurnEpoch++;
           set({ busy: false, spinner: null, thinking: null, lastTurn: null });
           flags.activePromptRestore = null;
@@ -24320,7 +24714,7 @@ function createRunTurn(bag) {
           flushDeferredExecutionPendingResumeKick();
         }, 5e3);
         watchdogGraceTimer.unref?.();
-      }, remaining);
+      }, delay);
       watchdogTimer.unref?.();
     };
     const markTurnProgress = (label) => {
@@ -24328,11 +24722,11 @@ function createRunTurn(bag) {
       if (watchdogTripped) return;
       lastProgressAt = Date.now();
       lastProgressLabel = String(label || "progress");
-      armWatchdog();
       return true;
     };
     armWatchdog();
     let currentAssistantText = "";
+    const committedSegments = [];
     let thinkingText = "";
     let thinkingStartedAt = 0;
     let thinkingSegmentStartedAt = 0;
@@ -24348,7 +24742,8 @@ function createRunTurn(bag) {
     const earlyResultBuffer = /* @__PURE__ */ new Map();
     const aggregateCards = [];
     let tailAggregate = null;
-    const TOOL_CARD_PUSH_DELAY_MS = 0;
+    let providerToolBatch = 0;
+    const TOOL_CARD_PUSH_DELAY_MS = 1e3;
     let deferredSeqCounter = 0;
     const deferredEntries = [];
     const flushDeferredUpTo = (entry) => {
@@ -24470,7 +24865,7 @@ function createRunTurn(bag) {
         const it = newItems[i];
         if (it?.id != null) itemIndexById.set(it.id, base + i);
       }
-      set({ items, ...extra });
+      set({ items, structureRevision: (Number(getState().structureRevision) || 0) + 1, ...extra });
     };
     const markPromptCommitted = () => {
       if (flags.activePromptRestore) {
@@ -24505,7 +24900,7 @@ function createRunTurn(bag) {
         changed = true;
         return { ...item, headerFinalized: true };
       });
-      if (changed) set({ items });
+      if (changed) set({ items, structureRevision: (Number(getState().structureRevision) || 0) + 1 });
       return changed;
     };
     const completeAggregateVisual = () => {
@@ -24515,10 +24910,11 @@ function createRunTurn(bag) {
         aggregate.ensureVisible?.();
         const errors = allCalls.filter((r) => r.isError).length;
         const callErrors = allCalls.filter((r) => r.isCallError).length;
+        const exitErrors = allCalls.filter((r) => r.isExitError).length;
         const completed = allCalls.filter((r) => r.resolved).length;
-        const succeeded = completed - errors;
+        const succeeded = Math.max(0, completed - errors - exitErrors);
         const rawResult = aggregateRawResult(allCalls);
-        const displayDetail = errors > 0 ? succeeded > 0 ? `${succeeded} Ok \xB7 ${errors} Failed` : `${errors} Failed` : formatAggregateDetail(aggregateSummaries(aggregate));
+        const displayDetail = errors > 0 || exitErrors > 0 ? failureDetailText({ succeeded, realErrors: callErrors, exitErrors, exitCode: allCalls.find((r) => r.isExitError)?.exitCode }) : formatAggregateDetail(aggregateSummaries(aggregate));
         patchItem(aggregate.itemId, {
           result: displayDetail,
           text: displayDetail,
@@ -24526,6 +24922,7 @@ function createRunTurn(bag) {
           isError: errors > 0,
           errorCount: errors,
           callErrorCount: callErrors,
+          exitErrorCount: exitErrors,
           count: allCalls.length,
           completedCount: allCalls.length,
           doneCategories: aggregateDoneCategories(allCalls),
@@ -24594,7 +24991,7 @@ function createRunTurn(bag) {
     const ensureAssistant = (initialText = "") => {
       if (!currentAssistantId) {
         currentAssistantId = nextId2();
-        pushItem({ kind: "assistant", id: currentAssistantId, text: String(initialText || ""), streaming: true });
+        updateStreamingTail(currentAssistantId, { text: String(initialText || "") });
       }
       return currentAssistantId;
     };
@@ -24605,7 +25002,6 @@ function createRunTurn(bag) {
       _lastNewlineIdx = -1;
       _emittedNewlineIdx = -2;
       _emittedVisibleText = "";
-      _cachedAssistantIndex = -1;
     };
     const commitAssistantSegment = ({ sealToolBlock = false } = {}) => {
       const text = currentAssistantText || "";
@@ -24615,7 +25011,8 @@ function createRunTurn(bag) {
       }
       if (sealToolBlock) clearAggregateContinuation();
       const id = currentAssistantId || ensureAssistant(text);
-      patchItem(id, { text, streaming: false });
+      settleStreamingTail(id, { text });
+      committedSegments.push(text);
       closeAssistantSegment();
       return true;
     };
@@ -24642,7 +25039,6 @@ function createRunTurn(bag) {
     let _lastNewlineIdx = -1;
     let _emittedNewlineIdx = -2;
     let _emittedVisibleText = "";
-    let _cachedAssistantIndex = -1;
     let _publishedThinkingActive = false;
     const flushStreamBatch = () => {
       if (_batchTimer !== null) {
@@ -24677,22 +25073,13 @@ function createRunTurn(bag) {
         const patch = {};
         if (currentAssistantId || streamingVisibleText.trim()) {
           const id = ensureAssistant(streamingVisibleText);
-          let index = _cachedAssistantIndex;
-          if (index < 0 || getState().items[index]?.id !== id) {
-            index = getState().items.findIndex((it) => it.id === id);
-            _cachedAssistantIndex = index;
-          }
-          if (index >= 0) {
-            const current = getState().items[index];
-            if (!Object.is(current.text, streamingVisibleText) || current.streaming !== true) {
-              const items = getState().items.slice();
-              items[index] = { ...current, text: streamingVisibleText, streaming: true };
-              patch.items = items;
-            }
+          const current = getState().streamingTail;
+          if (!current || current.id !== id || !Object.is(current.text, streamingVisibleText)) {
+            patch.streamingTail = { kind: "assistant", id, text: streamingVisibleText, streaming: true };
           }
         }
         const responseLengthVal = assistantText.length + thinkingText.length;
-        const visibleLineChanged = patch.items !== void 0;
+        const visibleLineChanged = patch.streamingTail !== void 0;
         const thinkingTransition = _publishedThinkingActive === true;
         if (getState().spinner && (visibleLineChanged || thinkingTransition || _pendingThinkingLastEndedAt)) {
           patch.spinner = { ...getState().spinner, responseLength: responseLengthVal, thinking: false, thinkingLastEndedAt: _pendingThinkingLastEndedAt || getState().spinner.thinkingLastEndedAt, mode: compactingActive ? "compacting" : "responding" };
@@ -24732,25 +25119,27 @@ function createRunTurn(bag) {
         if (!callRec || callRec.resolved || callRec.completedEarly) return;
         aggregate.ensureVisible?.();
         const rawText = toolResultText(message?.content);
-        const isMemoryCall = classifyToolCategory(callRec.name, callRec.args) === "Memory";
-        const isCallError = message?.isError === true || message?.toolKind === "error";
-        const isResultError = /^\s*\[?error/i.test(rawText) || isErrorToolStatus(toolResultStatus(rawText)) || isMemoryCall && memoryCoreResultErrorText(rawText) != null;
-        const isError = isCallError || isResultError;
+        const { exitCode, isExitError, isCallError } = toolCallOutcome(message, rawText);
+        const isError = isCallError;
         const text = isError ? toolErrorDisplay(rawText, callRec.name || "tool") : rawText;
         callRec.summary = !isError ? summarizeToolResult(callRec.name, callRec.args, rawText, isError) : null;
         assignAggregateSummaryOrder(aggregate, callRec);
         callRec.isError = isError;
         callRec.isCallError = isCallError;
+        callRec.isExitError = isExitError;
+        callRec.exitCode = exitCode;
         callRec.resultText = text;
         callRec.completedEarly = true;
         const allCalls = [...aggregate.calls.values()];
         const completedCount = allCalls.filter((r) => r.resolved || r.completedEarly).length;
         const errors = allCalls.filter((r) => r.isError).length;
         const callErrors = allCalls.filter((r) => r.isCallError).length;
-        const succeeded = completedCount - errors;
+        const exitErrors = allCalls.filter((r) => r.isExitError).length;
+        const succeeded = Math.max(0, completedCount - errors - exitErrors);
         const rawResult = aggregateRawResult(allCalls);
-        const displayDetail = errors > 0 ? succeeded > 0 ? `${succeeded} Ok \xB7 ${errors} Failed` : `${errors} Failed` : formatAggregateDetail(aggregateSummaries(aggregate));
-        const currentItem = getState().items.find((it) => it.id === card.itemId);
+        const displayDetail = errors > 0 || exitErrors > 0 ? failureDetailText({ succeeded, realErrors: callErrors, exitErrors, exitCode: allCalls.find((r) => r.isExitError)?.exitCode }) : formatAggregateDetail(aggregateSummaries(aggregate));
+        const currentIndex = itemIndexById.get(card.itemId);
+        const currentItem = Number.isInteger(currentIndex) && getState().items[currentIndex]?.id === card.itemId ? getState().items[currentIndex] : null;
         const visualCompleted = Math.max(
           completedCount,
           Math.min(allCalls.length, Number(currentItem?.completedCount || 0))
@@ -24761,6 +25150,7 @@ function createRunTurn(bag) {
           isError: errors > 0,
           errorCount: errors,
           callErrorCount: callErrors,
+          exitErrorCount: exitErrors,
           count: allCalls.length,
           completedCount: visualCompleted
         };
@@ -24782,14 +25172,14 @@ function createRunTurn(bag) {
     try {
       const { result, session } = await runtime.ask(userText, {
         drainSteering: (_sessionId, drainOptions) => isCurrentTurn() ? drainPendingSteering(drainOptions) : [],
+        onStreamDelta: () => {
+          markTurnProgress("stream-delta");
+        },
         onSteerMessage: (text) => {
           if (!markTurnProgress("steer-message")) return;
           if (text === STEERING_SUPPRESSED_DISPLAY) return;
           flushStreamBatch();
-          if (currentAssistantId) {
-            patchItem(currentAssistantId, { text: currentAssistantText || assistantText, streaming: false });
-            closeAssistantSegment();
-          }
+          commitAssistantSegment({ sealToolBlock: true });
           assistantText = "";
           const value = String(text || "").trim();
           if (value) {
@@ -24810,6 +25200,7 @@ function createRunTurn(bag) {
           }
           const batchCalls = (calls || []).filter(Boolean);
           if (batchCalls.length === 0) return;
+          const agentBatch = ++providerToolBatch;
           const committedAssistantSegment = commitAssistantSegment({ sealToolBlock: true });
           if (committedAssistantSegment) {
             await yieldToRenderer({ frames: 2 });
@@ -24822,7 +25213,7 @@ function createRunTurn(bag) {
             const name = toolCallName(c);
             const args = toolCallArgs(c);
             const category = classifyToolCategory(name, args);
-            const bucket = category === "Agent" ? null : aggregateBucketForCategory(category);
+            const bucket = aggregateBucketForCategory(category, { agentBatch });
             const callId = toolCallId(c);
             const callKey = callId || `__tool_${toolCards.length}_${i}`;
             const activeCount = Number(aggregateToolCategoryEntry(name, args, category)?.count || 1);
@@ -24865,7 +25256,7 @@ function createRunTurn(bag) {
               ...categoryEntry,
               count: Number(prevCategory?.count || 0) + Number(categoryEntry.count || 1)
             });
-            aggregateCard.calls.set(callKey, { name, args, category, summary: null, summarySeq: null, isError: false, isCallError: false, resultText: null, resolved: false, completedEarly: false });
+            aggregateCard.calls.set(callKey, { name, args, category, summary: null, summarySeq: null, isError: false, isCallError: false, isExitError: false, exitCode: null, resultText: null, resolved: false, completedEarly: false });
             touchedAggregates.add(aggregateCard);
             const card = { itemId: aggregateCard.itemId, callId: callKey, done: false, aggregate: aggregateCard };
             if (callId) {
@@ -25013,13 +25404,21 @@ function createRunTurn(bag) {
         flushStreamBatch();
         syncContextStats({ allowEstimated: true });
         const finalText = result?.content != null ? String(result.content) : "";
-        if (finalText.trim()) {
-          const id = currentAssistantId || ensureAssistant(finalText);
-          currentAssistantText = finalText;
-          patchItem(id, { text: finalText, streaming: false });
+        let finalRemainder = finalText;
+        for (const seg of committedSegments) {
+          const skipped = finalRemainder.replace(/^\s+/, "");
+          const trimmedSeg = seg ? seg.replace(/^\s+/, "") : "";
+          if (trimmedSeg && skipped.startsWith(trimmedSeg)) {
+            finalRemainder = skipped.slice(trimmedSeg.length);
+          }
+        }
+        if (finalRemainder.trim()) {
+          const id = currentAssistantId || ensureAssistant(finalRemainder);
+          currentAssistantText = finalRemainder;
+          settleStreamingTail(id, { text: finalRemainder });
         } else if (currentAssistantId && (currentAssistantText.trim() || assistantText.trim())) {
           const streamedText = currentAssistantText || assistantText;
-          patchItem(currentAssistantId, { text: streamedText, streaming: false });
+          settleStreamingTail(currentAssistantId, { text: streamedText });
         }
         turnFinishedNormally = true;
       }
@@ -25032,7 +25431,7 @@ function createRunTurn(bag) {
         if (error?.name === "SessionClosedError") {
           cancelled = true;
           if (assistantText.trim() && currentAssistantId) {
-            patchItem(currentAssistantId, { text: currentAssistantText || assistantText, streaming: false });
+            settleStreamingTail(currentAssistantId, { text: currentAssistantText || assistantText });
           }
           flushToolResults([], toolCards, cardByCallId, toolGroups, resultsDone, { finalize: true, cancelled: true });
           finalizeToolHeaders();
@@ -25058,6 +25457,13 @@ function createRunTurn(bag) {
       if (isStaleUnwind) {
         tuiDebug2(`runTurn STALE UNWIND turn=${turnIndex} \u2014 force-released; skipping shared UI/state writes`);
       } else {
+        if (currentAssistantId && getState().streamingTail?.id === currentAssistantId) {
+          if (currentAssistantText.trim()) {
+            settleStreamingTail(currentAssistantId, { text: currentAssistantText });
+          } else {
+            clearStreamingTail(currentAssistantId);
+          }
+        }
         const producedTranscriptItem = getState().items.length + closingItems.length > itemsAtTurnStart;
         const reclaimed = cancelled && flags.activePromptRestore?.reclaimed === true;
         flags.activePromptRestore = null;
@@ -25794,6 +26200,8 @@ function createEngineApiA(bag) {
     pushItem,
     patchItem,
     replaceItems,
+    settleStreamingTail,
+    clearStreamingTail,
     pushNotice,
     autoClearState,
     agentStatusState,
@@ -25807,7 +26215,8 @@ function createEngineApiA(bag) {
     restoreQueued,
     resetStatsAndSyncContext,
     drain,
-    flushDeferredExecutionPendingResumeKick
+    flushDeferredExecutionPendingResumeKick,
+    discardExecutionPendingResume
   } = bag;
   return {
     getState: () => getState(),
@@ -26301,9 +26710,14 @@ function createEngineApiA(bag) {
       const restorePastedTexts = canRestore && restoreState?.pastedTexts ? restoreState.pastedTexts : null;
       const discardPastedImages = restoreState?.restorable && hasPendingSteering && restoreState?.pastedImages ? restoreState.pastedImages : null;
       const discardPastedTexts = restoreState?.restorable && hasPendingSteering && restoreState?.pastedTexts ? restoreState.pastedTexts : null;
-      const requeueEntries = restoreState && !restoreState.committed && Array.isArray(restoreState.requeueEntries) ? restoreState.requeueEntries.slice() : [];
+      const requeueEntries = restoreState && !restoreState.committed && Array.isArray(restoreState.requeueEntries) ? restoreState.requeueEntries.filter(
+        (entry) => entry?.abortDiscardOnAbort !== true && entry?.mode !== "pending-resume"
+      ) : [];
       const aborted = runtime.abort("cli-react-abort");
       if (restoreState) {
+        if (aborted !== false && Array.isArray(restoreState.discardExecutionPendingResumeKeys)) {
+          discardExecutionPendingResume?.(restoreState.discardExecutionPendingResumeKeys);
+        }
         if ((restoreText || requeueEntries.length > 0) && aborted !== false) {
           restoreState.reclaimed = true;
           const idSet = new Set((restoreState.submittedIds || []).filter((id) => id != null));
@@ -26319,6 +26733,7 @@ function createEngineApiA(bag) {
         }
         restoreState.restorable = false;
         restoreState.requeueEntries = [];
+        restoreState.discardExecutionPendingResumeKeys = [];
       }
       const abortEpoch = flags.leadTurnEpoch;
       const recoveryMs = Number(flags.manualAbortRecoveryMs) > 0 ? Number(flags.manualAbortRecoveryMs) : MANUAL_ABORT_RECOVERY_MS;
@@ -26326,6 +26741,12 @@ function createEngineApiA(bag) {
         if (flags.disposed) return;
         if (!getState().busy) return;
         if (flags.leadTurnEpoch !== abortEpoch) return;
+        const streamingTail = getState().streamingTail;
+        if (streamingTail?.text?.trim()) {
+          settleStreamingTail?.(streamingTail.id, {});
+        } else {
+          clearStreamingTail?.();
+        }
         flags.leadTurnEpoch = (Number(flags.leadTurnEpoch) || 0) + 1;
         set({ busy: false, spinner: null, thinking: null, lastTurn: null });
         flags.activePromptRestore = null;
@@ -26362,6 +26783,79 @@ var tuiDebug = (msg) => {
 };
 var _idSeq = 0;
 var nextId = () => `it_${++_idSeq}`;
+function replaceEngineItemsState({
+  state,
+  items,
+  itemIndexById,
+  preserveStreamingTail = false,
+  extra = {}
+}) {
+  const nextItems = Array.isArray(items) ? items : [];
+  itemIndexById.clear();
+  for (let i = 0; i < nextItems.length; i++) {
+    const id = nextItems[i]?.id;
+    if (id != null) itemIndexById.set(id, i);
+  }
+  return {
+    ...state,
+    ...extra,
+    items: nextItems,
+    structureRevision: (Number(state.structureRevision) || 0) + 1,
+    streamingTail: preserveStreamingTail ? state.streamingTail : null
+  };
+}
+function createEngineItemMutators({ getState, set, itemIndexById }) {
+  const patchItem = (id, patch) => {
+    const state = getState();
+    let index = itemIndexById.get(id);
+    if (!Number.isInteger(index) || state.items[index]?.id !== id) {
+      index = state.items.findIndex((it) => it.id === id);
+      if (index >= 0) itemIndexById.set(id, index);
+    }
+    if (index < 0) return false;
+    const current = state.items[index];
+    let changed = false;
+    for (const [key, value] of Object.entries(patch || {})) {
+      if (!Object.is(current[key], value)) {
+        changed = true;
+        break;
+      }
+    }
+    if (!changed) return false;
+    const items = state.items.slice();
+    items[index] = { ...current, ...patch };
+    set({ items, structureRevision: (Number(state.structureRevision) || 0) + 1 });
+    return true;
+  };
+  const settleStreamingTail = (id, patch = {}, extra = {}) => {
+    const state = getState();
+    const tail = state.streamingTail?.id === id ? state.streamingTail : null;
+    if (!tail) return false;
+    let existingIndex = itemIndexById.get(id);
+    if (!Number.isInteger(existingIndex) || state.items[existingIndex]?.id !== id) {
+      existingIndex = state.items.findIndex((item2) => item2?.id === id);
+    }
+    if (existingIndex >= 0) return false;
+    const item = {
+      ...tail || {},
+      ...patch,
+      kind: "assistant",
+      id,
+      streaming: false
+    };
+    const index = state.items.length;
+    const items = [...state.items, item];
+    itemIndexById.set(id, index);
+    set({
+      items,
+      structureRevision: (Number(state.structureRevision) || 0) + 1,
+      streamingTail: null,
+      ...extra
+    });
+    return true;
+  };
+  return { patchItem, settleStreamingTail };
+}
 async function createEngineSession({
   provider: providerName,
   model,
@@ -26416,6 +26910,8 @@ async function createEngineSession({
   };
   let state = {
     items: [],
+    structureRevision: 0,
+    streamingTail: null,
     toasts: [],
     progressHint: null,
     busy: false,
@@ -26481,20 +26977,20 @@ async function createEngineSession({
     return true;
   };
   const itemIndexById = /* @__PURE__ */ new Map();
-  const replaceItems = (items) => {
+  const replaceItems = (items, { preserveStreamingTail = false } = {}) => {
     const nextItems = Array.isArray(items) ? items : [];
-    itemIndexById.clear();
-    for (let i = 0; i < nextItems.length; i++) {
-      const id = nextItems[i]?.id;
-      if (id != null) itemIndexById.set(id, i);
-    }
     activeToolCalls.clear();
-    state = {
-      ...state,
+    state = replaceEngineItemsState({
+      state,
       items: nextItems,
-      promptHistoryList: buildMergedPromptHistory(recomputePromptHistory(nextItems), loadPromptHistory(state.cwd)),
-      activeToolSummary: null
-    };
+      itemIndexById,
+      preserveStreamingTail,
+      extra: {
+        promptHistoryList: buildMergedPromptHistory(recomputePromptHistory(nextItems), loadPromptHistory(state.cwd)),
+        activeToolSummary: null
+      }
+    });
+    emit();
     return nextItems;
   };
   const activeToolCalls = /* @__PURE__ */ new Map();
@@ -26540,11 +27036,37 @@ async function createEngineSession({
     if (item?.id != null) itemIndexById.set(item.id, index);
     if (item?.kind === "user") {
       const promptHistoryList = buildMergedPromptHistory(recomputePromptHistory(items), loadPromptHistory(state.cwd));
-      set({ items, promptHistoryList });
+      set({ items, structureRevision: state.structureRevision + 1, promptHistoryList });
     } else {
-      set({ items });
+      set({ items, structureRevision: state.structureRevision + 1 });
     }
   };
+  const updateStreamingTail = (id, patch = {}, extra = {}) => {
+    if (id == null) return false;
+    const current = state.streamingTail?.id === id ? state.streamingTail : { kind: "assistant", id, text: "", streaming: true };
+    const next = { ...current, ...patch, kind: "assistant", id, streaming: true };
+    let changed = state.streamingTail !== current;
+    if (!changed) {
+      for (const [key, value] of Object.entries(next)) {
+        if (!Object.is(current[key], value)) {
+          changed = true;
+          break;
+        }
+      }
+    }
+    return set(changed ? { streamingTail: next, ...extra } : extra);
+  };
+  const clearStreamingTail = (id = null, extra = {}) => {
+    if (!state.streamingTail || id != null && state.streamingTail.id !== id) {
+      return set(extra);
+    }
+    return set({ streamingTail: null, ...extra });
+  };
+  const { patchItem, settleStreamingTail } = createEngineItemMutators({
+    getState: () => state,
+    set,
+    itemIndexById
+  });
   const upsertSyntheticToolItem = (text, id = nextId(), parsed = null) => {
     const synthetic = parseSyntheticAgentMessage(text);
     if (!synthetic) return false;
@@ -26579,6 +27101,59 @@ async function createEngineSession({
     if (origin === "user") appendPromptHistory(state.cwd, text);
     pushItem({ kind: "user", id, text });
   };
+  const pushAsyncAgentResponse = (text, id = nextId(), origin = "injected", metadata = {}) => {
+    const synthetic = parseSyntheticAgentMessage(text);
+    const isAgent = synthetic?.name === "agent";
+    if (!isAgent) return pushUserOrSyntheticItem(text, id, origin);
+    const responseHasBody = /\n\s*\n[\s\S]*\S/.test(String(text || ""));
+    const rawResult = synthetic.rawResult ?? text;
+    const args = {
+      ...synthetic.args && typeof synthetic.args === "object" ? synthetic.args : {},
+      type: "result"
+    };
+    const responseKey = String(metadata.responseKey || metadata.executionId || args.task_id || "").trim();
+    const previous = state.items.at(-1);
+    if (previous?.kind === "tool" && previous.agentDirection === "inbound") {
+      const patch = appendAgentResponseTail(previous, {
+        key: responseKey,
+        args,
+        result: synthetic.result,
+        rawResult,
+        hasBody: responseHasBody,
+        isError: synthetic.isError === true
+      });
+      if (patch) {
+        patchItem(previous.id, patch);
+        return true;
+      }
+    }
+    pushItem({
+      kind: "tool",
+      id,
+      name: "agent",
+      args,
+      result: synthetic.result,
+      rawResult,
+      isError: synthetic.isError === true,
+      expanded: false,
+      count: 1,
+      completedCount: 1,
+      startedAt: Date.now(),
+      completedAt: Date.now(),
+      agentDirection: "inbound",
+      agentResponseKey: responseKey,
+      agentResponseHasBody: responseHasBody,
+      agentResponseAggregate: false,
+      agentResponseEntries: [{
+        key: responseKey,
+        raw: String(rawResult ?? "").trim(),
+        result: synthetic.result,
+        hasBody: responseHasBody,
+        isError: synthetic.isError === true
+      }]
+    });
+    return true;
+  };
   const pushToast = (text, tone = "info", ttlMs = 3e3) => {
     const id = nextId();
     const value = String(text ?? "").trim();
@@ -26606,7 +27181,7 @@ async function createEngineSession({
     if (id == null) return false;
     const items = state.items.filter((it) => !(it?.kind === "notice" && it?.id === id));
     if (items.length === state.items.length) return false;
-    set({ items: replaceItems(items) });
+    set({ items: replaceItems(items, { preserveStreamingTail: true }) });
     return true;
   };
   const setProgressHint = (text, tone = "info") => {
@@ -26625,27 +27200,6 @@ async function createEngineSession({
     getDisposed: () => flags.disposed,
     timeoutMs: TOOL_APPROVAL_TIMEOUT_MS
   });
-  const patchItem = (id, patch) => {
-    let index = itemIndexById.get(id);
-    if (!Number.isInteger(index) || state.items[index]?.id !== id) {
-      index = state.items.findIndex((it) => it.id === id);
-      if (index >= 0) itemIndexById.set(id, index);
-    }
-    if (index < 0) return false;
-    const current = state.items[index];
-    let changed = false;
-    for (const [key, value] of Object.entries(patch || {})) {
-      if (!Object.is(current[key], value)) {
-        changed = true;
-        break;
-      }
-    }
-    if (!changed) return false;
-    const items = state.items.slice();
-    items[index] = { ...current, ...patch };
-    set({ items });
-    return true;
-  };
   const toastTimers = /* @__PURE__ */ new Set();
   lifecycle.runtimePulseTimer = setInterval(() => {
     if (flags.disposed) return;
@@ -26668,9 +27222,11 @@ async function createEngineSession({
     kickExecutionPendingResume,
     flushDeferredExecutionPendingResumeKick,
     scheduleExecutionPendingResumeKick,
+    discardExecutionPendingResume,
     updateAgentJobCard,
     buildAgentJobCardPatch,
-    subscribeRuntimeNotifications
+    subscribeRuntimeNotifications,
+    clearExecutionDedupState
   } = createAgentJobFeed({
     runtime,
     getState: () => state,
@@ -26681,11 +27237,13 @@ async function createEngineSession({
     enqueue: (...args) => bag.enqueue(...args),
     drain: (...args) => bag.drain(...args),
     pushUserOrSyntheticItem,
+    pushAsyncAgentResponse,
     makeQueueEntry: (...args) => bag.makeQueueEntry(...args),
     getPending: () => pending,
     agentStatusState,
     displayedExecutionNotificationKeys,
-    pushNotice
+    pushNotice,
+    itemIndexById
   });
   lifecycle.unsubscribeRuntimeNotifications = subscribeRuntimeNotifications();
   if (typeof runtime.onRemoteStateChange === "function") {
@@ -26704,7 +27262,8 @@ async function createEngineSession({
     markToolCallDone,
     updateAgentJobCard,
     buildAgentJobCardPatch,
-    agentStatusState
+    agentStatusState,
+    itemIndexById
   });
   Object.assign(bag, {
     runtime,
@@ -26716,6 +27275,7 @@ async function createEngineSession({
     pending,
     pendingNotificationKeys,
     displayedExecutionNotificationKeys,
+    clearExecutionDedupState,
     listeners,
     itemIndexById,
     getState: () => state,
@@ -26723,11 +27283,15 @@ async function createEngineSession({
     pushItem,
     patchItem,
     replaceItems,
+    updateStreamingTail,
+    settleStreamingTail,
+    clearStreamingTail,
     pushToast,
     pushNotice,
     removeNotice,
     setProgressHint,
     pushUserOrSyntheticItem,
+    pushAsyncAgentResponse,
     upsertSyntheticToolItem,
     markToolCallActive,
     markToolCallDone,
@@ -26744,9 +27308,11 @@ async function createEngineSession({
     requestToolApproval,
     patchToolCardResult,
     flushToolResults,
+    clearExecutionDedupState,
     kickExecutionPendingResume,
     flushDeferredExecutionPendingResumeKick,
     scheduleExecutionPendingResumeKick,
+    discardExecutionPendingResume,
     updateAgentJobCard,
     subscribeRuntimeNotifications
   });
@@ -27136,7 +27702,7 @@ function paintBootSplash() {
     const rows = Math.max(1, Number(process.stdout.rows) || 24);
     const windowsLikeTerminal = process.platform === "win32" || Boolean(process.env.WT_SESSION);
     const frameCols = Math.max(1, cols - (windowsLikeTerminal ? 1 : 0));
-    const center = (s) => `${" ".repeat(Math.max(0, Math.floor((frameCols - displayWidth(s)) / 2)))}${s}`;
+    const center = (s, reserve = 0) => `${" ".repeat(Math.max(0, Math.floor((frameCols - reserve - displayWidth(s)) / 2)))}${s}`;
     const logo = [
       "\u2588\u2588\u2588\u2557   \u2588\u2588\u2588\u2557\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 ",
       "\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D ",
@@ -27156,7 +27722,7 @@ function paintBootSplash() {
 `;
     }
     out += "\r\n";
-    out += `${subtleFg}${center(`mixdog coding agent \xB7 v${localPackageVersion()} \xB7 ${process.cwd()}`)}${reset}`;
+    out += `${subtleFg}${center(`mixdog coding agent \xB7 v${localPackageVersion()} \xB7 ${process.cwd()}`, 4)}${reset}`;
     out += "\x1B[H";
     process.stdout.write(out);
     return { stop: () => {