opencode-magi 0.0.0-dev-20260522110001 → 0.0.0-dev-20260522141748

package/dist/index.js

@@ -96,6 +96,7 @@ export function parseRunArguments(value, dryRun = false, command = "review") {
     const configOverrides = {};
     const prTokens = [];
     let sync = false;
+    let timeoutMs;
     for (let index = 0; index < tokens.length; index++) {
         const token = tokens[index];
         if (token === "--dry-run") {
@@ -110,6 +111,11 @@ export function parseRunArguments(value, dryRun = false, command = "review") {
             case "--language":
                 setConfigOverride(configOverrides, ["language"], nextFlagValue(tokens, ++index, token));
                 break;
+            case "--timeout":
+                timeoutMs =
+                    parseIntegerFlag(nextFlagValue(tokens, ++index, token), token, 0) *
+                        1_000;
+                break;
             case "--merge":
             case "--no-merge":
                 setConfigOverride(configOverrides, [command, "automation", "merge"], token === "--merge");
@@ -151,13 +157,20 @@ export function parseRunArguments(value, dryRun = false, command = "review") {
                 prTokens.push(token);
         }
     }
-    return { configOverrides, dryRun, prs: parsePrs(prTokens.join(" ")), sync };
+    return {
+        configOverrides,
+        dryRun,
+        prs: parsePrs(prTokens.join(" ")),
+        sync,
+        timeoutMs,
+    };
 }
 export function parseIssueRunArguments(value, dryRun = false) {
     const tokens = value.split(/[\s,]+/).filter(Boolean);
     const configOverrides = {};
     const issueTokens = [];
     let sync = false;
+    let timeoutMs;
     for (let index = 0; index < tokens.length; index++) {
         const token = tokens[index];
         if (token === "--dry-run") {
@@ -172,6 +185,11 @@ export function parseIssueRunArguments(value, dryRun = false) {
             case "--language":
                 setConfigOverride(configOverrides, ["language"], nextFlagValue(tokens, ++index, token));
                 break;
+            case "--timeout":
+                timeoutMs =
+                    parseIntegerFlag(nextFlagValue(tokens, ++index, token), token, 0) *
+                        1_000;
+                break;
             case "--close":
             case "--no-close":
                 setConfigOverride(configOverrides, ["triage", "automation", "close"], token === "--close");
@@ -210,6 +228,7 @@ export function parseIssueRunArguments(value, dryRun = false) {
         dryRun,
         issues: parseIssues(issueTokens.join(" ")),
         sync,
+        timeoutMs,
     };
 }
 function nextFlagValue(tokens, index, flag) {
@@ -461,7 +480,6 @@ export const MagiPlugin = async ({ client, directory }) => {
                     prs: tool.schema.string(),
                     dryRun: tool.schema.boolean().optional(),
                     sync: tool.schema.boolean().optional(),
-                    timeoutSeconds: tool.schema.number().optional(),
                 },
                 async execute(args, context) {
                     const parsed = parseRunArguments(args.prs, args.dryRun ?? false, "merge");
@@ -487,9 +505,7 @@ export const MagiPlugin = async ({ client, directory }) => {
                         parentSessionId: context.sessionID,
                         signal: context.abort,
                         sync,
-                        timeoutMs: args.timeoutSeconds == null
-                            ? undefined
-                            : args.timeoutSeconds * 1_000,
+                        timeoutMs: parsed.timeoutMs,
                     }), { signal: context.abort });
                     if (sync)
                         return syncResult(runManager, states);
@@ -507,7 +523,6 @@ export const MagiPlugin = async ({ client, directory }) => {
                     prs: tool.schema.string(),
                     dryRun: tool.schema.boolean().optional(),
                     sync: tool.schema.boolean().optional(),
-                    timeoutSeconds: tool.schema.number().optional(),
                 },
                 async execute(args, context) {
                     const parsed = parseRunArguments(args.prs, args.dryRun ?? false);
@@ -532,9 +547,7 @@ export const MagiPlugin = async ({ client, directory }) => {
                         parentSessionId: context.sessionID,
                         signal: context.abort,
                         sync,
-                        timeoutMs: args.timeoutSeconds == null
-                            ? undefined
-                            : args.timeoutSeconds * 1_000,
+                        timeoutMs: parsed.timeoutMs,
                     }), { signal: context.abort });
                     if (sync)
                         return syncResult(runManager, states);
@@ -549,7 +562,6 @@ export const MagiPlugin = async ({ client, directory }) => {
                     issues: tool.schema.string(),
                     dryRun: tool.schema.boolean().optional(),
                     sync: tool.schema.boolean().optional(),
-                    timeoutSeconds: tool.schema.number().optional(),
                 },
                 async execute(args, context) {
                     const parsed = parseIssueRunArguments(args.issues, args.dryRun ?? false);
@@ -580,9 +592,7 @@ export const MagiPlugin = async ({ client, directory }) => {
                         repository,
                         signal: context.abort,
                         sync,
-                        timeoutMs: args.timeoutSeconds == null
-                            ? undefined
-                            : args.timeoutSeconds * 1_000,
+                        timeoutMs: parsed.timeoutMs,
                     }), { signal: context.abort });
                     if (sync)
                         return syncResult(runManager, states);

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/package.json

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