opencode-magi 0.0.0-dev-20260722234348 → 0.0.0-dev-20260723005332

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, wait, Worker, } from "@/utils";
+import { command, filterEmpty, ignoreError, isArray, isObject, isString, loop, marker, omitNullish, quote, retry, wait, Worker, } from "@/utils";
 const events = {
     APPROVED: "APPROVE",
     CHANGES_REQUESTED: "REQUEST_CHANGES",
@@ -233,7 +233,10 @@ export async function automate() {
         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 ignoreError(() => graphql.enqueuePullRequest({ id: this.state.pr.metadata.node_id }), (e) => {
+            const message = e instanceof Error ? e.message : String(e);
+            return /pull request is already in the queue/i.test(message);
+        });
         await this.updateEvent(`Waiting for merge queue.`);
         const result = await waitMergeQueue.call(this, enqueuedAt);
         if (result === "CONFLICT")
@@ -388,8 +391,11 @@ async function waitMergeQueue(enqueuedAt, leftMergeQueue = false, retries = 0) {
             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({
+            await ignoreError(() => this.graphql.enqueuePullRequest({
                 id: this.state.pr.metadata.node_id,
+            }), (e) => {
+                const message = e instanceof Error ? e.message : String(e);
+                return /pull request is already in the queue/i.test(message);
             });
             return await waitMergeQueue.call(this, nextEnqueuedAt, false, attempt);
         }

package/dist/utils/function.js

@@ -12,6 +12,15 @@ export function wait(ms = 0, signal) {
         signal?.addEventListener("abort", abort, { once: true });
     });
 }
+export async function ignoreError(cb, shouldIgnore) {
+    try {
+        return await cb();
+    }
+    catch (e) {
+        if (!shouldIgnore(e))
+            throw e;
+    }
+}
 export async function loop(cb, ms = 0) {
     for (;;) {
         const value = await cb();

package/package.json

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