opencode-magi 0.6.0 → 0.6.1

package/dist/config/validate.js

@@ -138,13 +138,11 @@ const MERGE_PROMPT_KEYS = new Set([
 const TRIAGE_PROMPT_KEYS = new Set([
     "acceptance",
     "category",
-    "comment",
     "commentClassification",
     "create",
     "createGuidelines",
     "duplicate",
     "existingPr",
-    "question",
     "reconsider",
 ]);
 function githubHost(config) {

package/dist/github/commands.js

@@ -20,6 +20,20 @@ function errorText(error) {
         .filter((item) => typeof item === "string")
         .join("\n");
 }
+function isIssueTypeUnavailableText(text) {
+    return (/cannot query field ["']?issueType["']? on type ["']?Issue["']?/i.test(text) ||
+        /field ["']?issueType["']?.*(does not exist|doesn't exist|is not defined|not found).*type ["']?Issue["']?/i.test(text) ||
+        /undefinedField.*issueType/i.test(text) ||
+        /issueType.*unsupported field|unsupported field.*issueType/i.test(text));
+}
+function isIssueTypeUnavailableError(error) {
+    return isIssueTypeUnavailableText(errorText(error));
+}
+function isIssueTypeUnavailableGraphqlResponse(data) {
+    return (data.errors?.some((error) => isIssueTypeUnavailableText([error.message, error.type]
+        .filter((item) => typeof item === "string")
+        .join("\n"))) ?? false);
+}
 async function localCommitExists(exec, worktreePath, sha) {
     try {
         await exec(`git cat-file -e ${shellQuote(`${sha}^{commit}`)}`, {
@@ -184,26 +198,34 @@ export async function fetchPullRequestClosingIssues(exec, repository, pr) {
 }
 export async function fetchIssue(exec, repository, issue) {
     const query = `query($owner: String!, $repo: String!, $issue: Int!) { repository(owner: $owner, name: $repo) { issue(number: $issue) { number title body url state author { login } labels(first: 100) { nodes { name } } issueType { name } } } }`;
+    let raw;
     try {
-        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 issue=${issue}`);
-        const data = JSON.parse(raw);
-        const graphqlIssue = data.data?.repository?.issue;
-        if (!graphqlIssue)
-            throw new Error(`Could not fetch issue #${issue}`);
-        return {
-            author: graphqlIssue.author?.login ?? "",
-            body: graphqlIssue.body ?? "",
-            labels: graphqlIssue.labels?.nodes?.map((label) => label.name) ?? [],
-            number: graphqlIssue.number,
-            state: graphqlIssue.state,
-            title: graphqlIssue.title,
-            type: graphqlIssue.issueType?.name,
-            url: graphqlIssue.url,
-        };
+        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 issue=${issue}`);
     }
-    catch {
-        return fetchIssueWithCli(exec, repository, issue);
+    catch (error) {
+        if (isIssueTypeUnavailableError(error)) {
+            return fetchIssueWithCli(exec, repository, issue);
+        }
+        throw error;
+    }
+    const data = JSON.parse(raw);
+    const graphqlIssue = data.data?.repository?.issue;
+    if (!graphqlIssue) {
+        if (isIssueTypeUnavailableGraphqlResponse(data)) {
+            return fetchIssueWithCli(exec, repository, issue);
+        }
+        throw new Error(`Could not fetch issue #${issue}`);
     }
+    return {
+        author: graphqlIssue.author?.login ?? "",
+        body: graphqlIssue.body ?? "",
+        labels: graphqlIssue.labels?.nodes?.map((label) => label.name) ?? [],
+        number: graphqlIssue.number,
+        state: graphqlIssue.state,
+        title: graphqlIssue.title,
+        type: graphqlIssue.issueType?.name,
+        url: graphqlIssue.url,
+    };
 }
 async function fetchIssueWithCli(exec, repository, issue) {
     const raw = await exec(`gh issue view ${issue} --repo ${shellQuote(repoSpecifier(repository))} --json number,title,body,url,state,author,labels`);
@@ -458,8 +480,9 @@ export async function fetchPullRequestSafetyMeta(exec, repository, pr) {
     }
     return { author, changedFiles, files, labels };
 }
-export async function watchChecks(exec, repository, pr) {
-    await exec(`gh pr checks ${pr} --repo ${shellQuote(repoSpecifier(repository))} --watch`);
+export async function watchChecks(exec, repository, pr, options = {}) {
+    const requiredFlag = options.requiredOnly ? " --required" : "";
+    await exec(`gh pr checks ${pr} --repo ${shellQuote(repoSpecifier(repository))} --watch${requiredFlag}`);
 }
 export function isCancelledCheck(check) {
     return check.bucket === "cancel" || check.state === "CANCELLED";
@@ -469,8 +492,9 @@ export function isFailedCheck(check) {
 }
 export async function fetchPullRequestChecks(exec, repository, pr, options = {}) {
     let raw;
+    const requiredFlag = options.requiredOnly ? " --required" : "";
     try {
-        raw = await exec(`gh pr checks ${pr} --repo ${shellQuote(repoSpecifier(repository))} --json name,state,bucket,link,workflow`);
+        raw = await exec(`gh pr checks ${pr} --repo ${shellQuote(repoSpecifier(repository))} --json name,state,bucket,link,workflow${requiredFlag}`);
     }
     catch (error) {
         if (options.tolerateMissingChecks &&

package/dist/orchestrator/ci.js

@@ -229,7 +229,7 @@ async function watchRerunRuns(exec, repository, checks) {
     await Promise.all(runIds.map((runId) => watchRun(exec, repository, runId)));
 }
 async function checksForHead(input) {
-    const checks = await fetchPullRequestChecks(input.exec, input.repository, input.pr, { tolerateMissingChecks: Boolean(input.headSha) });
+    const checks = await fetchPullRequestChecks(input.exec, input.repository, input.pr, { requiredOnly: true, tolerateMissingChecks: Boolean(input.headSha) });
     const targetChecks = [];
     let hasAnyActionCheck = false;
     let hasTargetActionCheck = false;
@@ -254,7 +254,6 @@ async function checksForHead(input) {
     return {
         blocking: targetChecks.filter((check) => isFailedCheck(check) || isCancelledCheck(check)),
         hasAnyActionCheck,
-        hasAnyCheck: checks.length > 0,
         hasPending: targetChecks.some(isPendingCheck),
         hasTargetActionCheck,
     };
@@ -463,15 +462,17 @@ export async function waitForChecksWithClassification(input) {
         await input.onProgress?.("waiting for CI checks");
         for (let attempt = 0;; attempt += 1) {
             try {
-                await watchChecks(input.exec, input.repository, input.pr);
+                await watchChecks(input.exec, input.repository, input.pr, {
+                    requiredOnly: true,
+                });
             }
             catch {
                 // gh exits non-zero for pending checks too; re-read check state below.
             }
             const target = await readTargetChecks();
             const waitingForTargetHead = Boolean(input.headSha) &&
-                (!target.hasAnyCheck ||
-                    (target.hasAnyActionCheck && !target.hasTargetActionCheck));
+                target.hasAnyActionCheck &&
+                !target.hasTargetActionCheck;
             if (!waitingForTargetHead && !target.hasPending) {
                 await assignBlockingChecks(target.blocking);
                 break;
@@ -552,8 +553,11 @@ export async function waitForChecksWithClassification(input) {
         try {
             await input.onProgress?.("waiting for rerun CI checks");
             await watchRerunRuns(input.exec, input.repository, rerunnable);
-            if (input.wait)
-                await watchChecks(input.exec, input.repository, input.pr);
+            if (input.wait) {
+                await watchChecks(input.exec, input.repository, input.pr, {
+                    requiredOnly: true,
+                });
+            }
         }
         catch {
             // Re-read the PR checks below so stale failed checks are not trusted.

package/dist/orchestrator/triage.js

@@ -156,7 +156,7 @@ async function runVote(input) {
             parse: input.parse,
             permission: input.agent.permission,
             prompt,
-            repairAttempts: 3,
+            repairAttempts: input.run.config.output?.repairAttempts ?? 3,
             schemaName: input.schemaName,
             signal: input.signal,
             title: `Magi triage ${input.schemaName} #${input.issue} (${input.agent.key})`,
@@ -484,7 +484,7 @@ async function classifyMentionReplies(input) {
         parse: parseTriageCommentClassificationOutput,
         permission: agent.permission,
         prompt,
-        repairAttempts: 3,
+        repairAttempts: input.input.config.output?.repairAttempts ?? 3,
         schemaName: "triage comment classification",
         signal: input.input.signal,
         title: `Magi triage comment classification #${input.input.issue} (${agent.key})`,
@@ -823,7 +823,7 @@ async function createImplementationPr(input) {
                 parse: parseTriageCreatePrOutput,
                 permission: creator.permission,
                 prompt,
-                repairAttempts: 3,
+                repairAttempts: input.input.config.output?.repairAttempts ?? 3,
                 schemaName: "triage create PR",
                 signal: input.input.signal,
                 title: `Magi triage create PR #${input.issue.number}`,

package/dist/prompts/compose.js

@@ -339,38 +339,6 @@ async function composeTriageVotePrompt(input) {
         .filter(Boolean)
         .join("\n\n");
 }
-export async function composeTriageCommentPrompt(input) {
-    const values = triageValues(input);
-    const task = await taskBlock({
-        builtin: "triage/comment",
-        customPath: input.repository.triage?.prompts.comment,
-        directory: input.directory,
-        values,
-    });
-    return [
-        task,
-        languageBlock(input.repository.language),
-        `<context>\n${input.context}\n</context>`,
-    ]
-        .filter(Boolean)
-        .join("\n\n");
-}
-export async function composeTriageQuestionPrompt(input) {
-    const values = triageValues(input);
-    const task = await taskBlock({
-        builtin: "triage/question",
-        customPath: input.repository.triage?.prompts.question,
-        directory: input.directory,
-        values,
-    });
-    return [
-        task,
-        languageBlock(input.repository.language),
-        `<context>\n${input.context}\n</context>`,
-    ]
-        .filter(Boolean)
-        .join("\n\n");
-}
 export async function composeTriageCreatePrPrompt(input) {
     const values = triageValues(input);
     const task = await taskBlock({

package/dist/prompts/templates/triage/existing-pr.md

@@ -1,6 +1,6 @@
 Decide whether an existing related pull request already handles issue #{issue} in {owner}/{repo}.
 
-Use only the provided context. Return HANDLE only when the PR clearly addresses the issue.
+Use only the provided context. Return RELATED_PR_HANDLES_ISSUE only when the PR clearly addresses the issue. Otherwise return RELATED_PR_DOES_NOT_HANDLE_ISSUE.
 
 <context>
 {context}

package/package.json

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

package/schema.json

@@ -229,8 +229,6 @@
         "duplicate": { "type": "string" },
         "category": { "type": "string" },
         "acceptance": { "type": "string" },
-        "question": { "type": "string" },
-        "comment": { "type": "string" },
         "commentClassification": { "type": "string" },
         "reconsider": { "type": "string" },
         "create": { "type": "string" },

package/dist/prompts/templates/triage/comment.md

@@ -1,5 +0,0 @@
-Compose one concise final triage comment for issue #{issue} in {owner}/{repo}. Mention @{author}. Do not include markdown fences.
-
-<context>
-{context}
-</context>

package/dist/prompts/templates/triage/question.md

@@ -1,5 +0,0 @@
-Compose concrete, actionable questions for issue #{issue} in {owner}/{repo}. Mention @{author}. Do not include markdown fences.
-
-<context>
-{context}
-</context>