@volter/supercode-orchestrator 0.4.158 → 0.4.160

package/board/capacity.mjs

@@ -46,13 +46,16 @@ function sessionsOf(db, taskId) {
  * 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, 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), stored: row.status,
+      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,
     };

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';
@@ -147,7 +147,10 @@ const sessionAlive = (fleet, session) => fleet.native?.has(addressOf(session)) ?
 /** Native activity comes from the machine's harness discovery, not catalogue age. */
 function nativeSessions(machine, harness) {
   if (offlineMachine(machine)) throw unavailable(`native liveness unavailable: machine ${normalMachine(machine)} is offline`);
-  const result = sc(['discover', '--on', machine, '--harness', harness, '--limit', '2000'], { timeout: 120_000 });
+  const args = normalMachine(machine) === localMachine()
+    ? ['teams', 'rpc', 'sessions.discover', JSON.stringify({ harnesses: [harness], limit: 2000 })]
+    : ['discover', '--on', machine, '--harness', harness, '--limit', '2000'];
+  const result = sc(args, { timeout: 120_000 });
   const page = result.code === 0 ? lastJson(result.stdout) : null;
   if (!Array.isArray(page?.sessions)) throw unavailable(`native liveness unavailable on ${machine}: ${(result.stderr || result.stdout).trim().slice(-300)}`);
   return page.sessions;
@@ -464,13 +467,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 */ }
   }
@@ -1423,8 +1430,7 @@ function adoptSession(board, id, who, { workspace = null, ttl, assignee = null,
   // the session's own working directory, as discovery records it (where `--resume` finds it), else its pane's
   let dir = workspace ?? native?.row?.cwd;
   if (!dir) {
-    const r = sc(['discover', '--on', host, '--harness', harness, '--limit', '2000'], { timeout: 120_000 });
-    dir = (json(r.stdout.trim(), {})?.sessions ?? []).find((x) => x.locator?.session_id === sessionId)?.cwd ?? null;
+    dir = nativeSessions(host, harness).find((x) => x.locator?.session_id === sessionId)?.cwd ?? null;
   }
   if (!dir && found.pane) {
     const r = sc(['teams', 'panes', 'ls', '--machine', host], { timeout: 60_000 });
@@ -1453,7 +1459,7 @@ function adoptSession(board, id, who, { workspace = null, ttl, assignee = null,
       if (implementer?.session_id === sessionId) throw new Error('a reviewer must be independent of the implementer session');
     }
     event(db, id, 'dispatch_released', { reason: 'verified adoption', session: found.address });
-    if (!beforeRun) fire(db, board, entry, id, entry.workflow.run ? entry.workflow.dispatch.start : 'adopt', { roles: ['manager'], payload: { lock: claimer() } });
+    if (!beforeRun) fire(db, board, entry, id, entry.workflow.run ? entry.workflow.dispatch.start : 'adopt', { roles: [entry.workflow.run ? 'platform' : 'manager'], payload: { lock: claimer() } });
     const runId = getTask(db, id).current_run_id;
     if (!runId) throw new Error(`${id} waits on parents that are not done`);
     const session = { surface: found.pane ? 'pane' : 'native', session_id: sessionId, harness, machine: host, pane: found.pane ?? null, address: found.address, mode: 'adopt', launched_at: now(), seen_at: now() };
@@ -1872,7 +1878,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 +1988,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.158",
+  "version": "0.4.160",
   "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": {