xab 5.0.0 → 6.0.0

package/dist/index.js

@@ -1182,28 +1182,15 @@ async function validateApply(worktreeGit, beforeHash) {
   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) {
@@ -1791,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);
 }
@@ -1846,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)}`);
@@ -2041,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);
 }
@@ -2066,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"
@@ -2839,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": "5.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"
   }
 }