opencode-magi 0.0.0-dev-20260630073228 → 0.0.0-dev-20260630073732

package/dist/tools/review/action.js

@@ -1,6 +1,6 @@
 import { MagiError } from "@/magi";
 import { Prompt } from "@/prompts";
-import { command, filterEmpty, isArray, isObject, isString, loop, marker, omitNullish, quote, retry, Worker, } from "@/utils";
+import { command, filterEmpty, isArray, isObject, isString, loop, marker, omitNullish, quote, retry, wait, Worker, } from "@/utils";
 const events = {
     APPROVED: "APPROVE",
     CHANGES_REQUESTED: "REQUEST_CHANGES",
@@ -247,29 +247,7 @@ export async function automate() {
         this.state = await this.magi.updateState(this.state.output, {
             text: `Waiting for merge queue for ${this.getLink()}.`,
         });
-        const result = await loop(async () => {
-            this.context.abort.throwIfAborted();
-            const { repository } = await this.graphql.mergeQueueStatus({
-                owner: this.config.github.owner,
-                pr: this.number,
-                repo: this.config.github.repo,
-            });
-            if (!repository?.pullRequest)
-                throw new MagiError("blocked", "Could not fetch merge queue status.");
-            const { isInMergeQueue, mergeQueueEntry, state } = repository.pullRequest;
-            if (state === "MERGED")
-                return "MERGED";
-            if (state === "OPEN" && !isInMergeQueue && !mergeQueueEntry) {
-                if (await isConflict.call(this)) {
-                    this.state = await this.magi.updateState(this.state.output, {
-                        pr: { automation: "CONFLICT" },
-                        text: `Merge automation found conflicts for ${this.getLink()}.`,
-                    });
-                    return "CONFLICT";
-                }
-                throw new MagiError("blocked", `PR left the merge queue before merging ${this.getLink()}.`);
-            }
-        }, 30_000);
+        const result = await waitMergeQueue.call(this);
         if (result === "CONFLICT")
             return result;
     }
@@ -405,6 +383,32 @@ function getCheckTime(check) {
         return Number.isNaN(time) ? prev : Math.max(prev, time);
     }, 0);
 }
+async function waitMergeQueue(leftMergeQueue = false) {
+    this.context.abort.throwIfAborted();
+    const { repository } = await this.graphql.mergeQueueStatus({
+        owner: this.config.github.owner,
+        pr: this.number,
+        repo: this.config.github.repo,
+    });
+    if (!repository?.pullRequest)
+        throw new MagiError("blocked", "Could not fetch merge queue status.");
+    const { isInMergeQueue, mergeQueueEntry, state } = repository.pullRequest;
+    if (state === "MERGED")
+        return "MERGED";
+    const nextLeftMergeQueue = state === "OPEN" && !isInMergeQueue && !mergeQueueEntry;
+    if (leftMergeQueue && nextLeftMergeQueue) {
+        if (await isConflict.call(this)) {
+            this.state = await this.magi.updateState(this.state.output, {
+                pr: { automation: "CONFLICT" },
+                text: `Merge automation found conflicts for ${this.getLink()}.`,
+            });
+            return "CONFLICT";
+        }
+        throw new MagiError("blocked", `PR left the merge queue before merging ${this.getLink()}.`);
+    }
+    await wait(30_000);
+    return await waitMergeQueue.call(this, nextLeftMergeQueue);
+}
 async function isConflict() {
     if (!this.state.worktree)
         return false;

package/package.json

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