opencode-magi 0.0.0-dev-20260520163847 → 0.0.0-dev-20260520165753

package/dist/index.js

@@ -118,6 +118,11 @@ function parseOptionalPr(value) {
         return undefined;
     return parsePrToken(value);
 }
+function parseOptionalPrs(value) {
+    if (!value?.trim())
+        return undefined;
+    return parsePrs(value);
+}
 function parseOptionalIssue(value) {
     if (!value?.trim())
         return undefined;
@@ -432,7 +437,7 @@ export const MagiPlugin = async ({ client, directory }) => {
                         block: args.block,
                         issue: parseOptionalIssue(args.issue),
                         outputDir: await configuredOutputDir(),
-                        pr: parseOptionalPr(args.pr),
+                        pr: parseOptionalPrs(args.pr),
                         runId: args.runId,
                         timeoutMs: args.timeoutSeconds == null
                             ? undefined

package/dist/orchestrator/inline-comments.js

@@ -0,0 +1,73 @@
+function parseDiffPath(value) {
+    if (value === "/dev/null")
+        return undefined;
+    let path = value;
+    if (path.startsWith('"') && path.endsWith('"')) {
+        try {
+            path = JSON.parse(path);
+        }
+        catch {
+            path = path.slice(1, -1);
+        }
+    }
+    return path.startsWith("b/") ? path.slice(2) : path;
+}
+function addTargetLine(targets, path, line) {
+    const lines = targets.get(path) ?? new Set();
+    lines.add(line);
+    targets.set(path, lines);
+}
+export function parseRightSideDiffTargets(diff) {
+    const targets = new Map();
+    let currentPath;
+    let rightLine;
+    for (const line of diff.split("\n")) {
+        if (line.startsWith("+++ ")) {
+            currentPath = parseDiffPath(line.slice(4));
+            rightLine = undefined;
+            continue;
+        }
+        if (line.startsWith("@@ ")) {
+            const match = line.match(/\+(\d+)(?:,\d+)?/);
+            rightLine = match ? Number(match[1]) : undefined;
+            continue;
+        }
+        if (!currentPath || rightLine == null)
+            continue;
+        if (line.startsWith("+") || line.startsWith(" ")) {
+            addTargetLine(targets, currentPath, rightLine);
+            rightLine += 1;
+            continue;
+        }
+        if (line.startsWith("-"))
+            continue;
+    }
+    return targets;
+}
+function assertPositiveInteger(value, name) {
+    if (!Number.isInteger(value) || value < 1) {
+        throw new Error(`${name} must be a positive integer`);
+    }
+}
+export function validateInlineCommentTargets(findings, targets, label = "findings") {
+    for (const [index, finding] of findings.entries()) {
+        const name = `${label}[${index}]`;
+        assertPositiveInteger(finding.line, `${name}.line`);
+        if (finding.startLine != null) {
+            assertPositiveInteger(finding.startLine, `${name}.startLine`);
+            if (finding.startLine > finding.line) {
+                throw new Error(`${name}.startLine must be before or equal to line`);
+            }
+        }
+        const lines = targets.get(finding.path);
+        if (!lines) {
+            throw new Error(`${name} targets ${finding.path}:${finding.line}, but path is not in the PR diff`);
+        }
+        const startLine = finding.startLine ?? finding.line;
+        for (let line = startLine; line <= finding.line; line += 1) {
+            if (!lines.has(line)) {
+                throw new Error(`${name} targets ${finding.path}:${line}, but line is not in a right-side PR diff hunk`);
+            }
+        }
+    }
+}

package/dist/orchestrator/merge.js

@@ -1,11 +1,12 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { prRunOutputDir } from "../config/output";
-import { closePullRequest, configureGitIdentity, fetchMergeQueueRequirement, fetchPullRequest, fetchUnresolvedThreads, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, pushHead, removeWorktree, resolveThread, waitForMergeQueue, } from "../github/commands";
+import { closePullRequest, configureGitIdentity, fetchMergeQueueRequirement, fetchPullRequest, fetchUnresolvedThreads, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, pushHead, removeWorktree, resolveThread, shellQuote, waitForMergeQueue, } from "../github/commands";
 import { composeEditPrompt, composeRereviewCloseReconsiderationPrompt, composeRereviewPrompt, } from "../prompts/compose";
 import { parseEditOutput, parseRereviewCloseReconsiderationOutput, parseRereviewOutput, } from "../prompts/output";
 import { throwIfAborted, withAbortSignal } from "./abort";
 import { waitForChecksWithClassification } from "./ci";
+import { parseRightSideDiffTargets, validateInlineCommentTargets, } from "./inline-comments";
 import { closeMinorityReviewers, mergeVerdictForPolicy } from "./majority";
 import { runModelWithRepair } from "./model";
 import { mapPool } from "./pool";
@@ -155,10 +156,16 @@ async function postRereviewOutput(input, reviewerKey, output) {
     }
     return replies[0] ?? "";
 }
+function parseRereviewOutputWithInlineTargets(text, targets) {
+    const output = parseRereviewOutput(text);
+    validateInlineCommentTargets(output.newFindings, targets, "newFindings");
+    return output;
+}
 async function runRereview(input, worktreePath, previousHeadSha, cycle, sessionIds, ciFailureContext, options = {}) {
     throwIfAborted(input.signal);
     const meta = await fetchPullRequest(input.exec, input.repository, input.pr);
     const headSha = options.dryRunHeadSha ?? meta.headRefOid;
+    const inlineCommentTargets = parseRightSideDiffTargets(await input.exec(`git diff --no-ext-diff --unified=3 ${shellQuote(meta.baseRefOid)} ${shellQuote(headSha)}`, { cwd: worktreePath }));
     const artifactDir = outputDir(input);
     let entries = await mapPool(input.repository.agents.reviewers, input.repository.concurrency.reviewers, async (reviewer) => {
         throwIfAborted(input.signal);
@@ -213,7 +220,7 @@ async function runRereview(input, worktreePath, previousHeadSha, cycle, sessionI
                     }
                 },
                 options: reviewer.options,
-                parse: parseRereviewOutput,
+                parse: (text) => parseRereviewOutputWithInlineTargets(text, inlineCommentTargets),
                 permission: reviewer.permission,
                 prompt,
                 repairAttempts: input.config.output?.repairAttempts ?? 3,
@@ -296,7 +303,11 @@ async function runRereview(input, worktreePath, previousHeadSha, cycle, sessionI
                         }
                     },
                     options: reviewer.options,
-                    parse: parseRereviewCloseReconsiderationOutput,
+                    parse: (text) => {
+                        const output = parseRereviewCloseReconsiderationOutput(text);
+                        validateInlineCommentTargets(output.newFindings, inlineCommentTargets, "newFindings");
+                        return output;
+                    },
                     permission: reviewer.permission,
                     prompt,
                     repairAttempts: input.config.output?.repairAttempts ?? 3,

package/dist/orchestrator/review.js

@@ -1,12 +1,13 @@
 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";
@@ -123,6 +124,16 @@ function previousReviewText(review) {
         submittedAt: review.submittedAt,
     }, null, 2);
 }
