opencode-magi 0.0.0-dev-20260630052048 → 0.0.0-dev-20260630070412

package/dist/magi.js

@@ -200,7 +200,7 @@ export class Magi {
         const prev = await this.getState(dir);
         const state = merge(prev, next);
         const values = [this.createStateFile(state)];
-        if (next.text)
+        if (!state.sync && next.text)
             values.push(this.notify(prev.sessionId, next.text));
         await Promise.all(values);
         return state;

package/dist/prompts/merge/edit/output-contract.md

@@ -19,6 +19,8 @@ Rules:
 - `"ASK"` means you need clarification and did not edit.
 - Do not make changes just because a reviewer requested them; edit only when you understand and agree.
 - Do not push. The orchestrator pushes after validating this envelope.
-- `filesTouched` must include every final changed file.
-- `responses` must include a reply for each thread you addressed.
-- `"REPLIED"` requires `filesTouched` to be empty and at least one `"DISAGREE"` or `"ASK"` response.
+- `filesTouched` is required for `"EDITED"` and must include every final changed file.
+- `responses` is required and must include a reply for each thread you addressed.
+- `"EDITED"` requires at least one response.
+- `"REPLIED"` may omit `filesTouched`. If present, it must be empty.
+- `"REPLIED"` requires at least one `"DISAGREE"` or `"ASK"` response.

package/dist/prompts/merge/edit/validate.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["mode", "filesTouched", "responses"],
+  "required": ["mode", "responses"],
   "additionalProperties": false,
   "properties": {
     "mode": { "enum": ["EDITED", "REPLIED"] },
@@ -28,8 +28,11 @@
     {
       "if": { "properties": { "mode": { "const": "EDITED" } } },
       "then": {
-        "required": ["commitSha", "commitMessage"],
-        "properties": { "filesTouched": { "type": "array", "minItems": 1 } }
+        "required": ["commitSha", "commitMessage", "filesTouched"],
+        "properties": {
+          "filesTouched": { "type": "array", "minItems": 1 },
+          "responses": { "type": "array", "minItems": 1 }
+        }
       }
     },
     {

package/dist/prompts/review/close-reconsideration/output-contract.md

@@ -11,7 +11,8 @@ Return exactly one JSON object and nothing else. Do not wrap it in markdown.
 Rules:
 
 - `"verdict"` must be `"APPROVED"` or `"CHANGES_REQUESTED"`.
-- `"APPROVED"` requires an empty `"findings"` array.
+- `"APPROVED"` may omit `"findings"`. If present, it must be empty.
+- `"APPROVED"` may omit `"comment"`. If present, it must be an empty string.
 - `"CHANGES_REQUESTED"` requires `"comment"` and at least one `"finding"`.
 - `"comment"` for `"CHANGES_REQUESTED"` must be a concise prose review summary, not a bullet list of findings.
 - `"CLOSED"` is not allowed in this reconsideration step.

package/dist/prompts/review/close-reconsideration/validate.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["verdict", "findings"],
+  "required": ["verdict"],
   "additionalProperties": false,
   "properties": {
     "verdict": { "enum": ["APPROVED", "CHANGES_REQUESTED"] },
@@ -18,20 +18,26 @@
         }
       }
     },
-    "comment": { "type": "string", "minLength": 1 }
+    "comment": { "type": "string" }
   },
   "allOf": [
     {
       "if": { "properties": { "verdict": { "const": "APPROVED" } } },
       "then": {
-        "properties": { "findings": { "type": "array", "maxItems": 0 } }
+        "properties": {
+          "findings": { "type": "array", "maxItems": 0 },
+          "comment": { "const": "" }
+        }
       }
     },
     {
       "if": { "properties": { "verdict": { "const": "CHANGES_REQUESTED" } } },
       "then": {
-        "required": ["comment"],
-        "properties": { "findings": { "type": "array", "minItems": 1 } }
+        "required": ["comment", "findings"],
+        "properties": {
+          "findings": { "type": "array", "minItems": 1 },
+          "comment": { "type": "string", "minLength": 1 }
+        }
       }
     }
   ]

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

