@volter/supercode-orchestrator 0.4.45 → 0.4.47

package/board/dispatch.mjs

@@ -419,7 +419,11 @@ function closeRequested(board, report) {
     const session = json(row.metadata, {})?.supercode;
     if (!session?.pane) 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() }));
+    const address = session.address ?? `sc:${session.machine}:claude-code:${session.session_id}`;
+    tx(board, (db) => {
+      setRunSession(db, row.id, { ...session, closed_at: now() });
+      db.prepare("DELETE FROM kanban_notify_subs WHERE task_id = ? AND platform = 'supercode' AND chat_id = ?").run(row.task_id, address);
+    });
   }
 }
 
@@ -473,7 +477,12 @@ export async function sessionEffect(board, e) {
       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(board, session);
-      tx(board, (db) => setRunSession(db, row.id, { ...session, closed_at: now() }));
+      // a closed session hears nothing more of the card
+      const address = session.address ?? `sc:${session.machine}:claude-code:${session.session_id}`;
+      tx(board, (db) => {
+        setRunSession(db, row.id, { ...session, closed_at: now() });
+        db.prepare("DELETE FROM kanban_notify_subs WHERE task_id = ? AND platform = 'supercode' AND chat_id = ?").run(e.id, address);
+      });
       return;
     }
   }
@@ -577,8 +586,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, as: boardAddress(board.label) });
+      // 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
@@ -796,7 +807,8 @@ async function notify(board, fleet, report, entry) {
     const events = board.db.prepare(`SELECT id, kind, payload, created_at FROM task_events WHERE task_id = ? AND id > ? AND kind IN (${kinds.map(() => '?').join(', ')}) ORDER BY id`)
       .all(sub.task_id, sub.last_event_id, ...kinds);
     if (!events.length) return;
-    const task = tx(board, (db) => getTask(db, sub.task_id));
+    // the card as the workflow names it (its status the workflow's: triaging, reviewing, stopped; `stored_as` kanban.db's)
+    const task = tx(board, (db) => { const t = getTask(db, sub.task_id); return t ? { ...t, status: statusOf(db, t), stored_as: t.status } : t; });
     let cursor = Number(sub.last_event_id);
     let failed = null;
     try {

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.45",
+  "version": "0.4.47",
   "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": {