@jphutchins/code-review 0.1.0-alpha.26 → 0.1.0-alpha.28

package/dist/index.js

@@ -9,6 +9,7 @@ import { Ajv2020 } from 'ajv/dist/2020.js';
 import _addFormats from 'ajv-formats';
 import * as t from 'io-ts';
 import { execFile } from 'child_process';
+import { performance } from 'perf_hooks';
 import { PathReporter } from 'io-ts/lib/PathReporter.js';
 
 // src/cost.ts
@@ -195,6 +196,13 @@ var parseFindingsMarker = (body) => {
     return null;
   }
 };
+var carryForwardMarkers = (body) => {
+  const findings = /<!-- code-review:findings-json[^>]*-->/.exec(body)?.[0];
+  const reviewedSha = /<!-- reviewed-sha: [0-9a-fA-F]{40} -->/.exec(body)?.[0];
+  const findingsBlock = findings ? `${AGENTS_STOP_DIRECTIVE}
+${findings}` : void 0;
+  return [findingsBlock, reviewedSha].filter((m) => m !== void 0).join("\n\n");
+};
 var escapeFence = (text) => text.replace(/```/g, "`` ` ``");
 var projectPatch = (patch) => {
   if (patch === void 0) return { kind: "none" };
@@ -1590,6 +1598,47 @@ var post = async (input, ghApi = runGhApi) => {
     }
   }
 };
+var announceBody = (headSha, runUrl, existingBody) => {
+  const notice = `${DEFAULT_MARKER}
+
+\u{1F504} **Code review in progress** for \`${headSha.slice(0, 7)}\` \u2014 see the [workflow run](${runUrl}) for progress; this comment is updated with the review when it completes.`;
+  const carried = existingBody ? carryForwardMarkers(existingBody) : "";
+  return carried ? `${notice}
+
+${carried}` : notice;
+};
+var announce = async (input, ghApi = runGhApi) => {
+  const candidates = await fetchPrCandidates(input.repo, input.headSha, ghApi);
+  const resolution = resolvePr(candidates, input.headBranch);
+  if (resolution.kind !== "open") {
+    process.stderr.write(
+      `No open PR for ${input.headSha} \u2014 nothing to announce (${resolution.kind})
+`
+    );
+    return;
+  }
+  const existing = await findBotComment(
+    input.repo,
+    resolution.prNumber,
+    input.botLogin,
+    DEFAULT_MARKER,
+    ghApi
+  );
+  if (existing !== null && parseReviewedSha(existing.body) === input.headSha.toLowerCase()) {
+    process.stderr.write(
+      `Sticky already reflects a completed review of ${input.headSha} \u2014 leaving it in place
+`
+    );
+    return;
+  }
+  await upsertSticky(
+    input.repo,
+    resolution.prNumber,
+    existing,
+    announceBody(input.headSha, input.runUrl, existing?.body),
+    ghApi
+  );
+};
 var DURATION_RE = /^(\d+)(h|m|s)$/;
 var USD_RE = /^\$(\d+(?:\.\d+)?)$/;
 var toSeconds = (n, unit) => unit === "h" ? n * 3600 : unit === "m" ? n * 60 : n;
@@ -1781,15 +1830,21 @@ var RunCodec = t.type({
   conclusion: t.union([t.string, t.null]),
   run_number: t.number
 });
