mixdog 0.9.2 → 0.9.4

package/src/ui/statusline.mjs

@@ -9,47 +9,28 @@
  * reused as read-only data sources, but display identity always belongs to the
  * CLI route passed here.
  */
-import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { bold, colorEnabled, rgb } from './ansi.mjs';
-import { displayModelName, shortenModelName } from './model-display.mjs';
-import { createSessionStats } from './session-stats.mjs';
-import { forEachSessionRuntime } from '../runtime/agent/orchestrator/session/manager.mjs';
-import { listHiddenAgentNames } from '../runtime/agent/orchestrator/internal-agents.mjs';
-import { getModelMetadataSync } from '../runtime/agent/orchestrator/providers/model-catalog.mjs';
 import { readCachedOAuthUsageSnapshot } from '../runtime/agent/orchestrator/providers/oauth-usage.mjs';
 import { readCachedOpenCodeGoUsageSnapshot } from '../runtime/agent/orchestrator/providers/opencode-go-usage.mjs';
 import { buildGatewayLimits } from '../runtime/agent/orchestrator/providers/statusline-route-meta.mjs';
 import { compactBoundaryForStatus, formatGatewayLimitSegments, loadGatewayStatus } from '../vendor/statusline/bin/statusline-route.mjs';
+import { createSessionStats } from './session-stats.mjs';
+import {
+  FALLBACK_CONTEXT_WINDOW, statusSubtle,
+  R, B, D, GRN, YLW, RED,
+  terminalColumns, modelContextWindow, formatModelSegment,
+  formatContextSegment, colourPct, epochMsToHHMM,
+  num, formatElapsed,
+} from './statusline-format.mjs';
+import { shellJobsStatus, memoryCycleStatus } from './statusline-segments.mjs';
+import {
+  summarizeWorkerTags, agentStatuslinePayload, classifyAgentWorkers, activeHiddenAgentWorkers,
+} from './statusline-agents.mjs';
 export { createSessionStats, applyUsageDelta } from './session-stats.mjs';
+// Facade re-exports: keep these public symbols resolving from statusline.mjs.
+export { contextPctDisplayLabel } from './statusline-format.mjs';
 
-// Token window used to compute a fallback context% from our own session usage.
-// The live gateway (when up) overrides this with the real route's window. This
-// is only the last resort for unknown local models.
-const FALLBACK_CONTEXT_WINDOW = 200000;
-const statusText = rgb(198, 198, 198);
-const statusSubtle = rgb(136, 136, 136);
-const statusAccent = rgb(215, 119, 87);
-const DEFAULT_MIXDOG_HOME = process.env.MIXDOG_HOME || join(homedir(), '.mixdog');
-const DEFAULT_STANDALONE_DATA_DIR = join(DEFAULT_MIXDOG_HOME, 'data');
-
-function sgr(code) {
-  return colorEnabled() ? `\x1b[${code}m` : '';
-}
-
-const R = sgr('0');
-const B = sgr('1');
-const D = sgr('38;2;136;136;136');
-const GRN = sgr('38;2;0;170;75');
-const YLW = sgr('38;2;255;193;7');
-const RED = sgr('38;2;220;70;88');
-const CYN = sgr('38;2;136;136;136');
-const GREY = sgr('38;2;136;136;136');
-const SHELL_JOBS_SEGMENT_CACHE_MS = 1000;
 const GATEWAY_QUOTA_STATUS_CACHE_MS = 500;
 const WORKER_SPINNER_FRAMES = Object.freeze(['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']);
-const WORKER_SPINNER_FRAME_MS = 160;
 // L2 segment spinner: reuses the original WORKER_SPINNER_FRAMES dot glyphs (no
 // separate glyph list) but spins them at a faster 120ms step than the worker
 // spinner's 160ms. l2SpinnerFrame() indexes straight into WORKER_SPINNER_FRAMES.
@@ -61,11 +42,46 @@ const L2_SPINNER_FRAME_MS = 120;
 // replaces them. Snapshots from a previous launch stay hidden during boot so the
 // statusline starts empty until the current session captures usage once.
 const STATUSLINE_PROCESS_STARTED_AT_MS = Date.now() - Math.floor((Number(process.uptime?.()) || 0) * 1000);
