@volter/supercode-orchestrator 0.4.42 → 0.4.44

package/board/dispatch.mjs

@@ -383,7 +383,9 @@ export function launchRun(board, entry, id, lane, fleet, settings) {
   const surface = lane.surface === 'pane' ? 'pane' : 'headless';
   const scope = tx(board, (db) => scopeOf(db, board, task, { params: entry.params }));
   const where = whereOf(board, task);
-  const prompt = render(spec.prompt, { ...scope, where, context: tx(board, (db) => cardContext(db, id)), doors: doors(entry.workflow, status, spec.role, id, where, surface) });
+  // a subtask's run also sees its arc: the arc's text, tasks and thread (where its owner's rulings are)
+  const arcContext = task.subtask_of ? tx(board, (db) => cardContext(db, task.subtask_of)) : '';
+  const prompt = render(spec.prompt, { ...scope, where, context: tx(board, (db) => cardContext(db, id)), arc_context: arcContext, doors: doors(entry.workflow, status, spec.role, id, where, surface) });
   // the run's session record knows its status, role and slot (a reviewer's slot is never the implementer's)
   const meta = { status, role: spec.role, slot: spec.session };
   return surface === 'pane'

package/board/workflow.mjs

@@ -4,6 +4,7 @@
 // must hold and what happens; this module applies it to the board file and keeps no rule of its own. Its actions are
 // 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 { event as record, json, now } from './store.mjs';
 import { evaluate, holds, render } from './expr.mjs';
 
@@ -69,11 +70,21 @@ 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) {
+  if (!path) return null;
+  const r = spawnSync('git', ['-C', path, 'log', '-1', '--format=%ct', 'HEAD'], { encoding: 'utf8', timeout: 10_000 });
+  const t = Number(r.stdout?.trim());
+  return r.status === 0 && Number.isFinite(t) && t > 0 ? t : null;
+}
+
 /** The scope an expression is evaluated in: the card (with its relations), the event, params, time, extras. */
 export function scopeOf(db, board, task, { params, event = {}, extra = {} } = {}) {
   const status = statusOf(db, task);
-  const parents = all(db, 'SELECT t.id, t.status, t.title FROM tasks t JOIN task_links l ON l.parent_id = t.id WHERE l.child_id = ?', task.id);
-  const children = all(db, 'SELECT t.id, t.status FROM tasks t JOIN task_links l ON l.child_id = t.id WHERE l.parent_id = ?', task.id);
+  // a related card's status is the workflow's, as the card's own is (`stored_as`: what kanban.db holds)
+  const related = 'COALESCE(c.stage, t.status) AS status, t.status AS stored_as';
+  const parents = all(db, `SELECT t.id, ${related}, t.title FROM tasks t JOIN task_links l ON l.parent_id = t.id LEFT JOIN supercode_cards c ON c.task_id = t.id WHERE l.child_id = ?`, task.id);
+  const children = all(db, `SELECT t.id, ${related} FROM tasks t JOIN task_links l ON l.child_id = t.id LEFT JOIN supercode_cards c ON c.task_id = t.id WHERE l.parent_id = ?`, task.id);
   const lastRun = one(db, 'SELECT * FROM task_runs WHERE task_id = ? AND ended_at IS NOT NULL ORDER BY ended_at DESC, id DESC LIMIT 1', task.id);
   const lastCompleted = one(db, "SELECT * FROM task_runs WHERE task_id = ? AND outcome = 'completed' ORDER BY ended_at DESC LIMIT 1", task.id);
   const asked = json(one(db, "SELECT payload FROM task_events WHERE task_id = ? AND kind = 'review_requested' ORDER BY id DESC LIMIT 1", task.id)?.payload, {}) ?? {};
@@ -94,9 +105,9 @@ export function scopeOf(db, board, task, { params, event = {}, extra = {} } = {}
     goal_mode: Boolean(task.goal_mode),
     implementer: asked.implementer ?? task.assignee,
     last_reviewer: changes.reviewer ?? null,
-    arc: task.subtask_of ? one(db, 'SELECT id, status, title, body, assignee FROM tasks WHERE id = ?', task.subtask_of) ?? null : null,
+    arc: task.subtask_of ? one(db, `SELECT t.id, ${related}, t.title, t.body, t.assignee FROM tasks t LEFT JOIN supercode_cards c ON c.task_id = t.id WHERE t.id = ?`, task.subtask_of) ?? null : null,
     // the cards filed as its subtasks (`create --subtask-of`), in the order they were filed
-    subtasks: all(db, 'SELECT t.id, t.status, t.title, t.assignee FROM tasks t JOIN supercode_cards c ON c.task_id = t.id WHERE c.subtask_of = ? ORDER BY t.created_at', task.id),
+    subtasks: all(db, `SELECT t.id, ${related}, t.title, t.assignee FROM tasks t JOIN supercode_cards c ON c.task_id = t.id WHERE c.subtask_of = ? ORDER BY t.created_at`, task.id),
     queue_reason: json(one(db, "SELECT payload FROM task_events WHERE task_id = ? AND kind = 'respawn_guarded' AND created_at >= ? ORDER BY id DESC LIMIT 1",
       task.id, Number(one(db, 'SELECT since FROM supercode_cards WHERE task_id = ?', task.id)?.since ?? 0))?.payload, {})?.reason ?? null,
     last_block_event: one(db, "SELECT kind FROM task_events WHERE task_id = ? AND kind IN ('blocked', 'unblocked') ORDER BY id DESC LIMIT 1", task.id)?.kind ?? null,
@@ -109,6 +120,12 @@ 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
+    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 {
     card,

package/loop.mjs

@@ -586,6 +586,14 @@ export class Orchestrator {
     try {
       await runtime.sendInput(input);
     } catch (error) {
+      // A turn the harness is still running (one this loop did not start, or whose end it has not heard yet) is not a
+      // dead session: the line waits for that turn's end, as a refused steer does. Ending the binding on it killed a
+      // live lobby manager on the first message that reached it mid-turn.
+      if (/already in progress/.test(error.message)) {
+        this.log('info', `send ${keyString}: a turn is in progress; the line waits for its end`);
+        this.enqueue(events.worker({ profile, keyString, runtime_id: runtime.handle.runtime_id, ev: { kind: 'steer_refused', text: input }, at: this.clock() }));
+        return;
+      }
       this.enqueue(events.worker({ profile, keyString, runtime_id: runtime.handle.runtime_id, ev: { kind: 'error', message: `send failed: ${error.message}` }, at: this.clock() }));
     }
   }

package/package.json

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