opencode-magi 0.4.0 → 0.6.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, triageActionOutputContract, triageCommentClassificationOutputContract, triageCreatePrOutputContract, triageDuplicateOutputContract, triageVoteOutputContract, } from "./contracts";
+import { ciClassificationAfterEditOutputContract, ciClassificationOutputContract, closeReconsiderationOutputContract, editOutputContract, findingValidationOutputContract, rereviewCloseReconsiderationOutputContract, rereviewOutputContract, reviewOutputContract, triageCommentClassificationOutputContract, triageCreatePrOutputContract, triageDuplicateOutputContract, triageVoteOutputContract, } from "./contracts";
 async function readOptionalPrompt(directory, path, values = {}) {
     if (!path)
         return "";
@@ -333,20 +333,12 @@ async function composeTriageVotePrompt(input) {
     return [
         task,
         languageBlock(input.repository.language),
-        personaBlock(input.reviewer.persona),
+        personaBlock(input.voter.persona),
         input.outputContract,
     ]
         .filter(Boolean)
         .join("\n\n");
 }
-export async function composeTriageActionPrompt(input) {
-    return composeTriageVotePrompt({
-        ...input,
-        builtin: "action",
-        customPath: input.repository.triage?.prompts.action,
-        outputContract: triageActionOutputContract,
-    });
-}
 export async function composeTriageCommentPrompt(input) {
     const values = triageValues(input);
     const task = await taskBlock({

package/dist/prompts/contracts.js

@@ -15,26 +15,20 @@ The object must match this shape:
       "perspective": "Optional review perspective."
     }
   ],
-  "requirementFindings": [
-    {
-      "issueNumber": 47,
-      "requirement": "Required closing-issue behavior that is missing.",
-      "evidence": "Why the PR does not satisfy the requirement.",
-      "fix": "How to satisfy the requirement."
-    }
-  ],
   "reason": "Required only for CLOSE."
 }
 
 Rules:
-- MERGE requires empty findings and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one finding or requirementFinding.
-- CLOSE requires a reason and empty findings and requirementFindings arrays.
+- MERGE requires an empty findings array.
+- CHANGES_REQUESTED requires at least one finding.
+- CLOSE requires a reason and an empty findings array.
 - path must be repository-relative.
-- line is optional. Include line only when the finding targets a valid line inside the PR diff hunk.
-- startLine is allowed only when line is present and must also refer to a line inside the PR diff hunk.
-- Omit startLine for single-line findings and omit line for file-level or body-only findings.
-- Use requirementFindings only for missing closing-issue requirements; use findings for ordinary file-level issues that do not map cleanly to a diff line.
+- line is required and must target a valid right-side line inside the PR diff hunk.
+- startLine is optional and must also target a valid right-side line inside the same PR diff hunk range.
+- Omit startLine for single-line findings.
+- Do not omit line. Do not create file-level or body-only findings.
+- Missing closing-issue requirements must be normal findings anchored to the nearest responsible changed line.
+- 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.
 </output_contract>`.trim();
 export const rereviewOutputContract = `
 <output_contract>
@@ -46,18 +40,19 @@ The object must match this shape:
   "resolve": [{ "commentId": 123, "threadId": "..." }],
   "followUps": [{ "commentId": 123, "body": "..." }],
   "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }],
-  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }],
   "reason": "Required only for CLOSE."
 }
 
 Rules:
-- MERGE requires empty followUps, newFindings, and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one followUp, newFinding, or requirementFinding.
-- CLOSE requires a reason and empty followUps, newFindings, and requirementFindings arrays.
-- line is optional. Include line only when the newFinding targets a valid line inside the latest PR diff hunk.
-- startLine is allowed only when line is present and must also refer to a line inside the latest PR diff hunk.
-- Omit startLine for single-line findings and omit line for file-level or body-only findings.
-- Use requirementFindings only for missing closing-issue requirements; use newFindings for ordinary file-level issues that do not map cleanly to a diff line.
+- MERGE requires empty followUps and newFindings arrays.
+- CHANGES_REQUESTED requires at least one followUp or newFinding.
+- CLOSE requires a reason and empty followUps and newFindings arrays.
+- line is required and must target a valid right-side line inside the latest PR diff hunk.
+- startLine is optional and must also target a valid right-side line inside the same latest PR diff hunk range.
+- Omit startLine for single-line findings.
+- Do not omit line. Do not create file-level or body-only findings.
+- Missing closing-issue requirements must be normal newFindings anchored to the nearest responsible changed line.
+- 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.
 </output_contract>`.trim();
 export const findingValidationOutputContract = `
 <output_contract>
