patchrelay 0.35.12 → 0.35.13

package/dist/run-orchestrator.js

@@ -151,6 +151,67 @@ function appendLinearContext(lines, context) {
         lines.push("## Human Follow-up Comment", "", userComment, "");
     }
 }
+function readReviewFixComments(context) {
+    const raw = context?.reviewComments;
+    if (!Array.isArray(raw)) {
+        return [];
+    }
+    const comments = [];
+    for (const entry of raw) {
+        if (!entry || typeof entry !== "object")
+            continue;
+        const record = entry;
+        const body = typeof record.body === "string" ? record.body.trim() : "";
+        if (!body)
+            continue;
+        comments.push({
+            body,
+            ...(typeof record.path === "string" ? { path: record.path } : {}),
+            ...(typeof record.line === "number" ? { line: record.line } : {}),
+            ...(typeof record.side === "string" ? { side: record.side } : {}),
+            ...(typeof record.startLine === "number" ? { startLine: record.startLine } : {}),
+            ...(typeof record.startSide === "string" ? { startSide: record.startSide } : {}),
+            ...(typeof record.url === "string" ? { url: record.url } : {}),
+            ...(typeof record.authorLogin === "string" ? { authorLogin: record.authorLogin } : {}),
+        });
+    }
+    return comments;
+}
+function appendStructuredReviewContext(lines, context) {
+    const reviewId = typeof context?.reviewId === "number" ? context.reviewId : undefined;
+    const reviewCommitId = typeof context?.reviewCommitId === "string" ? context.reviewCommitId : undefined;
+    const reviewUrl = typeof context?.reviewUrl === "string" ? context.reviewUrl : undefined;
+    const reviewComments = readReviewFixComments(context);
+    if (!reviewId && !reviewCommitId && !reviewUrl && reviewComments.length === 0) {
+        return;
+    }
+    lines.push("## Structured Review Context", "");
+    if (reviewId !== undefined) {
+        lines.push(`Review ID: ${reviewId}`);
+    }
+    if (reviewCommitId) {
+        lines.push(`Reviewed commit: ${reviewCommitId}`);
+    }
+    if (reviewUrl) {
+        lines.push(`Review URL: ${reviewUrl}`);
+    }
+    if (reviewComments.length === 0) {
+        lines.push("No inline review comments were captured for this review.", "");
+        return;
+    }
+    lines.push(`Inline review comments captured: ${reviewComments.length}`, "Resolve each comment below or verify it is already fixed on the current head before you stop.", "");
+    for (const comment of reviewComments) {
+        const location = comment.path
+            ? `${comment.path}${comment.line !== undefined ? `:${comment.line}` : ""}${comment.side ? ` (${comment.side})` : ""}`
+            : "general";
+        lines.push(`- ${location}`);
+        lines.push(comment.body);
+        if (comment.url) {
+            lines.push(`  URL: ${comment.url}`);
+        }
+    }
+    lines.push("");
+}
 function collectFollowUpInputs(context) {
     const followUps = Array.isArray(context?.followUps) ? context.followUps : [];
     const inputs = [];
@@ -330,7 +391,8 @@ export function buildInitialRunPrompt(issue, runType, repoPath, context) {
             break;
         }
         case "review_fix":
-            lines.push("## Review Changes Requested", "", "A reviewer has requested changes on your PR. Address the feedback and push.", context?.reviewerName ? `Reviewer: ${String(context.reviewerName)}` : "", context?.reviewBody ? `\n## Review comment\n\n${String(context.reviewBody)}` : "", "", "Steps:", "1. Read the review feedback and PR comments (`gh pr view --comments`).", "2. Check the current diff (`git diff origin/main`) — a prior rebase may have already resolved some concerns (e.g., scope-bundling from stale commits).", "3. For each review point: if already resolved, note why. If not, fix it.", "4. Run verification, commit and push.", "5. If you believe all concerns are resolved, request a re-review: `gh pr edit <PR#> --add-reviewer <reviewer>`.", "   Do NOT just post a comment saying \"resolved\" — the reviewer must re-review to dismiss the CHANGES_REQUESTED state.", "");
+            lines.push("## Review Changes Requested", "", "A reviewer has requested changes on your PR. Address the feedback and push.", context?.reviewerName ? `Reviewer: ${String(context.reviewerName)}` : "", context?.reviewBody ? `\n## Review comment\n\n${String(context.reviewBody)}` : "", "", "Steps:", "1. Start with the structured review context below. Treat the inline review comments as the primary repair checklist for this turn.", "2. Check the current diff (`git diff origin/main`) — a prior rebase may have already resolved some concerns (e.g., scope-bundling from stale commits).", "3. For each review point: if already resolved on the current head, note why. If not, fix it.", "4. If the structured review context looks incomplete, inspect the latest GitHub review threads directly before deciding you are done.", "5. Run verification, commit and push.", "6. If you believe all concerns are resolved, request a re-review: `gh pr edit <PR#> --add-reviewer <reviewer>`.", "   Do NOT just post a comment saying \"resolved\" — the reviewer must re-review to dismiss the CHANGES_REQUESTED state.", "");
+            appendStructuredReviewContext(lines, context);
             break;
         case "queue_repair":
             appendQueueRepairContext(lines, context);
@@ -364,7 +426,8 @@ export function buildFollowUpRunPrompt(issue, runType, repoPath, context) {
             break;
         }
         case "review_fix":
-            lines.push("## Review Changes Requested", "", "A reviewer has requested changes on your PR. Address the feedback and push.", context?.reviewerName ? `Reviewer: ${String(context.reviewerName)}` : "", context?.reviewBody ? `\n## Review comment\n\n${String(context.reviewBody)}` : "", "", "Steps:", "1. Read the review feedback and PR comments (`gh pr view --comments`).", "2. Check the current diff (`git diff origin/main`) — a prior rebase may have already resolved some concerns (e.g., scope-bundling from stale commits).", "3. For each review point: if already resolved, note why. If not, fix it.", "4. Run verification, commit and push.", "5. If you believe all concerns are resolved, request a re-review: `gh pr edit <PR#> --add-reviewer <reviewer>`.", "   Do NOT just post a comment saying \"resolved\" — the reviewer must re-review to dismiss the CHANGES_REQUESTED state.", "");
+            lines.push("## Review Changes Requested", "", "A reviewer has requested changes on your PR. Address the feedback and push.", context?.reviewerName ? `Reviewer: ${String(context.reviewerName)}` : "", context?.reviewBody ? `\n## Review comment\n\n${String(context.reviewBody)}` : "", "", "Steps:", "1. Start with the structured review context below. Treat the inline review comments as the primary repair checklist for this turn.", "2. Check the current diff (`git diff origin/main`) — a prior rebase may have already resolved some concerns (e.g., scope-bundling from stale commits).", "3. For each review point: if already resolved on the current head, note why. If not, fix it.", "4. If the structured review context looks incomplete, inspect the latest GitHub review threads directly before deciding you are done.", "5. Run verification, commit and push.", "6. If you believe all concerns are resolved, request a re-review: `gh pr edit <PR#> --add-reviewer <reviewer>`.", "   Do NOT just post a comment saying \"resolved\" — the reviewer must re-review to dismiss the CHANGES_REQUESTED state.", "");
+            appendStructuredReviewContext(lines, context);
             break;
         case "queue_repair":
             appendQueueRepairContext(lines, context);
@@ -401,6 +464,9 @@ function shouldCompactThread(issue, threadGeneration, context) {
         && (threadGeneration ?? 0) >= MAX_THREAD_GENERATION_BEFORE_COMPACTION
         && followUpCount >= MAX_FOLLOW_UPS_BEFORE_COMPACTION;
 }
+export function shouldReuseIssueThread(params) {
+    return Boolean(params.existingThreadId) && !params.compactThread && params.resumeThread;
+}
 function isBranchUpkeepRequired(context) {
     return context?.branchUpkeepRequired === true;
 }
@@ -663,15 +729,17 @@ export class RunOrchestrator {
                 throw new Error(`prepare-worktree hook failed (exit ${prepareResult.exitCode}): ${prepareResult.stderr?.slice(0, 500) ?? ""}`);
             }
             this.assertLaunchLease(run, "before starting the Codex turn");
-            // Reuse the existing thread when the wake source is an additive follow-up
-            // or when review-fix work benefits from carrying reviewer context forward.
-            // If the thread has accumulated many resumptions and batched follow-ups,
-            // compact by starting a fresh main thread while keeping a parent link.
+            // Reuse the existing thread only for additive follow-ups that explicitly
+            // request continuity. Fresh review-fix runs now start a new thread so the
+            // model is not anchored to the implementation conversation that produced
+            // the rejected patch. If the thread has accumulated many resumptions and
+            // batched follow-ups, compact by starting a fresh main thread while
+            // keeping a parent link.
             const compactThread = shouldCompactThread(issue, issueSession?.threadGeneration, effectiveContext);
             if (compactThread && issue.threadId) {
                 parentThreadId = issue.threadId;
             }
-            if (issue.threadId && !compactThread && (resumeThread || runType === "review_fix")) {
+            if (shouldReuseIssueThread({ existingThreadId: issue.threadId, compactThread, resumeThread })) {
                 threadId = issue.threadId;
             }
             else {

package/dist/status-note.js

@@ -38,7 +38,7 @@ export function deriveIssueStatusNote(params) {
             break;
         case "failed":
         case "escalated":
-            note = latestRunNote ?? latestEventNote ?? failureSummary ?? sessionSummary;
+            note = latestEventNote ?? failureSummary ?? latestRunNote ?? sessionSummary;
             break;
         case "repairing_ci":
         case "repairing_queue":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchrelay",
-  "version": "0.35.12",
+  "version": "0.35.13",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -25,7 +25,8 @@
     "node": ">=24.0.0"
   },
   "workspaces": [
-    "packages/merge-steward"
+    "packages/merge-steward",
+    "packages/review-quill"
   ],
   "scripts": {
     "dev": "node --watch --experimental-transform-types src/index.ts",