xab 8.0.0 → 9.0.0

package/dist/index.js

@@ -774,26 +774,41 @@ async function reviewAppliedDiff(worktreePath, packet, onProgress) {
     normal: "Be thorough but reasonable. Reject clear issues, accept minor style differences.",
     lenient: "Focus on correctness and safety. Accept reasonable adaptations even if imperfect."
   };
-  const prompt = `You are reviewing a curated merge. A commit from "${packet.sourceBranch}" was applied to a branch based on "${packet.targetBranch}".
+  const prompt = `You are reviewing a curated merge commit. Codex adapted a source commit from "${packet.sourceBranch}" and applied it to this worktree (based on "${packet.targetBranch}").
 
-## Codex analysis of the source commit
-Summary: ${packet.analysis.summary}
-Decision: alreadyInTarget=${packet.analysis.alreadyInTarget}
-Strategy: ${packet.analysis.applicationStrategy}
-Affected components: ${packet.analysis.affectedComponents.join(", ")}
+Your job: review the NEW commit Codex created. Verify it is correct, clean, and faithful to the source commit's intent while respecting the target's architecture.
 
-## Source commit
+## Source commit (what was being backmerged)
 Hash: ${packet.commitHash}
 Message: ${packet.commitMessage}
+Branch: ${packet.sourceBranch}
+
+### Original source diff:
+\`\`\`diff
+${packet.sourcePatch.slice(0, 15000)}
+\`\`\`
+
+## Codex's analysis
+Summary: ${packet.analysis.summary}
+Already in target: ${packet.analysis.alreadyInTarget}
+Strategy used: ${packet.analysis.applicationStrategy}
+Components: ${packet.analysis.affectedComponents.join(", ")}
+
+## Codex's applied commit (what you are reviewing)
+${packet.newCommitHash ? `Commit: ${packet.newCommitHash} (in this worktree)
+Run \`git show ${packet.newCommitHash.slice(0, 8)}\` to inspect it.` : `Run \`git show HEAD\` to inspect it.`}
 
-## Applied diff (what was actually committed):
+### Applied diff:
 \`\`\`diff
 ${packet.appliedDiff.slice(0, 30000)}
 \`\`\`
 
-## Diff stat:
+### Diff stat:
 ${packet.appliedDiffStat}
 
+## Key question: does the applied commit correctly adapt the source commit's intent?
+Compare the source diff with the applied diff. The applied commit should capture the same behavior/fix but adapted for the target branch's codebase structure.
+
 ${packet.repoContext ? `## Repository context
 ${packet.repoContext}
 ` : ""}
@@ -904,15 +919,22 @@ Your objections will be sent back to the apply agent for fixing, so be specific
       }
     }
     if (message.type === "result") {
-      if ("result" in message) {
-        resultText = message.result;
+      const msg = message;
+      if (msg.structured_output) {
+        resultText = typeof msg.structured_output === "string" ? msg.structured_output : JSON.stringify(msg.structured_output);
+      } else if (msg.result) {
+        resultText = msg.result;
       }
       break;
     }
   }
   if (!resultText) {
+    if (onProgress)
+      onProgress("review", "WARNING: no structured_output or result in review response");
     return { approved: false, issues: ["Review produced no output"], summary: "Review failed", confidence: "low" };
   }
+  if (onProgress)
+    onProgress("review", `got ${resultText.length} chars of review output`);
   try {
     return JSON.parse(resultText);
   } catch {
@@ -1712,6 +1734,7 @@ async function processOneCommit(o) {
         packet = {
           commitHash: commit.hash,
           commitMessage: commit.message,
+          newCommitHash: validation.newCommitHash ?? undefined,
           sourceBranch: o.sourceRef,
           targetBranch: o.targetRef,
           analysis,
@@ -1975,7 +1998,21 @@ async function runBatch(opts) {
     onProgress(phase, msg) {
       if (jsonl)
         emitJsonl({ event: "progress", phase, msg });
-      const icon = phase === "apply" ? chalk.green("\u25B8") : chalk.blue("\u25B8");
+      let icon;
+      switch (phase) {
+        case "analyze":
+          icon = chalk.blue("\u25C6");
+          break;
+        case "apply":
+          icon = chalk.green("\u25B8");
+          break;
+        case "review":
+          icon = chalk.magenta("\u25CF");
+          break;
+        default:
+          icon = chalk.dim("\xB7");
+          break;
+      }
       log(`  ${ts()} ${icon} ${chalk.dim(msg)}`);
     },
     onLog(msg, color) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xab",
-  "version": "8.0.0",
+  "version": "9.0.0",
   "description": "AI-powered curated branch reconciliation engine",
   "type": "module",
   "bin": {