opencode-magi 0.0.0-dev-20260522221334 → 0.0.0-dev-20260522222915

package/dist/github/commands.js

@@ -650,6 +650,17 @@ export async function waitForMergeQueue(exec, repository, pr, intervalMs = 30_00
         await new Promise((resolve) => setTimeout(resolve, intervalMs));
     }
 }
+export async function waitForAutoMerge(exec, repository, pr, intervalMs = 30_000) {
+    for (;;) {
+        const status = await fetchPullRequestMergeStatus(exec, repository, pr);
+        if (status.state === "MERGED")
+            return "merged";
+        if (status.state !== "OPEN" || status.autoMergeRequest == null) {
+            return "dequeued";
+        }
+        await new Promise((resolve) => setTimeout(resolve, intervalMs));
+    }
+}
 export async function closePullRequest(exec, repository, pr, account) {
     const token = await ghToken(exec, repository, account);
     return exec(`gh pr close ${pr} --repo ${shellQuote(repoSpecifier(repository))}`, ghTokenEnv(token));

package/dist/orchestrator/merge.js

@@ -1,7 +1,7 @@
 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, waitForAutoMerge, waitForMergeQueue, } from "../github/commands";
 import { composeEditPrompt, composeRereviewCloseReconsiderationPrompt, composeRereviewPrompt, } from "../prompts/compose";
 import { parseEditOutput, parseRereviewCloseReconsiderationOutput, parseRereviewOutput, } from "../prompts/output";
 import { throwIfAborted, withAbortSignal } from "./abort";
