fix: Reviewer result not overwritten by Builder's COMPLETION_JSON

- update_task skips review_comment/commits when Reviewer already
  saved structured review via review-report API
- Stream result fallback now parses COMPLETION_JSON: prefix from
  result text instead of storing it raw

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: recuu-pfeg

src/agent-templates.ts

@@ -384,6 +384,12 @@ export async function executeActions(
       switch (action.type) {
         case "update_task": {
           const updates = { ...(action.params ?? {}) } as Record<string, unknown>;
+          // If Reviewer already saved a structured review via review-report API,
+          // don't overwrite with Builder's COMPLETION_JSON text
+          if (ctx.reviewVerdict && updates.review_comment && updates.status === "review") {
+            delete updates.review_comment;
+            delete updates.commits;
+          }
           // If review verdict is NEEDS_CHANGES, check retry count
           if (updates.status === "review" && ctx.reviewVerdict === "NEEDS_CHANGES") {
             const MAX_RETRIES = 3;

src/cli.ts

@@ -465,10 +465,22 @@ async function runLoop(cliArgs: CliArgs, runner: AgentRunner): Promise<void> {
             try {
               const ev = JSON.parse(l);
               if (ev.type === "result" && ev.subtype === "success" && typeof ev.result === "string") {
-                // Agent completed successfully but didn't output COMPLETION_JSON
-                // Use the result text as review_comment
-                const resultText = ev.result.slice(0, 2000);
-                actionCtx.completionJson = { review_comment: resultText, commits: "" };
+                // Try to extract COMPLETION_JSON from result text
+                const cjMatch = ev.result.match(/COMPLETION_JSON:(\{[\s\S]*\})/);
+                let resultText: string;
+                if (cjMatch) {
+                  try {
+                    const cj = JSON.parse(cjMatch[1]);
+                    actionCtx.completionJson = { review_comment: cj.review_comment, commits: cj.commits };
+                    resultText = cj.review_comment || ev.result.slice(0, 2000);
+                  } catch {
+                    resultText = ev.result.slice(0, 2000);
+                    actionCtx.completionJson = { review_comment: resultText, commits: "" };
+                  }
+                } else {
+                  resultText = ev.result.slice(0, 2000);
+                  actionCtx.completionJson = { review_comment: resultText, commits: "" };
+                }
                 for (const action of agentTemplate.post_actions) {
                   if (action.type === "update_task" && action.when === "success" && action.params?.status === "review") {
                     action.params = { ...action.params, review_comment: resultText, commits: "" };