@@ -15,11 +15,12 @@ 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>`.
-- Use an empty `"resolves"` array when no thread should be resolved.
-- `"APPROVED"` requires empty `"followUps"` and `"newFindings"` arrays.
+- 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.
 - `"CHANGES_REQUESTED"` requires `"comment"` and at least one `"followUp"` or `"newFinding"`.
 - `"comment"` for `"CHANGES_REQUESTED"` must be a concise prose review summary, not a bullet list of findings.
-- `"CLOSED"` requires `"comment"` and empty `"followUps"` and `"newFindings"` arrays.
+- `"CLOSED"` requires `"comment"` and may omit `"followUps"` and `"newFindings"`. If present, they must be empty.
 - `"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.

package/dist/prompts/review/rereview/validate.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["verdict", "resolves", "followUps", "newFindings"],
+  "required": ["verdict"],
   "additionalProperties": false,
   "properties": {
     "verdict": { "enum": ["APPROVED", "CHANGES_REQUESTED", "CLOSED"] },
@@ -42,7 +42,7 @@
         }
       }
     },
-    "comment": { "type": "string", "minLength": 1 }
+    "comment": { "type": "string" }
   },
   "allOf": [
     {
@@ -50,7 +50,8 @@
       "then": {
         "properties": {
           "followUps": { "type": "array", "maxItems": 0 },
-          "newFindings": { "type": "array", "maxItems": 0 }
+          "newFindings": { "type": "array", "maxItems": 0 },
+          "comment": { "const": "" }
         }
       }
     },
@@ -59,11 +60,16 @@
       "then": {
         "required": ["comment"],
         "anyOf": [
-          { "properties": { "followUps": { "type": "array", "minItems": 1 } } },
           {
+            "required": ["followUps"],
+            "properties": { "followUps": { "type": "array", "minItems": 1 } }
+          },
+          {
+            "required": ["newFindings"],
             "properties": { "newFindings": { "type": "array", "minItems": 1 } }
           }
-        ]
+        ],
+        "properties": { "comment": { "type": "string", "minLength": 1 } }
       }
     },
     {
@@ -72,7 +78,8 @@
         "required": ["comment"],
         "properties": {
           "followUps": { "type": "array", "maxItems": 0 },
-          "newFindings": { "type": "array", "maxItems": 0 }
+          "newFindings": { "type": "array", "maxItems": 0 },
+          "comment": { "type": "string", "minLength": 1 }
         }
       }
     }

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

@@ -11,10 +11,11 @@ Return exactly one JSON object and nothing else. Do not wrap it in markdown.
 Rules:
 
 - `"verdict"` must be `"APPROVED"`, `"CHANGES_REQUESTED"`, or `"CLOSED"`.
-- `"APPROVED"` requires an empty `"findings"` array.
+- `"APPROVED"` may omit `"findings"`. If present, it must be empty.
+- `"APPROVED"` may omit `"comment"`. If present, it must be an empty string.
 - `"CHANGES_REQUESTED"` requires `"comment"` and at least one `"finding"`.
 - `"comment"` for `"CHANGES_REQUESTED"` must be a concise prose review summary, not a bullet list of findings.
