@volter/supercode-orchestrator 0.4.44 → 0.4.46

package/board/cli.mjs

@@ -12,7 +12,7 @@ import { read } from '../orchestration.mjs';
 import { holdDispatcherLock } from '../hermes-locks.mjs';
 import { backingOf, boardExists, boardPath, DEFAULT_BOARD, event, json, listBoards, logsDir, now, openBoard, tx } from './store.mjs';
 import * as engine from './engine.mjs';
-import { adoptSession, boardLabel, boardSettings, lanesOf, localMachine, observeFleet, paused, plan, startCard, tick } from './dispatch.mjs';
+import { adoptSession, boardAddress, boardLabel, boardSettings, lanesOf, localMachine, observeFleet, paused, plan, startCard, tick } from './dispatch.mjs';
 import { loadWorkflow, statusOf, useWorkflow, workflowEntry, workflowFor } from './workflow.mjs';
 import { evaluate } from './expr.mjs';
 
@@ -1050,7 +1050,8 @@ function closeSession(board, id) {
   if (!task) throw new Error(`no card ${id}`);
   if (task.status === 'running') throw new Error(`${id} is running; block, complete or reclaim it before closing its session`);
   if (!session?.pane) return null;
-  const r = spawnSync(process.env.SUPERCODE_BIN || 'supercode', ['teams', 'panes', 'close', session.pane, '--machine', session.machine], { cwd: tmpdir(), encoding: 'utf8', timeout: 60_000 });
+  // the board closes its card's pane, whichever session ran `workflow close`
+  const r = spawnSync(process.env.SUPERCODE_BIN || 'supercode', ['teams', 'panes', 'close', session.pane, '--machine', session.machine], { cwd: tmpdir(), encoding: 'utf8', timeout: 60_000, env: { ...process.env, SUPERCODE_CALLER: boardAddress(board.label) } });
   if (r.status !== 0) throw new Error(`closing pane ${session.pane} on ${session.machine}: ${(r.stderr || r.stdout).trim().slice(-300)}`);
   tx(board, (db) => event(db, id, 'session_closed', { session_id: session.session_id, machine: session.machine, pane: session.pane }));
   return session;

package/board/dispatch.mjs

@@ -54,9 +54,11 @@ export function localMachine() {
 /** The supercode command the dispatcher drives. */
 export const supercodeBin = () => process.env.SUPERCODE_BIN || 'supercode';
 
-function sc(args, { input = null, timeout = 120_000 } = {}) {
-  // a neutral directory: `supercode teams …` resolves its entry from a checkout at the cwd
-  const r = spawnSync(supercodeBin(), args, { cwd: tmpdir(), input: input ?? undefined, encoding: 'utf8', timeout, env: process.env, maxBuffer: 512 * 1024 * 1024 });
+function sc(args, { input = null, timeout = 120_000, as = null } = {}) {
+  // a neutral directory: `supercode teams …` resolves its entry from a checkout at the cwd. `as`: the board this
+  // command acts for, so a card's pane is started and closed by its board, whichever session ran the board's verb
+  const env = as ? { ...process.env, SUPERCODE_CALLER: as } : process.env;
+  const r = spawnSync(supercodeBin(), args, { cwd: tmpdir(), input: input ?? undefined, encoding: 'utf8', timeout, env, maxBuffer: 512 * 1024 * 1024 });
   return { code: r.status, stdout: r.stdout ?? '', stderr: (r.stderr ?? '') + (r.error ? r.error.message : '') };
 }
 
@@ -236,7 +238,7 @@ function limitsOf(db, board, entry, task, session) {
   return out;
 }
 
-function stopSession(session) {
+function stopSession(board, session) {
   if (!session) return;
   if (session.surface === 'headless' && pidAlive(session.pid)) {
     // SIGTERM to the worker's process group, then SIGKILL if it is still there after a grace, as Hermes stops its own
@@ -246,7 +248,7 @@ function stopSession(session) {
     if (pidAlive(session.pid)) signal('SIGKILL');
     return;
   }
-  if (session.pane) sc(['teams', 'panes', 'close', session.pane, ...(session.machine ? ['--machine', session.machine] : [])], { timeout: 60_000 });
+  if (session.pane) sc(['teams', 'panes', 'close', session.pane, ...(session.machine ? ['--machine', session.machine] : [])], { timeout: 60_000, as: boardAddress(board.label) });
 }
 
 // ------------------------------------------------------------------ starting, as the workflow's dispatch says
@@ -416,7 +418,7 @@ function closeRequested(board, report) {
   for (const row of rows) {
     const session = json(row.metadata, {})?.supercode;
     if (!session?.pane) continue;
-    try { stopSession(session); } catch (error) { report.undelivered.push([row.task_id, session.address, `closing it: ${String(error.message).slice(-200)}`]); continue; }
+    try { stopSession(board, session); } catch (error) { report.undelivered.push([row.task_id, session.address, `closing it: ${String(error.message).slice(-200)}`]); continue; }
     tx(board, (db) => setRunSession(db, row.id, { ...session, closed_at: now() }));
   }
 }
@@ -470,7 +472,7 @@ export async function sessionEffect(board, e) {
       // the session that sent the event is not closed under its own command: the dispatcher closes it next tick
       const caller = process.env.CLAUDE_CODE_SESSION_ID || process.env.CODEX_THREAD_ID;
       if (caller && caller === session.session_id) { tx(board, (db) => setRunSession(db, row.id, { ...session, close_requested: now() })); return; }
-      stopSession(session);
+      stopSession(board, session);
       tx(board, (db) => setRunSession(db, row.id, { ...session, closed_at: now() }));
       return;
     }
@@ -575,8 +577,10 @@ function launchPane(board, task, runId, lane, fleet, { input = null, slot = 'wor
       // a kept session is told what this run is for (its card came back to it, with what happened since)
       if (input) deliverNow(board, prev.address ?? `sc:${prev.machine}:claude-code:${prev.session_id}`, input, `board-run-${task.id}-r${runId}`);
     } else if (prev.resumable !== false) {
-      const r = sc([...base, '--key', `board-${task.id}-r${runId}-resume`, '--input',
-        `The board resumed this session after it was lost; you are still on card ${task.id}: ${task.title}. Carry on.`, '--', '--resume', prev.session_id, ...tail], { timeout: 180_000 });
+      // a resumed session is told what this run is for, as a kept one is: the run's own prompt (a reviewer resumed for
+      // its next round gets that round's prompt, its arc's context with it), not only that it was resumed
+      const told = input ? `The board resumed this session for this run of card ${task.id}.\n\n${input}` : `The board resumed this session after it was lost; you are still on card ${task.id}: ${task.title}. Carry on.`;
+      const r = sc([...base, '--key', `board-${task.id}-r${runId}-resume`, '--input', told, '--', '--resume', prev.session_id, ...tail], { timeout: 180_000, as: boardAddress(board.label) });
       const pane = r.code === 0 ? lastJson(r.stdout)?.pane ?? null : null;
       // a resume the harness refuses (its transcript is gone) ends the pane at once; another machine's launch
       // answers before that shows, so the pane is looked for again a moment later
@@ -586,7 +590,7 @@ function launchPane(board, task, runId, lane, fleet, { input = null, slot = 'wor
   } else if (prev) replaced = { session_id: prev.session_id, why: `the card moved from ${prev.machine} to ${machine}` };
   if (!session) {
     const sid = randomUUID();
-    const r = sc([...base, '--key', `board-${task.id}-r${runId}-${sid.slice(0, 8)}`, '--input', input ?? `Card ${task.id}: ${task.title}`, '--', '--session-id', sid, ...tail], { timeout: 180_000 });
+    const r = sc([...base, '--key', `board-${task.id}-r${runId}-${sid.slice(0, 8)}`, '--input', input ?? `Card ${task.id}: ${task.title}`, '--', '--session-id', sid, ...tail], { timeout: 180_000, as: boardAddress(board.label) });
     if (r.code !== 0) throw new Error(`supercode open --on ${task.machine}: ${(r.stderr || r.stdout).trim().slice(-500)}`);
     session = { surface: 'pane', session_id: sid, machine, pane: lastJson(r.stdout)?.pane ?? null, mode: 'fresh', launched_at: now(), ...(replaced ? { replaces: replaced.session_id } : {}) };
   }

package/board/workflow.mjs

@@ -70,10 +70,11 @@ function pattern(p) {
   return text.startsWith('(?i)') ? new RegExp(text.slice(4), 'i') : new RegExp(text);
 }
 
-// the time of the latest commit in a repository checkout, or null when it is none (asked only when an expression does)
-function lastCommitAt(path) {
+// 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)
+function lastCommitAt(path, id) {
   if (!path) return null;
-  const r = spawnSync('git', ['-C', path, 'log', '-1', '--format=%ct', 'HEAD'], { encoding: 'utf8', timeout: 10_000 });
+  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;
 }
@@ -120,11 +121,11 @@ export function scopeOf(db, board, task, { params, event = {}, extra = {} } = {}
     last_events: Object.fromEntries(all(db, 'SELECT e.kind, e.created_at, e.payload FROM task_events e JOIN (SELECT kind, MAX(id) AS id FROM task_events WHERE task_id = ? GROUP BY kind) l ON l.id = e.id', task.id)
       .map((r) => [r.kind, { created_at: r.created_at, payload: json(r.payload, {}) ?? {} }])),
     comments_since: (t) => all(db, 'SELECT author, body, created_at FROM task_comments WHERE task_id = ? AND created_at >= ?', task.id, t),
-    // the latest commit in the card's workspace (a subtask's: its arc's), as epoch seconds; null outside a repository
+    // the latest commit naming this card, in its workspace's repository (a subtask's: its arc's), as epoch seconds
     last_commit_at: () => {
       const own = task.workspace_kind !== 'scratch' ? task.workspace_path : null;
       const arcWs = !own && task.subtask_of ? one(db, "SELECT workspace_path FROM tasks WHERE id = ? AND workspace_kind != 'scratch'", task.subtask_of)?.workspace_path : null;
-      return lastCommitAt(own ?? arcWs ?? null);
+      return lastCommitAt(own ?? arcWs ?? null, task.id);
     },
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.4.44",
+  "version": "0.4.46",
   "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": {