xab 5.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,37 +1177,24 @@ 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) {
-    const parts = [];
-    if (modified.length) {
-      parts.push(`${modified.length} modified`);
-      for (const f of modified)
-        dirtyFiles.push(`M ${f}`);
-    }
-    if (notAdded.length) {
-      parts.push(`${notAdded.length} untracked`);
-      for (const f of notAdded)
-        dirtyFiles.push(`? ${f}`);
-    }
-    if (deleted.length) {
-      parts.push(`${deleted.length} deleted`);
-      for (const f of deleted)
-        dirtyFiles.push(`D ${f}`);
-    }
-    if (conflicted.length) {
-      parts.push(`${conflicted.length} conflicted`);
-      for (const f of conflicted)
-        dirtyFiles.push(`C ${f}`);
-    }
-    errors.push(`Working tree not clean: ${parts.join(", ")}`);
+    for (const f of modified)
+      dirtyFiles.push(`M ${f}`);
+    for (const f of notAdded)
+      dirtyFiles.push(`? ${f}`);
+    for (const f of deleted)
+      dirtyFiles.push(`D ${f}`);
+    for (const f of conflicted)
+      dirtyFiles.push(`C ${f}`);
+    errors.push(`Working tree not clean (${dirtyFiles.length} files): ${dirtyFiles.join(", ")}`);
   }
   const conflictMarkers = [];
   if (newCommitHash) {
@@ -1241,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"]);
@@ -1281,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())
@@ -1561,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({
@@ -1584,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) {
@@ -1638,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,
@@ -1703,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,
@@ -1717,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,
@@ -1791,6 +1801,16 @@ __export(exports_batch, {
   runBatch: () => runBatch
 });
 import chalk from "chalk";
+import { readFileSync as readFileSync5 } from "fs";
+import { join as join6 } from "path";
+function getVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync5(join6(import.meta.dir, "..", "package.json"), "utf-8"));
+    return pkg.version ?? "?";
+  } catch {
+    return "?";
+  }
+}
 function shortHash2(h) {
   return h.slice(0, 8);
 }
@@ -1846,8 +1866,9 @@ function emitJsonl(obj) {
 async function runBatch(opts) {
   const jsonl = opts.jsonl ?? false;
   const startTime = Date.now();
+  const version = getVersion();
   log("");
-  log(`  ${chalk.cyan.bold("xab")} ${chalk.dim("\u2014 curated branch reconciliation")}`);
+  log(`  ${chalk.cyan.bold("xab")} ${chalk.dim(`v${version}`)} ${chalk.dim("\u2014 curated branch reconciliation")}`);
   log(`  ${chalk.magenta(opts.sourceRef)} ${chalk.dim("\u2192")} ${chalk.green(opts.targetRef)}`);
   if (opts.workBranch)
     log(`  ${chalk.dim("work branch:")} ${chalk.cyan(opts.workBranch)}`);
@@ -2041,7 +2062,16 @@ import { useState, useEffect, useCallback, useRef } from "react";
 import { Box, Text, useInput, useApp, Static, Newline } from "ink";
 import SelectInput from "ink-select-input";
 import Spinner from "ink-spinner";
+import { readFileSync as readFileSync4 } from "fs";
+import { join as join5 } from "path";
 import { jsxDEV, Fragment } from "react/jsx-dev-runtime";
+var XAB_VERSION = (() => {
+  try {
+    return JSON.parse(readFileSync4(join5(import.meta.dir, "..", "package.json"), "utf-8")).version ?? "?";
+  } catch {
+    return "?";
+  }
+})();
 function shortHash(h) {
   return h.slice(0, 8);
 }
@@ -2066,8 +2096,15 @@ function Header({
           /* @__PURE__ */ jsxDEV(Text, {
             bold: true,
             color: "cyan",
-            children: "\u256D\u2500 backmerge"
+            children: "\u256D\u2500 xab"
           }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV(Text, {
+            dimColor: true,
+            children: [
+              " v",
+              XAB_VERSION
+            ]
+          }, undefined, true, undefined, this),
           /* @__PURE__ */ jsxDEV(Text, {
             color: "gray",
             children: " \u2014 curated branch reconciliation"
@@ -2839,8 +2876,12 @@ for (let i = 0;i < args.length; i++) {
     repoPath = arg;
 }
 if (showHelp) {
+  let version = "?";
+  try {
+    version = JSON.parse(await Bun.file(new URL("./package.json", import.meta.url).pathname).text()).version;
+  } catch {}
   console.log(`
-xab \u2014 AI-powered curated branch reconciliation
+xab v${version} \u2014 AI-powered curated branch reconciliation
 
 Usage:
   xab [repo-path] [options]
@@ -2865,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": "5.0.0",
+  "version": "7.0.0",
   "description": "AI-powered curated branch reconciliation engine",
   "type": "module",
   "bin": {
@@ -32,6 +32,7 @@
     "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
     "react": "18.3.1",
-    "simple-git": "^3.33.0"
+    "simple-git": "^3.33.0",
+    "xab": "^5.0.0"
   }
 }