@volter/supercode-orchestrator 0.5.2 → 0.5.3

package/board/dispatch.mjs

@@ -154,10 +154,10 @@ function unpublishedAlive(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 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 });
+  // This machine's discovery is its harness door, as every other harness read here is; another machine's is supercode's fleet arm
+  const result = normalMachine(machine) === localMachine()
+    ? doorOn(machine, 'harness.v1.sessions.discover', { harnesses: [harness], limit: 2000 }, { timeout: 120_000 })
+    : sc(['discover', '--on', machine, '--harness', harness, '--limit', '2000'], { 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;
@@ -1516,9 +1516,12 @@ export function requestAdoption(board, id, who, { workspace = null, assignee = n
   });
 }
 
+/** How long a requested adoption waits for its session to appear in the fleet before it fails. */
+const ADOPTION_LISTING_WINDOW_S = 180;
+
 /** Adoptions the manager requested and no tick has answered yet, completed from this tick's fleet reading. */
 export function completeAdoptions(board, fleet, settings, report, lanes = null) {
-  const pending = view(board, db => db.prepare(`SELECT e.task_id, e.payload FROM task_events e WHERE e.kind = 'dispatch_held'
+  const pending = view(board, db => db.prepare(`SELECT e.task_id, e.payload, e.created_at FROM task_events e WHERE e.kind = 'dispatch_held'
     AND json_extract(e.payload, '$.reason') = 'adoption requested'
     AND e.id = (SELECT MAX(id) FROM task_events l WHERE l.task_id = e.task_id AND l.kind IN ('dispatch_held','dispatch_released','session_adopted','adoption_failed'))`).all());
   for (const row of pending) {
@@ -1528,6 +1531,12 @@ export function completeAdoptions(board, fleet, settings, report, lanes = null)
       (report.adopted ??= []).push([row.task_id, got.address]);
     } catch (error) {
       const message = String(error.message).slice(-400);
+      // A session opened moments before its adoption is asked may not be in the fleet's published set yet: the
+      // card stays held and each tick looks again, until the window closes
+      if (error.notListed && Date.now() / 1000 - Number(row.created_at) < ADOPTION_LISTING_WINDOW_S) {
+        report.queued.push([row.task_id, `adoption of ${asked.session} waits: ${message}`]);
+        continue;
+      }
       tx(board, db => event(db, row.task_id, 'adoption_failed', { session: asked.session, error: message }));
       report.failed.push([row.task_id, `adoption of ${asked.session}: ${message}`]);
     }
@@ -1538,7 +1547,7 @@ function adoptSession(board, id, who, { workspace = null, ttl, assignee = null,
   fleet ??= observeFleet();
   if (!fleet.ok) throw new Error(`supercode could not read the fleet: ${fleet.error}`);
   const found = fleet.sessions.find((s) => s.address === who || s.address.endsWith(`:${who}`) || s.name === who);
-  if (!found) throw new Error(`the fleet lists no live session ${who}`);
+  if (!found) throw Object.assign(new Error(`the fleet lists no live session ${who}`), { notListed: true });
   const [, host, harness, sessionId] = found.address.split(':');
   if (!HARNESSES[harness]) throw new Error(`${found.address} is ${harness}; the board keeps and resumes ${Object.keys(HARNESSES).join(' and ')} sessions`);
   const native = found.pane ? null : nativeReading(nativeSessions(host, harness), { session_id: sessionId, harness });

package/gates.mjs

@@ -68,6 +68,9 @@ export function scriptTimeoutSeconds(profile, env = process.env) {
 function scriptEnv() {
   const env = {};
   for (const k of ['PATH', 'HOME', 'LANG', 'LC_ALL', 'TZ', 'TMPDIR', 'USER', 'SHELL']) if (process.env[k] !== undefined) env[k] = process.env[k];
+  // A script's `supercode` is the one this daemon runs, as an agent worker's is: its folder leads PATH
+  const own = process.env.SUPERCODE_BIN ? dirname(process.env.SUPERCODE_BIN) : null;
+  if (own) env.PATH = [own, ...(env.PATH ?? '').split(':').filter(dir => dir && dir !== own)].join(':');
   return env;
 }
 

package/package.json

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