@jphutchins/code-review 0.1.0-alpha.8 → 0.1.0-alpha.9

package/dist/index.js

@@ -89,6 +89,10 @@ var drop = (reason) => ({
   kind: "drop",
   reason
 });
+var keep = (reason) => ({
+  kind: "keep",
+  reason
+});
 var parseHunk = (patch) => {
   const rawLines = patch.split("\n");
   const lines = rawLines.length > 0 && rawLines[rawLines.length - 1] === "" ? rawLines.slice(0, -1) : rawLines;
@@ -128,10 +132,12 @@ var validatePatch = (patch, fileLines) => {
   const removedCount = body.filter((l) => l.kind === "removed").length;
   const addedCount = body.filter((l) => l.kind === "added").length;
   if (removedCount === 0 && addedCount === 0) return drop("hunk contains no changes");
-  if (removedCount === 0) return drop("pure insertion has no range to anchor a suggestion");
+  if (removedCount === 0) {
+    return keep("pure insertion applies cleanly but has no removed range to anchor a suggestion");
+  }
   const { firstRemoved, lastRemoved } = removedRange(body, oldStart);
   if (firstRemoved === null || lastRemoved === null) return drop("malformed hunk body");
-  return { startLine: firstRemoved, endLine: lastRemoved };
+  return { kind: "anchored", startLine: firstRemoved, endLine: lastRemoved };
 };
 var patchToSuggestion = (patch) => {
   const parsed = parseHunk(patch);
@@ -164,12 +170,14 @@ var severityEmoji = (s) => {
 };
 var EMBED_LIMIT = 4e4;
 var AGENTS_STOP_DIRECTIVE = "<!-- AGENTS: STOP \u2014 do not parse the prose below; decode this findings JSON and read schema_version first. -->";
-var findingsPointer = (findings, jsonUrl, limit = EMBED_LIMIT) => {
-  const b64 = Buffer.from(JSON.stringify(findings), "utf-8").toString("base64");
+var encodeMarker = (document, jsonUrl, limit) => {
+  const b64 = Buffer.from(JSON.stringify(document), "utf-8").toString("base64");
   const marker = b64.length <= limit ? `<!-- code-review:findings-json;base64 ${b64} -->` : jsonUrl ? `<!-- code-review:findings-json ${jsonUrl} -->` : "";
   return marker ? `${AGENTS_STOP_DIRECTIVE}
 ${marker}` : "";
 };
+var findingsPointer = (findings, jsonUrl, limit = EMBED_LIMIT) => encodeMarker(findings, jsonUrl, limit);
+var findingPointer = (finding, schemaVersion, jsonUrl, limit = EMBED_LIMIT) => encodeMarker({ schema_version: schemaVersion, findings: [finding] }, jsonUrl, limit);
 var escapeFence = (text) => text.replace(/```/g, "`` ` ``");
 var projectPatch = (patch) => {
   if (patch === void 0) return { kind: "none" };
@@ -330,8 +338,8 @@ var buildInlineComments = (findings, diff, context) => {
   const { inDiff, strays } = partitionFindings(findings, index);
   const eta = new Eta({ autoTrim: false });
   const modelsText = formatModels(models);
-  const pointer = context.findingsPointer ?? (fullFindings ? findingsPointer(fullFindings, jsonUrl) : "");
   const comments = inDiff.map((f) => {
+    const pointer = fullFindings ? findingPointer(f, fullFindings.schema_version, jsonUrl) : "";
     const comment = {
       path: f.path,
       line: f.end_line,
@@ -868,6 +876,84 @@ var dismissReviews = async (repo, prNumber, ids, ghApi) => {
     }
   }
 };
+var REVIEW_THREAD_COMMENTS_QUERY = "query($owner:String!,$name:String!,$pr:Int!){repository(owner:$owner,name:$name){pullRequest(number:$pr){reviewThreads(first:100){pageInfo{hasNextPage}nodes{comments(first:100){nodes{id isMinimized author{login} originalCommit{oid}}}}}}}}";
+var MINIMIZE_COMMENT_MUTATION = "mutation($id:ID!){minimizeComment(input:{subjectId:$id,classifier:OUTDATED}){minimizedComment{isMinimized}}}";
+var supersededCommentId = (c, headSha, logins) => {
+  if (typeof c !== "object" || c === null) return null;
+  const o = c;
+  const login = o.author?.login;
+  const oid = o.originalCommit?.oid;
+  return typeof o.id === "string" && o.isMinimized !== true && typeof login === "string" && logins.includes(login) && typeof oid === "string" && oid !== headSha ? o.id : null;
+};
+var supersededBotCommentIds = (raw, headSha, botLogin) => {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return { ids: [], truncated: false };
+  }
+  const conn = parsed.data?.repository?.pullRequest?.reviewThreads;
+  const truncated = conn?.pageInfo?.hasNextPage === true;
+  const nodes = conn?.nodes;
+  if (!Array.isArray(nodes)) return { ids: [], truncated };
+  const logins = [botLogin.replace(/\[bot\]$/, ""), botLogin];
+  const ids = nodes.flatMap((t4) => {
+    const cnodes = t4.comments?.nodes;
+    return Array.isArray(cnodes) ? cnodes.map((c) => supersededCommentId(c, headSha, logins)).filter((id) => id !== null) : [];
+  });
+  return { ids, truncated };
+};
+var minimizeSupersededComments = async (repo, prNumber, headSha, botLogin, ghApi) => {
+  const slash = repo.indexOf("/");
+  if (slash <= 0) return;
+  const owner = repo.slice(0, slash);
+  const name = repo.slice(slash + 1);
+  let raw;
+  try {
+    raw = await ghApi([
+      "graphql",
+      "-f",
+      `query=${REVIEW_THREAD_COMMENTS_QUERY}`,
+      "-f",
+      `owner=${owner}`,
+      "-f",
+      `name=${name}`,
+      "-F",
+      `pr=${String(prNumber)}`
+    ]);
+  } catch (err) {
+    process.stderr.write(
+      `Warning: could not list review threads to minimize stale comments on PR #${String(prNumber)}: ${err instanceof Error ? err.message : String(err)}
+`
+    );
+    return;
+  }
+  const { ids, truncated } = supersededBotCommentIds(raw, headSha, botLogin);
+  if (truncated) {
+    process.stderr.write(
+      `Note: PR #${String(prNumber)} has more than 100 review threads \u2014 only the first 100 were scanned for stale bot comments
+`
+    );
+  }
+  let minimized = 0;
+  for (const id of ids) {
+    try {
+      await ghApi(["graphql", "-f", `query=${MINIMIZE_COMMENT_MUTATION}`, "-f", `id=${id}`]);
+      minimized += 1;
+    } catch (err) {
+      process.stderr.write(
+        `Warning: failed to minimize a stale review comment on PR #${String(prNumber)}: ${err instanceof Error ? err.message : String(err)}
+`
+      );
+    }
+  }
+  if (minimized > 0) {
+    process.stderr.write(
+      `Minimized ${String(minimized)} stale inline comment(s) from superseded reviews on PR #${String(prNumber)}
+`
+    );
+  }
+};
 var post = async (input, ghApi = runGhApi) => {
   const candidates = await fetchPrCandidates(input.repo, input.headSha, ghApi);
   const resolution = resolvePr(candidates, input.headBranch);
@@ -966,7 +1052,8 @@ var post = async (input, ghApi = runGhApi) => {
   const { comments: rawComments, strays } = buildInlineComments(findings.findings, diff, {
     inlineTemplate,
     models: envelope.models.map((m) => m.model),
-    findingsPointer: findingsMarker
+    findings,
+    jsonUrl: input.jsonUrl
   });
   const { comments, longFiles } = checkLongSuggestions(rawComments);
   for (const wf of longFiles) {
@@ -1034,6 +1121,7 @@ var post = async (input, ghApi = runGhApi) => {
     `Posted ${String(comments.length)} inline comments on PR #${String(prNumber)}
 `
   );
+  await minimizeSupersededComments(input.repo, prNumber, input.headSha, input.botLogin, ghApi);
   if (stickyRef !== null) {
     const confirmedDisposition = {
       kind: "posted",
@@ -1836,19 +1924,23 @@ var validateFinding = (finding, repoRoot) => {
     return withoutPatch(finding);
   }
   const result = validatePatch(finding.patch, lines);
-  if ("kind" in result) {
-    process.stderr.write(
-      `validate-patches: ${finding.path}:${String(finding.start_line)}: ${result.reason} \u2014 dropping patch
+  switch (result.kind) {
+    case "anchored":
+      return { ...finding, start_line: result.startLine, end_line: result.endLine };
+    case "keep":
+      return finding;
+    case "drop":
+      process.stderr.write(
+        `validate-patches: ${finding.path}:${String(finding.start_line)}: ${result.reason} \u2014 dropping patch
 `
-    );
-    return withoutPatch(finding);
+      );
+      return withoutPatch(finding);
   }
-  return { ...finding, start_line: result.startLine, end_line: result.endLine };
 };
 var validatePatchesCmd = defineCommand({
   meta: {
     name: "validate-patches",
-    description: "Validate each finding's patch against the real PR-head tree, aligning the finding's range to it and keeping the patch, or dropping the patch (issue #10)"
+    description: "Validate each finding's patch against the real PR-head tree, aligning the finding's range and keeping the patch when it anchors, keeping it unaligned when it's a pure insertion, or dropping it when it doesn't apply (issue #10)"
   },
   args: {
     findings: {