@jphutchins/code-review 0.1.0-alpha.66 → 0.1.0-alpha.68

package/README.md

@@ -38,7 +38,7 @@ npx @jphutchins/code-review <subcommand>
 | Subcommand | What it does |
 | --- | --- |
 | `post` | Post a complete review from findings + envelope + diff — the one-call path. The findings are listed in the sticky summary; `--inline` renders the in-diff ones as comments on the diff instead. Also renders the review into `$GITHUB_STEP_SUMMARY`: the sticky is overwritten each round, the run summary keeps each round as it stood |
-| `gather` | Resolve the PR from the CI head SHA and gather the review inputs (diff with git-diff fallback, PR context, prior bot review, the implementer's answers (`Review-Response:` lines and verdict tables), failing-job logs) into the directory named by `--out-dir` (default: the current directory; the shipped workflows use `$RUNNER_TEMP/gather`) |
+| `gather` | Resolve the PR from the CI head SHA and gather the review inputs (diff with git-diff fallback, PR context, prior bot review, the implementer's answers (`Review-Response:` lines and verdict tables), the CI run's job logs — the failing jobs' on a failure, the jobs that ran, up to 64, on a pass) into the directory named by `--out-dir` (default: the current directory; the shipped workflows use `$RUNNER_TEMP/gather`) |
 | `parse-command` | Resolve a PR's head from its number and parse a ChatOps trigger comment (`/code-review [24m] [$1.00] <instructions>`) into review overrides — the on-demand comment trigger |
 | `react` | Add/remove a GitHub comment reaction — the ChatOps acknowledgement (👀 on receipt, 🚀 on completion) |
 | `await-ci` | Wait for a PR head's CI run to conclude and emit its real conclusion + run id — so an on-demand comment review routes on the CI result (success → full, failure → mechanic) instead of reviewing blind |

package/dist/index.js

@@ -70,6 +70,11 @@ var LineNumber = t.refinement(
   "LineNumber"
 );
 var Confidence = t.refinement(t.number, (n) => n >= 0 && n <= 1, "Confidence");
+var NonEmptyString = t.refinement(
+  t.string,
+  (s) => s.trim().length > 0,
+  "NonEmptyString"
+);
 var Likelihood = t.refinement(t.number, (n) => n >= 0 && n <= 1, "Likelihood");
 var FiniteNumber = t.refinement(t.number, (n) => Number.isFinite(n), "FiniteNumber");
 var NonNegativePrice = t.refinement(t.number, (n) => n >= 0, "NonNegativePrice");
@@ -236,7 +241,8 @@ var FindingsCodec = t.exact(
       // Pipeline-stamped only (issue #174); see ConvergenceCodec.
       convergence: ConvergenceCodec,
       // Agent-written best-effort (issue #182); see ChangeSizeCodec.
-      change_size: ChangeSizeCodec
+      change_size: ChangeSizeCodec,
+      unfinished: t.array(NonEmptyString)
     })
   ])
 );
@@ -246,8 +252,31 @@ var PIPELINE_STAMPED_FIELDS = /* @__PURE__ */ new Set([
 ]);
 var RECOVERABLE_OPTIONAL_FIELDS = /* @__PURE__ */ new Set([
   ...PIPELINE_STAMPED_FIELDS,
-  "change_size"
+  "change_size",
+  "unfinished"
 ]);
