@volter/supercode-orchestrator 0.5.35 → 0.5.36

package/board/cli.mjs

@@ -15,7 +15,7 @@ import { actorOf, view, backingPaths, layOut, backingOf, boardExists, boardPath,
 import { isLocalWorkspace } from './workspace.mjs';
 import { openZtrackBoard } from './ztrack.mjs';
 import * as engine from './engine.mjs';
-import { requestAdoption, alertManagers, boardAddress, boardLabel, boardSettings, callerSession, commandEnv, reconcileCallerLaunch, closeRequested, lanesOf, localMachine, observeFleet, paused, plan, startCard, supercodeBin, tick } from './dispatch.mjs';
+import { requestAdoption, alertManagers, boardAddress, boardLabel, boardSettings, callerSession, commandEnv, reconcileCallerLaunch, closeRequested, lanesOf, localMachine, observeFleet, paused, plan, startCard, stopDispatching, supercodeBin, tick } from './dispatch.mjs';
 import { watchBoard } from './wake.mjs';
 import { streamBoardPublications } from './event-stream.mjs';
 import { completionOwnerOf, isLatestReviewer, loadWorkflow, requestSessionClose, scopeOf, statusOf, useWorkflow, workflowEntry, workflowFor } from './workflow.mjs';
@@ -1379,9 +1379,9 @@ async function serve(root, args = {}) {
   if (args.pidfile) writeFileSync(args.pidfile, `${process.pid}\n`);
   let stopped = false;
   let events;
-  const stop = () => { stopped = true; events?.close(); };
-  process.on('SIGTERM', stop);
-  process.on('SIGINT', stop);
+  // a signal ends the round in progress with nothing new started (dispatch.mjs stopDispatching) and no round after it
+  const stop = () => { stopped = true; stopDispatching(); events?.close(); };
+  for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP']) process.on(signal, stop);
   // what the serve says is kept in the home too (logs/workflow-serve.log), so why it stopped outlives its pane
   const kept = join(root, 'logs', 'workflow-serve.log');
   const log = (text) => {
@@ -1488,7 +1488,7 @@ async function serve(root, args = {}) {
         interval = settings.interval;
         const reports = await tick({ root, lanes: state.lanes, settings, params, deploymentReceipt: true });
         round += 1;
-        await watchRounds(reports);
+        if (!stopped) await watchRounds(reports);
         for (const r of reports) {
           nextMailAt = Math.min(nextMailAt, r.next_mail_at ?? Infinity);
           const said = summary(r);
@@ -1509,7 +1509,7 @@ async function serve(root, args = {}) {
         }
       } catch (error) {
         log(`tick failed: ${error.message}`);
-        await watchRounds([{ board: '*', error: `tick failed: ${error.message}` }]);
+        if (!stopped) await watchRounds([{ board: '*', error: `tick failed: ${error.message}` }]);
       }
       // each round is a line of its own in the slow log, with the steps it spent its time on
       recordSlow({ kind: 'call', name: 'dispatch round', ms: Date.now() - began, slowest: null, extra: { steps: takeSteps() } });
@@ -1529,7 +1529,7 @@ async function serve(root, args = {}) {
     }
   } finally {
     events?.close();
-    process.off('SIGTERM', stop); process.off('SIGINT', stop);
+    for (const signal of ['SIGTERM', 'SIGINT', 'SIGHUP']) process.off(signal, stop);
     if (args.pidfile) { try { unlinkSync(args.pidfile); } catch { /* gone */ } }
   }
   log(stopped ? 'stopped (a signal)' : 'stopped');

package/board/dispatch.mjs

@@ -2009,6 +2009,7 @@ export async function sendBoardMessages(board, report, taskId = null) {
   const planned = tx(board, db => pendingRequestMail(db, taskId));
   if (Number.isFinite(planned.nextAt)) report.next_mail_at = Math.min(report.next_mail_at ?? Infinity, planned.nextAt);
   for (const mail of planned.ready) {
+    if (stopping) break;
     const first = mail.members[0];
     try {
       const task = view(board, db => getTask(db, first.task_id));
@@ -2189,7 +2190,7 @@ async function notify(board, fleet, report, entry) {
         } else text = noticeOf(entry, role, ev.kind, task, p);
         if (text) {
           const body = ['worker', 'dependency'].includes(role) ? identifyNotice(ev, text) : text;
-          if (refused.has(sub.chat_id)) { untried = true; break; }
+          if (refused.has(sub.chat_id) || stopping) { untried = true; break; }
           let receipt;
           try {
             receipt = await send(board, from, board.label, sub.chat_id, body, `board-${sub.task_id}-${ev.id}-${sub.chat_id.slice(-12)}`, { queue: String(sub.chat_id).includes(':claude-code:') ? false : !working || (!entry.workflow.run && sub.delivery_mode === 'notify'), subject: `${ev.kind.replaceAll('_', ' ')} · run ${ev.run_id ?? 'none'} · event ${ev.id} · ${task?.title || sub.task_id}` });
@@ -2454,6 +2455,11 @@ function scAsync(args, { input = null, timeout = 120_000 } = {}) {
   });
 }
 
+// A dispatcher told to stop (its serve's SIGTERM, SIGINT or SIGHUP) starts nothing more in the round it is in: no further
+// board, card start, board message or notice. What it leaves untried is not a failure; the next dispatcher sends it.
+let stopping = false;
+export function stopDispatching() { stopping = true; }
+
 // how many deliveries a tick has in flight at once (each is a `supercode message` process of a few seconds)
 const SEND_CONCURRENCY = 8;
 
@@ -2461,7 +2467,7 @@ const SEND_CONCURRENCY = 8;
 async function pool(items, n, fn) {
   let next = 0;
   await Promise.all(Array.from({ length: Math.min(n, items.length) }, async () => {
-    while (next < items.length) { const i = next; next += 1; await fn(items[i]); }
+    while (next < items.length && !stopping) { const i = next; next += 1; await fn(items[i]); }
   }));
 }
 
@@ -2598,6 +2604,7 @@ export async function tick({ root, lanes, settings, only = null, slugs = null, d
   const held = dispatch ? homeHoldings(root, boards, lanes, fleet, entry) : [];
   const out = [];
   for (const slug of boards) {
+    if (stopping) break;
     const report = { board: slug, ms: { fleet: fleetMs }, mailed: [], started: [], queued: [], failed: [], lost: [], crashed: [], timed_out: [], reclaimed: [], auto_blocked: [], promoted: 0, unassigned: [], nonspawnable: [], notified: [], undelivered: [], fleet: fleet.ok ? 'read' : fleet.error };
     // the mailbox's answers in flight (not part of the report the caller prints)
     Object.defineProperty(report, 'answers', { value: [], enumerable: false });
@@ -2628,7 +2635,7 @@ export async function tick({ root, lanes, settings, only = null, slugs = null, d
       tx(board,db=>auditEndedRuns(db,board,entry));
       if (dispatch) await activatePullRequestReviews(board, entry, report, effects, { only });
       await sendBoardMessages(board, report);
-      if (dispatch) startCards(board, fleet, lanes, settings, report, entry, effects, { only, held });
+      if (dispatch && !stopping) startCards(board, fleet, lanes, settings, report, entry, effects, { only, held });
       phase('start');
       if (dispatch && !only && !report.paused) observeIdle(board, fleet, settings, report, entry, effects);
       // what the moves asked for, once they are committed (messages to actors, closed panes, cleaned workspaces)

package/package.json

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