opencode-magi 0.0.0-dev-20260520163717 → 0.0.0-dev-20260520165420

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/triage.js

@@ -4,7 +4,7 @@ import { issueRunOutputDir } from "../config/output";
 import { worktreeBaseDir } from "../config/worktree";
 import { assignIssue, closeIssue, closePullRequest, configureGitIdentity, createPullRequest, fetchIssue, fetchIssueComments, fetchRelatedPullRequests, postIssueComment, pushHead, removeIssueLabels, removeWorktree, searchDuplicateIssues, shellQuote, updateIssueComment, } from "../github/commands";
 import { composeTriageBugPrompt, composeTriageActionPrompt, composeTriageCommentClassificationPrompt, composeTriageCommentPrompt, composeTriageCreatePrPrompt, composeTriageDuplicatePrompt, composeTriageExistingPrPrompt, composeTriageFeaturePrompt, composeTriageKindPrompt, composeTriageQuestionPrompt, composeTriageReconsiderPrompt, } from "../prompts/compose";
-import { parseEditOutput, parseTriageActionOutput, parseTriageBinaryOutput, parseTriageCommentClassificationOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, parseTriageFinalOutput, parseTriageKindOutput, } from "../prompts/output";
+import { parseTriageActionOutput, parseTriageBinaryOutput, parseTriageCommentClassificationOutput, parseTriageCreatePrOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, parseTriageFinalOutput, parseTriageKindOutput, } from "../prompts/output";
 import { aggregateStringMajority, majorityThreshold } from "./majority";
 import { runModelText, runModelWithRepair } from "./model";
 const MARKER_PREFIX = "opencode-magi:triage";
@@ -65,6 +65,10 @@ function labelsContain(labels, targets) {
     const set = new Set(labels.map((label) => label.toLowerCase()));
     return targets.some((target) => set.has(target.toLowerCase()));
 }
