@volter/supercode-orchestrator 0.4.153 → 0.4.154

package/board/ci.mjs

@@ -126,6 +126,20 @@ function registeredBranches(board, id) {
   return out;
 }
 
+/** Whether `head` is a branch named for card `id`: `wt/<id>` (or `wt/t-…`), alone or with a `-…`/`/…` suffix. */
+export const namedWorkBranch = (id, head) => [`wt/${id}`, `wt/${id.replace(/^t_/, 't-')}`].some((prefix) => head === prefix || head.startsWith(`${prefix}-`) || head.startsWith(`${prefix}/`));
+
+/** The branch names an arc declares as its work: its own and its subtasks' `--branch`, and each branch its latest
+ *  review request covered. With `namedWorkBranch`, these are the branches its PRs are opened from. */
+export function declaredWorkBranches(db, id) {
+  const declared = db.prepare(`SELECT t.branch_name FROM tasks t LEFT JOIN supercode_cards c ON c.task_id=t.id
+    WHERE (t.id=? OR c.subtask_of=?) AND t.status != 'cancelled' AND t.branch_name IS NOT NULL`).all(id, id).map((r) => r.branch_name);
+  const row = db.prepare("SELECT payload FROM task_events WHERE task_id=? AND kind='review_requested' ORDER BY id DESC LIMIT 1").get(id);
+  let reviewed = [];
+  try { reviewed = candidatePullRequests(row && JSON.parse(row.payload)?.ci).map((p) => p.branch); } catch { /* an unreadable payload names none */ }
+  return [...new Set([...declared, ...reviewed].filter(Boolean))];
+}
+
 /** Every opened PR of the arc, each proposed to its repository's default branch: an open PR whose head is the card's
  *  work branch in the card's own repository, a `wt/<card id>` branch in any repository this machine keeps a checkout
  *  of, or a sibling checkout the arc registered (`registeredBranches`). The repository's default branch, declared or
@@ -140,8 +154,7 @@ export function openReviewPullRequests(board, id) {
   const current = task?.branch_name ? null : run('git', ['branch', '--show-current'], own);
   let branch = task?.branch_name ?? (current || null);
   const registered = registeredBranches(board, id);
-  const named = (head) => [`wt/${id}`, `wt/${id.replace(/^t_/, 't-')}`].some((prefix) => head === prefix || head.startsWith(`${prefix}-`) || head.startsWith(`${prefix}/`));
-  const mine = (repository, head) => (repository === ownRepository && head === branch) || named(head)
+  const mine = (repository, head) => (repository === ownRepository && head === branch) || namedWorkBranch(id, head)
     || registered.some((r) => r.repository === repository && r.branch === head);
   const prs = [];
   for (const repository of new Set([ownRepository, ...registered.map((r) => r.repository), ...knownRepositories()])) {

package/board/workflow.mjs

@@ -11,7 +11,7 @@ import { resolve, relative, isAbsolute } from 'node:path';
 import { randomBytes } from 'node:crypto';
 import { actorOf, appendRunObservation, event as record, json, now } from './store.mjs';
 import { evaluate, holds, render } from './expr.mjs';
-import { completionEvidence, reviewCandidate } from './ci.mjs';
+import { completionEvidence, declaredWorkBranches, namedWorkBranch, reviewCandidate } from './ci.mjs';
 import { isWorkspacePath } from './workspace.mjs';
 import { identifyNotice } from './notices.mjs';
 
@@ -103,17 +103,29 @@ function pattern(p) {
   return text.startsWith('(?i)') ? new RegExp(text.slice(4), 'i') : new RegExp(text);
 }
 
-// the time of the latest commit that names `id` in its message, on any ref of the repository at `path` (a worktree's
-// pushes land on the shared remote-tracking refs), or null (asked only when an expression does). Merge commits are
-// not the card's work: merging its reviewed PR, or main into its branch, is not a newer change to review.
+// the time of the latest commit that names `id` in its message on the card's work in the repository at `path`, or null
+// (asked only when an expression does). Its work is the branches its PRs are opened from (the checkout's own branch,
+// a declared or reviewed one, `wt/<id>…`), local or remote-tracking (a worktree's pushes land on the shared refs),
+// and the default branch they merge into. Another ref naming the card (an evidence branch, a later card's work) is not
+// a change to its reviewed work. Merge commits are not the card's work: merging its reviewed PR, or main into its
+// branch, is not a newer change to review.
 const commitTimes = new Map();
-function observeLastCommit(path, id) {
+function observeLastCommit(path, id, branches = []) {
   if (!path) return null;
   const key = `${path}:${id}`;
   const cached = commitTimes.get(key);
   if (cached && now() - cached.at < 15) return cached.value;
+  const git = (repo, args) => spawnSync('git', ['-C', repo, ...args], { encoding: 'utf8', timeout: 10_000 });
   const readCommit = (repo) => {
-    const r = spawnSync('git', ['-C', repo, 'log', '--all', '--no-merges', '-1', '--format=%ct', '--fixed-strings', `--grep=${id}`], { encoding: 'utf8', timeout: 10_000 });
+    const listed = git(repo, ['for-each-ref', '--format=%(refname)', 'refs/heads', 'refs/remotes']);
+    if (listed.status !== 0) return { repo: false, value: null };
+    const current = git(repo, ['branch', '--show-current']).stdout?.trim();
+    const fallback = git(repo, ['symbolic-ref', '--quiet', 'refs/remotes/origin/HEAD']).stdout?.trim().replace(/^refs\/remotes\/origin\//, '');
+    const names = new Set([...branches, current, fallback].filter(Boolean));
+    const short = (ref) => ref.startsWith('refs/heads/') ? ref.slice(11) : ref.split('/').slice(3).join('/');
+    const refs = listed.stdout.split('\n').filter((ref) => ref && !ref.endsWith('/HEAD') && (names.has(short(ref)) || namedWorkBranch(id, short(ref))));
+    if (!refs.length) return { repo: true, value: null };
+    const r = git(repo, ['log', ...refs, '--no-merges', '-1', '--format=%ct', '--fixed-strings', `--grep=${id}`, '--']);
     const value = Number(r.stdout?.trim());
     return { repo: r.status === 0, value: Number.isFinite(value) && value > 0 ? value : null };
   };
@@ -145,7 +157,7 @@ export function refreshCardInputs(board, id, { commits = false } = {}) {
     const parent=!own && task.subtask_of?board.db.prepare('SELECT workspace_path FROM tasks WHERE id=?').get(task.subtask_of)?.workspace_path:null;
     const path=own??parent??null;
     if(path)commitTimes.delete(`${path}:${id}`);
-    observeLastCommit(path,id);
+    observeLastCommit(path,id,declaredWorkBranches(board.db,id));
   }
 }
 
@@ -307,7 +319,8 @@ export function scopeOf(db, board, task, { params, event = {}, extra = {} } = {}
     last_events: Object.fromEntries(all(db, 'SELECT e.kind, e.created_at, e.payload FROM task_events e JOIN (SELECT kind, MAX(id) AS id FROM task_events WHERE task_id = ? GROUP BY kind) l ON l.id = e.id', task.id)
       .map((r) => [r.kind, { created_at: r.created_at, payload: json(r.payload, {}) ?? {} }])),
     comments_since: (t) => all(db, 'SELECT author, body, created_at FROM task_comments WHERE task_id = ? AND created_at >= ?', task.id, t),
-    // the latest commit naming this card, in its workspace's repository (a subtask's: its arc's), as epoch seconds
+    // the latest commit naming this card on its work branches and default branch, in its workspace's repository (a
+    // subtask's: its arc's), as epoch seconds
     last_commit_at: () => {
       const own = task.workspace_kind !== 'scratch' ? task.workspace_path : null;
       const arcWs = !own && task.subtask_of ? one(db, "SELECT workspace_path FROM tasks WHERE id = ? AND workspace_kind != 'scratch'", task.subtask_of)?.workspace_path : null;

package/package.json

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