@volter/supercode-orchestrator 0.4.142 → 0.4.143

package/board/dispatch.mjs

@@ -24,7 +24,7 @@ import { basename, dirname, join } from 'node:path';
 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));
@@ -815,6 +816,10 @@ 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 {

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;
   }
@@ -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;

package/package.json

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