@nathapp/nax 0.54.10 → 0.54.12

package/dist/nax.js

@@ -22370,7 +22370,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@nathapp/nax",
-    version: "0.54.10",
+    version: "0.54.12",
     description: "AI Coding Agent Orchestrator \u2014 loops until done",
     type: "module",
     bin: {
@@ -22449,8 +22449,8 @@ var init_version = __esm(() => {
   NAX_VERSION = package_default.version;
   NAX_COMMIT = (() => {
     try {
-      if (/^[0-9a-f]{6,10}$/.test("cf3ead2"))
-        return "cf3ead2";
+      if (/^[0-9a-f]{6,10}$/.test("cbd14dd"))
+        return "cbd14dd";
     } catch {}
     try {
       const result = Bun.spawnSync(["git", "rev-parse", "--short", "HEAD"], {
@@ -35228,6 +35228,25 @@ ${missing.join(`
     validateStoryId(storyId);
     const worktreePath = join50(projectRoot, ".nax-wt", storyId);
     const branchName = `nax/${storyId}`;
+    try {
+      const pruneProc = _managerDeps.spawn(["git", "worktree", "prune"], {
+        cwd: projectRoot,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      await pruneProc.exited;
+    } catch {}
+    try {
+      await this.remove(projectRoot, storyId);
+    } catch {}
+    try {
+      const branchProc = _managerDeps.spawn(["git", "branch", "-D", branchName], {
+        cwd: projectRoot,
+        stdout: "pipe",
+        stderr: "pipe"
+      });
+      await branchProc.exited;
+    } catch {}
     try {
       const proc = _managerDeps.spawn(["git", "worktree", "add", worktreePath, "-b", branchName], {
         cwd: projectRoot,
@@ -35244,9 +35263,6 @@ ${missing.join(`
         if (error48.message.includes("not a git repository")) {
           throw new Error(`Not a git repository: ${projectRoot}`);
         }
-        if (error48.message.includes("already exists")) {
-          throw new Error(`Worktree for story ${storyId} already exists at ${worktreePath}`);
-        }
         throw error48;
       }
       throw new Error(`Failed to create worktree: ${String(error48)}`);
@@ -35674,12 +35690,21 @@ import path16 from "path";
 async function runParallelBatch(options) {
   const { stories, ctx, prd } = options;
   const { workdir, config: config2, maxConcurrency, pipelineContext, eventEmitter, agentGetFn, hooks, pluginRegistry } = ctx;
+  const logger = getSafeLogger();
   const worktreeManager = await _parallelBatchDeps.createWorktreeManager();
   const worktreePaths = new Map;
   const storyStartTimes = new Map;
   for (const story of stories) {
     storyStartTimes.set(story.id, Date.now());
-    await worktreeManager.create(workdir, story.id);
+    try {
+      await worktreeManager.create(workdir, story.id);
+    } catch (error48) {
+      logger?.error("parallel-batch", "Failed to create worktree for story", {
+        storyId: story.id,
+        error: error48 instanceof Error ? error48.message : String(error48)
+      });
+      throw error48;
+    }
     worktreePaths.set(story.id, path16.join(workdir, ".nax-wt", story.id));
   }
   const workerResult = await _parallelBatchDeps.executeParallelBatch(stories, workdir, config2, pipelineContext, worktreePaths, maxConcurrency, eventEmitter);
@@ -35719,8 +35744,8 @@ async function runParallelBatch(options) {
       });
       mergeConflicts.push({ story, rectified: rectResult.success, cost: rectResult.cost });
     } catch (err) {
-      const logger = getSafeLogger();
-      logger?.warn("[parallel-batch]", "rectification failed for story", {
+      const logger2 = getSafeLogger();
+      logger2?.warn("[parallel-batch]", "rectification failed for story", {
         storyId: story.id,
         error: err.message
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nathapp/nax",
-  "version": "0.54.10",
+  "version": "0.54.12",
   "description": "AI Coding Agent Orchestrator — loops until done",
   "type": "module",
   "bin": {