@volter/supercode-orchestrator 0.4.157 → 0.4.158

package/board/capacity.mjs

@@ -40,19 +40,19 @@ 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 }) {
   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),
+      card: row.id, board: board.slug, assignee: row.assignee ?? null, status: statusOf(board.db, row), stored: row.status,
       machine: row.machine ? machineOf(row.machine) : null,
       model: row.model_override ?? lane.model ?? null, harness: lane.harness ?? null,
     };
@@ -81,7 +81,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 +162,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

@@ -579,7 +579,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)); };

package/package.json

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