@@ -426,8 +426,11 @@ async function finishMergeRun(input, result, reportInput) {
 }
 async function mergeWithQueue(input, exec, editorAccount) {
     await mergePullRequest(exec, input.repository, input.pr, editorAccount);
-    if (!input.repository.merge.mergeQueue)
-        return "merged";
+    if (!input.repository.merge.mergeQueue) {
+        if (!input.repository.merge.auto)
+            return "merged";
+        return waitForAutoMerge(exec, input.repository, input.pr);
+    }
     return waitForMergeQueue(exec, input.repository, input.pr);
 }
 export function hasBlockingCiReports(reports) {

package/dist/orchestrator/review.js

@@ -1,10 +1,10 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 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 { composeFindingValidationPrompt, composeCloseReconsiderationPrompt, composeRereviewCloseReconsiderationPrompt, composeRereviewPrompt, composeReviewPrompt, } from "../prompts/compose";
 import { prRunOutputDir } from "../config/output";
 import { prRunWorktreeDir } from "../config/worktree";
-import { parseCloseReconsiderationOutput, parseFindingValidationOutput, parseRereviewOutput, parseReviewOutput, } from "../prompts/output";
+import { parseCloseReconsiderationOutput, parseFindingValidationOutput, parseRereviewCloseReconsiderationOutput, parseRereviewOutput, parseReviewOutput, } from "../prompts/output";
 import { throwIfAborted, withAbortSignal } from "./abort";
 import { waitForChecksWithClassification } from "./ci";
 import { parseRightSideDiffTargets, validateInlineCommentTargets, } from "./inline-comments";
@@ -413,27 +413,49 @@ async function runCloseReconsideration(input) {
         type: "phase",
     });
     return Promise.all(input.entries.map(async (entry) => {
-        if (!targets.includes(entry.key) || !isReviewOutput(entry.value)) {
+        if (!targets.includes(entry.key)) {
             return entry;
         }
         const reviewer = input.reviewInput.repository.agents.reviewers.find((item) => item.key === entry.key);
         if (!reviewer)
             return entry;
         const hasReviewerSession = Boolean(input.sessionIds[reviewer.key]);
-        const prompt = await composeCloseReconsiderationPrompt({
-            baseSha: input.meta.baseRefOid,
-            ciFailureContext: undefined,
-            closeReason: entry.value.reason,
-            directory: input.reviewInput.directory,
-            headSha: input.meta.headRefOid,
-            includeReviewGuidelines: !hasReviewerSession,
-            includeSessionContext: !hasReviewerSession,
-            pr: input.reviewInput.pr,
-            repository: input.reviewInput.repository,
-            reviewContext: input.reviewContext,
-            reviewer,
-            worktreePath: input.worktreePath,
-        });
+        const isReviewEntry = isReviewOutput(entry.value);
+        let prompt;
+        if (isReviewEntry) {
+            prompt = await composeCloseReconsiderationPrompt({
+                baseSha: input.meta.baseRefOid,
+                ciFailureContext: undefined,
+                closeReason: entry.value.reason,
+                directory: input.reviewInput.directory,
+                headSha: input.meta.headRefOid,
+                includeReviewGuidelines: !hasReviewerSession,
+                includeSessionContext: !hasReviewerSession,
+                pr: input.reviewInput.pr,
+                repository: input.reviewInput.repository,
+                reviewContext: input.reviewContext,
+                reviewer,
+                worktreePath: input.worktreePath,
+            });
+        }
+        else {
+            if (!entry.previousHeadSha) {
+                throw new Error(`Missing previous review commit for ${reviewer.account}`);
+            }
+            prompt = await composeRereviewCloseReconsiderationPrompt({
+                baseSha: input.meta.baseRefOid,
+                closeReason: entry.value.reason,
+                directory: input.reviewInput.directory,
+                headSha: input.meta.headRefOid,
+                includeReviewGuidelines: !hasReviewerSession,
+                includeSessionContext: !hasReviewerSession,
+                pr: input.reviewInput.pr,
+                previousHeadSha: entry.previousHeadSha,
+                repository: input.reviewInput.repository,
+                reviewer,
+                worktreePath: input.worktreePath,
+            });
+        }
         const result = await withReviewerFailureProgress({
             onProgress: input.reviewInput.onProgress,
             reviewer: reviewer.key,
@@ -466,14 +488,19 @@ async function runCloseReconsideration(input) {
                 options: reviewer.options,
                 parentSessionId: input.reviewInput.parentSessionId,
                 parse: (text) => {
-                    const output = parseCloseReconsiderationOutput(text);
-                    validateInlineCommentTargets(output.findings, entry.inlineCommentTargets);
+                    const output = isReviewEntry
+                        ? parseCloseReconsiderationOutput(text)
+                        : parseRereviewCloseReconsiderationOutput(text);
+                    const findings = "newFindings" in output ? output.newFindings : output.findings;
+                    validateInlineCommentTargets(findings, entry.inlineCommentTargets, "newFindings" in output ? "newFindings" : "findings");
                     return output;
                 },
                 permission: reviewer.permission,
                 prompt,
                 repairAttempts: input.reviewInput.config.output?.repairAttempts ?? 3,
-                schemaName: "close reconsideration",
+                schemaName: isReviewEntry
+                    ? "close reconsideration"
+                    : "rereview close reconsideration",
                 sessionId: input.sessionIds[reviewer.key],
                 signal: input.reviewInput.signal,
                 title: `magi reconsider close ${input.reviewInput.repository.alias}#${input.reviewInput.pr} ${reviewer.key}`,
@@ -498,6 +525,7 @@ async function runCloseReconsideration(input) {
         return {
             inlineCommentTargets: entry.inlineCommentTargets,
             key: entry.key,
+            previousHeadSha: entry.previousHeadSha,
             raw: result.raw,
             sessionId: result.sessionId,
             value: result.value,
@@ -780,6 +808,7 @@ export async function runReview(input) {
                 return {
                     inlineCommentTargets,
                     key: reviewer.key,
+                    previousHeadSha: previous.commit.oid,
                     raw: result.raw,
                     sessionId: result.sessionId,
                     value: result.value,

package/package.json

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