+function existingClearLabels(issue, labels) {
+    const existing = new Set(issue.labels.map((label) => label.toLowerCase()));
+    return labels.filter((label) => existing.has(label.toLowerCase()));
+}
 export function resolveIssueKind(issue, repository) {
     const triage = repository.triage;
     if (!triage)
@@ -251,6 +255,11 @@ function markerPr(marker) {
     const pr = Number(marker.pr);
     return Number.isInteger(pr) && pr > 0 ? pr : undefined;
 }
+function pullRequestNumberFromUrl(url) {
+    const match = url.match(/\/pull\/(\d+)(?:\D|$)/);
+    const number = match ? Number(match[1]) : undefined;
+    return number && Number.isInteger(number) ? number : undefined;
+}
 export function mentionAllowed(comment, repository) {
     const safety = repository.triage?.safety;
     if (!safety)
@@ -329,6 +338,30 @@ function actionPlan(input) {
         postComment: true,
     };
 }
+function previousAutomationPlan(input) {
+    const base = actionPlan({ result: input.result, triage: input.triage });
+    const clearLabels = base.clearLabels &&
+        existingClearLabels(input.issue, input.triage.automation.clear).length > 0;
+    const closeIssue = input.marker.action === "CLOSE" &&
+        base.closeIssue &&
+        input.issue.state === "OPEN";
+    const createPr = input.marker.action === "PR" &&
+        base.createPr &&
+        !markerPr(input.marker) &&
+        !input.relationship.relatedPullRequests.length;
+    if (!clearLabels && !closeIssue && !createPr)
+        return undefined;
+    const action = closeIssue ? "CLOSE" : createPr ? "PR" : "CLEAR_ONLY";
+    return {
+        ...base,
+        action,
+        allowedActions: [action],
+        clearLabels,
+        closeIssue,
+        createPr,
+        postComment: false,
+    };
+}
 async function runActionPrompt(input) {
     const agent = input.input.repository.agents.triage?.[0];
     if (!agent)
@@ -454,7 +487,7 @@ async function persistProcessedMarker(input) {
         action: input.marker.action ?? input.marker.result ?? "ASK",
         checkpoint: markerCheckpoint(input.marker),
         issue: input.issue.number,
-        pr: markerPr(input.marker),
+        pr: input.pr ?? markerPr(input.marker),
         processed: input.processed,
         result: input.marker.result ?? "ASK",
     });
@@ -471,7 +504,7 @@ async function finishWithResult(input) {
     const triage = input.input.repository.triage;
     if (!triage)
         throw new Error("triage configuration is required");
-    const plan = actionPlan({ result: input.result, triage });
+    const plan = input.plan ?? actionPlan({ result: input.result, triage });
     await runActionPrompt({
         context: input.context,
         input: input.input,
@@ -502,6 +535,12 @@ async function finishWithResult(input) {
                 repository: input.input.repository,
             });
         }
+        if (plan.clearLabels) {
+            const clearLabels = existingClearLabels(input.issue, triage.automation.clear);
+            if (clearLabels.length) {
+                await removeIssueLabels(input.input.exec, input.input.repository, input.issue.number, clearLabels, triage.account ?? "");
+            }
+        }
         if (plan.closeIssue) {
             const closedPrs = [];
             for (const pr of input.relationship.relatedPullRequests.filter((pr) => pr.state === "OPEN")) {
@@ -522,8 +561,18 @@ async function finishWithResult(input) {
             if (prUrl)
                 await writeJson(join(input.outputDir, "pr.json"), { url: prUrl });
         }
-        if (plan.clearLabels) {
-            await removeIssueLabels(input.input.exec, input.input.repository, input.issue.number, triage.automation.clear, triage.account ?? "");
+        if (input.previousMarker && prUrl) {
+            await persistProcessedMarker({
+                account: triage.account ?? "",
+                comments: input.relationship.comments,
+                exec: input.input.exec,
+                issue: input.issue,
+                marker: input.previousMarker,
+                outputDir: input.outputDir,
+                pr: pullRequestNumberFromUrl(prUrl),
+                processed: input.processed ?? input.previousMarker.processed,
+                repository: input.input.repository,
+            });
         }
     }
     const report = [
@@ -589,7 +638,7 @@ async function createImplementationPr(input) {
             client: input.input.client,
             model: creator.model,
             options: creator.options,
-            parse: parseEditOutput,
+            parse: parseTriageCreatePrOutput,
             permission: creator.permission,
             prompt,
             repairAttempts: 3,
@@ -650,6 +699,26 @@ export async function runTriage(input) {
     if (relationship.previousMarker) {
         if (!relationship.mentionReplies.length) {
             const result = finalResultFromMarker(relationship.previousMarker);
+            const plan = previousAutomationPlan({
+                issue,
+                marker: relationship.previousMarker,
+                relationship,
+                result,
+                triage,
+            });
+            if (plan) {
+                return finishWithResult({
+                    context,
+                    input,
+                    issue,
+                    outputDir,
+                    plan,
+                    previousMarker: relationship.previousMarker,
+                    processed,
+                    relationship,
+                    result,
+                });
+            }
             const report = `Magi triage skipped #${issue.number} because no eligible mention replies were found for reconsideration.`;
             await writeFile(join(outputDir, "report.md"), `${report}\n`);
             return { issue: issue.number, outputDir, report, result };
@@ -746,6 +815,10 @@ export async function runTriage(input) {
                         outputDir,
                         repository: input.repository,
                     });
+                    const clearLabels = existingClearLabels(issue, triage.automation.clear);
+                    if (clearLabels.length) {
+                        await removeIssueLabels(input.exec, input.repository, issue.number, clearLabels, triage.account);
+                    }
                     const closedPrs = [];
                     for (const pr of relationship.relatedPullRequests.filter((pr) => pr.state === "OPEN")) {
                         await closePullRequest(input.exec, input.repository, pr.number, triage.account);
@@ -754,7 +827,6 @@ export async function runTriage(input) {
                     if (closedPrs.length)
                         await writeJson(join(outputDir, "closed-prs.json"), closedPrs);
                     await closeIssue(input.exec, input.repository, issue.number, triage.account);
-                    await removeIssueLabels(input.exec, input.repository, issue.number, triage.automation.clear, triage.account);
                 }
                 const report = `Magi triage closed #${issue.number} because a related PR was merged.`;
                 await writeFile(join(outputDir, "report.md"), `${report}\n`);

package/dist/prompts/output.js

@@ -305,7 +305,7 @@ export function parseCiClassificationOutput(text) {
         }),
     };
 }
-export function parseEditOutput(text) {
+function parseEditOutputWithOptions(text, options) {
     const data = extractJson(text);
     if (!data || typeof data !== "object")
         throw new Error("edit output must be an object");
@@ -323,7 +323,7 @@ export function parseEditOutput(text) {
             commentId: requireNumber(value.commentId, `responses[${index}].commentId`),
         };
     });
-    if (!responses.length)
+    if (options.requireResponses && !responses.length)
         throw new Error("responses must not be empty");
     if (data.mode === "EDITED") {
         if (!filesTouched.length)
@@ -351,3 +351,9 @@ export function parseEditOutput(text) {
         responses,
     };
 }
+export function parseEditOutput(text) {
+    return parseEditOutputWithOptions(text, { requireResponses: true });
+}
+export function parseTriageCreatePrOutput(text) {
+    return parseEditOutputWithOptions(text, { requireResponses: false });
+}

package/package.json

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