opencode-magi 0.2.0 → 0.4.0

package/dist/orchestrator/review.js

@@ -1,17 +1,19 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { createWorktree, fetchPullRequest, fetchPullRequestCommits, fetchPullRequestReviews, fetchUnresolvedThreads, closePullRequest, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, removeWorktree, resolveThread, } from "../github/commands";
+import { createWorktree, fetchPullRequest, fetchPullRequestCommits, fetchPullRequestReviews, fetchUnresolvedThreads, closePullRequest, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, removeWorktree, resolveThread, shellQuote, } from "../github/commands";
 import { composeFindingValidationPrompt, composeCloseReconsiderationPrompt, composeRereviewPrompt, composeReviewPrompt, } from "../prompts/compose";
 import { prRunOutputDir } from "../config/output";
 import { worktreeBaseDir } from "../config/worktree";
 import { parseCloseReconsiderationOutput, parseFindingValidationOutput, parseRereviewOutput, parseReviewOutput, } from "../prompts/output";
 import { throwIfAborted, withAbortSignal } from "./abort";
 import { waitForChecksWithClassification } from "./ci";
+import { parseRightSideDiffTargets, validateInlineCommentTargets, } from "./inline-comments";
 import { applyFindingValidation, reviewFindingTargets, validateFindingVotes, } from "./findings";
 import { closeMinorityReviewers, mergeVerdictForPolicy, } from "./majority";
 import { runModelWithRepair } from "./model";
 import { mapPool } from "./pool";
 import { formatReviewReport } from "./report";
+import { buildReviewContextSnapshot, renderReviewContext, } from "./review-context";
 import { checkSafetyGate, hasSafetyGate } from "./safety";
 function errorMessage(error) {
     return error instanceof Error ? error.message : String(error);
@@ -37,7 +39,7 @@ async function postReviewOutput(input, reviewerKey, output) {
         return postApproval(input.exec, input.repository, input.pr, reviewer.account);
     if (output.verdict === "CLOSE")
         return postCloseComment(input.exec, input.repository, input.pr, reviewer.account, output.reason ?? "Close requested.");
-    return postChangesRequested(input.exec, input.repository, input.pr, reviewer.account, output.findings);
+    return postChangesRequested(input.exec, input.repository, input.pr, reviewer.account, output.findings, output.requirementFindings);
 }
 function dryRunReviewPost(key, output) {
     if (output.verdict === "MERGE")
@@ -123,11 +125,87 @@ function previousReviewText(review) {
         submittedAt: review.submittedAt,
     }, null, 2);
 }