@@ -96,17 +91,16 @@ The object must match this shape:
       "issue": "What is wrong.",
       "fix": "How to fix it."
     }
-  ],
-  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }]
+  ]
 }
 
 Rules:
-- MERGE requires empty findings and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one finding or requirementFinding.
+- MERGE requires an empty findings array.
+- CHANGES_REQUESTED requires at least one finding.
 - CLOSE is not allowed in this reconsideration step.
-- line is optional. Include line only when the finding targets a valid line inside the PR diff hunk.
-- startLine is allowed only when line is present.
-- Omit startLine for single-line findings and omit line for file-level or body-only findings.
+- line is required and must target a valid right-side line inside the PR diff hunk.
+- startLine is optional and must also target a valid right-side line inside the same PR diff hunk range.
+- Do not omit line. Do not create file-level or body-only findings.
 </output_contract>`.trim();
 export const rereviewCloseReconsiderationOutputContract = `
 <output_contract>
@@ -117,17 +111,16 @@ The object must match this shape:
   "verdict": "MERGE" | "CHANGES_REQUESTED",
   "resolve": [{ "commentId": 123, "threadId": "..." }],
   "followUps": [{ "commentId": 123, "body": "..." }],
-  "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }],
-  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }]
+  "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }]
 }
 
 Rules:
-- MERGE requires empty followUps, newFindings, and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one followUp, newFinding, or requirementFinding.
+- MERGE requires empty followUps and newFindings arrays.
+- CHANGES_REQUESTED requires at least one followUp or newFinding.
 - CLOSE is not allowed in this reconsideration step.
-- line is optional. Include line only when the newFinding targets a valid line inside the latest PR diff hunk.
-- startLine is allowed only when line is present.
-- Omit startLine for single-line findings and omit line for file-level or body-only findings.
+- line is required and must target a valid right-side line inside the latest PR diff hunk.
+- startLine is optional and must also target a valid right-side line inside the same latest PR diff hunk range.
+- Do not omit line. Do not create file-level or body-only findings.
 </output_contract>`.trim();
 export const editOutputContract = `
 <output_contract>
@@ -224,8 +217,13 @@ Return exactly one JSON object and nothing else. Do not wrap it in markdown.
 The object must match this shape:
 {
   "vote": ${votes},
-  "reason": "Short rationale."
+  "reason": "Short rationale.",
+  "body": "Required only when vote is ASK. Public issue comment body asking for the missing information."
 }
+
+Rules:
+- body is required when vote is ASK and must be written for the issue author.
+- Omit body when vote is not ASK.
 </output_contract>`.trim();
 }
 export const triageDuplicateOutputContract = `
