@volter/supercode-orchestrator 0.4.26 → 0.4.27

package/board/dispatch.mjs

@@ -23,7 +23,7 @@ import { fileURLToPath } from 'node:url';
 import { boardPath, event, json, listBoards, now, openBoard, tx } from './store.mjs';
 import { holdBoardTickLock } from '../hermes-locks.mjs';
 import {
-  cardContext, claimIn, claimTtl, currentRun, DEFAULT_FAILURE_LIMIT, extendClaim, getTask, lastSession,
+  blockIn, cardContext, claimIn, claimTtl, currentRun, DEFAULT_FAILURE_LIMIT, extendClaim, getTask, lastSession,
   recomputeReady, recordFailure, release, setRunSession, subscribeIn, subscriptions,
 } from './engine.mjs';
 
@@ -943,9 +943,7 @@ function pursueGoals(board, fleet, settings, report) {
       const turns = session.worked_since_ask && !task.goal_mode ? 0 : Number(session.goal_turns ?? 0);
       const budget = task.goal_max_turns ?? settings.goalMaxTurns;
       if (turns >= budget) {
-        db.prepare("UPDATE tasks SET status = 'blocked', claim_lock = NULL, claim_expires = NULL WHERE id = ?").run(id);
-        const ended = endRun(db, id, { outcome: 'blocked', summary: `idle ${budget} times without deciding done or blocked` });
-        event(db, id, 'blocked', { reason: `its session went idle ${budget} times without deciding done or blocked; review it`, kind: 'needs_input', source_status: 'running' }, ended);
+        blockIn(db, id, { reason: `its session went idle ${budget} times without deciding done or blocked; review it`, kind: 'needs_input' });
         return null;
       }
       setRunSession(db, runRow.id, { ...session, goal_turns: turns + 1, goal_nudged_at: now(), worked_since_ask: false });

package/board/engine.mjs

@@ -396,25 +396,28 @@ function completeIn(board, id, { result = null, summary = null, metadata = null
 }
 
 export function block(board, id, { reason = null, kind = null } = {}) {
+  return tx(board, (db) => blockIn(db, id, { reason, kind }));
+}
+
+/** `block` inside the caller's transaction (the dispatcher's own blocks keep the same recurrence accounting). */
+export function blockIn(db, id, { reason = null, kind = null } = {}) {
   if (kind && !BLOCK_KINDS.includes(kind)) throw new Error(`block kind is one of ${BLOCK_KINDS.join(', ')}`);
-  return tx(board, (db) => {
-    const task = must(db, id);
-    if (!['running', 'ready'].includes(task.status)) throw new Error(`${id} is ${task.status}; only a running or ready card blocks`);
-    const source = task.status === 'running' ? retryStatus(db, id) : 'ready';
-    if (kind === 'dependency') {
-      run(db, "UPDATE tasks SET status = 'todo', claim_lock = NULL, claim_expires = NULL, worker_pid = NULL, block_kind = ? WHERE id = ?", kind, id);
-      const runId = endRun(db, id, { outcome: 'blocked', summary: reason }) ?? (reason ? synthesizeRun(db, id, { outcome: 'blocked', summary: reason }) : null);
-      event(db, id, 'dependency_wait', { reason, kind, source_status: source }, runId);
-      return 'todo';
-    }
-    const recurrences = task.block_kind === kind ? Number(task.block_recurrences || 0) + 1 : 1;
-    const loop = recurrences >= BLOCK_RECURRENCE_LIMIT;
-    const status = loop ? 'triage' : 'blocked';
-    run(db, 'UPDATE tasks SET status = ?, claim_lock = NULL, claim_expires = NULL, worker_pid = NULL, block_kind = ?, block_recurrences = ? WHERE id = ?', status, kind, recurrences, id);
+  const task = must(db, id);
+  if (!['running', 'ready'].includes(task.status)) throw new Error(`${id} is ${task.status}; only a running or ready card blocks`);
+  const source = task.status === 'running' ? retryStatus(db, id) : 'ready';
+  if (kind === 'dependency') {
+    run(db, "UPDATE tasks SET status = 'todo', claim_lock = NULL, claim_expires = NULL, worker_pid = NULL, block_kind = ? WHERE id = ?", kind, id);
     const runId = endRun(db, id, { outcome: 'blocked', summary: reason }) ?? (reason ? synthesizeRun(db, id, { outcome: 'blocked', summary: reason }) : null);
-    event(db, id, loop ? 'block_loop_detected' : 'blocked', { reason, kind, recurrences, ...(loop ? { limit: BLOCK_RECURRENCE_LIMIT } : {}), source_status: source }, runId);
-    return status;
-  });
+    event(db, id, 'dependency_wait', { reason, kind, source_status: source }, runId);
+    return 'todo';
+  }
+  const recurrences = task.block_kind === kind ? Number(task.block_recurrences || 0) + 1 : 1;
+  const loop = recurrences >= BLOCK_RECURRENCE_LIMIT;
+  const status = loop ? 'triage' : 'blocked';
+  run(db, 'UPDATE tasks SET status = ?, claim_lock = NULL, claim_expires = NULL, worker_pid = NULL, block_kind = ?, block_recurrences = ? WHERE id = ?', status, kind, recurrences, id);
+  const runId = endRun(db, id, { outcome: 'blocked', summary: reason }) ?? (reason ? synthesizeRun(db, id, { outcome: 'blocked', summary: reason }) : null);
+  event(db, id, loop ? 'block_loop_detected' : 'blocked', { reason, kind, recurrences, ...(loop ? { limit: BLOCK_RECURRENCE_LIMIT } : {}), source_status: source }, runId);
+  return status;
 }
 
 export function unblock(board, id) {

package/package.json

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