opencode-magi 0.1.0 → 0.2.0

package/dist/orchestrator/review.js

@@ -1,8 +1,9 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { createWorktree, fetchPullRequest, fetchPullRequestCommits, fetchPullRequestReviews, fetchUnresolvedThreads, postApproval, postChangesRequested, postCloseComment, postReply, removeWorktree, resolveThread, } from "../github/commands";
+import { createWorktree, fetchPullRequest, fetchPullRequestCommits, fetchPullRequestReviews, fetchUnresolvedThreads, closePullRequest, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, removeWorktree, resolveThread, } from "../github/commands";
 import { composeFindingValidationPrompt, composeCloseReconsiderationPrompt, composeRereviewPrompt, composeReviewPrompt, } from "../prompts/compose";
 import { prRunOutputDir } from "../config/output";
+import { worktreeBaseDir } from "../config/worktree";
 import { parseCloseReconsiderationOutput, parseFindingValidationOutput, parseRereviewOutput, parseReviewOutput, } from "../prompts/output";
 import { throwIfAborted, withAbortSignal } from "./abort";
 import { waitForChecksWithClassification } from "./ci";
@@ -111,6 +112,9 @@ function reviewStateToVerdict(state) {
         return "CHANGES_REQUESTED";
     return "CLOSE";
 }
+function hasBlockingCiReports(reports) {
+    return reports.some((report) => report.scopeInside.length || report.scopeOutsideUnresolved.length);
+}
 function previousReviewText(review) {
     return JSON.stringify({
         body: review.body ?? "",
@@ -497,7 +501,7 @@ export async function runReview(input) {
             checkResult.report.scopeInside.length)) {
         await input.onProgress?.({ report: checkResult.report, type: "ci_report" });
     }
-    const worktreeRoot = join(input.directory, input.config.worktree?.dir ?? ".magi/worktrees");
+    const worktreeRoot = worktreeBaseDir(input.directory, input.config, "pr");
     await input.onProgress?.({ phase: "creating worktree", type: "phase" });
     const worktree = await createWorktree(exec, input.repository, input.pr, worktreeRoot);
     const worktreePath = worktree.path;
@@ -752,6 +756,30 @@ export async function runReview(input) {
                         : await postReviewOutput({ ...input, exec }, key, output),
             ]))),
         };
