opencode-magi 0.0.0-dev-20260522221258 → 0.0.0-dev-20260522221722

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";
@@ -53,7 +53,7 @@ async function withReviewerFailureProgress(input) {
 async function runEditor(input, worktreePath, cycle, reviewFindings, unresolvedThreads) {
     const editor = input.repository.agents.editor;
     if (!editor)
-        throw new Error("agents.editor is required for magi_merge");
+        throw new Error("merge.editor is required for magi_merge");
     throwIfAborted(input.signal);
     await configureGitIdentity(input.exec, worktreePath, {
         email: editor.author?.email,
@@ -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) {
@@ -587,7 +590,7 @@ export async function runMerge(input) {
     const abortableInput = { ...input, exec };
     const editor = input.repository.agents.editor;
     if (!editor)
-        throw new Error("agents.editor is required for magi_merge");
+        throw new Error("merge.editor is required for magi_merge");
     throwIfAborted(input.signal);
     const artifactDir = outputDir(input);
     await mkdir(artifactDir, { recursive: true });

package/package.json

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