-function reviewOutputFromState(review) {
+function parseReviewOutputWithInlineTargets(text, targets) {
+    const output = parseReviewOutput(text);
+    validateInlineCommentTargets(output.findings, targets);
+    return output;
+}
+function parseRereviewOutputWithInlineTargets(text, targets) {
+    const output = parseRereviewOutput(text);
+    validateInlineCommentTargets(output.newFindings, targets, "newFindings");
+    return output;
+}
+function parsePostedFindingLocation(location) {
+    const range = /^(.*):(\d+)-(\d+)$/.exec(location);
+    if (range) {
+        return {
+            line: Number(range[3]),
+            path: range[1] ?? location,
+            startLine: Number(range[2]),
+        };
+    }
+    const line = /^(.*):(\d+)$/.exec(location);
+    if (line)
+        return { line: Number(line[2]), path: line[1] ?? location };
+    return { path: location };
+}
+function reviewFindingsFromBody(body) {
+    const findings = [];
+    const requirementFindings = [];
+    const lines = (body ?? "").split(/\r?\n/);
+    let section;
+    for (let index = 0; index < lines.length; index += 1) {
+        const line = lines[index];
+        if (line === "Inline findings:" || line === "File-level findings:") {
+            section = "finding";
+            continue;
+        }
+        if (line === "Requirement findings:") {
+            section = "requirement";
+            continue;
+        }
+        if (section === "finding") {
+            const match = /^- (.*): (.+)$/.exec(line ?? "");
+            const fix = /^\s+Fix: (.+)$/.exec(lines[index + 1] ?? "");
+            if (!match || !fix)
+                continue;
+            findings.push({
+                ...parsePostedFindingLocation(match[1] ?? ""),
+                fix: fix[1] ?? "Please address this before merging.",
+                issue: match[2] ?? "Review finding.",
+            });
+            index += 1;
+            continue;
+        }
+        if (section !== "requirement")
+            continue;
+        const match = /^- Missing issue #(\d+) requirement: (.+)$/.exec(line ?? "");
+        const evidence = /^\s+Evidence: (.+)$/.exec(lines[index + 1] ?? "");
+        const fix = /^\s+Fix: (.+)$/.exec(lines[index + 2] ?? "");
+        if (!match || !evidence || !fix)
+            continue;
+        requirementFindings.push({
+            evidence: evidence[1] ?? "See review body.",
+            fix: fix[1] ?? "Please address this before merging.",
+            issueNumber: Number(match[1]),
+            requirement: match[2] ?? "Review requirement.",
+        });
+        index += 2;
+    }
+    return { findings, requirementFindings };
+}
+export function reviewOutputFromState(review) {
     const verdict = reviewStateToVerdict(review.state);
+    if (verdict === "CHANGES_REQUESTED")
+        return { ...reviewFindingsFromBody(review.body), verdict };
     return verdict === "CLOSE"
-        ? { findings: [], reason: review.body || "Close requested.", verdict }
-        : { findings: [], verdict };
+        ? {
+            findings: [],
+            reason: review.body || "Close requested.",
+            requirementFindings: [],
+            verdict,
+        }
+        : { findings: [], requirementFindings: [], verdict };
 }
 export function hasPendingThreadReply(threads, reviewerAccount) {
     return threads.some((thread) => {
@@ -151,15 +229,15 @@ async function postRereviewOutput(input, reviewerKey, output) {
         return postApproval(input.exec, input.repository, input.pr, reviewer.account);
     if (output.verdict === "CLOSE")
         return postCloseComment(input.exec, input.repository, input.pr, reviewer.account, output.reason ?? "Close requested.");
-    if (!output.newFindings.length)
+    if (!output.newFindings.length && !output.requirementFindings.length)
         return "";
     return postChangesRequested(input.exec, input.repository, input.pr, reviewer.account, output.newFindings.map((finding) => ({
         fix: "Please address this before merging.",
         issue: finding.body,
-        line: finding.line,
         path: finding.path,
+        ...(finding.line == null ? {} : { line: finding.line }),
         startLine: finding.startLine,
-    })));
+    })), output.requirementFindings);
 }
 function isReviewOutput(output) {
     return "findings" in output;
@@ -191,6 +269,7 @@ async function runFindingValidation(input) {
             includeSessionContext: !hasReviewerSession,
             pr: input.reviewInput.pr,
             repository: input.reviewInput.repository,
+            reviewContext: input.reviewContext,
             reviewer,
             worktreePath: input.worktreePath,
         });
@@ -303,6 +382,7 @@ async function runCloseReconsideration(input) {
             includeSessionContext: !hasReviewerSession,
             pr: input.reviewInput.pr,
             repository: input.reviewInput.repository,
+            reviewContext: input.reviewContext,
             reviewer,
             worktreePath: input.worktreePath,
         });
@@ -336,7 +416,11 @@ async function runCloseReconsideration(input) {
                     }
                 },
                 options: reviewer.options,
-                parse: parseCloseReconsiderationOutput,
+                parse: (text) => {
+                    const output = parseCloseReconsiderationOutput(text);
+                    validateInlineCommentTargets(output.findings, input.inlineCommentTargets);
+                    return output;
+                },
                 permission: reviewer.permission,
                 prompt,
                 repairAttempts: input.reviewInput.config.output?.repairAttempts ?? 3,
@@ -397,6 +481,7 @@ export async function runReview(input) {
                 dryRun: input.dryRun,
                 outputs: {},
                 posted: {},
+                pr: input.pr,
                 repository: input.repository,
                 safety,
             });
@@ -448,6 +533,15 @@ export async function runReview(input) {
         pr: input.pr,
     }), ...(input.runId ? [input.runId] : []));
     await mkdir(outputDir, { recursive: true });
