@volter/supercode-orchestrator 0.4.33 → 0.4.35

package/board/cli.mjs

@@ -45,6 +45,7 @@ supercode's own:
   move <id> <machine|none>   adopt <id> <session> [--assignee P]   close <id>   serve (= daemon)   list --machine M
   notify-subscribe <id> --address sc:<machine>:<harness>:<id> [--role creator|worker|dependency]
   Any verb … --at sc:<machine>:board:<home>: sent as mail to a board kept on another machine.
+  <event> <id>... [reason] [--<field> value]: any other event the board's workflow declares, its flags the event's fields.
 
   specify/decompose with no spec start a session on the triage card to write it. A card's own session may comment on,
   block (with --kind), heartbeat and request review of its card, specify or decompose it in triage, and file, complete,
@@ -555,8 +556,8 @@ export async function runWorkflow(argv) {
       const results = [];
       for (const t of targets) {
         if (verb === 'specify' && (args.title !== undefined || args.body !== undefined)) {
-          await withBoardAsync((b) => engine.specify(b, t, { title: args.title ?? null, body: args.body ?? null, author: args.author ?? callerAddress() ?? callerName() }));
-          results.push({ id: t, specified: true });
+          const moved = await withBoardAsync((b) => engine.specify(b, t, { title: args.title ?? null, body: args.body ?? null, author: args.author ?? callerAddress() ?? callerName() }));
+          results.push({ id: t, specified: true, status: moved.to });
         } else if (verb === 'decompose' && args.child?.length) {
           const children = args.child.map((c) => { const [title, assignee] = c.split(/@(?=[^@]*$)/); return { title: title.trim(), assignee: assignee?.trim() || undefined }; });
           results.push({ id: t, children: await withBoardAsync((b) => engine.decompose(b, t, children, { author: args.author ?? callerAddress() ?? callerName() })) });
@@ -565,7 +566,7 @@ export async function runWorkflow(argv) {
           results.push({ id: t, session: session.address, mode: session.mode });
         }
       }
-      say(args, results.map((r) => (r.specified ? `Specified ${r.id} → todo` : r.children ? `Decomposed ${r.id} into ${r.children.join(', ')}` : `${r.id}: session ${r.session} (${r.mode}) is writing its ${verb === 'specify' ? 'spec' : 'breakdown'}`)).join('\n'), results);
+      say(args, results.map((r) => (r.specified ? `Specified ${r.id} → ${r.status}` : r.children ? `Decomposed ${r.id} into ${r.children.join(', ')}` : `${r.id}: session ${r.session} (${r.mode}) is writing its ${verb === 'specify' ? 'spec' : 'breakdown'}`)).join('\n'), results);
       return 0;
     }
 
@@ -746,7 +747,20 @@ export async function runWorkflow(argv) {
       return 0;
     }
 
-    default: throw new Error(`no workflow verb ${verb}; \`supercode workflow help\` lists them`);
+    default: {
+      // any other event the board's workflow declares is a verb of its own: `<event> <id>... [reason] [--<field> value]`,
+      // the flags its payload (the doors a session is told name these)
+      const name = verb.replace(/-/g, '_');
+      const { workflow } = workflowFor(root);
+      const declared = Object.values(workflow.statuses).some((s) => s.on?.[name]) || Boolean(workflow.on?.[name]);
+      if (!declared) throw new Error(`no workflow verb ${verb}; \`supercode workflow help\` lists them`);
+      need(1, 'a card id');
+      const { _: _words, root: _r, board: _b, json: _j, at: _a, ids: _i, ...fields } = args;
+      const payload = { ...fields, reason: args.reason ?? (rest.slice(1).join(' ') || null) };
+      const results = [];
+      for (const t of [id, ...(args.ids ?? [])]) results.push([t, (await withBoardAsync((b) => engine.act(b, t, name, { payload }))).to]);
+      say(args, results.map(([t, s]) => `${t} → ${s}`).join('\n'), { ok: true, results }); return 0;
+    }
   }
 }
 

package/board/dispatch.mjs