+        const automationAccount = input.repository.agents.reviewers[0]?.account;
+        const enableReviewAutomation = input.enableReviewAutomation ?? true;
+        if (enableReviewAutomation &&
+            verdict === "MERGE" &&
+            input.repository.reviewAutomation?.merge) {
+            await input.onProgress?.({ phase: "merging PR", type: "phase" });
+            posted.automation = hasBlockingCiReports(ciReports)
+                ? "skipped: unresolved CI"
+                : input.dryRun
+                    ? "dry-run:would-merge"
+                    : automationAccount
+                        ? await mergePullRequest(input.exec, input.repository, input.pr, automationAccount)
+                        : "skipped: no review automation account";
+        }
+        if (enableReviewAutomation &&
+            verdict === "CLOSE" &&
+            input.repository.reviewAutomation?.close) {
+            await input.onProgress?.({ phase: "closing PR", type: "phase" });
+            posted.automation = input.dryRun
+                ? "dry-run:would-close"
+                : automationAccount
+                    ? await closePullRequest(input.exec, input.repository, input.pr, automationAccount)
+                    : "skipped: no review automation account";
+        }
         await writeFile(join(outputDir, "majority.json"), JSON.stringify({
             approvalPolicy: input.approvalPolicy ?? "majority",
             verdict,

package/dist/orchestrator/run-manager.js

@@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto";
 import { mkdir, readFile, readdir, rm, rmdir, writeFile, } from "node:fs/promises";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { outputBaseDirs, prRunOutputDir } from "../config/output";
+import { worktreeBaseDirs } from "../config/worktree";
 import { removeBranch, removeWorktree, } from "../github/commands";
 import { withGitHubApiRetry } from "../github/retry";
 import { runMerge, } from "./merge";
@@ -582,9 +583,7 @@ export class MagiRunManager {
             worktree: configured.worktree ?? DEFAULT_CLEAR_OPTIONS.worktree,
         };
         const states = await this.filteredStates(input);
-        const cleanupDirs = new Set([
-            join(this.input.directory, ".magi", "worktrees"),
-        ]);
+        const cleanupDirs = new Set(this.absoluteWorktreeDirs(input));
         const cleanupTrees = new Set(this.emptyOutputCleanupRoots(input));
         const summary = {
             branchDeleted: 0,
@@ -1566,6 +1565,14 @@ export class MagiRunManager {
     absoluteOutputDir(dir) {
         return isAbsolute(dir) ? dir : join(this.input.directory, dir);
     }
+    absoluteWorktreeDirs(input) {
+        const worktreeDirs = Array.isArray(input.worktreeDir)
+            ? input.worktreeDir
+            : input.worktreeDir
+                ? [input.worktreeDir]
+                : worktreeBaseDirs(this.input.directory);
+        return worktreeDirs.map((dir) => isAbsolute(dir) ? dir : join(this.input.directory, dir));
+    }
     emptyOutputCleanupRoots(input) {
         const outputDirs = Array.isArray(input.outputDir)
             ? input.outputDir

package/dist/prompts/compose.js

@@ -34,7 +34,7 @@ function repositoryValues(repository) {
     };
 }
 function reviewValues(input) {
-    const ciFailureContext = input.ciFailureContext?.trim() ?? input.ciFailureLogs?.trim() ?? "";
+    const ciFailureContext = input.ciFailureContext?.trim() ?? "";
     return {
         ...repositoryValues(input.repository),
         baseSha: input.baseSha,
@@ -42,10 +42,6 @@ function reviewValues(input) {
         ciFailureContextBlock: ciFailureContext
             ? `<ci_failure_context>\n${ciFailureContext}\n</ci_failure_context>`
             : "",
-        ciFailureLogs: ciFailureContext,
-        ciFailureLogsBlock: ciFailureContext
-            ? `<ci_failure_context>\n${ciFailureContext}\n</ci_failure_context>`
-            : "",
         headSha: input.headSha,
         jsonEncodedWorktreePath: JSON.stringify(input.worktreePath),
         pr: String(input.pr),
@@ -104,7 +100,7 @@ async function sessionContextBlocks(input) {
 export async function composeReviewPrompt(input) {
     const values = reviewValues(input);
     const task = await taskBlock({
-        builtin: "review",
+        builtin: "review/review",
         customPath: input.repository.prompts.review,
         directory: input.directory,
         values,
@@ -126,7 +122,7 @@ export async function composeReviewPrompt(input) {
 export async function composeRereviewPrompt(input) {
     const values = rereviewValues(input);
     const task = await taskBlock({
-        builtin: "rereview",
+        builtin: "review/rereview",
         customPath: input.repository.prompts.rereview,
         directory: input.directory,
         values,
@@ -154,7 +150,7 @@ export async function composeRereviewPrompt(input) {
 export async function composeEditPrompt(input) {
     const values = editValues(input);
     const task = await taskBlock({
-        builtin: "edit",
+        builtin: "merge/edit",
         customPath: input.repository.prompts.edit,
         directory: input.directory,
         values,
@@ -177,7 +173,7 @@ export async function composeEditPrompt(input) {
 export async function composeFindingValidationPrompt(input) {
     const values = { ...reviewValues(input), findings: input.findings };
     const task = await taskBlock({
-        builtin: "finding-validation",
+        builtin: "review/finding-validation",
         customPath: input.repository.prompts.findingValidation,
         directory: input.directory,
         values,
@@ -203,7 +199,7 @@ export async function composeCloseReconsiderationPrompt(input) {
         closeReason: input.closeReason ?? "",
     };
     const task = await taskBlock({
-        builtin: "close-reconsideration",
+        builtin: "review/close-reconsideration",
         customPath: input.repository.prompts.closeReconsideration,
         directory: input.directory,
         values,
@@ -230,8 +226,8 @@ export async function composeRereviewCloseReconsiderationPrompt(input) {
         previousHeadSha: input.previousHeadSha,
     };
     const task = await taskBlock({
-        builtin: "rereview-close-reconsideration",
-        customPath: input.repository.prompts.rereviewCloseReconsideration,
+        builtin: "review/close-reconsideration",
+        customPath: input.repository.prompts.closeReconsideration,
         directory: input.directory,
         values,
     });
@@ -257,7 +253,7 @@ export async function composeCiClassificationPrompt(input) {
         pr: String(input.pr),
     };
     const task = await taskBlock({
-        builtin: "ci-classification",
+        builtin: "review/ci-classification",
         customPath: input.repository.prompts.ciClassification,
         directory: input.directory,
         values,
@@ -282,7 +278,7 @@ export async function composeCiClassificationAfterEditPrompt(input) {
         worktreePath: input.worktreePath,
     };
     const task = await taskBlock({
-        builtin: "ci-classification-after-edit",
+        builtin: "merge/ci-classification",
         customPath: input.repository.prompts.ciClassificationAfterEdit ??
             input.repository.prompts.ciClassification,
         directory: input.directory,

package/dist/prompts/templates/{close-reconsideration.md → review/close-reconsideration.md}

@@ -1,6 +1,5 @@
 You requested CLOSE for pull request #{pr} in {owner}/{repo}, but the other reviewers did not.
-Reconsider your decision and choose MERGE or CHANGES_REQUESTED instead.
-Use the existing review session context.
+Reconsider your decision using the existing session context and choose MERGE or CHANGES_REQUESTED instead.
 Original close reason:
 {closeReason}
 Do not edit files or perform write operations.

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "opencode-magi",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Multi-agent PR review and merge orchestration plugin for OpenCode.",
   "license": "MIT",
   "author": "Hirotomo Yamada <hirotomo.yamada@avap.co.jp>",
   "repository": {
     "type": "git",
-    "url": "https://github.com/hirotomoyamada/opencode-magi"
+    "url": "https://github.com/magi-ai/opencode-magi"
   },
   "bugs": {
-    "url": "https://github.com/hirotomoyamada/opencode-magi/issues"
+    "url": "https://github.com/magi-ai/opencode-magi/issues"
   },
   "keywords": [
     "opencode",
@@ -27,24 +27,8 @@
     "dist",
     "schema.json"
   ],
-  "packageManager": "pnpm@10.33.0",
-  "scripts": {
-    "prebuild": "node scripts/copy-data.ts",
-    "build": "tsgo -p tsconfig.build.json",
-    "clean": "rimraf node_modules dist coverage",
-    "format:check": "oxfmt --check .",
-    "format:write": "oxfmt --write .",
-    "lint:check": "oxlint . --max-warnings=0",
-    "lint:fix": "oxlint . --max-warnings=0 --fix",
-    "prepare": "git rev-parse --is-inside-work-tree >/dev/null 2>&1 && lefthook install || true",
-    "quality": "pnpm format:check && pnpm lint:check && pnpm typecheck && pnpm test",
-    "test": "vitest run",
-    "typecheck": "tsgo --noEmit",
-    "release": "changeset publish",
-    "release:version": "changeset version"
-  },
   "dependencies": {
-    "@opencode-ai/plugin": "latest",
+    "@opencode-ai/plugin": "^1.15.5",
     "ajv": "^8.20.0",
     "picomatch": "^4.0.4",
     "valibot": "^1.4.0"
@@ -54,16 +38,30 @@
     "@changesets/cli": "^2.30.0",
     "@commitlint/cli": "^21.0.1",
     "@commitlint/config-conventional": "^21.0.1",
-    "@types/node": "^25.7.0",
+    "@types/node": "^25.9.0",
     "@types/picomatch": "^4.0.3",
-    "@typescript/native-preview": "7.0.0-dev.20260513.1",
+    "@typescript/native-preview": "7.0.0-dev.20260518.1",
     "eslint-plugin-perfectionist": "^5.9.0",
     "eslint-plugin-unused-imports": "^4.4.1",
     "lefthook": "^2.1.6",
-    "oxfmt": "^0.49.0",
-    "oxlint": "^1.64.0",
-    "oxlint-tsgolint": "^0.22.1",
+    "oxfmt": "^0.50.0",
+    "oxlint": "^1.65.0",
+    "oxlint-tsgolint": "^0.23.0",
     "rimraf": "^6.1.3",
     "vitest": "^4.1.5"
+  },
+  "scripts": {
+    "prebuild": "node scripts/copy-data.ts",
+    "build": "tsgo -p tsconfig.build.json",
+    "clean": "rimraf node_modules dist coverage",
+    "format:check": "oxfmt --check .",
+    "format:write": "oxfmt --write .",
+    "lint:check": "oxlint . --max-warnings=0",
+    "lint:fix": "oxlint . --max-warnings=0 --fix",
+    "quality": "pnpm format:check && pnpm lint:check && pnpm typecheck && pnpm test",
+    "test": "vitest run",
+    "typecheck": "tsgo --noEmit",
+    "release": "changeset publish",
+    "release:dev": "changeset version --snapshot dev && changeset publish --tag dev"
   }
-}
+}

package/schema.json

@@ -5,13 +5,11 @@
   "additionalProperties": false,
   "properties": {
     "$schema": { "type": "string" },
-    "agents": { "$ref": "#/$defs/agents" },
-    "automation": {
+    "agents": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "merge": { "type": "boolean", "default": true },
-        "close": { "type": "boolean", "default": true }
+        "permissions": { "$ref": "#/$defs/permissions" }
       }
     },
     "clear": {
@@ -24,24 +22,6 @@
         "branch": { "type": "boolean", "default": true }
       }
     },
-    "checks": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "exclude": { "type": "array", "items": { "type": "string" } },
-        "waitAfterEdit": { "type": "boolean" },
-        "waitBeforeReview": { "type": "boolean" },
-        "retryFailedJobs": { "type": "integer", "minimum": 0, "default": 3 }
-      }
-    },
-    "concurrency": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "runs": { "type": "integer", "minimum": 1, "default": 3 },
-        "reviewers": { "type": "integer", "minimum": 1, "default": 3 }
-      }
-    },
     "github": {
       "type": "object",
       "required": ["owner", "repo"],
@@ -59,58 +39,15 @@
       }
     },
     "language": { "type": "string" },
-    "merge": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "approvalPolicy": {
-          "enum": ["majority", "unanimous"],
-          "default": "majority"
-        },
-        "method": { "enum": ["merge", "squash", "rebase"] },
-        "auto": { "type": "boolean" },
-        "deleteBranch": { "type": "boolean" },
-        "mergeQueue": { "type": "boolean", "default": false },
-        "maxThreadResolutionCycles": {
-          "type": "integer",
-          "minimum": 0,
-          "default": 5,
-          "description": "Maximum resolution attempts per unresolved review thread. Set 0 for unlimited attempts."
-        }
-      }
-    },
+    "merge": { "$ref": "#/$defs/merge" },
     "output": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "dirs": {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "pr": { "type": "string" }
-          }
-        },
         "repairAttempts": { "type": "integer", "minimum": 0, "default": 3 }
       }
     },
-    "prompts": { "$ref": "#/$defs/prompts" },
-    "safety": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "allowAuthors": { "type": "array", "items": { "type": "string" } },
-        "blockedPaths": { "type": "array", "items": { "type": "string" } },
-        "maxChangedFiles": { "type": "integer", "minimum": 0 },
-        "requiredLabels": { "type": "array", "items": { "type": "string" } }
-      }
-    },
-    "worktree": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "dir": { "type": "string" }
-      }
-    }
+    "review": { "$ref": "#/$defs/review" }
   },
   "$defs": {
     "reviewer": {
@@ -122,7 +59,7 @@
         "model": { "type": "string", "minLength": 1 },
         "options": { "type": "object", "additionalProperties": true },
         "account": { "type": "string", "minLength": 1 },
-        "permission": { "$ref": "#/$defs/permission" },
+        "permissions": { "$ref": "#/$defs/permissions" },
         "persona": { "type": "string" }
       }
     },
@@ -143,21 +80,120 @@
             "email": { "type": "string", "minLength": 1 }
           }
         },
-        "permission": { "$ref": "#/$defs/permission" },
+        "permissions": { "$ref": "#/$defs/permissions" },
         "persona": { "type": "string" }
       }
     },
-    "agents": {
+    "automation": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "merge": { "type": "boolean" },
+        "close": { "type": "boolean" }
+      }
+    },
+    "reviewChecks": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "exclude": { "type": "array", "items": { "type": "string" } },
+        "wait": { "type": "boolean", "default": true },
+        "retryFailedJobs": { "type": "integer", "minimum": 0, "default": 3 }
+      }
+    },
+    "mergeChecks": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "wait": { "type": "boolean", "default": true }
+      }
+    },
+    "concurrency": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "runs": { "type": "integer", "minimum": 1, "default": 3 },
+        "reviewers": { "type": "integer", "minimum": 1, "default": 3 }
+      }
+    },
+    "safety": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "allowAuthors": { "type": "array", "items": { "type": "string" } },
+        "blockedPaths": { "type": "array", "items": { "type": "string" } },
+        "maxChangedFiles": { "type": "integer", "minimum": 0 },
+        "requiredLabels": { "type": "array", "items": { "type": "string" } }
+      }
+    },
+    "reviewPrompts": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "review": { "type": "string" },
+        "rereview": { "type": "string" },
+        "reviewGuidelines": { "type": "string" },
+        "ciClassification": { "type": "string" },
+        "findingValidation": { "type": "string" },
+        "closeReconsideration": { "type": "string" }
+      }
+    },
+    "mergePrompts": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "edit": { "type": "string" },
+        "editGuidelines": { "type": "string" },
+        "ciClassification": { "type": "string" }
+      }
+    },
+    "reviewMerge": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "approvalPolicy": {
+          "enum": ["majority", "unanimous"],
+          "default": "majority"
+        },
+        "method": { "enum": ["merge", "squash", "rebase"] },
+        "auto": { "type": "boolean" },
+        "deleteBranch": { "type": "boolean" },
+        "queue": { "type": "boolean", "default": false }
+      }
+    },
+    "review": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "permissions": { "$ref": "#/$defs/permission" },
-        "reviewers": {
+        "agents": {
           "type": "array",
           "minItems": 3,
           "items": { "$ref": "#/$defs/reviewer" }
         },
-        "editor": { "$ref": "#/$defs/editor" }
+        "prompts": { "$ref": "#/$defs/reviewPrompts" },
+        "checks": { "$ref": "#/$defs/reviewChecks" },
+        "safety": { "$ref": "#/$defs/safety" },
+        "automation": { "$ref": "#/$defs/automation" },
+        "concurrency": { "$ref": "#/$defs/concurrency" },
+        "merge": { "$ref": "#/$defs/reviewMerge" },
+        "output": { "type": "string" },
+        "worktree": { "type": "string" }
+      }
+    },
+    "merge": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "editor": { "$ref": "#/$defs/editor" },
+        "checks": { "$ref": "#/$defs/mergeChecks" },
+        "prompts": { "$ref": "#/$defs/mergePrompts" },
+        "automation": { "$ref": "#/$defs/automation" },
+        "maxThreadResolutionCycles": {
+          "type": "integer",
+          "minimum": 0,
+          "default": 5,
+          "description": "Maximum resolution attempts per unresolved review thread. Set 0 for unlimited attempts."
+        }
       }
     },
     "permissionAction": { "enum": ["allow", "ask", "deny"] },
