@feigi/fleet-ctl 3.79.1 → 3.79.2

package/package.json

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

package/scripts/diff-stats.mjs

@@ -131,8 +131,8 @@ export function computeStats(files, changedFiles) {
 // --- CLI (runs only when executed directly, never on import) ---------------
 
 // die()/numArg() shared with the other fleet scripts — see arg.mjs for the
-// fail-open and pipe-safety rationale. `--pr` is
-// the only flag read here, and numArg() rather than arg() because this file
+// fail-open and pipe-safety rationale. `--pr` is the numeric flag read here
+// (`--repo` is the other, a plain string for gh's own `-R`), and numArg() rather than arg() because this file
 // was the live half of a defect: the `if (!pr)` below caught a trailing
 // `--pr` — `undefined` is falsy — but never a non-numeric one, so `--pr abc`
 // reached `gh pr view abc` and printed `{"pr":null,…}` at exit 0. Measured
@@ -140,7 +140,7 @@ export function computeStats(files, changedFiles) {
 // it resolves as a BRANCH, so the stats underneath were genuine and about
 // whatever PR that branch heads, reported under a null id.
 const die = makeDie(NAME);
-const { numArg, sweep, stray } = defineFlags(die, { flags: { pr: "value" } });
+const { arg, numArg, sweep, stray } = defineFlags(die, { flags: { pr: "value", repo: "value" } });
 
 // The one truncation rule for the raw gh value this script quotes into a
 // refusal: clip behind a visible marker, and only when the value was really
@@ -211,7 +211,17 @@ function main() {
   // required, where gh answers it truthfully as no such PR. Absent is this
   // file's own refusal and malformed is numArg()'s, per arg.mjs.
   const pr = numArg("pr");
-  if (pr === null) die("usage: diff-stats.mjs --pr <number>");
+  if (pr === null) die("usage: diff-stats.mjs --pr <number> [--repo <[HOST/]OWNER/REPO | url>]");
+  // Which repository the PR is in. Absent, `gh` resolves it from this process's
+  // working directory — the right answer for a human at their own checkout and
+  // the wrong one for review-core.mjs's snapshot agent, which starts in the
+  // controller's checkout while the PR belongs to the worktree's repository: a
+  // PR in the cwd's repository that shares the number answers instead, exit 0,
+  // a well-formed `files` array and a profile that sizes another change.
+  // `arg()` refuses an empty or flag-shaped value, so a caller whose repository
+  // came back empty gets a refusal here, never the cwd fallback an empty `-R ""`
+  // would be.
+  const repo = arg("repo");
   // The misspelled-flag sweep, weaker here for the same reason as pr-overlap.mjs: `--pr` is
   // required, so a misspelled `--prr 5` already fell through to the usage die
   // above. What was silently ignored at exit 0 is a stray riding along with a
@@ -234,7 +244,7 @@ function main() {
   // fail-closed rule as run() above: a broken response is not an empty diff.
   // `changedFiles` rides the same query for free and is the only thing that
   // reveals the 100-file cap on `files` — see computeStats.
-  const raw = run("gh", ["pr", "view", String(pr), "--json", "files,changedFiles"]);
+  const raw = run("gh", ["pr", "view", String(pr), "--json", "files,changedFiles", ...(repo === null ? [] : ["-R", repo])]);
   let info;
   try {
     info = JSON.parse(raw);

package/scripts/review-core.mjs

@@ -115,6 +115,11 @@ export const SNAPSHOT_SCHEMA = {
     // printed instead of SNAPSHOT_TREE_MATCH. Optional, because a verified
     // snapshot has nothing to say here.
     repoError: { type: "string" },
+    // Only when the PR-capture block printed SNAPSHOT_REPO_UNRESOLVED: the
+    // error `gh` gave for the worktree's repository, verbatim. Optional, so a
+    // resolved repository has nothing to say here; present, it is the one
+    // record of why the review then runs with no diff and no sizing.
+    repoUnresolved: { type: "string" },
     diffStats: { type: "string" },
     diffPath: { type: "string" },
     diffLines: { type: "integer" },
@@ -1071,17 +1076,41 @@ bare \`git\` — reads or writes THERE. Add nothing relative to it, and
 chain a \`cd\` into "$RUN" or "$SNAP" for anything you run beyond it.
 
 Then capture the PR's diff for the specialists, plus the three facts the caller
-needs to judge whether it is usable:
-
-    gh pr diff ${pr} > "$RUN"/pr.diff
-    crossRepo=$(gh pr view ${pr} --json isCrossRepository -q .isCrossRepository)
-    branch=$(gh pr view ${pr} --json headRefName -q .headRefName)
-    ref=""
-    [ "$crossRepo" = "true" ] || ref=$(git -C ${worktree} ls-remote origin "refs/heads/$branch" | cut -f1)
-    [ -n "$ref" ] || ref=$(git -C ${worktree} ls-remote origin "refs/pull/${pr}/head" | cut -f1)
-    echo "$ref"
-    gh pr view ${pr} --json headRefOid -q .headRefOid
-    wc -l < "$RUN"/pr.diff
+needs to judge whether it is usable. Every 'gh' call here names the repository
+with -R, and that repository is the one 'gh repo view' resolves from inside the
+worktree: this dispatch starts in the controller's checkout, which may be a
+different repository from the worktree's, and a 'gh' with no -R reads whichever
+PR in THAT repository shares the number — a diff, a branch and a head that
+belong to another PR entirely, with nothing in the output saying so. It is
+gh's answer rather than the raw 'origin' URL because gh resolves a checkout's
+remotes through ssh-config host aliases ('git@my-alias:owner/repo.git') and -R
+does not: handed that URL raw, every read below fails. It is also the remote gh
+would pick for any command run in that checkout — 'origin', unless an
+'upstream' remote or 'gh repo set-default' names another:
+
+    REPO=$( { cd ${worktree} && gh repo view --json url -q .url; } 2>"$RUN"/repo.err )
+    if [ -n "$REPO" ]; then
+      gh pr diff ${pr} -R "$REPO" > "$RUN"/pr.diff
+      crossRepo=$(gh pr view ${pr} -R "$REPO" --json isCrossRepository -q .isCrossRepository)
+      branch=$(gh pr view ${pr} -R "$REPO" --json headRefName -q .headRefName)
+      ref=""
+      [ "$crossRepo" = "true" ] || ref=$(git -C ${worktree} ls-remote origin "refs/heads/$branch" | cut -f1)
+      [ -n "$ref" ] || ref=$(git -C ${worktree} ls-remote origin "refs/pull/${pr}/head" | cut -f1)
+      echo "$ref"
+      gh pr view ${pr} -R "$REPO" --json headRefOid -q .headRefOid
+      wc -l < "$RUN"/pr.diff
+    else
+      echo SNAPSHOT_REPO_UNRESOLVED
+      cat "$RUN"/repo.err
+    fi
+
+If the block printed SNAPSHOT_REPO_UNRESOLVED, no 'gh pr' read ran: gh could not
+name the worktree's repository, and the controller's own repository is never a
+substitute. Report \`repoUnresolved\` = every line the block printed after
+SNAPSHOT_REPO_UNRESOLVED, verbatim — gh's own reason, such as no remote, or no
+remote on a GitHub host it is logged in to — or 'no error output' if it printed
+none. Omit \`diffPath\`, \`diffLines\`, \`refHead\` and \`prHead\`, and run
+nothing else against the PR yourself.
 
 Report \`diffPath\` = the SNAPSHOT_RUN_ROOT value with '/pr.diff' appended, ONLY
 if 'gh pr diff' exited 0. Report \`refHead\` = the sha the 'echo "$ref"' line
@@ -1120,9 +1149,15 @@ Report \`uncovered\` = its stdout, one line of JSON copied verbatim, ONLY if it
 exited 0. If it exited non-zero, report \`uncoveredError\` = its stderr and omit
 \`uncovered\`. Run none of the steps it lists.
 
-Then size the diff:
+Then size the diff, naming the same repository for the same reason — diff-stats.mjs
+given no --repo reads the PR from the controller's checkout. This block resolves
+it again because it is a separate command; the capture block above already
+reported why when it could not:
 
-    ~/.fleet/bin/fleet-run diff-stats.mjs --pr ${pr}
+    REPO=$(cd ${worktree} && gh repo view --json url -q .url 2>/dev/null)
+    if [ -n "$REPO" ]; then ~/.fleet/bin/fleet-run diff-stats.mjs --pr ${pr} --repo "$REPO"; else echo SNAPSHOT_REPO_UNRESOLVED; fi
+
+If that printed SNAPSHOT_REPO_UNRESOLVED, omit \`diffStats\`.
 
 Report \`runRoot\` = the SNAPSHOT_RUN_ROOT value and \`path\` = the SNAPSHOT_DEST
 value, both copied verbatim. Each ends in a component the shell substituted —
@@ -1135,8 +1170,9 @@ specialists into another run's tree. Report the HEAD sha, and — in
 STDOUT, copied verbatim. Only runRoot, path, head, pathVerified and repoVerified
 are ever required — diffStats, diffPath, diffLines, refHead and prHead are each
 omitted independently when their command failed, repoError only accompanies
-a false repoVerified, installError only replaces installCmd and installExit,
-and uncoveredError only replaces uncovered.`,
+a false repoVerified, repoUnresolved only accompanies SNAPSHOT_REPO_UNRESOLVED,
+installError only replaces installCmd and installExit, and uncoveredError only
+replaces uncovered.`,
     { label: `snapshot${forPr}`, phase: "Snapshot", agentType: SNAPSHOT_AGENT_TYPE, schema: SNAPSHOT_SCHEMA },
   );
 
@@ -1164,7 +1200,7 @@ and uncoveredError only replaces uncovered.`,
   log(
     usable
       ? `diff ${usable} (${snap.diffLines} lines)`
-      : `no diff — diffPath=${snap.diffPath ?? "(absent)"} diffLines=${snap.diffLines ?? "(absent)"} refHead=${snap.refHead ?? "(absent)"} prHead=${snap.prHead ?? "(absent)"} head=${snap.head} — specialists get the fallback read rules`,
+      : `no diff — diffPath=${snap.diffPath ?? "(absent)"} diffLines=${snap.diffLines ?? "(absent)"} refHead=${snap.refHead ?? "(absent)"} prHead=${snap.prHead ?? "(absent)"} head=${snap.head}${typeof snap.repoUnresolved === "string" ? ` — repository unresolved: ${oneLine(snap.repoUnresolved) || "(no reason given)"}` : ""} — specialists get the fallback read rules`,
   );
 
   let stats = null;