opencode-magi 0.0.0-dev-20260630051947 → 0.0.0-dev-20260630052239

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;
@@ -267,10 +267,8 @@ export class Magi {
         const path = this.getPath(join(dir, number.toString(), id));
         try {
             await mkdir(dirname(path), { recursive: true });
-            await this.exec(command("git", "worktree", "add", quote(path)), {
-                signal,
-            });
-            await this.exec(command("gh", "pr", "checkout", number), {
+            await this.exec(command("git", "worktree", "add", "--detach", quote(path)), { signal });
+            await this.exec(command("gh", "pr", "checkout", number, "--detach"), {
                 cwd: path,
                 signal,
             });
@@ -278,9 +276,7 @@ export class Magi {
                 cwd: path,
                 signal,
             });
-            if (!branch)
-                throw new Error("Failed to determine worktree branch");
-            return { branch, path };
+            return { branch: branch || undefined, path };
         }
         catch (e) {
             try {

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

@@ -40,7 +40,7 @@ export async function edit() {
         }
         return parsed;
     }, {
-        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 +49,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 +135,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-20260630051947",
+  "version": "0.0.0-dev-20260630052239",
   "description": "Multi-agent PR review and merge orchestration plugin for OpenCode.",
   "license": "MIT",
   "author": "Hirotomo Yamada <hirotomo.yamada@avap.co.jp>",