@jphutchins/code-review 0.1.0-alpha.29 → 0.1.0-alpha.30

package/dist/index.js

@@ -972,7 +972,7 @@ var pad2 = (n) => String(n).padStart(2, "0");
 var formatUtc = (d) => `${String(d.getUTCFullYear())}-${pad2(d.getUTCMonth() + 1)}-${pad2(d.getUTCDate())} ${pad2(d.getUTCHours())}:${pad2(d.getUTCMinutes())} UTC`;
 
 // src/notice.ts
-var isNoticeKind = (s) => s === "security-blocked" || s === "setup-failed" || s === "diff-apply-failed" || s === "no-output";
+var isNoticeKind = (s) => s === "security-blocked" || s === "setup-failed" || s === "checkout-failed" || s === "no-output";
 var blockquote = (text) => text.replaceAll("\n", "\n> ");
 var noticeSummary = (kind, reasons) => {
   switch (kind) {
@@ -984,8 +984,8 @@ The diff was flagged as unsafe to apply and execute:
 > ${blockquote(reasons)}` : "### \u{1F6D1} Code review skipped by the security gate\n\nThe security triage returned an unsafe verdict without a reason. See workflow logs.";
     case "setup-failed":
       return "### \u{1F6E0}\uFE0F Review did not run\n\nThe review job failed before the security triage could run (e.g. dependency install or environment setup). See the workflow logs \u2014 this is an infrastructure failure, not a security verdict.";
-    case "diff-apply-failed":
-      return "### \u26A0\uFE0F Could not apply the diff\n\nThe PR diff could not be applied to the checked-out base commit, so the review was skipped rather than run against an unmodified tree. See workflow logs.";
+    case "checkout-failed":
+      return "### \u26A0\uFE0F Could not check out the PR head\n\nThe PR head commit could not be fetched or checked out (it may have been force-pushed away, or is otherwise unavailable), so the review was skipped rather than run against the wrong tree. See workflow logs.";
     case "no-output":
       return "### \u26A0\uFE0F Review did not complete\n\nThe diff passed triage but the review produced no output. See workflow logs.";
   }
@@ -1953,6 +1953,7 @@ var renderOutputs = (result) => {
       return `pr=${String(result.pr)}
 conclusion=${result.conclusion}
 diff_size=${String(result.diffSize)}
+stacked=${String(result.stacked)}
 `;
   }
 };
@@ -1975,6 +1976,7 @@ var runGit = (args) => new Promise((resolve3, reject) => {
 var PrMetaCodec = t.type({
   changed_files: t.number,
   base_sha: t.string,
+  base_ref: t.string,
   title: t.string,
   body: t.union([t.string, t.null])
 });
@@ -1995,7 +1997,7 @@ var fetchPrMeta = async (repo, prNumber, ghApi) => {
   const stdout = await ghApi([
     `repos/${repo}/pulls/${String(prNumber)}`,
     "--jq",
-    "{changed_files: .changed_files, base_sha: .base.sha, title: .title, body: .body}"
+    "{changed_files: .changed_files, base_sha: .base.sha, base_ref: .base.ref, title: .title, body: .body}"
   ]);
   const decoded = PrMetaCodec.decode(JSON.parse(stdout));
   if (decoded._tag === "Left") {
@@ -2010,6 +2012,53 @@ var fetchApiDiff = async (repo, prNumber, ghApi) => {
     return null;
   }
 };
+var fetchFullDiff = async (repo, defaultBranch, headSha, ghApi, gitRun) => {
+  try {
+    const diff = await ghApi([
+      `repos/${repo}/compare/${defaultBranch}...${headSha}`,
+      "-H",
+      "Accept: application/vnd.github.v3.diff"
+    ]);
+    if (diff.length > 0) return diff;
+    process.stderr.write(
+      `compare diff for ${defaultBranch}...${headSha} was empty \u2014 falling back to git diff
+`
+    );
+  } catch (err) {
+    process.stderr.write(`compare diff fetch failed (${errMsg(err)}) \u2014 falling back to git diff
+`);
+  }
+  await gitRun(["fetch", "origin", headSha]);
+  const base = (await gitRun(["rev-parse", "HEAD"])).trim();
+  return gitRun(["diff", `${base}...${headSha}`]);
+};
+var CommitCodec = t.type({
+  sha: t.string,
+  message: t.string,
+  author: t.union([t.string, t.null]),
+  email: t.union([t.string, t.null])
+});
+var COMMIT_JQ = ".commits[] | {sha: .sha, message: .commit.message, author: .commit.author.name, email: .commit.author.email}";
+var fetchCompareCommits = async (repo, defaultBranch, headSha, ghApi) => {
+  const rows = parseJsonl(
+    await ghApi([
+      `repos/${repo}/compare/${defaultBranch}...${headSha}`,
+      "--paginate",
+      "--jq",
+      COMMIT_JQ
+    ])
+  );
+  const decoded = rows.map((row) => CommitCodec.decode(row));
+  const commits = decoded.flatMap((d) => d._tag === "Right" ? [d.right] : []);
+  const dropped = decoded.length - commits.length;
+  if (dropped > 0) {
+    process.stderr.write(
+      `Warning: ${String(dropped)} of ${String(rows.length)} commit row(s) failed to decode \u2014 their messages are NOT in the triage scan though a checkout's git log still exposes them
+`
+    );
+  }
+  return commits;
+};
 var COMMENT_JQ = ".[] | {id: .id, body: .body, user: {login: .user.login}, created_at: .created_at, author_association: .author_association}";
 var REVIEW_COMMENT_JQ = ".[] | {body: .body, user: {login: .user.login}, created_at: .created_at, author_association: .author_association, path: .path, line: .line}";
 var REVIEW_JQ = ".[] | {body: .body, user: {login: .user.login}, submitted_at: .submitted_at, author_association: .author_association, state: .state}";
@@ -2131,8 +2180,10 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit) => {
   }
   const prNumber = resolution.prNumber;
   const meta = await fetchPrMeta(input.repo, prNumber, ghApi);
-  const apiDiff = await fetchApiDiff(input.repo, prNumber, ghApi);
-  const diff = apiDiff !== null && !(apiDiff.length === 0 && meta.changed_files > 0) ? apiDiff : await (async () => {
+  const stacked = meta.base_ref !== input.defaultBranch;
+  const prDiff = await (async () => {
+    const apiDiff = await fetchApiDiff(input.repo, prNumber, ghApi);
+    if (apiDiff !== null && !(apiDiff.length === 0 && meta.changed_files > 0)) return apiDiff;
     process.stderr.write(
       `PR diff fetch failed or was empty for ${String(meta.changed_files)} changed files \u2014 falling back to git diff
 `
@@ -2140,7 +2191,11 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit) => {
     await gitRun(["fetch", "origin", input.headSha]);
     return gitRun(["diff", meta.base_sha, input.headSha]);
   })();
-  writeFileSync(join(input.outDir, "pr.diff"), diff);
+  const fullDiff = stacked ? await fetchFullDiff(input.repo, input.defaultBranch, input.headSha, ghApi, gitRun) : prDiff;
+  const commits = await fetchCompareCommits(input.repo, input.defaultBranch, input.headSha, ghApi);
+  writeFileSync(join(input.outDir, "full.diff"), fullDiff);
+  writeFileSync(join(input.outDir, "pr.diff"), prDiff);
+  writeFileSync(join(input.outDir, "commits.json"), JSON.stringify(commits));
   writeFileSync(
     join(input.outDir, "pr_context.json"),
     JSON.stringify({ title: meta.title, body: meta.body })
@@ -2177,7 +2232,8 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit) => {
     kind: "gathered",
     pr: prNumber,
     conclusion: input.conclusion,
-    diffSize: Buffer.byteLength(diff, "utf8")
+    diffSize: Buffer.byteLength(prDiff, "utf8"),
+    stacked
   };
 };
 
@@ -3189,7 +3245,7 @@ var noticeCmd = defineCommand({
   args: {
     kind: {
       type: "positional",
-      description: "One of: security-blocked, setup-failed, diff-apply-failed, no-output",
+      description: "One of: security-blocked, setup-failed, checkout-failed, no-output",
       required: true
     },
     reasons: {
@@ -3199,7 +3255,7 @@ var noticeCmd = defineCommand({
   },
   run: ({ args }) => {
     const kind = isNoticeKind(args.kind) ? args.kind : fail(
-      `Unknown notice kind "${args.kind}" \u2014 expected one of: security-blocked, setup-failed, diff-apply-failed, no-output`
+      `Unknown notice kind "${args.kind}" \u2014 expected one of: security-blocked, setup-failed, checkout-failed, no-output`
     );
     process.stdout.write(`${JSON.stringify(buildNoticeEnvelope(kind, args.reasons), null, 2)}
 `);
@@ -3464,6 +3520,11 @@ var gatherCmd = defineCommand({
       type: "string",
       description: "Head branch to disambiguate the PR when multiple share a commit"
     },
+    "default-branch": {
+      type: "string",
+      description: "The repo's default branch \u2014 the trusted base the review checks out, and the reference for the full (triage) diff; a PR based on any other branch is treated as stacked",
+      required: true
+    },
     "run-id": {
       type: "string",
       description: "CI run id (from workflow_run.id); its failing jobs' logs are downloaded on failure",
@@ -3488,6 +3549,7 @@ var gatherCmd = defineCommand({
       repo: args.repo,
       headSha: args["head-sha"],
       headBranch: args["head-branch"],
+      defaultBranch: args["default-branch"],
       runId: args["run-id"],
       conclusion: args.conclusion,
       botLogin: args["bot-login"] || "github-actions[bot]",