opencode-magi 0.3.0 → 0.5.0

package/dist/orchestrator/review-context.js

@@ -37,6 +37,23 @@ function quoteEvidence(value) {
     const compact = value.replaceAll(/\s+/g, " ").trim();
     return compact.length > 120 ? `${compact.slice(0, 117)}...` : compact;
 }
+function errorText(error) {
+    if (!error || typeof error !== "object")
+        return String(error);
+    const value = error;
+    return [value.message, value.stderr, value.stdout]
+        .filter((item) => typeof item === "string")
+        .join("\n");
+}
+function isIssueLookupFailure(error) {
+    const text = errorText(error);
+    return (/could not resolve to an issue/i.test(text) ||
+        /could not fetch issue #\d+/i.test(text) ||
+        /not an issue/i.test(text));
+}
+function isIssueUrl(url) {
+    return /\/issues\/\d+(?:$|[/?#])/i.test(url);
+}
 function issueReferencePattern(repository) {
     const host = escapeRegExp(repository.github.host || "github.com");
     const owner = escapeRegExp(repository.github.owner);
@@ -120,6 +137,9 @@ export function collectIssueRelationships(input) {
 async function contextIssue(input) {
     const issue = input.issue ??
         (await fetchIssue(input.exec, input.repository, input.relationship.number));
+    if (!isIssueUrl(issue.url)) {
+        throw new Error(`Reference #${issue.number} resolved to ${issue.url}, not an Issue`);
+    }
     const commentPage = await fetchIssueCommentPage(input.exec, input.repository, issue.number, input.limit);
     return {
         author: issue.author,
@@ -138,6 +158,19 @@ async function contextIssue(input) {
         url: issue.url,
     };
 }
+async function contextIssueIfIssue(input) {
+    try {
+        return await contextIssue(input);
+    }
+    catch (error) {
+        if (isIssueLookupFailure(error))
+            return undefined;
+        throw error;
+    }
+}
+function presentIssue(issue) {
+    return Boolean(issue);
+}
 function orderReviewThreads(threads) {
     return [...threads]
         .sort((a, b) => {
@@ -183,13 +216,13 @@ export async function buildReviewContextSnapshot(input) {
     const closingRelationships = relationships.filter((relationship) => relationship.relationship === "closing");
     const referencedRelationships = relationships.filter((relationship) => relationship.relationship === "referenced");
     return {
-        closingIssues: await Promise.all(closingRelationships.map((relationship) => contextIssue({
+        closingIssues: (await Promise.all(closingRelationships.map((relationship) => contextIssueIfIssue({
             exec: input.exec,
             issue: closingIssueMap.get(relationship.number),
             limit: LIMITS.closingIssueComments,
             relationship,
             repository: input.repository,
-        }))),
+        })))).filter(presentIssue),
         pullRequest: {
             author: input.pr.author?.login ?? safetyMeta.author,
             baseRef: input.pr.baseRefName,
@@ -207,12 +240,12 @@ export async function buildReviewContextSnapshot(input) {
             title: input.pr.title,
             url: input.pr.url,
         },
-        referencedIssues: await Promise.all(referencedRelationships.map((relationship) => contextIssue({
+        referencedIssues: (await Promise.all(referencedRelationships.map((relationship) => contextIssueIfIssue({
             exec: input.exec,
             limit: LIMITS.referencedIssueComments,
             relationship,
             repository: input.repository,
-        }))),
+        })))).filter(presentIssue),
         reviewDiscussion: {
             prComments: boundedComments(prComments, LIMITS.prComments),
             prCommentsOmitted,

package/dist/orchestrator/review.js

@@ -39,7 +39,7 @@ async function postReviewOutput(input, reviewerKey, output) {
         return postApproval(input.exec, input.repository, input.pr, reviewer.account);
     if (output.verdict === "CLOSE")
         return postCloseComment(input.exec, input.repository, input.pr, reviewer.account, output.reason ?? "Close requested.");
-    return postChangesRequested(input.exec, input.repository, input.pr, reviewer.account, output.findings, output.requirementFindings);
+    return postChangesRequested(input.exec, input.repository, input.pr, reviewer.account, output.findings);
 }
 function dryRunReviewPost(key, output) {
     if (output.verdict === "MERGE")
@@ -135,16 +135,64 @@ function parseRereviewOutputWithInlineTargets(text, targets) {
     validateInlineCommentTargets(output.newFindings, targets, "newFindings");
     return output;
 }
-function reviewOutputFromState(review) {
+function parsePostedFindingLocation(location) {
+    const range = /^(.*):(\d+)-(\d+)$/.exec(location);
+    if (range) {
+        return {
+            line: Number(range[3]),
+            path: range[1] ?? location,
+            startLine: Number(range[2]),
+        };
+    }
+    const line = /^(.*):(\d+)$/.exec(location);
+    if (line)
+        return { line: Number(line[2]), path: line[1] ?? location };
+    return undefined;
+}
+function reviewFindingsFromBody(body) {
+    const findings = [];
+    const lines = (body ?? "").split(/\r?\n/);
+    let section;
+    for (let index = 0; index < lines.length; index += 1) {
+        const line = lines[index];
+        if (line === "Inline findings:" || line === "File-level findings:") {
+            section = "finding";
+            continue;
+        }
+        if (line === "Requirement findings:") {
+            section = undefined;
+            continue;
+        }
+        if (section === "finding") {
+            const match = /^- (.*): (.+)$/.exec(line ?? "");
+            const fix = /^\s+Fix: (.+)$/.exec(lines[index + 1] ?? "");
+            if (!match || !fix)
+                continue;
+            const location = parsePostedFindingLocation(match[1] ?? "");
+            if (!location)
+                continue;
+            findings.push({
+                ...location,
+                fix: fix[1] ?? "Please address this before merging.",
+                issue: match[2] ?? "Review finding.",
+            });
+            index += 1;
+            continue;
+        }
+    }
+    return { findings };
+}
+export function reviewOutputFromState(review) {
     const verdict = reviewStateToVerdict(review.state);
+    if (verdict === "CHANGES_REQUESTED")
+        return { ...reviewFindingsFromBody(review.body), verdict };
     return verdict === "CLOSE"
         ? {
             findings: [],
             reason: review.body || "Close requested.",
-            requirementFindings: [],
             verdict,
         }
-        : { findings: [], requirementFindings: [], verdict };
+        : { findings: [], verdict };
 }
 export function hasPendingThreadReply(threads, reviewerAccount) {
     return threads.some((thread) => {
@@ -168,15 +216,15 @@ async function postRereviewOutput(input, reviewerKey, output) {
         return postApproval(input.exec, input.repository, input.pr, reviewer.account);
     if (output.verdict === "CLOSE")
         return postCloseComment(input.exec, input.repository, input.pr, reviewer.account, output.reason ?? "Close requested.");
-    if (!output.newFindings.length && !output.requirementFindings.length)
+    if (!output.newFindings.length)
         return "";
     return postChangesRequested(input.exec, input.repository, input.pr, reviewer.account, output.newFindings.map((finding) => ({
         fix: "Please address this before merging.",
         issue: finding.body,
-        line: finding.line,
         path: finding.path,
+        line: finding.line,
         startLine: finding.startLine,
-    })), output.requirementFindings);
+    })));
 }
 function isReviewOutput(output) {
     return "findings" in output;
@@ -761,7 +809,14 @@ export async function runReview(input) {
             sessionIds,
             worktreePath,
         });
-        const outputs = validation.outputs;
+        const activeOutputs = validation.outputs;
+        const skippedOutputs = Object.fromEntries(input.repository.agents.reviewers.flatMap((reviewer) => {
+            const assignment = mode.assignments.get(reviewer.account);
+            return assignment?.type === "skip"
+                ? [[reviewer.key, reviewOutputFromState(assignment.review)]]
+                : [];
+        }));
+        const outputs = { ...skippedOutputs, ...activeOutputs };
         const remainingSkippedVerdicts = input.repository.agents.reviewers.flatMap((reviewer) => {
             const assignment = mode.assignments.get(reviewer.account);
             if (assignment?.type !== "skip" || closeTargets.includes(reviewer.key))
@@ -773,7 +828,7 @@ export async function runReview(input) {
                 },
             ];
         });
-        const activeVerdicts = Object.entries(outputs).map(([reviewer, output]) => ({
+        const activeVerdicts = Object.entries(activeOutputs).map(([reviewer, output]) => ({
             reviewer,
             verdict: output.verdict,
         }));
@@ -786,7 +841,7 @@ export async function runReview(input) {
                     ? [[reviewer.key, "skipped: already reviewed current head"]]
                     : [];
             })),
-            ...Object.fromEntries(await Promise.all(Object.entries(outputs).map(async ([key, output]) => [
+            ...Object.fromEntries(await Promise.all(Object.entries(activeOutputs).map(async ([key, output]) => [
                 key,
                 input.dryRun
                     ? dryRunReviewPost(key, output)

package/dist/orchestrator/run-manager.js

@@ -15,6 +15,7 @@ const DEFAULT_CLEAR_OPTIONS = {
     session: true,
     worktree: true,
 };
+const SYNC_RUN_TIMEOUT_MS = 600_000;
 function createRunId() {
     return `run-${Date.now().toString(36)}-${randomUUID().slice(0, 8)}`;
 }
@@ -453,11 +454,14 @@ export class MagiRunManager {
         await this.notify(state, `Started Magi review for ${prMarkdownLink(state)}.`);
         const controller = new AbortController();
         this.controllers.set(runId, controller);
-        void this.executeReview({
+        const execute = () => this.executeReview({
             ...input,
             runId,
             signal: controller.signal,
-        }).catch(async (error) => {
+        });
+        if (input.sync)
+            return this.executeSync(state, controller, execute);
+        void execute().catch(async (error) => {
             await this.failRun(runId, error);
         });
         return state;
@@ -511,11 +515,14 @@ export class MagiRunManager {
         await this.notify(state, `Started Magi merge for ${prMarkdownLink(state)}.`);
         const controller = new AbortController();
         this.controllers.set(runId, controller);
-        void this.executeMerge({
+        const execute = () => this.executeMerge({
             ...input,
             runId,
             signal: controller.signal,
-        }).catch(async (error) => {
+        });
+        if (input.sync)
+            return this.executeSync(state, controller, execute);
+        void execute().catch(async (error) => {
             await this.failRun(runId, error);
         });
         return state;
@@ -568,11 +575,14 @@ export class MagiRunManager {
         await this.notify(state, `Started Magi triage for ${issueMarkdownLink(state)}.`);
         const controller = new AbortController();
         this.controllers.set(runId, controller);
-        void this.executeTriage({
+        const execute = () => this.executeTriage({
             ...input,
             runId,
             signal: controller.signal,
-        }).catch(async (error) => {
+        });
+        if (input.sync)
+            return this.executeSync(state, controller, execute);
+        void execute().catch(async (error) => {
             await this.failRun(runId, error);
         });
         return state;
@@ -1210,6 +1220,36 @@ export class MagiRunManager {
     hasBlockedAgents(state) {
         return this.agentEntries(state).some(([, agent]) => agent.status === "blocked");
     }
+    async executeSync(state, controller, execute) {
+        let timeout;
+        const timeoutPromise = new Promise((resolve) => {
+            timeout = setTimeout(() => resolve("timeout"), SYNC_RUN_TIMEOUT_MS);
+        });
+        try {
+            const result = await Promise.race([
+                execute().then(() => "completed"),
+                timeoutPromise,
+            ]);
+            if (result === "timeout") {
+                controller.abort();
+                await this.failRun(state.runId, new Error("Magi sync run timed out after 600 seconds."));
+            }
+        }
+        catch (error) {
+            controller.abort();
+            await this.failRun(state.runId, error);
+        }
+        finally {
+            if (timeout)
+                clearTimeout(timeout);
+        }
+        return (await this.readStateByRunId(state.runId)) ?? state;
+    }
+    assertSuccessfulSyncFollowUp(state) {
+        if (state.status === "completed")
+            return;
+        throw new Error(`Synchronous follow-up ${state.command} run ${state.runId} finished with status ${state.status}.`);
+    }
     async executeReview(input) {
         const result = await runReview({
             approvalPolicy: input.repository.merge.approvalPolicy,
@@ -1347,24 +1387,30 @@ export class MagiRunManager {
             : undefined;
         const triageAutomation = input.repository.triage?.automation;
         if (followUpPr != null && triageAutomation?.merge) {
-            await this.startMerge({
+            const followUp = await this.startMerge({
                 config: input.config,
                 dryRun: input.dryRun,
                 parentSessionId: input.parentSessionId,
                 pr: followUpPr,
                 repository: input.repository,
                 signal: input.signal,
+                sync: input.sync,
             });
+            if (input.sync)
+                this.assertSuccessfulSyncFollowUp(followUp);
         }
         else if (followUpPr != null && triageAutomation?.review) {
-            await this.startReview({
+            const followUp = await this.startReview({
                 config: input.config,
                 dryRun: input.dryRun,
                 parentSessionId: input.parentSessionId,
                 pr: followUpPr,
                 repository: input.repository,
                 signal: input.signal,
+                sync: input.sync,
             });
+            if (input.sync)
+                this.assertSuccessfulSyncFollowUp(followUp);
         }
         this.active.delete(input.runId);
         this.controllers.delete(input.runId);

package/dist/prompts/compose.js

@@ -62,6 +62,7 @@ function editValues(input) {
     return {
         ...repositoryValues(input.repository),
         pr: String(input.pr),
+        reviewFindings: input.reviewFindings,
         unresolvedThreads: input.unresolvedThreads,
         worktreePath: input.worktreePath,
     };

package/dist/prompts/contracts.js

@@ -15,25 +15,20 @@ The object must match this shape:
       "perspective": "Optional review perspective."
     }
   ],
-  "requirementFindings": [
-    {
-      "issueNumber": 47,
-      "requirement": "Required closing-issue behavior that is missing.",
-      "evidence": "Why the PR does not satisfy the requirement.",
-      "fix": "How to satisfy the requirement."
-    }
-  ],
   "reason": "Required only for CLOSE."
 }
 
 Rules:
-- MERGE requires empty findings and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one finding or requirementFinding.
-- CLOSE requires a reason and empty findings and requirementFindings arrays.
+- MERGE requires an empty findings array.
+- CHANGES_REQUESTED requires at least one finding.
+- CLOSE requires a reason and an empty findings array.
 - path must be repository-relative.
-- line and startLine must refer to lines inside the PR diff hunk.
+- 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.
 - Omit startLine for single-line findings.
-- Use requirementFindings for missing closing-issue requirements that do not map cleanly to a diff line.
+- Do not omit line. Do not create file-level or body-only findings.
+- Missing closing-issue requirements must be normal findings anchored to the nearest responsible changed line.
+- 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.
 </output_contract>`.trim();
 export const rereviewOutputContract = `
 <output_contract>
@@ -45,17 +40,19 @@ The object must match this shape:
   "resolve": [{ "commentId": 123, "threadId": "..." }],
   "followUps": [{ "commentId": 123, "body": "..." }],
   "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }],
-  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }],
   "reason": "Required only for CLOSE."
 }
 
 Rules:
-- MERGE requires empty followUps, newFindings, and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one followUp, newFinding, or requirementFinding.
-- CLOSE requires a reason and empty followUps, newFindings, and requirementFindings arrays.
-- line and startLine must refer to lines inside the latest PR diff hunk.
+- MERGE requires empty followUps and newFindings arrays.
+- CHANGES_REQUESTED requires at least one followUp or newFinding.
+- CLOSE requires a reason and empty followUps and newFindings arrays.
+- 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.
-- Use requirementFindings for missing closing-issue requirements that do not map cleanly to a diff line.
+- Do not omit line. Do not create file-level or body-only findings.
+- Missing closing-issue requirements must be normal newFindings anchored to the nearest responsible changed line.
+- 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.
 </output_contract>`.trim();
 export const findingValidationOutputContract = `
 <output_contract>
@@ -94,15 +91,16 @@ The object must match this shape:
       "issue": "What is wrong.",
       "fix": "How to fix it."
     }
-  ],
-  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }]
+  ]
 }
 
 Rules:
-- MERGE requires empty findings and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one finding or requirementFinding.
+- MERGE requires an empty findings array.
+- CHANGES_REQUESTED requires at least one finding.
 - CLOSE is not allowed in this reconsideration step.
-- Omit startLine for single-line findings.
+- 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.
+- Do not omit line. Do not create file-level or body-only findings.
 </output_contract>`.trim();
 export const rereviewCloseReconsiderationOutputContract = `
 <output_contract>
@@ -113,15 +111,16 @@ The object must match this shape:
   "verdict": "MERGE" | "CHANGES_REQUESTED",
   "resolve": [{ "commentId": 123, "threadId": "..." }],
   "followUps": [{ "commentId": 123, "body": "..." }],
-  "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }],
-  "requirementFindings": [{ "issueNumber": 47, "requirement": "Missing requirement.", "evidence": "Why it is missing.", "fix": "How to fix it." }]
+  "newFindings": [{ "path": "relative/path.ext", "line": 123, "startLine": 120, "body": "..." }]
 }
 
 Rules:
-- MERGE requires empty followUps, newFindings, and requirementFindings arrays.
-- CHANGES_REQUESTED requires at least one followUp, newFinding, or requirementFinding.
+- MERGE requires empty followUps and newFindings arrays.
+- CHANGES_REQUESTED requires at least one followUp or newFinding.
 - CLOSE is not allowed in this reconsideration step.
-- Omit startLine for single-line findings.
+- 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.
+- Do not omit line. Do not create file-level or body-only findings.
 </output_contract>`.trim();
 export const editOutputContract = `
 <output_contract>

package/dist/prompts/output.js

@@ -71,16 +71,15 @@ function requireNumber(value, path) {
         throw new Error(`${path} must be an integer`);
     return value;
 }
-function parseRequirementFindings(value) {
-    return (value == null ? [] : requireArray(value, "requirementFindings")).map((finding, index) => {
-        const item = finding;
-        return {
-            evidence: requireString(item.evidence, `requirementFindings[${index}].evidence`),
-            fix: requireString(item.fix, `requirementFindings[${index}].fix`),
-            issueNumber: requireNumber(item.issueNumber, `requirementFindings[${index}].issueNumber`),
-            requirement: requireString(item.requirement, `requirementFindings[${index}].requirement`),
-        };
-    });
+function requireLine(value, path) {
+    if (value == null)
+        throw new Error(`${path} is required`);
+    return requireNumber(value, path);
+}
+function optionalStartLine(input) {
+    if (input.value == null)
+        return undefined;
+    return requireNumber(input.value, input.path);
 }
 function requireOneOf(value, path, values) {
     const text = requireString(value, path);
@@ -169,34 +168,34 @@ export function parseReviewOutput(text) {
     const data = extractJson(text);
     if (!data || typeof data !== "object")
         throw new Error("review output must be an object");
+    if (data.requirementFindings != null)
+        throw new Error("requirementFindings is not accepted");
     if (!isVerdict(data.verdict))
         throw new Error("verdict must be MERGE, CHANGES_REQUESTED, or CLOSE");
     const findings = requireArray(data.findings, "findings").map((finding, index) => {
         const item = finding;
+        const line = requireLine(item.line, `findings[${index}].line`);
         return {
             fix: requireString(item.fix, `findings[${index}].fix`),
             issue: requireString(item.issue, `findings[${index}].issue`),
-            line: requireNumber(item.line, `findings[${index}].line`),
+            line,
             path: requireString(item.path, `findings[${index}].path`),
             perspective: item.perspective == null
                 ? undefined
                 : requireString(item.perspective, `findings[${index}].perspective`),
-            startLine: item.startLine == null
-                ? undefined
-                : requireNumber(item.startLine, `findings[${index}].startLine`),
+            startLine: optionalStartLine({
+                line,
+                path: `findings[${index}].startLine`,
+                value: item.startLine,
+            }),
         };
     });
-    const requirementFindings = parseRequirementFindings(data.requirementFindings);
-    if (data.verdict === "MERGE" &&
-        (findings.length || requirementFindings.length))
-        throw new Error("MERGE requires no findings or requirementFindings");
-    if (data.verdict === "CHANGES_REQUESTED" &&
-        !findings.length &&
-        !requirementFindings.length)
-        throw new Error("CHANGES_REQUESTED requires findings or requirementFindings");
-    if (data.verdict === "CLOSE" &&
-        (findings.length || requirementFindings.length))
-        throw new Error("CLOSE requires no findings or requirementFindings");
+    if (data.verdict === "MERGE" && findings.length)
+        throw new Error("MERGE requires no findings");
+    if (data.verdict === "CHANGES_REQUESTED" && !findings.length)
+        throw new Error("CHANGES_REQUESTED requires findings");
+    if (data.verdict === "CLOSE" && findings.length)
+        throw new Error("CLOSE requires no findings");
     const reason = typeof data.reason === "string" && data.reason.trim()
         ? data.reason
         : undefined;
@@ -205,7 +204,6 @@ export function parseReviewOutput(text) {
     return {
         findings,
         reason,
-        requirementFindings,
         verdict: data.verdict,
     };
 }
@@ -213,6 +211,8 @@ export function parseRereviewOutput(text) {
     const data = extractJson(text);
     if (!isVerdict(data.verdict))
         throw new Error("rereview verdict must be MERGE, CHANGES_REQUESTED, or CLOSE");
+    if (data.requirementFindings != null)
+        throw new Error("requirementFindings is not accepted");
     const resolve = requireArray(data.resolve, "resolve").map((item, index) => {
         const value = item;
         return {
@@ -229,38 +229,36 @@ export function parseRereviewOutput(text) {
     });
     const newFindings = requireArray(data.newFindings, "newFindings").map((item, index) => {
         const value = item;
+        const line = requireLine(value.line, `newFindings[${index}].line`);
         return {
             body: requireString(value.body, `newFindings[${index}].body`),
-            line: requireNumber(value.line, `newFindings[${index}].line`),
+            line,
             path: requireString(value.path, `newFindings[${index}].path`),
-            startLine: value.startLine == null
-                ? undefined
-                : requireNumber(value.startLine, `newFindings[${index}].startLine`),
+            startLine: optionalStartLine({
+                line,
+                path: `newFindings[${index}].startLine`,
+                value: value.startLine,
+            }),
         };
     });
-    const requirementFindings = parseRequirementFindings(data.requirementFindings);
-    if (data.verdict === "MERGE" &&
-        (followUps.length || newFindings.length || requirementFindings.length)) {
-        throw new Error("MERGE requires no followUps, newFindings, or requirementFindings");
+    if (data.verdict === "MERGE" && (followUps.length || newFindings.length)) {
+        throw new Error("MERGE requires no followUps or newFindings");
     }
-    if (data.verdict === "CLOSE" &&
-        (followUps.length || newFindings.length || requirementFindings.length)) {
-        throw new Error("CLOSE requires no followUps, newFindings, or requirementFindings");
+    if (data.verdict === "CLOSE" && (followUps.length || newFindings.length)) {
+        throw new Error("CLOSE requires no followUps or newFindings");
     }
     if (data.verdict === "CLOSE" && !data.reason) {
         throw new Error("CLOSE requires reason");
     }
     if (data.verdict === "CHANGES_REQUESTED" &&
         !followUps.length &&
-        !newFindings.length &&
-        !requirementFindings.length) {
-        throw new Error("CHANGES_REQUESTED requires followUps, newFindings, or requirementFindings");
+        !newFindings.length) {
+        throw new Error("CHANGES_REQUESTED requires followUps or newFindings");
     }
     return {
         followUps,
         newFindings,
         reason: data.reason == null ? undefined : requireString(data.reason, "reason"),
-        requirementFindings,
         resolve,
         verdict: data.verdict,
     };
@@ -349,7 +347,7 @@ function parseEditOutputWithOptions(text, options) {
             commentId: requireNumber(value.commentId, `responses[${index}].commentId`),
         };
     });
-    if (options.requireResponses && !responses.length)
+    if (options.requireResponses && data.mode === "REPLIED" && !responses.length)
         throw new Error("responses must not be empty");
     if (data.mode === "EDITED") {
         if (!filesTouched.length)

package/dist/prompts/templates/merge/edit.md

@@ -1,9 +1,15 @@
 Fix pull request #{pr} for {owner}/{repo}.
 The PR worktree is {worktreePath}.
-Act as the PR author and resolve every unresolved review thread listed below.
+
+Act as the PR author and address every blocking review finding listed below.
+Review findings are the complete set of requested changes. Each finding targets a PR diff line and should have a corresponding GitHub review thread unless it comes from legacy read-side state.
+{reviewFindings}
+
+Unresolved GitHub review threads are conversations that may need replies or resolution.
 {unresolvedThreads}
-For each thread, decide whether you agree with the reviewer.
-If you understand and agree with the requested change, edit the code, stage changes, commit, and reply with action FIXED.
-If the requested change is incorrect or unnecessary and you have a clear reason, do not edit for that thread; reply with action DISAGREE and explain why.
-If you cannot determine whether the request is correct or what change is expected, do not blindly edit; reply with action ASK and ask a concrete question.
+
+For each review finding and thread, decide whether you agree with the reviewer.
+If you understand and agree with the requested change, edit the code, stage changes, commit, and reply with action FIXED for each related thread.
+If a requested change in a thread is incorrect or unnecessary and you have a clear reason, do not edit for that thread; reply with action DISAGREE and explain why.
+If you cannot determine whether a threaded request is correct or what change is expected, do not blindly edit; reply with action ASK and ask a concrete question.
 Do not make changes just because a reviewer requested them. Do not push.

package/dist/prompts/templates/review/close-reconsideration.md

@@ -2,4 +2,5 @@ You requested CLOSE for pull request #{pr} in {owner}/{repo}, but the other revi
 Reconsider your decision using the existing session context and choose MERGE or CHANGES_REQUESTED instead.
 Original close reason:
 {closeReason}
+Every finding 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.
 Do not edit files or perform write operations.

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

@@ -9,6 +9,9 @@ If there is no new commit, still reconsider the thread when a user replied after
 If you agree with the user's explanation or the code is fixed, resolve the thread.
 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.
+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.
 
 {ciFailureContextBlock}
 Do not edit files or perform write operations.