opencode-magi 0.1.0 → 0.2.0

package/README.md

@@ -36,6 +36,8 @@ Add the plugin to `opencode.json`.
 }
 ```
 
+Restart OpenCode. Done.
+
 ### Configure
 
 Configure global defaults in `~/.config/opencode/magi.json` and project overrides in `<project>/.opencode/magi.json`.
@@ -58,9 +60,9 @@ Add the following content to the configuration file.
 
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/hirotomoyamada/opencode-magi/main/schema.json",
-  "agents": {
-    "reviewers": [
+  "$schema": "https://raw.githubusercontent.com/magi-ai/opencode-magi/main/schema.json",
+  "review": {
+    "agents": [
       {
         "account": "your-account-1",
         "model": "openai/gpt-5.5"
@@ -78,7 +80,7 @@ Add the following content to the configuration file.
 }
 ```
 
-`agents.reviewers[].account` is the GitHub account used to post reviews and approvals. Must be authenticated with `gh auth token --user <account>` and must be unique.
+`review.agents[].account` is the GitHub account used to post reviews and approvals. Must be authenticated with `gh auth token --user <account>` and must be unique.
 
 #### Set project config
 
@@ -94,13 +96,13 @@ Add the following content to the configuration file.
 
 ```json
 {
-  "$schema": "https://raw.githubusercontent.com/hirotomoyamada/opencode-magi/main/schema.json",
+  "$schema": "https://raw.githubusercontent.com/magi-ai/opencode-magi/main/schema.json",
   "github": {
     "owner": "your-owner",
     "repo": "your-repo"
   },
-  "agents": {
-    "reviewers": [
+  "review": {
+    "agents": [
       {
         "account": "your-account-1",
         "model": "openai/gpt-5.5"
@@ -113,7 +115,9 @@ Add the following content to the configuration file.
         "account": "your-account-3",
         "model": "opencode/kimi-k2-6"
       }
-    ],
+    ]
+  },
+  "merge": {
     "editor": {
       "account": "your-editor-account",
       "model": "openai/gpt-5.5",
@@ -126,7 +130,7 @@ Add the following content to the configuration file.
 }
 ```
 
-`agents.reviewers[].account` is the GitHub account used to post reviews and approvals. Must be authenticated with `gh auth token --user <account>` and must be unique.
+`review.agents[].account` is the GitHub account used to post reviews and approvals. Must be authenticated with `gh auth token --user <account>` and must be unique. `merge.editor.account` is used by `/magi:merge` to push fixes, close PRs, and merge PRs.
 
 #### Validate config
 
@@ -152,7 +156,7 @@ Run commands from OpenCode.
 
 - [Commands](docs/commands/index.md)
 - [Config](docs/config.md)
-- [Prompts](docs/prompts.md)
+- [Prompts](docs/prompts/index.md)
 
 ## Contributing
 

package/dist/config/output.js

