opencode-magi 0.0.0-dev-20260522141520 → 0.0.0-dev-20260522141851

package/dist/config/validate.js

@@ -136,7 +136,6 @@ const MERGE_PROMPT_KEYS = new Set([
     "editGuidelines",
 ]);
 const TRIAGE_PROMPT_KEYS = new Set([
-    "action",
     "acceptance",
     "category",
     "comment",

package/dist/orchestrator/model.js

@@ -97,15 +97,26 @@ export async function createModelSession(input) {
 }
 export async function promptModelText(input) {
     throwIfAborted(input.signal);
-    const result = await input.client.session.prompt({
-        body: {
-            model: modelBody(input.model),
-            parts: [{ type: "text", text: input.prompt }],
-        },
-        path: { id: input.sessionId },
-    });
-    throwIfAborted(input.signal);
-    return extractText(result, input.allowEmpty);
+    const abort = () => {
+        void input.client.session
+            .abort?.({ path: { id: input.sessionId } })
+            .catch(() => undefined);
+    };
+    input.signal?.addEventListener("abort", abort, { once: true });
+    try {
+        const result = await input.client.session.prompt({
+            body: {
+                model: modelBody(input.model),
+                parts: [{ type: "text", text: input.prompt }],
+            },
+            path: { id: input.sessionId },
+        });
+        throwIfAborted(input.signal);
+        return extractText(result, input.allowEmpty);
+    }
+    finally {
+        input.signal?.removeEventListener("abort", abort);
+    }
 }
 async function sendPrompt(client, sessionId, model, prompt, signal) {
     return promptModelText({ client, model, prompt, sessionId, signal });

package/dist/orchestrator/run-manager.js

@@ -676,53 +676,7 @@ export class MagiRunManager {
         state.status = "cancelled";
         state.phase = "cancelled";
         state.completedAt = now();
-        if (state.editor?.status === "pending" ||
-            state.editor?.status === "running" ||
-            state.editor?.status === "repairing") {
-            state.editor.status = "cancelled";
-        }
-        if (state.editor?.sessionId) {
-            await this.input.client.session
-                .abort?.({ path: { id: state.editor.sessionId } })
-                .catch(() => undefined);
-        }
-        if (state.triageCreator?.status === "pending" ||
-            state.triageCreator?.status === "running" ||
-            state.triageCreator?.status === "repairing" ||
-            state.triageCreator?.status === "blocked") {
-            state.triageCreator.status = "cancelled";
-        }
-        if (state.triageCreator?.sessionId) {
-            await this.input.client.session
-                .abort?.({ path: { id: state.triageCreator.sessionId } })
-                .catch(() => undefined);
-        }
-        for (const reviewer of Object.values(state.reviewers)) {
-            if (reviewer.status === "pending" ||
-                reviewer.status === "running" ||
-                reviewer.status === "repairing" ||
-                reviewer.status === "blocked") {
-                reviewer.status = "cancelled";
-            }
-            if (reviewer.sessionId) {
-                await this.input.client.session
-                    .abort?.({ path: { id: reviewer.sessionId } })
-                    .catch(() => undefined);
-            }
-        }
-        for (const classifier of Object.values(state.ciClassifiers ?? {})) {
-            if (classifier.status === "pending" ||
-                classifier.status === "running" ||
-                classifier.status === "repairing" ||
-                classifier.status === "blocked") {
-                classifier.status = "cancelled";
-            }
-            if (classifier.sessionId) {
-                await this.input.client.session
-                    .abort?.({ path: { id: classifier.sessionId } })
-                    .catch(() => undefined);
-            }
-        }
+        await this.finishActiveAgents(state, "cancelled");
         if (state.worktreePath) {
             await removeWorktree(this.input.exec, state.worktreePath).catch(() => undefined);
         }
@@ -1223,6 +1177,26 @@ export class MagiRunManager {
             ...Object.entries(state.reviewers),
         ];
     }
+    isActiveAgent(agent) {
+        return (agent.status === "pending" ||
+            agent.status === "running" ||
+            agent.status === "repairing" ||
+            agent.status === "blocked");
+    }
+    async finishActiveAgents(state, status, error) {
+        for (const [, agent] of this.agentEntries(state)) {
+            if (this.isActiveAgent(agent)) {
+                agent.status = status;
+                if (error != null)
+                    agent.error = error;
+            }
+            if (agent.sessionId) {
+                await this.input.client.session
+                    .abort?.({ path: { id: agent.sessionId } })
+                    .catch(() => undefined);
+            }
+        }
+    }
     selectPendingAgent(state, kind, key, requestId) {
         const entries = key
             ? this.agentState(state, key)
@@ -1966,46 +1940,7 @@ export class MagiRunManager {
         state.phase = "failed";
         state.completedAt = now();
         state.error = errorMessage(error);
-        if (state.editor?.status === "pending" ||
-            state.editor?.status === "running" ||
-            state.editor?.status === "repairing" ||
-            state.editor?.status === "blocked") {
-            state.editor.status = "failed";
-            state.editor.error = state.error;
-        }
-        if (state.editor?.sessionId) {
-            await this.input.client.session
-                .abort?.({ path: { id: state.editor.sessionId } })
-                .catch(() => undefined);
-        }
-        for (const reviewer of Object.values(state.reviewers)) {
-            if (reviewer.status === "pending" ||
-                reviewer.status === "running" ||
-                reviewer.status === "repairing" ||
-                reviewer.status === "blocked") {
-                reviewer.status = "failed";
-                reviewer.error = state.error;
-            }
-            if (reviewer.sessionId) {
-                await this.input.client.session
-                    .abort?.({ path: { id: reviewer.sessionId } })
-                    .catch(() => undefined);
-            }
-        }
-        for (const classifier of Object.values(state.ciClassifiers ?? {})) {
-            if (classifier.status === "pending" ||
-                classifier.status === "running" ||
-                classifier.status === "repairing" ||
-                classifier.status === "blocked") {
-                classifier.status = "failed";
-                classifier.error = state.error;
-            }
-            if (classifier.sessionId) {
-                await this.input.client.session
-                    .abort?.({ path: { id: classifier.sessionId } })
-                    .catch(() => undefined);
-            }
-        }
+        await this.finishActiveAgents(state, "failed", state.error);
         await this.persist(state);
         await this.notify(state, `Magi ${state.command} failed for ${runLabel(state)}: ${state.error}`, { reply: true });
         this.active.delete(runId);

package/dist/orchestrator/triage.js

@@ -3,8 +3,8 @@ import { dirname, join } from "node:path";
 import { issueRunOutputDir } from "../config/output";
 import { worktreeBaseDir } from "../config/worktree";
 import { assignIssue, closeIssue, closePullRequest, configureGitIdentity, createPullRequest, fetchIssue, fetchIssueComments, fetchRelatedPullRequests, postIssueComment, pushHead, removeIssueLabels, removeWorktree, searchDuplicateIssues, shellQuote, updateIssueComment, } from "../github/commands";
-import { composeTriageAcceptancePrompt, composeTriageActionPrompt, composeTriageCategoryPrompt, composeTriageCommentClassificationPrompt, composeTriageCreatePrPrompt, composeTriageDuplicatePrompt, composeTriageExistingPrPrompt, composeTriageReconsiderPrompt, } from "../prompts/compose";
-import { parseTriageActionOutput, parseTriageBinaryOutput, parseTriageCategoryOutput, parseTriageCommentClassificationOutput, parseTriageCreatePrOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, } from "../prompts/output";
+import { composeTriageAcceptancePrompt, composeTriageCategoryPrompt, composeTriageCommentClassificationPrompt, composeTriageCreatePrPrompt, composeTriageDuplicatePrompt, composeTriageExistingPrPrompt, composeTriageReconsiderPrompt, } from "../prompts/compose";
+import { parseTriageBinaryOutput, parseTriageCategoryOutput, parseTriageCommentClassificationOutput, parseTriageCreatePrOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, } from "../prompts/output";
 import { aggregateStringMajority, majorityThreshold } from "./majority";
 import { runModelWithRepair, } from "./model";
 const MARKER_PREFIX = "opencode-magi:triage";
@@ -456,42 +456,6 @@ function previousAutomationPlan(input) {
         postComment: false,
     };
 }
-async function runActionPrompt(input) {
-    const agent = input.input.repository.agents.triage?.[0];
-    if (!agent)
-        throw new Error("triage.agents is required");
-    const context = JSON.stringify({
-        allowedActions: input.plan.allowedActions,
-        deterministicPlan: input.plan,
-        result: input.result,
-        triageContext: input.context,
-    }, null, 2);
-    const prompt = await composeTriageActionPrompt({
-        context,
-        directory: input.input.directory,
-        issue: input.input.issue,
-        repository: input.input.repository,
-        reviewer: agent,
-    });
-    const result = await runModelWithRepair({
-        client: input.input.client,
-        model: agent.model,
-        options: agent.options,
-        parentSessionId: input.input.parentSessionId,
-        parse: parseTriageActionOutput,
-        permission: agent.permission,
-        prompt,
-        repairAttempts: 3,
-        schemaName: "triage action",
-        signal: input.input.signal,
-        title: `Magi triage action #${input.input.issue}`,
-    });
-    await writeJson(join(input.outputDir, "action.json"), {
-        model: result.value,
-        plan: input.plan,
-    });
-    return result.value;
-}
 async function classifyMentionReplies(input) {
     const agent = input.input.repository.agents.triage?.[0];
     if (!agent)
@@ -663,13 +627,6 @@ async function finishWithResult(input) {
         result: input.result,
         type: "decision",
     });
-    await runActionPrompt({
-        context: input.context,
-        input: input.input,
-        outputDir: input.outputDir,
-        plan,
-        result: input.result,
-    });
     let prUrl;
     const reporter = triageReporter(input.input.repository, input.issue.number);
     const comment = plan.postComment && input.result.disposition !== "ask"

package/dist/prompts/compose.js

@@ -1,7 +1,7 @@
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { isAbsolute, join } from "node:path";
-import { ciClassificationAfterEditOutputContract, ciClassificationOutputContract, closeReconsiderationOutputContract, editOutputContract, findingValidationOutputContract, rereviewCloseReconsiderationOutputContract, rereviewOutputContract, reviewOutputContract, triageActionOutputContract, triageCommentClassificationOutputContract, triageCreatePrOutputContract, triageDuplicateOutputContract, triageVoteOutputContract, } from "./contracts";
+import { ciClassificationAfterEditOutputContract, ciClassificationOutputContract, closeReconsiderationOutputContract, editOutputContract, findingValidationOutputContract, rereviewCloseReconsiderationOutputContract, rereviewOutputContract, reviewOutputContract, triageCommentClassificationOutputContract, triageCreatePrOutputContract, triageDuplicateOutputContract, triageVoteOutputContract, } from "./contracts";
 async function readOptionalPrompt(directory, path, values = {}) {
     if (!path)
         return "";
@@ -339,14 +339,6 @@ async function composeTriageVotePrompt(input) {
         .filter(Boolean)
         .join("\n\n");
 }
-export async function composeTriageActionPrompt(input) {
-    return composeTriageVotePrompt({
-        ...input,
-        builtin: "action",
-        customPath: input.repository.triage?.prompts.action,
-        outputContract: triageActionOutputContract,
-    });
-}
 export async function composeTriageCommentPrompt(input) {
     const values = triageValues(input);
     const task = await taskBlock({

package/dist/prompts/contracts.js

@@ -256,24 +256,6 @@ The object must match this shape:
   ]
 }
 </output_contract>`.trim();
-export const triageActionOutputContract = `
-<output_contract>
-Return exactly one JSON object and nothing else. Do not wrap it in markdown.
-
-The object must match this shape:
-{
-  "action": "ASK" | "COMMENT" | "CLOSE" | "PR" | "CLEAR_ONLY",
-  "reason": "Short rationale."
-}
-
-Rules:
-- Choose only an action listed as allowed in the task context.
-- ASK means post an author-mentioned question and do not close, create a PR, or clear labels.
-- COMMENT means post a decision comment only.
-- CLOSE means post a decision comment and close the issue.
-- PR means post a decision comment and create an implementation PR.
-- CLEAR_ONLY means clear labels without posting a comment.
-</output_contract>`.trim();
 const outputContractsBySchemaName = {
     "CI classification": ciClassificationOutputContract,
     "close reconsideration": closeReconsiderationOutputContract,
@@ -282,7 +264,6 @@ const outputContractsBySchemaName = {
     rereview: rereviewOutputContract,
     "rereview close reconsideration": rereviewCloseReconsiderationOutputContract,
     review: reviewOutputContract,
-    "triage action": triageActionOutputContract,
     "triage acceptance": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
     "triage category": triageVoteOutputContract('"ASK" or one of the configured category IDs'),
     "triage create PR": triageCreatePrOutputContract,

package/dist/prompts/output.js

@@ -154,21 +154,6 @@ export function parseTriageCommentClassificationOutput(text) {
         }),
     };
 }
-export function parseTriageActionOutput(text) {
-    const data = extractJson(text);
-    if (!data || typeof data !== "object")
-        throw new Error("triage action output must be an object");
-    return {
-        action: requireOneOf(data.action, "action", [
-            "ASK",
-            "CLEAR_ONLY",
-            "CLOSE",
-            "COMMENT",
-            "PR",
-        ]),
-        reason: requireString(data.reason, "reason"),
-    };
-}
 export function parseReviewOutput(text) {
     const data = extractJson(text);
     if (!data || typeof data !== "object")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-magi",
-  "version": "0.0.0-dev-20260522141520",
+  "version": "0.0.0-dev-20260522141851",
   "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,7 +229,6 @@
         "duplicate": { "type": "string" },
         "category": { "type": "string" },
         "acceptance": { "type": "string" },
-        "action": { "type": "string" },
         "question": { "type": "string" },
         "comment": { "type": "string" },
         "commentClassification": { "type": "string" },

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

@@ -1,5 +0,0 @@
-Decide the next action for issue #{issue} in {owner}/{repo} from the provided triage result and allowed actions.
-
-<context>
-{context}
-</context>