opencode-magi 0.0.0-dev-20260715023915 → 0.0.0-dev-20260717081152

package/dist/prompts/review/rereview/output-contract.md

@@ -15,6 +15,7 @@ Rules:
 - `"verdict"` must be `"APPROVED"`, `"CHANGES_REQUESTED"`, or `"CLOSED"`.
 - `"resolves"` contains threads that should be resolved because the issue is fixed or the user's explanation is acceptable.
 - Each `"resolves"` item must use the exact `"commentId"` and `"threadId"` from `<unresolved_threads>`.
+- Each `"followUps"` item must use a `"commentId"` from `<unresolved_threads>`.
 - Omit `"resolves"` when no thread should be resolved.
 - `"APPROVED"` may omit `"followUps"` and `"newFindings"`. If present, they must be empty.
 - `"APPROVED"` may omit `"comment"`. If present, it must be an empty string.

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

@@ -3,11 +3,12 @@ The PR worktree is {worktreePath}.
 Validate whether your unresolved comments are fixed in the diff from {previousHeadSha} to {headSha} and in the review thread conversation.
 Use: git -C "{worktreePath}" diff {previousHeadSha}...{headSha}
 Your unresolved threads are provided in `<unresolved_threads>`.
+All review threads are provided in `<review>` for context, but only your unresolved threads may be resolved or receive followUps.
 
 If there is no new commit, still reconsider the thread when a user replied after your latest comment.
 If you agree with the user's explanation or the code is fixed, add the thread to `resolves`.
 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.
+Do not duplicate an issue already raised in any review 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.

package/dist/tools/review/reviewer.js

@@ -101,6 +101,7 @@ export async function review() {
                 const parsed = prompt.parse(raw);
                 if (!prompt.validate(parsed))
                     throw new Error(`Invalid output for reviewer ${id}.`);
+                validateThreadTargets(parsed, unresolvedThreads);
                 validateInlineCommentTargets(status, parsed, inlineCommentTargets);
                 const findings = parsed.findings ?? parsed.newFindings ?? [];
                 await this.updateEvent(filterEmpty([
@@ -383,3 +384,14 @@ function validateInlineCommentTargets(status, output, inlineCommentTargets) {
         }
     }
 }
+function validateThreadTargets({ followUps, resolves }, threads) {
+    const targets = new Map(threads.flatMap(({ comments, id }) => comments.flatMap(({ databaseId }) => databaseId == null ? [] : [[databaseId, id]])));
+    if (followUps)
+        for (const [index, { commentId }] of followUps.entries())
+            if (!targets.has(commentId))
+                throw new Error(`followUps[${index}].commentId must target an unresolved thread owned by the reviewer.`);
+    if (resolves)
+        for (const [index, { commentId, threadId }] of resolves.entries())
+            if (targets.get(commentId) !== threadId)
+                throw new Error(`resolves[${index}] must target an unresolved thread owned by the reviewer.`);
+}

package/package.json

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