opencode-magi 0.0.0-dev-20260522141924 → 0.0.0-dev-20260522143303

package/dist/config/worktree.js

@@ -17,3 +17,9 @@ export function worktreeBaseDirs(directory, config = {}) {
         worktreeBaseDir(directory, config, "issue"),
     ];
 }
+export function prRunWorktreeDir(input) {
+    return join(worktreeBaseDir(input.directory, input.config, "pr"), String(input.pr), input.runId);
+}
+export function issueRunWorktreeDir(input) {
+    return join(worktreeBaseDir(input.directory, input.config, "issue"), String(input.issue), input.runId);
+}

package/dist/github/commands.js

@@ -446,9 +446,8 @@ export async function fetchMergeQueueRequirement(exec, repository, branch) {
     const rules = JSON.parse(raw);
     return rules.some((rule) => rule.type === "merge_queue");
 }
-export async function createWorktree(exec, repository, pr, root) {
-    const worktreePath = join(root, `pr-${pr}`);
-    const lockKey = `${repoSpecifier(repository)}:${root}`;
+export async function createWorktree(exec, repository, pr, worktreePath) {
+    const lockKey = `${repoSpecifier(repository)}:${dirname(dirname(worktreePath))}`;
     return withWorktreeCreateLock(lockKey, async () => {
         let worktreeAdded = false;
         try {

package/dist/orchestrator/review.js

@@ -3,7 +3,7 @@ import { join } from "node:path";
 import { createWorktree, fetchPullRequest, fetchPullRequestCommits, fetchPullRequestReviews, fetchUnresolvedThreads, closePullRequest, mergePullRequest, postApproval, postChangesRequested, postCloseComment, postReply, removeWorktree, resolveThread, shellQuote, } from "../github/commands";
 import { composeFindingValidationPrompt, composeCloseReconsiderationPrompt, composeRereviewPrompt, composeReviewPrompt, } from "../prompts/compose";
 import { prRunOutputDir } from "../config/output";
-import { worktreeBaseDir } from "../config/worktree";
+import { prRunWorktreeDir } from "../config/worktree";
 import { parseCloseReconsiderationOutput, parseFindingValidationOutput, parseRereviewOutput, parseReviewOutput, } from "../prompts/output";
 import { throwIfAborted, withAbortSignal } from "./abort";
 import { waitForChecksWithClassification } from "./ci";
@@ -552,11 +552,13 @@ export async function runReview(input) {
         : preliminaryMode;
     if (mode.type === "already_reviewed" && !input.allowAlreadyReviewed)
         throw new Error("PR has already been reviewed by all configured accounts");
-    const outputDir = join(prRunOutputDir({
+    const runId = input.runId ?? `run-${Date.now().toString(36)}`;
+    const outputDir = prRunOutputDir({
         config: input.config,
         directory: input.directory,
         pr: input.pr,
-    }), ...(input.runId ? [input.runId] : []));
+        runId,
+    });
     await mkdir(outputDir, { recursive: true });
     await input.onProgress?.({ phase: "fetching review context", type: "phase" });
     const reviewContextSnapshot = await buildReviewContextSnapshot({
@@ -621,10 +623,14 @@ export async function runReview(input) {
             checkResult.report.scopeInside.length)) {
         await input.onProgress?.({ report: checkResult.report, type: "ci_report" });
     }
-    const worktreeRoot = worktreeBaseDir(input.directory, input.config, "pr");
+    const worktreePath = prRunWorktreeDir({
+        config: input.config,
+        directory: input.directory,
+        pr: input.pr,
+        runId,
+    });
     await input.onProgress?.({ phase: "creating worktree", type: "phase" });
-    const worktree = await createWorktree(exec, input.repository, input.pr, worktreeRoot);
-    const worktreePath = worktree.path;
+    const worktree = await createWorktree(exec, input.repository, input.pr, worktreePath);
     await input.onProgress?.({
         branch: worktree.branch,
         type: "worktree_created",

package/dist/orchestrator/run-manager.js

@@ -1463,6 +1463,18 @@ export class MagiRunManager {
             state.worktreePath = progress.worktreePath;
             state.worktreeBranch = progress.branch;
         }
+        if (progress.type === "triage_session") {
+            if (progress.options)
+                this.input.setSessionOptions?.(progress.sessionId, progress.options);
+            state.sessionIds = {
+                ...state.sessionIds,
+                [progress.key]: progress.sessionId,
+            };
+            this.sessionToRun.set(progress.sessionId, {
+                agent: progress.agent,
+                runId,
+            });
+        }
         if (progress.type === "triage_agent_started") {
             const reviewer = state.reviewers[progress.reviewer];
             if (reviewer)

package/dist/orchestrator/triage.js

@@ -1,7 +1,7 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 import { issueRunOutputDir } from "../config/output";
-import { worktreeBaseDir } from "../config/worktree";
+import { issueRunWorktreeDir } from "../config/worktree";
 import { assignIssue, closeIssue, closePullRequest, configureGitIdentity, createPullRequest, fetchIssue, fetchIssueComments, fetchRelatedPullRequests, postIssueComment, pushHead, removeIssueLabels, removeWorktree, searchDuplicateIssues, shellQuote, updateIssueComment, } from "../github/commands";
 import { composeTriageAcceptancePrompt, composeTriageCategoryPrompt, composeTriageCommentClassificationPrompt, composeTriageCreatePrPrompt, composeTriageDuplicatePrompt, composeTriageExistingPrPrompt, composeTriageReconsiderPrompt, } from "../prompts/compose";
 import { parseTriageBinaryOutput, parseTriageCategoryOutput, parseTriageCommentClassificationOutput, parseTriageCreatePrOutput, parseTriageDuplicateOutput, parseTriageExistingPrOutput, } from "../prompts/output";
@@ -457,9 +457,7 @@ function previousAutomationPlan(input) {
     };
 }
 async function classifyMentionReplies(input) {
-    const agent = input.input.repository.agents.triage?.[0];
-    if (!agent)
-        throw new Error("triage.agents is required");
+    const agent = triageReporter(input.input.repository, input.input.issue);
     const prompt = await composeTriageCommentClassificationPrompt({
         context: JSON.stringify({ context: input.context, mentionReplies: input.replies }, null, 2),
         directory: input.input.directory,
@@ -470,6 +468,17 @@ async function classifyMentionReplies(input) {
     const result = await runModelWithRepair({
         client: input.input.client,
         model: agent.model,
+        onProgress: async (progress) => {
+            if (progress.type !== "session_created")
+                return;
+            await emitProgress(input.input, {
+                agent: agent.key,
+                key: `triage:comment-classification:${agent.key}:${progress.sessionId}`,
+                options: progress.options,
+                sessionId: progress.sessionId,
+                type: "triage_session",
+            });
+        },
         options: agent.options,
         parentSessionId: input.input.parentSessionId,
         parse: parseTriageCommentClassificationOutput,
@@ -478,7 +487,7 @@ async function classifyMentionReplies(input) {
         repairAttempts: 3,
         schemaName: "triage comment classification",
         signal: input.input.signal,
-        title: `Magi triage comment classification #${input.input.issue}`,
+        title: `Magi triage comment classification #${input.input.issue} (${agent.key})`,
     });
     await writeJson(join(input.outputDir, "comment-classification.json"), result.value);
     return result.value;
@@ -698,6 +707,7 @@ async function finishWithResult(input) {
                 input: input.input,
                 issue: input.issue,
                 outputDir: input.outputDir,
+                runId: input.runId,
             });
             if (prUrl) {
                 await writeJson(join(input.outputDir, "pr.json"), { url: prUrl });
@@ -766,7 +776,12 @@ async function createImplementationPr(input) {
     try {
         await assignIssue(input.input.exec, input.input.repository, input.issue.number, creator.account);
         const branch = `magi/issue-${input.issue.number}-${Date.now().toString(36)}`;
-        const worktreePath = join(worktreeBaseDir(input.input.directory, input.input.config, "issue"), `issue-${input.issue.number}`);
+        const worktreePath = issueRunWorktreeDir({
+            config: input.input.config,
+            directory: input.input.directory,
+            issue: input.issue.number,
+            runId: input.runId,
+        });
         await mkdir(dirname(worktreePath), { recursive: true });
         await input.input.exec(`git worktree add -b ${shellQuote(branch)} ${shellQuote(worktreePath)}`);
         await emitProgress(input.input, {
@@ -914,6 +929,7 @@ export async function runTriage(input) {
                     processed,
                     relationship,
                     result,
+                    runId,
                 });
             }
             const report = `Magi triage skipped #${issue.number} because no eligible mention replies were found for reconsideration.`;
@@ -1032,6 +1048,7 @@ export async function runTriage(input) {
                     processed,
                     relationship,
                     result: relatedPrDecision,
+                    runId,
                 });
             }
             return finishWithResult({
@@ -1042,6 +1059,7 @@ export async function runTriage(input) {
                 processed,
                 relationship,
                 result: { category: null, disposition: "clear_only" },
+                runId,
             });
         }
     }
@@ -1139,5 +1157,6 @@ export async function runTriage(input) {
             category: null,
             disposition: "ask",
         },
+        runId,
     });
 }

package/package.json

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