@volter/supercode-orchestrator 0.4.127 → 0.4.129

package/board/cli.mjs

@@ -302,6 +302,7 @@ export async function runWorkflow(argv) {
       }), true);
       let answer = { id: created.id, existing: created.existing };
       if (args.adopt) {
+        withBoard(b => { if (!rolesFor(b.db, created.id, sid, workflowFor(root).params).includes('manager')) throw new Error('Only the manager adopts an existing session.'); });
         const adopted = withBoard(b => adoptSession(b, created.id, args.adopt, { ttl: settings.ttl }));
         answer = { ...answer, started: true, session: adopted.address, mode: adopted.mode };
       } else if (!args['no-start'] && !created.existing && !args['subtask-of']) {
@@ -827,6 +828,7 @@ export async function runWorkflow(argv) {
     }
     case 'adopt': {
       need(2, 'a card id and a session');
+      withBoard(b => { if (!rolesFor(b.db, id, sid, workflowFor(root).params).includes('manager')) throw new Error('Only the manager adopts an existing session.'); });
       const { settings } = await laneState(root);
       const got = withBoard((b) => adoptSession(b, id, rest[1], { workspace: args.workspace ?? null, ttl: settings.ttl, assignee: args.assignee ?? null, role: args.role ?? null }));
       say(args, `${id} is worked by ${got.address} (pane ${got.pane ?? '?'} in ${got.workspace ?? 'its card\'s directory'})`, { ok: true, ...got });

package/board/dispatch.mjs

@@ -1212,6 +1212,12 @@ function resolveLocalWorkspace(board, task) {
  * its card. `who` is an address, a session id, or a `name@machine` the fleet lists.
  */
 export function adoptSession(board, id, who, { workspace = null, ttl, assignee = null, role = null } = {}) {
+  // Hold before discovery or any other process I/O: a failed attachment remains
+  // visible and cannot race a dispatcher into launching a replacement worker.
+  tx(board, db => {
+    if (!getTask(db, id)) throw new Error(`no card ${id}`);
+    event(db, id, 'dispatch_held', { session: who, reason: 'adoption requested' });
+  });
   const 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);

package/board/engine.mjs

@@ -170,6 +170,7 @@ export function createCard(board, spec) {
   ws.path = declared.path;
   spec = { ...spec, branch: declared.branch ?? spec.branch };
   const initial = spec.initialStatus ?? null;
+  if (initial === 'running' && (spec.noStart || spec.adopt)) throw new Error('A held or awaiting-adoption card cannot be created initially running.');
   if (initial && !['blocked', 'running'].includes(initial)) throw new Error('initial status is blocked or running');
   if (spec.provider && !spec.model) throw new Error('a provider needs a model');
   return tx(board, (db) => {

package/board/ztrack.mjs

@@ -19,6 +19,14 @@ const CARD_MAIN = new Set(['id', 'title', 'body', 'status', 'assignee', 'priorit
 const EPHEMERAL = new Set(['tasks', 'supercode_cards', 'task_links', 'sqlite_sequence']);
 const atomic = (path, text) => { const tmp = `${path}.${process.pid}.tmp`; writeFileSync(tmp, text, { mode: 0o600 }); renameSync(tmp, path); };
 
+// Only SQLite's actual contention codes retry. Rule refusals can contain words
+// such as "blocked" or "busy" and must reach the caller unchanged.
+const sqliteContention = error => [5, 6].includes(Number(error?.errcode) & 255)
+  || ['SQLITE_BUSY', 'SQLITE_LOCKED'].includes(error?.code)
+  || /^database (?:table |schema )?is locked$/i.test(error?.message ?? '');
+const exportConflict = error => error?.message === 'Hermes wrote during board export; retained its events for the next read';
+const recoveryConflict = error => error?.message === 'document changed during recovery; retry';
+
 export function openZtrackBoard(marker, { create = false, document = null, seed = null, init, root, slug, compatPath }) {
   if (!existsSync(marker)) {
     if (!create) throw new Error(`no ztrack board ${marker}`);
@@ -60,7 +68,7 @@ class ZtrackBoard {
     const fileStamp = (path) => { try { const s = statSync(path); return `${s.ino}:${s.size}:${s.mtimeMs}`; } catch { return 'missing'; } };
     return [fileStamp(this.path), fileStamp(this.archive), fileStamp(this.compatPath), this.get('version', '')].join('|');
   }
-  readOnly(fn) { for (;;) { try { return fn(); } catch(error) { if(!/busy|locked/i.test(error.message))throw error; } } }
+  readOnly(fn) { for (;;) { try { return fn(); } catch(error) { if(!sqliteContention(error))throw error; } } }
   access(fn, reading = false) {
     if (reading && !this.reading) { this.reading=true; try {return this.readOnly(()=>this.access(fn,true));}finally{this.reading=false;} }
     if (this.active || (reading && this.mem && this.loadedStamp === this.stamp())) return fn();
@@ -112,7 +120,7 @@ class ZtrackBoard {
     this.readOnly(()=>{ if(this.runtime.prepare('PRAGMA journal_mode').get().journal_mode!=='wal')this.runtime.exec('PRAGMA journal_mode=WAL'); });
     for (;;) {
       try { this.runtime.exec('BEGIN'); }
-      catch (error) { if (!/busy|locked/i.test(error.message)) throw error; continue; }
+      catch (error) { if (!sqliteContention(error)) throw error; continue; }
       this.active = true;
       let committed = false;
       try {
@@ -173,14 +181,14 @@ class ZtrackBoard {
         this.put('export_pending', [...this.get('export_pending', []), ...changes]);
         this.put('version', randomBytes(8).toString('hex'));
         this.runtime.exec('COMMIT');
-        try { this.flushExport(); } catch (error) { if (!/busy|locked|Hermes wrote/i.test(error.message)) throw error; }
+        try { this.flushExport(); } catch (error) { if (!sqliteContention(error) && !exportConflict(error)) throw error; }
         this.loadedStamp = this.stamp();
         this.seed = null;
         return result;
       } catch (error) {
         try { this.runtime.exec('ROLLBACK'); } catch { /* intent already durable */ }
         this.invalidate();
-        if (/busy|locked|Hermes wrote|document changed during recovery/i.test(error.message)) continue;
+        if (sqliteContention(error) || exportConflict(error) || recoveryConflict(error)) continue;
         if (committed) error.message += ' (the operation reached its durable intent; inspect its recorded outcome before retrying)';
         throw error;
       } finally { this.active = false; this.computing = false; this.pendingValues = null; }

package/package.json

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