@volter/supercode-orchestrator 0.4.78 → 0.4.80

package/board/workflow.mjs

@@ -5,7 +5,7 @@
 // the engine's primitives (the rows Hermes's tables hold); the I/O an action asks for (stopping a worker, closing a
 // pane, sending a session a message, cleaning a workspace) is answered as effects the caller runs after commit.
 import { spawnSync } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
+import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { resolve, relative, isAbsolute } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { actorOf, event as record, json, now } from './store.mjs';
@@ -78,11 +78,33 @@ function pattern(p) {
 
 // the time of the latest commit that names `id` in its message, on any ref of the repository at `path` (a worktree's
 // pushes land on the shared remote-tracking refs), or null (asked only when an expression does)
+const commitTimes = new Map();
 function lastCommitAt(path, id) {
   if (!path) return null;
-  const r = spawnSync('git', ['-C', path, 'log', '--all', '-1', '--format=%ct', '--fixed-strings', `--grep=${id}`], { encoding: 'utf8', timeout: 10_000 });
-  const t = Number(r.stdout?.trim());
-  return r.status === 0 && Number.isFinite(t) && t > 0 ? t : null;
+  const key = `${path}:${id}`;
+  const cached = commitTimes.get(key);
+  if (cached && now() - cached.at < 15) return cached.value;
+  const readCommit = (repo) => {
+    const r = spawnSync('git', ['-C', repo, 'log', '--all', '-1', '--format=%ct', '--fixed-strings', `--grep=${id}`], { encoding: 'utf8', timeout: 10_000 });
+    const value = Number(r.stdout?.trim());
+    return { repo: r.status === 0, value: Number.isFinite(value) && value > 0 ? value : null };
+  };
+  const own = readCommit(path);
+  let value = own.value;
+  if (!own.repo) {
+    // A fleet card may span sibling repositories under its declared workspace.
+    // Only direct children with a Git door participate; never scan arbitrary home trees.
+    let entries = []; try { entries = readdirSync(path, { withFileTypes: true }); } catch {}
+    for (const child of entries) {
+      if (!child.isDirectory() && !child.isSymbolicLink()) continue;
+      const repo = resolve(path, child.name);
+      if (!existsSync(resolve(repo, '.git'))) continue;
+      const t = readCommit(repo).value;
+      if (t != null) value = Math.max(value ?? 0, t);
+    }
+  }
+  commitTimes.set(key, { at: now(), value });
+  return value;
 }
 
 /** The first answer to message `id` in its sender's mailbox (`supercode message show --replies`), as its id; or null. */

package/board/ztrack.mjs

@@ -140,13 +140,15 @@ class ZtrackBoard {
       const status = old.stage ?? task.status;
       const mapped = source.mapping[status];
       if (!mapped) throw new Error(`migration needs an explicit mapping for ${status} (${task.id})`);
-      const stage = typeof mapped === 'string' ? mapped : mapped.status;
+      let stage = typeof mapped === 'string' ? mapped : mapped.status;
+      if (mapped.preserve_completed && task.completed_at) stage = 'done';
       const parents = this.mem.prepare('SELECT parent_id FROM task_links WHERE child_id = ?').all(task.id).map((p) => ({ id: p.parent_id, kind: 'card' }));
       const last = this.mem.prepare("SELECT kind, payload FROM task_events WHERE task_id = ? AND kind IN ('blocked','unblocked') ORDER BY id DESC LIMIT 1").get(task.id);
       const wait = last?.kind === 'blocked' ? json(last.payload, {})?.waiting_on : null;
       if (wait) parents.push({ id: wait, kind: 'message' });
       this.insert('supercode_cards', { ...old, task_id: task.id, stage, archived: Number(Boolean(mapped.archived) || stage === 'cancelled'), blocked_by: JSON.stringify(parents),
-        paused: mapped.paused ? JSON.stringify({ by: 'migration', reason: `migrated ${status}: ${json(last?.payload, {})?.reason ?? 'held by previous workflow'}` }) : null });
+        every: mapped.every ?? old.every ?? null, next_run_at: mapped.every ? now() : old.next_run_at,
+        paused: mapped.paused ? JSON.stringify({ by: actorOf() ?? 'migration', reason: `migrated ${status}: ${json(last?.payload, {})?.reason ?? 'held by previous workflow'}` }) : null });
       this.mem.prepare('UPDATE tasks SET status = ? WHERE id = ?').run(stage, task.id);
       if (task.current_run_id && ['done','cancelled'].includes(stage)) {
         this.mem.prepare("UPDATE task_runs SET ended_at = COALESCE(ended_at, ?), status = 'reclaimed', outcome = COALESCE(outcome, 'reclaimed') WHERE id = ?").run(now(), task.current_run_id);
@@ -186,7 +188,7 @@ class ZtrackBoard {
         this.taskKeys.set(tid, `${id}:${task.id}`);
         const body = task.metadata?.body ?? '';
         const taskCard = { ...task.metadata?.card, id: tid, title: `${task.id} ${task.text}`, body,
-          status: task.status === 'passed' ? 'done' : (task.metadata?.status === 'done' ? 'todo' : task.metadata?.status ?? 'todo'),
+          status: task.status === 'passed' ? (task.metadata?.status === 'cancelled' ? 'cancelled' : 'done') : (['done','cancelled'].includes(task.metadata?.status) ? 'todo' : task.metadata?.status ?? 'todo'),
           metadata: task.metadata?.properties ?? {}, assignee: task.metadata?.assignee ?? card.assignee,
           machine: task.metadata?.machine ?? card.machine, acceptanceCriteria: [],
           acceptance: task.lines ?? [], relations: (task.blockedBy ?? []).map((b) => ({ type: 'blocked-by', issueId: b.ac ? `${nativeId(b.issue)}:${b.ac}` : nativeId(b.issue) })) };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.4.78",
+  "version": "0.4.80",
   "type": "module",
   "description": "The orchestrator runtime over the Volter Harness ontology: one typed operational model whose folder is its serialization, read and written through the harness orchestration doors (docs/ORCHESTRATOR-IR.md)",
   "exports": {