xab 6.0.0 → 7.0.0

package/dist/index.js

@@ -43,7 +43,7 @@ var init_config = __esm(() => {
     promptHints: [],
     pathRemaps: [],
     reviewStrictness: "normal",
-    maxAttempts: 2,
+    maxAttempts: undefined,
     commitPrefix: "backmerge:"
   };
 });
@@ -543,7 +543,9 @@ After making all file changes, you MUST run these two commands as your FINAL act
 If you do not run both commands, your work will be discarded. This is not optional.
 The validation system checks for exactly one new git commit. Zero commits = failure.
 
-Report what you did.`;
+Report what you did.
+
+MAKE SURE TO ACTUALLY GIT COMMIT, NOT JUST MODIFY FILES.`;
   const firstPrompt = `${MERGE_PREAMBLE}
 ${opts.repoContext ? `## Repository context
 ${opts.repoContext}
@@ -622,7 +624,9 @@ After making all fixes, you MUST run these two commands as your FINAL action:
 
 If you do not run both commands, your fixes will be discarded. This is not optional.
 
-Report what you fixed.`;
+Report what you fixed.
+
+MAKE SURE TO ACTUALLY GIT COMMIT, NOT JUST MODIFY FILES.`;
   const turn = await thread.run(prompt, { outputSchema: applyResultSchema });
   return parseJson(turn.finalResponse, {
     applied: false,
@@ -783,7 +787,7 @@ If you have ANY objections, be specific about what's wrong and how to fix it. Yo
     options: {
       cwd: worktreePath,
       model: "claude-opus-4-6",
-      maxTurns: 30,
+      maxTurns: undefined,
       permissionMode: "default",
       outputFormat: reviewSchema,
       tools: ["Read", "Glob", "Grep", "Bash"],
@@ -1173,12 +1177,12 @@ async function validateApply(worktreeGit, beforeHash) {
     errors.push(`Failed to check commits: ${e.message}`);
   }
   const status = await worktreeGit.status();
-  const isOurs = (f) => f.startsWith(".backmerge/") || f.startsWith(".backmerge\\");
-  const modified = status.modified.filter((f) => !isOurs(f));
-  const created = status.created.filter((f) => !isOurs(f));
-  const deleted = status.deleted.filter((f) => !isOurs(f));
-  const notAdded = status.not_added.filter((f) => !isOurs(f));
-  const conflicted = status.conflicted.filter((f) => !isOurs(f));
+  const isInfra = (f) => f.startsWith(".backmerge/") || f.startsWith(".backmerge\\") || f.startsWith(".git-local/") || f.startsWith(".git-local\\");
+  const modified = status.modified.filter((f) => !isInfra(f));
+  const created = status.created.filter((f) => !isInfra(f));
+  const deleted = status.deleted.filter((f) => !isInfra(f));
+  const notAdded = status.not_added.filter((f) => !isInfra(f));
+  const conflicted = status.conflicted.filter((f) => !isInfra(f));
   const worktreeClean = modified.length === 0 && created.length === 0 && deleted.length === 0 && conflicted.length === 0 && notAdded.length === 0;
   const dirtyFiles = [];
   if (!worktreeClean) {
@@ -1228,7 +1232,7 @@ async function getAppliedDiffStat(worktreeGit, beforeHash) {
 }
 async function resetHard(git, ref) {
   await git.raw(["reset", "--hard", ref]);
-  await git.raw(["clean", "-fd", "--exclude=.backmerge"]);
+  await git.raw(["clean", "-fd", "--exclude=.backmerge", "--exclude=.git-local"]);
 }
 async function fetchOrigin(git) {
   await git.fetch(["--all", "--prune"]);
@@ -1268,7 +1272,7 @@ async function runEngine(opts, cb) {
     autoSkip = true
   } = opts;
   const config = loadConfig(repoPath, opts.configPath);
-  const effectiveMaxAttempts = opts.maxAttempts ?? config.maxAttempts ?? 2;
+  const effectiveMaxAttempts = opts.maxAttempts ?? config.maxAttempts ?? Infinity;
   const effectiveWorkBranch = opts.workBranch ?? config.workBranch;
   const commitPrefix = config.commitPrefix ?? "backmerge:";
   if (!checkCodexInstalled())
@@ -1548,7 +1552,7 @@ async function processOneCommit(o) {
   }
   for (let attempt = 1;attempt <= o.maxAttempts; attempt++) {
     const headBefore = await getHead(o.wtGit);
-    cb.onStatus(`Applying ${commit.hash.slice(0, 8)} (attempt ${attempt}/${o.maxAttempts})...`);
+    cb.onStatus(`Applying ${commit.hash.slice(0, 8)} (attempt ${attempt})...`);
     let applyResult;
     try {
       applyResult = await applyCommit({
@@ -1571,7 +1575,26 @@ async function processOneCommit(o) {
       continue;
     }
     cb.onStatus(`Validating ${commit.hash.slice(0, 8)}...`);
-    const validation = await validateApply(o.wtGit, headBefore);
+    let validation = await validateApply(o.wtGit, headBefore);
+    if (!validation.valid && validation.newCommitCount === 0 && !validation.worktreeClean && validation.dirtyFiles.length > 0) {
+      const realChanges = validation.dirtyFiles.filter((f) => !f.includes(".git-local/"));
+      if (realChanges.length > 0) {
+        cb.onLog(`Codex left ${realChanges.length} changed files without committing \u2014 creating rescue commit`, "yellow");
+        for (const f of realChanges)
+          cb.onLog(`  ${f}`, "yellow");
+        const commitMsg = `${o.commitPrefix} ${commit.message} (from ${commit.hash.slice(0, 8)})`;
+        try {
+          await o.wtGit.raw(["add", "-A", "--", ".", ":!.git-local"]);
+          await o.wtGit.raw(["commit", "-m", commitMsg]);
+          validation = await validateApply(o.wtGit, headBefore);
+          if (validation.valid) {
+            cb.onLog(`Rescue commit succeeded`, "green");
+          }
+        } catch (e) {
+          cb.onLog(`Rescue commit failed: ${e.message}`, "red");
+        }
+      }
+    }
     if (!validation.valid) {
       cb.onLog(`Validation failed: ${validation.errors.join("; ")}`, "red");
       if (validation.dirtyFiles.length > 0) {
@@ -1625,10 +1648,10 @@ async function processOneCommit(o) {
       }
       if (!reviewResult.approved) {
         cb.onLog(`Review rejected: ${reviewResult.issues.join("; ")}`, "red");
-        const maxFixRounds = 2;
+        const maxFixRounds = Infinity;
         let fixed = false;
         for (let fixRound = 1;fixRound <= maxFixRounds; fixRound++) {
-          cb.onStatus(`Codex fixing review issues (round ${fixRound}/${maxFixRounds})...`);
+          cb.onStatus(`Codex fixing review issues (round ${fixRound})...`);
           try {
             await fixFromReview({
               worktreePath: o.wtPath,
@@ -1690,7 +1713,7 @@ async function processOneCommit(o) {
                 kind: "failed",
                 commitHash: commit.hash,
                 commitMessage: commit.message,
-                reason: `Review rejected after ${maxFixRounds} fix rounds: ${reviewResult.issues.join("; ")}`,
+                reason: `Review rejected after fix attempts: ${reviewResult.issues.join("; ")}`,
                 failedPhase: "review",
                 reviewApproved: false,
                 reviewIssues: reviewResult.issues,
@@ -1704,7 +1727,7 @@ async function processOneCommit(o) {
               kind: "failed",
               commitHash: commit.hash,
               commitMessage: commit.message,
-              reason: `Review rejected after ${maxFixRounds} fix rounds: ${reviewResult.issues.join("; ")}`,
+              reason: `Review rejected after fix attempts: ${reviewResult.issues.join("; ")}`,
               failedPhase: "review",
               reviewApproved: false,
               reviewIssues: reviewResult.issues,
@@ -2883,7 +2906,7 @@ Behavior:
   --no-fetch              Skip fetch (default)
   --no-review             Skip Claude review pass
   --no-auto-skip          Don't auto-skip commits AI identifies as present
-  --max-attempts <n>      Max retries per commit (default: 2)
+  --max-attempts <n>      Max retries per commit (default: unlimited)
   --no-resume             Don't resume from interrupted runs (default: auto-resume)
   --config <path>         Path to config file (default: auto-discover)
   --help, -h              Show this help

package/package.json

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