@volter/supercode-orchestrator 0.4.71 → 0.4.73

package/board/cli.mjs

@@ -13,7 +13,7 @@ import { holdDispatcherLock } from '../hermes-locks.mjs';
 import { backingOf, boardExists, boardPath, DEFAULT_BOARD, event, json, listBoards, logsDir, now, openBoard, setActor, tx } from './store.mjs';
 import * as engine from './engine.mjs';
 import { adoptSession, boardAddress, boardLabel, boardSettings, callerSession, lanesOf, localMachine, observeFleet, paused, plan, startCard, tick } from './dispatch.mjs';
-import { loadWorkflow, statusOf, useWorkflow, workflowEntry, workflowFor } from './workflow.mjs';
+import { loadWorkflow, scopeOf, statusOf, useWorkflow, workflowEntry, workflowFor } from './workflow.mjs';
 import { evaluate } from './expr.mjs';
 
 const HELP = `supercode workflow <verb> [--root <home>] [--board <slug>] [--json]
@@ -356,16 +356,20 @@ export async function runWorkflow(argv) {
         got.runs = engine.runs(b.db, id, { stateType: args['state-type'] ?? null, stateName: args['state-name'] ?? null });
         got.diagnostics = engine.diagnose(b.db, got.task, { failureLimit: settings.failureLimit });
         got.stage = statusOf(b.db, got.task);
+        got.time = scopeOf(b.db, b, got.task, { params: workflowFor(root).params }).card.time;
         return got;
       });
       const t = card.task;
       const latest = [...card.runs].reverse().find((r) => r.summary)?.summary ?? null;
       if (args.json) {
-        say(args, '', { task: cardDict(t), latest_summary: latest, parents: card.parents.map((p) => p.id), children: card.children, subtasks: card.subtasks, comments: card.comments, events: card.events, runs: card.runs, subscriptions: card.subscriptions, diagnostics: card.diagnostics });
+        say(args, '', { task: cardDict(t), latest_summary: latest, parents: card.parents.map((p) => p.id), children: card.children, subtasks: card.subtasks, comments: card.comments, events: card.events, runs: card.runs, time: card.time, subscriptions: card.subscriptions, diagnostics: card.diagnostics });
         return 0;
       }
       const out = [`Task ${t.id}: ${t.title}`, `  status:    ${card.stage}${card.stage !== t.status ? ` (${t.status} in kanban.db)` : ''}`, `  assignee:  ${t.assignee || '-'}`];
       if (t.machine) out.push(`  machine:   ${t.machine}`);
+      // where the card's time went: each role's runs, and the rest waiting
+      const mins = (sec) => `${Math.round(sec / 60)}m`;
+      out.push(`  time:      ${Object.entries(card.time).filter(([, v]) => v > 0).map(([k, v]) => `${k} ${mins(v)}`).join(', ') || '-'}`);
       if (t.subtask_of) out.push(`  subtask of: ${t.subtask_of}`);
       if (t.tenant) out.push(`  tenant:    ${t.tenant}`);
       out.push(`  workspace: ${t.workspace_kind}${t.workspace_path ? ` @ ${t.workspace_path}` : ''}`);
@@ -387,9 +391,14 @@ export async function runWorkflow(argv) {
       if (t.result) out.push('', 'Result:', t.result);
       else if (latest) out.push('', 'Latest summary:', latest);
       if (card.comments.length) { out.push('', `Comments (${card.comments.length}):`); for (const c of card.comments) out.push(`  [${ts(c.created_at)}] ${c.author}: ${c.body}`); }
-      if (card.events.length) {
-        out.push('', `Events (${card.events.length}):`);
-        for (const e of card.events.slice(-20)) out.push(`  [${ts(e.created_at)}]${e.run_id ? ` [run ${e.run_id}]` : ''} ${e.kind}${e.payload ? ` ${JSON.stringify(e.payload)}` : ''}`);
+      // the card's history, without the board's own bookkeeping (a claim, a session kept or started, a goal ask, a
+      // message queued); `--all` shows every event, `--json` always does
+      const PLUMBING = new Set(['claimed', 'session_started', 'session_resumed', 'session_adopted', 'session_replaced', 'session_closed',
+        'goal_set', 'goal_continued', 'decision_asked', 'board_message', 'board_message_sent', 'heartbeat', 'promoted', 'respawn_guarded']);
+      const history = args.all ? card.events : card.events.filter((e) => !PLUMBING.has(e.kind));
+      if (history.length) {
+        out.push('', `Events (${history.length}${history.length < card.events.length ? ` of ${card.events.length}; --all shows every one` : ''}):`);
+        for (const e of history.slice(-20)) out.push(`  [${ts(e.created_at)}]${e.run_id ? ` [run ${e.run_id}]` : ''} ${e.kind}${e.payload ? ` ${JSON.stringify(e.payload)}` : ''}`);
       }
       if (card.runs.length) {
         out.push('', `Runs (${card.runs.length}):`);

package/board/workflow.mjs

@@ -92,15 +92,20 @@ function answerTo(id) {
 }
 
 const OPEN_OUTCOME = /^(\s*[-*] )\[ \] (.+)$/;
-/** Whether `body` is `was` with only outcomes ticked: each changed line was `- [ ] X` and is now `- [x] X` or
- *  `- [x] X: <pointer>`; no other line added, removed or changed. */
+/** Whether `body` is `was` with only outcomes ticked: each changed line is under the Acceptance heading, was `- [ ] X`
+ *  and is now `- [x] X` or `- [x] X: <pointer>`; no other line added, removed or changed. */
 function onlyTicks(was, body) {
   if (typeof body !== 'string') return false;
   const before = String(was ?? '').split('\n');
   const after = body.split('\n');
   if (before.length !== after.length) return false;
+  // an outcome is a line of the card's Acceptance section (its heading at any level), not a task or any other checkbox
+  let section = null;
   return before.every((line, i) => {
+    const heading = /^#{1,6}\s+(.+?)\s*$/.exec(line);
+    if (heading) section = heading[1].toLowerCase();
     if (line === after[i]) return true;
+    if (section !== 'acceptance') return false;
     const open = OPEN_OUTCOME.exec(line);
     if (!open) return false;
     const ticked = `${open[1]}[x] ${open[2]}`;
@@ -108,6 +113,22 @@ function onlyTicks(was, body) {
   });
 }
 
+/** Seconds a card's runs spent by role, and the rest of its life as `waiting`. */
+function timeOf(db, task) {
+  const t = now();
+  const out = { coding: 0, reviewing: 0, auditing: 0, triaging: 0 };
+  const key = { implementer: 'coding', reviewer: 'reviewing', auditor: 'auditing', triager: 'triaging' };
+  for (const r of all(db, 'SELECT started_at, ended_at, metadata FROM task_runs WHERE task_id = ?', task.id)) {
+    const role = json(r.metadata, {})?.supercode?.role ?? 'implementer';
+    const spent = Math.max(0, Number(r.ended_at ?? t) - Number(r.started_at ?? t));
+    const k = key[role] ?? role;
+    out[k] = (out[k] ?? 0) + spent;
+  }
+  const worked = Object.values(out).reduce((a, b) => a + b, 0);
+  out.waiting = Math.max(0, t - Number(task.created_at ?? t) - worked);
+  return out;
+}
+
 /** The session message `id` was filed for (`supercode message show`): who was asked; or null. */
 function askedOf(id) {
   if (!id) return null;
@@ -155,6 +176,9 @@ export function scopeOf(db, board, task, { params, event = {}, extra = {} } = {}
     // the message whose answer the standing block waits for (`block --waiting-on`), and that answer's id once it has landed
     waiting_on: waitingOn,
     answer: () => answerTo(waitingOn),
+    // the seconds its runs spent, by the role each run was for (implementer: coding, reviewer: reviewing, …), an open
+    // run counted to now; `waiting` is the rest of its life since it was filed
+    time: timeOf(db, task),
     // whether an edit of its text only ticks outcome lines (the card's own session's door to its acceptance)
     only_ticks: (body) => onlyTicks(task.body, body),
     asked_of: () => askedOf(waitingOn),

package/package.json

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