opencode-magi 0.0.0-dev-20260522104950 → 0.0.0-dev-20260522105602

package/dist/github/commands.js

@@ -330,10 +330,13 @@ export async function removeIssueLabels(exec, repository, issue, labels, account
     return removed;
 }
 export async function fetchPullRequestReviews(exec, repository, pr) {
-    const query = `query($owner: String!, $repo: String!, $pr: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $pr) { reviews(first: 100) { nodes { author { login } submittedAt state body commit { oid } } } } } }`;
+    const query = `query($owner: String!, $repo: String!, $pr: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $pr) { reviews(first: 100) { nodes { author { login } submittedAt state body commit { oid } comments(first: 100) { nodes { body path line startLine } } } } } } }`;
     const raw = await exec(`gh api${ghHostOption(repository)} graphql -f query=${shellQuote(query)} -F owner=${shellQuote(repository.github.owner)} -F repo=${shellQuote(repository.github.repo)} -F pr=${pr}`);
     const data = JSON.parse(raw);
-    return data.data.repository.pullRequest.reviews.nodes;
+    return data.data.repository.pullRequest.reviews.nodes.map((review) => ({
+        ...review,
+        comments: review.comments?.nodes ?? [],
+    }));
 }
 export async function fetchPullRequestCommits(exec, repository, pr) {
     const query = `query($owner: String!, $repo: String!, $pr: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $pr) { commits(first: 100) { nodes { commit { oid committedDate parents { totalCount } } } } } } }`;

package/dist/orchestrator/findings.js

@@ -1,9 +1,20 @@
 import { majorityThreshold } from "./majority";
+function validationFindings(output) {
+    if ("findings" in output)
+        return output.findings;
+    return output.newFindings.map((finding) => ({
+        fix: "Please address this before merging.",
+        issue: finding.body,
+        line: finding.line,
+        path: finding.path,
+        startLine: finding.startLine,
+    }));
+}
 export function reviewFindingTargets(outputs) {
     return Object.entries(outputs).flatMap(([reviewer, output]) => {
         if (output.verdict !== "CHANGES_REQUESTED")
             return [];
-        return output.findings.map((finding, findingIndex) => ({
+        return validationFindings(output).map((finding, findingIndex) => ({
             finding,
             findingIndex,
             reviewer,
@@ -41,7 +52,9 @@ export function applyFindingValidation(input) {
             next[reviewer] = output;
             continue;
         }
-        const findings = output.findings.filter((finding, findingIndex) => {
+        const keptIndexes = new Set();
+        const findings = validationFindings(output);
+        findings.forEach((finding, findingIndex) => {
             let agrees = 1;
             for (const validator of input.reviewerKeys) {
                 if (validator === reviewer)
@@ -53,14 +66,23 @@ export function applyFindingValidation(input) {
             const target = { finding, findingIndex, reviewer };
             if (agrees >= threshold) {
                 kept.push(target);
-                return true;
+                keptIndexes.add(findingIndex);
+                return;
             }
             discarded.push(target);
-            return false;
         });
-        next[reviewer] = findings.length
-            ? { ...output, findings }
-            : { findings: [], verdict: "MERGE" };
+        if ("findings" in output) {
+            const keptFindings = output.findings.filter((_finding, index) => keptIndexes.has(index));
+            next[reviewer] = keptFindings.length
+                ? { ...output, findings: keptFindings }
+                : { findings: [], verdict: "MERGE" };
+            continue;
+        }
+        const newFindings = output.newFindings.filter((_finding, index) => keptIndexes.has(index));
+        next[reviewer] =
+            newFindings.length || output.followUps.length
+                ? { ...output, newFindings }
+                : { ...output, newFindings, verdict: "MERGE" };
     }
     return { outputs: next, summary: { discarded, kept } };
 }

package/dist/orchestrator/review.js

@@ -135,6 +135,9 @@ function parseRereviewOutputWithInlineTargets(text, targets) {
     validateInlineCommentTargets(output.newFindings, targets, "newFindings");
     return output;
 }
+export async function inlineCommentTargetsForDiff(input) {
+    return parseRightSideDiffTargets(await input.exec(`git diff --no-ext-diff --unified=3 ${shellQuote(input.fromSha)}...${shellQuote(input.toSha)}`, { cwd: input.worktreePath }));
+}
 function parsePostedFindingLocation(location) {
     const range = /^(.*):(\d+)-(\d+)$/.exec(location);
     if (range) {
@@ -182,10 +185,42 @@ function reviewFindingsFromBody(body) {
     }
     return { findings };
 }
+function parsePostedFindingComment(body) {
+    const match = /^\*\*Issue:\*\*\s*([\s\S]*?)\s*\r?\n\r?\n\*\*Fix:\*\*\s*([\s\S]+?)\s*$/.exec(body);
+    if (!match)
+        return undefined;
+    return {
+        fix: match[2]?.trim() || "Please address this before merging.",
+        issue: match[1]?.trim() || "Review finding.",
+    };
+}
+function reviewFindingsFromComments(comments) {
+    return {
+        findings: (comments ?? []).flatMap((comment) => {
+            if (comment.line == null)
+                return [];
+            const parsed = parsePostedFindingComment(comment.body);
+            if (!parsed)
+                return [];
+            return [
+                {
+                    ...parsed,
+                    line: comment.line,
+                    path: comment.path,
+                    startLine: comment.startLine ?? undefined,
+                },
+            ];
+        }),
+    };
+}
 export function reviewOutputFromState(review) {
     const verdict = reviewStateToVerdict(review.state);
-    if (verdict === "CHANGES_REQUESTED")
+    if (verdict === "CHANGES_REQUESTED") {
+        const fromComments = reviewFindingsFromComments(review.comments);
+        if (fromComments.findings.length)
+            return { ...fromComments, verdict };
         return { ...reviewFindingsFromBody(review.body), verdict };
+    }
     return verdict === "CLOSE"
         ? {
             findings: [],
@@ -230,8 +265,8 @@ function isReviewOutput(output) {
     return "findings" in output;
 }
 async function runFindingValidation(input) {
-    const reviewOutputs = Object.fromEntries(input.entries.flatMap((entry) => isReviewOutput(entry.value) ? [[entry.key, entry.value]] : []));
-    const targets = reviewFindingTargets(reviewOutputs);
+    const outputs = Object.fromEntries(input.entries.map((entry) => [entry.key, entry.value]));
+    const targets = reviewFindingTargets(outputs);
     if (!targets.length) {
         return {
             outputs: Object.fromEntries(input.entries.map((entry) => [entry.key, entry.value])),
@@ -316,7 +351,7 @@ async function runFindingValidation(input) {
         return [reviewer.key, result.value];
     }, { signal: input.reviewInput.signal }));
     const filtered = applyFindingValidation({
-        outputs: reviewOutputs,
+        outputs,
         reviewerKeys: input.reviewInput.repository.agents.reviewers.map((reviewer) => reviewer.key),
         validations,
     });
@@ -324,7 +359,7 @@ async function runFindingValidation(input) {
     await input.reviewInput.onProgress?.({
         discarded: filtered.summary.discarded.length,
         kept: filtered.summary.kept.length,
-        reviewersChangedToMerge: Object.entries(reviewOutputs)
+        reviewersChangedToMerge: Object.entries(outputs)
             .filter(([reviewer, output]) => {
             return (output.verdict === "CHANGES_REQUESTED" &&
                 filtered.outputs[reviewer]?.verdict === "MERGE");
@@ -407,7 +442,7 @@ async function runCloseReconsideration(input) {
                 parentSessionId: input.reviewInput.parentSessionId,
                 parse: (text) => {
                     const output = parseCloseReconsiderationOutput(text);
-                    validateInlineCommentTargets(output.findings, input.inlineCommentTargets);
+                    validateInlineCommentTargets(output.findings, entry.inlineCommentTargets);
                     return output;
                 },
                 permission: reviewer.permission,
@@ -436,6 +471,7 @@ async function runCloseReconsideration(input) {
         });
         input.sessionIds[reviewer.key] = result.sessionId;
         return {
+            inlineCommentTargets: entry.inlineCommentTargets,
             key: entry.key,
             raw: result.raw,
             sessionId: result.sessionId,
@@ -602,7 +638,12 @@ 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 }));
+        const initialInlineCommentTargets = await inlineCommentTargetsForDiff({
+            exec,
+            fromSha: meta.baseRefOid,
+            toSha: meta.headRefOid,
+            worktreePath,
+        });
         for (const reviewer of input.repository.agents.reviewers) {
             const assignment = mode.assignments.get(reviewer.account);
             if (assignment?.type !== "skip")
@@ -622,6 +663,12 @@ export async function runReview(input) {
                 const previous = assignment.review;
                 if (!previous.commit?.oid)
                     throw new Error(`Missing previous review commit for ${reviewer.account}`);
+                const inlineCommentTargets = await inlineCommentTargetsForDiff({
+                    exec,
+                    fromSha: previous.commit.oid,
+                    toSha: meta.headRefOid,
+                    worktreePath,
+                });
                 const unresolved = unresolvedThreadsByAccount.get(reviewer.account) ??
                     (await fetchUnresolvedThreads(exec, input.repository, input.pr, reviewer.account));
                 const prompt = await composeRereviewPrompt({
@@ -688,6 +735,7 @@ export async function runReview(input) {
                     verdict: result.value.verdict,
                 });
                 return {
+                    inlineCommentTargets,
                     key: reviewer.key,
                     raw: result.raw,
                     sessionId: result.sessionId,
@@ -736,7 +784,7 @@ export async function runReview(input) {
                     },
                     options: reviewer.options,
                     parentSessionId: input.parentSessionId,
-                    parse: (text) => parseReviewOutputWithInlineTargets(text, inlineCommentTargets),
+                    parse: (text) => parseReviewOutputWithInlineTargets(text, initialInlineCommentTargets),
                     permission: reviewer.permission,
                     prompt,
                     repairAttempts: input.config.output?.repairAttempts ?? 3,
@@ -755,6 +803,7 @@ export async function runReview(input) {
                 verdict: result.value.verdict,
             });
             return {
+                inlineCommentTargets: initialInlineCommentTargets,
                 key: reviewer.key,
                 raw: result.raw,
                 sessionId: result.sessionId,
@@ -788,6 +837,7 @@ export async function runReview(input) {
             return [
                 {
                     key: reviewer.key,
+                    inlineCommentTargets: initialInlineCommentTargets,
                     raw: assignment.review.body ?? "",
                     sessionId: "",
                     value: reviewOutputFromState(assignment.review),
@@ -796,7 +846,6 @@ export async function runReview(input) {
         });
         entries = await runCloseReconsideration({
             entries: [...entries, ...skippedCloseEntries],
-            inlineCommentTargets,
             meta,
             outputDir,
             reviewContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-magi",
-  "version": "0.0.0-dev-20260522104950",
+  "version": "0.0.0-dev-20260522105602",
   "description": "Multi-agent PR review and merge orchestration plugin for OpenCode.",
   "license": "MIT",
   "author": "Hirotomo Yamada <hirotomo.yamada@avap.co.jp>",