+var withoutBrokenOptionalFields = (doc, accepts) => {
+  const bare = Object.fromEntries(
+    Object.entries(doc).filter(([key2]) => !RECOVERABLE_OPTIONAL_FIELDS.has(key2))
+  );
+  if (!accepts(bare)) return null;
+  const usable = (kept, key2, value) => {
+    if (accepts({ ...kept, [key2]: value })) return value;
+    if (!Array.isArray(value)) return void 0;
+    const entries = value.filter((entry) => accepts({ ...kept, [key2]: [entry] }));
+    return entries.length > 0 && accepts({ ...kept, [key2]: entries }) ? entries : void 0;
+  };
+  const restored = Object.entries(doc).filter(([key2]) => RECOVERABLE_OPTIONAL_FIELDS.has(key2)).reduce((kept, [key2, value]) => {
+    const restoredValue = usable(kept, key2, value);
+    return restoredValue === void 0 ? kept : { ...kept, [key2]: restoredValue };
+  }, bare);
+  return {
+    doc: restored,
+    stripped: Object.keys(doc).filter(
+      (key2) => !Object.hasOwn(restored, key2) || restored[key2] !== doc[key2]
+    )
+  };
+};
 var ID_SHAPE_RE = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
 var priorIdsFrom = (doc) => {
   if (typeof doc !== "object" || doc === null || Array.isArray(doc)) return [];
@@ -545,7 +574,7 @@ var incompleteFindings = (summary) => ({
 var isIncompleteFindings = (findings) => findings.verdict === "error" && findings.findings.length === 0;
 
 // src/released.ts
-var RELEASED = "2026-10-10";
+var RELEASED = "2026-10-11";
 
 // src/cost.ts
 var defaultWarn = (message) => {
@@ -1939,6 +1968,19 @@ var overruledReRaiseNote = (entries, count) => entries.length === 0 ? "" : [
 // src/render.ts
 var escapePipes = (text) => text.replace(/\|/g, "\\|");
 var shedNote = (count, summaryAvailable, runUrl, findingsDocLinked, thisRunArtifact) => count === 0 ? "" : `<sub>**${String(count)} finding${count === 1 ? "" : "s"} left out of this comment**${summaryAvailable && runUrl !== void 0 ? ` \u2014 the [run summary](<${runUrl}>) carries the whole review` : findingsDocLinked && thisRunArtifact ? " \u2014 the machine findings document carries them" : ""}.</sub>`;
+var UNFINISHED_SHOWN = 8;
+var UNFINISHED_CLIP_CHARS = 240;
+var unfinishedLine = (check) => {
+  const escaped = escapeHtml(check.replace(/\s+/g, " ").trim());
+  return escaped.length > UNFINISHED_CLIP_CHARS ? `${escaped.slice(0, UNFINISHED_CLIP_CHARS).replace(/&[#a-z0-9]*$/i, "").replace(/[\uD800-\uDBFF]$/, "")}\u2026` : escaped;
+};
+var shownUnfinished = (doc, fullReviewRound) => {
+  const checks = fullReviewRound ? doc.unfinished ?? [] : [];
+  return [
+    ...checks.slice(0, UNFINISHED_SHOWN).map(unfinishedLine),
+    ...checks.length > UNFINISHED_SHOWN ? [`\u2026 and ${String(checks.length - UNFINISHED_SHOWN)} more`] : []
+  ];
+};
 var terminalNotice = (i) => [
   `## ${i.verdictBadge}`,
   "",
@@ -1950,6 +1992,7 @@ var terminalNotice = (i) => [
   ] : [],
   "",
   `> **The review for \`${escapeCodeBackticks(i.reviewedSha.slice(0, 7))}\` exceeds GitHub's comment-size limit.**` + (i.summaryAvailable ? i.runUrl ? ` The whole review lives in the [run summary](<${i.runUrl}>).` : " The whole review lives in the workflow run's summary." : i.findingsDocLinked && i.thisRunArtifact ? " The whole review lives in the machine findings document." : "") + (i.findingsDocLinked && i.thisRunArtifact ? " The machine findings document is linked above." : ""),
+  ...i.unfinished.length > 0 ? ["", `> **Unfinished checks:** ${i.unfinished.join(" \xB7 ")}`] : [],
   "",
   "> [!WARNING]",
   `> **LLM Disclosure** \u2014 this review was produced by ${i.modelNames || "unknown model"}.`,
@@ -2113,6 +2156,8 @@ var render = (input) => {
   const trajectory = convergence?.rounds ?? input.rounds ?? [];
   const sameRootNotes = input.sameRootNotes ?? computeSameRootNotes(trajectory.slice(0, -1), input.findings.findings);
   const isFullReviewRound = (input.convergenceRound ?? (isConvergenceRound(route, incomplete) && trajectory.length > 0)) && isReviewVerdict(input.findings.verdict);
+  const unfinished = input.findings.unfinished ?? [];
+  const unfinishedSuffix = unfinished.length > 0 ? ` \xB7 ${String(unfinished.length)} unfinished check${unfinished.length === 1 ? "" : "s"}` : "";
   const contestedSuffix = (input.contested ?? []).length > 0 ? ` \xB7 ${String((input.contested ?? []).length)} contested` : "";
   const advisoryAllowed = isFullReviewRound;
   const discussionLinksFor = (id) => input.discussionByFinding !== void 0 && Object.prototype.hasOwnProperty.call(input.discussionByFinding, id) ? input.discussionByFinding[id] ?? [] : [];
@@ -2257,12 +2302,13 @@ var render = (input) => {
       input.jsonUrl !== void 0
     ),
     terminalNotice: terminalNotice({
+      unfinished: shownUnfinished(input.findings, isFullReviewRound),
       reviewedSha: input.reviewedSha ?? "0000000000000000000000000000000000000000",
       verdictBadge: verdictBadge(input.findings.verdict),
       route: route ?? void 0,
       postedAt: input.postedAt ?? "",
       roundsSummary: roundsSummary(trajectory, input.roundCount),
-      convergenceSummary: !isFullReviewRound ? "" : convergence ? convergenceBadge(convergence) + contestedSuffix : "",
+      convergenceSummary: !isFullReviewRound ? "" : convergence ? convergenceBadge(convergence) + contestedSuffix + unfinishedSuffix : "",
       inlinePosted: input.inlineDisposition?.kind === "posted" ? input.inlineDisposition.count : 0,
       runUrl: input.runUrl,
       summaryAvailable: input.summaryAvailable ?? false,
@@ -2289,7 +2335,7 @@ var render = (input) => {
     reviewedSha: input.reviewedSha ?? "0000000000000000000000000000000000000000",
     postedAt: input.postedAt ?? "",
     severityCounts,
-    convergenceSummary: !isFullReviewRound ? "" : (convergence ? convergenceBadge(convergence) : convergenceSummary(input.findings, input.convergenceThreshold)) + contestedSuffix,
+    convergenceSummary: !isFullReviewRound ? "" : (convergence ? convergenceBadge(convergence) : convergenceSummary(input.findings, input.convergenceThreshold)) + contestedSuffix + unfinishedSuffix,
     strays: discussionBudget.kept,
     orphanedLines: orphanedRender.lines,
     orphanedUnresolvable: input.orphanedUnresolvable === true,
@@ -2326,6 +2372,8 @@ var render = (input) => {
     answeredNotes: input.answeredNotes ?? {},
     answeredReRaiseNote: input.answeredReRaiseNote ?? "",
     contested: contestedBudget.kept,
+    unfinished: shownUnfinished(input.findings, isFullReviewRound),
+    unfinishedCaveat: unfinished.length > 0 ? ` \u2014 ${String(unfinished.length)} planned check${unfinished.length === 1 ? "" : "s"} went unfinished` : "",
     reviewUrl: input.reviewUrl ?? null,
     formatTokens: (n) => Number.isFinite(n) && n >= 0 ? n.toLocaleString("en-US") : "\u2014",
     // N/A (never a false $0.00) when no real price map was provided — real tokens, no rates to
@@ -2740,8 +2788,8 @@ var spendClause = (i) => i.spentUsd === null ? null : i.budgetUsd !== null && i.
 var timeClause = (i) => i.elapsedMs === null ? null : i.wallMs !== null && i.wallMs > 0 ? `${mins(i.elapsedMs)}/${mins(i.wallMs)} elapsed (${pct(i.elapsedMs / i.wallMs)})` : `${mins(i.elapsedMs)} elapsed`;
 var directive = (phase, draftPath, isSubagent) => {
   if (isSubagent)
-    return phase.kind === "hard" ? `Budget nearly exhausted \u2014 STOP all new investigation now and report the findings you have back to the main agent in your reply. Do not write ${draftPath} yourself; only the main agent writes it.` : `Wind down investigation and report the findings you have back to the main agent in your reply \u2014 do not write ${draftPath} yourself; the main agent writes it, and you may run out of budget otherwise.`;
-  return phase.kind === "hard" ? `Budget nearly exhausted \u2014 STOP all new investigation now. Do not wait for subagents still running in the background. Write your COMPLETE findings from what you already have to ${draftPath} and run \`code-review validate ${draftPath} --explain\` until it passes (--explain prints the exact schema when the shape is wrong). Other tools are blocked until that draft is written.` : `Wind down investigation and write your COMPLETE findings to ${draftPath} now, then run \`code-review validate ${draftPath} --explain\` (it prints the exact schema if the shape is wrong) \u2014 fold in the subagent reports you already have rather than waiting on stragglers; you may run out of budget before you finish otherwise.`;
+    return phase.kind === "hard" ? `Budget nearly exhausted \u2014 STOP all new investigation now and report the findings you have back to the main agent in your reply, naming each check you planned but did not finish. Do not write ${draftPath} yourself; only the main agent writes it.` : `Wind down investigation and report the findings you have back to the main agent in your reply, naming each check you planned but did not finish \u2014 do not write ${draftPath} yourself; the main agent writes it, and you may run out of budget otherwise.`;
+  return phase.kind === "hard" ? `Budget nearly exhausted \u2014 STOP all new investigation now. Do not wait for subagents still running in the background. Write your COMPLETE findings from what you already have to ${draftPath}, listing in its \`unfinished\` field, when its schema has one, every check you or a subagent planned but did not finish (never one a CI job already ran and passed), and run \`code-review validate ${draftPath} --explain\` until it passes (--explain prints the exact schema when the shape is wrong). Other tools are blocked until that draft is written.` : `Wind down investigation and write your COMPLETE findings to ${draftPath} now, listing in its \`unfinished\` field, when its schema has one, every check you or a subagent planned but did not finish (never one a CI job already ran and passed), then run \`code-review validate ${draftPath} --explain\` (it prints the exact schema if the shape is wrong) \u2014 fold in the subagent reports you already have rather than waiting on stragglers; you may run out of budget before you finish otherwise.`;
 };
 var budgetMessage = (i, phase, draftPath, isSubagent) => {
   const status = [spendClause(i), timeClause(i)].filter((c) => c !== null).join(" \xB7 ");
@@ -3333,15 +3381,16 @@ var loadFindings = (path) => {
   }
   const first = decodeFindings(raw);
   if (first.kind === "invalid-shape" && typeof raw === "object" && raw !== null && !Array.isArray(raw) && Object.keys(raw).some((k) => RECOVERABLE_OPTIONAL_FIELDS.has(k))) {
-    const stripped = Object.fromEntries(
-      Object.entries(raw).filter(([key2]) => !RECOVERABLE_OPTIONAL_FIELDS.has(key2))
+    const recovered = withoutBrokenOptionalFields(
+      raw,
+      (candidate) => decodeFindings(candidate).kind === "ok"
     );
-    const retry = decodeFindings(stripped);
-    if (retry.kind === "ok") {
+    if (recovered !== null) {
       process.stderr.write(
-        "Warning: the review draft carried an invalid best-effort field (convergence/scope_metastasis/change_size) \u2014 stripped it and used the rest; the pipeline re-stamps convergence\n"
+        `Warning: the review draft carried an invalid best-effort field (${recovered.stripped.join("/")}) \u2014 stripped it and used the rest; the pipeline re-stamps convergence
+`
       );
-      return retry;
+      return decodeFindings(recovered.doc);
     }
   }
   return first;
@@ -4304,6 +4353,7 @@ ${findingsPointer2}`
     ] : [],
     "",
     terminalNotice({
+      unfinished: [],
       reviewedSha: input.headSha,
       verdictBadge: verdictBadge(loadedFindings.verdict),
       route: route ?? void 0,
@@ -5009,14 +5059,17 @@ var react = async (input, ghApi = runGhApi) => {
     await removeReactions(input.repo, input.commentId, input.remove, ghApi);
   }
 };
-var RunCodec = t.type({
-  id: t.number,
-  name: t.union([t.string, t.null]),
-  status: t.union([t.string, t.null]),
-  conclusion: t.union([t.string, t.null]),
-  run_number: t.number
-});
-var RUN_JQ = ".workflow_runs[] | {id: .id, name: .name, status: .status, conclusion: .conclusion, run_number: .run_number}";
+var RunCodec = t.intersection([
+  t.type({
+    id: t.number,
+    name: t.union([t.string, t.null]),
+    status: t.union([t.string, t.null]),
+    conclusion: t.union([t.string, t.null]),
+    run_number: t.number
+  }),
+  t.partial({ run_attempt: t.union([t.number, t.null]) })
+]);
+var RUN_JQ = ".workflow_runs[] | {id: .id, name: .name, status: .status, conclusion: .conclusion, run_number: .run_number, run_attempt: .run_attempt}";
 var resolveCiRun = async (repo, headSha, workflowName, ghApi) => {
   const endpoint = `repos/${repo}/actions/runs?head_sha=${headSha}&per_page=100`;
   const rows = parseJsonl(await ghApi([endpoint, "--paginate", "--jq", RUN_JQ]));
@@ -5036,7 +5089,12 @@ var resolveCiRun = async (repo, headSha, workflowName, ghApi) => {
     null
   );
   return {
-    run: latest === null ? null : { id: latest.id, status: latest.status ?? "unknown", conclusion: latest.conclusion },
+    run: latest === null ? null : {
+      id: latest.id,
+      status: latest.status ?? "unknown",
+      conclusion: latest.conclusion,
+      attempt: latest.run_attempt ?? null
+    },
     seenNames: [...new Set(runs.flatMap((r) => r.name === null ? [] : [r.name]))]
   };
 };
@@ -5055,7 +5113,12 @@ var awaitCiConclusion = async (repo, headSha, options, deps = { ghApi: runGhApi,
   const poll = async (lastSeenNames, lastRunId) => {
     const { run: run2, seenNames } = await safeResolve();
     if (run2 !== null && run2.status === "completed" && run2.conclusion !== null)
-      return { kind: "concluded", conclusion: run2.conclusion, runId: run2.id };
+      return {
+        kind: "concluded",
+        conclusion: run2.conclusion,
+        runId: run2.id,
+        runAttempt: run2.attempt
+      };
     const runId = run2 === null ? lastRunId : run2.id;
     const names = seenNames.length > 0 ? seenNames : lastSeenNames;
     if (deps.elapsedMs() >= options.timeoutMs)
@@ -5073,6 +5136,7 @@ var monotonicElapsed = () => {
 var renderCiOutputs = (outcome) => outcome.kind === "concluded" ? `ci_settled=true
 ci_conclusion=${outcome.conclusion}
 ci_run_id=${String(outcome.runId)}
+ci_run_attempt=${outcome.runAttempt === null ? "" : String(outcome.runAttempt)}
 ` : `ci_settled=false
 ci_run_id=${outcome.runId === null ? "" : String(outcome.runId)}
 `;
@@ -5133,6 +5197,14 @@ var JobCodec = t.type({
   conclusion: t.union([t.string, t.null])
 });
 var JOBS_JQ = ".jobs[] | {id: .id, name: .name, conclusion: .conclusion}";
+var parseRunAttempt = (raw) => {
+  if (raw === void 0 || raw === "") return void 0;
+  if (!/^[1-9][0-9]*$/.test(raw)) {
+    throw new Error(`--run-attempt must be a positive integer, got ${JSON.stringify(raw)}`);
+  }
+  return raw;
+};
+var jobsEndpoint = (repo, runId, runAttempt) => runAttempt === void 0 ? `repos/${repo}/actions/runs/${runId}/jobs` : `repos/${repo}/actions/runs/${runId}/attempts/${runAttempt}/jobs`;
 var fetchPrMeta = async (repo, prNumber, ghApi) => {
   const stdout = await ghApi([
     `repos/${repo}/pulls/${String(prNumber)}`,
@@ -5282,35 +5354,46 @@ var reviewsFrom = (reviews, botLogin) => boundedHuman(reviews, botLogin, "review
   body: clip(r.body)
 }));
 var MAX_STAGED_JOB_LOGS = 20;
-var downloadFailingJobLogs = async (repo, runId, outDir, ghApi) => {
-  const rows = parseJsonl(
-    await ghApi([`repos/${repo}/actions/runs/${runId}/jobs`, "--paginate", "--jq", JOBS_JQ])
+var stageJobLog = async (repo, jobId, outDir, ghApi) => {
+  try {
+    const log = await ghApi([`repos/${repo}/actions/jobs/${String(jobId)}/logs`]);
+    if (log.trim() === "no log available" || log.trim() === "") {
+      process.stderr.write(
+        `Warning: job ${String(jobId)} has no log available (placeholder body) \u2014 not staged
+`
+      );
+      return null;
+    }
+    const file = `job_${String(jobId)}.log`;
+    writeFileSync(join(outDir, file), log);
+    return file;
+  } catch (err) {
+    process.stderr.write(
+      `Warning: failed to download logs for job ${String(jobId)}: ${errMsg(err)} \u2014 continuing with the logs retrieved so far
+`
+    );
+    return null;
+  }
+};
+var listRunJobs = async (repo, runId, runAttempt, ghApi) => {
+  const decoded = t.array(JobCodec).decode(
+    parseJsonl(
+      await ghApi([jobsEndpoint(repo, runId, runAttempt), "--paginate", "--jq", JOBS_JQ])
+    )
   );
-  const decoded = t.array(JobCodec).decode(rows);
   if (decoded._tag === "Left") {
     throw new Error(`Jobs list for run ${runId} did not match the expected shape`);
   }
-  const failing = decoded.right.filter((j) => j.conclusion === "failure");
+  return decoded.right;
+};
+var downloadFailingJobLogs = async (repo, runId, runAttempt, outDir, ghApi) => {
+  const failing = (await listRunJobs(repo, runId, runAttempt, ghApi)).filter(
+    (j) => j.conclusion === "failure"
+  );
   const selected = failing.slice(0, MAX_STAGED_JOB_LOGS);
   let staged = 0;
   for (const job of selected) {
-    try {
-      const log = await ghApi([`repos/${repo}/actions/jobs/${String(job.id)}/logs`]);
-      if (log.trim() === "no log available" || log.trim() === "") {
-        process.stderr.write(
-          `Warning: job ${String(job.id)} has no log available (placeholder body) \u2014 not staged
-`
-        );
-        continue;
-      }
-      writeFileSync(join(outDir, `job_${String(job.id)}.log`), log);
-      staged += 1;
-    } catch (err) {
-      process.stderr.write(
-        `Warning: failed to download logs for job ${String(job.id)}: ${errMsg(err)} \u2014 continuing with the logs retrieved so far
-`
-      );
-    }
+    if (await stageJobLog(repo, job.id, outDir, ghApi) !== null) staged += 1;
   }
   writeFileSync(
     join(outDir, "failed_jobs.json"),
@@ -5338,6 +5421,58 @@ var downloadFailingJobLogs = async (repo, runId, outDir, ghApi) => {
   }
   return { staged, failing: failing.length };
 };
+var MAX_STAGED_PASSED_JOB_LOGS = 64;
+var PASSED_LOG_CONCURRENCY = 8;
+var stagePassedRun = async (repo, runId, runAttempt, outDir, ghApi) => {
+  try {
+    const jobs = await listRunJobs(repo, runId, runAttempt, ghApi);
+    const writeIndex = (logs2) => {
+      writeFileSync(
+        join(outDir, "ci_jobs.json"),
+        `${JSON.stringify(
+          jobs.map((j) => ({
+            name: j.name,
+            conclusion: j.conclusion,
+            log: logs2.get(j.id) ?? null
+          })),
+          null,
+          2
+        )}
+`
+      );
+    };
+    writeIndex(/* @__PURE__ */ new Map());
+    const ran = jobs.filter((j) => j.conclusion !== "skipped");
+    const selected = ran.slice(0, MAX_STAGED_PASSED_JOB_LOGS);
+    const logs = await Array.from(
+      { length: Math.ceil(selected.length / PASSED_LOG_CONCURRENCY) },
+      (_, i) => selected.slice(i * PASSED_LOG_CONCURRENCY, (i + 1) * PASSED_LOG_CONCURRENCY)
+    ).reduce(async (staged, batch) => {
+      const prior = await staged;
+      const files = await Promise.all(
+        batch.map(async (job) => [job.id, await stageJobLog(repo, job.id, outDir, ghApi)])
+      );
+      return new Map([
+        ...prior,
+        ...files.flatMap(([id, file]) => file === null ? [] : [[id, file]])
+      ]);
+    }, Promise.resolve(/* @__PURE__ */ new Map()));
+    writeIndex(logs);
+    if (ran.length > selected.length) {
+      process.stderr.write(
+        `::warning::${annotationSafe(`${String(ran.length)} jobs ran in the passed run ${runId}; logs were staged for the first ${String(selected.length)} only`)}
+`
+      );
+    }
+    return logs.size;
+  } catch (err) {
+    process.stderr.write(
+      `::warning::${annotationSafe(`the passed CI run's jobs could not be listed (${errMsg(err)}) \u2014 the review knows CI passed, not which jobs ran`)}
+`
+    );
+    return 0;
+  }
+};
 var gather = async (input, ghApi = runGhApi, gitRun = runGit, readArtifact = ghArtifactReader) => {
   const candidates = await fetchPrCandidates(input.repo, input.headSha, ghApi);
   const resolution = resolvePr(candidates, input.headBranch);
@@ -5441,7 +5576,8 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit, readArtifact = ghA
       reviews: reviews === null ? [] : reviewsFrom(reviews, input.botLogin)
     })
   );
-  const jobLogs = input.conclusion === "failure" ? await downloadFailingJobLogs(input.repo, input.runId, input.outDir, ghApi) : { staged: 0, failing: 0 };
+  const jobLogs = input.conclusion === "failure" ? await downloadFailingJobLogs(input.repo, input.runId, input.runAttempt, input.outDir, ghApi) : { staged: 0, failing: 0 };
+  const passedLogs = input.conclusion === "success" ? await stagePassedRun(input.repo, input.runId, input.runAttempt, input.outDir, ghApi) : 0;
   return {
     kind: "gathered",
     pr: prNumber,
@@ -5449,7 +5585,7 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit, readArtifact = ghA
     diffSize: Buffer.byteLength(prDiff, "utf8"),
     stacked,
     baseSha: meta.base_sha,
-    stagedJobLogs: jobLogs.staged,
+    stagedJobLogs: jobLogs.staged + passedLogs,
     failingJobs: jobLogs.failing
   };
 };
@@ -6619,11 +6755,6 @@ var seedDraftCmd = defineCommand({
     const seededFromPrior = priorFindings === null ? false : (() => {
       try {
         const schemaPath = args.schema ? resolve(args.schema) : schemaPathFor(kind, args["schema-version"]);
-        const barePrior = typeof priorFindings === "object" && !Array.isArray(priorFindings) ? Object.fromEntries(
-          Object.entries(priorFindings).filter(
-            ([key2]) => !RECOVERABLE_OPTIONAL_FIELDS.has(key2)
-          )
-        ) : priorFindings;
         const accepts = (doc) => {
           const resolved = resolvedPriorValue(doc);
           if (resolved === null) return null;
@@ -6631,13 +6762,18 @@ var seedDraftCmd = defineCommand({
           return validateAgainstSchema(carried, schemaPath).valid ? carried : null;
         };
         const seedDoc = accepts(priorFindings) ?? (() => {
-          const bare = accepts(barePrior);
-          if (bare === null) return null;
+          if (typeof priorFindings !== "object" || Array.isArray(priorFindings))
+            return null;
+          const recovered = withoutBrokenOptionalFields(
+            priorFindings,
+            (candidate) => accepts(candidate) !== null
+          );
+          if (recovered === null) return null;
           process.stderr.write(
-            `Note: the in-force schema rejects a carried recoverable field (scope_metastasis/convergence/change_size) \u2014 seeding the prior without it (issue #150 review r2 / #182 review r2)
+            `Note: the in-force schema rejects a carried recoverable field (${recovered.stripped.join("/")}) \u2014 seeding the prior without it (issue #150 review r2 / #182 review r2)
 `
           );
-          return bare;
+          return accepts(recovered.doc);
         })();
         if (seedDoc === null) return false;
         if (isIncompleteFindings(seedDoc)) return false;
@@ -7032,7 +7168,7 @@ var stopGateCmd = defineCommand({
 var gatherCmd = defineCommand({
   meta: {
     name: "gather",
-    description: "Resolve the PR from the CI head SHA and gather review inputs (diff with git-diff fallback, PR context, prior bot review, untrusted PR conversation to triage, failing-job logs and the failing jobs' identities in failed_jobs.json) as files for the review agent"
+    description: "Resolve the PR from the CI head SHA and gather review inputs (diff with git-diff fallback, PR context, prior bot review, untrusted PR conversation to triage, the CI run's job logs \u2014 the failing jobs' with their identities in failed_jobs.json on a failure, the jobs that ran, up to 64, indexed in ci_jobs.json on a pass) as files for the review agent"
   },
   args: {
     repo: { type: "string", description: "Repository (owner/name)", required: true },
@@ -7052,12 +7188,16 @@ var gatherCmd = defineCommand({
     },
     "run-id": {
       type: "string",
-      description: "CI run id (from workflow_run.id); its failing jobs' logs are downloaded on failure",
+      description: "CI run id (from workflow_run.id); its job logs are downloaded \u2014 the failing jobs' on failure, the jobs that ran (up to 64) on success",
       required: true
     },
+    "run-attempt": {
+      type: "string",
+      description: "The CI run's attempt that triggered the review (from workflow_run.run_attempt); its jobs' logs are the ones staged, even after a re-run starts a newer attempt. Empty or omitted: the run's latest attempt"
+    },
     conclusion: {
       type: "string",
-      description: "CI conclusion (e.g. success | failure); failure triggers failing-job log download",
+      description: "CI conclusion (e.g. success | failure); failure stages the failing jobs' logs, success the logs of the jobs that ran (up to 64) and ci_jobs.json",
       required: true
     },
     "bot-login": {
@@ -7076,6 +7216,7 @@ var gatherCmd = defineCommand({
       headBranch: args["head-branch"],
       defaultBranch: args["default-branch"],
       runId: args["run-id"],
+      runAttempt: parseRunAttempt(args["run-attempt"]),
       conclusion: args.conclusion,
       botLogin: args["bot-login"] || "github-actions[bot]",
       outDir: args["out-dir"] ? resolve(args["out-dir"]) : process.cwd()
@@ -7473,7 +7614,7 @@ var reactCmd = defineCommand({
 var awaitCiCmd = defineCommand({
   meta: {
     name: "await-ci",
-    description: "Wait for the PR head's CI workflow run to conclude, then emit its REAL conclusion + run id to $GITHUB_OUTPUT (ci_settled, ci_conclusion, ci_run_id). The on-demand comment trigger uses this so it routes on the same CI result the CI-completion trigger would \u2014 success \u2192 full review, failure \u2192 mechanic with that run's logs \u2014 instead of reviewing blind. Polls until the run completes or the timeout elapses; ci_settled=false \u21D2 no conclusive result (caller should decline to review, not guess)."
+    description: "Wait for the PR head's CI workflow run to conclude, then emit its REAL conclusion, run id and run attempt to $GITHUB_OUTPUT (ci_settled, ci_conclusion, ci_run_id, ci_run_attempt). The on-demand comment trigger uses this so it routes on the same CI result the CI-completion trigger would \u2014 success \u2192 full review, failure \u2192 mechanic with that run's logs \u2014 instead of reviewing blind. Polls until the run completes or the timeout elapses; ci_settled=false \u21D2 no conclusive result (caller should decline to review, not guess)."
   },
   args: {
     repo: { type: "string", description: "Repository (owner/name)", required: true },