opencode-magi 0.6.1 → 0.8.0

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, triageCommentClassificationOutputContract, triageCreatePrOutputContract, triageDuplicateOutputContract, triageVoteOutputContract, } from "./contracts";
+import { ciClassificationAfterEditOutputContract, ciClassificationOutputContract, closeReconsiderationOutputContract, editOutputContract, findingValidationOutputContract, rereviewCloseReconsiderationOutputContract, rereviewOutputContract, reviewOutputContract, triageCommentClassificationOutputContract, triageCreatePrOutputContract, triageDuplicateOutputContract, triageSignalOutputContract, triageVoteOutputContract, } from "./contracts";
 async function readOptionalPrompt(directory, path, values = {}) {
     if (!path)
         return "";
@@ -35,6 +35,7 @@ function repositoryValues(repository) {
 }
 function reviewValues(input) {
     const ciFailureContext = input.ciFailureContext?.trim() ?? "";
+    const mergeConflictContext = input.mergeConflictContext?.trim() ?? "";
     return {
         ...repositoryValues(input.repository),
         baseSha: input.baseSha,
@@ -44,6 +45,10 @@ function reviewValues(input) {
             : "",
         headSha: input.headSha,
         jsonEncodedWorktreePath: JSON.stringify(input.worktreePath),
+        mergeConflictContext,
+        mergeConflictContextBlock: mergeConflictContext
+            ? `<merge_conflict_context>\n${mergeConflictContext}\n</merge_conflict_context>`
+            : "",
         pr: String(input.pr),
         reviewContext: input.reviewContext ?? "",
         worktreePath: input.worktreePath,
@@ -67,6 +72,17 @@ function editValues(input) {
         worktreePath: input.worktreePath,
     };
 }
+function mergeConflictValues(input) {
+    return {
+        ...repositoryValues(input.repository),
+        baseBranch: input.baseBranch,
+        baseSha: input.baseSha,
+        conflictedFiles: input.conflictedFiles,
+        headSha: input.headSha,
+        pr: String(input.pr),
+        worktreePath: input.worktreePath,
+    };
+}
 function triageValues(input) {
     const categories = input.repository.triage?.categories ?? [];
     const categoryOptions = categories
@@ -74,12 +90,16 @@ function triageValues(input) {
         ? `- ${category.id}: ${category.description}`
         : `- ${category.id}`)
         .join("\n");
+    const signalOptions = (input.repository.triage?.signals ?? [])
+        .map((signal) => `- ${signal.id}: ${signal.description}`)
+        .join("\n");
     return {
         ...repositoryValues(input.repository),
         author: input.author ?? "",
         categoryOptions,
         context: input.context,
         issue: String(input.issue),
+        signalOptions,
         worktreePath: input.worktreePath ?? "",
     };
 }
@@ -97,6 +117,12 @@ function previousReviewBlock(previousReview) {
 function reviewContextBlock(reviewContext) {
     return reviewContext?.trim() ? reviewContext.trim() : "";
 }
+function mergeConflictContextBlock(mergeConflictContext) {
+    const body = mergeConflictContext?.trim();
+    return body
+        ? `<merge_conflict_context>\n${body}\n</merge_conflict_context>`
+        : "";
+}
 async function reviewGuidelinesBlock(input) {
     const body = (await readOptionalPrompt(input.directory, input.path, input.values)).trim();
     return body ? `<review_guidelines>\n${body}\n</review_guidelines>` : "";
@@ -136,6 +162,7 @@ export async function composeReviewPrompt(input) {
     return [
         task,
         reviewContextBlock(input.reviewContext),
+        mergeConflictContextBlock(input.mergeConflictContext),
         languageBlock(input.repository.language),
         personaBlock(input.reviewer.persona),
         await reviewGuidelinesBlock({
@@ -159,6 +186,7 @@ export async function composeRereviewPrompt(input) {
     return [
         task,
         reviewContextBlock(input.reviewContext),
+        mergeConflictContextBlock(input.mergeConflictContext),
         input.includeSessionContext === false
             ? ""
             : languageBlock(input.repository.language),
@@ -200,6 +228,28 @@ export async function composeEditPrompt(input) {
         .filter(Boolean)
         .join("\n\n");
 }
+export async function composeMergeConflictPrompt(input) {
+    const values = mergeConflictValues(input);
+    const task = await taskBlock({
+        builtin: "merge/conflict",
+        directory: input.directory,
+        values,
+    });
+    const persona = input.repository.agents.editor?.persona;
+    return [
+        task,
+        languageBlock(input.repository.language),
+        personaBlock(persona),
+        await editGuidelinesBlock({
+            directory: input.directory,
+            path: input.repository.prompts.editGuidelines,
+            values,
+        }),
+        editOutputContract,
+    ]
+        .filter(Boolean)
+        .join("\n\n");
+}
 export async function composeFindingValidationPrompt(input) {
     const values = { ...reviewValues(input), findings: input.findings };
     const task = await taskBlock({
@@ -395,7 +445,14 @@ export async function composeTriageAcceptancePrompt(input) {
         ...input,
         builtin: "acceptance",
         customPath: input.repository.triage?.prompts.acceptance,
-        outputContract: triageVoteOutputContract('"YES" | "NO" | "ASK"'),
+        outputContract: triageVoteOutputContract('"YES" | "NO" | "INVALID" | "ASK"'),
+    });
+}
+export async function composeTriageSignalPrompt(input) {
+    return composeTriageVotePrompt({
+        ...input,
+        builtin: "signal",
+        outputContract: triageSignalOutputContract,
     });
 }
 export async function composeTriageCommentClassificationPrompt(input) {

package/dist/prompts/contracts.js

@@ -256,6 +256,24 @@ The object must match this shape:
   ]
 }
 </output_contract>`.trim();
+export const triageSignalOutputContract = `
+<output_contract>
+Return exactly one JSON object and nothing else. Do not wrap it in markdown.
+
+The object must match this shape:
+{
+  "signals": [
+    {
+      "id": "configured_signal_id",
+      "reason": "Short rationale."
+    }
+  ]
+}
+
+Rules:
+- Return only configured signal IDs that apply.
+- Return an empty signals array when none apply.
+</output_contract>`.trim();
 const outputContractsBySchemaName = {
     "CI classification": ciClassificationOutputContract,
     "close reconsideration": closeReconsiderationOutputContract,
@@ -264,13 +282,14 @@ const outputContractsBySchemaName = {
     rereview: rereviewOutputContract,
     "rereview close reconsideration": rereviewCloseReconsiderationOutputContract,
     review: reviewOutputContract,
-    "triage acceptance": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
+    "triage acceptance": triageVoteOutputContract('"YES" | "NO" | "INVALID" | "ASK"'),
     "triage category": triageVoteOutputContract('"ASK" or one of the configured category IDs'),
     "triage create PR": triageCreatePrOutputContract,
     "triage comment classification": triageCommentClassificationOutputContract,
     "triage duplicate": triageDuplicateOutputContract,
     "triage existing PR": triageVoteOutputContract('"RELATED_PR_HANDLES_ISSUE" | "RELATED_PR_DOES_NOT_HANDLE_ISSUE"'),
     "triage reconsider": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
+    "triage signal": triageSignalOutputContract,
 };
 export function repairPrompt(schemaName) {
     const outputContract = outputContractsBySchemaName[schemaName];

package/dist/prompts/output.js

@@ -112,7 +112,25 @@ export function parseTriageCategoryOutput(text, categories) {
     return parseTriageVote(text, ["ASK", ...categories]);
 }
 export function parseTriageBinaryOutput(text) {
-    return parseTriageVote(text, ["ASK", "NO", "YES"]);
+    return parseTriageVote(text, ["ASK", "INVALID", "NO", "YES"]);
+}
+export function parseTriageSignalOutput(text, signalIds) {
+    const data = extractJson(text);
+    if (!data || typeof data !== "object")
+        throw new Error("triage signal output must be an object");
+    const ids = new Set(signalIds);
+    return {
+        signals: requireArray(data.signals, "signals").map((item, index) => {
+            const value = item;
+            const id = requireString(value.id, `signals[${index}].id`);
+            if (!ids.has(id))
+                throw new Error(`signals[${index}].id is not configured`);
+            return {
+                id,
+                reason: requireString(value.reason, `signals[${index}].reason`),
+            };
+        }),
+    };
 }
 export function parseTriageDuplicateOutput(text) {
     const data = extractJson(text);

package/dist/prompts/templates/merge/conflict.md

@@ -0,0 +1,10 @@
+Resolve merge conflicts for pull request #{pr} in {owner}/{repo}.
+The PR worktree is {worktreePath}.
+
+The latest base branch is {baseBranch} at {baseSha}.
+The PR head before conflict recovery was {headSha}.
+
+Conflicted files:
+{conflictedFiles}
+
+Resolve every merge conflict in the worktree. Preserve the intended PR behavior while incorporating the latest base branch changes. Stage all resolved files and create a commit. Do not push.

package/dist/prompts/templates/review/rereview.md

@@ -13,6 +13,8 @@ Every newFinding must target a valid right-side line in the PR diff.
 If the problem itself does not have an exact changed line, choose the nearest changed line that represents the cause, responsibility, missing implementation, or affected behavior. This includes but is not limited to missing validation, missing wiring, missing requirements, missing tests, missing documentation, affected configuration, or relevant call sites.
 Do not omit line. Do not create file-level or body-only newFindings.
 
+If `<merge_conflict_context>` is present, treat unresolved merge conflicts as review findings. Request changes when a conflict makes the PR unsafe or impossible to merge, and prefer the provided `suggestedLine` when it is present.
+
 {ciFailureContextBlock}
 Do not edit files or perform write operations.
 

package/dist/prompts/templates/review/review.md

@@ -14,4 +14,6 @@ Every finding must target a valid right-side line in the PR diff.
 If the problem itself does not have an exact changed line, choose the nearest changed line that represents the cause, responsibility, missing implementation, or affected behavior. This includes but is not limited to missing validation, missing wiring, missing requirements, missing tests, missing documentation, affected configuration, or relevant call sites.
 Do not omit line. Do not create file-level or body-only findings.
 
+If `<merge_conflict_context>` is present, treat unresolved merge conflicts as review findings. Request changes when a conflict makes the PR unsafe or impossible to merge, and prefer the provided `suggestedLine` when it is present.
+
 {ciFailureContextBlock}

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

@@ -1,6 +1,6 @@
 Evaluate issue #{issue} in {owner}/{repo} for the selected category.
 
-Choose YES when the issue should be accepted for the project. Choose NO when it should be rejected, is not actionable, or is not appropriate for this project. Choose ASK when specific missing information is required before deciding.
+Choose YES when the issue should be accepted for the project. Choose NO when it should not be worked on for normal wontfix reasons. Choose INVALID when the report is unreproducible, contradictory, based on an impossible premise, or otherwise not actionable as an issue. Choose ASK when specific missing information is required before deciding.
 
 <context>
 {context}

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

@@ -0,0 +1,10 @@
+Evaluate optional triage signals for issue #{issue} in {owner}/{repo}.
+
+Configured signals:
+{signalOptions}
+
+Return every configured signal that applies to the final triage result and issue context. Do not invent signal IDs.
+
+<context>
+{context}
+</context>

package/package.json

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

package/schema.json

@@ -60,8 +60,7 @@
       "additionalProperties": false,
       "properties": {
         "id": { "type": "string", "pattern": "^[A-Za-z0-9_-]+$" },
-        "model": { "type": "string", "minLength": 1 },
-        "options": { "type": "object", "additionalProperties": true },
+        "model": { "$ref": "#/$defs/modelConfig" },
         "account": { "type": "string", "minLength": 1 },
         "author": {
           "type": "object",
@@ -83,8 +82,7 @@
       "properties": {
         "ref": { "type": "string", "minLength": 1 },
         "id": { "type": "string", "pattern": "^[A-Za-z0-9_-]+$" },
-        "model": { "type": "string", "minLength": 1 },
-        "options": { "type": "object", "additionalProperties": true },
+        "model": { "$ref": "#/$defs/modelConfig" },
         "account": { "type": "string", "minLength": 1 },
         "permissions": { "$ref": "#/$defs/permissions" },
         "persona": { "type": "string" }
@@ -97,8 +95,7 @@
       "additionalProperties": false,
       "properties": {
         "ref": { "type": "string", "minLength": 1 },
-        "model": { "type": "string", "minLength": 1 },
-        "options": { "type": "object", "additionalProperties": true },
+        "model": { "$ref": "#/$defs/modelConfig" },
         "account": { "type": "string", "minLength": 1 },
         "author": {
           "type": "object",
@@ -121,9 +118,8 @@
       "properties": {
         "ref": { "type": "string", "minLength": 1 },
         "id": { "type": "string", "pattern": "^[A-Za-z0-9_-]+$" },
-        "model": { "type": "string", "minLength": 1 },
+        "model": { "$ref": "#/$defs/modelConfig" },
         "account": { "type": "string", "minLength": 1 },
-        "options": { "type": "object", "additionalProperties": true },
         "permissions": { "$ref": "#/$defs/permissions" },
         "persona": { "type": "string" }
       }
@@ -136,8 +132,7 @@
       "properties": {
         "ref": { "type": "string", "minLength": 1 },
         "account": { "type": "string", "minLength": 1 },
-        "model": { "type": "string", "minLength": 1 },
-        "options": { "type": "object", "additionalProperties": true },
+        "model": { "$ref": "#/$defs/modelConfig" },
         "author": {
           "type": "object",
           "required": ["name", "email"],
@@ -151,6 +146,31 @@
         "persona": { "type": "string" }
       }
     },
+    "modelConfig": {
+      "oneOf": [
+        { "type": "string", "minLength": 1 },
+        { "$ref": "#/$defs/modelCandidate" },
+        {
+          "type": "array",
+          "minItems": 1,
+          "items": {
+            "oneOf": [
+              { "type": "string", "minLength": 1 },
+              { "$ref": "#/$defs/modelCandidate" }
+            ]
+          }
+        }
+      ]
+    },
+    "modelCandidate": {
+      "type": "object",
+      "required": ["id"],
+      "additionalProperties": false,
+      "properties": {
+        "id": { "type": "string", "minLength": 1 },
+        "options": { "type": "object", "additionalProperties": true }
+      }
+    },
     "automation": {
       "type": "object",
       "additionalProperties": false,
@@ -159,6 +179,15 @@
         "close": { "type": "boolean" }
       }
     },
+    "mergeAutomation": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "merge": { "type": "boolean", "default": true },
+        "close": { "type": "boolean", "default": false },
+        "conflict": { "type": "boolean", "default": false }
+      }
+    },
     "reviewChecks": {
       "type": "object",
       "additionalProperties": false,
@@ -250,6 +279,47 @@
         "description": { "type": "string" }
       }
     },
+    "triageSignal": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["id", "description"],
+      "properties": {
+        "id": { "type": "string", "pattern": "^[A-Za-z0-9_-]+$" },
+        "description": { "type": "string", "minLength": 1 }
+      }
+    },
+    "triageLabelRuleCondition": {
+      "type": "object",
+      "additionalProperties": false,
+      "minProperties": 1,
+      "properties": {
+        "disposition": {
+          "enum": [
+            "accepted",
+            "rejected",
+            "invalid",
+            "duplicate",
+            "already_handled",
+            "needs_category",
+            "needs_acceptance",
+            "blocked",
+            "failed"
+          ]
+        },
+        "category": { "type": "string" },
+        "signals": { "type": "array", "items": { "type": "string" } }
+      }
+    },
+    "triageLabelRule": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["when"],
+      "properties": {
+        "when": { "$ref": "#/$defs/triageLabelRuleCondition" },
+        "add": { "type": "array", "items": { "type": "string" } },
+        "remove": { "type": "array", "items": { "type": "string" } }
+      }
+    },
     "triageAutomation": {
       "type": "object",
       "additionalProperties": false,
@@ -258,10 +328,9 @@
         "create": { "type": "boolean", "default": false },
         "review": { "type": "boolean", "default": false },
         "merge": { "type": "boolean", "default": false },
-        "clear": {
+        "label": {
           "type": "array",
-          "items": { "type": "string" },
-          "default": ["triage"]
+          "items": { "$ref": "#/$defs/triageLabelRule" }
         }
       }
     },
@@ -297,7 +366,7 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "agents": {
+        "reviewers": {
           "type": "array",
           "minItems": 3,
           "items": { "$ref": "#/$defs/reviewer" }
@@ -319,7 +388,7 @@
         "editor": { "$ref": "#/$defs/editor" },
         "checks": { "$ref": "#/$defs/mergeChecks" },
         "prompts": { "$ref": "#/$defs/mergePrompts" },
-        "automation": { "$ref": "#/$defs/automation" },
+        "automation": { "$ref": "#/$defs/mergeAutomation" },
         "maxThreadResolutionCycles": {
           "type": "integer",
           "minimum": 0,
@@ -332,7 +401,7 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "agents": {
+        "voters": {
           "type": "array",
           "minItems": 3,
           "items": { "$ref": "#/$defs/triageAgent" }
@@ -342,6 +411,10 @@
           "type": "array",
           "items": { "$ref": "#/$defs/triageCategory" }
         },
+        "signals": {
+          "type": "array",
+          "items": { "$ref": "#/$defs/triageSignal" }
+        },
         "automation": { "$ref": "#/$defs/triageAutomation" },
         "safety": { "$ref": "#/$defs/triageSafety" },
         "concurrency": { "$ref": "#/$defs/triageConcurrency" },