mixdog 0.9.46 → 0.9.49

package/src/tui/engine/agent-job-feed.mjs

@@ -79,6 +79,9 @@ export function createAgentJobFeed({
   const terminalExecutionNotificationKeys = new Set();
   const terminalExecutionResponseKeys = new Set();
   const executionNotificationKeys = new Map();
+  const AGENT_STATUS_COALESCE_MS = 16;
+  let agentStatusRefreshTimer = null;
+  let agentStatusRefreshForce = false;
 
   const clearExecutionDedupState = () => {
     displayedExecutionNotificationKeys.clear();
@@ -261,7 +264,16 @@ export function createAgentJobFeed({
     if (!parsed?.taskId) return;
     const status = String(parsed.status || '').toLowerCase();
     const terminal = /^(completed|complete|done|success|succeeded|ok|failed|error|timeout|killed|cancelled|canceled|denied)$/.test(status);
-    set(agentStatusState(terminal ? { force: true } : undefined));
+    agentStatusRefreshForce = agentStatusRefreshForce || terminal;
+    if (agentStatusRefreshTimer) return;
+    agentStatusRefreshTimer = setTimeout(() => {
+      agentStatusRefreshTimer = null;
+      if (getDisposed()) return;
+      const force = agentStatusRefreshForce;
+      agentStatusRefreshForce = false;
+      set(agentStatusState(force ? { force: true } : undefined));
+    }, AGENT_STATUS_COALESCE_MS);
+    agentStatusRefreshTimer.unref?.();
   }
 
   function subscribeRuntimeNotifications() {
@@ -399,7 +411,14 @@ export function createAgentJobFeed({
       return true;
     });
     return () => {
-      try { unsubscribe?.(); } finally { clearExecutionDedupState(); }
+      try {
+        unsubscribe?.();
+      } finally {
+        if (agentStatusRefreshTimer) clearTimeout(agentStatusRefreshTimer);
+        agentStatusRefreshTimer = null;
+        agentStatusRefreshForce = false;
+        clearExecutionDedupState();
+      }
     };
   }
 

package/src/tui/engine/turn.mjs

@@ -1007,8 +1007,12 @@ export function createRunTurn(bag) {
             label: compactEventLabel(event),
             detail: compactEventDetail(event),
           });
+          // Compaction itself remains owned by the pre-provider-send pass.
+          // This event only refreshes the gauge from the already-mutated
+          // transcript before another render can show stale pressure.
+          syncContextStats({ allowEstimated: true });
         },
-        onStageChange: async (stage) => {
+        onStageChange: async (stage, detail = null) => {
           if (!markTurnProgress(`stage:${String(stage || '')}`)) return;
           if (!getState().spinner) return;
           const value = String(stage || '');
@@ -1031,6 +1035,13 @@ export function createRunTurn(bag) {
             await yieldToRenderer();
             return;
           }
+          if (value === 'reconnecting') {
+            compactingActive = false;
+            const retryVerb = String(detail?.message || 'Reconnecting');
+            set({ spinner: { ...getState().spinner, mode: 'reconnecting', verb: retryVerb } });
+            await yieldToRenderer();
+            return;
+          }
           if (value === 'requesting' || value === 'streaming') compactingActive = false;
           const mode = value === 'requesting'
             ? 'requesting'

package/src/tui/markdown/measure-rendered-rows.mjs

@@ -67,7 +67,7 @@ export function measureStreamingMarkdownRenderedRows(text, columns, streamKey) {
   if (!value) return 1;
   const parts = resolveStreamingMarkdownParts(value, streamKey);
   if (parts.plain) {
-    return measureMarkdownRenderedRows(value, columns, { trimPartialFences: false });
+    return estimateWrappedRowsFallback(parts.unstableForRender, columns, 3);
   }
   let rows = 0;
   let childCount = 0;

package/src/tui/markdown/streaming-markdown.mjs

@@ -5,6 +5,7 @@
 import { marked } from 'marked';
 import { configureMarked, hasMarkdownSyntax } from './render-ansi.mjs';
 import { trimPartialClosingFences, findOpenFenceStart } from './stream-fence.mjs';
+import { displayWidth } from '../display-width.mjs';
 
 const stablePrefixByStreamKey = new Map();
 // Reuse the current normalized-text split across measure → render → harvest.
@@ -16,6 +17,25 @@ export function streamingLayoutText(text) {
   return String(text ?? '').replace(/^\n+|\n+$/g, '');
 }
 
+export function windowPlainStreamingText(text, columns, maxRows) {
+  const value = streamingLayoutText(text);
+  const rowBudget = Math.max(0, Math.floor(Number(maxRows) || 0));
+  if (!value || rowBudget <= 0 || hasMarkdownSyntax(value)) return value;
+  const lines = value.split('\n');
+  const width = Math.max(1, Math.floor(Number(columns) || 80));
+  let rows = 0;
+  let start = lines.length;
+  while (start > 0) {
+    const line = lines[start - 1];
+    const lineRows = Math.max(1, Math.ceil(displayWidth(line) / width));
+    if (rows > 0 && rows + lineRows > rowBudget) break;
+    rows += lineRows;
+    start -= 1;
+    if (rows >= rowBudget) break;
+  }
+  return start > 0 ? lines.slice(start).join('\n') : value;
+}
+
 function isWhitespaceOnlyText(text) {
   return !String(text ?? '').trim();
 }

package/src/ui/statusline.mjs

@@ -189,7 +189,7 @@ function displayContextBoundary({
   return modelContextWindow('', '', boundarySeed);
 }
 
-function resolveContextUsedPct({
+export function resolveContextUsedPct({
   provider = '',
   model = '',
   stats = null,
@@ -210,10 +210,10 @@ function resolveContextUsedPct({
     autoCompactTokenLimit,
     compact,
   });
-  // Boundary-only denominator: context % is always measured against the single
-  // compaction boundary value (shared with the gateway), never against a
-  // separate auto-compact trigger. This keeps the statusline and gateway
-  // display on the same denominator with no before/after trigger semantics.
+  const trigger = num(autoCompactTokenLimit);
+  // A resolved trigger means this is the runtime compaction gauge: keep both
+  // operands local so a gateway boundary percentage cannot replace it.
+  if (trigger > 0) return (numerator / trigger) * 100;
   const gatewayRawPct = gatewayStatus?.contextUsedPct;
   if (
     gatewayStatus

package/src/vendor/statusline/src/gateway/session-routes.mjs

@@ -140,22 +140,30 @@ export function readLatestGatewayHostRoute(clientHostPid, options = {}) {
   return best;
 }
 
-export function writeGatewaySessionRoute(sessionId, route, options = {}) {
-  const sid = normalizeGatewaySessionId(sessionId);
-  const normalized = normalizeGatewayRouteSection(route || {});
-  if (!sid || !normalized) return false;
-  const pid = normalizeClientHostPid(options?.clientHostPid ?? route?.clientHostPid);
+export function writeGatewaySessionRoutes(entries = []) {
+  const normalizedEntries = [];
+  for (const entry of Array.isArray(entries) ? entries : []) {
+    const sid = normalizeGatewaySessionId(entry?.sessionId);
+    const route = normalizeGatewayRouteSection(entry?.route || {});
+    if (!sid || !route) continue;
+    const pid = normalizeClientHostPid(entry?.options?.clientHostPid ?? entry?.route?.clientHostPid);
+    normalizedEntries.push({ sid, route, pid });
+  }
+  if (normalizedEntries.length === 0) return false;
   try {
     updateJsonAtomicSync(gatewaySessionRoutesPath(), (curRaw) => {
       const cur = curRaw && typeof curRaw === 'object' ? curRaw : {};
       const sessions = cur.sessions && typeof cur.sessions === 'object' ? { ...cur.sessions } : {};
       const sessionHosts = cur.sessionHosts && typeof cur.sessionHosts === 'object' ? { ...cur.sessionHosts } : {};
-      if (pid) {
-        sessionHosts[hostRouteKey(sid, pid)] = { ...normalized, sessionId: sid, clientHostPid: pid, updatedAt: Date.now() };
-      } else {
-        sessions[sid] = { ...normalized, sessionId: sid, updatedAt: Date.now() };
+      const updatedAt = Date.now();
+      for (const { sid, route, pid } of normalizedEntries) {
+        if (pid) {
+          sessionHosts[hostRouteKey(sid, pid)] = { ...route, sessionId: sid, clientHostPid: pid, updatedAt };
+        } else {
+          sessions[sid] = { ...route, sessionId: sid, updatedAt };
+        }
       }
-      return { version: 2, updatedAt: Date.now(), sessions, sessionHosts };
+      return { version: 2, updatedAt, sessions, sessionHosts };
     }, { compact: true, fsync: false, fsyncDir: false });
     return true;
   } catch {
@@ -163,6 +171,10 @@ export function writeGatewaySessionRoute(sessionId, route, options = {}) {
   }
 }
 
+export function writeGatewaySessionRoute(sessionId, route, options = {}) {
+  return writeGatewaySessionRoutes([{ sessionId, route, options }]);
+}
+
 export function clearGatewaySessionRoute(sessionId, options = {}) {
   const sid = normalizeGatewaySessionId(sessionId);
   if (!sid) return false;