opencode-magi 0.0.0-dev-20260721055255 → 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/magi.js

@@ -217,27 +217,69 @@ export class Magi {
         }
     }
     async promptSession(sessionID, text, signal) {
-        const result = await this.input.client.session.prompt({
-            parts: [{ text, type: "text" }],
-            sessionID,
-        }, { signal });
-        if (result.error) {
-            if (!isUndefined(result.response) && result.response.statusText)
-                throw new Error(result.response.statusText);
-            else if (result.error instanceof Error)
-                throw new Error(result.error.message);
-            else
-                throw new Error(JSON.stringify(result.error));
+        const controller = new AbortController();
+        const events = await this.input.client.event.subscribe(undefined, {
+            signal: controller.signal,
+        });
+        try {
+            const result = await Promise.race([
+                this.input.client.session.prompt({
+                    parts: [{ text, type: "text" }],
+                    sessionID,
+                }, { signal }),
+                this.monitorSession(sessionID, events.stream),
+            ]);
+            if (result.error) {
+                if (!isUndefined(result.response) && result.response.statusText)
+                    throw new Error(result.response.statusText);
+                else if (result.error instanceof Error)
+                    throw new Error(result.error.message);
+                else
+                    throw new Error(JSON.stringify(result.error));
+            }
+            else {
+                const output = result.data.parts
+                    .filter((part) => part.type === "text")
+                    .map((part) => part.text)
+                    .join("\n");
+                if (!output)
+                    throw new Error("OpenCode session.prompt did not return text output.");
+                return output;
+            }
         }
-        else {
-            const output = result.data.parts
-                .filter((part) => part.type === "text")
-                .map((part) => part.text)
-                .join("\n");
-            if (!output)
-                throw new Error("OpenCode session.prompt did not return text output.");
-            return output;
+        catch (e) {
+            if (e instanceof MagiError)
+                await this.input.client.session.abort({ sessionID });
+            throw e;
+        }
+        finally {
+            controller.abort();
+        }
+    }
+    async monitorSession(sessionID, events) {
+        for await (const ev of events) {
+            if (ev.type === "permission.asked" &&
+                ev.properties.sessionID === sessionID) {
+                const { id, patterns, permission } = ev.properties;
+                const result = await this.input.client.permission.reply({
+                    reply: "reject",
+                    requestID: id,
+                });
+                if (result.error)
+                    throw new MagiError("blocked", "Could not reject permission request.");
+                throw new MagiError("blocked", `OpenCode session requested ${permission} permission for ${patterns.join(", ")}.`);
+            }
+            if (ev.type === "question.asked" &&
+                ev.properties.sessionID === sessionID) {
+                const result = await this.input.client.question.reject({
+                    requestID: ev.properties.id,
+                });
+                if (result.error)
+                    throw new MagiError("blocked", "Could not reject user question.");
+                throw new MagiError("blocked", "OpenCode session requested user input.");
+            }
         }
+        return new Promise(() => { });
     }
     async deleteSessions(state) {
         const sessionIds = this.getSessionIds(state);

package/dist/tools/merge/editor.js

@@ -43,7 +43,11 @@ export async function edit() {
         }
         return output;
     }, {
-        error: (_, count) => this.updateEvent(`Attempt ${count} failed to edit. Retrying...`),
+        error: async (e, count) => {
+            if (e instanceof MagiError)
+                throw e;
+            await this.updateEvent(`Attempt ${count} failed to edit. Retrying...`);
+        },
         retries: this.config.output.repairAttempts,
         signal: this.context.abort,
     });
@@ -134,7 +138,11 @@ export async function resolveConflict() {
             responses: [],
         };
     }, {
-        error: (_, count) => this.updateEvent(`Attempt ${count} failed to resolve conflicts. Retrying...`),
+        error: async (e, count) => {
+            if (e instanceof MagiError)
+                throw e;
+            await this.updateEvent(`Attempt ${count} failed to resolve conflicts. Retrying...`);
+        },
         retries: this.config.output.repairAttempts,
         signal: this.context.abort,
     });

package/dist/tools/review/action.js

@@ -86,7 +86,11 @@ export async function postReviews() {
                     throw new Error("Invalid output for operator.");
                 return parsed.comment;
             }, {
-                error: (_, count) => this.updateEvent(`Attempt ${count} failed to post comment by operator. Retrying...`),
+                error: async (e, count) => {
+                    if (e instanceof MagiError)
+                        throw e;
+                    await this.updateEvent(`Attempt ${count} failed to post comment by operator. Retrying...`);
+                },
                 retries: this.config.output.repairAttempts,
                 signal: this.context.abort,
             });
@@ -228,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;
     }
@@ -354,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,
@@ -363,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/dist/tools/review/check.js

@@ -113,7 +113,11 @@ export async function classifyChecks() {
                 throw new Error(`Invalid output for reviewer ${id}.`);
             return parsed;
         }, {
-            error: (_, count) => this.updateEvent(`Attempt ${count} failed to classify CI checks with reviewer ${id}. Retrying...`),
+            error: async (e, count) => {
+                if (e instanceof MagiError)
+                    throw e;
+                await this.updateEvent(`Attempt ${count} failed to classify CI checks with reviewer ${id}. Retrying...`);
+            },
             retries: this.config.output.repairAttempts,
             signal: this.context.abort,
         });

package/dist/tools/review/reviewer.js

@@ -125,7 +125,11 @@ export async function review() {
                 ]).join("\n\n"));
                 return parsed;
             }, {
-                error: (_, count) => this.updateEvent(`Attempt ${count} failed to ${label} with reviewer ${id}. Retrying...`),
+                error: async (e, count) => {
+                    if (e instanceof MagiError)
+                        throw e;
+                    await this.updateEvent(`Attempt ${count} failed to ${label} with reviewer ${id}. Retrying...`);
+                },
                 retries: this.config.output.repairAttempts,
                 signal: this.context.abort,
             });
@@ -208,7 +212,11 @@ export async function reconsiderClose() {
             validateInlineCommentTargets("initial", parsed, inlineCommentTargets);
             return parsed;
         }, {
-            error: (_, count) => this.updateEvent(`Attempt ${count} failed to reconsider close verdict with reviewer ${id}. Retrying...`),
+            error: async (e, count) => {
+                if (e instanceof MagiError)
+                    throw e;
+                await this.updateEvent(`Attempt ${count} failed to reconsider close verdict with reviewer ${id}. Retrying...`);
+            },
             retries: this.config.output.repairAttempts,
             signal: this.context.abort,
         });
@@ -287,7 +295,11 @@ async function collectAcceptedFindings(findings) {
                     throw new Error(`Missing finding vote: ${key}.`);
             return parsed;
         }, {
-            error: (_, count) => this.updateEvent(`Attempt ${count} failed to validate review findings with reviewer ${id}. Retrying...`),
+            error: async (e, count) => {
+                if (e instanceof MagiError)
+                    throw e;
+                await this.updateEvent(`Attempt ${count} failed to validate review findings with reviewer ${id}. Retrying...`);
+            },
             retries: this.config.output.repairAttempts,
             signal: this.context.abort,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-magi",
-  "version": "0.0.0-dev-20260721055255",
+  "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>",