@volter/supercode-orchestrator 0.4.157 → 0.4.159

package/board/capacity.mjs

@@ -40,19 +40,22 @@ function sessionsOf(db, taskId) {
 }
 
 /**
- * What one board holds now, as counted things: each card with a live run (`runs`), each card in any status but
- * archived, once (`cards`; a cap's `where` names the statuses it counts), each live session its cards hold in any slot (`sessions`, those in a turn also
+ * What one board holds now, as counted things: each card with a live run (`runs`), each card (never a subtask) in any
+ * status but archived, once (`cards`; a cap's `where` names the statuses it counts), each live session its cards hold in any slot (`sessions`, those in a turn also
  * `turns`). `alive(session)` and `liveRecord(session)` read the fleet; `modelOf(session)` is the model the session's
  * own transcript reports it runs, or null where none can be read; `machineOf` normalises a machine name; `lanes` gives
  * a profile's harness and model.
  */
-export function holdings(board, { lanes, fleetOk, alive, liveRecord, modelOf = () => null, machineOf }) {
+export function holdings(board, { lanes, fleetOk, alive, liveRecord, modelOf = () => null, storedOf = null, machineOf }) {
   const out = [];
-  const rows = board.db.prepare("SELECT t.id, t.status, t.assignee, t.current_run_id, t.model_override, c.machine FROM tasks t LEFT JOIN supercode_cards c ON c.task_id = t.id WHERE t.status != 'archived'").all();
+  const rows = board.db.prepare("SELECT t.id, t.status, t.assignee, t.current_run_id, t.model_override, c.machine, c.subtask_of FROM tasks t LEFT JOIN supercode_cards c ON c.task_id = t.id WHERE t.status != 'archived'").all();
   for (const row of rows) {
     const lane = lanes[row.assignee] ?? {};
     const card = {
       card: row.id, board: board.slug, assignee: row.assignee ?? null, status: statusOf(board.db, row),
+      // what the board stores for an arc is read through its workflow's stored_as rules now, never the column a write has
+      // not yet brought up to date (a paused card counted as running until its row caught up)
+      stored: !row.subtask_of && storedOf ? storedOf(row.id) : row.status,
       machine: row.machine ? machineOf(row.machine) : null,
       model: row.model_override ?? lane.model ?? null, harness: lane.harness ?? null,
     };
@@ -81,7 +84,8 @@ export function holdings(board, { lanes, fleetOk, alive, liveRecord, modelOf = (
     out.push(...held);
     // the card itself, whatever its runs and sessions: a cap says which by its status (a started card holds its slot
     // until it is done); its model and harness are its run's session's, else its newest live session's, else its own
-    out.push({ ...(held[0] ?? { ...card, unconfigured: !card.model }), session: undefined, slot: undefined, counts: 'cards' });
+    // a subtask is a task of its arc: it never runs or holds a slot of its own
+    if (!row.subtask_of) out.push({ ...(held[0] ?? { ...card, unconfigured: !card.model }), session: undefined, slot: undefined, counts: 'cards' });
   }
   return out;
 }
@@ -161,7 +165,7 @@ export function capacity(caps, held, evaluate) {
       for (const counts of ['runs', 'cards', 'sessions', 'turns', 'starts']) {
         const had = things.find((x) => x.card === entry.card && x.counts === counts);
         // the card is counted already: it is now in the status its start moved it to
-        if (had) { if (counts === 'cards') Object.assign(had, { status: entry.status, model: had.model ?? entry.model, harness: had.harness ?? entry.harness }); }
+        if (had) { if (counts === 'cards') Object.assign(had, { status: entry.status, stored: entry.stored, model: had.model ?? entry.model, harness: had.harness ?? entry.harness }); }
         else things.push({ ...entry, counts });
       }
     },

package/board/dispatch.mjs

@@ -24,7 +24,7 @@ import { basename, dirname, join } from 'node:path';
 import { createHash, randomUUID } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { view, boardCopyOf, boardPath, claimer, copyRefusal, event, json, listBoards, logsDir, now, openBoard, setActor, tx } from './store.mjs';
-import { doors, fire, loadWorkflow, resumeOf, runSpec, runWorkingSeconds, requestSessionClose, retireSupersededRuns, refreshCardInputs, refreshRelationAnswers, transitionsFor, scopeOf, statusOf, templateValue, workflowFor } from './workflow.mjs';
+import { doors, fire, loadWorkflow, resumeOf, runSpec, runWorkingSeconds, requestSessionClose, retireSupersededRuns, refreshCardInputs, refreshRelationAnswers, transitionsFor, scopeOf, statusOf, storedStatus, templateValue, workflowFor } from './workflow.mjs';
 import { checkWorkspace, assertWorkspaceOwner, notePresence, resolveWorkspace } from './workspace.mjs';
 import { capacity, harnessDefaults, holdings } from './capacity.mjs';
 import { evaluate, holds, render } from './expr.mjs';
@@ -464,13 +464,17 @@ export function whereOf(board, task) {
 const hostOf = (pressure) => ({ memory_pressure: pressure, max_in_progress: derivedMaxInProgress() });
 
 /** What every board of the home at `root` holds now, counted for its caps (capacity.mjs). */
-function homeHoldings(root, slugs, lanes, fleet) {
+function homeHoldings(root, slugs, lanes, fleet, entry) {
   const live = (s) => fleet.sessions?.find((x) => x.address === addressOf(s)) ?? null;
   const out = [];
   for (const slug of slugs) {
     try {
       const b = openBoard(root, slug);
-      try { b.slug ??= slug; out.push(...holdings(b, { lanes, fleetOk: fleet.ok, alive: (s) => sessionAlive(fleet, s), liveRecord: live, modelOf: transcriptModel, machineOf: normalMachine })); }
+      try {
+        b.slug ??= slug; b.label ??= boardLabel(root, slug);
+        const storedOf = (id) => storedStatus(b.db, b, entry, id).stored;
+        out.push(...holdings(b, { lanes, fleetOk: fleet.ok, alive: (s) => sessionAlive(fleet, s), liveRecord: live, modelOf: transcriptModel, storedOf, machineOf: normalMachine }));
+      }
       finally { b.close(); }
     } catch { /* its own tick reports it */ }
   }
@@ -579,7 +583,7 @@ function startCards(board, fleet, lanes, settings, report, entry, effects, { onl
   // the caps, over what the home holds now; what each candidate would be once started
   const caps = capacity(d.capacity, held, evaluate);
   const entryOf = (c) => ({ card: c.task.id, board: board.slug, machine: c.task.machine ? normalMachine(c.task.machine) : null, assignee: c.plan.profile ?? null,
-    status: c.plan.target, model: c.task.model_override ?? c.plan.lane?.model ?? held.defaults?.[c.plan.lane?.harness] ?? null, harness: c.plan.lane?.harness ?? null });
+    status: c.plan.target, stored: c.plan.target, model: c.task.model_override ?? c.plan.lane?.model ?? held.defaults?.[c.plan.lane?.harness] ?? null, harness: c.plan.lane?.harness ?? null });
   const waitingEntries = candidates.map(entryOf);
   // a dry run (dispatch --dry-run) plans the same way and writes nothing: no notes, no moves, no launches
   const note = (id, why) => { if (!dry) tx(board, (db) => noteGuard(db, id, why)); };
@@ -1872,7 +1876,7 @@ export async function plan({ root, lanes, settings, slugs = null, params = {} })
   const fleet = Object.values(lanes).some((l) => l.surface === 'pane') ? observeFleet() : { ok: false, alive: new Set(), online: new Set(), sessions: [], error: 'no pane lanes' };
   const out = [];
   // the home's caps count every board, whichever boards are planned
-  const held = homeHoldings(root, listBoards(root), lanes, fleet);
+  const held = homeHoldings(root, listBoards(root), lanes, fleet, entry);
   const caps = capacity(entry.workflow.dispatch?.capacity, held, evaluate);
   // what each cap counts now, before anything this plan would start
   Object.defineProperty(out, 'capacity', { value: caps.view().map((cap) => ({ ...cap, groups: cap.groups.map((g) => ({ ...g, max: capMax(cap, g, entry, lanes) })) })) });
@@ -1982,7 +1986,7 @@ export async function tick({ root, lanes, settings, only = null, slugs = null, d
   const fleetMs = Date.now() - fleetAt;
   const boards = slugs ?? listBoards(root);
   // what every board of the home holds, for caps whose scope is the whole home (kanban.max_in_progress counts so)
-  const held = dispatch ? homeHoldings(root, boards, lanes, fleet) : [];
+  const held = dispatch ? homeHoldings(root, boards, lanes, fleet, entry) : [];
   const out = [];
   for (const slug of boards) {
     const report = { board: slug, ms: { fleet: fleetMs }, mailed: [], started: [], queued: [], failed: [], lost: [], crashed: [], timed_out: [], reclaimed: [], auto_blocked: [], promoted: 0, unassigned: [], nonspawnable: [], notified: [], undelivered: [], fleet: fleet.ok ? 'read' : fleet.error };

package/package.json

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