-const DEFAULT_HIDDEN_STATUSLINE_AGENTS = Object.freeze(['explorer', 'cycle1-agent', 'cycle2-agent', 'cycle3-agent', 'scheduler-task', 'webhook-handler']);
-let _shellJobsSegmentCache = { ownerPid: 0, at: 0, value: { count: 0, elapsedLabel: '' } };
 let _gatewayQuotaStatusCache = { key: '', at: 0, value: null };
 let _fallbackQuotaStatusCache = { key: '', at: 0, value: null };
-let _hiddenStatuslineAgents = null;
+// Holds the last non-empty rendered L1 quota/usage segments per provider+route
+// key, but ONLY for providers that have actually armed the OAuth boot latch
+// (_oauthUsageArmedProviders) — non-OAuth providers (which oauthUsageSegmentReady
+// also returns true for, since they are never gated) must keep their exact
+// prior empty/null behavior, unaffected by this hold. Once armed and at least
+// one non-empty quota segment set has been rendered for a route, a transient
+// resolution failure (cache miss / gateway hiccup) that would otherwise
+// collapse quotaSegments to [] instead re-uses the last held segments, so the
+// L1 segment does not blink out. Replaced only when a newer non-empty result
+// lands for the SAME key. The key includes sessionId + clientHostPid because
+// rendered segments can embed session-scoped routeSpend — without those, a new
+// session sharing provider/model/effort/fast could reuse a stale prior
+// session's spend. Capped at a small LRU size so long-running processes that
+// cycle through many sessions/routes don't grow this map unbounded.
+const _lastNonEmptyQuotaSegmentsByKey = new Map();
+const LAST_NON_EMPTY_QUOTA_SEGMENTS_CACHE_MAX = 8;
+
+function quotaSegmentsHoldKey({ provider, model, effort, fast, sessionId, clientHostPid } = {}) {
+  return [
+    String(provider || '').trim().toLowerCase(),
+    String(model || '').trim(),
+    String(effort || '').trim(),
+    fast === true ? 'fast' : '',
+    String(sessionId || ''),
+    String(clientHostPid || ''),
+  ].join('\0');
+}
+
+function rememberNonEmptyQuotaSegments(key, segments) {
+  // Delete-then-set to bump this key to most-recently-used position (Map
+  // iterates in insertion order), then evict the oldest entry if over cap.
+  _lastNonEmptyQuotaSegmentsByKey.delete(key);
+  _lastNonEmptyQuotaSegmentsByKey.set(key, segments);
+  if (_lastNonEmptyQuotaSegmentsByKey.size > LAST_NON_EMPTY_QUOTA_SEGMENTS_CACHE_MAX) {
+    const oldestKey = _lastNonEmptyQuotaSegmentsByKey.keys().next().value;
+    _lastNonEmptyQuotaSegmentsByKey.delete(oldestKey);
+  }
+}
 // Option A boot gate: the L1 usage/quota segment stays fully empty until THIS
 // process has captured its FIRST confirmed (current-process) OAuth usage
 // snapshot for THAT provider. The latch is monotonic PER PROVIDER — once a
@@ -85,19 +101,6 @@ function isConfirmedCurrentProcessSnapshot(snapshot) {
   return cachedAt > 0 && cachedAt >= STATUSLINE_PROCESS_STARTED_AT_MS;
 }
 
