@volter/supercode-orchestrator 0.4.141 → 0.4.143

package/board/dispatch.mjs

@@ -21,10 +21,10 @@ import { spawn as spawnChild, spawnSync } from 'node:child_process';
 import { existsSync, mkdirSync, openSync, readdirSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs';
 import { hostname, tmpdir } from 'node:os';
 import { basename, dirname, join } from 'node:path';
-import { randomUUID } from 'node:crypto';
+import { createHash, randomUUID } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { view, boardPath, claimer, event, json, listBoards, logsDir, now, openBoard, setActor, tx } from './store.mjs';
-import { doors, fire, loadWorkflow, resumeOf, runSpec, requestSessionClose, retireSupersededRuns, refreshRelationAnswers, transitionsFor, scopeOf, statusOf, templateValue, workflowFor } from './workflow.mjs';
+import { doors, fire, loadWorkflow, resumeOf, runSpec, runWorkingSeconds, requestSessionClose, retireSupersededRuns, refreshRelationAnswers, transitionsFor, scopeOf, statusOf, templateValue, workflowFor } from './workflow.mjs';
 import { checkWorkspace, assertWorkspaceOwner, resolveWorkspace } from './workspace.mjs';
 import { evaluate, holds, render } from './expr.mjs';
 import {
@@ -331,13 +331,13 @@ function supervise(board, fleet, settings, report, entry, effects) {
         return;
       }
       // a run past its runtime limit (the status's `run.limits.runtime`), as Hermes times its workers out
-      if (limits.runtime && runRow && t - Number(runRow.started_at) > Number(limits.runtime)) {
+      if (limits.runtime && runRow && session?.wait_started_at == null && runWorkingSeconds(runRow, t) > Number(limits.runtime)) {
         observe('timed_out', { limit_seconds: limits.runtime, error: `ran past max_runtime ${limits.runtime}s` }, 'timed_out');
         return;
       }
       if (session?.surface === 'headless') {
         // Hermes's stale check: a worker running past the limit with no heartbeat in the last hour is stopped
-        if (limits.stale && runRow && t - Number(runRow.started_at) >= Number(limits.stale) && !(task.last_heartbeat_at && t - Number(task.last_heartbeat_at) < 3600)) {
+        if (limits.stale && runRow && session?.wait_started_at == null && runWorkingSeconds(runRow, t) >= Number(limits.stale) && !(task.last_heartbeat_at && t - Number(task.last_heartbeat_at) < 3600)) {
           observe('stale', { timeout_seconds: limits.stale, pid: session.pid, error: `no heartbeat after ${t - Number(runRow.started_at)}s running` }, 'reclaimed');
           return;
         }
@@ -733,6 +733,7 @@ function observeIdle(board, fleet, settings, report, entry, effects) {
       if (!(entry.workflow.statuses[status]?.on?.session_idle || entry.workflow.on?.session_idle || entry.workflow.run?.on?.session_idle)) return;
       const runRow = currentRun(db, id);
       const session = runRow?.metadata?.supercode;
+      if (session?.wait_started_at != null) return;
       if (!session?.session_id || !['pane', 'native'].includes(session.surface) || session.offline_since != null) return;
       if (session.surface === 'native' && fleet.native?.get(addressOf(session))?.alive !== true) return;
       const live = fleet.sessions.find((x) => x.address === addressOf(session));
@@ -778,6 +779,12 @@ function observeIdle(board, fleet, settings, report, entry, effects) {
   }
 }
 
+function effectMessageKey(effect) {
+  if (effect.messageKey) return effect.messageKey;
+  const identity = JSON.stringify([effect.kind, effect.id, effect.runId, effect.sourceEvent, effect.durableId, effect.verb, effect.text]);
+  return `board-effect-${createHash('sha256').update(identity).digest('hex')}`;
+}
+
 /** The verb drains this durable notice immediately; the dispatcher retries after a failure. */
 export async function sessionNotice(board, e) {
   const prior = view(board, (db) => json(db.prepare('SELECT metadata FROM task_runs WHERE id=?').get(e.runId)?.metadata, {})?.supercode);
@@ -792,7 +799,7 @@ export async function sessionNotice(board, e) {
   let error = null, receipt = null;
   try {
     if (!e.address) throw new Error('lifecycle notice awaits the owned launch session identity');
-    receipt = await send(boardAddress(board.label), board.label, e.address, e.text, e.messageKey ?? `board-run-notice-${e.id}-${e.durableId}`);
+    receipt = await send(boardAddress(board.label), board.label, e.address, e.text, effectMessageKey(e));
     if (!receipt.delivered) error = receipt.reason ?? 'notice queued; native transcript confirmation pending'; }
   catch (failure) { error = String(failure.message).slice(-500); }
   tx(board, (db) => {
@@ -809,11 +816,15 @@ export async function sessionEffect(board, e) {
   if (e.kind === 'send_to_actor') {
     const row = view(board, db => e.runId ? db.prepare('SELECT metadata FROM task_runs WHERE id=?').get(e.runId) : null);
     const session = json(row?.metadata, {})?.supercode;
+    if (session?.wait_started_at != null) {
+      tx(board, db => event(db, e.id, 'actor_notice_suppressed', { notice: e.durableId, reason: 'run is waiting', run_id: e.runId }, e.runId));
+      return true;
+    }
     const address = addressOf(session);
     let receipt;
     try {
       if (!address) throw new Error('actor session identity unavailable');
-      receipt = await send(boardAddress(board.label), board.label, address, e.text, `board-actor-${e.id}-${e.durableId}`);
+      receipt = await send(boardAddress(board.label), board.label, address, e.text, effectMessageKey(e));
     } catch (error) { receipt = { delivered: false, reason: error.message }; }
     const kind = receipt.delivered ? 'actor_notice_delivered' : receipt.queued ? 'actor_notice_queued' : 'actor_notice_failed';
     tx(board, db => {

package/board/rows.mjs

@@ -5,7 +5,7 @@ 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.cachedTasks={}; this.cachedCards={}; }
+  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)');
@@ -40,16 +40,24 @@ export class RuntimeRows {
       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();
-    return dirty.map(({name,key})=>{
+    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}};
@@ -72,6 +80,12 @@ export class RuntimeRows {
       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);
@@ -108,6 +122,7 @@ export class RuntimeRows {
       }
       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));

package/board/workflow.mjs

@@ -186,13 +186,21 @@ function onlyTicks(was, body) {
 }
 
 /** Seconds a card's runs spent by role, and the rest of its life as `waiting`. */
+export function runWorkingSeconds(row, at = now()) {
+  const metadata = typeof row.metadata === 'string' ? json(row.metadata, {}) : row.metadata;
+  const session = metadata?.supercode ?? {};
+  const end = Number(row.ended_at ?? at);
+  const waiting = Number(session.wait_seconds ?? 0) + (session.wait_started_at != null ? Math.max(0, end - Number(session.wait_started_at)) : 0);
+  return Math.max(0, end - Number(row.started_at ?? end) - waiting);
+}
+
 function timeOf(db, task) {
   const t = now();
   const out = { coding: 0, reviewing: 0, auditing: 0, triaging: 0 };
   const key = { implementer: 'coding', reviewer: 'reviewing', auditor: 'auditing', triager: 'triaging' };
   for (const r of all(db, 'SELECT started_at, ended_at, metadata FROM task_runs WHERE task_id = ?', task.id)) {
     const role = json(r.metadata, {})?.supercode?.role ?? 'implementer';
-    const spent = Math.max(0, Number(r.ended_at ?? t) - Number(r.started_at ?? t));
+    const spent = runWorkingSeconds(r, t);
     const k = key[role] ?? role;
     out[k] = (out[k] ?? 0) + spent;
   }
@@ -338,7 +346,7 @@ function queueTransitionNotice(db, board, entry, task, from, name, payload, befo
   const scope = scopeOf(db, board, after, { params: entry.params, event: { ...payload, verb: name, from, to }, extra: { run: { id: beforeRun.id } } });
   const text = render(entry.workflow.notify?.worker?.run_changed ?? '{{card.id}}: {{event.verb}} changed run {{run.id}} ({{event.from}} → {{event.to}}). Stop work under the previous run; follow the board’s current state. {{event.reason ?? ""}}', scope);
   const source = one(db, 'SELECT MAX(id) AS id FROM task_events WHERE task_id = ?', task.id)?.id;
-  const effect = { kind: 'session_notice', id: task.id, runId: beforeRun.id, address, text, sourceEvent: source, verb: name };
+  const effect = { kind: 'session_notice', id: task.id, runId: beforeRun.id, address, text, sourceEvent: source, verb: name, messageKey: `board-run-notice-${randomBytes(16).toString('hex')}` };
   const inserted = run(db, 'INSERT INTO supercode_effects (effect) VALUES (?)', JSON.stringify(effect));
   effects.push({ ...effect, durableId: Number(inserted.lastInsertRowid) });
   const current = json(one(db, 'SELECT metadata FROM task_runs WHERE id = ?', beforeRun.id)?.metadata, {}) ?? {};
@@ -612,6 +620,17 @@ const ACTIONS = {
     const result = fire(ctx.db, ctx.board, ctx.entry, ctx.id, name, { roles: [].concat(as), payload, extra: { lanes: lanesIn(ctx.entry) } });
     ctx.effects.push(...result.effects);
   },
+  wait_run(ctx, waiting) {
+    if (typeof waiting !== 'boolean') throw new Error('wait_run requires a boolean');
+    const at = now();
+    runSession(ctx, session => {
+      if (waiting) return { ...session, wait_started_at: session.wait_started_at ?? at };
+      if (session.wait_started_at == null) return session;
+      return { ...session, wait_started_at: null,
+        wait_seconds: Number(session.wait_seconds ?? 0) + Math.max(0, at - Number(session.wait_started_at)),
+        goal_nudged_at: at };
+    });
+  },
   record(ctx, args, scope) {
     const kind = typeof args === 'string' ? args : args?.kind;
     const given = typeof args === 'object' && args?.payload ? args.payload : null;
@@ -791,7 +810,7 @@ const ACTIONS = {
     ctx.effects.push({ kind: 'board_message', id: ctx.id });
   },
   send_to_actor(ctx, text) {
-    const effect = { kind: 'send_to_actor', id: ctx.id, runId: ctx.runId, text };
+    const effect = { kind: 'send_to_actor', id: ctx.id, runId: ctx.runId, text, messageKey: `board-actor-${randomBytes(16).toString('hex')}` };
     const inserted = run(ctx.db, 'INSERT INTO supercode_effects (effect) VALUES (?)', JSON.stringify(effect));
     ctx.effects.push({ ...effect, durableId: Number(inserted.lastInsertRowid) });
   },

package/board/ztrack.mjs

@@ -625,6 +625,7 @@ class ZtrackBoard {
         if (id) sources.set(`tasks:${JSON.stringify([id])}`, {name:'tasks',key:JSON.stringify([id]),row:this.mem.prepare('SELECT * FROM tasks WHERE id=?').get(id)});
       }
       for (const {name,key,row:source} of sources.values()) {
+        if (name === 'sqlite_sequence') continue;
         if (!compat.prepare("SELECT 1 FROM sqlite_master WHERE type='table' AND name=?").get(name)) continue;
         const table = this.rows.tables.get(name);
         if (name === 'task_events') {

package/package.json

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