@volter/supercode-orchestrator 0.4.151 → 0.4.152

package/board/ci.mjs

@@ -40,7 +40,7 @@ const repositoryOf = (url) => new URL(url).pathname.split('/').slice(1, 3).join(
 const numberOf = (url) => Number(new URL(url).pathname.split('/')[4]);
 /** A PR as the board reads it (gh's field names). */
 const pullRequest = (repository, p) => ({ url: p.html_url, number: p.number, state: p.merged_at ? 'MERGED' : String(p.state).toUpperCase(), headRefOid: p.head.sha,
-  headRefName: p.head.ref, baseRefName: p.base.ref, isCrossRepository: p.head.repo?.full_name?.toLowerCase() !== repository.toLowerCase(), isDraft: Boolean(p.draft) });
+  headRefName: p.head.ref, baseRefName: p.base.ref, defaultBranch: p.base.repo?.default_branch ?? null, isCrossRepository: p.head.repo?.full_name?.toLowerCase() !== repository.toLowerCase(), isDraft: Boolean(p.draft) });
 const readPullRequest = (url) => pullRequest(repositoryOf(url), github(`/repos/${repositoryOf(url)}/pulls/${numberOf(url)}`));
 
 const observations = new Map();
@@ -122,18 +122,22 @@ function registeredBranches(board, id) {
   return out;
 }
 
-/** Every opened PR of the arc: each open PR whose head is the card's branch or a `wt/<card id>` branch, in the
- *  card's own repository and in every repository this machine keeps a checkout of, and each open PR on a sibling
- *  checkout the arc registered (`registeredBranches`). One review covers them all; the caller decides the transition. */
+/** 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
+ *  checked out (or no branch), is not a work branch: such a card's PRs are only its `wt/<card>` and registered ones, and with none it
+ *  answers `{ waits }` saying so. One review covers them all; the caller decides the transition. */
 export function openReviewPullRequests(board, id) {
   const own = repositoryWorkspace(board, id);
   if (!own) return null;
   const task = board.db.prepare('SELECT branch_name FROM tasks WHERE id=?').get(id);
-  const branch = task?.branch_name ?? run('git', ['branch', '--show-current'], own);
   const ownRepository = originOf(own);
   if (!ownRepository) return null;
+  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 mine = (repository, head) => head === branch || [`wt/${id}`, `wt/${id.replace(/^t_/, 't-')}`].some((prefix) => head === prefix || head.startsWith(`${prefix}-`) || head.startsWith(`${prefix}/`))
+  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)
     || registered.some((r) => r.repository === repository && r.branch === head);
   const prs = [];
   for (const repository of new Set([ownRepository, ...registered.map((r) => r.repository), ...knownRepositories()])) {
@@ -147,10 +151,15 @@ export function openReviewPullRequests(board, id) {
       if (pullRequestLists.size >= 64) pullRequestLists.delete(pullRequestLists.keys().next().value);
       pullRequestLists.set(repository, list);
     }
-    // a draft is not handed over yet: its review starts when it is marked ready
-    for (const pr of list.items) if (!pr.isCrossRepository && !pr.isDraft && mine(repository, pr.headRefName)) prs.push({ url: pr.url, head: pr.headRefOid });
+    // The repository's default branch is not a work branch, declared or checked out (a card working in a `dir` on main).
+    if (repository === ownRepository && branch) {
+      const defaultBranch = list.items.find((pr) => pr.defaultBranch)?.defaultBranch ?? (() => { try { return run('git', ['symbolic-ref', '--quiet', '--short', 'refs/remotes/origin/HEAD'], own).replace(/^origin\//, ''); } catch { return null; } })();
+      if (branch === defaultBranch) branch = null;
+    }
+    // a draft is not handed over yet: its review starts when it is marked ready; a PR to another base (main→prod) is a release, not the arc's work
+    for (const pr of list.items) if (!pr.isCrossRepository && !pr.isDraft && pr.baseRefName === pr.defaultBranch && mine(repository, pr.headRefName)) prs.push({ url: pr.url, head: pr.headRefOid });
   }
-  if (!prs.length) return null;
+  if (!prs.length) return branch ? null : { waits: `the card has no work branch (${task?.branch_name ? `it declares ${task.branch_name}, its repository's default` : current ? `its checkout ${own} is on ${current}, its repository's default` : `its checkout ${own} is on no branch`}): give it one with --branch, or open its PR from a wt/${id} branch` };
   return { pr: prs.map((p) => p.url), pr_head: prs.map((p) => p.head), branch };
 }
 

package/board/dispatch.mjs

@@ -1880,6 +1880,7 @@ async function activatePullRequestReviews(board, entry, report, effects, { only
       // The arc's open PRs ask for one review only while some head has no verdict: after changes are
       // requested the next run is the implementer's, until a new head is pushed.
       if (!payload) { report.queued.push([id, 'review waits: no open PR on its branch, a wt/<card> branch or a registered checkout']); continue; }
+      if (payload.waits) { report.queued.push([id, `review waits: ${payload.waits}`]); payload = null; continue; }
       if (!reviewDue(board, id, payload.pr.map((url, index) => ({ url, head: payload.pr_head[index] })))) {
         report.queued.push([id, `review waits: every open PR head (${payload.pr.join(', ')}) has a verdict or predates the last one; push a commit that answers it`]);
         continue;

package/package.json

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