opencode-magi 0.0.0-dev-20260722060754 → 0.0.0-dev-20260722111427

package/dist/graphql/index.generated.js

@@ -52,6 +52,14 @@ export const MergeQueueStatusDocument = gql `
       mergeQueueEntry {
         id
       }
+      timelineItems(last: 1, itemTypes: REMOVED_FROM_MERGE_QUEUE_EVENT) {
+        nodes {
+          ... on RemovedFromMergeQueueEvent {
+            createdAt
+            reason
+          }
+        }
+      }
     }
   }
 }

package/dist/tools/review/action.js

@@ -232,9 +232,10 @@ export async function automate() {
     if (action === "merge" && this.config.review.merge.queue) {
         const octokit = await this.magi.createOctokit(this.config, this.context.abort, account);
         const graphql = this.magi.createGraphql(octokit);
+        const enqueuedAt = new Date().toISOString();
         await graphql.enqueuePullRequest({ id: this.state.pr.metadata.node_id });
         await this.updateEvent(`Waiting for merge queue.`);
-        const result = await waitMergeQueue.call(this);
+        const result = await waitMergeQueue.call(this, enqueuedAt);
         if (result === "CONFLICT")
             return result;
     }
@@ -358,8 +359,10 @@ function getCheckTime(check) {
         return Number.isNaN(time) ? prev : Math.max(prev, time);
     }, 0);
 }
-async function waitMergeQueue(leftMergeQueue = false) {
+async function waitMergeQueue(enqueuedAt, leftMergeQueue = false, retries = 0) {
     this.context.abort.throwIfAborted();
+    if (!this.state.pr?.metadata)
+        throw new MagiError("blocked", "PR metadata not found.");
     const { repository } = await this.graphql.mergeQueueStatus({
         owner: this.config.github.owner,
         pr: this.number,
@@ -367,20 +370,33 @@ async function waitMergeQueue(leftMergeQueue = false) {
     });
     if (!repository?.pullRequest)
         throw new MagiError("blocked", "Could not fetch merge queue status.");
-    const { isInMergeQueue, mergeQueueEntry, state } = repository.pullRequest;
+    const { isInMergeQueue, mergeQueueEntry, state, timelineItems } = repository.pullRequest;
     if (state === "MERGED")
         return "MERGED";
     const nextLeftMergeQueue = state === "OPEN" && !isInMergeQueue && !mergeQueueEntry;
     if (leftMergeQueue && nextLeftMergeQueue) {
         if (await isConflict.call(this)) {
             await this.updateState({ pr: { automation: "CONFLICT" } });
-            await this.updateEvent(`Merge automation found conflicts.`);
+            await this.updateEvent("Merge automation found conflicts.");
             return "CONFLICT";
         }
+        const removedFromQueue = timelineItems.nodes?.at(-1);
+        if (removedFromQueue?.reason === "failed_checks" &&
+            Date.parse(removedFromQueue.createdAt) >= Date.parse(enqueuedAt)) {
+            if (retries >= this.config.review.checks.retryFailedJobs)
+                throw new MagiError("blocked", `PR left the merge queue after failed checks exceeded ${retries} retries.`);
+            const attempt = retries + 1;
+            const nextEnqueuedAt = new Date().toISOString();
+            await this.updateEvent(`Attempt ${attempt} failed to merge from the merge queue. Retrying...`);
+            await this.graphql.enqueuePullRequest({
+                id: this.state.pr.metadata.node_id,
+            });
+            return await waitMergeQueue.call(this, nextEnqueuedAt, false, attempt);
+        }
         throw new MagiError("blocked", `PR left the merge queue before merging.`);
     }
     await wait(30_000, this.context.abort);
-    return await waitMergeQueue.call(this, nextLeftMergeQueue);
+    return await waitMergeQueue.call(this, enqueuedAt, nextLeftMergeQueue, retries);
 }
 async function isConflict() {
     if (!this.state.worktree)

package/package.json

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