xab 4.0.0 → 6.0.0

package/dist/index.js

@@ -531,11 +531,18 @@ ${opts.applicationStrategy}
 - If the target already has a different version of the same logic, merge both intents
 - Preserve the target's existing improvements \u2014 do not regress
 - Create or modify files as needed; delete files if the source commit deleted them
-- After applying, run exactly: git add -A && git commit -m "${commitMsg.replace(/"/g, "\\\"")}"
-- You MUST create exactly ONE commit. Not zero, not two.
 - No conflict markers, dead code, or TODO placeholders
 - If impossible to apply cleanly, explain why in notes
 
+## CRITICAL \u2014 you MUST commit your changes
+After making all file changes, you MUST run these two commands as your FINAL action:
+
+    git add -A
+    git commit -m "${commitMsg.replace(/"/g, "\\\"")}"
+
+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.`;
   const firstPrompt = `${MERGE_PREAMBLE}
 ${opts.repoContext ? `## Repository context
@@ -605,9 +612,16 @@ ${opts.reviewIssues.map((issue, i) => `${i + 1}. ${issue}`).join(`
 - Read the affected files to understand the current state
 - Fix every issue the reviewer raised
 - Do NOT introduce new problems while fixing
-- After fixing, amend the commit: git add -A && git commit --amend -m "${commitMsg.replace(/"/g, "\\\"")}"
 - The result must be a single clean commit with no issues
 
+## CRITICAL \u2014 you MUST amend the commit after fixing
+After making all fixes, you MUST run these two commands as your FINAL action:
+
+    git add -A
+    git commit --amend -m "${commitMsg.replace(/"/g, "\\\"")}"
+
+If you do not run both commands, your fixes will be discarded. This is not optional.
+
 Report what you fixed.`;
   const turn = await thread.run(prompt, { outputSchema: applyResultSchema });
   return parseJson(turn.finalResponse, {
@@ -1166,17 +1180,17 @@ async function validateApply(worktreeGit, beforeHash) {
   const notAdded = status.not_added.filter((f) => !isOurs(f));
   const conflicted = status.conflicted.filter((f) => !isOurs(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`);
-    if (notAdded.length)
-      parts.push(`${notAdded.length} untracked`);
-    if (deleted.length)
-      parts.push(`${deleted.length} deleted`);
-    if (conflicted.length)
-      parts.push(`${conflicted.length} conflicted`);
-    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) {
@@ -1196,7 +1210,15 @@ async function validateApply(worktreeGit, beforeHash) {
   if (conflictMarkers.length > 0) {
     errors.push(`Conflict markers in: ${conflictMarkers.join(", ")}`);
   }
-  return { valid: errors.length === 0, newCommitHash, newCommitCount, worktreeClean, conflictMarkers, errors };
+  return {
+    valid: errors.length === 0,
+    newCommitHash,
+    newCommitCount,
+    worktreeClean,
+    conflictMarkers,
+    dirtyFiles,
+    errors
+  };
 }
 async function getAppliedDiff(worktreeGit, beforeHash) {
   return worktreeGit.raw(["diff", beforeHash, "HEAD"]);
@@ -1552,6 +1574,11 @@ async function processOneCommit(o) {
     const validation = await validateApply(o.wtGit, headBefore);
     if (!validation.valid) {
       cb.onLog(`Validation failed: ${validation.errors.join("; ")}`, "red");
+      if (validation.dirtyFiles.length > 0) {
+        for (const f of validation.dirtyFiles) {
+          cb.onLog(`  ${f}`, "red");
+        }
+      }
       await resetHard(o.wtGit, headBefore);
       if (attempt === o.maxAttempts)
         return mkFailed(commit, "validation", validation.errors.join("; "), start);
@@ -1751,6 +1778,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);
 }
@@ -1806,8 +1843,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)}`);
@@ -1844,7 +1882,13 @@ async function runBatch(opts) {
       if (jsonl)
         emitJsonl({ event: "analysis", hash: commit.hash, result: analysis });
       log(`  ${ts()} ${chalk.dim("analysis:")} ${analysisBadge(analysis.alreadyInTarget)}`);
-      log(`  ${chalk.dim("  summary:")} ${analysis.summary.slice(0, 120)}`);
+      log(`  ${chalk.dim("  summary:")} ${analysis.summary}`);
+      if (analysis.reasoning) {
+        log(`  ${chalk.dim("  reasoning:")} ${analysis.reasoning}`);
+      }
+      if (analysis.applicationStrategy && analysis.alreadyInTarget !== "yes") {
+        log(`  ${chalk.dim("  strategy:")} ${analysis.applicationStrategy}`);
+      }
       if (analysis.affectedComponents.length > 0) {
         log(`  ${chalk.dim("  components:")} ${analysis.affectedComponents.join(", ")}`);
       }
@@ -1863,13 +1907,24 @@ async function runBatch(opts) {
         });
       const duration = chalk.dim(`${(decision.durationMs / 1000).toFixed(1)}s`);
       log(`  ${ts()} ${decisionBadge(decision.kind)} ${duration}`);
+      if (decision.newCommitHash) {
+        log(`  ${chalk.dim("  commit:")} ${decision.newCommitHash.slice(0, 8)}`);
+      }
       if (decision.kind === "failed" && decision.error) {
-        log(`  ${chalk.red(`  error: ${decision.error.slice(0, 150)}`)}`);
+        log(`  ${chalk.red(`  error: ${decision.error}`)}`);
+      }
+      if (decision.reason && decision.kind !== "failed") {
+        log(`  ${chalk.dim("  reason:")} ${decision.reason}`);
       }
       if (decision.filesChanged && decision.filesChanged.length > 0) {
-        const shown = decision.filesChanged.slice(0, 5).join(", ");
-        const extra = decision.filesChanged.length > 5 ? chalk.dim(` +${decision.filesChanged.length - 5} more`) : "";
-        log(`  ${chalk.dim(`  files: ${shown}`)}${extra}`);
+        for (const f of decision.filesChanged) {
+          log(`  ${chalk.dim(`  \xB7 ${f}`)}`);
+        }
+      }
+      if (decision.opsNotes && decision.opsNotes.length > 0) {
+        for (const note of decision.opsNotes) {
+          log(`  ${chalk.yellow(`  ops: ${note}`)}`);
+        }
       }
     },
     onReview(commit, review) {
@@ -1984,7 +2039,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);
 }
@@ -2009,8 +2073,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"
@@ -2782,8 +2853,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]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xab",
-  "version": "4.0.0",
+  "version": "6.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"
   }
 }