@volter/supercode-orchestrator 0.5.227 → 0.5.229

package/orchestration.mjs

@@ -25,8 +25,8 @@ import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { SupercodeHarnessClient } from '@volter/supercode-harness-sdk';
 import { emptyRuntime, persistedView } from './ir.mjs';
-import { lockedProgram } from './source-lock.mjs';
-import { sourceRoot } from '@volter/supercode-teams/source-lock';
+import { lockedProgram } from './source-lock.mjs'; // layer: the orchestration names the program it runs from its pinned source (the host's source lock); owed: the host hands it in
+import { sourceRoot } from '@volter/supercode-teams/source-lock'; // layer: the orchestration names the program it runs from its pinned source (the host's source lock); owed: the host hands it in
 import { SESSION_READ_REQUEST_UNITS, stringifySessionWire } from '@volter/supercode-teams/session-read-client';
 
 /** Selected CLI for clients that need it: the locked Node entry, explicit
@@ -41,6 +41,9 @@ export function supercodeCommand() {
 
 const IDLE_MS = 250;
 let shared = null;
+// A new door can open while its predecessor closes. Keep each close until it succeeds, so an explicit shutdown
+// joins an idle close already in flight and still reports an earlier unconfirmed close.
+const closing = new Map();
 let holders = 0;
 let inFlight = 0;
 let idle = null;
@@ -55,13 +58,21 @@ export async function closeWorld() {
   if (idle) { clearTimeout(idle); idle = null; }
   const client = shared;
   shared = null;
-  if (client) await client.close();
+  if (client && !closing.has(client)) {
+    const work = Promise.resolve().then(() => client.close());
+    closing.set(client, work);
+    void work.then(() => closing.delete(client), () => { /* retained for the next explicit close */ });
+  }
+  const results = await Promise.allSettled([...closing.values()]);
+  const errors = results.filter(result => result.status === 'rejected').map(result => result.reason);
+  if (errors.length === 1) throw errors[0];
+  if (errors.length) throw new AggregateError(errors, 'orchestration door shutdown failed', { cause: errors[0] });
 }
 
 function settle() {
   if (idle) { clearTimeout(idle); idle = null; }
   if (holders > 0 || inFlight > 0 || !shared) return;
-  idle = setTimeout(() => { idle = null; if (holders === 0 && inFlight === 0) void closeWorld(); }, IDLE_MS);
+  idle = setTimeout(() => { idle = null; if (holders === 0 && inFlight === 0) void closeWorld().catch(() => { /* retained for explicit shutdown */ }); }, IDLE_MS);
   idle.unref?.();
 }
 

package/package.json

@@ -1,6 +1,13 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.5.227",
+  "devEngines": {
+    "packageManager": {
+      "name": "pnpm",
+      "version": ">=12.15.0",
+      "onFail": "error"
+    }
+  },
+  "version": "0.5.229",
   "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": {
@@ -31,16 +38,12 @@
     }
   },
   "types": "./index.d.ts",
-  "scripts": {
-    "generate-types": "node scripts/generate-types.mjs",
-    "check-types": "node scripts/generate-types.mjs --check"
-  },
   "dependencies": {
-    "@volter/supercode-teams": "^0.3.344",
-    "@volter/supercode-terminal": "^0.3.10",
-    "@volter/supercode-harness-sdk": "^0.3.104",
-    "@volter/teams": "0.2.99",
-    "@volter/ztrack": "2.4.23",
+    "@volter/supercode-teams": "0.3.393",
+    "@volter/supercode-terminal": "0.3.15",
+    "@volter/supercode-harness-sdk": "0.3.112",
+    "@volter/teams": "0.2.112",
+    "@volter/ztrack": "3.0.1-reader.0",
     "yaml": "^2.9.0"
   },
   "devDependencies": {
@@ -65,5 +68,9 @@
     "board",
     "apply",
     "README.md"
-  ]
-}
+  ],
+  "scripts": {
+    "generate-types": "node scripts/generate-types.mjs",
+    "check-types": "node scripts/generate-types.mjs --check"
+  }
+}

package/session-recovery.mjs

@@ -1,5 +1,6 @@
 // The optional local-session retry policy. The machine owns observation and native input receipts;
 // this orchestrator command owns when to ask for another turn. One invocation is bounded to eight seconds.
+import { readMachineRecord } from '@volter/teams/connector-records';
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
@@ -75,7 +76,7 @@ export async function runSessionRecovery(args = []) {
       log({ ...summary, durationMs: Date.now() - started, error: 'recovery pass exceeded its eight-second deadline' });
       channel?.close(); owner?.close(); process.exit(1);
     }, 8500);