-- `"CLOSED"` requires `"comment"` and an empty `"findings"` array.
+- `"CLOSED"` requires `"comment"` and may omit `"findings"`. If present, `"findings"` must be empty.
 - `"path"` must be repository-relative.
 - `"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.

package/dist/prompts/review/review/validate.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["verdict", "findings"],
+  "required": ["verdict"],
   "additionalProperties": false,
   "properties": {
     "verdict": { "enum": ["APPROVED", "CHANGES_REQUESTED", "CLOSED"] },
@@ -18,27 +18,36 @@
         }
       }
     },
-    "comment": { "type": "string", "minLength": 1 }
+    "comment": { "type": "string" }
   },
   "allOf": [
     {
       "if": { "properties": { "verdict": { "const": "APPROVED" } } },
       "then": {
-        "properties": { "findings": { "type": "array", "maxItems": 0 } }
+        "properties": {
+          "findings": { "type": "array", "maxItems": 0 },
+          "comment": { "const": "" }
+        }
       }
     },
     {
       "if": { "properties": { "verdict": { "const": "CHANGES_REQUESTED" } } },
       "then": {
-        "required": ["comment"],
-        "properties": { "findings": { "type": "array", "minItems": 1 } }
+        "required": ["comment", "findings"],
+        "properties": {
+          "findings": { "type": "array", "minItems": 1 },
+          "comment": { "type": "string", "minLength": 1 }
+        }
       }
     },
     {
       "if": { "properties": { "verdict": { "const": "CLOSED" } } },
       "then": {
         "required": ["comment"],
-        "properties": { "findings": { "type": "array", "maxItems": 0 } }
+        "properties": {
+          "findings": { "type": "array", "maxItems": 0 },
+          "comment": { "type": "string", "minLength": 1 }
+        }
       }
     }
   ]

package/dist/prompts/triage/create/output-contract.md

@@ -22,6 +22,7 @@ Rules:
 - Use REPLIED when you only replied without code changes.
 - For EDITED, pullRequest.title and pullRequest.body must be non-empty and follow the repository's PR conventions.
 - Do not push or create the PR. The orchestrator pushes and creates the PR using pullRequest exactly as provided.
-- filesTouched must include every final changed file.
-- responses may be empty when no review threads were addressed.
-- REPLIED requires filesTouched to be empty and at least one DISAGREE or ASK response.
+- filesTouched is required for EDITED and must include every final changed file.
+- responses may be omitted when no review threads were addressed.
+- REPLIED may omit filesTouched. If present, it must be empty.
+- REPLIED requires at least one DISAGREE or ASK response.

package/dist/prompts/triage/create/validate.json

@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "required": ["mode", "filesTouched", "responses"],
+  "required": ["mode"],
   "additionalProperties": false,
   "properties": {
     "mode": { "enum": ["EDITED", "REPLIED"] },
@@ -37,13 +37,19 @@
     {
       "if": { "properties": { "mode": { "const": "EDITED" } } },
       "then": {
-        "required": ["commitSha", "commitMessage", "pullRequest"],
+        "required": [
+          "commitSha",
+          "commitMessage",
+          "filesTouched",
+          "pullRequest"
+        ],
         "properties": { "filesTouched": { "type": "array", "minItems": 1 } }
       }
     },
     {
       "if": { "properties": { "mode": { "const": "REPLIED" } } },
       "then": {
+        "required": ["responses"],
         "not": {
           "anyOf": [
             { "required": ["commitSha"] },

package/dist/prompts/triage/signal/output-contract.md

@@ -16,4 +16,4 @@ The object must match this shape:
 Rules:
 
 - Return only configured signal IDs that apply.
-- Return an empty signals array when none apply.
+- Omit `"signals"` when none apply.

package/dist/prompts/triage/signal/validate.json

@@ -1,6 +1,5 @@
 {
   "type": "object",
-  "required": ["signals"],
   "additionalProperties": false,
   "properties": {
     "signals": {

package/dist/tools/merge/action.js

@@ -9,10 +9,10 @@ export async function editCycles(callback) {
             throw error;
         return verdict;
     }, {
-        error: (e, count) => {
+        error: async (e, count) => {
             if (e !== error)
                 throw e;
-            this.magi.notify(this.state.sessionId, `Attempt ${count} failed to edit cycles for ${this.getLink()}. Retrying...`);
+            await this.notify(`Attempt ${count} failed to edit cycles for ${this.getLink()}. Retrying...`);
         },
         retries: this.config.merge.maxThreadResolutionCycles,
     });

package/dist/tools/merge/editor.js

@@ -30,17 +30,21 @@ export async function edit() {
         const parsed = prompt.parse(raw);
         if (!prompt.validate(parsed))
             throw new Error("Invalid output for editor.");
-        if (parsed.mode === "EDITED") {
+        const output = {
+            ...parsed,
+            filesTouched: parsed.filesTouched ?? [],
+        };
+        if (output.mode === "EDITED") {
             const head = await this.exec(command("git", "rev-parse", "HEAD"), {
                 cwd: this.state.worktree.path,
                 signal: this.context.abort,
             });
-            if (head !== parsed.commitSha)
-                throw new Error(`Editor reported commit ${parsed.commitSha}, but worktree HEAD is ${head}.`);
+            if (head !== output.commitSha)
+                throw new Error(`Editor reported commit ${output.commitSha}, but worktree HEAD is ${head}.`);
         }
-        return parsed;
+        return output;
     }, {
-        error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to edit ${this.getLink()}. Retrying...`),
+        error: (_, count) => this.notify(`Attempt ${count} failed to edit ${this.getLink()}. Retrying...`),
         retries: this.config.output.repairAttempts,
     });
     if (!output)