@@ -523,7 +523,10 @@ function memoryPressure() {
 
 /** Record a guard reason once per change, not once per tick. */
 function noteGuard(db, id, reason) {
-  const last = db.prepare("SELECT payload FROM task_events WHERE task_id = ? AND kind IN ('respawn_guarded', 'claimed') ORDER BY id DESC LIMIT 1").get(id);
+  // once per reason per entry into the status: a card back in ready (a new `since`) is noted again, so the workflow's
+  // after-timers that read the reason (card.queue_reason) see it
+  const since = Number(db.prepare('SELECT since FROM supercode_cards WHERE task_id = ?').get(id)?.since ?? 0);
+  const last = db.prepare("SELECT payload FROM task_events WHERE task_id = ? AND kind IN ('respawn_guarded', 'claimed') AND created_at >= ? ORDER BY id DESC LIMIT 1").get(id, since);
   if (json(last?.payload, {})?.reason === reason) return;
   event(db, id, 'respawn_guarded', { reason });
 }

package/board/engine.mjs

@@ -130,15 +130,6 @@ function retryStatus(db, taskId) {
   return source === 'review' || source === 'triage' ? source : 'ready';
 }
 
-/** The phase a card blocked out of comes back to (Hermes reads it off the latest interruption). */
-function resumeStatus(db, taskId) {
-  const row = one(db, `SELECT payload FROM task_events WHERE task_id = ? AND kind IN ('blocked', 'block_loop_detected', 'dependency_wait', 'gave_up',
-    'unblocked', 'changes_requested', 'review_reopened', 'status', 'reclaimed', 'stale', 'timed_out', 'crashed', 'spawn_failed', 'rate_limited', 'session_lost')
-    ORDER BY id DESC LIMIT 1`, taskId);
-  const p = json(row?.payload, {}) ?? {};
-  return ['resume_status', 'retry_status', 'source_status'].some((k) => p[k] === 'review') ? 'review' : 'ready';
-}
-
 // ------------------------------------------------------------------ creating and linking
 
 /**
@@ -290,35 +281,6 @@ export function extendClaim(db, id, { ttl, reason, extra = {} }) {
   return true;
 }
 
-/** Put a running card back where its run came from, closing the run with `outcome`. Answers the closed run id. */
-export function release(db, id, { outcome = 'reclaimed', error = null, metadata = undefined, kind = 'reclaimed', payload = {} } = {}) {
-  const task = one(db, 'SELECT status, claim_lock FROM tasks WHERE id = ?', id);
-  if (!task || task.status !== 'running') return null;
-  const retry = retryStatus(db, id);
-  run(db, 'UPDATE tasks SET status = ?, claim_lock = NULL, claim_expires = NULL, worker_pid = NULL WHERE id = ?', retry, id);
-  const runId = endRun(db, id, { outcome, status: outcome, error, metadata });
-  event(db, id, kind, { ...payload, retry_status: retry }, runId);
-  return runId;
-}
-
-/**
- * Count a failure against the card (Hermes's circuit breaker): at the card's `max_retries`, else `failureLimit`,
- * consecutive failures it is blocked with a `gave_up` event. Answers true when it tripped.
- */
-export function recordFailure(db, id, error, { failureLimit = DEFAULT_FAILURE_LIMIT, outcome = 'crashed' } = {}) {
-  const task = one(db, 'SELECT consecutive_failures, max_retries, status FROM tasks WHERE id = ?', id);
-  if (!task) return false;
-  const failures = Number(task.consecutive_failures || 0) + 1;
-  run(db, 'UPDATE tasks SET consecutive_failures = ?, last_failure_error = ? WHERE id = ?', failures, String(error).slice(0, 500), id);
-  const limit = task.max_retries ?? failureLimit;
-  if (failures < limit) return false;
-  if (task.status === 'running') endRun(db, id, { outcome, error: String(error) });
-  run(db, "UPDATE tasks SET status = 'blocked', claim_lock = NULL, claim_expires = NULL, worker_pid = NULL WHERE id = ?", id);
-  event(db, id, 'gave_up', { error: String(error).slice(0, 500), failures, limit, outcome });
-  return true;
-}
-
-
 /**
  * A completed card's workspace goes, as Hermes cleans up on completion: a scratch directory under the board's own
  * workspaces, or a worktree (its branch stays); never while a child still waits on it, never a `dir`.
@@ -541,8 +503,8 @@ export const subscriptions = (db, id = null) => (id ? all(db, 'SELECT * FROM kan
 
 export function listCards(db, { status = null, assignee = null, machine = null, includeArchived = false } = {}) {
   const rows = all(db, `SELECT t.*, c.machine, c.subtask_of, c.stage FROM tasks t LEFT JOIN supercode_cards c ON c.task_id = t.id
-    WHERE (? IS NULL OR t.status = ?) AND (? IS NULL OR t.assignee = ?) AND (? IS NULL OR c.machine = ?) AND (? OR t.status != 'archived')
-    ORDER BY t.priority DESC, t.created_at ASC`, status, status, assignee, assignee, machine, machine, includeArchived ? 1 : 0);
+    WHERE (? IS NULL OR t.status = ? OR c.stage = ?) AND (? IS NULL OR t.assignee = ?) AND (? IS NULL OR c.machine = ?) AND (? OR t.status != 'archived')
+    ORDER BY t.priority DESC, t.created_at ASC`, status, status, status, assignee, assignee, machine, machine, includeArchived ? 1 : 0);
   return rows.map((r) => ({ ...r, skills: json(r.skills, []) ?? [] }));
 }
 

package/board/workflow.mjs

@@ -94,7 +94,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 FROM tasks WHERE id = ?', task.subtask_of) ?? null : null,
+    arc: task.subtask_of ? one(db, 'SELECT id, status, title, assignee FROM tasks WHERE 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),
     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,

package/package.json

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