mixdog 0.9.35 → 0.9.37

package/src/tui/dist/index.mjs

@@ -6020,7 +6020,7 @@ function percent(value, total) {
 function percentLabel(value, total) {
   const pct = percent(value, total);
   if (pct === null) return "N/A";
-  return `${pct > 0 && pct < 1 ? pct.toFixed(1) : Math.round(pct)}%`;
+  return `${pct > 0 && pct < 1 ? pct.toFixed(1) : Math.floor(pct)}%`;
 }
 function usageColor(pct) {
   if (!Number.isFinite(Number(pct))) return theme.text;
@@ -10479,6 +10479,7 @@ function computeTranscriptItemVariantKey(item) {
     const count = Number(item.count ?? 0);
     const completed = item.completedCount === void 0 ? "u" : Number(item.completedCount);
     const errors = item.errorCount === void 0 ? "u" : Number(item.errorCount);
+    const callErrors = item.callErrorCount === void 0 ? "u" : Number(item.callErrorCount);
     const isError = item.isError ? 1 : 0;
     const normalizedName = String(normalizeToolName(item.name) || "").toLowerCase();
     const aggregate = item.aggregate ? 1 : 0;
@@ -10489,17 +10490,28 @@ function computeTranscriptItemVariantKey(item) {
     const bgPrompt = textShapeFingerprint(bgArgs.prompt);
     const bgMessage = textShapeFingerprint(bgArgs.message);
     const bgError = textShapeFingerprint(bgArgs.error);
-    return `x${expanded}:n${normalizedName}:g${aggregate}:r${resultShape}:R${rawShape}:c${count}:d${completed}:e${errors}:E${isError}:bt${bgType}:bs${bgStatus}:bk${bgTaskId}:bp${bgPrompt}:bm${bgMessage}:be${bgError}`;
+    return `x${expanded}:n${normalizedName}:g${aggregate}:r${resultShape}:R${rawShape}:c${count}:d${completed}:e${errors}:ce${callErrors}:E${isError}:bt${bgType}:bs${bgStatus}:bk${bgTaskId}:bp${bgPrompt}:bm${bgMessage}:be${bgError}`;
   }
   return `x${expanded}:s${textShapeFingerprint(item.text ?? item.result ?? "")}`;
 }
 var transcriptRowsCache = /* @__PURE__ */ new WeakMap();
 var transcriptMeasuredRowsCache = /* @__PURE__ */ new WeakMap();
 var streamingMeasuredRowsById = /* @__PURE__ */ new Map();
+var streamingEstimateHighWaterById = /* @__PURE__ */ new Map();
+function hasStreamingRowStateToPrune() {
+  return streamingMeasuredRowsById.size > 0 || streamingEstimateHighWaterById.size > 0;
+}
 function pruneStreamingMeasuredRowsById(liveIds) {
-  if (!liveIds || streamingMeasuredRowsById.size === 0) return;
-  for (const id of streamingMeasuredRowsById.keys()) {
-    if (!liveIds.has(id)) streamingMeasuredRowsById.delete(id);
+  if (!liveIds) return;
+  if (streamingMeasuredRowsById.size > 0) {
+    for (const id of streamingMeasuredRowsById.keys()) {
+      if (!liveIds.has(id)) streamingMeasuredRowsById.delete(id);
+    }
+  }
+  if (streamingEstimateHighWaterById.size > 0) {
+    for (const id of streamingEstimateHighWaterById.keys()) {
+      if (!liveIds.has(id)) streamingEstimateHighWaterById.delete(id);
+    }
   }
 }
 function carryTranscriptMeasuredRowsCache(prevItem, nextItem) {
@@ -10534,7 +10546,17 @@ function streamingEstimateRows(item, columns, toolOutputExpanded) {
   const trimmedText = assistantTextForStreamingRowEstimate(item.text);
   const estimateItem = trimmedText === item.text ? item : { ...item, text: trimmedText };
   const raw = Math.max(1, Math.ceil(estimateTranscriptItemRows(estimateItem, columns, toolOutputExpanded)));
-  return Math.ceil(raw / STREAMING_ROW_QUANTUM) * STREAMING_ROW_QUANTUM;
+  const quantized = Math.ceil(raw / STREAMING_ROW_QUANTUM) * STREAMING_ROW_QUANTUM;
+  const id = item?.id;
+  if (id == null) return quantized;
+  const toolExpanded = toolOutputExpanded ? 1 : 0;
+  const prev = streamingEstimateHighWaterById.get(id);
+  if (!prev || prev.columns !== columns || prev.toolExpanded !== toolExpanded) {
+    streamingEstimateHighWaterById.set(id, { rows: quantized, columns, toolExpanded });
+    return quantized;
+  }
+  if (quantized > prev.rows) prev.rows = quantized;
+  return prev.rows;
 }
 function streamingTailMountedGrowth(items, columns, toolOutputExpanded) {
   const list = Array.isArray(items) ? items : [];
@@ -10563,11 +10585,15 @@ function estimateTranscriptItemRowsCached(item, columns, toolOutputExpanded) {
       }
       return idEntry.rows;
     }
-    if (idEntry) streamingMeasuredRowsById.delete(item.id);
+    if (idEntry) {
+      streamingMeasuredRowsById.delete(item.id);
+      streamingEstimateHighWaterById.delete(item.id);
+    }
     return streamingEstimateRows(item, columns, toolOutputExpanded);
   }
-  if (item.kind === "assistant" && streamingMeasuredRowsById.has(item.id)) {
-    streamingMeasuredRowsById.delete(item.id);
+  if (item.kind === "assistant") {
+    if (streamingMeasuredRowsById.has(item.id)) streamingMeasuredRowsById.delete(item.id);
+    if (streamingEstimateHighWaterById.has(item.id)) streamingEstimateHighWaterById.delete(item.id);
   }
   const variantKey = transcriptItemVariantKey(item);
   const toolExpanded = toolOutputExpanded ? 1 : 0;
@@ -11999,7 +12025,7 @@ function useTranscriptWindow({
         if (!els.has(key)) refCache.delete(key);
       }
     }
-    if (streamingMeasuredRowsById.size > 0) {
+    if (hasStreamingRowStateToPrune()) {
       pruneStreamingMeasuredRowsById(new Set(liveItems.keys()));
     }
   });
@@ -14269,7 +14295,7 @@ function createOnboardingSteps({
 }
 
 // src/runtime/shared/config.mjs
-import { readFileSync as readFileSync5, mkdirSync as mkdirSync5, existsSync as existsSync6 } from "fs";
+import { readFileSync as readFileSync5, statSync as statSync4, mkdirSync as mkdirSync5, existsSync as existsSync6 } from "fs";
 import { join as join6, dirname as dirname6 } from "path";
 import { createRequire as createRequire2 } from "module";
 
@@ -14986,6 +15012,56 @@ var { getSecret: _getSecret, setSecret: _setSecret, deleteSecret: _deleteSecret,
 var DATA_DIR = resolvePluginData();
 var CONFIG_PATH = join6(DATA_DIR, "mixdog-config.json");
 var GENERATED_KEY = "_generated";
+var _configReadCache = null;
+var CONFIG_READ_TTL_MS = (() => {
+  const n = Number(process.env.MIXDOG_CONFIG_READ_TTL_MS);
+  return Number.isFinite(n) && n >= 0 ? n : 0;
+})();
+function invalidateConfigReadCache() {
+  _configReadCache = null;
+}
+function readConfigRawCached() {
+  const now = Date.now();
+  if (_configReadCache) {
+    if (CONFIG_READ_TTL_MS > 0 && now - _configReadCache.atMs < CONFIG_READ_TTL_MS) {
+      return _configReadCache.raw;
+    }
+    try {
+      const st2 = statSync4(CONFIG_PATH);
+      if (st2.mtimeMs === _configReadCache.mtimeMs && st2.size === _configReadCache.size) {
+        _configReadCache.atMs = now;
+        return _configReadCache.raw;
+      }
+    } catch {
+    }
+  }
+  let st = null;
+  try {
+    st = statSync4(CONFIG_PATH);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      _configReadCache = null;
+      return null;
+    }
+    process.stderr.write(`[config] readConfigRawCached: unexpected stat error for ${CONFIG_PATH}: ${err.message}
+`);
+    throw err;
+  }
+  let raw;
+  try {
+    raw = readFileSync5(CONFIG_PATH, "utf8");
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      _configReadCache = null;
+      return null;
+    }
+    process.stderr.write(`[config] readJsonFile: unexpected read error for ${CONFIG_PATH}: ${err.message}
+`);
+    throw err;
+  }
+  _configReadCache = { raw, mtimeMs: st.mtimeMs, size: st.size, atMs: now };
+  return raw;
+}
 function isPlainObject2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -14996,18 +15072,24 @@ function stripGeneratedMarker(data) {
 }
 function readJsonFile(path2) {
   let raw;
-  try {
-    raw = readFileSync5(path2, "utf8");
-  } catch (err) {
-    if (err.code === "ENOENT") return null;
-    process.stderr.write(`[config] readJsonFile: unexpected read error for ${path2}: ${err.message}
+  if (path2 === CONFIG_PATH) {
+    raw = readConfigRawCached();
+  } else {
+    try {
+      raw = readFileSync5(path2, "utf8");
+    } catch (err) {
+      if (err.code === "ENOENT") return null;
+      process.stderr.write(`[config] readJsonFile: unexpected read error for ${path2}: ${err.message}
 `);
-    throw err;
+      throw err;
+    }
   }
+  if (raw == null) return null;
   try {
     return JSON.parse(raw);
   } catch (err) {
     if (path2 === CONFIG_PATH) {
+      invalidateConfigReadCache();
       const corrupt = `${path2}.corrupt-${Date.now()}`;
       try {
         renameWithRetrySync(path2, corrupt);
@@ -15029,6 +15111,7 @@ function writeJsonFile(path2, data) {
   }
   writeJsonAtomicSync(path2, data, { lock: false, fsyncDir: true, mode: 384, secret: true });
   if (path2 === CONFIG_PATH) {
+    invalidateConfigReadCache();
     try {
       markUserDataInitialized(DATA_DIR);
     } catch {
@@ -18879,12 +18962,12 @@ 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, failedCount, terminalStatus = "" }) {
+function toolStatusColor({ pending, groupCount, callFailedCount = 0, terminalStatus = "" }) {
   if (pending) return theme.text;
   const status = normalizeTerminalStatus(terminalStatus);
   if (status === "cancelled") return theme.warning;
-  if (failedCount <= 0) return status === "failed" ? theme.error : theme.success;
-  if (groupCount > 1 && failedCount < groupCount) return theme.mixdogOrange || theme.warning;
+  if (callFailedCount <= 0) return theme.success;
+  if (groupCount > 1 && callFailedCount < groupCount) return theme.mixdogOrange || theme.warning;
   return theme.error;
 }
 
@@ -18911,13 +18994,12 @@ function ResultBody({ lines, rawText, pathArg = "", isShell = false, columns, co
 // src/tui/components/ToolExecution.jsx
 import { jsx as jsx16, jsxs as jsxs12 } from "react/jsx-runtime";
 var TOOL_BLINK_MS = 500;
-var TOOL_BLINK_LIMIT_MS = 3e3;
 var TOOL_PENDING_SHOW_DELAY_MS = 1e3;
 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, 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, expanded, columns = 80, attached = false, count = 1, completedCount = 0, startedAt = 0, completedAt = 0, aggregate = false, categories = {}, doneCategories = null, headerFinalized = true, deferredDisplayReady = 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))));
@@ -18933,14 +19015,14 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
   const hasVisibleProgress = doneCount > 0 || Boolean(String(rt || "").trim());
   const pendingDisplayReady = !pending || !startedAtMs || pendingDelayElapsed || pendingAgeMs >= TOOL_PENDING_SHOW_DELAY_MS || hasVisibleProgress || deferredDisplayReady;
   const blinkActive = pending && pendingDisplayReady;
-  const blinkExpired = blinkActive && startedAtMs > 0 && nowMs - startedAtMs >= TOOL_BLINK_LIMIT_MS;
-  const blinkOn = !blinkActive || blinkExpired ? true : Math.floor(nowMs / TOOL_BLINK_MS) % 2 === 0;
+  const blinkOn = !blinkActive ? true : Math.floor(nowMs / TOOL_BLINK_MS) % 2 === 0;
   const headerPending = pending || headerFinalized === false;
   const hasResult = result != null && Boolean(String(rt || "").trim());
   const hasRawResult = rawResult != null && Boolean(String(rawRt || "").trim());
   const elapsedMs = startedAtMs ? Math.max(0, (pending ? nowMs : completedAtMs || nowMs) - startedAtMs) : 0;
   const elapsed = elapsedMs >= 1e3 ? formatElapsed(elapsedMs) : "";
   const failedCount = clampFailureCount(errorCount, groupCount, isError);
+  const callFailedCount = clampFailureCount(callErrorCount, groupCount, false);
   const displayGroupCount = groupCount;
   const displayCategories = normalizeCountMap(categories || {});
   const normalizedDoneCategories = doneCategories ? normalizeCountMap(doneCategories) : displayCategories;
@@ -18966,8 +19048,8 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
       detailText = "";
     }
     const aggregateTerminalStatus = pending ? "running" : resultTerminalStatus(rt) || (isError || failedCount > 0 ? "failed" : "completed");
-    const dotColor2 = toolStatusColor({ pending, groupCount, failedCount, terminalStatus: aggregateTerminalStatus });
-    const dotText2 = pending && !blinkExpired && !blinkOn ? " " : TURN_MARKER;
+    const dotColor2 = toolStatusColor({ pending, groupCount, callFailedCount, terminalStatus: aggregateTerminalStatus });
+    const dotText2 = pending && !blinkOn ? " " : TURN_MARKER;
     const gutter2 = 2;
     const showHeaderExpandHint2 = hasRawResult;
     const hintLabel2 = `ctrl+o ${expanded ? "collapse" : "expand"}`;
@@ -19066,12 +19148,12 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
     const keepAgentDetail = (isError || agentFailureText) && !(agentHeaderFailure && !agentSurfaceBrief);
     visibleDetailLines = keepAgentDetail ? [agentDetailLine] : [];
   }
-  const finalStatusColor = toolStatusColor({ pending, groupCount, failedCount, terminalStatus });
+  const finalStatusColor = toolStatusColor({ pending, groupCount, callFailedCount, 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 && !blinkExpired && !blinkOn ? " " : markerText;
+  const dotText = pending && !blinkOn ? " " : markerText;
   let labelText;
   if (isAgentResponse) labelText = agentResponseTitle(parsedArgs);
   else if (isBackgroundResponse) labelText = backgroundTaskResultTitle(normalizedName, backgroundMeta || parsedArgs);
@@ -19282,7 +19364,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, 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, themeEpoch });
+      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 });
       break;
     }
     case "notice":
@@ -20339,7 +20421,8 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
       const n = Number(value || 0);
       const d = Number(total || 0);
       if (!d) return "N/A";
-      return `${(n / d * 100).toFixed(n > 0 && n < d / 100 ? 1 : 0)}%`;
+      const p = Math.max(0, Math.min(100, n / d * 100));
+      return `${p > 0 && p < 1 ? p.toFixed(1) : Math.floor(p)}%`;
     };
     const fmt = (value) => {
       const n = Number(value || 0);
@@ -20941,11 +21024,11 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
       }
     }
     if (!commandText) return false;
-    if (state.commandBusy) {
-      store.pushNotice("wait for the current command to finish", "warn");
-      return false;
-    }
     if (commandText.startsWith("/")) {
+      if (state.commandBusy) {
+        store.pushNotice("wait for the current command to finish", "warn");
+        return false;
+      }
       const [cmd, ...rest] = commandText.slice(1).split(/\s+/);
       const accepted2 = runSlashCommand(cmd, rest.join(" ").trim());
       if (accepted2 !== false) clearPastedImagesSnapshot();
@@ -22702,7 +22785,7 @@ function resolveTuiRuntimeNotificationDelivery(event, text) {
   if (meta.kind === "update-notice") {
     const ver = String(meta.version || "").trim();
     const displayText = ver ? `mixdog v${ver} ready \u2014 restart to apply.` : trimmed;
-    return { action: "notice", displayText, tone: meta.tone === "warn" ? "warn" : "info" };
+    return { action: "notice", displayText, tone: meta.tone === "warn" ? "warn" : "info", transcript: false };
   }
   if (!isExecutionNotification(event, trimmed, parsed)) {
     return { action: "enqueue", displayText: trimmed, modelContent: trimmed };
@@ -22719,9 +22802,68 @@ function resolveTuiRuntimeNotificationDelivery(event, text) {
 }
 
 // src/tui/engine/render-timing.mjs
-var RENDER_THROTTLE_FLUSH_MS = 12;
-var yieldToRenderer = () => new Promise((resolve5) => {
-  setTimeout(resolve5, RENDER_THROTTLE_FLUSH_MS);
+var RENDER_ACK_HANG_GUARD_MS = 250;
+var RENDER_SETTLE_IDLE_MS = 64;
+var pendingRenderAcks = [];
+var renderAckSeq = 0;
+var scheduleRenderFrameAck = () => {
+  const seq = ++renderAckSeq;
+  setImmediate(() => notifyRenderFrame(seq));
+};
+var notifyRenderFrame = (seq = ++renderAckSeq) => {
+  if (pendingRenderAcks.length === 0) return;
+  const acks = pendingRenderAcks;
+  pendingRenderAcks = [];
+  for (const ack of acks) ack(seq);
+};
+var yieldToRenderer = ({ frames = 1 } = {}) => new Promise((resolve5) => {
+  const minSeq = renderAckSeq;
+  let remainingFrames = Math.max(1, Math.floor(Number(frames) || 1));
+  let settled = false;
+  let sawRealFrame = false;
+  let timer2 = null;
+  const finish = () => {
+    if (settled) return;
+    settled = true;
+    if (timer2) clearTimeout(timer2);
+    const idx = pendingRenderAcks.indexOf(onFrame);
+    if (idx !== -1) pendingRenderAcks.splice(idx, 1);
+    resolve5();
+  };
+  const onTimeout = () => {
+    if (settled) return;
+    if (!sawRealFrame && renderAckSeq > minSeq) {
+      setImmediate(() => {
+        if (!settled && !sawRealFrame) finish();
+      });
+      return;
+    }
+    finish();
+  };
+  const armWait = () => {
+    if (settled) return;
+    if (!pendingRenderAcks.includes(onFrame)) pendingRenderAcks.push(onFrame);
+    if (timer2) clearTimeout(timer2);
+    timer2 = setTimeout(onTimeout, sawRealFrame ? RENDER_SETTLE_IDLE_MS : RENDER_ACK_HANG_GUARD_MS);
+  };
+  const onFrame = (seq = 0) => {
+    if (settled) return;
+    if (seq <= minSeq) {
+      if (!pendingRenderAcks.includes(onFrame)) pendingRenderAcks.push(onFrame);
+      return;
+    }
+    sawRealFrame = true;
+    if (timer2) {
+      clearTimeout(timer2);
+      timer2 = null;
+    }
+    const idx = pendingRenderAcks.indexOf(onFrame);
+    if (idx !== -1) pendingRenderAcks.splice(idx, 1);
+    remainingFrames -= 1;
+    if (remainingFrames <= 0) finish();
+    else armWait();
+  };
+  armWait();
 });
 
 // src/tui/engine/tool-result-status.mjs
@@ -22920,6 +23062,7 @@ function createToolCardResults({
   patchItem,
   markToolCallDone,
   updateAgentJobCard,
+  buildAgentJobCardPatch,
   agentStatusState
 }) {
   function patchToolItem(id, patch) {
@@ -22940,7 +23083,9 @@ function createToolCardResults({
     const aggregate = card.aggregate;
     const callRec = aggregate && callId ? aggregate.calls.get(callId) : null;
     const isMemoryCall = classifyToolCategory(callRec?.name || card?.name || "", callRec?.args || {}) === "Memory";
-    const isError = message?.isError === true || message?.toolKind === "error" || /^\s*\[?error/i.test(rawText) || isErrorToolStatus(toolResultStatus(rawText)) || isMemoryCall && memoryCoreResultErrorText(rawText) != null;
+    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 text = isError ? toolErrorDisplay(rawText, card?.name || "tool") : rawText;
     if (aggregate && card.itemId === aggregate.itemId) {
       if (!callRec) return false;
@@ -22952,11 +23097,13 @@ function createToolCardResults({
       callRec.summary = !isError ? summarizeToolResult(callRec.name, callRec.args, rawText, isError) : null;
       assignAggregateSummaryOrder(aggregate, callRec);
       callRec.isError = isError;
+      callRec.isCallError = isCallError;
       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);
@@ -22970,6 +23117,7 @@ function createToolCardResults({
         rawResult: rawResult || null,
         isError: errors > 0,
         errorCount: errors,
+        callErrorCount: callErrors,
         count: allCalls.length,
         completedCount: visualCompleted,
         doneCategories: aggregateDoneCategories(allCalls),
@@ -22979,9 +23127,10 @@ function createToolCardResults({
       if (callId) done.add(callId);
       return true;
     }
-    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, callErrors: 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 });
     toolGroups.set(card.itemId, group);
     const resultText = groupedToolResultText(group);
@@ -22991,6 +23140,7 @@ function createToolCardResults({
       text: displayResult,
       isError: group.errors > 0,
       errorCount: group.errors,
+      callErrorCount: group.callErrors || 0,
       count: group.count,
       completedCount: group.completed,
       completedAt: Date.now()
@@ -23000,19 +23150,11 @@ function createToolCardResults({
       if (body) patch.rawResult = text || rawText;
       const parsedAgent = parseAgentJob(rawText);
       if (parsedAgent) {
-        patch.args = agentArgsWithResultMetadata(getState().items.find((it) => it.id === card.itemId)?.args, parsedAgent);
         set(agentStatusState({ force: true }));
       }
+      Object.assign(patch, buildAgentJobCardPatch(card.itemId, rawText, isError));
     }
     patchToolItem(card.itemId, patch);
-    if (group.count <= 1) {
-      const beforeAgent = getState().items.find((it) => it.id === card.itemId);
-      updateAgentJobCard(card.itemId, rawText, isError);
-      const afterAgent = getState().items.find((it) => it.id === card.itemId);
-      if (afterAgent && beforeAgent && afterAgent !== beforeAgent) {
-        carryTranscriptMeasuredRowsCache(beforeAgent, afterAgent);
-      }
-    }
     card.done = true;
     if (callId) done.add(callId);
     return true;
@@ -23060,6 +23202,7 @@ function createToolCardResults({
         const completed = allCalls.filter((r) => r.resolved).length;
         const totalCompleted = completed;
         const errors = allCalls.filter((r) => r.isError).length;
+        const callErrors = allCalls.filter((r) => r.isCallError).length;
         const succeeded = completed - errors;
         const rawResult = aggregateRawResult(allCalls);
         let displayDetail = errors > 0 ? succeeded > 0 ? `${succeeded} Ok \xB7 ${errors} Failed` : `${errors} Failed` : formatAggregateDetail(aggregateSummaries(aggregate));
@@ -23073,6 +23216,7 @@ function createToolCardResults({
           rawResult: rawResult || null,
           isError: errors > 0,
           errorCount: errors,
+          callErrorCount: callErrors,
           count: allCalls.length,
           completedCount: totalCompleted,
           doneCategories: aggregateDoneCategories(allCalls),
@@ -23093,7 +23237,7 @@ function createToolCardResults({
         const currentItem = getState().items.find((it) => it.id === card.itemId);
         resultText = withCancelledResultMarker(resultText, currentItem);
       }
-      patchToolItem(card.itemId, { result: resultText, text: resultText, isError: group.errors > 0, errorCount: group.errors, 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, count: group.count, completedCount: group.completed, completedAt: Date.now() });
       card.done = true;
       if (card.callId) done.add(card.callId);
     }
@@ -23153,18 +23297,21 @@ function createAgentJobFeed({
   function scheduleExecutionPendingResumeKick(body = "") {
     queueMicrotask(() => kickExecutionPendingResume(body));
   }
-  function updateAgentJobCard(itemId, text, isError = false) {
+  function buildAgentJobCardPatch(itemId, text, isError = false) {
     const parsed = parseAgentJob(text);
     const current = getState().items.find((it) => it.id === itemId);
     const rawDisplayText = agentJobResultText(text, parsed) || String(text ?? "").trim();
     const displayText = isError ? toolErrorDisplay(rawDisplayText, "agent") : rawDisplayText;
-    patchItem(itemId, {
+    return {
       result: displayText,
       text: displayText,
       isError,
       errorCount: isError ? 1 : 0,
       ...parsed ? { args: agentArgsWithResultMetadata(current?.args, parsed) } : {}
-    });
+    };
+  }
+  function updateAgentJobCard(itemId, text, isError = false) {
+    patchItem(itemId, buildAgentJobCardPatch(itemId, text, isError));
   }
   function subscribeRuntimeNotifications() {
     if (typeof runtime.onNotification !== "function") return null;
@@ -23177,7 +23324,7 @@ function createAgentJobFeed({
       const delivery = resolveTuiRuntimeNotificationDelivery(event, text);
       if (delivery.action === "ignore") return;
       if (delivery.action === "notice") {
-        pushNotice?.(delivery.displayText, delivery.tone || "info", { transcript: true });
+        pushNotice?.(delivery.displayText, delivery.tone || "info", { transcript: delivery.transcript === true });
         return true;
       }
       if (delivery.action === "status-only") {
@@ -23193,7 +23340,15 @@ function createAgentJobFeed({
         if (parsed?.taskId) set(agentStatusState({ force: true }));
         const resumeBody = String(delivery.modelContent || "").trim();
         if (resumeBody) {
-          scheduleExecutionPendingResumeKick(resumeBody);
+          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,
+            displayText: delivery.displayText || text
+          });
         }
         return true;
       }
@@ -23205,7 +23360,9 @@ function createAgentJobFeed({
       if (!modelContent && imagePaths.length === 0) return true;
       const enqueueOpts = {
         mode: "task-notification",
-        priority: "next",
+        // Claude Code parity: task/schedule notifications are lower-priority
+        // queue items and drain between turns, behind direct user input.
+        priority: "later",
         key: notificationKey || void 0,
         displayText: delivery.displayText || text
       };
@@ -23241,6 +23398,7 @@ function createAgentJobFeed({
     flushDeferredExecutionPendingResumeKick,
     scheduleExecutionPendingResumeKick,
     updateAgentJobCard,
+    buildAgentJobCardPatch,
     subscribeRuntimeNotifications
   };
 }
@@ -23461,11 +23619,13 @@ function createContextState({ runtime, getState, getPendingSessionReset }) {
   });
   const routeState = () => {
     const state = getState();
+    const base = baseRouteState();
+    const sameContextRoute = state.sessionId === base.sessionId && state.clientHostPid === base.clientHostPid && state.provider === base.provider && state.model === base.model && state.effort === base.effort && state.fast === base.fast && state.contextWindow === base.contextWindow && state.rawContextWindow === base.rawContextWindow;
     return {
-      ...baseRouteState(),
-      displayContextWindow: state.displayContextWindow || 0,
-      compactBoundaryTokens: state.compactBoundaryTokens || 0,
-      autoCompactTokenLimit: state.autoCompactTokenLimit || 0
+      ...base,
+      displayContextWindow: sameContextRoute ? state.displayContextWindow || 0 : 0,
+      compactBoundaryTokens: sameContextRoute ? state.compactBoundaryTokens || 0 : 0,
+      autoCompactTokenLimit: sameContextRoute ? state.autoCompactTokenLimit || 0 : 0
     };
   };
   function syncContextDisplayFields(ctx = null) {
@@ -23617,9 +23777,6 @@ function createSessionFlow(bag) {
   }
   function removeQueuedEntries(entries) {
     const ids = new Set(entries.map((entry) => entry.id));
-    const keys = entries.map((entry) => entry.key).filter(Boolean);
-    for (const key of keys) pendingNotificationKeys.delete(key);
-    for (const key of keys) displayedExecutionNotificationKeys.delete(key);
     const queued = getState().queued.filter((q) => !ids.has(q.id));
     if (queued.length !== getState().queued.length) set({ queued });
   }
@@ -23632,8 +23789,9 @@ function createSessionFlow(bag) {
         displayText: entry.displayText || (entry.mode === "task-notification" ? notificationDisplayText(entry.text) : String(entry.text || ""))
       };
       if (next.mode === "task-notification" && next.key) {
-        if (pendingNotificationKeys.has(next.key)) continue;
-        pendingNotificationKeys.add(next.key);
+        const duplicateQueued = pending.some((entry2) => entry2?.mode === "task-notification" && entry2?.key === next.key);
+        if (duplicateQueued) continue;
+        if (!pendingNotificationKeys.has(next.key)) pendingNotificationKeys.add(next.key);
       }
       restored.push(next);
     }
@@ -23674,14 +23832,49 @@ function createSessionFlow(bag) {
     removeQueuedEntries(batch);
     return batch;
   }
+  function scheduleBlockedDrainRetry() {
+    if (pending.length === 0) return;
+    if (flags.blockedDrainRetryTimer) return;
+    const timer2 = setTimeout(() => {
+      flags.blockedDrainRetryTimer = null;
+      if (pending.length > 0) void drain();
+    }, 50);
+    if (typeof timer2.unref === "function") timer2.unref();
+    flags.blockedDrainRetryTimer = timer2;
+  }
+  function clearBlockedDrainRetry() {
+    if (!flags.blockedDrainRetryTimer) return;
+    clearTimeout(flags.blockedDrainRetryTimer);
+    flags.blockedDrainRetryTimer = null;
+  }
+  function hasModelDrainablePending() {
+    return pending.some((entry) => !isSlashQueuedEntry(entry));
+  }
   async function drain() {
     if (flags.draining) return;
-    if (flags.autoClearRunning) return;
+    if (flags.autoClearRunning || getState().commandBusy) {
+      scheduleBlockedDrainRetry();
+      return;
+    }
+    if (getState().busy) {
+      tuiDebug2(`busy-queue drain deferred while active pending=${pending.length}`);
+      return;
+    }
+    clearBlockedDrainRetry();
+    const drainEpoch = (Number(flags.drainEpoch) || 0) + 1;
+    flags.drainEpoch = drainEpoch;
     flags.draining = true;
     let firstBatch = true;
     try {
       while (pending.length > 0) {
-        const batch = dequeueQueueBatch("later", { limit: firstBatch ? 1 : Infinity });
+        if (flags.drainEpoch !== drainEpoch) return;
+        const batch = dequeueQueueBatch("later", {
+          limit: firstBatch ? 1 : Infinity,
+          // Slash commands must run through the TUI command dispatcher, not be
+          // delivered to the model as plain text. Claude Code's queueProcessor
+          // similarly handles slash entries outside the queued_command drain.
+          predicate: (entry) => !isSlashQueuedEntry(entry)
+        });
         firstBatch = false;
         if (batch.length === 0) break;
         tuiDebug2(`busy-queue drain batch=${batch.length} remaining=${pending.length}`);
@@ -23703,6 +23896,7 @@ function createSessionFlow(bag) {
           restorable: nonEditable.length === 0,
           requeueOnAbort: nonEditable
         });
+        if (flags.drainEpoch !== drainEpoch) return;
         flushDeferredClearedSessionUi();
         const scheduledReset = runtime.consumePendingSessionReset?.();
         if ((scheduledReset === "clear" || scheduledReset === "compact_clear") && turnStatus !== "cancelled" && !getState().commandBusy) {
@@ -23717,10 +23911,12 @@ function createSessionFlow(bag) {
         if (turnStatus === "cancelled" && pending.length === 0) break;
       }
     } finally {
-      flags.draining = false;
-      flushDeferredClearedSessionUi();
-      if (pending.length > 0) void drain();
-      else flushDeferredExecutionPendingResumeKick();
+      if (flags.drainEpoch === drainEpoch) {
+        flags.draining = false;
+        flushDeferredClearedSessionUi();
+        if (hasModelDrainablePending()) void drain();
+        else flushDeferredExecutionPendingResumeKick();
+      }
     }
   }
   function enqueue(text, options = {}) {
@@ -23738,11 +23934,17 @@ function createSessionFlow(bag) {
     void drain();
     return true;
   }
-  function drainPendingSteering() {
-    const predicate = (entry) => !isSlashQueuedEntry(entry);
+  function drainPendingSteering(_sessionIdOrOptions = null, maybeOptions = null) {
+    const options = maybeOptions && typeof maybeOptions === "object" ? maybeOptions : _sessionIdOrOptions && typeof _sessionIdOrOptions === "object" ? _sessionIdOrOptions : {};
+    const maxPriority = options.maxPriority || "next";
+    const predicate = (entry) => {
+      if (isSlashQueuedEntry(entry)) return false;
+      const mode = entry?.mode || "prompt";
+      return mode === "prompt" || mode === "task-notification";
+    };
     const out = [];
     for (; ; ) {
-      const batch = dequeueQueueBatch("later", { predicate });
+      const batch = dequeueQueueBatch(maxPriority, { predicate });
       if (batch.length === 0) break;
       for (const entry of batch) {
         const content = entry.content;
@@ -24019,6 +24221,7 @@ function createRunTurn(bag) {
     const turnIndex = getState().stats.turns || 0;
     const startedAt = Date.now();
     const turnEpoch = ++flags.leadTurnEpoch;
+    const isCurrentTurn = () => !flags.disposed && flags.leadTurnEpoch === turnEpoch;
     const inputBaseline = getState().stats.inputTokens;
     const outputBaseline = getState().stats.outputTokens;
     const submittedIds = Array.isArray(options.submittedIds) ? options.submittedIds : [];
@@ -24042,6 +24245,8 @@ function createRunTurn(bag) {
     let watchdogTripped = false;
     let watchdogTimer = null;
     let watchdogGraceTimer = null;
+    let lastProgressAt = startedAt;
+    let lastProgressLabel = "start";
     const clearWatchdog = () => {
       if (watchdogTimer) {
         clearTimeout(watchdogTimer);
@@ -24052,31 +24257,67 @@ function createRunTurn(bag) {
         watchdogGraceTimer = null;
       }
     };
-    watchdogTimer = setTimeout(() => {
-      if (flags.disposed) return;
-      watchdogTripped = true;
-      const elapsed = Date.now() - startedAt;
-      tuiDebug2(`runTurn WATCHDOG TRIP turn=${turnIndex} elapsedMs=${elapsed} \u2014 aborting stuck turn`);
-      pushNotice(`Turn timed out after ${Math.round(elapsed / 1e3)}s \u2014 aborting stuck request. Input is available again.`, "warn", { transcript: true });
-      try {
-        runtime.abort("cli-react-abort-watchdog");
-      } catch {
+    const armWatchdog = () => {
+      if (watchdogTimer) {
+        clearTimeout(watchdogTimer);
+        watchdogTimer = null;
       }
-      watchdogGraceTimer = setTimeout(() => {
-        if (flags.disposed) return;
-        if (!getState().busy) return;
-        if (flags.leadTurnEpoch !== turnEpoch) return;
-        tuiDebug2(`runTurn WATCHDOG FORCE-RELEASE turn=${turnIndex} \u2014 abort unwind starved`);
-        flags.leadTurnEpoch++;
-        set({ busy: false, spinner: null, thinking: null, lastTurn: null });
-        flags.activePromptRestore = null;
-        if (flags.draining) flags.draining = false;
-        if (pending.length > 0) void drain();
-        flushDeferredExecutionPendingResumeKick();
-      }, 5e3);
-      watchdogGraceTimer.unref?.();
-    }, LEAD_TURN_TIMEOUT_MS2);
-    watchdogTimer.unref?.();
+      if (watchdogTripped) return;
+      const remaining = Math.max(1, LEAD_TURN_TIMEOUT_MS2 - Math.max(0, Date.now() - lastProgressAt));
+      watchdogTimer = setTimeout(() => {
+        if (!isCurrentTurn()) return;
+        if (watchdogTripped) return;
+        const idleMs = Date.now() - lastProgressAt;
+        if (idleMs < LEAD_TURN_TIMEOUT_MS2) {
+          armWatchdog();
+          return;
+        }
+        watchdogTripped = true;
+        if (_batchTimer !== null) {
+          clearTimeout(_batchTimer);
+          _batchTimer = null;
+        }
+        _pendingTextFlush = false;
+        _pendingThinkFlush = false;
+        _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 });
+        try {
+          runtime.abort("cli-react-abort-watchdog");
+        } catch {
+        }
+        watchdogGraceTimer = setTimeout(() => {
+          if (flags.disposed) return;
+          if (!getState().busy) return;
+          if (flags.leadTurnEpoch !== turnEpoch) return;
+          tuiDebug2(`runTurn WATCHDOG FORCE-RELEASE turn=${turnIndex} \u2014 abort unwind starved`);
+          denyAllToolApprovals("turn timed out");
+          clearActiveToolSummary();
+          flushToolResults([], toolCards, cardByCallId, toolGroups, resultsDone, { finalize: true, cancelled: true });
+          finalizeToolHeaders();
+          clearDeferredTimers();
+          flags.flushDeferredBeforeImmediatePush = null;
+          flags.leadTurnEpoch++;
+          set({ busy: false, spinner: null, thinking: null, lastTurn: null });
+          flags.activePromptRestore = null;
+          if (flags.draining) flags.draining = false;
+          if (pending.length > 0) void drain();
+          flushDeferredExecutionPendingResumeKick();
+        }, 5e3);
+        watchdogGraceTimer.unref?.();
+      }, remaining);
+      watchdogTimer.unref?.();
+    };
+    const markTurnProgress = (label) => {
+      if (!isCurrentTurn()) return false;
+      if (watchdogTripped) return;
+      lastProgressAt = Date.now();
+      lastProgressLabel = String(label || "progress");
+      armWatchdog();
+      return true;
+    };
+    armWatchdog();
     let currentAssistantText = "";
     let thinkingText = "";
     let thinkingStartedAt = 0;
@@ -24097,6 +24338,7 @@ function createRunTurn(bag) {
     let deferredSeqCounter = 0;
     const deferredEntries = [];
     const flushDeferredUpTo = (entry) => {
+      if (!isCurrentTurn()) return;
       if (!entry) return;
       const specs = collectDeferredUpTo(entry);
       if (!specs.length) return;
@@ -24141,7 +24383,7 @@ function createRunTurn(bag) {
       deferredEntries.push(entry);
       entry.timer = setTimeout(() => {
         entry.timer = null;
-        if (flags.disposed) return;
+        if (!isCurrentTurn()) return;
         flushDeferredUpTo(entry);
       }, TOOL_CARD_PUSH_DELAY_MS);
       entry.timer.unref?.();
@@ -24173,7 +24415,7 @@ function createRunTurn(bag) {
       deferredEntries.push(entry);
       entry.timer = setTimeout(() => {
         entry.timer = null;
-        if (flags.disposed) return;
+        if (!isCurrentTurn()) return;
         flushDeferredUpTo(entry);
       }, TOOL_CARD_PUSH_DELAY_MS);
       entry.timer.unref?.();
@@ -24203,6 +24445,7 @@ function createRunTurn(bag) {
       return specs;
     };
     const appendItemsBatch = (newItems, extra = {}) => {
+      if (!isCurrentTurn()) return;
       if (!newItems || !newItems.length) {
         set(extra);
         return;
@@ -24257,6 +24500,7 @@ function createRunTurn(bag) {
         if (allCalls.length === 0) continue;
         aggregate.ensureVisible?.();
         const errors = allCalls.filter((r) => r.isError).length;
+        const callErrors = allCalls.filter((r) => r.isCallError).length;
         const completed = allCalls.filter((r) => r.resolved).length;
         const succeeded = completed - errors;
         const rawResult = aggregateRawResult(allCalls);
@@ -24266,6 +24510,8 @@ function createRunTurn(bag) {
           text: displayDetail,
           rawResult: rawResult || null,
           isError: errors > 0,
+          errorCount: errors,
+          callErrorCount: callErrors,
           count: allCalls.length,
           completedCount: allCalls.length,
           doneCategories: aggregateDoneCategories(allCalls),
@@ -24389,6 +24635,12 @@ function createRunTurn(bag) {
         clearTimeout(_batchTimer);
         _batchTimer = null;
       }
+      if (!isCurrentTurn()) {
+        _pendingTextFlush = false;
+        _pendingThinkFlush = false;
+        _pendingThinkingLastEndedAt = 0;
+        return;
+      }
       if (_pendingTextFlush) {
         _pendingTextFlush = false;
         const textLen = currentAssistantText.length;
@@ -24467,16 +24719,20 @@ function createRunTurn(bag) {
         aggregate.ensureVisible?.();
         const rawText = toolResultText(message?.content);
         const isMemoryCall = classifyToolCategory(callRec.name, callRec.args) === "Memory";
-        const isError = message?.isError === true || message?.toolKind === "error" || /^\s*\[?error/i.test(rawText) || isErrorToolStatus(toolResultStatus(rawText)) || isMemoryCall && memoryCoreResultErrorText(rawText) != null;
+        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 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.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 rawResult = aggregateRawResult(allCalls);
         const displayDetail = errors > 0 ? succeeded > 0 ? `${succeeded} Ok \xB7 ${errors} Failed` : `${errors} Failed` : formatAggregateDetail(aggregateSummaries(aggregate));
@@ -24490,6 +24746,7 @@ function createRunTurn(bag) {
           text: displayDetail,
           isError: errors > 0,
           errorCount: errors,
+          callErrorCount: callErrors,
           count: allCalls.length,
           completedCount: visualCompleted
         };
@@ -24510,8 +24767,9 @@ function createRunTurn(bag) {
     };
     try {
       const { result, session } = await runtime.ask(userText, {
-        drainSteering: () => drainPendingSteering(),
+        drainSteering: (_sessionId, drainOptions) => isCurrentTurn() ? drainPendingSteering(drainOptions) : [],
         onSteerMessage: (text) => {
+          if (!markTurnProgress("steer-message")) return;
           flushStreamBatch();
           if (currentAssistantId) {
             patchItem(currentAssistantId, { text: currentAssistantText || assistantText, streaming: false });
@@ -24525,6 +24783,7 @@ function createRunTurn(bag) {
           }
         },
         onToolCall: async (_iter, calls) => {
+          if (!markTurnProgress("tool-call")) return;
           markPromptCommitted();
           flushStreamBatch();
           if (thinkingText && getState().thinking) {
@@ -24538,7 +24797,8 @@ function createRunTurn(bag) {
           if (batchCalls.length === 0) return;
           const committedAssistantSegment = commitAssistantSegment({ sealToolBlock: true });
           if (committedAssistantSegment) {
-            await yieldToRenderer();
+            await yieldToRenderer({ frames: 2 });
+            if (!isCurrentTurn()) return;
           }
           const touchedAggregates = /* @__PURE__ */ new Set();
           let standaloneReserve = null;
@@ -24590,7 +24850,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, resultText: null, resolved: false, completedEarly: false });
+            aggregateCard.calls.set(callKey, { name, args, category, summary: null, summarySeq: null, isError: false, isCallError: false, resultText: null, resolved: false, completedEarly: false });
             touchedAggregates.add(aggregateCard);
             const card = { itemId: aggregateCard.itemId, callId: callKey, done: false, aggregate: aggregateCard };
             if (callId) {
@@ -24614,6 +24874,7 @@ function createRunTurn(bag) {
           await yieldToRenderer();
         },
         onToolResult: (message) => {
+          if (!markTurnProgress("tool-result")) return;
           const callId = toolResultCallId(message);
           if (callId && !cardByCallId.has(callId) && !resultsDone.has(callId)) {
             earlyResultBuffer.set(callId, message);
@@ -24622,12 +24883,16 @@ function createRunTurn(bag) {
           deliverToolResultMessage(message);
         },
         onToolApproval: async (request) => {
+          if (!markTurnProgress("tool-approval")) return { approved: false, reason: "turn no longer active" };
           markPromptCommitted();
           flushStreamBatch();
           if (getState().spinner) set({ spinner: { ...getState().spinner, mode: "tool-approval" } });
-          return await requestToolApproval(request);
+          const approval = await requestToolApproval(request);
+          if (!isCurrentTurn()) return { approved: false, reason: "turn no longer active" };
+          return approval;
         },
         onCompactEvent: (event) => {
+          if (!markTurnProgress("compact-event")) return;
           flushStreamBatch();
           clearAggregateContinuation();
           pushItem({
@@ -24638,6 +24903,7 @@ function createRunTurn(bag) {
           });
         },
         onStageChange: async (stage) => {
+          if (!markTurnProgress(`stage:${String(stage || "")}`)) return;
           if (!getState().spinner) return;
           const value = String(stage || "");
           if (value === "compacting") {
@@ -24667,6 +24933,7 @@ function createRunTurn(bag) {
         onTextDelta: (chunk) => {
           const textChunk = String(chunk ?? "");
           if (!textChunk) return;
+          if (!markTurnProgress("text-delta")) return;
           markPromptCommitted();
           const thinkingLastEndedAt = closeThinkingSegment();
           _pendingThinkFlush = false;
@@ -24683,6 +24950,7 @@ function createRunTurn(bag) {
         onAssistantText: (text) => {
           const full = String(text ?? "");
           if (!full.trim()) return;
+          if (!markTurnProgress("assistant-text")) return;
           if (currentAssistantText.trim()) return;
           markPromptCommitted();
           closeThinkingSegment();
@@ -24697,13 +24965,18 @@ function createRunTurn(bag) {
           flushStreamBatch();
         },
         onReasoningDelta: (chunk) => {
-          if (String(chunk ?? "")) markPromptCommitted();
+          if (!isCurrentTurn() || watchdogTripped) return;
+          if (String(chunk ?? "")) {
+            if (!markTurnProgress("reasoning-delta")) return;
+            markPromptCommitted();
+          }
           startThinkingSegment();
           thinkingText += String(chunk ?? "");
           _pendingThinkFlush = true;
           scheduleStreamFlush();
         },
         onUsageDelta: (delta) => {
+          if (!markTurnProgress("usage-delta")) return;
           applyUsageDelta(getState().stats, delta);
           syncContextStats({ allowEstimated: true });
           const currentTurnInput = Math.max(0, getState().stats.inputTokens - inputBaseline);
@@ -24715,64 +24988,73 @@ function createRunTurn(bag) {
           }
         }
       });
-      askResult = result;
-      markPromptCommitted();
-      flushToolResults(session?.messages || [], toolCards, cardByCallId, toolGroups, resultsDone, { finalize: true });
-      finalizeToolHeaders();
-      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 });
-      } else if (currentAssistantId && (currentAssistantText.trim() || assistantText.trim())) {
-        const streamedText = currentAssistantText || assistantText;
-        patchItem(currentAssistantId, { text: streamedText, streaming: false });
-      }
-      turnFinishedNormally = true;
-    } catch (error) {
-      flushStreamBatch();
-      if (error?.name === "SessionClosedError") {
+      if (!isCurrentTurn()) {
         cancelled = true;
-        if (assistantText.trim() && currentAssistantId) {
-          patchItem(currentAssistantId, { text: currentAssistantText || assistantText, streaming: false });
-        }
-        flushToolResults([], toolCards, cardByCallId, toolGroups, resultsDone, { finalize: true, cancelled: true });
-        finalizeToolHeaders();
       } else {
+        askResult = result;
+        markPromptCommitted();
+        flushToolResults(session?.messages || [], toolCards, cardByCallId, toolGroups, resultsDone, { finalize: true });
         finalizeToolHeaders();
-        pushNotice(toolErrorDisplay(error, "turn"), "error");
+        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 });
+        } else if (currentAssistantId && (currentAssistantText.trim() || assistantText.trim())) {
+          const streamedText = currentAssistantText || assistantText;
+          patchItem(currentAssistantId, { text: streamedText, streaming: false });
+        }
+        turnFinishedNormally = true;
+      }
+    } catch (error) {
+      const staleCatch = !isCurrentTurn();
+      if (staleCatch) {
+        cancelled = true;
+      } else {
+        flushStreamBatch();
+        if (error?.name === "SessionClosedError") {
+          cancelled = true;
+          if (assistantText.trim() && currentAssistantId) {
+            patchItem(currentAssistantId, { text: currentAssistantText || assistantText, streaming: false });
+          }
+          flushToolResults([], toolCards, cardByCallId, toolGroups, resultsDone, { finalize: true, cancelled: true });
+          finalizeToolHeaders();
+        } else {
+          finalizeToolHeaders();
+          pushNotice(toolErrorDisplay(error, "turn"), "error");
+        }
       }
     } finally {
-      denyAllToolApprovals(cancelled ? "turn cancelled" : "turn finished");
+      const isStaleUnwind = !isCurrentTurn();
+      if (!isStaleUnwind) denyAllToolApprovals(cancelled ? "turn cancelled" : "turn finished");
       clearWatchdog();
-      const isStaleUnwind = flags.leadTurnEpoch !== turnEpoch;
       let closingItems = [];
       if (deferredEntries.length) {
-        const last = deferredEntries[deferredEntries.length - 1];
-        closingItems = collectDeferredUpTo(last);
+        if (!isStaleUnwind) {
+          const last = deferredEntries[deferredEntries.length - 1];
+          closingItems = collectDeferredUpTo(last);
+        }
         clearDeferredTimers();
       }
-      flags.flushDeferredBeforeImmediatePush = null;
-      const producedTranscriptItem = getState().items.length + closingItems.length > itemsAtTurnStart;
-      const reclaimed = cancelled && flags.activePromptRestore?.reclaimed === true;
-      if (!isStaleUnwind) flags.activePromptRestore = null;
+      if (!isStaleUnwind) flags.flushDeferredBeforeImmediatePush = null;
       closeThinkingSegment();
-      const elapsedMs = Date.now() - startedAt;
-      const thinkingElapsedMs = thinkingStartedAt ? accumulatedThinkingMs : 0;
-      const finalAssistantLen = Math.max(assistantText.length, currentAssistantText.length);
-      const finalResponseLength = finalAssistantLen + thinkingText.length;
-      const finalOutputTokens = Math.max(0, Number(getState().spinner?.outputTokens || 0), Math.round(finalResponseLength / 4));
-      const turnStatus = cancelled ? "cancelled" : "done";
-      const resultContent = askResult?.content != null ? String(askResult.content).trim() : "";
-      const assistantOutput = (currentAssistantText || assistantText || "").trim();
-      const isNoOpTurn = turnFinishedNormally && !cancelled && toolCards.length === 0 && !resultContent && !assistantOutput && !producedTranscriptItem;
       if (isStaleUnwind) {
-        if (closingItems.length) appendItemsBatch(closingItems);
-        tuiDebug2(`runTurn STALE UNWIND turn=${turnIndex} \u2014 force-released; skipping shared-getState() writes`);
-        flushDeferredExecutionPendingResumeKick();
+        tuiDebug2(`runTurn STALE UNWIND turn=${turnIndex} \u2014 force-released; skipping shared UI/state writes`);
       } else {
+        const producedTranscriptItem = getState().items.length + closingItems.length > itemsAtTurnStart;
+        const reclaimed = cancelled && flags.activePromptRestore?.reclaimed === true;
+        flags.activePromptRestore = null;
+        const elapsedMs = Date.now() - startedAt;
+        const thinkingElapsedMs = thinkingStartedAt ? accumulatedThinkingMs : 0;
+        const finalAssistantLen = Math.max(assistantText.length, currentAssistantText.length);
+        const finalResponseLength = finalAssistantLen + thinkingText.length;
+        const finalOutputTokens = Math.max(0, Number(getState().spinner?.outputTokens || 0), Math.round(finalResponseLength / 4));
+        const turnStatus = cancelled ? "cancelled" : "done";
+        const resultContent = askResult?.content != null ? String(askResult.content).trim() : "";
+        const assistantOutput = (currentAssistantText || assistantText || "").trim();
+        const isNoOpTurn = turnFinishedNormally && !cancelled && toolCards.length === 0 && !resultContent && !assistantOutput && !producedTranscriptItem;
         if (!isNoOpTurn) {
           getState().stats.turns = (getState().stats.turns || 0) + 1;
         }
@@ -25478,6 +25760,10 @@ async function buildDoctorReport(runtime = {}, getState = () => ({})) {
 }
 
 // src/tui/engine/session-api.mjs
+var MANUAL_ABORT_RECOVERY_MS = (() => {
+  const v = Number(process.env.MIXDOG_MANUAL_ABORT_RECOVERY_MS);
+  return Number.isFinite(v) && v > 0 ? v : 4e3;
+})();
 function createEngineApi(bag) {
   return { ...createEngineApiA(bag), ...createEngineApiB(bag) };
 }
@@ -25504,7 +25790,9 @@ function createEngineApiA(bag) {
     enqueue,
     autoClearBeforeSubmit,
     restoreQueued,
-    resetStatsAndSyncContext
+    resetStatsAndSyncContext,
+    drain,
+    flushDeferredExecutionPendingResumeKick
   } = bag;
   return {
     getState: () => getState(),
@@ -25528,12 +25816,16 @@ function createEngineApiA(bag) {
         enqueue(text, queueOptions);
         return true;
       }
-      if (getState().commandBusy) return false;
+      if (getState().commandBusy) {
+        enqueue(text, queueOptions);
+        return true;
+      }
       if (getState().busy) {
         enqueue(text, queueOptions);
         return true;
       }
-      void autoClearBeforeSubmit().then(() => enqueue(text, queueOptions));
+      void autoClearBeforeSubmit().catch(() => {
+      }).then(() => enqueue(text, queueOptions));
       return true;
     },
     restoreQueued,
@@ -26013,6 +26305,22 @@ function createEngineApiA(bag) {
         restoreState.restorable = false;
         restoreState.requeueEntries = [];
       }
+      const abortEpoch = flags.leadTurnEpoch;
+      const recoveryMs = Number(flags.manualAbortRecoveryMs) > 0 ? Number(flags.manualAbortRecoveryMs) : MANUAL_ABORT_RECOVERY_MS;
+      const recoveryTimer = setTimeout(() => {
+        if (flags.disposed) return;
+        if (!getState().busy) return;
+        if (flags.leadTurnEpoch !== abortEpoch) return;
+        flags.leadTurnEpoch = (Number(flags.leadTurnEpoch) || 0) + 1;
+        set({ busy: false, spinner: null, thinking: null, lastTurn: null });
+        flags.activePromptRestore = null;
+        flags.drainEpoch = (Number(flags.drainEpoch) || 0) + 1;
+        if (flags.draining) flags.draining = false;
+        pushNotice("Interrupt did not settle \u2014 input restored.", "warn", { transcript: true });
+        if (pending.length > 0 && typeof drain === "function") void drain();
+        if (typeof flushDeferredExecutionPendingResumeKick === "function") flushDeferredExecutionPendingResumeKick();
+      }, recoveryMs);
+      recoveryTimer.unref?.();
       return { aborted, restoreText, pastedImages: restorePastedImages, discardPastedImages, pastedTexts: restorePastedTexts, discardPastedTexts };
     }
   };
@@ -26149,8 +26457,12 @@ async function createEngineSession({
       }
     }
     if (!changed) return false;
+    const commandBusyReleased = state.commandBusy === true && Object.prototype.hasOwnProperty.call(patch, "commandBusy") && patch.commandBusy === false;
     state = { ...state, ...patch };
     emit();
+    if (commandBusyReleased) queueMicrotask(() => {
+      void bag.drain?.();
+    });
     return true;
   };
   const itemIndexById = /* @__PURE__ */ new Map();
@@ -26342,6 +26654,7 @@ async function createEngineSession({
     flushDeferredExecutionPendingResumeKick,
     scheduleExecutionPendingResumeKick,
     updateAgentJobCard,
+    buildAgentJobCardPatch,
     subscribeRuntimeNotifications
   } = createAgentJobFeed({
     runtime,
@@ -26375,6 +26688,7 @@ async function createEngineSession({
     patchItem,
     markToolCallDone,
     updateAgentJobCard,
+    buildAgentJobCardPatch,
     agentStatusState
   });
   Object.assign(bag, {
@@ -26676,7 +26990,10 @@ function installTuiPerfProbe() {
   };
 }
 function makeRenderProfiler() {
-  if (!PERF_ENABLED) return void 0;
+  const ackRenderedFrame = () => {
+    scheduleRenderFrameAck();
+  };
+  if (!PERF_ENABLED) return ackRenderedFrame;
   let count = 0;
   let sum = 0;
   let max = 0;
@@ -26684,6 +27001,7 @@ function makeRenderProfiler() {
   let maxGap = 0;
   let lastFrameAt = 0;
   return ({ renderTime } = {}) => {
+    ackRenderedFrame();
     const now = performance3.now();
     const ms = Number(renderTime) || 0;
     const gap = lastFrameAt ? now - lastFrameAt : 0;