@@ -49,7 +53,7 @@ export async function edit() {
         editor: { outputs: [...(this.state.editor.outputs ?? []), output] },
         text: `Finished editing ${this.getLink()}.`,
     });
-    await this.magi.notify(this.state.sessionId, filterEmpty([
+    await this.notify(filterEmpty([
         `Editor ${output.mode === "EDITED" ? "edited" : "replied to"} ${this.getLink()}.`,
         output.commitSha
             ? `Commit: ${output.commitSha}${output.commitMessage ? ` ${output.commitMessage}` : ""}`
@@ -135,7 +139,7 @@ export async function resolveConflict() {
             responses: [],
         };
     }, {
-        error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to resolve conflicts for ${this.getLink()}. Retrying...`),
+        error: (_, count) => this.notify(`Attempt ${count} failed to resolve conflicts for ${this.getLink()}. Retrying...`),
         retries: this.config.output.repairAttempts,
     });
     if (!output)

package/dist/tools/merge/merge.js

@@ -27,8 +27,8 @@ export class Merge extends Review {
             permissions: config.merge.editor.permissions,
         };
         const state = await magi.createState(join(config.review.output, number.toString()), {
+            ...options,
             command: "merge",
-            dryRun: options.dryRun,
             editor,
             operator,
             pr: { number, url },

package/dist/tools/review/action.js

@@ -45,7 +45,7 @@ export async function postReviews() {
                     .map((finding) => ({ ...finding, id }));
             });
             if (!findings.length) {
-                this.magi.notify(this.state.sessionId, `Finished posting reviews for ${this.getLink()}.`);
+                await this.notify(`Finished posting reviews for ${this.getLink()}.`);
                 return;
             }
             params.comments = findings.map(({ body, id, line, path, startLine }) => ({
@@ -63,7 +63,7 @@ export async function postReviews() {
         if (this.state.pr.verdict !== "APPROVED") {
             if (!this.state.operator?.sessionId)
                 throw new MagiError("blocked", "Reporter session ID not found.");
-            await this.magi.notify(this.state.sessionId, `Generating comment for ${this.getLink()} by operator.`);
+            await this.notify(`Generating comment for ${this.getLink()} by operator.`);
             const contents = JSON.stringify(reviewers.flatMap(([, { outputs }]) => {
                 const output = outputs?.at(-1);
                 if (!output || output.verdict === "APPROVED")
@@ -88,12 +88,12 @@ export async function postReviews() {
                     throw new Error("Invalid output for operator.");
                 return parsed.comment;
             }, {
-                error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to post comment for ${this.getLink()} by operator. Retrying...`),
+                error: (_, count) => this.notify(`Attempt ${count} failed to post comment for ${this.getLink()} by operator. Retrying...`),
                 retries: this.config.output.repairAttempts,
             });
             if (!output)
                 throw new MagiError("blocked", "Invalid output for operator.");
-            await this.magi.notify(this.state.sessionId, `Generated comment for ${this.getLink()} by operator.`);
+            await this.notify(`Generated comment for ${this.getLink()} by operator.`);
             params.body = output;
         }
         params.body = [

package/dist/tools/review/check.js

@@ -115,7 +115,7 @@ export async function classifyChecks() {
     await Promise.all(Object.entries(this.state.reviewers ?? {}).map(([id, { sessionId }]) => worker.run(async () => {
         if (!sessionId)
             throw new Error(`No session ID found for reviewer ${id}.`);
-        await this.magi.notify(this.state.sessionId, `Classifying CI checks for ${this.getLink()} with reviewer ${id}.`);
+        await this.notify(`Classifying CI checks for ${this.getLink()} with reviewer ${id}.`);
         const output = await retry(async (count) => {
             const raw = await this.magi.promptSession(sessionId, count === 1 ? taskMessage : repairMessage);
             const parsed = prompt.parse(raw);
@@ -123,7 +123,7 @@ export async function classifyChecks() {
                 throw new Error(`Invalid output for reviewer ${id}.`);
             return parsed;
         }, {
-            error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to classify CI checks for ${this.getLink()} with reviewer ${id}. Retrying...`),
+            error: (_, count) => this.notify(`Attempt ${count} failed to classify CI checks for ${this.getLink()} with reviewer ${id}. Retrying...`),
             retries: this.config.output.repairAttempts,
         });
         if (!output)
@@ -151,7 +151,7 @@ export async function classifyChecks() {
                 .filter(([, { scope }]) => !scope)
                 .map(([id, { comment }]) => `- ${id}: ${comment}`),
         };
-        await this.magi.notify(this.state.sessionId, filterEmpty([
+        await this.notify(filterEmpty([
             scope
                 ? `Check ${name} for ${this.getLink()} was classified as in scope by majority vote.`
                 : `Check ${name} for ${this.getLink()} was classified as out of scope by majority vote. Rerunning it.`,
@@ -192,7 +192,7 @@ export async function rerunChecks() {
     }
     else {
         await retry(async () => {
-            await this.magi.notify(this.state.sessionId, `Rerunning checks ${label} for ${this.getLink()}.`);
+            await this.notify(`Rerunning checks ${label} for ${this.getLink()}.`);
             await Promise.all(checks.failed
                 .filter(({ scope }) => !scope)
                 .map(async ({ id }) => rerunCheck.call(this, id)));
@@ -212,7 +212,7 @@ export async function rerunChecks() {
             label = failedChecks.map(({ name }) => name).join(", ");
             throw new Error(`Checks ${label} for ${this.getLink()} still failed.`);
         }, {
-            error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to rerun checks ${label} for ${this.getLink()}. Retrying...`),
+            error: (_, count) => this.notify(`Attempt ${count} failed to rerun checks ${label} for ${this.getLink()}. Retrying...`),
             retries: this.config.review.checks.retryFailedJobs,
         });
     }
@@ -227,7 +227,7 @@ export async function rerunChecks() {
             : undefined,
     ]).join("\n");
     if (message)
-        await this.magi.notify(this.state.sessionId, message);
+        await this.notify(message);
     this.state = await this.magi.updateState(this.state.output, {
         pr: { checks },
         text: `Finished rerunning checks for ${this.getLink()}.`,

package/dist/tools/review/review.js

@@ -40,8 +40,8 @@ export class Review {
             ? config.review.reviewers.find(({ id }) => id === config.review.operator)
             : config.review.reviewers[Math.abs(number) % config.review.reviewers.length];
         const state = await magi.createState(join(config.review.output, number.toString()), {
+            ...options,
             command: "review",
-            dryRun: options.dryRun,
             operator,
             pr: { number, url },
             repo: quote(`${config.github.owner}/${config.github.repo}`),
@@ -64,6 +64,10 @@ export class Review {
     postReviews = postReviews;
     automate = automate;
     createReport = createReport;
+    async notify(text) {
+        if (!this.state.sync)
+            await this.magi.notify(this.state.sessionId, text);
+    }
     async cleanup() {
         if (this.state.worktree?.path)
             await this.magi.deleteWorktree(this.state.worktree.path);

package/dist/tools/review/reviewer.js

@@ -22,7 +22,7 @@ export async function review() {
             throw new MagiError("blocked", "Reviewers not found.");
         const { outputs, review, sessionId, status } = this.state.reviewers[id];
         if (status === "skip") {
-            this.magi.notify(this.state.sessionId, `Skipping review for ${this.getLink()} with reviewer ${id}.`);
+            await this.notify(`Skipping review for ${this.getLink()} with reviewer ${id}.`);
             return [id, {}];
         }
         else {
@@ -32,7 +32,7 @@ export async function review() {
                 throw new MagiError("blocked", `Missing previous review commit for reviewer ${id}.`);
             const rereview = status !== "initial";
             const label = rereview ? "rereview" : "review";
-            await this.magi.notify(this.state.sessionId, `Running ${label} for ${this.getLink()} with reviewer ${id}.`);
+            await this.notify(`Running ${label} for ${this.getLink()} with reviewer ${id}.`);
             const sha = rereview
                 ? (review?.commit_id ?? this.state.pr.metadata.base.sha)
                 : this.state.pr.metadata.base.sha;
@@ -104,7 +104,7 @@ export async function review() {
                 validateInlineCommentTargets(status, parsed, inlineCommentTargets);
                 return parsed;
             }, {
-                error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to ${label} for ${this.getLink()} with reviewer ${id}. Retrying...`),
+                error: (_, count) => this.notify(`Attempt ${count} failed to ${label} for ${this.getLink()} with reviewer ${id}. Retrying...`),
                 retries: this.config.output.repairAttempts,
             });
             if (!output)
@@ -184,7 +184,7 @@ export async function reconsiderClose() {
             repo: this.config.github.repo,
         });
         const repairMessage = await prompt.repair();
-        await this.magi.notify(this.state.sessionId, `Reconsidering close verdict for ${this.getLink()} with reviewer ${id}.`);
+        await this.notify(`Reconsidering close verdict for ${this.getLink()} with reviewer ${id}.`);
         const output = await retry(async (count) => {
             const raw = await this.magi.promptSession(sessionId, count === 1 ? taskMessage : repairMessage);
             const parsed = prompt.parse(raw);
@@ -193,7 +193,7 @@ export async function reconsiderClose() {
             validateInlineCommentTargets("initial", parsed, inlineCommentTargets);
             return parsed;
         }, {
-            error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to reconsider close verdict for ${this.getLink()} with reviewer ${id}. Retrying...`),
+            error: (_, count) => this.notify(`Attempt ${count} failed to reconsider close verdict for ${this.getLink()} with reviewer ${id}. Retrying...`),
             retries: this.config.output.repairAttempts,
         });
         if (!output)
@@ -240,7 +240,7 @@ async function collectAcceptedFindings(findings) {
         const { sessionId } = this.state.reviewers[id];
         if (!sessionId)
             throw new MagiError("blocked", `No session ID found for reviewer ${id}.`);
-        await this.magi.notify(this.state.sessionId, `Validating review findings for ${this.getLink()} with reviewer ${id}.`);
+        await this.notify(`Validating review findings for ${this.getLink()} with reviewer ${id}.`);
         const targetFindings = findings.filter((target) => target.reviewer !== id);
         const expectedKeys = new Set(targetFindings.map(({ index, reviewer }) => `${reviewer}:${index}`));
         const taskMessage = await prompt.create(this.config.review.prompts?.findingValidation, [
@@ -273,7 +273,7 @@ async function collectAcceptedFindings(findings) {
                     throw new Error(`Missing finding vote: ${key}.`);
             return parsed;
         }, {
-            error: (_, count) => this.magi.notify(this.state.sessionId, `Attempt ${count} failed to validate review findings for ${this.getLink()} with reviewer ${id}. Retrying...`),
+            error: (_, count) => this.notify(`Attempt ${count} failed to validate review findings for ${this.getLink()} with reviewer ${id}. Retrying...`),
             retries: this.config.output.repairAttempts,
         });
         if (!output)
@@ -298,7 +298,7 @@ async function collectAcceptedFindings(findings) {
             .map(({ validator, vote }) => `- ${validator}: ${vote.comment}`);
         if (agrees >= threshold)
             accepted.add(key);
-        await this.magi.notify(this.state.sessionId, filterEmpty([
+        await this.notify(filterEmpty([
             `Finding ${reviewer} #${index + 1} for ${this.getLink()} was ${agrees >= threshold ? "accepted" : "rejected"} by majority vote.`,
             `Finding: ${finding.path}:${finding.line}\n${finding.body}`,
             acceptedComments.length
@@ -338,7 +338,7 @@ async function notifyVerdictChanges(prev, next, reason) {
         const nextVerdict = reviewer.outputs?.at(-1)?.verdict;
         if (!prevVerdict || !nextVerdict || prevVerdict === nextVerdict)
             return;
-        await this.magi.notify(this.state.sessionId, `Reviewer ${id} verdict changed from ${prevVerdict} to ${nextVerdict} for ${this.getLink()} ${reason}.`);
+        await this.notify(`Reviewer ${id} verdict changed from ${prevVerdict} to ${nextVerdict} for ${this.getLink()} ${reason}.`);
     }));
 }
 function validateInlineCommentTargets(status, output, inlineCommentTargets) {

package/dist/utils/function.js

@@ -16,7 +16,7 @@ export async function retry(callback, { error, retries = 1 }) {
             return await callback(count);
         }
         catch (e) {
-            error?.(e, count);
+            await error?.(e, count);
             count += 1;
         }
 }

package/package.json

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