+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 reviewOutputFromState(review) {
     const verdict = reviewStateToVerdict(review.state);
     return verdict === "CLOSE"
@@ -336,7 +347,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,
@@ -519,6 +534,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")
@@ -583,7 +599,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,
@@ -648,7 +664,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,
@@ -708,6 +724,7 @@ export async function runReview(input) {
         });
         entries = await runCloseReconsideration({
             entries: [...entries, ...skippedCloseEntries],
+            inlineCommentTargets,
             meta,
             outputDir,
             reviewInput: { ...input, exec },

package/dist/orchestrator/run-manager.js

@@ -35,6 +35,19 @@ function isActiveStatus(status) {
         status === "running" ||
         status === "posting");
 }
+function matchesNumberFilter(value, filter) {
+    if (filter == null)
+        return true;
+    return Array.isArray(filter)
+        ? value != null && filter.includes(value)
+        : value === filter;
+}
+function hasAllRequestedPrStates(states, pr) {
+    if (pr == null)
+        return true;
+    const prs = Array.isArray(pr) ? pr : [pr];
+    return prs.every((item) => states.some((state) => state.pr === item));
+}
 function isWithinDirectory(directory, path) {
     const relation = relative(directory, path);
     return (relation === "" || (!relation.startsWith("..") && !isAbsolute(relation)));
@@ -548,6 +561,7 @@ export class MagiRunManager {
         while (input.block) {
             const states = await this.filteredStates(input);
             if (states.length &&
+                hasAllRequestedPrStates(states, input.pr) &&
                 states.every((state) => !isActiveStatus(state.status)))
                 return states;
             if (Date.now() - startedAt >= timeoutMs)
@@ -1661,7 +1675,7 @@ export class MagiRunManager {
         return states
             .filter((state) => input.command == null || state.command === input.command)
             .filter((state) => input.issue == null || state.issue === input.issue)
-            .filter((state) => input.pr == null || state.pr === input.pr)
+            .filter((state) => matchesNumberFilter(state.pr, input.pr))
             .sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
     }
     async selectState(input) {

package/package.json

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