@volter/supercode-orchestrator 0.4.148 → 0.4.150

package/cron.mjs

@@ -750,18 +750,24 @@ function firePrompt(job) {
   return job.prompt ?? '';
 }
 
+// supercode's normal machine name (session addresses spell a machine this way)
+const machineName = (name) => String(name ?? '').split('.')[0].toLowerCase().replace(/[^a-z0-9_-]/g, '-');
+
 function startFire(state, profile, job, now, effects) {
   const fire = claimFire(profile, job, now);
   if (!fire) return;
   effects.push({ type: 'save' }); // the claim is durable before anything runs (at-most-once)
-  if (state.runtime?.hostedJobs) {
+  // A job that names another machine runs each fire in a session there: the loop launches it on that machine, and the
+  // launch's receipt finishes the fire as a host's would.
+  const remote = job.machine && state.runtime?.machine && machineName(job.machine) !== state.runtime.machine ? machineName(job.machine) : null;
+  if (state.runtime?.hostedJobs || remote) {
     fire.started_at = now;
     fire.status = 'running';
     fire.session_id = null; // a host callback is not a fabricated native worker session
     fire.residue = { execution: 'host_task' };
     state.runtime.hostedFires[`${profile.name}:${fire.id}`] = true;
     effects.push({ type: 'save' });
-    effects.push({ type: 'execute_job', profile: profile.name, job_id: job.id, fire_id: fire.id });
+    effects.push({ type: 'execute_job', profile: profile.name, job_id: job.id, fire_id: fire.id, ...(remote ? { machine: remote } : {}) });
     return;
   }
   // A gate (a script, a monitor source) runs before any model, off the event

package/hermes-locks.mjs

@@ -13,7 +13,7 @@ import { spawn, spawnSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, unlinkSync, writeSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { join, resolve } from 'node:path';
 
 /** Hermes's gateway kind, the `kind` of every record it writes. */
 export const GATEWAY_KIND = 'hermes-gateway';
@@ -143,25 +143,6 @@ export function holdGatewayLock(home, { python = 'python3' } = {}) {
   return holdFileLock(join(resolve(home), 'gateway.lock'), home, { python, what: `${resolve(home)} is served by`, tail: 'one runtime serves a home at a time' });
 }
 
-/**
- * Hold the board's one dispatcher lock, `<root>/kanban/.dispatcher.lock` (Hermes's
- * `_acquire_singleton_lock`, which every Hermes gateway takes before it dispatches). Resolves
- * `{ release }`; rejects, naming the holder, when another dispatcher holds it.
- */
-export function holdDispatcherLock(root, { python = 'python3' } = {}) {
-  const path = join(resolve(root), 'kanban', '.dispatcher.lock');
-  mkdirSync(join(resolve(root), 'kanban'), { recursive: true });
-  return holdFileLock(path, root, { python, what: `the board at ${resolve(root)} is dispatched by`, tail: 'one dispatcher serves a board' });
-}
-
-/**
- * Hold one board's per-tick lock, `<kanban.db>.dispatch.lock` (Hermes's `_dispatch_tick_lock`), for one tick: a
- * one-shot `dispatch` never ticks a board beside another dispatcher. Rejects, naming the holder, when it is held.
- */
-export function holdBoardTickLock(dbPath, { python = 'python3' } = {}) {
-  return holdFileLock(`${dbPath}.dispatch.lock`, dirname(dbPath), { python, what: `the board ${dbPath} is being ticked by`, tail: 'one tick at a time' });
-}
-
 function holdFileLock(path, home, { python, what, tail }) {
   return new Promise((done, fail) => {
     let child;

package/loop.mjs

@@ -23,6 +23,9 @@ import { performRemoveProfileDir } from './operator.mjs';
 import { harnessHomes } from './mcp/verbs.mjs';
 import { checkMonitor, runJobScript } from './gates.mjs';
 import { startBoard } from './board.mjs';
+import { localMachine } from './board/dispatch.mjs';
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
 
 /**
  * Where a worker keeps its transcripts inside its config home (`<profile>/<harness>`), as discovery and
@@ -54,6 +57,7 @@ export class Orchestrator {
     this.hostedTasks = new Set();
     state.runtime ??= {};
     state.runtime.hostedJobs = !!executeJob;
+    state.runtime.machine = localMachine(); // a job naming another machine fires there (cron.mjs startFire)
     state.runtime.hostedFires = {};
     this.vault = vault;
     this.client = client;
@@ -263,12 +267,12 @@ export class Orchestrator {
     }
   }
 
-  executeHostedJob({ profile: name, job_id, fire_id }) {
+  executeHostedJob({ profile: name, job_id, fire_id, machine = null }) {
     const profile = this.state.profiles[name];
     const job = structuredClone(profile.jobs[job_id]);
     const fire = structuredClone(profile.fires.find((f) => f.id === fire_id));
     // Host work never blocks the state queue; completion returns as an event.
-    const task = Promise.resolve().then(() => this.executeJob({ profile: name, job, fire }))
+    const task = Promise.resolve().then(() => machine ? this.launchRemoteFire({ profile, job, fire, machine }) : this.executeJob({ profile: name, job, fire }))
       .then((receipt) => {
         if (!receipt || typeof receipt.output !== 'string' || receipt.accepted !== true)
           throw new Error('The host did not confirm this scheduled task');
@@ -279,6 +283,23 @@ export class Orchestrator {
     this.hostedTasks.add(task);
   }
 
+  /**
+   * A fire of a job pinned to another machine: a session of the profile's worker harness on that machine, in a window
+   * there, given the job's prompt (`supercode open --new --on`, keyed by the fire so a retry never opens a second).
+   * The launch is the fire's receipt; the session does the job's work and reports through its own doors.
+   */
+  async launchRemoteFire({ profile, job, fire, machine }) {
+    const harness = profile.worker?.harness;
+    const program = { 'claude-code': 'claude', codex: 'codex' }[harness];
+    if (!program) throw new Error(`profile ${profile.name}'s worker (${harness ?? 'none'}) cannot run a fire on ${machine}`);
+    const args = ['open', '--new', program, '--detach', '--window=true', '--on', machine, '--key', `cron-${fire.id}`, '--input', job.prompt ?? ''];
+    if (job.workdir && job.workdir.startsWith('/')) args.push('--cwd', job.workdir);
+    if (job.model) args.push('--', '--model', job.model);
+    const { stdout } = await promisify(execFile)(process.env.SUPERCODE_BIN || 'supercode', args, { timeout: 180_000, maxBuffer: 4 * 1024 * 1024 });
+    const pane = /"pane"\s*:\s*"([^"]+)"/.exec(stdout)?.[1] ?? null;
+    return { accepted: true, output: `Fire ${fire.id} of ${job.id} launched on ${machine}${pane ? ` in pane ${pane}` : ''}.`, machine, pane };
+  }
+
   /**
    * A fire's gate, off the queue (a script may run for Hermes's hour): the
    * monitor source first, then the pre-run script unless the monitor already

package/mcp/hermes-kanban-tools.json

@@ -183,17 +183,25 @@
           "type": "string",
           "description": "Exact pushed worktree branch head for independent review."
         },
-        "branch": {
-          "type": "string",
-          "description": "The worktree branch whose pushed head is reviewed before merge."
-        },
         "pr": {
-          "type": "string",
-          "description": "Opened PR URL for the candidate in this worktree repository."
+          "type": [
+            "string",
+            "array"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "description": "Every opened PR the arc changed, one URL each (its own repository's and any other repository it changed)."
         },
         "pr_head": {
-          "type": "string",
-          "description": "Full 40-character SHA of the pushed PR head to review."
+          "type": [
+            "string",
+            "array"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "description": "The full 40-character pushed head SHA of each PR, in the same order as pr."
         }
       },
       "required": [
@@ -218,6 +226,13 @@
         "board": {
           "type": "string",
           "description": "Kanban board slug to target. When omitted, the call resolves the active board the usual way: HERMES_KANBAN_DB env \u2192 HERMES_KANBAN_BOARD env \u2192 the 'current' symlink under the kanban home \u2192 'default'. Pass an explicit slug only when the caller (e.g. a Telegram routing layer) needs to override the env-pinned active board for this one call."
+        },
+        "findings": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "Each finding, filed as a task on the arc before the card returns; an arc with no open task is refused."
         }
       },
       "required": [
@@ -361,10 +376,6 @@
     "inputSchema": {
       "type": "object",
       "properties": {
-        "review_only": {
-          "type": "boolean",
-          "description": "Declare a standalone independent review job, where permitted by the home's manager policy. Its verdict is accepted without another review of the review; implementation arcs keep their independent review requirement."
-        },
         "title": {
           "type": "string",
           "description": "Short task title (required)."
@@ -563,16 +574,34 @@
           "description": "The pushed worktree branch the reviewer inspected."
         },
         "reviewed_sha": {
-          "type": "string",
-          "description": "Exact pushed branch head the independent reviewer actually inspected."
+          "type": [
+            "string",
+            "array"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "description": "Every requested PR head this independent reviewer inspected (full SHAs)."
         },
         "pr": {
-          "type": "string",
-          "description": "PR URL, optional when using the recorded review candidate."
+          "type": [
+            "string",
+            "array"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "description": "PR URLs, optional when using the recorded review candidate."
         },
         "pr_head": {
-          "type": "string",
-          "description": "Full PR head SHA; reviewers can use reviewed_sha instead."
+          "type": [
+            "string",
+            "array"
+          ],
+          "items": {
+            "type": "string"
+          },
+          "description": "Full PR head SHAs; reviewers can use reviewed_sha instead."
         }
       },
       "required": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.4.148",
+  "version": "0.4.150",
   "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": {
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@volter/supercode-harness-sdk": "^0.3.41",
-    "@volter/ztrack": "^2.4.20",
+    "@volter/ztrack": "^2.4.21",
     "yaml": "^2.9.0",
     "@volter/supercode-teams": "^0.2.145"
   },

package/board/rows.mjs

@@ -1,132 +0,0 @@
-// Normalized runtime rows. Card text remains in the document; this stores only runtime
-// tables, run fields and small indexing metadata. No application locks or snapshot rewrites.
-import { json } from './store.mjs';
-const quote = s => `"${s.replaceAll('"', '""')}"`;
-const RUNTIME = new Set(['claim_lock','claim_expires','worker_pid','last_heartbeat_at','current_run_id','consecutive_failures','last_failure_error','block_recurrences','session_id','workspace_path']);
-const OMIT = new Set(['tasks','supercode_cards','task_links','sqlite_sequence']);
-export class RuntimeRows {
-  constructor(db) { this.db=db; this.revision=null; this.tables=new Map(); this.runtime={}; this.clocks={}; this.sequences={}; this.cachedTasks={}; this.cachedCards={}; }
-  normalized() { return Boolean(this.db.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name='runtime_rows'").get()); }
-  watch(mem) {
-    mem.exec('CREATE TEMP TABLE IF NOT EXISTS _runtime_dirty (name TEXT, key TEXT)');
-    for (const {name,sql} of mem.prepare("SELECT name,sql FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%'").all()) {
-      const columns=mem.prepare(`PRAGMA table_info(${quote(name)})`).all();
-      const keys=columns.filter(c=>c.pk).sort((a,b)=>a.pk-b.pk).map(c=>c.name);
-      if (!keys.length) keys.push('rowid');
-      this.tables.set(name,{name,sql,keys,columns});
-      const key=prefix=>`json_array(${keys.map(k=>`${prefix}.${quote(k)}`).join(',')})`;
-      for(const [suffix,verb,prefix] of [['i','INSERT','NEW'],['u','UPDATE','NEW'],['d','DELETE','OLD']])
-        mem.exec(`CREATE TEMP TRIGGER IF NOT EXISTS ${quote(`_runtime_${name}_${suffix}`)} AFTER ${verb} ON main.${quote(name)} BEGIN INSERT OR IGNORE INTO _runtime_dirty VALUES ('${name}',${key(prefix)}); END`);
-    }
-    mem.exec('DELETE FROM _runtime_dirty');
-  }
-  insert(mem,name,row,key=null) {
-    if(row===null) {
-      const table=this.tables.get(name);if(!table)return;
-      mem.prepare(`DELETE FROM ${quote(name)} WHERE ${table.keys.map(k=>`${quote(k)} IS ?`).join(' AND ')}`).run(...JSON.parse(key));return;
-    }
-    const keys=Object.keys(row);
-    mem.prepare(`INSERT OR REPLACE INTO ${quote(name)} (${keys.map(quote).join(',')}) VALUES (${keys.map(()=>'?').join(',')})`).run(...keys.map(k=>row[k]??null));
-  }
-  load(mem,{fresh=false}={}) {
-    if(!this.normalized())return false;
-    if(fresh) {
-      for(const row of this.db.prepare('SELECT name,sql FROM runtime_schema').all()) mem.exec(row.sql.replace('CREATE TABLE ','CREATE TABLE IF NOT EXISTS '));
-      this.watch(mem);
-    }
-    const query=this.revision===null?'SELECT * FROM runtime_rows':'SELECT * FROM runtime_rows WHERE revision>?';
-    const rows=this.revision===null?this.db.prepare(query).all():this.db.prepare(query).all(this.revision);
-    for(const row of rows) {
-      const value=json(row.value,null);
-      if(row.name==='@runtime') { if(value)this.runtime[row.key]=value;else delete this.runtime[row.key]; }
-      else if(row.name==='@clock') { if(value)this.clocks[row.key]=value;else delete this.clocks[row.key]; }
-      else if(row.name==='@sequence') { if(value)this.sequences[row.key]=value;else delete this.sequences[row.key]; }
-      else if(row.name==='@task_cache') { if(value)this.cachedTasks[row.key]=value;else delete this.cachedTasks[row.key]; }
-      else if(row.name==='@card_cache') { if(value)this.cachedCards[row.key]=value;else delete this.cachedCards[row.key]; }
-      else this.insert(mem,row.name,value,row.key);
-    }
-    if (mem.prepare("SELECT 1 FROM sqlite_master WHERE name='sqlite_sequence'").get()) {
-      for (const [name, value] of Object.entries(this.sequences)) {
-        const sequence = mem.prepare('SELECT seq FROM sqlite_sequence WHERE name=?').get(name);
-        if (sequence) mem.prepare('UPDATE sqlite_sequence SET seq=MAX(seq,?) WHERE name=?').run(value.seq,name);
-        else mem.prepare('INSERT INTO sqlite_sequence(name,seq) VALUES(?,?)').run(name,value.seq);
-      }
-    }
-    this.revision=Number(this.db.prepare("SELECT value FROM state WHERE key='rows_revision'").get()?.value??0);
-    return true;
-  }
-  changes(mem,{all=false}={}) {
-    const dirty=all?[...this.tables.values()].flatMap(t=>mem.prepare(`SELECT ${t.keys.map(quote).join(',')} FROM ${quote(t.name)}`).all().map(row=>({name:t.name,key:JSON.stringify(t.keys.map(k=>row[k]))}))):mem.prepare('SELECT DISTINCT name,key FROM _runtime_dirty').all();
-    const changes = dirty.map(({name,key})=>{
-      const table=this.tables.get(name);
-      const row=mem.prepare(`SELECT * FROM ${quote(name)} WHERE ${table.keys.map(k=>`${quote(k)} IS ?`).join(' AND ')}`).get(...JSON.parse(key))??null;
-      if(name==='tasks')return {name:'@runtime',key:JSON.parse(key)[0],value:row&&Object.fromEntries(Object.entries(row).filter(([k])=>RUNTIME.has(k))),source:{name,key,row}};
-      if(name==='supercode_cards')return {name:'@clock',key:JSON.parse(key)[0],value:row&&{workspace_root:row.workspace_root,since:row.since,after_fired:row.after_fired,next_run_at:row.next_run_at},source:{name,key,row}};
-      return {name,key,value:row,source:{name,key,row}};
-    }).filter(change=>{
-      if(all)return true;
-      const {name,key,value,source}=change;
-      if(name==='task_links') {
-        const [parent,child]=JSON.parse(key);
-        const before=json(this.cachedCards[child]?.blocked_by,[]).some(b=>b.kind==='card'&&b.id===parent);
-        return before!==Boolean(source.row);
-      }
-      const before=this.db.prepare('SELECT value FROM runtime_rows WHERE name=? AND key=?').get(name,key)?.value??null;
-      if(before!==(value===null?null:JSON.stringify(value)))return true;
-      if(name==='@runtime') {
-        const fields=row=>row&&Object.fromEntries(Object.entries(row).filter(([k])=>k!=='status'));
-        return JSON.stringify(fields(source.row))!==JSON.stringify(fields(this.cachedTasks[key]??null));
-      }
-      if(name==='@clock')return JSON.stringify(source.row)!==JSON.stringify(this.cachedCards[key]??null);
-      return false;
-    });
-    if (mem.prepare("SELECT 1 FROM sqlite_master WHERE name='sqlite_sequence'").get()) {
-      for (const row of mem.prepare('SELECT name,seq FROM sqlite_sequence').all()) {
-        if (Number(this.sequences[row.name]?.seq) !== Number(row.seq)) changes.push({name:'@sequence',key:row.name,value:row,source:{name:'sqlite_sequence',key:JSON.stringify([row.name]),row}});
-      }
-    }
-    return changes;
-  }
-  mirror(changes, revision) {
-    const previous=Number(this.db.prepare("SELECT value FROM state WHERE key='read_revision'").get()?.value??-1);
-    for(const name of ['tasks','supercode_cards']) {
-      const table=this.tables.get(name); if(!table)return;
-      this.db.exec(table.sql.replace(/^CREATE TABLE (?:IF NOT EXISTS )?(?:"[^"]+"|\w+)/,`CREATE TABLE IF NOT EXISTS ${quote('read_'+name)}`));
-      const columns=this.db.prepare(`PRAGMA table_info(${quote('read_'+name)})`).all();
-      for(const c of table.columns) if(!columns.some(old=>old.name===c.name))this.db.exec(`ALTER TABLE ${quote('read_'+name)} ADD COLUMN ${quote(c.name)} ${c.type}${c.dflt_value==null?'':` DEFAULT ${c.dflt_value}`}`);
-
-    }
-    const rows=previous===revision-1?changes.filter(c=>['tasks','supercode_cards'].includes(c.source.name)).map(c=>c.source):this.db.prepare("SELECT name,key,value FROM runtime_rows WHERE name IN ('@task_cache','@card_cache')").all().map(r=>({name:r.name==='@task_cache'?'tasks':'supercode_cards',key:JSON.stringify([r.key]),row:json(r.value,null)}));
-    for(const {name,key,row} of rows) {
-      const table=this.tables.get(name), target=quote('read_'+name);
-      if(!row) {this.db.prepare(`DELETE FROM ${target} WHERE ${table.keys.map(k=>`${quote(k)} IS ?`).join(' AND ')}`).run(...JSON.parse(key));continue;}
-      const keys=Object.keys(row);
-      this.db.prepare(`INSERT OR REPLACE INTO ${target} (${keys.map(quote)}) VALUES (${keys.map(()=>'?')})`).run(...keys.map(k=>row[k]??null));
-    }
-    this.db.prepare("INSERT INTO state VALUES('read_revision',?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(String(revision));
-  }
-  write(changes) {
-    this.db.exec(`CREATE TABLE IF NOT EXISTS runtime_schema(name TEXT PRIMARY KEY,sql TEXT NOT NULL); CREATE TABLE IF NOT EXISTS runtime_rows(name TEXT,key TEXT,value TEXT,revision INTEGER NOT NULL,PRIMARY KEY(name,key)); CREATE INDEX IF NOT EXISTS runtime_rows_revision ON runtime_rows(revision); CREATE INDEX IF NOT EXISTS runtime_rows_task ON runtime_rows(name,json_extract(value,'$.task_id'),json_extract(value,'$.id')); CREATE INDEX IF NOT EXISTS runtime_rows_id ON runtime_rows(name,json_extract(value,'$.id'))`);
-    const revision=Number(this.db.prepare("SELECT value FROM state WHERE key='rows_revision'").get()?.value??0)+1;
-    const statement=this.db.prepare('INSERT INTO runtime_rows VALUES(?,?,?,?) ON CONFLICT(name,key) DO UPDATE SET value=excluded.value,revision=excluded.revision');
-    for(const {name,key,value,source} of changes) {
-      if (OMIT.has(name)) continue;
-      const encoded=value===null?null:JSON.stringify(value);
-      if (this.db.prepare('SELECT value FROM runtime_rows WHERE name=? AND key=?').get(name,key)?.value !== encoded) statement.run(name,key,encoded,revision);
-      if(name==='@runtime' || name==='@clock') {
-        const cacheName=name==='@runtime'?'@task_cache':'@card_cache';
-        const cache=name==='@runtime'?this.cachedTasks:this.cachedCards;
-        const encodedCache=source?.row?JSON.stringify(source.row):null;
-        if (this.db.prepare('SELECT value FROM runtime_rows WHERE name=? AND key=?').get(cacheName,key)?.value !== encodedCache) statement.run(cacheName,key,encodedCache,revision);
-        if(source?.row)cache[key]=source.row;else delete cache[key];
-      }
-      if(name==='@runtime') { if(value)this.runtime[key]=value;else delete this.runtime[key]; }
-      if(name==='@clock') { if(value)this.clocks[key]=value;else delete this.clocks[key]; }
-      if(name==='@sequence') { if(value)this.sequences[key]=value;else delete this.sequences[key]; }
-    }
-    for(const {name,sql} of this.tables.values())if(!OMIT.has(name))this.db.prepare('INSERT OR IGNORE INTO runtime_schema VALUES(?,?)').run(name,sql);
-    this.db.prepare("INSERT INTO state VALUES('rows_revision',?) ON CONFLICT(key) DO UPDATE SET value=excluded.value").run(String(revision));
-    this.mirror(changes,revision);
-    this.revision=revision;
-  }
-}