mixdog 0.9.63 → 0.9.65

package/src/tui/engine/live-share.mjs

@@ -62,6 +62,7 @@ export function createLiveShare({
   getPublishedState,
   listeners,
   onRemoteSubmit,
+  onRemoteAbort,
   onOwnerClosed,
   viewerApply,
 }) {
@@ -73,6 +74,7 @@ export function createLiveShare({
   let lastItems = null;
   let lastTail = null;
   let lastSpinner = null;
+  let lastLiveSig = '';
 
   const broadcast = (frame) => {
     if (sockets.size === 0) return;
@@ -82,12 +84,49 @@ export function createLiveShare({
     }
   };
 
+  // Live-state mirror (attach parity): the transcript alone left an attached
+  // viewer blind to the owner's activity — busy/stop state, the queued
+  // follow-up list, the Explore/Search summary, agent workers/jobs, and the
+  // context gauge stats all live in owner process state. Mirror a compact
+  // subset so viewer surfaces render them natively. queued entries are
+  // projected to display fields only (content parts may carry images).
+  const LIVE_STATS_KEYS = [
+    'currentContextSource', 'currentContextTokens', 'currentEstimatedContextTokens',
+    'currentContextUpdatedAt', 'costUsd', 'turns', 'inputTokens', 'outputTokens',
+    'latestInputTokens', 'latestPromptTokens', 'contextTokens',
+  ];
+  const liveStateOf = (st) => {
+    const stats = st.stats && typeof st.stats === 'object' ? st.stats : {};
+    const statsSubset = {};
+    for (const key of LIVE_STATS_KEYS) {
+      if (stats[key] !== undefined) statsSubset[key] = stats[key];
+    }
+    return {
+      busy: st.busy === true,
+      commandBusy: st.commandBusy === true,
+      queued: (Array.isArray(st.queued) ? st.queued : []).map((entry) => ({
+        id: entry?.id,
+        text: String(entry?.displayText ?? entry?.text ?? entry?.message ?? '').slice(0, 2000),
+        ...(entry?.enqueuedAt ? { enqueuedAt: entry.enqueuedAt } : {}),
+      })),
+      activeToolSummary: st.activeToolSummary || null,
+      agentWorkers: Array.isArray(st.agentWorkers) ? st.agentWorkers : [],
+      agentJobs: Array.isArray(st.agentJobs) ? st.agentJobs : [],
+      ownerClientHostPid: Number(st.clientHostPid) || process.pid,
+      displayContextWindow: Number(st.displayContextWindow) || 0,
+      compactBoundaryTokens: Number(st.compactBoundaryTokens) || 0,
+      autoCompactTokenLimit: Number(st.autoCompactTokenLimit) || 0,
+      stats: statsSubset,
+    };
+  };
+
   const fullFrame = (st) => ({
     t: 'full',
     sessionId: serverId,
     items: Array.isArray(st.items) ? st.items : [],
     tail: st.streamingTail || null,
     spinner: st.spinner || null,
+    live: liveStateOf(st),
   });
 
   // Runs on every frame-batched publish. With no viewers it only re-baselines
@@ -98,6 +137,7 @@ export function createLiveShare({
       lastItems = st.items;
       lastTail = st.streamingTail;
       lastSpinner = st.spinner;
+      lastLiveSig = '';
       return;
     }
     const frame = { t: 'delta' };
@@ -155,6 +195,13 @@ export function createLiveShare({
       lastSpinner = st.spinner;
       dirty = true;
     }
+    const live = liveStateOf(st);
+    const liveSig = JSON.stringify(live);
+    if (liveSig !== lastLiveSig) {
+      frame.live = live;
+      lastLiveSig = liveSig;
+      dirty = true;
+    }
     if (dirty) broadcast(frame);
   };
   listeners.add(onPublish);
@@ -190,6 +237,10 @@ export function createLiveShare({
       attachLineReader(socket, (frame) => {
         if (frame.t === 'submit' && typeof frame.text === 'string' && frame.text.trim()) {
           onRemoteSubmit(frame.text);
+        } else if (frame.t === 'abort') {
+          // Viewer stop button: interrupt the owner's active turn here — the
+          // viewer process has no turn of its own to cancel.
+          onRemoteAbort?.();
         } else if (frame.t === 'sync') {
           try { socket.write(frameLine(fullFrame(getPublishedState()))); } catch { /* close handles */ }
         }
@@ -199,6 +250,7 @@ export function createLiveShare({
         lastItems = st.items;
         lastTail = st.streamingTail;
         lastSpinner = st.spinner;
+        lastLiveSig = JSON.stringify(liveStateOf(st));
         socket.write(frameLine(fullFrame(st)));
       } catch {
         try { socket.destroy(); } catch { /* already gone */ }
@@ -275,11 +327,48 @@ export function createLiveShare({
     else viewerApply.appendItems([item]);
   };
 
+  // Mirror the owner's live-state subset into the viewer store. Context stats
+  // merge over the local stats object so unmirrored accumulator fields keep
+  // their last local values instead of vanishing.
+  const applyLiveState = (live) => {
+    if (!live || typeof live !== 'object') return;
+    const patch = {
+      busy: live.busy === true,
+      commandBusy: live.commandBusy === true,
+      queued: Array.isArray(live.queued) ? live.queued : [],
+      activeToolSummary: live.activeToolSummary || null,
+      agentWorkers: Array.isArray(live.agentWorkers) ? live.agentWorkers : [],
+      agentJobs: Array.isArray(live.agentJobs) ? live.agentJobs : [],
+      ownerClientHostPid: Number(live.ownerClientHostPid) || 0,
+    };
+    for (const key of ['displayContextWindow', 'compactBoundaryTokens', 'autoCompactTokenLimit']) {
+      if (Number(live[key]) > 0) patch[key] = Number(live[key]);
+    }
+    if (live.stats && typeof live.stats === 'object' && Object.keys(live.stats).length > 0) {
+      const current = viewerApply.getState().stats;
+      patch.stats = { ...(current && typeof current === 'object' ? current : {}), ...live.stats };
+    }
+    viewerApply.set(patch);
+  };
+
+  // Owner gone (clean close, crash, or pipe drop): the mirrored activity is
+  // no longer authoritative — clear it so the viewer never shows a frozen
+  // spinner/queue while the promotion path takes over.
+  const clearMirroredLiveState = () => {
+    try {
+      viewerApply?.set?.({
+        busy: false, commandBusy: false, spinner: null, queued: [],
+        activeToolSummary: null, agentWorkers: [], agentJobs: [], ownerClientHostPid: 0,
+      });
+    } catch { /* viewer store already disposed */ }
+  };
+
   const applyViewerFrame = (frame, socket) => {
     if (frame.t === 'full') {
       viewerApply.replaceItems(Array.isArray(frame.items) ? frame.items : []);
       if (frame.tail) viewerApply.updateStreamingTail(frame.tail.id, frame.tail);
       viewerApply.set({ spinner: frame.spinner || null });
+      applyLiveState(frame.live);
       return;
     }
     if (frame.t !== 'delta') return;
@@ -307,6 +396,7 @@ export function createLiveShare({
       else viewerApply.clearStreamingTail();
     }
     if ('spinner' in frame) viewerApply.set({ spinner: frame.spinner || null });
+    if ('live' in frame) applyLiveState(frame.live);
   };
 
   const stopClient = () => {
@@ -335,6 +425,7 @@ export function createLiveShare({
       const wasUp = clientUp && client === socket;
       if (client === socket) { client = null; clientId = ''; clientUp = false; }
       try { socket.destroy(); } catch { /* already gone */ }
+      if (wasUp) clearMirroredLiveState();
       // A live link that dropped means the owner ended or crashed: nudge the
       // promotion path instead of waiting for the next store-mtime change.
       if (wasUp) onOwnerClosed?.(id, ownerClosed);
@@ -381,6 +472,15 @@ export function createLiveShare({
         return false;
       }
     },
+    sendAbort() {
+      if (!clientUp || !client) return false;
+      try {
+        client.write(frameLine({ t: 'abort' }));
+        return true;
+      } catch {
+        return false;
+      }
+    },
     dispose() {
       listeners.delete(onPublish);
       stopServer();

package/src/tui/engine/notification-plan.mjs

@@ -63,7 +63,7 @@ export function executionCardKey(event, text, parsed) {
   return `card:${executionId}:${hasBody}`;
 }
 
-export function isExecutionNotification(event, text, parsed) {
+function isExecutionNotification(event, text, parsed) {
   const meta = event?.meta && typeof event.meta === 'object' ? event.meta : {};
   if (meta.execution_id || meta.execution_surface) return true;
   if (parseAgentResultEnvelope(text)) return true;

package/src/tui/engine/queue-helpers.mjs

@@ -53,7 +53,7 @@ export function isSlashQueuedEntry(entry) {
   return text.trim().startsWith('/');
 }
 
-export function firstQueueLine(text) {
+function firstQueueLine(text) {
   return String(text || '').split('\n').map((line) => line.trim()).find(Boolean) || '';
 }
 
@@ -88,7 +88,7 @@ export function promptContentText(content) {
   return String(content ?? '');
 }
 
-export function timestampMs(value) {
+function timestampMs(value) {
   if (value == null || value === '') return 0;
   const n = Number(value);
   if (Number.isFinite(n) && n > 0) return n;
@@ -96,7 +96,7 @@ export function timestampMs(value) {
   return Number.isFinite(parsed) && parsed > 0 ? parsed : 0;
 }
 
-export function hasModelVisibleConversation(session) {
+function hasModelVisibleConversation(session) {
   const messages = Array.isArray(session?.messages) ? session.messages : [];
   return messages.some((message) => {
     const role = message?.role;

package/src/tui/engine/render-timing.mjs

@@ -17,12 +17,11 @@
  * The fixed timeout below is only a fallback ceiling for when no renderer ack is
  * wired (or the renderer is idle) so a yield can never hang the turn.
  */
-export const RENDER_ACK_FALLBACK_MS = 32;
-export const RENDER_ACK_HANG_GUARD_MS = 250;
-export const RENDER_SETTLE_IDLE_MS = 64;
+const RENDER_ACK_FALLBACK_MS = 32;
+const RENDER_ACK_HANG_GUARD_MS = 250;
+const RENDER_SETTLE_IDLE_MS = 64;
 
 // Back-compat alias: previously the fixed wait duration, now the fallback only.
-export const RENDER_THROTTLE_FLUSH_MS = RENDER_ACK_FALLBACK_MS;
 
 let pendingRenderAcks = [];
 let renderAckSeq = 0;
@@ -38,7 +37,7 @@ export const scheduleRenderFrameAck = () => {
   setImmediate(() => notifyRenderFrame(seq));
 };
 
-export const notifyRenderFrame = (seq = ++renderAckSeq) => {
+const notifyRenderFrame = (seq = ++renderAckSeq) => {
   if (pendingRenderAcks.length === 0) return;
   const acks = pendingRenderAcks;
   pendingRenderAcks = [];

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

@@ -58,7 +58,7 @@ export function restoredAssistantTranscriptItems(message, nextId) {
 // tool_calls and the follow-up role:'tool' results, but resume used to drop
 // both — a reopened session lost every tool marker (user bug). Rebuild one
 // transcript tool item per call and attach its result by tool_call_id.
-export function restoredToolCallItems(message, nextId, pendingByCallId) {
+function restoredToolCallItems(message, nextId, pendingByCallId) {
   const calls = Array.isArray(message?.tool_calls) ? message.tool_calls
     : Array.isArray(message?.toolCalls) ? message.toolCalls : [];
   const at = Number(message?.meta?.transcript?.at);
@@ -86,7 +86,7 @@ export function restoredToolCallItems(message, nextId, pendingByCallId) {
   return items;
 }
 
-export function attachRestoredToolResult(message, pendingByCallId) {
+function attachRestoredToolResult(message, pendingByCallId) {
   const callId = typeof message?.tool_call_id === 'string' && message.tool_call_id
     ? message.tool_call_id
     : typeof message?.toolCallId === 'string' ? message.toolCallId : '';
@@ -177,7 +177,7 @@ function buildRestoredAggregateItem(members) {
 // Runs of 1 keep the plain per-call card (its argument summary stays visible).
 // Agent cards never merge on restore: the live rule scopes Agent grouping to
 // a single provider batch, a boundary the stored history no longer carries.
-export function mergeRestoredToolItems(items) {
+function mergeRestoredToolItems(items) {
   const merged = [];
   let run = null; // { bucket, members: [{ item, category }] }
   const flushRun = () => {
@@ -515,6 +515,9 @@ export function createEngineApiB(bag) {
     getUsageDashboard: async (options = {}) => {
       return await runtime.getUsageDashboard?.(options);
     },
+    getTurnReviewDiff: async () => {
+      return (await runtime.getTurnReviewDiff?.()) ?? { supported: false, files: [], patch: '' };
+    },
     getOnboardingStatus: () => {
       return runtime.getOnboardingStatus?.() || { completed: true, workflowRoutes: {} };
     },

package/src/tui/engine/tool-result-status.mjs

@@ -13,7 +13,7 @@ import {
   toolResultTerminalStatus,
 } from '../../runtime/shared/tool-status.mjs';
 
-export const CANCELLED_RESULT_STATUS_LINE = '[status: cancelled]';
+const CANCELLED_RESULT_STATUS_LINE = '[status: cancelled]';
 
 // Detect a shell command that RAN but exited non-zero (a process exit code)
 // as opposed to a real tool-call failure (`[shell-tool-failed]`) or a
@@ -71,15 +71,15 @@ export function failureDetailText({ succeeded = 0, realErrors = 0, exitErrors =
   return parts.join(' · ');
 }
 
-export function normalizedResultStatusToken(value) {
+function normalizedResultStatusToken(value) {
   return normalizeToolTerminalStatus(value);
 }
 
-export function resultTextTerminalStatus(text) {
+function resultTextTerminalStatus(text) {
   return toolResultTerminalStatus(text);
 }
 
-export function itemHasKnownTerminalStatus(item, texts = []) {
+function itemHasKnownTerminalStatus(item, texts = []) {
   const settled = (token) => token === 'completed' || token === 'failed' || token === 'cancelled';
   if (settled(normalizedResultStatusToken(item?.args?.status))) return true;
   for (const text of texts) {
@@ -129,7 +129,7 @@ export function groupedToolResultText(group) {
   return '';
 }
 
-export function firstErrorLine(text) {
+function firstErrorLine(text) {
   const clean = toolErrorDisplay(text, 'tool');
   if (clean) return clean;
   for (const line of String(text || '').split('\n')) {

package/src/tui/engine/tool-result-text.mjs

@@ -52,7 +52,7 @@ function compactToolResultObjectFallback(obj) {
   }
 }
 
-export function toolResultPartText(part, depth = 0) {
+function toolResultPartText(part, depth = 0) {
   if (part == null) return '';
   if (depth > TOOL_RESULT_PART_MAX_DEPTH) return '';
   if (typeof part === 'string') return part;