+    await input.onProgress?.({ phase: "fetching review context", type: "phase" });
+    const reviewContextSnapshot = await buildReviewContextSnapshot({
+        exec,
+        pr: meta,
+        repository: input.repository,
+    });
+    const reviewContext = renderReviewContext(reviewContextSnapshot);
+    await writeFile(join(outputDir, "review-context.json"), JSON.stringify(reviewContextSnapshot, null, 2));
+    await writeFile(join(outputDir, "review-context.md"), `${reviewContext}\n`);
     await input.onProgress?.({ phase: "waiting for checks", type: "phase" });
     const checkResult = await waitForChecksWithClassification({
         client: input.client,
@@ -518,6 +612,7 @@ export async function runReview(input) {
                 return [];
             return [{ assignment, reviewer }];
         });
+        const inlineCommentTargets = parseRightSideDiffTargets(await exec(`git diff --no-ext-diff --unified=3 ${shellQuote(meta.baseRefOid)} ${shellQuote(meta.headRefOid)}`, { cwd: worktreePath }));
         for (const reviewer of input.repository.agents.reviewers) {
             const assignment = mode.assignments.get(reviewer.account);
             if (assignment?.type !== "skip")
@@ -548,6 +643,7 @@ export async function runReview(input) {
                     previousReview: previousReviewText(previous),
                     previousHeadSha: previous.commit.oid,
                     repository: input.repository,
+                    reviewContext,
                     reviewer,
                     unresolvedThreads: JSON.stringify(unresolved, null, 2),
                     worktreePath,
@@ -582,7 +678,7 @@ export async function runReview(input) {
                             }
                         },
                         options: reviewer.options,
-                        parse: parseRereviewOutput,
+                        parse: (text) => parseRereviewOutputWithInlineTargets(text, inlineCommentTargets),
                         permission: reviewer.permission,
                         prompt,
                         repairAttempts: input.config.output?.repairAttempts ?? 3,
@@ -614,6 +710,7 @@ export async function runReview(input) {
                 headSha: meta.headRefOid,
                 pr: input.pr,
                 repository: input.repository,
+                reviewContext,
                 reviewer,
                 worktreePath,
             });
@@ -647,7 +744,7 @@ export async function runReview(input) {
                         }
                     },
                     options: reviewer.options,
-                    parse: parseReviewOutput,
+                    parse: (text) => parseReviewOutputWithInlineTargets(text, inlineCommentTargets),
                     permission: reviewer.permission,
                     prompt,
                     repairAttempts: input.config.output?.repairAttempts ?? 3,
@@ -707,8 +804,10 @@ export async function runReview(input) {
         });
         entries = await runCloseReconsideration({
             entries: [...entries, ...skippedCloseEntries],
+            inlineCommentTargets,
             meta,
             outputDir,
+            reviewContext,
             reviewInput: { ...input, exec },
             sessionIds,
             targets: closeTargets,
@@ -718,11 +817,19 @@ export async function runReview(input) {
             entries,
             meta,
             outputDir,
+            reviewContext,
             reviewInput: { ...input, exec },
             sessionIds,
             worktreePath,
         });
-        const outputs = validation.outputs;
+        const activeOutputs = validation.outputs;
+        const skippedOutputs = Object.fromEntries(input.repository.agents.reviewers.flatMap((reviewer) => {
+            const assignment = mode.assignments.get(reviewer.account);
+            return assignment?.type === "skip"
+                ? [[reviewer.key, reviewOutputFromState(assignment.review)]]
+                : [];
+        }));
+        const outputs = { ...skippedOutputs, ...activeOutputs };
         const remainingSkippedVerdicts = input.repository.agents.reviewers.flatMap((reviewer) => {
             const assignment = mode.assignments.get(reviewer.account);
             if (assignment?.type !== "skip" || closeTargets.includes(reviewer.key))
@@ -734,7 +841,7 @@ export async function runReview(input) {
                 },
             ];
         });
-        const activeVerdicts = Object.entries(outputs).map(([reviewer, output]) => ({
+        const activeVerdicts = Object.entries(activeOutputs).map(([reviewer, output]) => ({
             reviewer,
             verdict: output.verdict,
         }));
@@ -747,7 +854,7 @@ export async function runReview(input) {
                     ? [[reviewer.key, "skipped: already reviewed current head"]]
                     : [];
             })),
-            ...Object.fromEntries(await Promise.all(Object.entries(outputs).map(async ([key, output]) => [
+            ...Object.fromEntries(await Promise.all(Object.entries(activeOutputs).map(async ([key, output]) => [
                 key,
                 input.dryRun
                     ? dryRunReviewPost(key, output)
@@ -793,6 +900,7 @@ export async function runReview(input) {
             dryRun: input.dryRun,
             outputs,
             posted,
+            pr: input.pr,
             repository: input.repository,
         });
         await writeFile(join(outputDir, "report.md"), `${report}\n`);