-function summarizeWorkerTags(workers, limit = 3) {
-  const cleanLabels = [...new Set((Array.isArray(workers) ? workers : [])
-    .map((worker) => String(worker?.tag || '').trim())
-    .filter(Boolean))];
-  if (cleanLabels.length <= limit) return cleanLabels.join(', ');
-  return `${cleanLabels.slice(0, limit).join(', ')}, +${cleanLabels.length - limit}`;
-}
-
-function workerSpinnerFrame(now = Date.now()) {
-  const index = Math.floor(now / WORKER_SPINNER_FRAME_MS) % WORKER_SPINNER_FRAMES.length;
-  return WORKER_SPINNER_FRAMES[index] || WORKER_SPINNER_FRAMES[0];
-}
-
 function l2SpinnerFrame(now = Date.now()) {
   const index = Math.floor(now / L2_SPINNER_FRAME_MS) % WORKER_SPINNER_FRAMES.length;
   return WORKER_SPINNER_FRAMES[index] || WORKER_SPINNER_FRAMES[0];
@@ -114,21 +117,6 @@ function l2SpinnerFrame(now = Date.now()) {
  * model / context% / effort / 5H-7D are overridden by the live gateway via
  * loadGatewayStatus() when it's running; these are the standalone fallbacks.
  */
-function providerInputExcludesCache(provider) {
-  return String(provider || '').toLowerCase().includes('anthropic');
-}
-
-function promptFootprintTokens(provider, stats) {
-  const s = stats || createSessionStats();
-  const explicit = num(s.promptTokens);
-  if (explicit > 0) return explicit;
-  const input = num(s.inputTokens);
-  if (providerInputExcludesCache(provider)) {
-    return input + num(s.cachedTokens) + num(s.cacheWriteTokens);
-  }
-  return input;
-}
-
 function activeContextNumerator(provider, stats) {
   const s = stats || createSessionStats();
   const source = String(s.currentContextSource || '').toLowerCase();
@@ -144,18 +132,6 @@ function activeContextNumerator(provider, stats) {
   return 0;
 }
 
-function currentContextTokens(provider, stats) {
-  return activeContextNumerator(provider, stats);
-}
-
-function modelContextWindow(provider, model, explicitContextWindow = 0) {
-  const explicit = num(explicitContextWindow);
-  if (explicit > 0) return explicit;
-  const metaWindow = num(getModelMetadataSync(model, provider)?.contextWindow);
-  if (metaWindow > 0) return metaWindow;
-  return FALLBACK_CONTEXT_WINDOW;
-}
-
 function displayContextBoundary({
   contextWindow = 0,
   displayContextWindow = 0,
@@ -210,88 +186,6 @@ function resolveContextUsedPct({
   return 0;
 }
 
-function normalizeAgentWorkerForStatusline(worker = {}) {
-  const tag = String(worker.tag || worker.agent || worker.name || '').trim();
-  if (!tag) return null;
-  const statusText = String(worker.stage || worker.status || '').toLowerCase();
-  const status = isTerminalBridgeStatus(statusText) ? 'idle' : 'running';
-  return {
-    tag,
-    status,
-    startedAtMs: timeMs(worker.startedAt || worker.startTime || worker.createdAt),
-    agent: worker.agent || null,
-    stage: worker.stage || worker.status || null,
-    sessionId: worker.sessionId || null,
-    provider: worker.provider || null,
-    model: worker.model || null,
-  };
-}
-
-function normalizeAgentJobForStatusline(job = {}) {
-  const statusText = String(job.status || job.stage || '').toLowerCase();
-  if (!statusText) return null;
-  const taskId = String(job.task_id || job.taskId || '').trim();
-  const tag = String(job.tag || job.agent || job.type || taskId || '').trim();
-  if (!tag && !taskId) return null;
-  const startedAtMs = timeMs(job.startedAt);
-  const finishedAtMs = timeMs(job.finishedAt);
-  if (isTerminalBridgeStatus(statusText) && finishedAtMs > 0) {
-    return {
-      tag,
-      taskId,
-      status: 'finished',
-      finalStatus: statusText,
-      startedAtMs,
-      finishedAtMs,
-      agent: job.agent || null,
-      stage: job.stage || job.workerStatus || job.status || null,
-      sessionId: job.sessionId || null,
-      provider: job.provider || null,
-      model: job.model || null,
-    };
-  }
-  if (!/running/.test(statusText)) return null;
-  return {
-    tag,
-    taskId,
-    status: 'running',
-    startedAtMs,
-    agent: job.agent || null,
-    stage: job.stage || job.workerStatus || job.status || null,
-    sessionId: job.sessionId || null,
-    provider: job.provider || null,
-    model: job.model || null,
-  };
-}
-
-function agentStatuslinePayload(agentWorkers = [], agentJobs = []) {
-  const byTag = new Map();
-  const finishedJobs = [];
-  for (const worker of Array.isArray(agentWorkers) ? agentWorkers : []) {
-    const row = normalizeAgentWorkerForStatusline(worker);
-    if (row) byTag.set(row.tag, row);
-  }
-  for (const job of Array.isArray(agentJobs) ? agentJobs : []) {
-    const row = normalizeAgentJobForStatusline(job);
-    if (!row) continue;
-    if (row.status === 'finished') {
-      finishedJobs.push(row);
-      continue;
-    }
-    const prev = byTag.get(row.tag);
-    byTag.set(row.tag, { ...(prev || {}), ...row, status: 'running' });
-  }
-  const workers = [...byTag.values()];
-  return {
-    workers,
-    finishedJobs: finishedJobs.sort((a, b) => (b.finishedAtMs || 0) - (a.finishedAtMs || 0)),
-    sessions: {
-      roles: workers.filter((w) => w.status !== 'idle').map((w) => w.tag),
-      workers,
-    },
-  };
-}
-
 /**
  * Render the L1/L2 statusline footer from CLI state.
  *
@@ -380,9 +274,23 @@ function renderNativeStatusline({
   const quotaStatus = usageReady
     ? mergeQuotaStatus(gatewayStatus, fallbackQuotaStatus({ provider, model }))
     : null;
-  const quotaSegments = quotaStatus
+  let quotaSegments = quotaStatus
     ? formatGatewayLimitSegments(quotaStatus, { COLS: cols, D, R, GRN, YLW, RED, colourPct, epochMsToHHMM })
     : [];
+  // Only apply the hold to providers that actually armed the OAuth boot latch.
+  // oauthUsageSegmentReady() also returns true for non-OAuth providers (they
+  // are never gated), so gate the hold itself on _oauthUsageArmedProviders to
+  // keep non-OAuth empty/null behavior byte-for-byte unchanged.
+  const normalizedHoldProvider = String(provider || '').trim().toLowerCase();
+  if (usageReady && _oauthUsageArmedProviders.has(normalizedHoldProvider)) {
+    const holdKey = quotaSegmentsHoldKey({ provider, model, effort, fast, sessionId, clientHostPid });
+    if (quotaSegments.length) {
+      rememberNonEmptyQuotaSegments(holdKey, quotaSegments);
+    } else {
+      const held = _lastNonEmptyQuotaSegmentsByKey.get(holdKey);
+      if (held && held.length) quotaSegments = held;
+    }
+  }
   for (const seg of quotaSegments) addL1(seg);
 
   const agentPayload = agentStatuslinePayload([
@@ -425,20 +333,21 @@ function renderNativeStatusline({
     const label = `Running ${n} Shell${n === 1 ? '' : 's'}`;
     addL2(`${spin} ${B}${label}${R}${elapsedSuffix(shellStatus.elapsedLabel)}`);
   }
+  // Memory cycle segment — single unified "Memory" wording for all states:
+  // running -> "⠋ Memory · 12s"; backlog warning -> "⠋ Memory · backlog 512"
+  // (yellow). Nothing when idle (no L2 pollution).
+  const memStatus = memoryCycleStatus();
+  if (memStatus?.kind === 'running') {
+    const elapsed = formatElapsed(Date.now() - memStatus.startedAt);
+    addL2(`${spin} ${B}Memory${R}${elapsedSuffix(elapsed)}`);
+  } else if (memStatus?.kind === 'backlog') {
+    addL2(`${spin} ${B}Memory${R} ${D}·${R} ${YLW}backlog ${memStatus.pending}${R}`);
+  }
   const l1 = l1Parts.join(sep) || 'mixdog';
   const l2 = l2Parts.join(sep);
   return l2 ? `${l1}\n${l2}` : l1;
 }
 
-function terminalColumns() {
-  const cols = Number(process.stdout?.columns);
-  return Number.isFinite(cols) && cols > 0 ? Math.floor(cols) : 120;
-}
-
-function dataDir() {
-  return process.env.MIXDOG_DATA_DIR || DEFAULT_STANDALONE_DATA_DIR;
-}
-
 function loadGatewayQuotaStatus({
   provider, model, effort, fast, contextWindow, rawContextWindow, autoCompactTokenLimit = 0,
   sessionId, activeContextTokens, clientHostPid,
@@ -605,278 +514,6 @@ function mergeQuotaStatus(primary, fallback) {
   };
 }
 
-function formatModelSegment({ provider, model, effort, fast, cols }) {
-  const raw = String(model || '').trim();
-  const meta = getModelMetadataSync(raw, provider) || {};
-  const displayHint = String(meta.displayName || meta.display || meta.name || '').trim();
-  const modelName = shortenModelName(displayModelName(raw, provider, displayHint), cols);
-  const bits = [`${B}${modelName}${R}`];
-  if (effort) bits.push(`${B}${String(effort).toUpperCase()}${R}`);
-  if (fast === true) bits.push(`${B}FAST${R}`);
-  return bits.join(` ${D}·${R} `);
-}
-
-/** Display label for context % (clamped to 100); raw pct still drives bar/color thresholds. */
-export function contextPctDisplayLabel(ctxPct) {
-  const pct = Number(ctxPct);
-  if (!Number.isFinite(pct) || pct <= 0) return '0';
-  if (pct > 0 && pct < 1) return String(Math.round(pct * 10) / 10);
-  return String(Math.floor(Math.min(100, pct)));
-}
-
-function formatContextSegment(ctxPct, cols) {
-  const raw = Number(ctxPct);
-  const pct = Number.isFinite(raw) ? Math.max(0, raw) : 0;
-  const barPct = clampPct(pct);
-  const fill = pct >= 90 ? RED : pct >= 70 ? YLW : GRN;
-  const label = contextPctDisplayLabel(pct);
-  // Keep a full-width bar wherever there is room for one. Below 80 cols the bar
-  // is dropped (label-only) so the footer never overflows a narrow terminal;
-  // at 80+ it stays a fixed 14 cells instead of shrinking to 8, which read as
-  // too small/cramped on mid-width terminals.
-  const cells = cols >= 80 ? 14 : 0;
-  if (!cells) return `${fill}${label}%${R}`;
-  const bar = makeBar(barPct, cells);
-  const filled = bar.replace(/░/g, '');
-  const empty = bar.replace(/▓/g, '');
-  return `${fill}${filled}${R}${D}${empty}${R} ${label}%`;
-}
-
-function makeBar(pct, cells) {
-  let filled = Math.floor((Number(pct) || 0) * cells / 100);
-  if (filled < 0) filled = 0;
-  if (filled > cells) filled = cells;
-  if (pct >= 1 && filled === 0) filled = 1;
-  return '▓'.repeat(filled) + '░'.repeat(cells - filled);
-}
-
-function colourPct(p) {
-  if (p >= 90) return `${RED}${p}%${R}`;
-  if (p >= 70) return `${YLW}${p}%${R}`;
-  return `${GRN}${p}%${R}`;
-}
-
-function epochMsToHHMM(ms) {
-  const d = new Date(Number(ms));
-  if (!Number.isFinite(d.getTime())) return '';
-  return d.toLocaleTimeString('sv-SE', { hour: '2-digit', minute: '2-digit', hour12: false });
-}
-
-function classifyAgentWorkers(workers = []) {
-  const maintenance = [];
-  const runningWorkers = [];
-  const seenMaintenance = new Set();
-  const seenRunning = new Set();
-  for (const w of Array.isArray(workers) ? workers : []) {
-    const tag = String(w?.tag || '').trim();
-    if (!tag) continue;
-    const maint = hiddenWorkerLabel(w);
-    if (maint) {
-      if (w.status !== 'idle' && !seenMaintenance.has(maint)) {
-        seenMaintenance.add(maint);
-        maintenance.push(`${GRN}↻${R} ${B}${maint}${R}`);
-      }
-      continue;
-    }
-    if (w.status !== 'idle' && !seenRunning.has(tag)) {
-      seenRunning.add(tag);
-      runningWorkers.push(w);
-    }
-  }
-  return { maintenance, runningWorkers };
-}
-
-function hiddenWorkerLabel(worker = {}) {
-  const agent = String(worker?.agent || '').trim();
-  const tag = String(worker?.tag || '').trim();
-  return maintenanceLabel(agent) || (!agent ? maintenanceLabel(tag) : '');
-}
-
-function hiddenStatuslineAgents() {
-  if (_hiddenStatuslineAgents) return _hiddenStatuslineAgents;
-  const agents = new Set(DEFAULT_HIDDEN_STATUSLINE_AGENTS);
-  try {
-    for (const agent of listHiddenAgentNames()) {
-      const clean = String(agent || '').trim();
-      if (clean) agents.add(clean);
-    }
-  } catch {}
-  _hiddenStatuslineAgents = agents;
-  return agents;
-}
-
-function isActiveHiddenStatus(statusText) {
-  return /^(connecting|requesting|streaming|tool_running|running)$/i.test(String(statusText || '').trim());
-}
-
-function activeHiddenAgentWorkers({ sessionId = '', clientHostPid = 0 } = {}) {
-  const agents = hiddenStatuslineAgents();
-  const ownerPid = positiveInt(clientHostPid);
-  const ownerSessionId = String(sessionId || '').trim();
-  const rows = [];
-  try {
-    for (const [runtimeSessionId, entry] of forEachSessionRuntime() || []) {
-      if (!entry || entry.closed === true) continue;
-      const session = entry.session || null;
-      if (!session || session.closed === true) continue;
-      const agent = String(session?.agent || '').trim();
-      if (!agent || !agents.has(agent)) continue;
-      const id = session?.id || runtimeSessionId || null;
-      if (ownerSessionId && id === ownerSessionId) continue;
-      const sessionOwnerId = String(session?.ownerSessionId || '').trim();
-      if (sessionOwnerId && ownerSessionId && sessionOwnerId !== ownerSessionId) continue;
-      const pid = positiveInt(session?.clientHostPid);
-      if (ownerPid && pid && pid !== ownerPid) continue;
-      const stage = String(entry.stage || session?.stage || session?.status || '').trim().toLowerCase();
-      const status = String(session?.status || stage || '').trim().toLowerCase();
-      if (!isActiveHiddenStatus(stage || status)) continue;
-      rows.push({
-        tag: String(session?.agentTag || `${agent}:${id || rows.length}`).trim(),
-        agent,
-        status: 'running',
-        stage: stage || status || 'running',
-        sessionId: id,
-        provider: session?.provider || null,
-        model: session?.model || null,
-      });
-    }
-  } catch {}
-  return rows;
-}
-
-function isTerminalBridgeStatus(statusText) {
-  return /idle|done|complete|success|closed|error|fail|cancel|killed|timeout/.test(String(statusText || '').toLowerCase());
-}
-
-function timeMs(value) {
-  if (typeof value === 'number' && Number.isFinite(value) && value > 0) return value;
-  const n = Date.parse(String(value || ''));
-  return Number.isFinite(n) ? n : 0;
-}
-
-function maintenanceLabel(tag) {
-  switch (tag) {
-    case 'cycle1-agent': return 'cycle1';
-    case 'cycle2-agent': return 'cycle2';
-    case 'cycle3-agent': return 'cycle3';
-    case 'scheduler-task': return 'scheduler';
-    case 'webhook-handler': return 'webhook';
-    case 'explorer': return 'explorer';
-    default: return '';
-  }
-}
-
-function shellJobsStatus({ clientHostPid } = {}) {
-  const ownerPid = positiveInt(clientHostPid);
-  const empty = { count: 0, elapsedLabel: '' };
-  if (!ownerPid) return empty;
-  const now = Date.now();
-  if (_shellJobsSegmentCache.ownerPid === ownerPid && now - _shellJobsSegmentCache.at < SHELL_JOBS_SEGMENT_CACHE_MS) {
-    return _shellJobsSegmentCache.value || empty;
-  }
-  let value = empty;
-  try {
-    const dir = join(dataDir(), 'shell-jobs');
-    if (!existsSync(dir)) {
-      _shellJobsSegmentCache = { ownerPid, at: now, value };
-      return value;
-    }
-    const names = readdirSync(dir);
-    const done = new Set(names.filter((n) => n.endsWith('.done')).map((n) => n.slice(0, -5)));
-    const ownerByJob = new Map();
-    for (const n of names) {
-      const i = n.lastIndexOf('.owner-');
-      if (i > 0) {
-        const pid = positiveInt(n.slice(i + 7));
-        if (pid) ownerByJob.set(n.slice(0, i), pid);
-      }
-    }
-    const ids = names
-      .filter((n) => n.endsWith('.json'))
-      .map((n) => n.slice(0, -5))
-      .filter((id) => !done.has(id) && ownerByJob.get(id) === ownerPid)
-      .sort((a, b) => jobStampMs(b) - jobStampMs(a))
-      .slice(0, 30);
-    let count = 0;
-    let oldestMs = Infinity;
-    for (const id of ids) {
-      const p = join(dir, `${id}.json`);
-      let detail;
-      try { detail = JSON.parse(readFileSync(p, 'utf-8')); } catch { continue; }
-      if (!isShellJobAlive(detail, p, dir, id)) continue;
-      count++;
-      try {
-        const st = statSync(p);
-        if (st.mtimeMs < oldestMs) oldestMs = st.mtimeMs;
-      } catch {}
-    }
-    if (!count) {
-      _shellJobsSegmentCache = { ownerPid, at: now, value };
-      return value;
-    }
-    const elapsedLabel = Number.isFinite(oldestMs) ? formatElapsed(Date.now() - oldestMs) : '';
-    value = { count, elapsedLabel };
-  } catch {
-    value = empty;
-  }
-  _shellJobsSegmentCache = { ownerPid, at: now, value };
-  return value;
-}
-
-function isShellJobAlive(detail, detailPath, dir, id) {
-  const pid = positiveInt(detail?.pid);
-  if (!pid) return false;
-  try {
-    const st = statSync(detailPath);
-    const timeoutMs = Number(detail?.timeoutMs);
-    const enforced = detail?.timeoutEnforced === true || existsSync(join(dir, `${id}.enforced`));
-    if (enforced && Number.isFinite(timeoutMs) && timeoutMs > 0 && Date.now() - st.mtimeMs > timeoutMs + 30 * 60_000) {
-      return false;
-    }
-  } catch {
-    return false;
-  }
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (e) {
-    return e?.code === 'EPERM';
-  }
-}
-
-function jobStampMs(id) {
-  const m = /^job_(\d+)/.exec(String(id || ''));
-  return m ? Number(m[1]) : 0;
-}
-
-function positiveInt(value) {
-  const n = Number(value);
-  return Number.isInteger(n) && n > 0 ? n : 0;
-}
-
-// Byte-identical replica of src/tui/time-format.mjs formatDuration() with
-// DEFAULT options (no mostSignificantOnly / hideTrailingZeros), wrapped to drop
-// sub-1s like formatElapsed there. Output shape: '' (<1s), `Xs`, `Xm Ys`,
-// `Xh Ym Zs`, `Xd Yh Zm`. statusline.mjs is a standalone UI module that should
-// not depend on the React/ink TUI tree, so the algorithm is replicated rather
-// than imported. Used for ALL L2 elapsed (Agents/Explore/Search/Shell).
-function formatElapsed(ms) {
-  if (!Number.isFinite(Number(ms))) return '';
-  const value = Math.max(0, Number(ms) || 0);
-  if (value < 60_000) {
-    if (value < 1_000) return '';
-    return `${Math.floor(value / 1000)}s`;
-  }
-  const days = Math.floor(value / 86_400_000);
-  const hours = Math.floor((value % 86_400_000) / 3_600_000);
-  const minutes = Math.floor((value % 3_600_000) / 60_000);
-  const seconds = Math.floor((value % 60_000) / 1000);
-  if (days > 0) return `${days}d ${hours}h ${minutes}m`;
-  if (hours > 0) return `${hours}h ${minutes}m ${seconds}s`;
-  if (minutes > 0) return `${minutes}m ${seconds}s`;
-  return `${seconds}s`;
-}
-
 /** Minimal one-line footer used when the vendored renderer is unavailable. */
 export function fallbackStatusline({
   provider = '', model = '', effort = '', fast = false, cwd = '', stats, contextWindow = 0,
@@ -913,25 +550,3 @@ function fallbackLine({
   if (!parts.length) return statusSubtle('> mixdog');
   return parts.join(sep);
 }
-
-function num(v) {
-  const n = Number(v);
-  return Number.isFinite(n) ? n : 0;
-}
-
-function clampPct(v) {
-  const n = Number(v);
-  if (!Number.isFinite(n)) return 0;
-  return Math.max(0, Math.min(100, n));
-}
-
-/** Human-friendly token count: 1234 -> 1.2k. */
-function fmt(n) {
-  const v = Number(n) || 0;
-  if (v < 1000) return String(Math.round(v));
-  if (v < 1_000_000) {
-    const k = Math.round(v / 1000);
-    return k >= 1000 ? '1M' : `${k}k`;
-  }
-  return (v / 1_000_000).toFixed(1) + 'M';
-}

package/src/ui/tool-card.mjs

@@ -21,7 +21,6 @@ const SUMMARIZERS = {
   glob: (a) => joinMaybe(a.pattern) ?? a.path,
   grep: (a) => joinMaybe(a.pattern),
   shell: (a) => a.command,
-  diagnostics: (a) => a.path,
 };
 
 /**

package/src/vendor/statusline/bin/statusline-route.mjs

@@ -539,7 +539,14 @@ export function loadGatewayStatus(options = {}) {
     : true;
   const metricsOwnCurrentSession = !!(sessionStatus || gatewayCcSessionMatch || gatewayTranscriptMatch || activeTranscriptMatch);
   const metricsMatch = gatewayClientHostMatch && metricsOwnCurrentSession && routeMatchesConfigured;
-  const lastUsage = gatewayClientHostMatch && (sessionStatus || gatewayCcSessionMatch || gatewayTranscriptMatch) && active.gateway_last_usage && typeof active.gateway_last_usage === 'object'
+  // Strong ownership = this session's own status file or an explicit session/
+  // transcript id match from the gateway advert. `activeTranscriptMatch` (the
+  // global active-instance transcript merely naming the current session) is NOT
+  // strong: right after /new the global record can already point at the new
+  // session while its stored gateway metrics (context pct, last usage) still
+  // belong to the previous one.
+  const strongSessionOwnership = !!(sessionStatus || gatewayCcSessionMatch || gatewayTranscriptMatch);
+  const lastUsage = gatewayClientHostMatch && strongSessionOwnership && active.gateway_last_usage && typeof active.gateway_last_usage === 'object'
     ? active.gateway_last_usage
     : null;
   const lastCompact = lastUsage?.compact && typeof lastUsage.compact === 'object'
@@ -593,7 +600,13 @@ export function loadGatewayStatus(options = {}) {
     rawContextWindow: configured?.rawContextWindow ?? num(active.gateway_raw_context_window, null),
     effectiveContextWindowPercent: configured?.effectiveContextWindowPercent ?? num(active.gateway_effective_context_window_percent, null),
     autoCompactTokenLimit: statusAutoCompactTokenLimit,
-    contextUsedPct: metricsMatch ? recomputedContextUsedPct ?? num(active.gateway_context_used_pct, null) : null,
+    // Live recompute (from the caller's own context tokens) may use the weaker
+    // metricsMatch gate, but the STORED gateway_context_used_pct fallback needs
+    // strong ownership — otherwise a fresh /new session with a not-yet-updated
+    // active-instance record would keep showing the old session's context %.
+    contextUsedPct: metricsMatch
+      ? recomputedContextUsedPct ?? (strongSessionOwnership ? num(active.gateway_context_used_pct, null) : null)
+      : null,
     lastUsage,
     quotaWindows: activeQuotaWindows.length ? activeQuotaWindows : (configuredStatus?.quotaWindows || []),
     balance: metricsMatch && active.gateway_balance && typeof active.gateway_balance === 'object' ? active.gateway_balance : (configuredStatus?.balance || null),