@feigi/fleet-ctl 3.82.19 → 3.82.21

package/agents/fleet-merge-bot.agent.md

@@ -18,9 +18,9 @@ Your report is the one file you write outside it: `<scratch>/reports/merge-bot-<
 the path your brief names, holding every PR you merged in `merged`. Your final
 message is the one line your brief gives, `merge-bot-<n>: done <path>`.
 
-The shell traps below are copied from the controller's skill file,
-`run-team/SKILL.md`. In them **Own the CI waits** is that file's section on the
-controller's CI watcher, which you do not run, and "this file" is that skill file; each trap applies to every shell
+The shell traps below are copied from the controller's skill, `run-team`. In
+them `references/ci-watcher.md` is that skill's file on the controller's CI
+watcher, which you do not run; each trap applies to every shell
 command and loop you run.
 
 **zsh word-splits an unquoted command substitution's result; it does NOT split
@@ -54,7 +54,7 @@ EOF
 ```
 
 The inline `$(printf '%s\n' "$prs")` form splits correctly too and is what the
-watcher block under **Own the CI waits** uses, but it splits on *every* whitespace character, so it is safe only
+watcher block in `references/ci-watcher.md` uses, but it splits on *every* whitespace character, so it is safe only
 for values that cannot contain one — PR numbers cannot, branch names and paths
 can. Measured on a two-line list whose first value is `two words`: three
 iterations through `$(printf …)`, two through `while IFS= read -r`. On an empty
@@ -70,8 +70,8 @@ word-split bug, so a correct heredoc fix missing this half looks exactly like no
 fix at all, and reads as one.
 
 **A probe that could not look emits an event; it never `continue`s.** Stated in
-full at *A probe that cannot read is a transition event, not silence* under **Own the CI waits**,
-and it binds every watcher in this file rather than that one block: the third
+full at *A probe that cannot read is a transition event, not silence* in `references/ci-watcher.md`,
+and it binds every watcher rather than that one block: the third
 value beside pass and fail is what turns a broken loop into a loud failure
 instead of a quiet one. A guard that drops an unreadable probe — `[ -n "$json" ]
 || continue` — makes *could not look* indistinguishable from *nothing to report*.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feigi/fleet-ctl",
-  "version": "3.82.19",
+  "version": "3.82.21",
   "description": "Agent fleet: run-team controller, merge bot, PR reviewer, and the ticket pipeline they share",
   "license": "Apache-2.0",
   "repository": {

package/scripts/tier-outcomes.mjs

@@ -20,7 +20,12 @@
 //     lack a member row (nothing from that run was checked). `--live`
 //     (a run in progress; CI never passes it) adds a WARNING, never a
 //     failure, per PR whose run-ledger row carries `reviewed=` but which has
-//     no row here. `--ledger <path>` names another ledger than the run's own.
+//     no row here, except a PR that closes no issue: `append` keys a row on
+//     exactly one ticket and refuses it, so it is named in a `note` line and
+//     never warned about. A read of that PR that does not answer keeps the
+//     warning, after a line naming why the read failed. Both reads of a PR's
+//     closing references ignore an ambient GH_REPO and give `gh` 60s.
+//     `--ledger <path>` names another ledger than the run's own.
 //
 // `tier` resolution, in order (never tie-broken by `run_date`: the two files'
 // `run_date`s mean different things — this file's header measures 92 of 267
@@ -445,20 +450,37 @@ function readLedger(ledgerFile, requireFile) {
   }
 }
 
-function closingTicket(pr) {
+// A PR's closingIssuesReferences array, or an Error naming why it could not be
+// read. GH_REPO is blanked so an ambient one naming another repository never
+// decides which PR is read; the timeout keeps a hung `gh` from stalling
+// `append` or a close-out's `check --live`.
+const GH_TIMEOUT_MS = 60_000;
+function closingRefs(pr) {
   let raw;
   try {
-    raw = execFileSync("gh", ["pr", "view", pr, "--json", "closingIssuesReferences"], { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] });
+    raw = execFileSync("gh", ["pr", "view", String(pr), "--json", "closingIssuesReferences"], {
+      encoding: "utf8", stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, GH_REPO: "" }, timeout: GH_TIMEOUT_MS,
+    });
   } catch (e) {
-    die(`gh pr view ${pr} failed: ${e.stderr?.trim() || e.message}`);
+    throw new Error(`gh pr view ${pr} failed: ${e.stderr?.trim() || e.message}`);
   }
   let refs;
   try {
     refs = JSON.parse(raw).closingIssuesReferences;
   } catch (e) {
-    die(`gh pr view ${pr} returned unreadable JSON: ${e.message}`);
+    throw new Error(`gh pr view ${pr} returned unreadable JSON: ${e.message}`);
+  }
+  if (!Array.isArray(refs)) throw new Error(`gh pr view ${pr} returned no closingIssuesReferences array`);
+  return refs;
+}
+
+function closingTicket(pr) {
+  let refs;
+  try {
+    refs = closingRefs(pr);
+  } catch (e) {
+    die(e.message);
   }
-  if (!Array.isArray(refs)) die(`gh pr view ${pr} returned no closingIssuesReferences array`);
   const numbers = [...new Set(refs.map((r) => r?.number))];
   if (numbers.length !== 1 || !Number.isInteger(numbers[0])) {
     die(`PR #${pr} closes ${numbers.length === 0 ? "no issue" : `${numbers.length} issues (${numbers.map((n) => `#${n}`).join(", ")})`} per GitHub's closingIssuesReferences — a tier-outcomes row keys on exactly one ticket`);
@@ -534,6 +556,20 @@ function append(pr, paths) {
   console.log(line);
 }
 
+// True only when `gh` answered and the PR's closingIssuesReferences is an empty
+// array. Any other outcome (gh failing, unreadable JSON, a non-array) is false
+// after a line naming why: a PR whose closing references cannot be read keeps
+// its warning. That line never reads `WARNING PR #`, which closeout.mjs turns
+// into a NEED.
+function closesNoIssue(pr) {
+  try {
+    return closingRefs(pr).length === 0;
+  } catch (e) {
+    console.error(`${NAME}: could not read the closing references of PR #${pr}: ${e.message}`);
+    return false;
+  }
+}
+
 function check(paths) {
   for (const flag of Object.keys(APPEND_FLAGS)) {
     if (arg(flag) !== null) die(`--${flag} is an append flag`);
@@ -546,6 +582,10 @@ function check(paths) {
   if (has("live")) {
     const ledger = readLedger(paths.ledger, true);
     for (const pr of unrecordedReviewedPrs(ledger, rows)) {
+      if (closesNoIssue(pr)) {
+        console.error(`${NAME}: note PR #${pr} carries reviewed= on the ledger and closes no issue, so it takes no row in ${paths.file}`);
+        continue;
+      }
       console.error(`${NAME}: WARNING PR #${pr} carries reviewed= on the ledger but has no row in ${paths.file} — run \`tier-outcomes.mjs append ${pr}\` if it is an implementer PR`);
     }
   }