@volter/supercode-orchestrator 0.4.59 → 0.4.61

package/board/cli.mjs

@@ -767,7 +767,7 @@ export async function runWorkflow(argv) {
     case 'close': {
       need(1, 'a card id');
       const closed = withBoard((b) => closeSession(b, id));
-      say(args, closed ? `closed ${closed.session_id} (pane ${closed.pane} on ${closed.machine})` : `${id} has no live session`, { ok: true, closed });
+      say(args, closed ? closed.map((c) => `closed ${c.session_id} (pane ${c.pane} on ${c.machine})`).join('\n') : `${id} has no live session`, { ok: true, closed });
       return 0;
     }
 
@@ -1044,17 +1044,28 @@ function authorize(db, verb, rest, args, own) {
   for (const other of args.ids ?? []) if (other !== own.id && engine.getTask(db, other)?.subtask_of !== own.id) refuse(`writes only its own card and its subtasks, not ${other}`);
 }
 
-/** Close the live session of a card that is not running, freeing its machine's place. */
+/** Close the live sessions of a card that is not running (its worker's and its reviewers'), freeing its machine's place. */
 function closeSession(board, id) {
-  const { task, session } = tx(board, (db) => ({ task: engine.getTask(db, id), session: engine.lastSession(db, id) }));
+  const { task, rows } = tx(board, (db) => ({ task: engine.getTask(db, id), rows: db.prepare('SELECT id, metadata FROM task_runs WHERE task_id = ? AND metadata IS NOT NULL ORDER BY id DESC').all(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;
-  // 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;
+  const closed = [];
+  const seen = new Set();
+  for (const row of rows) {
+    const session = json(row.metadata, {})?.supercode;
+    if (!session?.pane || session.closed_at || seen.has(session.session_id)) continue;
+    seen.add(session.session_id);
+    // 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) => {
+      const whole = json(db.prepare('SELECT metadata FROM task_runs WHERE id = ?').get(row.id)?.metadata, {}) ?? {};
+      db.prepare('UPDATE task_runs SET metadata = ? WHERE id = ?').run(JSON.stringify({ ...whole, supercode: { ...whole.supercode, closed_at: now() } }), row.id);
+      event(db, id, 'session_closed', { session_id: session.session_id, machine: session.machine, pane: session.pane });
+    });
+    closed.push(session);
+  }
+  return closed.length ? closed : null;
 }
 
 export function summary(r) {

package/board/workflow.mjs

@@ -456,7 +456,13 @@ const ACTIONS = {
     const e = said ?? {};
     const summary = e.summary ?? null;
     run(ctx.db, 'UPDATE tasks SET result = COALESCE(?, result), completed_at = COALESCE(completed_at, ?) WHERE id = ?', e.result ?? summary ?? null, now(), ctx.id);
-    if (ctx.runId) run(ctx.db, 'UPDATE task_runs SET summary = COALESCE(?, summary), metadata = COALESCE(?, metadata) WHERE id = ?', summary, e.metadata ? JSON.stringify(e.metadata) : null, ctx.runId);
+    if (!ctx.runId) return;
+    // the completion's metadata joins the run's; the board's record of the run's session (`supercode`) stays, so the
+    // session is still closed when the card is done
+    const was = json(one(ctx.db, 'SELECT metadata FROM task_runs WHERE id = ?', ctx.runId)?.metadata, {}) ?? {};
+    const given = e.metadata && typeof e.metadata === 'object' ? e.metadata : null;
+    run(ctx.db, 'UPDATE task_runs SET summary = COALESCE(?, summary), metadata = ? WHERE id = ?', summary,
+      given ? JSON.stringify({ ...was, ...given, ...(was.supercode ? { supercode: was.supercode } : {}) }) : (Object.keys(was).length ? JSON.stringify(was) : null), ctx.runId);
   },
   link(ctx, parent) {
     if (!one(ctx.db, 'SELECT id FROM tasks WHERE id = ?', parent)) throw new Error(`${parent} is no card on this board`);

package/package.json

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