@@ -258,24 +256,6 @@ The object must match this shape:
   ]
 }
 </output_contract>`.trim();
-export const triageActionOutputContract = `
-<output_contract>
-Return exactly one JSON object and nothing else. Do not wrap it in markdown.
-
-The object must match this shape:
-{
-  "action": "ASK" | "COMMENT" | "CLOSE" | "PR" | "CLEAR_ONLY",
-  "reason": "Short rationale."
-}
-
-Rules:
-- Choose only an action listed as allowed in the task context.
-- ASK means post an author-mentioned question and do not close, create a PR, or clear labels.
-- COMMENT means post a decision comment only.
-- CLOSE means post a decision comment and close the issue.
-- PR means post a decision comment and create an implementation PR.
-- CLEAR_ONLY means clear labels without posting a comment.
-</output_contract>`.trim();
 const outputContractsBySchemaName = {
     "CI classification": ciClassificationOutputContract,
     "close reconsideration": closeReconsiderationOutputContract,
@@ -284,7 +264,6 @@ const outputContractsBySchemaName = {
     rereview: rereviewOutputContract,
     "rereview close reconsideration": rereviewCloseReconsiderationOutputContract,
     review: reviewOutputContract,
-    "triage action": triageActionOutputContract,
     "triage acceptance": triageVoteOutputContract('"YES" | "NO" | "ASK"'),
     "triage category": triageVoteOutputContract('"ASK" or one of the configured category IDs'),
     "triage create PR": triageCreatePrOutputContract,

package/dist/prompts/output.js

@@ -71,27 +71,16 @@ function requireNumber(value, path) {
         throw new Error(`${path} must be an integer`);
     return value;
 }
-function optionalLine(value, path) {
-    return value == null ? undefined : requireNumber(value, path);
+function requireLine(value, path) {
+    if (value == null)
+        throw new Error(`${path} is required`);
+    return requireNumber(value, path);
 }
 function optionalStartLine(input) {
     if (input.value == null)
         return undefined;
-    if (input.line == null)
-        throw new Error(`${input.path} requires line`);
     return requireNumber(input.value, input.path);
 }
-function parseRequirementFindings(value) {
-    return (value == null ? [] : requireArray(value, "requirementFindings")).map((finding, index) => {
-        const item = finding;
-        return {
-            evidence: requireString(item.evidence, `requirementFindings[${index}].evidence`),
-            fix: requireString(item.fix, `requirementFindings[${index}].fix`),
-            issueNumber: requireNumber(item.issueNumber, `requirementFindings[${index}].issueNumber`),
-            requirement: requireString(item.requirement, `requirementFindings[${index}].requirement`),
-        };
-    });
-}
 function requireOneOf(value, path, values) {
     const text = requireString(value, path);
     if (!values.includes(text)) {
@@ -103,9 +92,14 @@ function parseTriageVote(text, votes) {
     const data = extractJson(text);
     if (!data || typeof data !== "object")
         throw new Error("triage vote output must be an object");
+    const vote = requireOneOf(data.vote, "vote", votes);
+    const body = data.body == null ? undefined : requireString(data.body, "body");
+    if (vote === "ASK" && !body?.trim())
+        throw new Error("ASK requires body");
     return {
+        body,
         reason: requireString(data.reason, "reason"),
-        vote: requireOneOf(data.vote, "vote", votes),
+        vote,
     };
 }
 export function parseTriageExistingPrOutput(text) {
@@ -160,30 +154,17 @@ export function parseTriageCommentClassificationOutput(text) {
         }),
     };
 }
-export function parseTriageActionOutput(text) {
-    const data = extractJson(text);
-    if (!data || typeof data !== "object")
-        throw new Error("triage action output must be an object");
-    return {
-        action: requireOneOf(data.action, "action", [
-            "ASK",
-            "CLEAR_ONLY",
-            "CLOSE",
-            "COMMENT",
-            "PR",
-        ]),
-        reason: requireString(data.reason, "reason"),
-    };
-}
 export function parseReviewOutput(text) {
     const data = extractJson(text);
     if (!data || typeof data !== "object")
         throw new Error("review output must be an object");
+    if (data.requirementFindings != null)
+        throw new Error("requirementFindings is not accepted");
     if (!isVerdict(data.verdict))
         throw new Error("verdict must be MERGE, CHANGES_REQUESTED, or CLOSE");
     const findings = requireArray(data.findings, "findings").map((finding, index) => {
         const item = finding;
-        const line = optionalLine(item.line, `findings[${index}].line`);
+        const line = requireLine(item.line, `findings[${index}].line`);
         return {
             fix: requireString(item.fix, `findings[${index}].fix`),
             issue: requireString(item.issue, `findings[${index}].issue`),
@@ -199,17 +180,12 @@ export function parseReviewOutput(text) {
             }),
         };
     });
-    const requirementFindings = parseRequirementFindings(data.requirementFindings);
-    if (data.verdict === "MERGE" &&
-        (findings.length || requirementFindings.length))
-        throw new Error("MERGE requires no findings or requirementFindings");
-    if (data.verdict === "CHANGES_REQUESTED" &&
-        !findings.length &&
-        !requirementFindings.length)
-        throw new Error("CHANGES_REQUESTED requires findings or requirementFindings");
-    if (data.verdict === "CLOSE" &&
-        (findings.length || requirementFindings.length))
-        throw new Error("CLOSE requires no findings or requirementFindings");
+    if (data.verdict === "MERGE" && findings.length)
+        throw new Error("MERGE requires no findings");
+    if (data.verdict === "CHANGES_REQUESTED" && !findings.length)
+        throw new Error("CHANGES_REQUESTED requires findings");
+    if (data.verdict === "CLOSE" && findings.length)
+        throw new Error("CLOSE requires no findings");
     const reason = typeof data.reason === "string" && data.reason.trim()
         ? data.reason
         : undefined;
@@ -218,7 +194,6 @@ export function parseReviewOutput(text) {
     return {
         findings,
         reason,
-        requirementFindings,
         verdict: data.verdict,
     };
 }
@@ -226,6 +201,8 @@ export function parseRereviewOutput(text) {
     const data = extractJson(text);
     if (!isVerdict(data.verdict))
         throw new Error("rereview verdict must be MERGE, CHANGES_REQUESTED, or CLOSE");
+    if (data.requirementFindings != null)
+        throw new Error("requirementFindings is not accepted");
     const resolve = requireArray(data.resolve, "resolve").map((item, index) => {
         const value = item;
         return {
@@ -242,7 +219,7 @@ export function parseRereviewOutput(text) {
     });
     const newFindings = requireArray(data.newFindings, "newFindings").map((item, index) => {
         const value = item;
-        const line = optionalLine(value.line, `newFindings[${index}].line`);
+        const line = requireLine(value.line, `newFindings[${index}].line`);
         return {
             body: requireString(value.body, `newFindings[${index}].body`),
             line,
@@ -254,29 +231,24 @@ export function parseRereviewOutput(text) {
             }),
         };
     });
-    const requirementFindings = parseRequirementFindings(data.requirementFindings);
-    if (data.verdict === "MERGE" &&
-        (followUps.length || newFindings.length || requirementFindings.length)) {
-        throw new Error("MERGE requires no followUps, newFindings, or requirementFindings");
+    if (data.verdict === "MERGE" && (followUps.length || newFindings.length)) {
+        throw new Error("MERGE requires no followUps or newFindings");
     }
-    if (data.verdict === "CLOSE" &&
-        (followUps.length || newFindings.length || requirementFindings.length)) {
-        throw new Error("CLOSE requires no followUps, newFindings, or requirementFindings");
+    if (data.verdict === "CLOSE" && (followUps.length || newFindings.length)) {
+        throw new Error("CLOSE requires no followUps or newFindings");
     }
     if (data.verdict === "CLOSE" && !data.reason) {
         throw new Error("CLOSE requires reason");
     }
     if (data.verdict === "CHANGES_REQUESTED" &&
         !followUps.length &&
-        !newFindings.length &&
-        !requirementFindings.length) {
-        throw new Error("CHANGES_REQUESTED requires followUps, newFindings, or requirementFindings");
+        !newFindings.length) {
+        throw new Error("CHANGES_REQUESTED requires followUps or newFindings");
     }
     return {
         followUps,
         newFindings,
         reason: data.reason == null ? undefined : requireString(data.reason, "reason"),
-        requirementFindings,
         resolve,
         verdict: data.verdict,
     };

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

@@ -2,7 +2,7 @@ Fix pull request #{pr} for {owner}/{repo}.
 The PR worktree is {worktreePath}.
 
 Act as the PR author and address every blocking review finding listed below.
-Review findings are the complete set of requested changes. Inline findings target a PR diff line; file-level findings may not have a GitHub thread; requirement findings describe missing closing-issue requirements.
+Review findings are the complete set of requested changes. Each finding targets a PR diff line and should have a corresponding GitHub review thread unless it comes from legacy read-side state.
 {reviewFindings}
 
 Unresolved GitHub review threads are conversations that may need replies or resolution.
@@ -12,5 +12,4 @@ For each review finding and thread, decide whether you agree with the reviewer.
 If you understand and agree with the requested change, edit the code, stage changes, commit, and reply with action FIXED for each related thread.
 If a requested change in a thread is incorrect or unnecessary and you have a clear reason, do not edit for that thread; reply with action DISAGREE and explain why.
 If you cannot determine whether a threaded request is correct or what change is expected, do not blindly edit; reply with action ASK and ask a concrete question.
-File-level and requirement findings may not have a thread to reply to, but they are still blocking and must be addressed.
 Do not make changes just because a reviewer requested them. Do not push.

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

@@ -2,4 +2,5 @@ You requested CLOSE for pull request #{pr} in {owner}/{repo}, but the other revi
 Reconsider your decision using the existing session context and choose MERGE or CHANGES_REQUESTED instead.
 Original close reason:
 {closeReason}
+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.
 Do not edit files or perform write operations.

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

@@ -9,6 +9,9 @@ If there is no new commit, still reconsider the thread when a user replied after
 If you agree with the user's explanation or the code is fixed, resolve the thread.
 If you do not agree, reply in the same thread with a followUp explaining why the issue still needs changes and keep CHANGES_REQUESTED.
 Do not duplicate an existing unresolved thread as a newFinding. Use newFindings only for separate new issues.
+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.
 
 {ciFailureContextBlock}
 Do not edit files or perform write operations.

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

@@ -10,4 +10,8 @@ Request changes if a closing issue requirement is missing, only documented, only
 Do not approve solely because the PR improves the codebase if it claims to close an issue that remains incomplete.
 For referenced non-closing issues, use them as context only unless the PR body explicitly claims to complete them.
 
+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.
+
 {ciFailureContextBlock}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-magi",
-  "version": "0.4.0",
+  "version": "0.6.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

@@ -116,12 +116,13 @@
     "triageAgent": {
       "type": "object",
       "if": { "not": { "required": ["ref"] } },
-      "then": { "required": ["model"] },
+      "then": { "required": ["model", "account"] },
       "additionalProperties": false,
       "properties": {
         "ref": { "type": "string", "minLength": 1 },
         "id": { "type": "string", "pattern": "^[A-Za-z0-9_-]+$" },
         "model": { "type": "string", "minLength": 1 },
+        "account": { "type": "string", "minLength": 1 },
         "options": { "type": "object", "additionalProperties": true },
         "permissions": { "$ref": "#/$defs/permissions" },
         "persona": { "type": "string" }
@@ -228,7 +229,6 @@
         "duplicate": { "type": "string" },
         "category": { "type": "string" },
         "acceptance": { "type": "string" },
-        "action": { "type": "string" },
         "question": { "type": "string" },
         "comment": { "type": "string" },
         "commentClassification": { "type": "string" },
@@ -334,7 +334,6 @@
       "type": "object",
       "additionalProperties": false,
       "properties": {
-        "account": { "type": "string", "minLength": 1 },
         "agents": {
           "type": "array",
           "minItems": 3,
@@ -349,6 +348,7 @@
         "safety": { "$ref": "#/$defs/triageSafety" },
         "concurrency": { "$ref": "#/$defs/triageConcurrency" },
         "prompts": { "$ref": "#/$defs/triagePrompts" },
+        "reporter": { "type": "string", "minLength": 1 },
         "output": { "type": "string" },
         "worktree": { "type": "string" }
       }

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

@@ -1,5 +0,0 @@
-Decide the next action for issue #{issue} in {owner}/{repo} from the provided triage result and allowed actions.
-
-<context>
-{context}
-</context>