@@ -170,7 +206,7 @@
         }
       ]
     },
-    "permission": {
+    "permissions": {
       "oneOf": [
         { "$ref": "#/$defs/permissionAction" },
         {
@@ -178,23 +214,6 @@
           "additionalProperties": { "$ref": "#/$defs/permissionRule" }
         }
       ]
-    },
-    "prompts": {
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "review": { "type": "string" },
-        "rereview": { "type": "string" },
-        "edit": { "type": "string" },
-        "editGuidelines": { "type": "string" },
-        "findingValidation": { "type": "string" },
-        "closeReconsideration": { "type": "string" },
-        "rereviewCloseReconsideration": { "type": "string" },
-        "ciClassification": { "type": "string" },
-        "ciClassificationAfterEdit": { "type": "string" },
-        "report": { "type": "string" },
-        "reviewGuidelines": { "type": "string" }
-      }
     }
   }
 }

package/dist/prompts/templates/rereview-close-reconsideration.md

@@ -1,6 +0,0 @@
-You requested CLOSE while re-reviewing pull request #{pr} in {owner}/{repo}, but the other reviewers did not.
-Reconsider your decision and choose MERGE or CHANGES_REQUESTED instead.
-Use the existing re-review session context.
-Original close reason:
-{closeReason}
-Do not edit files or perform write operations.