@volter/supercode-orchestrator 0.5.7 → 0.5.9

package/board/ci.mjs

@@ -324,15 +324,19 @@ function verifyPullRequest(board, id, entry, own, url, supplied, stage) {
   // with nothing uncommitted.
   const observed = readPullRequest(url);
   const path = originOf(own) === repository && run('git', ['branch', '--show-current'], own) === observed.headRefName ? own : branchCheckout(board, id, repository, observed.headRefName);
-  if (observed.state !== 'OPEN' || observed.isCrossRepository) throw new Error(`Source review needs an open PR from its repository (${url}).`);
-  if (observed.isDraft) throw new Error(`${url} is a draft; its review starts when it is marked ready for review.`);
+  // A PR merged before its review (an outage fix landed first) is still reviewed: its head is fixed for good, so the
+  // verdict is recorded on that head, and nothing about a worktree or its base can move under it any more.
+  const merged = observed.state === 'MERGED';
+  if ((observed.state !== 'OPEN' && !merged) || observed.isCrossRepository) throw new Error(`Source review needs an open or merged PR from its repository (${url}).`);
+  if (!merged && observed.isDraft) throw new Error(`${url} is a draft; its review starts when it is marked ready for review.`);
   const head = supplied ?? observed.headRefOid;
   if (!/^[a-f0-9]{40}$/.test(head)) throw new Error('Name the full PR head commit with --pr-head (reviewer: --reviewed-sha).');
   if (observed.headRefOid !== head) throw new Error(`The head of ${url} changed to ${observed.headRefOid}; request review of that head before recording a verdict.`);
   const branch = observed.headRefName;
   const mainBranch = entry.params.completion_ci?.main_branches?.[repository] ?? 'main';
-  if (branch === mainBranch || observed.baseRefName !== mainBranch) throw new Error(`${url} must propose its worktree branch to the repository main branch.`);
-  if (stage === 'request_review' && path) {
+  // A merged hotfix may have landed on another base (prod); a PR from the main branch itself is a release, never arc work.
+  if (branch === mainBranch || (!merged && observed.baseRefName !== mainBranch)) throw new Error(`${url} must propose its worktree branch to the repository main branch.`);
+  if (stage === 'request_review' && path && !merged) {
     run('git', ['check-ref-format', '--branch', branch], path);
     if (run('git', ['rev-parse', 'HEAD'], path) !== head) throw new Error(`The head named for ${url} must be its worktree head.`);
     const uncommitted = run('git', ['status', '--porcelain', '--untracked-files=normal'], path).split('\n').filter(Boolean);

package/board/cli.mjs

@@ -42,7 +42,7 @@ Hermes Kanban's verbs, with their flags:
   request-state <id> --state block|pause|done|cancelled --reason <why> [--on <card>|--waiting-on <message>] [--evidence <pointers>]
   unblock <id>... --on <blocker> --reason <what arrived>   request-review <id> (--pr URL --pr-head SHA)... [--summary] [--reviewer] [--force]   request-changes <id> <reason> [--finding <finding>]...   reopen-review <id>...   reopen <id>... [--reason]
   promote <id> [reason] [--ids ...] [--force] [--dry-run]   archive <id>... [--rm <id>...]
-  specify <id> [--title --body] [--workspace scratch|worktree:<repository>|dir:<repository>] [--branch NAME] [--all]
+  specify <id> [--title --body] [--workspace scratch|worktree:<repository>|dir:<repository>] [--branch NAME] [--machine M|none] [--all]
   decompose <id> [--child "<title>[@<profile>]"]... [--all]
   diagnostics [--task] [--severity]   stats   assignees   log <id> [--tail N]   tail <id>   watch [--assignee] [--kinds]
   notify-subscribe <id> --platform P --chat-id C [--thread-id]   notify-list [<id>]   notify-unsubscribe <id> --platform P --chat-id C
@@ -76,6 +76,7 @@ supercode's own:
   goto <id> <status> [reason] [--<field> value]: the event the workflow says takes the card to that status, sent.
 
   specify <id> --workspace dir:<repository> --branch NAME: the manager retargets a stopped card without replacing its history.
+  specify <id> --workspace … --machine M: declares the workspace on M and moves the card there, never asking the machine it leaves.
   request-review <id> (--pr URL --pr-head SHA)...: hand over every open PR the arc changed, each at its pushed head; one review covers them all.
   request-state <id> --state done (--reviewed-sha SHA)...: record the verdict on every requested PR head.
   request-state <id>... --state STATE --reason REASON: request several decisions in one retained manager mail.
@@ -763,8 +764,8 @@ export async function runWorkflow(argv) {
       if (!targets[0]) throw new Error(`${verb} needs a card id, or --all`);
       const results = [];
       for (const t of targets) {
-        if (verb === 'specify' && (args.title !== undefined || args.body !== undefined || args.workspace !== undefined || args.branch !== undefined)) {
-          const moved = await withBoardAsync((b) => engine.specify(b, t, { title: args.title ?? null, body: args.body ?? null, workspace: args.workspace ?? null, branch: args.branch ?? null, author: args.author ?? callerAddress() ?? callerName() }));
+        if (verb === 'specify' && (args.title !== undefined || args.body !== undefined || args.workspace !== undefined || args.branch !== undefined || args.machine !== undefined)) {
+          const moved = await withBoardAsync((b) => engine.specify(b, t, { title: args.title ?? null, body: args.body ?? null, workspace: args.workspace ?? null, branch: args.branch ?? null, machine: args.machine ?? null, author: args.author ?? callerAddress() ?? callerName() }));
           results.push({ id: t, specified: true, status: moved.to });
         } else if (verb === 'decompose' && args.child?.length) {
           const children = args.child.map((c) => { const [title, assignee] = c.split(/@(?=[^@]*$)/); return { title: title.trim(), assignee: assignee?.trim() || undefined }; });

package/board/engine.mjs

@@ -561,18 +561,21 @@ export const schedule = (board, id, reason = null, { roles } = {}) => act(board,
 export const promote = (board, id, { actor = 'user', reason = null, force = false, roles } = {}) => act(board, id, 'promote', { roles, payload: { actor, reason, force } });
 export const reclaim = (board, id, reason = null, { roles } = {}) => act(board, id, 'reclaim', { roles, payload: { reason } });
 export const archive = (board, id, { roles } = {}) => act(board, id, 'archive', { roles });
-export async function specify(board, id, { title = null, body = null, workspace = null, branch = null, author = 'user', roles } = {}) {
+export async function specify(board, id, { title = null, body = null, workspace = null, branch = null, machine = null, author = 'user', roles } = {}) {
   let declaration = null;
-  if (workspace != null || branch != null) {
+  if (workspace != null || branch != null || machine != null) {
     const task = getTask(board.db, id);
+    // `machine`: the workspace is declared on the machine the card moves to, never asked of the one it leaves (which may
+    // be offline or run a daemon too old to answer), and the card moves with the declaration in one act.
+    const target = machine == null ? task.machine : machine === 'none' ? null : machine;
     const word = workspace ?? `${task.workspace_kind}${task.workspace_anchor || task.workspace_path ? `:${task.workspace_anchor ?? task.workspace_path}` : ''}`;
     const ws = parseWorkspace(word);
     if (task.current_run_id) throw new Error('end the current run before changing its workspace');
     if (branch != null && ws.kind === 'scratch') throw new Error('a scratch workspace has no repository branch');
-    declaration = { kind: ws.kind, ...declareWorkspace(ws.kind, ws.path, task.machine, branch) };
+    declaration = { kind: ws.kind, ...declareWorkspace(ws.kind, ws.path, target, branch), ...(machine != null && target !== task.machine ? { machine: target } : {}) };
     if (declaration.repository === task.workspace_anchor) declaration.branch ??= task.branch_name;
     if (declaration.kind === 'worktree') declaration.branch ??= `wt/${id}`;
-    if (declaration.kind === 'dir') declaration.path = checkWorkspace(board, { ...task, workspace_kind: declaration.kind, workspace_anchor: declaration.repository, workspace_path: declaration.path, branch_name: declaration.branch }).path;
+    if (declaration.kind === 'dir') declaration.path = checkWorkspace(board, { ...task, machine: target, workspace_kind: declaration.kind, workspace_anchor: declaration.repository, workspace_path: declaration.path, branch_name: declaration.branch }).path;
   }
   // an arc's new task lines are filed as its subtasks once the specify itself is accepted
   const steps = body != null && !one(board.db, 'SELECT subtask_of FROM supercode_cards WHERE task_id = ?', id)?.subtask_of ? bodyTasks(body) : { body, tasks: [] };

package/board/event-relay.mjs

@@ -1,7 +1,8 @@
 // App-owned source names/maps live here; the Teams core knows only a scoped event publisher.
 import { createHash } from 'node:crypto';
 import { eventClient } from '@volter/teams/event-client';
-import { boardSourceName, recordCardPublications } from './published.mjs';
+import { EVENT_DATA_LIMIT } from '@volter/teams/event-limits';
+import { boardSourceName, publishableCard, recordCardPublications } from './published.mjs';
 import { listBoards, openBoard } from './store.mjs';
 
 export function boardEventRelay({root,context,supercodeHome,log=()=>{}}) {
@@ -26,7 +27,8 @@ export function boardEventRelay({root,context,supercodeHome,log=()=>{}}) {
           for(const row of rows){
             if(closed)return;
             const id=`event_${createHash('sha256').update(`${row.id}:${destination}`).digest('hex')}`;
-            await team.events.publish(source,{id,kind:row.kind,resource:{kind:'task',id:`${source}:${row.resource_id}`},revision:row.sequence,data:{board:slug,card:JSON.parse(row.snapshot)},actor:{session:row.actor?`session:${row.actor}`:null}},{idempotencyKey:id});
+            await team.events.publish(source,{id,kind:row.kind,resource:{kind:'task',id:`${source}:${row.resource_id}`},revision:row.sequence,data:{board:slug,card:publishableCard(JSON.parse(row.snapshot),slug,EVENT_DATA_LIMIT)},actor:{session:row.actor?`session:${row.actor}`:null}},{idempotencyKey:id})
+              .catch(error=>{throw Object.assign(error,{message:`${row.resource_id} ${row.kind} (sequence ${row.sequence}): ${error.message}`});});
             board.tx(db=>db.prepare('INSERT OR IGNORE INTO supercode_publication_receipts VALUES (?,?)').run(row.id,destination));
           }
         }
@@ -36,7 +38,7 @@ export function boardEventRelay({root,context,supercodeHome,log=()=>{}}) {
   const wake=(refresh=true)=>{
     reconcile ||= refresh;dirty=true;if(work||closed)return work;
     work=(async()=>{while(dirty&&!closed){dirty=false;await run();}})().catch(error=>{
-      log(`board event delivery pending: ${error.code??error.message}`);
+      log(`board event delivery pending: ${error.code?`${error.code}: `:''}${error.message}`);
       // Retry durable delivery, not a read of the board's current state.
       retry=setTimeout(()=>wake(false),5000);retry.unref?.();
     }).finally(()=>{work=null;});return work;

package/board/published.mjs

@@ -84,3 +84,32 @@ export function recordCardPublications(db,actor) {
   return changed;
 }
 export const boardSourceName = (root,slug) => `board:${hash(realpathSync(root)).slice(0,24)}:${slug}`;
+
+/**
+ * The card as one published event may carry it (`limit`: the bytes its `data`, `{ board, card }`, may serialize to).
+ * The board keeps every card whole; a card too large to send keeps its newest history: the oldest comments, attempts
+ * and reviews go first, then the body's tail, and `omitted` counts what the event leaves out.
+ */
+export function publishableCard(card,board,limit) {
+  const bytes=value=>Buffer.byteLength(JSON.stringify(value));
+  const size=value=>bytes({board,card:value});
+  if(size(card)<=limit)return card;
+  const omitted={comments:0,attempts:0,reviews:0,body_chars:0};
+  const fitted={...card,omitted};
+  // Counted once per item (its bytes and a separator), then checked whole: a card of megabytes fits in one pass.
+  let over=size(fitted)-limit;
+  for(const field of ['comments','attempts','reviews']){
+    const items=card[field]??[];let drop=0;
+    while(drop<items.length&&over>0){over-=bytes(items[drop])+1;drop+=1;}
+    fitted[field]=items.slice(drop);omitted[field]=drop;
+  }
+  for(const field of ['comments','attempts','reviews']){
+    while(fitted[field].length&&size(fitted)>limit){fitted[field]=fitted[field].slice(1);omitted[field]+=1;}
+  }
+  const body=String(card.body??'');
+  for(let keep=body.length;size(fitted)>limit&&keep>0;){
+    keep=Math.max(0,Math.min(keep-1,keep-(size(fitted)-limit)-64));
+    fitted.body=body.slice(0,keep);omitted.body_chars=body.length-keep;
+  }
+  return fitted;
+}

package/board/workflow.mjs

@@ -807,10 +807,12 @@ const ACTIONS = {
       if (task.current_run_id) throw new Error('end the current run before changing its workspace');
       ACTIONS.forget_session(ctx, '*');
       const prior = one(ctx.db, 'SELECT workspace_anchor FROM supercode_cards WHERE task_id=?', ctx.id);
-      record(ctx.db, ctx.id, 'workspace_changed', { from: { kind: task.workspace_kind, repository: prior?.workspace_anchor, branch: task.branch_name }, to: { kind: ws.kind, repository: ws.repository, branch: ws.branch } }, null);
+      const moves = Object.hasOwn(ws, 'machine');
+      record(ctx.db, ctx.id, 'workspace_changed', { from: { kind: task.workspace_kind, repository: prior?.workspace_anchor, branch: task.branch_name, ...(moves ? { machine: task.machine } : {}) }, to: { kind: ws.kind, repository: ws.repository, branch: ws.branch, ...(moves ? { machine: ws.machine } : {}) } }, null);
       run(ctx.db, 'UPDATE tasks SET workspace_kind=?,workspace_path=?,branch_name=? WHERE id=?', ws.kind, ws.path ?? null, ws.branch ?? null, ctx.id);
       cardField(ctx, 'workspace_anchor', ws.repository ?? null);
       cardField(ctx, 'workspace_root', null);
+      if (moves) cardField(ctx, 'machine', ws.machine ?? null);
     }
     if (said?.title && String(said.title).trim()) run(ctx.db, 'UPDATE tasks SET title = ? WHERE id = ?', String(said.title).trim(), ctx.id);
     if (said?.body !== undefined && said?.body !== null) run(ctx.db, 'UPDATE tasks SET body = ? WHERE id = ?', said.body, ctx.id);

package/kanban-worker.mjs

@@ -21,7 +21,7 @@ import { normalizeWorkerEvent, widensSandbox } from './loop.mjs';
 import { DEFAULT_BOARD, json, openBoard, tx } from './board/store.mjs';
 import { setRunSession } from './board/engine.mjs';
 import { permissionResponse } from './reducer.mjs';
-import { boardGuardArguments } from '@volter/supercode-teams/board-process-guard';
+import { boardGuardArguments } from '@volter/teams/board-process-guard';
 
 /** Hermes's worker argv, as `_default_spawn` builds it. */
 export function parseHermesArgv(argv) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-orchestrator",
-  "version": "0.5.7",
+  "version": "0.5.9",
   "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": {
@@ -25,8 +25,7 @@
   },
   "dependencies": {
     "@volter/supercode-harness-sdk": "^0.3.41",
-    "@volter/supercode-teams": "0.3.6",
-    "@volter/teams": "0.2.3",
+    "@volter/teams": "0.2.5",
     "@volter/ztrack": "^2.4.23",
     "yaml": "^2.9.0"
   },