mixdog 0.9.53 → 0.9.55

package/src/tui/engine/context-state.mjs

@@ -2,14 +2,10 @@
  * src/tui/engine/context-state.mjs - route/context/agent-status derivations.
  *
  * Extracted from engine.mjs unchanged. These read the live runtime + store
- * snapshot and (for the two sync helpers) mutate state.stats / the display
- * context fields IN PLACE — the exact same object the store owns — so the
- * immutable-emit contract is preserved by their callers, which follow up with
- * a set({ stats: { ...state.stats }, ...routeState() }). getState() must return
- * the live (latest) store object; getPendingSessionReset() gates the stats
- * sync exactly as the old inline `pendingSessionReset` closure did.
+ * snapshot. The two sync helpers stage immutable draft patches through
+ * updateState; callers still follow with set(...) to schedule publication.
  */
-export function createContextState({ runtime, getState, getPendingSessionReset }) {
+export function createContextState({ runtime, getState, updateState, getPendingSessionReset }) {
   const autoClearState = () => runtime.getAutoClear?.() || runtime.autoClear || { enabled: true, idleMs: 60 * 60 * 1000, custom: false, providerDefault: 60 * 60 * 1000, provider: null, minContextPercent: 10 };
   const AGENT_STATUS_CACHE_MS = 250;
   let agentStatusCache = null;
@@ -68,7 +64,6 @@ export function createContextState({ runtime, getState, getPendingSessionReset }
   function syncContextDisplayFields(ctx = null) {
     const status = ctx || runtime.contextStatus?.() || null;
     if (!status) return;
-    const state = getState();
     const displayWindow = Number(status.contextWindow || 0);
     const compactBoundary = Number(status.compaction?.boundaryTokens || 0);
     // Prefer the resolved trigger (boundary - buffer): the statusline uses it
@@ -80,9 +75,11 @@ export function createContextState({ runtime, getState, getPendingSessionReset }
       || runtime.session?.autoCompactTokenLimit
       || 0,
     );
-    if (displayWindow > 0) state.displayContextWindow = displayWindow;
-    if (compactBoundary > 0) state.compactBoundaryTokens = compactBoundary;
-    if (autoCompact > 0) state.autoCompactTokenLimit = autoCompact;
+    const patch = {};
+    if (displayWindow > 0) patch.displayContextWindow = displayWindow;
+    if (compactBoundary > 0) patch.compactBoundaryTokens = compactBoundary;
+    if (autoCompact > 0) patch.autoCompactTokenLimit = autoCompact;
+    if (Object.keys(patch).length > 0) updateState(patch);
   }
 
   const syncContextStats = ({ allowEstimated = false } = {}) => {
@@ -91,17 +88,19 @@ export function createContextState({ runtime, getState, getPendingSessionReset }
     if (!ctx) return null;
     syncContextDisplayFields(ctx);
     const state = getState();
-    const hasProviderUsage = Number(state.stats.latestPromptTokens || state.stats.latestInputTokens || state.stats.inputTokens || 0) > 0;
+    const stats = { ...state.stats };
+    const hasProviderUsage = Number(stats.latestPromptTokens || stats.latestInputTokens || stats.inputTokens || 0) > 0;
     const hasApiContextUsage = Number(ctx?.lastApiRequestTokens ?? ctx?.usage?.lastContextTokens ?? 0) > 0;
     const hasTurnActivity = state.busy === true
       || state.spinner != null
       || state.thinking != null;
     const isFreshSession = !hasProviderUsage && !hasApiContextUsage && !hasTurnActivity;
     if (isFreshSession) {
-      state.stats.currentEstimatedContextTokens = 0;
-      state.stats.currentContextTokens = 0;
-      state.stats.currentContextSource = null;
-      state.stats.currentContextUpdatedAt = Date.now();
+      stats.currentEstimatedContextTokens = 0;
+      stats.currentContextTokens = 0;
+      stats.currentContextSource = null;
+      stats.currentContextUpdatedAt = Date.now();
+      updateState({ stats });
       return ctx;
     }
     const estimatedTokens = Math.max(0, Number(ctx.currentEstimatedTokens ?? ctx.usedTokens ?? 0));
@@ -114,32 +113,33 @@ export function createContextState({ runtime, getState, getPendingSessionReset }
     );
     if (!allowEstimated && !hasProviderUsage && usedSource !== 'last_api_request') return ctx;
     if (shouldPublishEstimate) {
-      state.stats.currentEstimatedContextTokens = estimatedTokens;
-      state.stats.currentContextSource = 'estimated';
-      state.stats.currentContextTokens = 0;
+      stats.currentEstimatedContextTokens = estimatedTokens;
+      stats.currentContextSource = 'estimated';
+      stats.currentContextTokens = 0;
     } else if (allowEstimated && (hasProviderUsage || hasApiContextUsage || hasTurnActivity)) {
-      state.stats.currentEstimatedContextTokens = estimatedTokens;
-      state.stats.currentContextSource = usedSource || (estimatedTokens > 0 ? 'estimated' : null);
-      const publishedSource = String(state.stats.currentContextSource || '').toLowerCase();
+      stats.currentEstimatedContextTokens = estimatedTokens;
+      stats.currentContextSource = usedSource || (estimatedTokens > 0 ? 'estimated' : null);
+      const publishedSource = String(stats.currentContextSource || '').toLowerCase();
       if (publishedSource === 'last_api_request') {
         const apiUsed = Math.max(0, Number(ctx.lastApiRequestTokens ?? usedTokens ?? 0));
-        state.stats.currentContextTokens = apiUsed;
+        stats.currentContextTokens = apiUsed;
       } else if (publishedSource === 'estimated') {
-        state.stats.currentContextTokens = 0;
+        stats.currentContextTokens = 0;
       } else {
-        state.stats.currentContextTokens = usedTokens > 0 ? usedTokens : 0;
+        stats.currentContextTokens = usedTokens > 0 ? usedTokens : 0;
       }
     } else {
-      state.stats.currentEstimatedContextTokens = 0;
+      stats.currentEstimatedContextTokens = 0;
       if (usedSource === 'last_api_request' && Number(ctx.lastApiRequestTokens ?? usedTokens ?? 0) > 0) {
-        state.stats.currentContextTokens = Math.max(0, Number(ctx.lastApiRequestTokens ?? usedTokens ?? 0));
-        state.stats.currentContextSource = 'last_api_request';
+        stats.currentContextTokens = Math.max(0, Number(ctx.lastApiRequestTokens ?? usedTokens ?? 0));
+        stats.currentContextSource = 'last_api_request';
       } else {
-        state.stats.currentContextTokens = 0;
-        state.stats.currentContextSource = null;
+        stats.currentContextTokens = 0;
+        stats.currentContextSource = null;
       }
     }
-    state.stats.currentContextUpdatedAt = Date.now();
+    stats.currentContextUpdatedAt = Date.now();
+    updateState({ stats });
     return ctx;
   };
 

package/src/tui/engine/frame-batched-store.mjs

@@ -0,0 +1,75 @@
+/**
+ * Coalesces external-store publications to one terminal frame snapshot.
+ * Internal draft mutations remain synchronous. The public snapshot, listener
+ * delivery, and structureRevision commit are swapped atomically at flush.
+ */
+export function createFrameBatchedStorePublisher({
+  getState,
+  publishState,
+  listeners,
+  isDisposed = () => false,
+  frameMs = 16,
+  setTimer = setTimeout,
+  clearTimer = clearTimeout,
+  enqueueMicrotask = queueMicrotask,
+}) {
+  let timer = null;
+  let emitPending = false;
+  let structureChangePending = false;
+  let immediatePending = false;
+
+  const flush = () => {
+    if (timer !== null) {
+      clearTimer(timer);
+      timer = null;
+    }
+    immediatePending = false;
+    if (!emitPending || isDisposed()) return false;
+    emitPending = false;
+    const current = getState();
+    let next = current;
+    if (structureChangePending) {
+      structureChangePending = false;
+      next = {
+        ...current,
+        structureRevision: (Number(current.structureRevision) || 0) + 1,
+      };
+    }
+    publishState(next);
+    for (const listener of listeners) listener();
+    return true;
+  };
+
+  const emit = () => {
+    emitPending = true;
+    if (timer !== null || isDisposed()) return;
+    timer = setTimer(flush, frameMs);
+    timer?.unref?.();
+  };
+
+  const markStructureChange = () => {
+    structureChangePending = true;
+  };
+
+  // Let the current synchronous mutation chain finish, then publish without
+  // waiting for the frame timer (input echo / terminal turn boundaries).
+  const flushImmediate = () => {
+    if (!emitPending || immediatePending || isDisposed()) return false;
+    immediatePending = true;
+    enqueueMicrotask(flush);
+    return true;
+  };
+
+  const dispose = () => {
+    // Disposal is itself an immediate boundary: publish the final pending
+    // snapshot once, while subscribers are still present, then disarm.
+    if (emitPending && !isDisposed()) flush();
+    else if (timer !== null) clearTimer(timer);
+    timer = null;
+    emitPending = false;
+    structureChangePending = false;
+    immediatePending = false;
+  };
+
+  return { emit, flush, flushImmediate, markStructureChange, dispose };
+}

package/src/tui/engine/session-api-ext.mjs

@@ -10,7 +10,7 @@ import { getVoiceStatus, toggleVoice } from '../lib/voice-setup.mjs';
 
 export function createEngineApiB(bag) {
   const {
-    runtime, nextId, flags, lifecycle, listeners, getState, set, replaceItems, pushNotice, removeNotice, setProgressHint, clearToastTimers, routeState, syncContextStats, finishToolApproval, denyAllToolApprovals, restoreLeadSteeringFromDisk, resetStats, clearUiActivityBeforeContextSync, resetTuiForPendingSessionReset, snapshotTuiBeforeSessionReset, restoreTuiAfterFailedSessionReset, resetStatsAndSyncContext,
+    runtime, nextId, flags, lifecycle, listeners, getState, set, disposeEmit, replaceItems, pushNotice, removeNotice, setProgressHint, clearToastTimers, disposeTranscriptSpill, routeState, syncContextStats, finishToolApproval, denyAllToolApprovals, restoreLeadSteeringFromDisk, resetStats, clearUiActivityBeforeContextSync, resetTuiForPendingSessionReset, snapshotTuiBeforeSessionReset, restoreTuiAfterFailedSessionReset, commitTuiSessionReset, resetStatsAndSyncContext,
   } = bag;
   return {
     resolveToolApproval: (id, decision = {}) => {
@@ -363,6 +363,7 @@ export function createEngineApiB(bag) {
         flags.pendingSessionReset = false;
         resetStatsAndSyncContext();
         set({ items: replaceItems([]), toasts: [], queued: [], thinking: null, spinner: null, lastTurn: null, ...routeState(), stats: { ...getState().stats } });
+        commitTuiSessionReset(rollbackSnapshot);
         flags.lastUserActivityAt = Date.now();
         return true;
       } catch (error) {
@@ -400,6 +401,7 @@ export function createEngineApiB(bag) {
           ...routeState(),
           stats: { ...getState().stats },
         });
+        commitTuiSessionReset(rollbackSnapshot);
         return true;
       } catch (error) {
         restoreTuiAfterFailedSessionReset(rollbackSnapshot);
@@ -432,6 +434,7 @@ export function createEngineApiB(bag) {
         flags.pendingSessionReset = false;
         resetStatsAndSyncContext();
         set({ items: replaceItems([]), toasts: [], queued: [], thinking: null, spinner: null, lastTurn: null, ...routeState(), stats: { ...getState().stats } });
+        commitTuiSessionReset(rollbackSnapshot);
         return true;
       } catch (error) {
         restoreTuiAfterFailedSessionReset(rollbackSnapshot);
@@ -506,8 +509,10 @@ export function createEngineApiB(bag) {
 
     dispose: async (reason = 'cli-react-exit', options = {}) => {
       if (flags.disposed) return;
+      disposeEmit?.();
       flags.disposed = true;
       clearToastTimers();
+      disposeTranscriptSpill?.();
       try { clearInterval(lifecycle.runtimePulseTimer); } catch {}
       try { lifecycle.unsubscribeRuntimeNotifications?.(); } catch {}
       lifecycle.unsubscribeRuntimeNotifications = null;

package/src/tui/engine/session-api.mjs

@@ -24,11 +24,13 @@ export function createEngineApi(bag) {
 
 export function createEngineApiA(bag) {
   const {
-    runtime, nextId, flags, pending, listeners, getState, set, pushItem, patchItem, replaceItems, settleStreamingTail, clearStreamingTail, pushNotice, autoClearState, agentStatusState, routeState, syncContextStats, denyAllToolApprovals, updateAgentJobCard, requeueEntriesFront, enqueue, autoClearBeforeSubmit, restoreQueued, resetStatsAndSyncContext, drain, flushDeferredExecutionPendingResumeKick, discardExecutionPendingResume,
+    runtime, nextId, flags, pending, listeners, getState, getPublishedState = getState, set, flushEmitImmediate, pushItem, patchItem, replaceItems, restoreOlderTranscript, restoreNewerTranscript, settleStreamingTail, clearStreamingTail, pushNotice, autoClearState, agentStatusState, routeState, syncContextStats, denyAllToolApprovals, updateAgentJobCard, requeueEntriesFront, enqueue, autoClearBeforeSubmit, restoreQueued, resetStatsAndSyncContext, drain, flushDeferredExecutionPendingResumeKick, discardExecutionPendingResume,
   } = bag;
   return {
-    getState: () => getState(),
+    getState: () => getPublishedState(),
     patchItem,
+    restoreOlderTranscript,
+    restoreNewerTranscript,
     subscribe: (listener) => {
       listeners.add(listener);
       return () => listeners.delete(listener);
@@ -592,7 +594,10 @@ export function createEngineApiA(bag) {
           if (idSet.size > 0) {
             const items = getState().items.filter((item) => !idSet.has(item?.id));
             if (items.length !== getState().items.length) {
-              patch.items = replaceItems(items);
+              patch.items = replaceItems(items, {
+                preserveSpill: true,
+                preserveTranscriptView: true,
+              });
             }
           }
           set(patch);
@@ -637,6 +642,7 @@ export function createEngineApiA(bag) {
         flags.drainEpoch = (Number(flags.drainEpoch) || 0) + 1;
         if (flags.draining) flags.draining = false;
         pushNotice('Interrupt did not settle — input restored.', 'warn', { transcript: true });
+        flushEmitImmediate?.();
         if (pending.length > 0 && typeof drain === 'function') void drain();
         // busy→false here bypasses the normal turn-end + drain-finally flushes,
         // so re-arm any deferred completion kick explicitly (idempotent).

package/src/tui/engine/session-flow.mjs

@@ -9,7 +9,8 @@ import { appendTuiSteeringPersist, dropTuiSteeringPersist, drainTuiSteeringPersi
 
 export function createSessionFlow(bag) {
   const {
-    runtime, nextId, tuiDebug, flags, pending, pendingNotificationKeys, displayedExecutionNotificationKeys, clearExecutionDedupState, clearToastTimers, getState, set, pushItem, replaceItems, pushNotice, pushUserOrSyntheticItem, autoClearState, agentStatusState, routeState, syncContextStats, flushDeferredExecutionPendingResumeKick,
+    runtime, nextId, tuiDebug, flags, pending, pendingNotificationKeys, displayedExecutionNotificationKeys, clearExecutionDedupState, clearToastTimers, getState, set, flushEmitImmediate, pushItem, replaceItems, pushNotice, pushUserOrSyntheticItem, autoClearState, agentStatusState, routeState, syncContextStats, flushDeferredExecutionPendingResumeKick,
+    snapshotTranscriptSpill, restoreTranscriptSpill, releaseTranscriptSpill,
   } = bag;
 
   // Upper bound on the awaited compacting clear. requireCompactSuccess makes
@@ -272,7 +273,10 @@ export function createSessionFlow(bag) {
     if (getState().busy && shouldMirrorSteeringEntry(entry)) {
       appendTuiSteeringPersist(leadSessionId(), entry);
     }
-    if (isQueuedEntryVisible(entry)) set({ queued: [...getState().queued, entry] });
+    if (isQueuedEntryVisible(entry)) {
+      set({ queued: [...getState().queued, entry] });
+      if (isQueuedEntryEditable(entry)) flushEmitImmediate?.();
+    }
     if (getState().busy) tuiDebug(`busy-queue enqueue mode=${entry.mode} pending=${pending.length}`);
     void drain();
     return true;
@@ -495,19 +499,23 @@ export function createSessionFlow(bag) {
   }
 
   const resetStats = () => {
-    getState().stats = createSessionStats();
-    return getState().stats;
+    const stats = createSessionStats();
+    set({ stats });
+    return stats;
   };
   const clearUiActivityBeforeContextSync = () => {
     clearToastTimers();
     resetAllStreamingMarkdownStablePrefixes();
-    getState().items = replaceItems([]);
-    getState().toasts = [];
-    getState().queued = [];
-    getState().thinking = null;
-    getState().spinner = null;
-    getState().lastTurn = null;
-    getState().busy = false;
+    const items = replaceItems([]);
+    set({
+      items,
+      toasts: [],
+      queued: [],
+      thinking: null,
+      spinner: null,
+      lastTurn: null,
+      busy: false,
+    });
     pendingNotificationKeys.clear();
     displayedExecutionNotificationKeys.clear();
     clearExecutionDedupState?.();
@@ -545,16 +553,26 @@ export function createSessionFlow(bag) {
     flags.pendingSessionReset = true;
     clearUiActivityBeforeContextSync();
     resetStats();
-    getState().stats.currentContextTokens = 0;
-    getState().stats.currentEstimatedContextTokens = 0;
-    getState().stats.currentContextSource = null;
-    getState().stats.currentContextUpdatedAt = Date.now();
-    getState().displayContextWindow = 0;
-    getState().compactBoundaryTokens = 0;
-    getState().autoCompactTokenLimit = 0;
+    set({
+      stats: {
+        ...getState().stats,
+        currentContextTokens: 0,
+        currentEstimatedContextTokens: 0,
+        currentContextSource: null,
+        currentContextUpdatedAt: Date.now(),
+      },
+      displayContextWindow: 0,
+      compactBoundaryTokens: 0,
+      autoCompactTokenLimit: 0,
+    });
   };
   const snapshotTuiBeforeSessionReset = () => ({
     items: getState().items.slice(),
+    transcriptViewItems: Array.isArray(getState().transcriptViewItems)
+      ? getState().transcriptViewItems.slice()
+      : null,
+    transcriptViewRevision: getState().transcriptViewRevision,
+    transcriptSpill: snapshotTranscriptSpill?.() || null,
     toasts: getState().toasts.slice(),
     queued: getState().queued.slice(),
     thinking: getState().thinking,
@@ -567,14 +585,20 @@ export function createSessionFlow(bag) {
   const restoreTuiAfterFailedSessionReset = (snapshot) => {
     if (!snapshot) return;
     flags.pendingSessionReset = false;
-    getState().items = replaceItems(snapshot.items);
-    getState().toasts = snapshot.toasts.slice();
-    getState().queued = snapshot.queued.slice();
-    getState().thinking = snapshot.thinking;
-    getState().spinner = snapshot.spinner;
-    getState().lastTurn = snapshot.lastTurn;
-    getState().busy = snapshot.busy;
-    getState().stats = { ...snapshot.stats };
+    restoreTranscriptSpill?.(snapshot.transcriptSpill);
+    const items = replaceItems(snapshot.items, { preserveSpill: true });
+    set({
+      items,
+      transcriptViewItems: snapshot.transcriptViewItems,
+      transcriptViewRevision: snapshot.transcriptViewRevision,
+      toasts: snapshot.toasts.slice(),
+      queued: snapshot.queued.slice(),
+      thinking: snapshot.thinking,
+      spinner: snapshot.spinner,
+      lastTurn: snapshot.lastTurn,
+      busy: snapshot.busy,
+      stats: { ...snapshot.stats },
+    });
     syncContextStats({ allowEstimated: true });
     set({
       items: getState().items,
@@ -589,11 +613,14 @@ export function createSessionFlow(bag) {
       ...agentStatusState(),
     });
   };
+  const commitTuiSessionReset = (snapshot) => {
+    releaseTranscriptSpill?.(snapshot?.transcriptSpill);
+  };
   const resetStatsAndSyncContext = () => {
     resetStats();
     syncContextStats({ allowEstimated: true });
     return getState().stats;
   };
 
-  return { leadSessionId, shouldMirrorSteeringEntry, commitSteeringQueueEntries, makeQueueEntry, removeQueuedEntries, requeueEntriesFront, dequeueQueueBatch, drain, enqueue, drainPendingSteering, restoreLeadSteeringFromDisk, autoClearBeforeSubmit, performSessionClear, restoreQueued, resetStats, clearUiActivityBeforeContextSync, resetTuiForPendingSessionReset, snapshotTuiBeforeSessionReset, restoreTuiAfterFailedSessionReset, resetStatsAndSyncContext };
+  return { leadSessionId, shouldMirrorSteeringEntry, commitSteeringQueueEntries, makeQueueEntry, removeQueuedEntries, requeueEntriesFront, dequeueQueueBatch, drain, enqueue, drainPendingSteering, restoreLeadSteeringFromDisk, autoClearBeforeSubmit, performSessionClear, restoreQueued, resetStats, clearUiActivityBeforeContextSync, resetTuiForPendingSessionReset, snapshotTuiBeforeSessionReset, restoreTuiAfterFailedSessionReset, commitTuiSessionReset, resetStatsAndSyncContext };
 }

package/src/tui/engine/turn.mjs

@@ -12,7 +12,7 @@ import { aggregateRawResult, aggregateBucketForCategory, aggregateSummaries, ass
 
 export function createRunTurn(bag) {
   const {
-    runtime, nextId, tuiDebug, LEAD_TURN_TIMEOUT_MS, flags, pending, itemIndexById, getState, set, pushItem, patchItem, replaceItems, updateStreamingTail: updateStreamingTailFromStore, settleStreamingTail: settleStreamingTailFromStore, clearStreamingTail: clearStreamingTailFromStore, pushNotice, pushUserOrSyntheticItem, markToolCallActive, markToolCallDone, clearActiveToolSummary, agentStatusState, routeState, syncContextStats, denyAllToolApprovals, requestToolApproval, patchToolCardResult, flushToolResults, flushDeferredExecutionPendingResumeKick, drain, drainPendingSteering,
+    runtime, nextId, tuiDebug, LEAD_TURN_TIMEOUT_MS, flags, pending, itemIndexById, getState, set, flushEmit, flushEmitImmediate, pushItem, appendItems, patchItem, replaceItems, updateStreamingTail: updateStreamingTailFromStore, settleStreamingTail: settleStreamingTailFromStore, clearStreamingTail: clearStreamingTailFromStore, pushNotice, pushUserOrSyntheticItem, markToolCallActive, markToolCallDone, clearActiveToolSummary, agentStatusState, routeState, syncContextStats, denyAllToolApprovals, requestToolApproval, patchToolCardResult, flushToolResults, flushDeferredExecutionPendingResumeKick, drain, drainPendingSteering,
   } = bag;
   // Small fallbacks keep isolated createRunTurn harnesses source-compatible;
   // the real engine supplies atomic implementations that also maintain revision.
@@ -179,6 +179,7 @@ export function createRunTurn(bag) {
           // drain-finally flush, so a deferred completion kick would never re-arm.
           // Fire it explicitly (idempotent: guarded by deferred flag + !busy).
           flushDeferredExecutionPendingResumeKick();
+          flushEmitImmediate?.();
         }, 5_000);
         watchdogGraceTimer.unref?.();
       }, delay);
@@ -354,6 +355,10 @@ export function createRunTurn(bag) {
     const appendItemsBatch = (newItems, extra = {}) => {
       if (!isCurrentTurn()) return;
       if (!newItems || !newItems.length) { set(extra); return; }
+      if (appendItems) {
+        appendItems(newItems, extra);
+        return;
+      }
       const base = getState().items.length;
       const items = [...getState().items, ...newItems];
       for (let i = 0; i < newItems.length; i++) {
@@ -1073,6 +1078,37 @@ export function createRunTurn(bag) {
           if (thinkingLastEndedAt) _pendingThinkingLastEndedAt = thinkingLastEndedAt;
           scheduleStreamFlush();
         },
+        onTextReset: ({ chars } = {}) => {
+          if (!isCurrentTurn()) return false;
+          const count = Math.max(0, Number(chars) || 0);
+          if (!count) return false;
+          flushStreamBatch();
+          assistantText = assistantText.slice(0, Math.max(0, assistantText.length - count));
+          currentAssistantText = currentAssistantText.slice(
+            0,
+            Math.max(0, currentAssistantText.length - count),
+          );
+          _streamScanLen = 0;
+          _lastNewlineIdx = -1;
+          _emittedNewlineIdx = -2;
+          _emittedVisibleText = '';
+          if (currentAssistantId) {
+            if (currentAssistantText) {
+              set({
+                streamingTail: {
+                  kind: 'assistant',
+                  id: currentAssistantId,
+                  text: currentAssistantText,
+                  streaming: true,
+                },
+              });
+            } else {
+              clearStreamingTail(currentAssistantId);
+              currentAssistantId = null;
+            }
+          }
+          return true;
+        },
         onAssistantText: (text) => {
           // Mid-turn assistant text that precedes a tool call. Providers that
           // stream via onTextDelta already accumulated it into assistantText;
@@ -1113,7 +1149,9 @@ export function createRunTurn(bag) {
         },
         onUsageDelta: (delta) => {
           if (!markTurnProgress('usage-delta')) return;
-          applyUsageDelta(getState().stats, delta);
+          const stats = { ...getState().stats };
+          applyUsageDelta(stats, delta);
+          set({ stats });
           syncContextStats({ allowEstimated: true });
           const currentTurnInput = Math.max(0, getState().stats.inputTokens - inputBaseline);
           const currentTurnOutput = Math.max(0, getState().stats.outputTokens - outputBaseline);
@@ -1269,7 +1307,7 @@ export function createRunTurn(bag) {
           && !assistantOutput
           && !producedTranscriptItem;
         if (!isNoOpTurn) {
-          getState().stats.turns = (getState().stats.turns || 0) + 1;
+          set({ stats: { ...getState().stats, turns: (getState().stats.turns || 0) + 1 } });
         }
         // Pin the post-think summary into the transcript right after this turn's
         // output so it scrolls up with the answer and stays in the scrollback,
@@ -1295,6 +1333,9 @@ export function createRunTurn(bag) {
     // Shared UI getState(): a stale unwind must not wipe a newer turn's live
     // tool-summary line (same epoch rule as the shared-getState() block above).
     if (flags.leadTurnEpoch === turnEpoch) clearActiveToolSummary();
+    // Turn completion is latency-sensitive and must publish busy=false plus all
+    // terminal transcript/card mutations as one final snapshot.
+    flushEmit?.();
     _publishedThinkingActive = false; // turn teardown cleared getState().thinking
     const finalStatus = cancelled ? 'cancelled' : (failed ? 'failed' : 'done');
     tuiDebug(`runTurn end turn=${turnIndex} status=${finalStatus} elapsedMs=${Date.now() - startedAt}${watchdogTripped ? ' watchdogTripped=1' : ''} pending=${pending.length}`);