opencode-magi 0.0.0-dev-20260519084318 → 0.0.0-dev-20260519091916

package/dist/github/commands.js

@@ -83,6 +83,16 @@ export async function ghToken(exec, repository, account) {
 function ghTokenEnv(token) {
     return { env: { GH_TOKEN: token } };
 }
+async function fetchPullRequestQueueInput(exec, repository, pr, token) {
+    const query = `query($owner: String!, $repo: String!, $pr: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $pr) { id headRefOid } } }`;
+    const raw = await exec(`gh api${ghHostOption(repository)} graphql -f query=${shellQuote(query)} -F owner=${shellQuote(repository.github.owner)} -F repo=${shellQuote(repository.github.repo)} -F pr=${pr}`, ghTokenEnv(token));
+    const data = JSON.parse(raw);
+    const pullRequest = data.data?.repository?.pullRequest;
+    if (!pullRequest?.id || !pullRequest.headRefOid) {
+        throw new Error(`Could not fetch pull request queue metadata for #${pr}`);
+    }
+    return { headRefOid: pullRequest.headRefOid, id: pullRequest.id };
+}
 export async function fetchPullRequest(exec, repository, pr) {
     const json = await exec(`gh pr view ${pr} --repo ${shellQuote(repoSpecifier(repository))} --json number,title,url,isDraft,baseRefOid,headRefOid,baseRefName,headRefName,headRepository,headRepositoryOwner`);
     return JSON.parse(json);
@@ -296,6 +306,11 @@ export async function postChangesRequested(exec, repository, pr, account, findin
 }
 export async function mergePullRequest(exec, repository, pr, account) {
     const token = await ghToken(exec, repository, account);
+    if (repository.merge.mergeQueue) {
+        const queueInput = await fetchPullRequestQueueInput(exec, repository, pr, token);
+        const query = `mutation($pullRequestId: ID!, $expectedHeadOid: GitObjectID!) { enqueuePullRequest(input: { pullRequestId: $pullRequestId, expectedHeadOid: $expectedHeadOid }) { mergeQueueEntry { id } } }`;
+        return exec(`gh api${ghHostOption(repository)} graphql -f query=${shellQuote(query)} -F pullRequestId=${shellQuote(queueInput.id)} -F expectedHeadOid=${shellQuote(queueInput.headRefOid)} --jq .data.enqueuePullRequest.mergeQueueEntry.id`, ghTokenEnv(token));
+    }
     const methodFlag = repository.merge.method === "merge"
         ? "--merge"
         : repository.merge.method === "rebase"
@@ -303,21 +318,29 @@ export async function mergePullRequest(exec, repository, pr, account) {
             : "--squash";
     const autoFlag = repository.merge.auto ? " --auto" : "";
     const deleteFlag = repository.merge.deleteBranch ? " --delete-branch" : "";
-    const mergeFlags = repository.merge.mergeQueue
-        ? ""
-        : ` ${methodFlag}${autoFlag}${deleteFlag}`;
-    return exec(`gh pr merge ${pr} --repo ${shellQuote(repoSpecifier(repository))}${mergeFlags}`, ghTokenEnv(token));
+    return exec(`gh pr merge ${pr} --repo ${shellQuote(repoSpecifier(repository))} ${methodFlag}${autoFlag}${deleteFlag}`, ghTokenEnv(token));
 }
 export async function fetchPullRequestMergeStatus(exec, repository, pr) {
     const json = await exec(`gh pr view ${pr} --repo ${shellQuote(repoSpecifier(repository))} --json state,mergeStateStatus,autoMergeRequest`);
     return JSON.parse(json);
 }
+export async function fetchPullRequestQueueStatus(exec, repository, pr) {
+    const query = `query($owner: String!, $repo: String!, $pr: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $pr) { state isInMergeQueue mergeQueueEntry { id } } } }`;
+    const raw = await exec(`gh api${ghHostOption(repository)} graphql -f query=${shellQuote(query)} -F owner=${shellQuote(repository.github.owner)} -F repo=${shellQuote(repository.github.repo)} -F pr=${pr}`);
+    const data = JSON.parse(raw);
+    const status = data.data?.repository?.pullRequest;
+    if (!status)
+        throw new Error(`Could not fetch merge queue status for #${pr}`);
+    return status;
+}
 export async function waitForMergeQueue(exec, repository, pr, intervalMs = 30_000) {
     for (;;) {
-        const status = await fetchPullRequestMergeStatus(exec, repository, pr);
+        const status = await fetchPullRequestQueueStatus(exec, repository, pr);
         if (status.state === "MERGED")
             return "merged";
-        if (status.state === "OPEN" && status.autoMergeRequest == null) {
+        if (status.state === "OPEN" &&
+            !status.isInMergeQueue &&
+            status.mergeQueueEntry == null) {
             return "dequeued";
         }
         await new Promise((resolve) => setTimeout(resolve, intervalMs));

package/dist/index.js

@@ -16,6 +16,7 @@ import { MagiRunManager } from "./orchestrator/run-manager";
 const execAsync = promisify(nodeExec);
 const GLOBAL_CONFIG_PATH = join(homedir(), ".config", "opencode", "magi.json");
 const PROJECT_CONFIG_PATH = join(".opencode", "magi.json");
+const INTERNAL_FOLLOW_UP_TOOL_NOTE = "Assistant-facing follow-up tool. Use it yourself when needed; do not suggest this tool name to users.";
 function createExec(defaultCwd) {
     return async (command, options) => {
         const { stdout } = await execAsync(command, {
@@ -266,7 +267,10 @@ export const MagiPlugin = async ({ client, directory }) => {
         },
         tool: {
             magi_merge: tool({
-                description: "Start background Magi merge runs for one or more GitHub pull requests with configured Magi agents.",
+                description: [
+                    "Start background Magi merge runs for one or more GitHub pull requests with configured Magi agents.",
+                    "After starting, monitor progress yourself when useful; do not tell users to call follow-up tools by name.",
+                ].join(" "),
                 args: {
                     prs: tool.schema.string(),
                     dryRun: tool.schema.boolean().optional(),
@@ -299,7 +303,10 @@ export const MagiPlugin = async ({ client, directory }) => {
                 },
             }),
             magi_review: tool({
-                description: "Start background Magi review runs for one or more GitHub pull requests and post the reviews.",
+                description: [
+                    "Start background Magi review runs for one or more GitHub pull requests and post the reviews.",
+                    "After starting, monitor progress yourself when useful; do not tell users to call follow-up tools by name.",
+                ].join(" "),
                 args: {
                     prs: tool.schema.string(),
                     dryRun: tool.schema.boolean().optional(),
@@ -331,7 +338,10 @@ export const MagiPlugin = async ({ client, directory }) => {
                 },
             }),
             magi_status: tool({
-                description: "Show Magi background run status. Optionally filter by runId or PR and wait for completion.",
+                description: [
+                    "Show Magi background run status. Optionally filter by runId or PR and wait for completion.",
+                    INTERNAL_FOLLOW_UP_TOOL_NOTE,
+                ].join(" "),
                 args: {
                     runId: tool.schema.string().optional(),
                     pr: tool.schema.string().optional(),
@@ -355,7 +365,10 @@ export const MagiPlugin = async ({ client, directory }) => {
                 },
             }),
             magi_output: tool({
-                description: "Show artifacts and details for a Magi background run by runId or PR, optionally for a single reviewer.",
+                description: [
+                    "Show artifacts and details for a Magi background run by runId or PR, optionally for a single reviewer.",
+                    INTERNAL_FOLLOW_UP_TOOL_NOTE,
+                ].join(" "),
                 args: {
                     runId: tool.schema.string().optional(),
                     pr: tool.schema.string().optional(),

package/package.json

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