-var RunsCodec = t.type({ workflow_runs: t.array(RunCodec) });
+var RUN_JQ = ".workflow_runs[] | {id: .id, name: .name, status: .status, conclusion: .conclusion, run_number: .run_number}";
 var resolveCiRun = async (repo, headSha, workflowName, ghApi) => {
-  const stdout = await ghApi([`repos/${repo}/actions/runs?head_sha=${headSha}&per_page=100`]);
-  const decoded = RunsCodec.decode(JSON.parse(stdout));
-  if (decoded._tag === "Left")
-    throw new Error(
-      `workflow runs for ${headSha} did not match the expected shape: ${PathReporter.report(decoded).join("; ")}`
+  const endpoint = `repos/${repo}/actions/runs?head_sha=${headSha}&per_page=100`;
+  const rows = parseJsonl(await ghApi([endpoint, "--paginate", "--jq", RUN_JQ]));
+  const decoded = rows.map((row) => RunCodec.decode(row));
+  const runs = decoded.flatMap((d) => d._tag === "Right" ? [d.right] : []);
+  const dropped = decoded.length - runs.length;
+  if (dropped > 0) {
+    const firstDrift = decoded.find((d) => d._tag === "Left");
+    const detail = firstDrift === void 0 ? "" : ` (${PathReporter.report(firstDrift).join("; ")})`;
+    process.stderr.write(
+      `Warning: ${String(dropped)} of ${String(rows.length)} workflow-run row(s) from ${endpoint} failed to decode${detail} \u2014 excluded from the lookup
+`
     );
-  const runs = decoded.right.workflow_runs;
+  }
   const latest = runs.filter((r) => r.name === workflowName).reduce(
     (best, r) => best === null || r.run_number > best.run_number ? r : best,
     null
@@ -1800,21 +1855,34 @@ var resolveCiRun = async (repo, headSha, workflowName, ghApi) => {
   };
 };
 var awaitCiConclusion = async (repo, headSha, options, deps = { ghApi: runGhApi, sleep: defaultSleep, elapsedMs: monotonicElapsed() }) => {
-  const poll = async () => {
-    const { run, seenNames } = await resolveCiRun(repo, headSha, options.workflowName, deps.ghApi);
-    if (run !== null && run.status === "completed")
-      return { kind: "concluded", conclusion: run.conclusion ?? "unknown", runId: run.id };
+  const safeResolve = async () => {
+    try {
+      return await resolveCiRun(repo, headSha, options.workflowName, deps.ghApi);
+    } catch (err) {
+      process.stderr.write(
+        `Warning: CI-run lookup for ${headSha} failed (${errMsg(err)}) \u2014 retrying until the timeout
+`
+      );
+      return { run: null, seenNames: [] };
+    }
+  };
+  const poll = async (lastSeenNames, lastRunId) => {
+    const { run, seenNames } = await safeResolve();
+    if (run !== null && run.status === "completed" && run.conclusion !== null)
+      return { kind: "concluded", conclusion: run.conclusion, runId: run.id };
+    const runId = run === null ? lastRunId : run.id;
+    const names = seenNames.length > 0 ? seenNames : lastSeenNames;
     if (deps.elapsedMs() >= options.timeoutMs)
-      return { kind: "timed-out", runId: run === null ? null : run.id, seenNames };
+      return { kind: "timed-out", runId, seenNames: names };
     await deps.sleep(options.pollIntervalMs);
-    return poll();
+    return poll(names, runId);
   };
-  return poll();
+  return poll([], null);
 };
 var defaultSleep = (ms) => new Promise((resolvePromise) => setTimeout(resolvePromise, ms));
 var monotonicElapsed = () => {
-  const start = Date.now();
-  return () => Date.now() - start;
+  const start = performance.now();
+  return () => performance.now() - start;
 };
 var renderCiOutputs = (outcome) => outcome.kind === "concluded" ? `ci_settled=true
 ci_conclusion=${outcome.conclusion}
@@ -1855,12 +1923,17 @@ var PrMetaCodec = t.type({
   title: t.string,
   body: t.union([t.string, t.null])
 });
-var IssueCommentCodec = t.type({
-  id: t.number,
-  body: t.union([t.string, t.null]),
-  user: t.type({ login: t.string })
-});
-var IssueCommentsCodec = t.array(IssueCommentCodec);
+var IssueCommentCodec = t.intersection([
+  t.type({
+    id: t.number,
+    body: t.union([t.string, t.null]),
+    user: t.type({ login: t.string })
+  }),
+  t.partial({
+    created_at: t.union([t.string, t.null]),
+    author_association: t.union([t.string, t.null])
+  })
+]);
 var JobCodec = t.type({ id: t.number, conclusion: t.union([t.string, t.null]) });
 var JobsResponseCodec = t.type({ jobs: t.array(JobCodec) });
 var fetchPrMeta = async (repo, prNumber, ghApi) => {
@@ -1882,18 +1955,92 @@ var fetchApiDiff = async (repo, prNumber, ghApi) => {
     return null;
   }
 };
-var fetchPriorReview = async (repo, prNumber, botLogin, ghApi) => {
+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}";
+var ReviewCommentCodec = t.intersection([
+  t.type({ body: t.union([t.string, t.null]), user: t.type({ login: t.string }) }),
+  t.partial({
+    created_at: t.union([t.string, t.null]),
+    author_association: t.union([t.string, t.null]),
+    path: t.union([t.string, t.null]),
+    line: t.union([t.number, t.null])
+  })
+]);
+var ReviewCodec = t.intersection([
+  t.type({ body: t.union([t.string, t.null]), user: t.type({ login: t.string }) }),
+  t.partial({
+    submitted_at: t.union([t.string, t.null]),
+    author_association: t.union([t.string, t.null]),
+    state: t.union([t.string, t.null])
+  })
+]);
+var fetchJsonlRows = async (ghApi, endpoint, jq) => {
   try {
-    const stdout = await ghApi([`repos/${repo}/issues/${String(prNumber)}/comments`, "--paginate"]);
-    const decoded = IssueCommentsCodec.decode(JSON.parse(stdout || "[]"));
-    if (decoded._tag === "Left") return null;
-    const byBot = decoded.right.filter((c) => c.user.login === botLogin);
-    const last = byBot[byBot.length - 1];
-    return last ? { id: last.id, body: last.body } : null;
-  } catch {
+    return parseJsonl(await ghApi([endpoint, "--paginate", "--jq", jq]));
+  } catch (err) {
+    process.stderr.write(
+      `Warning: could not fetch ${endpoint} (${errMsg(err)}) \u2014 omitting it from the review context
+`
+    );
     return null;
   }
 };
+var decodeArrayOrNull = (codec, rows) => {
+  if (rows === null) return null;
+  return rows.flatMap((row) => {
+    const decoded = codec.decode(row);
+    return decoded._tag === "Right" ? [decoded.right] : [];
+  });
+};
+var priorReviewFrom = (comments, botLogin) => {
+  const byBot = comments.filter((c) => c.user.login === botLogin);
+  const last = byBot[byBot.length - 1];
+  return last ? { id: last.id, body: last.body } : null;
+};
+var MAX_CONVERSATION_COMMENTS = 50;
+var MAX_CONVERSATION_BODY_CHARS = 4e3;
+var clip = (body) => {
+  if (body.length <= MAX_CONVERSATION_BODY_CHARS) return body;
+  const cut = body.slice(0, MAX_CONVERSATION_BODY_CHARS);
+  const safe = /[\uD800-\uDBFF]$/.test(cut) ? cut.slice(0, -1) : cut;
+  return `${safe}
+\u2026 [truncated]`;
+};
+var boundedHuman = (items, botLogin, label, project) => {
+  const human = items.filter(
+    (a) => a.user.login !== botLogin && typeof a.body === "string" && a.body.trim() !== ""
+  );
+  const kept = human.slice(-MAX_CONVERSATION_COMMENTS);
+  if (kept.length < human.length) {
+    process.stderr.write(
+      `Note: PR has ${String(human.length)} ${label} \u2014 feeding the review the most recent ${String(MAX_CONVERSATION_COMMENTS)}
+`
+    );
+  }
+  return kept.map(project);
+};
+var issueCommentsFrom = (comments, botLogin) => boundedHuman(comments, botLogin, "discussion comments", (c) => ({
+  author: c.user.login,
+  author_association: c.author_association ?? null,
+  created_at: c.created_at ?? null,
+  body: clip(c.body)
+}));
+var reviewCommentsFrom = (comments, botLogin) => boundedHuman(comments, botLogin, "inline review comments", (c) => ({
+  author: c.user.login,
+  author_association: c.author_association ?? null,
+  created_at: c.created_at ?? null,
+  path: c.path ?? null,
+  line: c.line ?? null,
+  body: clip(c.body)
+}));
+var reviewsFrom = (reviews, botLogin) => boundedHuman(reviews, botLogin, "review submissions", (r) => ({
+  author: r.user.login,
+  author_association: r.author_association ?? null,
+  submitted_at: r.submitted_at ?? null,
+  state: r.state ?? null,
+  body: clip(r.body)
+}));
 var downloadFailingJobLogs = async (repo, runId, outDir, ghApi) => {
   const stdout = await ghApi([`repos/${repo}/actions/runs/${runId}/jobs`]);
   const decoded = JobsResponseCodec.decode(JSON.parse(stdout));
@@ -1943,11 +2090,31 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit) => {
     join(input.outDir, "pr_context.json"),
     JSON.stringify({ title: meta.title, body: meta.body })
   );
-  const prior = await fetchPriorReview(input.repo, prNumber, input.botLogin, ghApi);
+  const [issueRows, reviewCommentRows, reviewRows] = await Promise.all([
+    fetchJsonlRows(ghApi, `repos/${input.repo}/issues/${String(prNumber)}/comments`, COMMENT_JQ),
+    fetchJsonlRows(
+      ghApi,
+      `repos/${input.repo}/pulls/${String(prNumber)}/comments`,
+      REVIEW_COMMENT_JQ
+    ),
+    fetchJsonlRows(ghApi, `repos/${input.repo}/pulls/${String(prNumber)}/reviews`, REVIEW_JQ)
+  ]);
+  const issueComments = decodeArrayOrNull(IssueCommentCodec, issueRows);
+  const reviewComments = decodeArrayOrNull(ReviewCommentCodec, reviewCommentRows);
+  const reviews = decodeArrayOrNull(ReviewCodec, reviewRows);
+  const prior = issueComments === null ? null : priorReviewFrom(issueComments, input.botLogin);
   writeFileSync(
     join(input.outDir, "prior_review.json"),
     prior === null ? "null" : JSON.stringify(prior)
   );
+  writeFileSync(
+    join(input.outDir, "pr_conversation.json"),
+    JSON.stringify({
+      issue_comments: issueComments === null ? [] : issueCommentsFrom(issueComments, input.botLogin),
+      review_comments: reviewComments === null ? [] : reviewCommentsFrom(reviewComments, input.botLogin),
+      reviews: reviews === null ? [] : reviewsFrom(reviews, input.botLogin)
+    })
+  );
   if (input.conclusion === "failure") {
     await downloadFailingJobLogs(input.repo, input.runId, input.outDir, ghApi);
   }
@@ -3204,7 +3371,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, failing-job logs) 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, failing-job logs) as files for the review agent"
   },
   args: {
     repo: { type: "string", description: "Repository (owner/name)", required: true },
@@ -3338,6 +3505,51 @@ var postCmd = defineCommand({
     });
   }
 });
+var announceCmd = defineCommand({
+  meta: {
+    name: "announce",
+    description: "Post (or update) the sticky the moment a review starts \u2014 an in-progress placeholder linking the run \u2014 so a workflow_run review, which runs from the default branch and is otherwise invisible on the PR, is visibly under way. Preserves a prior sticky's embedded findings + reviewed-sha markers so the re-review seed survives the swap."
+  },
+  args: {
+    "head-sha": {
+      type: "string",
+      description: "Trusted head SHA to resolve the PR (from workflow_run.head_sha)",
+      required: true
+    },
+    repo: {
+      type: "string",
+      description: "Repository (owner/name)",
+      required: true
+    },
+    "run-url": {
+      type: "string",
+      description: "Workflow run URL the placeholder links to",
+      required: true
+    },
+    "bot-login": {
+      type: "string",
+      description: "Bot login to trust for the sticky comment upsert (default: github-actions[bot])"
+    },
+    "head-branch": {
+      type: "string",
+      description: "Head branch to disambiguate the PR when multiple share a commit"
+    }
+  },
+  run: async ({ args }) => {
+    await announce({
+      repo: args.repo,
+      headSha: args["head-sha"],
+      botLogin: args["bot-login"] || "github-actions[bot]",
+      runUrl: args["run-url"],
+      headBranch: args["head-branch"]
+    }).catch(
+      (err) => process.stderr.write(
+        `code-review announce: could not post the in-progress sticky (${errMsg(err)}) \u2014 continuing (cosmetic)
+`
+      )
+    );
+  }
+});
 var requireCeilingSec = (raw) => {
   if (raw === void 0) return null;
   const ms = parseWallMs(raw);
@@ -3510,6 +3722,7 @@ var main = defineCommand({
     render: renderCmd,
     inline: inlineCmd,
     post: postCmd,
+    announce: announceCmd,
     cost: costCmd,
     "check-cost": checkCostCmd,
     validate: validateCmd,