mixdog 1.1.1 → 1.2.0

package/src/runtime/shared/statusline/statusline-segments.mjs

@@ -23,7 +23,13 @@ const SHELL_JOBS_SEGMENT_CACHE_MS = 1000;
 // Session buckets ride along with the owner-wide totals: one host process can
 // own many sessions (the desktop pools every pane's engine), so a pane must be
 // able to ask for ITS OWN jobs instead of the process aggregate.
-const EMPTY_SHELL_JOBS_SESSION = Object.freeze({ count: 0, elapsedLabel: '', jobs: Object.freeze([]) });
+const FINISHED_SHELL_JOB_TTL_MS = 30 * 60 * 1000;
+const EMPTY_SHELL_JOBS_SESSION = Object.freeze({
+  count: 0,
+  elapsedLabel: '',
+  jobs: Object.freeze([]),
+  finished: Object.freeze([]),
+});
 const EMPTY_SHELL_JOBS = Object.freeze({
   count: 0,
   elapsedLabel: '',
@@ -31,8 +37,20 @@ const EMPTY_SHELL_JOBS = Object.freeze({
   sessions: Object.freeze({}),
 });
 
-let _shellJobsSegmentCache = { ownerPid: 0, at: 0, value: EMPTY_SHELL_JOBS };
-let _shellJobsRefreshInFlight = false;
+// One entry per owner pid: a desktop host polls under whichever session frame
+// arrived last, so the owner can alternate between processes. A single shared
+// slot answered every switch with "no jobs" and made the job list flicker.
+const _shellJobsSegmentCache = new Map();
+const _shellJobsRefreshInFlight = new Set();
+const SHELL_JOBS_OWNER_CACHE_TTL_MS = 60_000;
+
+function rememberShellJobs(ownerPid, value) {
+  const at = Date.now();
+  for (const [pid, entry] of _shellJobsSegmentCache) {
+    if (at - entry.at > SHELL_JOBS_OWNER_CACHE_TTL_MS) _shellJobsSegmentCache.delete(pid);
+  }
+  _shellJobsSegmentCache.set(ownerPid, { at, value });
+}
 
 function dataDir() {
   return process.env.MIXDOG_DATA_DIR || DEFAULT_STANDALONE_DATA_DIR;
@@ -50,15 +68,15 @@ export function shellJobsStatus({ clientHostPid, sessionId } = {}) {
   const scope = String(sessionId ?? '').trim();
   if (!ownerPid) return scoped ? EMPTY_SHELL_JOBS_SESSION : EMPTY_SHELL_JOBS;
   const now = Date.now();
-  const sameOwner = _shellJobsSegmentCache.ownerPid === ownerPid;
-  const fresh = sameOwner && now - _shellJobsSegmentCache.at < SHELL_JOBS_SEGMENT_CACHE_MS;
-  if (!fresh && !_shellJobsRefreshInFlight) {
-    _shellJobsRefreshInFlight = true;
+  const cached = _shellJobsSegmentCache.get(ownerPid);
+  const fresh = cached && now - cached.at < SHELL_JOBS_SEGMENT_CACHE_MS;
+  if (!fresh && !_shellJobsRefreshInFlight.has(ownerPid)) {
+    _shellJobsRefreshInFlight.add(ownerPid);
     refreshShellJobsStatus(ownerPid).finally(() => {
-      _shellJobsRefreshInFlight = false;
+      _shellJobsRefreshInFlight.delete(ownerPid);
     });
   }
-  const value = sameOwner ? _shellJobsSegmentCache.value || EMPTY_SHELL_JOBS : EMPTY_SHELL_JOBS;
+  const value = cached?.value || EMPTY_SHELL_JOBS;
   if (!scoped) return value;
   return (scope && value.sessions?.[scope]) || EMPTY_SHELL_JOBS_SESSION;
 }
@@ -123,10 +141,10 @@ async function refreshShellJobsStatus(ownerPid) {
     try {
       names = await readdir(dir);
     } catch {
-      _shellJobsSegmentCache = { ownerPid, at: Date.now(), value };
+      rememberShellJobs(ownerPid, value);
       return;
     }
-    const { ids, ownerByJob } = listOpenShellJobs(names);
+    const { ids, ownerByJob, doneIds } = listOpenShellJobs(names);
     let count = 0;
     let oldestMs = Infinity;
     const jobs = [];
@@ -143,6 +161,10 @@ async function refreshShellJobsStatus(ownerPid) {
         continue;
       }
       if (!(await isShellJobAlive(detail, p, dir, id))) continue;
+      // A foreground command is awaited in its own tool card; listing it here
+      // made every short command flash in and out of the shell list. Only
+      // backgrounded jobs (including promoted ones) are background work.
+      if (detail?.foreground === true) continue;
       // Owner-wide totals stay this process's own; session buckets take every
       // live job regardless of which host published it.
       const ownedByThisHost = ownerByJob.get(id) === ownerPid;
@@ -162,12 +184,39 @@ async function refreshShellJobsStatus(ownerPid) {
       };
       if (ownedByThisHost) jobs.push(job);
       if (!owner) continue;
-      const bucket = bySession.get(owner) || { count: 0, oldestMs: Infinity, jobs: [] };
+      const bucket = bySession.get(owner) || { count: 0, oldestMs: Infinity, jobs: [], finished: [] };
       bucket.count += 1;
       if (jobMs < bucket.oldestMs) bucket.oldestMs = jobMs;
       bucket.jobs.push(job);
       bySession.set(owner, bucket);
     }
+    // Recently finished background jobs ride in their session bucket only;
+    // they never touch the running counts.
+    const finishedCutoff = Date.now() - FINISHED_SHELL_JOB_TTL_MS;
+    for (const id of doneIds) {
+      let detail;
+      try {
+        detail = JSON.parse(await readFile(join(dir, `${id}.json`), 'utf-8'));
+      } catch {
+        continue;
+      }
+      if (detail?.foreground === true) continue;
+      const owner = String(detail?.ownerSessionId ?? '').trim();
+      if (!owner) continue;
+      const finishedMs = Date.parse(detail?.finishedAt || detail?.recordedAt || '');
+      if (Number.isFinite(finishedMs) && finishedMs < finishedCutoff) continue;
+      const bucket = bySession.get(owner) || { count: 0, oldestMs: Infinity, jobs: [], finished: [] };
+      bucket.finished.push({
+        taskId: id,
+        command: String(detail?.command || '').trim(),
+        cwd: String(detail?.cwd || '').trim(),
+        startedAt: detail?.startedAt || null,
+        status: String(detail?.status || ''),
+        exitCode: Number.isInteger(detail?.exitCode) ? detail.exitCode : null,
+        finishedAt: detail?.finishedAt || detail?.recordedAt || null,
+      });
+      bySession.set(owner, bucket);
+    }
     // A desktop pane's job lands in a session bucket while the owner-wide
     // count stays 0 (its publisher is a shard, not this host), so an empty
     // aggregate must NOT discard the session buckets.
@@ -175,7 +224,7 @@ async function refreshShellJobsStatus(ownerPid) {
   } catch {
     value = EMPTY_SHELL_JOBS;
   }
-  _shellJobsSegmentCache = { ownerPid, at: Date.now(), value };
+  rememberShellJobs(ownerPid, value);
 }
 
 // Newest-first, capped ids of job records with no `.done` marker, plus the
@@ -209,7 +258,11 @@ function listOpenShellJobs(names) {
     // the per-refresh cap doubles with it; a live (non-.done) record set is
     // a handful in practice and terminal ones age out on their own.
     .slice(0, 60);
-  return { ids, ownerByJob };
+  const doneIds = [...done]
+    .filter((id) => names.includes(`${id}.json`))
+    .sort((a, b) => jobStampMs(b) - jobStampMs(a))
+    .slice(0, 30);
+  return { ids, ownerByJob, doneIds };
 }
 
 function summarizeShellJobs({ count, oldestMs, jobs, bySession }) {
@@ -221,6 +274,7 @@ function summarizeShellJobs({ count, oldestMs, jobs, bySession }) {
       count: bucket.count,
       elapsedLabel: Number.isFinite(bucket.oldestMs) ? formatElapsed(now - bucket.oldestMs) : '',
       jobs: bucket.jobs,
+      finished: bucket.finished,
     };
   }
   return { count, elapsedLabel, jobs, sessions };

package/src/runtime/shared/tool-surface.mjs

@@ -1,6 +1,6 @@
 // ── Facade: tool-surface primitives + result summaries are re-exported from
-// their cohesive modules so every existing importer resolves unchanged. This
-// file keeps the display-name / arg-summary and aggregate-card clusters.
+// their cohesive modules. This file keeps the display-name / arg-summary and
+// aggregate-card clusters.
 import {
   DEFAULT_SUMMARY_MAX,
   AGENT_SURFACE_BRIEF_MAX,
@@ -140,6 +140,8 @@ export function displayToolName(name, args = {}) {
       return 'Media';
     case 'tidy':
       return 'Tidy';
+    case 'visualize':
+      return 'Visualize';
     case 'list_mcp_resources':
     case 'list_mcp_resource_templates':
     case 'cwd':
@@ -310,6 +312,11 @@ export function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}
     }
     case 'terminal':
       return compactParts([String(a.action || ''), a.tab ? `tab ${a.tab}` : '']);
+    case 'visualize': {
+      const input = a.input && typeof a.input === 'object' ? a.input : {};
+      const targets = Array.isArray(input.targets) ? input.targets.map(String).join(', ') : '';
+      return compactParts([String(a.action || ''), targets || String(input.tab || '')]);
+    }
     case 'office':
       return compactParts([String(a.action || ''), pathOrId(a.path, a.session, max)]);
     case 'media':

package/src/runtime/shared/tool-work-units.mjs

@@ -82,6 +82,7 @@ const TOOL_CATEGORY = new Map([
   ['office', 'Office'],
   ['media', 'Media'],
   ['tidy', 'Tidy'],
+  ['visualize', 'Visualize'],
   ['list_mcp_resources', 'Setup'],
   ['list_mcp_resource_templates', 'Setup'],
   ['cwd', 'Setup'],
@@ -124,6 +125,7 @@ const CATEGORY_COPY = new Map([
   ['Office', { active: 'Editing', done: 'Edited', noun: 'document action' }],
   ['Media', { active: 'Generating', done: 'Generated', noun: 'media action' }],
   ['Tidy', { active: 'Tidying', done: 'Tidied', noun: 'cleanup pass' }],
+  ['Visualize', { active: 'Showing', done: 'Showed', noun: 'artifact' }],
   ['Other', { active: 'Calling', done: 'Called', noun: 'tool' }],
 ]);
 
@@ -338,6 +340,17 @@ function officeUnit(a) {
   return unitDescriptor('Office', { count: 1, active, done, noun: 'document action', effect: true });
 }
 
+function visualizeUnit(a) {
+  const action = String(a.action || '').toLowerCase();
+  if (action === 'capture') return unitDescriptor('Visualize', { count: 1, active: 'Capturing', done: 'Captured', noun: 'screenshot' });
+  if (action === 'export') return unitDescriptor('Visualize', { count: 1, active: 'Exporting', done: 'Exported', noun: 'file' });
+  if (action === 'annotate') return unitDescriptor('Visualize', { count: 1, active: 'Marking', done: 'Marked', noun: 'annotation' });
+  if (action === 'check') return unitDescriptor('Visualize', { count: 1, active: 'Checking', done: 'Checked', noun: 'page' });
+  if (action === 'inspect') return unitDescriptor('Visualize', { count: 1, active: 'Inspecting', done: 'Inspected', noun: 'page' });
+  if (action === 'close') return unitDescriptor('Visualize', { count: 1, active: 'Closing', done: 'Closed', noun: 'tab' });
+  return unitDescriptor('Visualize', { count: 1, active: 'Showing', done: 'Showed', noun: 'artifact' });
+}
+
 function terminalUnit(a) {
   return String(a.action || '').toLowerCase() === 'list'
     ? unitDescriptor('Terminal', { count: 1, active: 'Listing', done: 'Listed', noun: 'terminal tab' })
@@ -642,6 +655,7 @@ const TOOL_UNITS = new Map([
   ['setup', setupUnit],
   ['media', mediaUnit],
   ['tidy', tidyUnit],
+  ['visualize', visualizeUnit],
   ['fetch', fetchUnit],
   ['recall', memoryReadUnit],
   ['recall_memory', memoryReadUnit],

package/src/runtime/shared/transcript-metadata.mjs

@@ -21,14 +21,29 @@ export function createTranscriptRouteMetadata(session, route = {}, at = Date.now
   return { at, ...transcriptRouteMetadataFields({ modelId, model, provider, agent }) };
 }
 
+/** A new stable message id (`meta.transcript.messageId`). */
+export function newTranscriptMessageId() {
+  return `msg_${globalThis.crypto.randomUUID().replaceAll('-', '')}`;
+}
+
+export const stableMessageId = (value) => (typeof value === 'string' && value ? value : newTranscriptMessageId());
+
+// Every persisted prompt/reply carries a stable `messageId` from creation on.
+// Compaction rewrites copy `meta`, so the id survives them; the display-only
+// compaction archive and a live view tell dropped rows from rewritten ones
+// by it. A surface that drew the row first passes its id in.
 export function persistedUserTranscriptMetadata(value) {
   if (!value || typeof value !== 'object') return null;
   return {
+    messageId: stableMessageId(value.messageId),
     ...(Number.isFinite(Number(value.at)) ? { at: Number(value.at) } : {}),
     ...transcriptRouteMetadataFields(value),
     ...(typeof value.sender === 'string' && value.sender ? { sender: value.sender } : {}),
     // The device that submitted the prompt (host-stamped display name).
     ...(typeof value.device === 'string' && value.device ? { device: value.device } : {}),
+    // The turn's change-record key (the outer prompt id), so a restored user
+    // row still addresses its turn's Undo/Reapply.
+    ...(typeof value.checkpointId === 'string' && value.checkpointId ? { checkpointId: value.checkpointId } : {}),
   };
 }
 
@@ -37,5 +52,6 @@ export function persistedAssistantTranscriptMetadata(value, fallbackAt = Date.no
   const candidateAt = Number(value.assistantAt);
   const assistantAt = Number.isFinite(candidateAt) && candidateAt > 0 ? candidateAt : fallbackAt;
   value.assistantAt = assistantAt;
-  return { at: assistantAt, ...transcriptRouteMetadataFields(value) };
+  value.assistantMessageId = stableMessageId(value.assistantMessageId);
+  return { messageId: value.assistantMessageId, at: assistantAt, ...transcriptRouteMetadataFields(value) };
 }