opencode-magi 0.6.1 → 0.8.0

package/dist/orchestrator/review.js

@@ -163,6 +163,90 @@ export async function inlineCommentTargetsForDiff(input) {
         cwd: input.worktreePath,
     }));
 }
+function firstTargetLine(targets, path) {
+    const lines = targets.get(path);
+    if (!lines?.size)
+        return undefined;
+    return [...lines].sort((a, b) => a - b)[0];
+}
+function mergeInlineCommentTargets(left, right) {
+    const merged = new Map();
+    for (const [path, lines] of [...left, ...right]) {
+        const targetLines = merged.get(path) ?? new Set();
+        for (const line of lines)
+            targetLines.add(line);
+        merged.set(path, targetLines);
+    }
+    return merged;
+}
+function targetLineSummary(targets, path) {
+    const lines = targets.get(path);
+    if (!lines?.size)
+        return "(none)";
+    const sorted = [...lines].sort((a, b) => a - b);
+    const shown = sorted.slice(0, 12).join(", ");
+    return sorted.length > 12 ? `${shown}, ...` : shown;
+}
+function indentedExcerpt(lines) {
+    return lines
+        .slice(0, 24)
+        .map((line) => `  ${line}`)
+        .join("\n");
+}
+function parseMergeConflictSections(output) {
+    const conflictHeaders = new Set([
+        "added in both",
+        "changed in both",
+        "removed in local",
+        "removed in remote",
+    ]);
+    const sections = [];
+    let current;
+    for (const line of output.split("\n")) {
+        if (!line.trim())
+            continue;
+        if (!line.startsWith(" ") &&
+            !line.startsWith("+") &&
+            !line.startsWith("-") &&
+            !line.startsWith("@")) {
+            current = conflictHeaders.has(line)
+                ? { lines: [line], paths: new Set() }
+                : undefined;
+            if (current)
+                sections.push(current);
+            continue;
+        }
+        if (!current)
+            continue;
+        current.lines.push(line);
+        const path = /^  (?:base|our|their)\s+\d+\s+[0-9a-f]+\s+(.+)$/.exec(line)?.[1];
+        if (path)
+            current.paths.add(path);
+    }
+    return sections.flatMap((section) => [...section.paths].map((path) => ({
+        excerpt: indentedExcerpt(section.lines),
+        path,
+    })));
+}
+export async function mergeConflictContextForDiff(input) {
+    const mergeBase = (await input.exec(`git merge-base ${shellQuote(input.baseSha)} ${shellQuote(input.headSha)}`, { cwd: input.worktreePath })).trim();
+    const output = await input.exec(`git merge-tree ${shellQuote(mergeBase)} ${shellQuote(input.headSha)} ${shellQuote(input.baseSha)}`, { cwd: input.worktreePath });
+    const conflicts = parseMergeConflictSections(output);
+    if (!conflicts.length)
+        return "";
+    return [
+        "The PR currently has unresolved merge conflicts with the base branch.",
+        "Treat unresolved conflicts as review findings and request changes when they make the PR unsafe or impossible to merge.",
+        "Use suggestedLine when it is present; it is a valid right-side PR diff line for an inline finding.",
+        ...conflicts.map((conflict) => {
+            const suggestedLine = firstTargetLine(input.inlineCommentTargets, conflict.path);
+            const suggestedLineText = suggestedLine
+                ? `suggestedLine: ${suggestedLine}`
+                : "suggestedLine: (no right-side PR diff line found)";
+            return `<conflict_file>\npath: ${conflict.path}\n${suggestedLineText}\nrightSideDiffLines: ${targetLineSummary(input.inlineCommentTargets, conflict.path)}\nmergeTreeExcerpt:\n${conflict.excerpt}\n</conflict_file>`;
+        }),
+    ].join("\n");
+}
 function parsePostedFindingLocation(location) {
     const range = /^(.*):(\d+)-(\d+)$/.exec(location);
     if (range) {
@@ -709,6 +793,13 @@ export async function runReview(input) {
             toSha: meta.headRefOid,
             worktreePath,
         });
+        const mergeConflictContext = await mergeConflictContextForDiff({
+            baseSha: meta.baseRefOid,
+            exec,
+            headSha: meta.headRefOid,
+            inlineCommentTargets: initialInlineCommentTargets,
+            worktreePath,
+        });
         for (const reviewer of input.repository.agents.reviewers) {
             const assignment = mode.assignments.get(reviewer.account);
             if (assignment?.type !== "skip")
@@ -740,6 +831,9 @@ export async function runReview(input) {
                     toSha: meta.headRefOid,
                     worktreePath,
                 });
+                const rereviewInlineCommentTargets = mergeConflictContext
+                    ? mergeInlineCommentTargets(inlineCommentTargets, initialInlineCommentTargets)
+                    : inlineCommentTargets;
                 const unresolved = unresolvedThreadsByAccount.get(reviewer.account) ??
                     (await fetchUnresolvedThreads(exec, input.repository, input.pr, reviewer.account));
                 const prompt = await composeRereviewPrompt({
@@ -747,6 +841,7 @@ export async function runReview(input) {
                     ciFailureContext,
                     directory: input.directory,
                     headSha: meta.headRefOid,
+                    mergeConflictContext,
                     pr: input.pr,
                     previousReview: previousReviewText(previous),
                     previousHeadSha: previous.commit.oid,
@@ -787,7 +882,7 @@ export async function runReview(input) {
                         },
                         options: reviewer.options,
                         parentSessionId: input.parentSessionId,
-                        parse: (text) => parseRereviewOutputWithInlineTargets(text, inlineCommentTargets),
+                        parse: (text) => parseRereviewOutputWithInlineTargets(text, rereviewInlineCommentTargets),
                         permission: reviewer.permission,
                         prompt,
                         repairAttempts: input.config.output?.repairAttempts ?? 3,
@@ -819,6 +914,7 @@ export async function runReview(input) {
                 ciFailureContext,
                 directory: input.directory,
                 headSha: meta.headRefOid,
+                mergeConflictContext,
                 pr: input.pr,
                 repository: input.repository,
                 reviewContext,

package/dist/orchestrator/run-manager.js

@@ -1616,16 +1616,16 @@ export class MagiRunManager {
             }));
         }
         if (progress.type === "triage_agent_started") {
-            await this.notify(state, `**Triage agent ${progress.voter}** started ${progress.phase} for ${issue}.`);
+            await this.notify(state, `**Triage voter ${progress.voter}** started ${progress.phase} for ${issue}.`);
         }
         if (progress.type === "triage_agent_repair") {
-            await this.notify(state, `**Triage agent ${progress.voter}** started JSON regeneration for ${issue}.`);
+            await this.notify(state, `**Triage voter ${progress.voter}** started JSON regeneration for ${issue}.`);
         }
         if (progress.type === "triage_agent_completed") {
-            await this.notify(state, `**Triage agent ${progress.voter}** completed ${progress.phase} for ${issue}: ${progress.vote}.`);
+            await this.notify(state, `**Triage voter ${progress.voter}** completed ${progress.phase} for ${issue}: ${progress.vote}.`);
         }
         if (progress.type === "triage_agent_failed") {
-            await this.notify(state, `**Triage agent ${progress.voter}** failed ${progress.phase} for ${issue}: ${redactSecrets(progress.error)}`);
+            await this.notify(state, `**Triage voter ${progress.voter}** failed ${progress.phase} for ${issue}: ${redactSecrets(progress.error)}`);
         }
         if (progress.type === "comment_posting") {
             await this.notify(state, `Posting triage comment for ${issue}.`);