@volter/supercode-orchestrator 0.4.56 → 0.4.58

package/board/cli.mjs

@@ -12,7 +12,7 @@ import { read } from '../orchestration.mjs';
 import { holdDispatcherLock } from '../hermes-locks.mjs';
 import { backingOf, boardExists, boardPath, DEFAULT_BOARD, event, json, listBoards, logsDir, now, openBoard, tx } from './store.mjs';
 import * as engine from './engine.mjs';
-import { adoptSession, boardAddress, boardLabel, boardSettings, lanesOf, localMachine, observeFleet, paused, plan, startCard, tick } from './dispatch.mjs';
+import { adoptSession, boardAddress, boardLabel, boardSettings, callerSession, lanesOf, localMachine, observeFleet, paused, plan, startCard, tick } from './dispatch.mjs';
 import { loadWorkflow, statusOf, useWorkflow, workflowEntry, workflowFor } from './workflow.mjs';
 import { evaluate } from './expr.mjs';
 
@@ -164,7 +164,7 @@ async function laneState(root) {
 
 /** The caller's own supercode address, when it is a session supercode can reach (for its card's notices). */
 function callerAddress() {
-  const id = process.env.CLAUDE_CODE_SESSION_ID || process.env.CODEX_THREAD_ID;
+  const id = callerSession();
   if (!id) return null;
   const fleet = observeFleet();
   return [...fleet.alive].find((a) => a.endsWith(`:${id}`)) ?? null;
@@ -233,7 +233,7 @@ export async function runWorkflow(argv) {
   const ids = (first = rest) => [...first, ...(args.ids ?? [])];
 
   // a caller that is a card's own session (its harness names it; the board recorded which session it launched)
-  const sid = process.env.CLAUDE_CODE_SESSION_ID || process.env.CODEX_THREAD_ID;
+  const sid = callerSession();
   if (sid && !READS.has(verb) && boardExists(root, slug)) {
     withBoard((b) => { const own = ownCard(b.db, sid); if (own) authorize(b.db, verb, rest, args, own); });
   }
@@ -266,7 +266,7 @@ export async function runWorkflow(argv) {
         workspace, branch: args.branch, parents: args.parent, priority: args.priority, tenant: args.tenant,
         triage: args.triage, idempotencyKey: args['idempotency-key'], maxRuntime: duration(args['max-runtime']),
         maxRetries, skills: args.skill, model: args.model, provider: args.provider, createdBy: args['created-by'] ?? callerName(),
-        sessionId: process.env.CLAUDE_CODE_SESSION_ID ?? null, subtaskOf: args['subtask-of'] ?? null, initialStatus: args['initial-status'] ?? null,
+        sessionId: callerSession(), subtaskOf: args['subtask-of'] ?? null, initialStatus: args['initial-status'] ?? null,
         project: args.project ?? meta.project_id ?? null, goal: args.goal ? { maxTurns: args['goal-max-turns'] ? Number(args['goal-max-turns']) : null } : args['no-goal'] ? false : null,
       }), true);
       let answer = { id: created.id, existing: created.existing };

package/board/dispatch.mjs

@@ -72,6 +72,31 @@ const lastJson = (text) => {
  * What supercode reports about the fleet now: `{ ok, alive: Set<address>, online: Set<machine>, error }`. `alive` is
  * every session that can be messaged on every machine; `online` every enrolled machine connected to the team.
  */
+/**
+ * The session a command runs in. Each harness names its own in a variable (Claude Code CLAUDE_CODE_SESSION_ID, Codex
+ * CODEX_THREAD_ID), and a pane inherits every variable the program that started its terminal server had, so a Codex
+ * pane can carry a Claude session's id too: the nearest harness among the command's ancestors says which is its own.
+ */
+export function callerSession() {
+  const claude = process.env.CLAUDE_CODE_SESSION_ID || null;
+  const codex = process.env.CODEX_THREAD_ID || null;
+  if (!claude || !codex) return claude ?? codex;
+  const table = spawnSync('ps', ['-A', '-o', 'pid=,ppid=,comm='], { encoding: 'utf8' });
+  const processes = new Map();
+  for (const row of String(table.stdout ?? '').split('\n')) {
+    const m = row.trim().match(/^(\d+)\s+(\d+)\s+(.*)$/);
+    if (m) processes.set(Number(m[1]), { parent: Number(m[2]), name: basename(m[3]) });
+  }
+  for (let pid = process.ppid, depth = 0; pid > 1 && depth < 64; depth++) {
+    const p = processes.get(pid);
+    if (!p) break;
+    if (p.name === 'codex') return codex;
+    if (/^claude(\.exe)?$/.test(p.name)) return claude;
+    pid = p.parent;
+  }
+  return claude;
+}
+
 export function observeFleet() {
   const list = sc(['message', 'list', '--json']);
   const sessions = list.code === 0 ? json(list.stdout.trim(), null) : null;
@@ -491,7 +516,7 @@ export async function sessionEffect(board, e) {
       const session = json(row.metadata, {})?.supercode;
       if ((session?.slot ?? 'worker') !== e.slot || !session?.pane || session.closed_at) continue;
       // the session that sent the event is not closed under its own command: the dispatcher closes it next tick
-      const caller = process.env.CLAUDE_CODE_SESSION_ID || process.env.CODEX_THREAD_ID;
+      const caller = callerSession();
       if (caller && caller === session.session_id) { tx(board, (db) => setRunSession(db, row.id, { ...session, close_requested: now() })); return; }
       stopSession(board, session);
       // a closed session hears nothing more of the card

package/package.json

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