opencode-magi 0.0.0-dev-20260522143303 → 0.0.0-dev-20260522144424

package/dist/github/commands.js

@@ -20,6 +20,68 @@ function errorText(error) {
         .filter((item) => typeof item === "string")
         .join("\n");
 }
+async function localCommitExists(exec, worktreePath, sha) {
+    try {
+        await exec(`git cat-file -e ${shellQuote(`${sha}^{commit}`)}`, {
+            cwd: worktreePath,
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function pullRequestCommitSource(input) {
+    if (input.source === "base") {
+        return {
+            owner: input.repository.github.owner,
+            refName: input.meta.baseRefName,
+            repo: input.repository.github.repo,
+        };
+    }
+    return {
+        owner: input.meta.headRepositoryOwner?.login ?? input.repository.github.owner,
+        refName: input.meta.headRefName,
+        repo: input.meta.headRepository?.name ?? input.repository.github.repo,
+    };
+}
+async function fetchPullRequestCommitSource(input) {
+    const commitSource = pullRequestCommitSource(input);
+    try {
+        await input.exec(`git fetch --no-tags ${shellQuote(repositoryGitUrl(input.repository, commitSource.owner, commitSource.repo))} ${shellQuote(`refs/heads/${commitSource.refName}`)}`, { cwd: input.worktreePath });
+    }
+    catch (error) {
+        throw new Error(`Could not fetch ${input.source} ref ${commitSource.refName} for #${input.meta.number}: ${errorText(error)}`);
+    }
+}
+export async function ensurePullRequestCommits(input) {
+    const missing = [];
+    for (const commit of input.commits) {
+        if (!(await localCommitExists(input.exec, input.worktreePath, commit.sha))) {
+            missing.push(commit);
+        }
+    }
+    for (const source of new Set(missing.map((commit) => commit.source))) {
+        await fetchPullRequestCommitSource({
+            exec: input.exec,
+            meta: input.meta,
+            repository: input.repository,
+            source,
+            worktreePath: input.worktreePath,
+        });
+    }
+    for (const commit of missing) {
+        if (await localCommitExists(input.exec, input.worktreePath, commit.sha)) {
+            continue;
+        }
+        const source = pullRequestCommitSource({
+            meta: input.meta,
+            repository: input.repository,
+            source: commit.source,
+        });
+        throw new Error(`${commit.label} commit ${commit.sha} is unavailable after fetching ${commit.source} ref ${source.refName}`);
+    }
+}
 function isCheckoutConfigLockError(error) {
     const text = errorText(error);
     return (/could not lock config file/i.test(text) ||

package/dist/orchestrator/merge.js

@@ -1,17 +1,17 @@
 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, shellQuote, waitForMergeQueue, } from "../github/commands";
+import { closePullRequest, configureGitIdentity, fetchMergeQueueRequirement, fetchPullRequest, fetchUnresolvedThreads, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, pushHead, removeWorktree, resolveThread, 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 { validateInlineCommentTargets, } from "./inline-comments";
 import { closeMinorityReviewers, mergeVerdictForPolicy } from "./majority";
 import { runModelWithRepair } from "./model";
 import { mapPool } from "./pool";
 import { formatMergeReport } from "./report";
-import { runReview } from "./review";
+import { inlineCommentTargetsForDiff, runReview, } from "./review";
 import { checkSafetyGate, hasSafetyGate } from "./safety";
 function outputDir(input) {
     return prRunOutputDir({
@@ -196,7 +196,21 @@ async function runRereview(input, worktreePath, previousHeadSha, cycle, sessionI
     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 inlineCommentTargets = await inlineCommentTargetsForDiff({
+        ensure: options.dryRunHeadSha
+            ? undefined
+            : {
+                fromSource: "base",
+                meta,
+                repository: input.repository,
+                toSource: "head",
+            },
+        exec: input.exec,
+        fromSha: meta.baseRefOid,
+        range: "direct",
+        toSha: headSha,
+        worktreePath,
+    });
     const artifactDir = outputDir(input);
     let entries = await mapPool(input.repository.agents.reviewers, input.repository.concurrency.reviewers, async (reviewer) => {
         throwIfAborted(input.signal);

package/dist/orchestrator/review.js

@@ -1,6 +1,6 @@
 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, shellQuote, } from "../github/commands";
+import { createWorktree, fetchPullRequest, fetchPullRequestCommits, fetchPullRequestReviews, fetchUnresolvedThreads, closePullRequest, mergePullRequest, ensurePullRequestCommits, postApproval, postChangesRequested, postCloseComment, postReply, removeWorktree, resolveThread, shellQuote, } from "../github/commands";
 import { composeFindingValidationPrompt, composeCloseReconsiderationPrompt, composeRereviewPrompt, composeReviewPrompt, } from "../prompts/compose";
 import { prRunOutputDir } from "../config/output";
 import { prRunWorktreeDir } from "../config/worktree";
@@ -136,7 +136,32 @@ function parseRereviewOutputWithInlineTargets(text, targets) {
     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 }));
+    if (input.ensure) {
+        await ensurePullRequestCommits({
+            commits: [
+                {
+                    label: "base",
+                    sha: input.fromSha,
+                    source: input.ensure.fromSource,
+                },
+                {
+                    label: "head",
+                    sha: input.toSha,
+                    source: input.ensure.toSource,
+                },
+            ],
+            exec: input.exec,
+            meta: input.ensure.meta,
+            repository: input.ensure.repository,
+            worktreePath: input.worktreePath,
+        });
+    }
+    const diffRange = input.range === "direct"
+        ? `${shellQuote(input.fromSha)} ${shellQuote(input.toSha)}`
+        : `${shellQuote(input.fromSha)}...${shellQuote(input.toSha)}`;
+    return parseRightSideDiffTargets(await input.exec(`git diff --no-ext-diff --unified=3 ${diffRange}`, {
+        cwd: input.worktreePath,
+    }));
 }
 function parsePostedFindingLocation(location) {
     const range = /^(.*):(\d+)-(\d+)$/.exec(location);
@@ -645,6 +670,12 @@ export async function runReview(input) {
             return [{ assignment, reviewer }];
         });
         const initialInlineCommentTargets = await inlineCommentTargetsForDiff({
+            ensure: {
+                fromSource: "base",
+                meta,
+                repository: input.repository,
+                toSource: "head",
+            },
             exec,
             fromSha: meta.baseRefOid,
             toSha: meta.headRefOid,
@@ -670,6 +701,12 @@ export async function runReview(input) {
                 if (!previous.commit?.oid)
                     throw new Error(`Missing previous review commit for ${reviewer.account}`);
                 const inlineCommentTargets = await inlineCommentTargetsForDiff({
+                    ensure: {
+                        fromSource: "head",
+                        meta,
+                        repository: input.repository,
+                        toSource: "head",
+                    },
                     exec,
                     fromSha: previous.commit.oid,
                     toSha: meta.headRefOid,

package/dist/orchestrator/run-manager.js

@@ -403,6 +403,7 @@ function extractQuestionRequest(properties) {
 export class MagiRunManager {
     input;
     active = new Map();
+    activePrRuns = 0;
     activeTriageRuns = 0;
     countedToolParts = new Map();
     controllers = new Map();
@@ -411,6 +412,7 @@ export class MagiRunManager {
     runPaths = new Map();
     outputDirs = new Set();
     sessionToRun = new Map();
+    prQueue = [];
     triageQueue = [];
     constructor(input) {
         this.input = input;
@@ -462,9 +464,12 @@ export class MagiRunManager {
         });
         if (input.sync)
             return this.executeSync(state, controller, execute, input.timeoutMs);
-        void execute().catch(async (error) => {
-            await this.failRun(runId, error);
+        this.prQueue.push({
+            execute,
+            repository: input.repository,
+            runId,
         });
+        this.drainPrQueue();
         return state;
     }
     async startMerge(input) {
@@ -523,9 +528,12 @@ export class MagiRunManager {
         });
         if (input.sync)
             return this.executeSync(state, controller, execute, input.timeoutMs);
-        void execute().catch(async (error) => {
-            await this.failRun(runId, error);
+        this.prQueue.push({
+            execute,
+            repository: input.repository,
+            runId,
         });
+        this.drainPrQueue();
         return state;
     }
     async startTriage(input) {
@@ -591,6 +599,29 @@ export class MagiRunManager {
         this.drainTriageQueue();
         return state;
     }
+    drainPrQueue() {
+        while (this.prQueue.length) {
+            const next = this.prQueue[0];
+            if (!next)
+                return;
+            if (this.activePrRuns >= next.repository.concurrency.runs)
+                return;
+            this.prQueue.shift();
+            const state = this.active.get(next.runId);
+            if (!state || state.status === "cancelled")
+                continue;
+            this.activePrRuns += 1;
+            void next
+                .execute()
+                .catch(async (error) => {
+                await this.failRun(next.runId, error);
+            })
+                .finally(() => {
+                this.activePrRuns -= 1;
+                this.drainPrQueue();
+            });
+        }
+    }
     drainTriageQueue() {
         while (this.triageQueue.length) {
             const next = this.triageQueue[0];

package/package.json

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