-    const machine = JSON.parse(readFileSync(join(opts.home, 'teams', 'machine.json'), 'utf8'));
+    const machine = readMachineRecord(join(opts.home, 'teams'));
     channel = await openLocalMachine(machine.socket, { timeoutMs: 1000 });
     const rpc = new StreamRpc(await channel.open('node'));
     const call = (method, params, maximum = 1800) => {

package/worker-route.mjs

@@ -60,13 +60,20 @@ export function hermesModel(profile) {
  * writing the provider table into the worker's config home. The launch's `worker.model` (a job's own
  * model, or the `worker:` block's) wins over `model.default`.
  */
-export function workerRoute(profile, worker, vault) {
+export function workerRoute(profile, worker, vault, nativeHome = null) {
   const route = hermesModel(profile);
   // `model.default` reaches only a worker that takes a model at launch; one that reads the home's own
   // `model:` itself (Hermes over ACP) keeps it there
   const model = worker?.model ?? (MODEL_ARGUMENTS[worker?.harness] ? route?.model ?? null : null);
   if (route?.provider && worker?.harness === 'claude-code') return claudeRoute(profile, route, model, vault);
   if (!route?.provider || worker?.harness !== 'codex') return { model, args: [], env: {} };
+  const home = nativeHome?.env?.CODEX_HOME ?? join(profile.dir, 'codex');
+  const { id, table, env } = codexProvider(route, vault);
+  if (id !== 'openai' || route.base_url) writeProviderTable(home, id, table);
+  return { model, args: ['-c', `model_provider=${JSON.stringify(id)}`], env };
+}
+
+function codexProvider(route, vault) {
   const id = PROVIDER_ID[route.provider];
   if (!id) throw new Error(`model.provider ${route.provider} has no Codex route in this orchestrator yet; refused rather than run on Codex's default`);
   const env = {};
@@ -78,18 +85,16 @@ export function workerRoute(profile, worker, vault) {
     table.requires_openai_auth = false;
     table.env_key = LITERAL_KEY_ENV;
     env[LITERAL_KEY_ENV] = 'valve';
-    writeProviderTable(join(profile.dir, 'codex'), id, table);
-    return { model, args: ['-c', `model_provider=${JSON.stringify(id)}`], env };
+  } else {
+    if (route.base_url) table.base_url = resolve(route.base_url, vault).value;
+    if (route.api_key) {
+      const key = resolve(route.api_key, vault);
+      const name = key.name ?? LITERAL_KEY_ENV;
+      env[name] = key.value;
+      table.env_key = name;
+    }
   }
-  if (route.base_url) table.base_url = resolve(route.base_url, vault).value;
-  if (route.api_key) {
-    const key = resolve(route.api_key, vault);
-    const name = key.name ?? LITERAL_KEY_ENV;
-    env[name] = key.value;
-    table.env_key = name;
-  }
-  if (id !== 'openai' || route.base_url) writeProviderTable(join(profile.dir, 'codex'), id, table);
-  return { model, args: ['-c', `model_provider=${JSON.stringify(id)}`], env };
+  return { id, table, env };
 }
 
 /**
@@ -140,11 +145,9 @@ function writeProviderTable(home, id, table) {
   if (next !== text) writeFileSync(file, next, { mode: 0o600 });
 }
 
-/** The headful Codex lane must never fall back to the shared ChatGPT login.
- * This returns only the configured forward's stand-in key and provider flags;
- * it neither copies a credential nor starts a program or login. */
-export function codexPaneRoute(profile, worker, vault) {
-  if (worker?.harness !== 'codex' || hermesModel(profile)?.provider !== 'openai-codex')
+function paneProvider(profile, worker, vault) {
+  const route = hermesModel(profile);
+  if (worker?.harness !== 'codex' || route?.provider !== 'openai-codex')
     throw new Error('headful Codex requires model.provider openai-codex and its configured HERMES_CODEX_BASE_URL; no shared-login pane was launched');
   if (worker.home === 'user') throw new Error('headful Codex requires a profile home; no shared-login pane was launched');
   const forward = vault?.get?.('HERMES_CODEX_BASE_URL') ?? process.env.HERMES_CODEX_BASE_URL;
@@ -153,6 +156,21 @@ export function codexPaneRoute(profile, worker, vault) {
   try { endpoint = new URL(forward); } catch { throw new Error('the configured Codex forward is not an HTTP endpoint; no pane was launched'); }
   if (!['http:', 'https:'].includes(endpoint.protocol) || endpoint.username || endpoint.password)
     throw new Error('the configured Codex forward must be HTTP(S) without URL credentials; no pane was launched');
+  return { model: worker.model ?? route.model ?? null, ...codexProvider(route, vault) };
+}
+
+/** A login-free Codex route carried entirely in native launch arguments. */
+export function codexPaneRouteArguments(profile, worker, vault) {
+  const { id, table, env } = paneProvider(profile, worker, vault);
+  return { env, args: ['-c', `model_provider=${JSON.stringify(id)}`,
+    ...Object.entries(table).flatMap(([name, value]) => ['-c', `model_providers.${id}.${name}=${JSON.stringify(value)}`])] };
+}
+
+/** The headful Codex lane must never fall back to the shared ChatGPT login.
+ * This returns only the configured forward's stand-in key and provider flags;
+ * it neither copies a credential nor starts a program or login. */
+export function codexPaneRoute(profile, worker, vault) {
+  const { model, id, table, env } = paneProvider(profile, worker, vault);
   const home = join(profile.dir, 'codex');
   if (Object.hasOwn(worker.env ?? {}, 'CODEX_HOME') && worker.env.CODEX_HOME !== home)
     throw new Error('headful Codex has a different worker.env.CODEX_HOME; no shared-login pane was launched');
@@ -163,6 +181,6 @@ export function codexPaneRoute(profile, worker, vault) {
   } catch (error) { if (error.code !== 'ENOENT') throw error; }
   materializePersona(profile);
   materializeSkills(profile);
-  const route = workerRoute(profile, worker, vault);
-  return { ...route, env: { CODEX_HOME: home, ...route.env } };
+  writeProviderTable(home, id, table);
+  return { model, args: ['-c', `model_provider=${JSON.stringify(id)}`], env: { CODEX_HOME: home, ...env } };
 }