@@ -6,7 +6,7 @@ function resolvePath(directory, path) {
     return isAbsolute(path) ? path : join(directory, path);
 }
 export function outputBaseDir(directory, config, kind) {
-    return resolvePath(directory, config.output?.dirs?.[kind] ?? DEFAULT_OUTPUT_DIRS[kind]);
+    return resolvePath(directory, config.review?.output ?? DEFAULT_OUTPUT_DIRS[kind]);
 }
 export function outputBaseDirs(directory, config) {
     return [outputBaseDir(directory, config, "pr")];

package/dist/config/resolve.js

@@ -44,20 +44,22 @@ export function mergePermissions(base, override) {
     return merged;
 }
 export function resolveReviewerPermission(agents, reviewer) {
-    return mergePermissions(mergePermissions(DEFAULT_REVIEWER_PERMISSION, agents.permissions), reviewer.permission);
+    return mergePermissions(mergePermissions(DEFAULT_REVIEWER_PERMISSION, agents.permissions), reviewer.permissions);
 }
 export function resolveEditorPermission(agents, editor) {
-    return mergePermissions(mergePermissions(DEFAULT_EDITOR_PERMISSION, agents.permissions), editor.permission);
+    return mergePermissions(mergePermissions(DEFAULT_EDITOR_PERMISSION, agents.permissions), editor.permissions);
 }
-export function resolveAgents(agents) {
+export function resolveAgents(config) {
+    const agents = config.agents ?? {};
+    const editor = config.merge?.editor;
     return {
-        editor: agents.editor
+        editor: editor
             ? {
-                ...agents.editor,
-                permission: resolveEditorPermission(agents, agents.editor),
+                ...editor,
+                permission: resolveEditorPermission(agents, editor),
             }
             : undefined,
-        reviewers: (agents.reviewers ?? []).map((reviewer, index) => ({
+        reviewers: (config.review?.agents ?? []).map((reviewer, index) => ({
             ...reviewer,
             key: reviewerKey(reviewer, index),
             index,
@@ -72,20 +74,21 @@ export function resolveRepository(config) {
         throw new Error("github.repo is required");
     return {
         alias: config.github.repo,
-        agents: resolveAgents(config.agents),
+        agents: resolveAgents(config),
         automation: {
-            close: config.automation?.close ?? true,
-            merge: config.automation?.merge ?? true,
+            close: config.merge?.automation?.close ?? false,
+            merge: config.merge?.automation?.merge ?? true,
         },
         checks: {
-            exclude: config.checks?.exclude ?? [],
-            waitAfterEdit: config.checks?.waitAfterEdit ?? true,
-            waitBeforeReview: config.checks?.waitBeforeReview ?? true,
-            retryFailedJobs: config.checks?.retryFailedJobs ?? 3,
+            exclude: config.review?.checks?.exclude ?? [],
+            retryFailedJobs: config.review?.checks?.retryFailedJobs ?? 3,
+            wait: config.review?.checks?.wait ?? true,
+            waitAfterEdit: config.merge?.checks?.wait ?? true,
+            waitBeforeReview: config.review?.checks?.wait ?? true,
         },
         concurrency: {
-            runs: config.concurrency?.runs ?? 3,
-            reviewers: config.concurrency?.reviewers ?? 3,
+            runs: config.review?.concurrency?.runs ?? 3,
+            reviewers: config.review?.concurrency?.reviewers ?? 3,
         },
         github: {
             apiRetryAttempts: config.github.apiRetryAttempts ?? 3,
@@ -95,19 +98,34 @@ export function resolveRepository(config) {
         },
         language: config.language,
         merge: {
-            approvalPolicy: config.merge?.approvalPolicy ?? "majority",
-            method: config.merge?.method ?? "squash",
-            auto: config.merge?.auto ?? true,
-            deleteBranch: config.merge?.deleteBranch ?? true,
-            mergeQueue: config.merge?.mergeQueue ?? false,
+            approvalPolicy: config.review?.merge?.approvalPolicy ?? "majority",
+            method: config.review?.merge?.method ?? "squash",
+            auto: config.review?.merge?.auto ?? true,
+            deleteBranch: config.review?.merge?.deleteBranch ?? true,
+            queue: config.review?.merge?.queue ?? false,
+            mergeQueue: config.review?.merge?.queue ?? false,
             maxThreadResolutionCycles: config.merge?.maxThreadResolutionCycles ?? 5,
         },
-        prompts: config.prompts ?? {},
+        prompts: {
+            ciClassification: config.review?.prompts?.ciClassification,
+            ciClassificationAfterEdit: config.merge?.prompts?.ciClassification,
+            closeReconsideration: config.review?.prompts?.closeReconsideration,
+            edit: config.merge?.prompts?.edit,
+            editGuidelines: config.merge?.prompts?.editGuidelines,
+            findingValidation: config.review?.prompts?.findingValidation,
+            rereview: config.review?.prompts?.rereview,
+            review: config.review?.prompts?.review,
+            reviewGuidelines: config.review?.prompts?.reviewGuidelines,
+        },
+        reviewAutomation: {
+            close: config.review?.automation?.close ?? false,
+            merge: config.review?.automation?.merge ?? false,
+        },
         safety: {
-            allowAuthors: config.safety?.allowAuthors ?? [],
-            blockedPaths: config.safety?.blockedPaths ?? [],
-            maxChangedFiles: config.safety?.maxChangedFiles,
-            requiredLabels: config.safety?.requiredLabels ?? [],
+            allowAuthors: config.review?.safety?.allowAuthors ?? [],
+            blockedPaths: config.review?.safety?.blockedPaths ?? [],
+            maxChangedFiles: config.review?.safety?.maxChangedFiles,
+            requiredLabels: config.review?.safety?.requiredLabels ?? [],
         },
     };
 }