opencode-magi 0.0.0-dev-20260520190626 → 0.0.0-dev-20260520193633

package/dist/config/resolve.js

@@ -184,6 +184,8 @@ export function resolveRepository(config) {
                 clear: config.triage?.automation?.clear ?? ["triage"],
                 close: config.triage?.automation?.close ?? false,
                 create: config.triage?.automation?.create ?? false,
+                merge: config.triage?.automation?.merge ?? false,
+                review: config.triage?.automation?.review ?? false,
             },
             categories: resolveTriageCategories(config),
             concurrency: {

package/dist/config/validate.js

@@ -99,7 +99,13 @@ const AUTOMATION_KEYS = new Set(["close", "merge"]);
 const CLEAR_KEYS = new Set(["branch", "output", "session", "worktree"]);
 const CONCURRENCY_KEYS = new Set(["reviewers", "runs"]);
 const OUTPUT_KEYS = new Set(["repairAttempts"]);
-const TRIAGE_AUTOMATION_KEYS = new Set(["clear", "close", "create"]);
+const TRIAGE_AUTOMATION_KEYS = new Set([
+    "clear",
+    "close",
+    "create",
+    "merge",
+    "review",
+]);
 const TRIAGE_CATEGORY_KEYS = new Set(["description", "id", "labels", "types"]);
 const TRIAGE_CONCURRENCY_KEYS = new Set(["runs"]);
 const TRIAGE_SAFETY_KEYS = new Set([
@@ -634,7 +640,15 @@ function validateTriage(config, errors, options) {
     validateKnownKeys(automation, "triage.automation", TRIAGE_AUTOMATION_KEYS, errors);
     validateBoolean(automation?.close, "triage.automation.close", errors);
     validateBoolean(automation?.create, "triage.automation.create", errors);
+    validateBoolean(automation?.merge, "triage.automation.merge", errors);
+    validateBoolean(automation?.review, "triage.automation.review", errors);
     validateStringArray(automation?.clear, "triage.automation.clear", errors);
+    if (automation?.review && !automation.create) {
+        errors.push("triage.automation.review requires triage.automation.create to be true");
+    }
+    if (automation?.merge && !automation.create) {
+        errors.push("triage.automation.merge requires triage.automation.create to be true");
+    }
     validateKnownKeys(concurrency, "triage.concurrency", TRIAGE_CONCURRENCY_KEYS, errors);
     if (concurrency?.runs != null &&
         (typeof concurrency.runs !== "number" ||

package/dist/index.js

@@ -170,11 +170,17 @@ export function parseIssueRunArguments(value, dryRun = false) {
             case "--no-create":
                 setConfigOverride(configOverrides, ["triage", "automation", "create"], token === "--create");
                 break;
-            case "--run-concurrency":
-                setConfigOverride(configOverrides, ["triage", "concurrency", "runs"], parseIntegerFlag(nextFlagValue(tokens, ++index, token), token, 1));
+            case "--review":
+            case "--no-review":
+                setConfigOverride(configOverrides, ["triage", "automation", "review"], token === "--review");
                 break;
             case "--merge":
             case "--no-merge":
+                setConfigOverride(configOverrides, ["triage", "automation", "merge"], token === "--merge");
+                break;
+            case "--run-concurrency":
+                setConfigOverride(configOverrides, ["triage", "concurrency", "runs"], parseIntegerFlag(nextFlagValue(tokens, ++index, token), token, 1));
+                break;
             case "--max-cycles":
             case "--retry-failed-jobs":
             case "--reviewer-concurrency":
@@ -507,7 +513,9 @@ export const MagiPlugin = async ({ client, directory }) => {
                         directory,
                         exec: retryingExec,
                         modelCatalog: await modelCatalog(),
-                        requireReview: false,
+                        requireEditor: config.triage?.automation?.merge === true,
+                        requireReview: config.triage?.automation?.review === true ||
+                            config.triage?.automation?.merge === true,
                         requireTriage: true,
                     });
                     if (!validation.ok)

package/dist/orchestrator/run-manager.js

@@ -89,6 +89,13 @@ function prUrl(repository, pr) {
     const host = repository.github.host || "github.com";
     return `https://${host}/${repository.github.owner}/${repository.github.repo}/pull/${pr}`;
 }
+function pullRequestNumberFromUrl(url) {
+    const match = url.match(/(?:^|\/)pull\/(\d+)(?:[/?#].*)?$/);
+    if (!match)
+        return undefined;
+    const pr = Number.parseInt(match[1], 10);
+    return Number.isInteger(pr) && pr > 0 ? pr : undefined;
+}
 function issueUrl(repository, issue) {
     const host = repository.github.host || "github.com";
     return `https://${host}/${repository.github.owner}/${repository.github.repo}/issues/${issue}`;
@@ -1335,6 +1342,30 @@ export class MagiRunManager {
             "",
             result.report,
         ].join("\n"), { reply: true });
+        const followUpPr = result.prUrl
+            ? pullRequestNumberFromUrl(result.prUrl)
+            : undefined;
+        const triageAutomation = input.repository.triage?.automation;
+        if (followUpPr != null && triageAutomation?.merge) {
+            await this.startMerge({
+                config: input.config,
+                dryRun: input.dryRun,
+                parentSessionId: input.parentSessionId,
+                pr: followUpPr,
+                repository: input.repository,
+                signal: input.signal,
+            });
+        }
+        else if (followUpPr != null && triageAutomation?.review) {
+            await this.startReview({
+                config: input.config,
+                dryRun: input.dryRun,
+                parentSessionId: input.parentSessionId,
+                pr: followUpPr,
+                repository: input.repository,
+                signal: input.signal,
+            });
+        }
         this.active.delete(input.runId);
         this.controllers.delete(input.runId);
     }

package/dist/orchestrator/triage.js

@@ -704,6 +704,7 @@ async function finishWithResult(input) {
     return {
         issue: input.issue.number,
         outputDir: input.outputDir,
+        prUrl,
         report,
         result: input.result,
     };

package/package.json

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

package/schema.json

@@ -225,6 +225,8 @@
       "properties": {
         "close": { "type": "boolean", "default": false },
         "create": { "type": "boolean", "default": false },
+        "review": { "type": "boolean", "default": false },
+        "merge": { "type": "boolean", "default": false },
         "clear": {
           "type": "array",
           "items": { "type": "string" },