@ogpoyraz/wtx 0.8.4 → 0.8.6

package/dist/cli.mjs

@@ -31096,7 +31096,7 @@ function isMissingWorktreePathError(message) {
   return message.includes("ENOENT") || message.includes("No such file") || message.includes("does not exist") || message.includes("not a git repository") || message.includes("cannot change to");
 }
 function isRecoverableWorktreeRemoveError(message) {
-  return message.includes("not a working tree") || message.includes("already removed") || isMissingWorktreePathError(message);
+  return message.includes("not a working tree") || message.includes("already removed") || message.includes("submodule") || message.includes("containing submodules") || isMissingWorktreePathError(message);
 }
 function removeExistingPath(wtPath, opts) {
   if (!opts.dryRun && fs23.existsSync(wtPath)) {
@@ -31253,7 +31253,30 @@ function registerRemoveCommand(program2) {
           stepSuccess("Worktree removed", wtPath);
         } catch (err) {
           const msg = errorMessage(err);
-          if (isRecoverableWorktreeRemoveError(msg)) {
+          const isSubmodule = msg.includes("submodule") || msg.includes("containing submodules");
+          if (isSubmodule && !options.force && !args.includes("--force")) {
+            stepWarning("Worktree contains submodules — retrying with --force", msg.split(`
+`)[0] ?? msg);
+            try {
+              await gitExec(["-C", repo.mainPath, "worktree", "remove", "--force", wtPath], globalOpts);
+              stepSuccess("Worktree removed", wtPath);
+            } catch (forceErr) {
+              const forceMsg = errorMessage(forceErr);
+              if (isRecoverableWorktreeRemoveError(forceMsg)) {
+                stepWarning("Worktree already removed or invalid", forceMsg);
+                try {
+                  await gitExec(["-C", repo.mainPath, "worktree", "prune"], globalOpts);
+                } catch (pruneErr) {
+                  stepWarning("Worktree prune failed", errorMessage(pruneErr));
+                }
+                removeExistingPath(wtPath, globalOpts);
+                await removeLocalBranchBestEffort(repo.mainPath, branch, globalOpts);
+                stepSuccess("Worktree removed", wtPath);
+              } else {
+                throw forceErr;
+              }
+            }
+          } else if (isRecoverableWorktreeRemoveError(msg)) {
             stepWarning("Worktree already removed or invalid", msg);
             try {
               await gitExec(["-C", repo.mainPath, "worktree", "prune"], globalOpts);
@@ -32889,21 +32912,130 @@ function registerSkillCommand(program2) {
 }
 
 // src/commands/terminal.ts
+import { spawnSync as spawnSync3 } from "node:child_process";
+import fs33 from "node:fs";
+import path37 from "node:path";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
+function findEntry() {
+  const candidates = [];
+  if (process.argv[1])
+    candidates.push(process.argv[1]);
+  try {
+    const thisPath = fileURLToPath4(import.meta.url);
+    candidates.push(thisPath);
+    candidates.push(path37.resolve(path37.dirname(thisPath), "../../dist/cli.mjs"));
+    candidates.push(path37.resolve(path37.dirname(thisPath), "../cli.mjs"));
+  } catch {}
+  for (const p of candidates) {
+    try {
+      if (p.endsWith(".mjs") || p.endsWith(".js")) {
+        if (fs33.existsSync(p) && fs33.statSync(p).isFile())
+          return p;
+      } else if (fs33.existsSync(p)) {
+        const stat = fs33.statSync(p);
+        if (stat.isFile()) {
+          const head = fs33.readFileSync(p, "utf8").slice(0, 1024);
+          if (head.includes("cli.mjs") || head.includes("#!/usr/bin/env node")) {
+            if (p.endsWith("wtx") || p.endsWith("cli.mjs")) {
+              const dir = path37.dirname(fs33.realpathSync(p));
+              const cli = path37.join(dir, "cli.mjs");
+              if (fs33.existsSync(cli))
+                return cli;
+              const cli2 = path37.resolve(dir, "../dist/cli.mjs");
+              if (fs33.existsSync(cli2))
+                return cli2;
+              if (head.includes("import") || head.includes("commander"))
+                return p;
+            }
+          }
+        }
+      }
+    } catch {}
+  }
+  try {
+    const thisPath = fileURLToPath4(import.meta.url);
+    const pkgRoot = path37.resolve(path37.dirname(thisPath), "../..");
+    const cli = path37.join(pkgRoot, "dist", "cli.mjs");
+    if (fs33.existsSync(cli))
+      return cli;
+  } catch {}
+  return null;
+}
+function tryRelaunchViaBun(forwardedArgs) {
+  if (process.env.WTX_BUN_RERUN === "1")
+    return null;
+  const env2 = { ...process.env, WTX_BUN_RERUN: "1" };
+  const entry = findEntry();
+  if (entry) {
+    const result = spawnSync3("bun", [entry, ...forwardedArgs], {
+      stdio: "inherit",
+      env: env2
+    });
+    if (!result.error) {
+      process.exit(result.status ?? 0);
+    }
+    if (result.error.code !== "ENOENT") {
+      process.stderr.write(`✗ Failed to relaunch via Bun: ${result.error.message}
+`);
+      process.exit(1);
+    }
+  }
+  const attempts = [
+    { cmd: "bunx", args: ["--bun", "wtx", ...forwardedArgs] },
+    { cmd: "bun", args: ["x", "--bun", "wtx", ...forwardedArgs] }
+  ];
+  for (const { cmd, args } of attempts) {
+    const result = spawnSync3(cmd, args, { stdio: "inherit", env: env2 });
+    if (!result.error) {
+      process.exit(result.status ?? 0);
+    }
+    if (result.error.code !== "ENOENT") {
+      process.stderr.write(`✗ Failed to relaunch via ${cmd}: ${result.error.message}
+`);
+      process.exit(1);
+    }
+  }
+  return null;
+}
 function registerTerminalCommand(program2) {
   program2.command("terminal").description("Interactive worktree dashboard (requires Bun)").action(async () => {
     const opts = program2.optsWithGlobals();
     if (typeof Bun === "undefined") {
-      process.stderr.write(`✗ wtx terminal dashboard requires the Bun runtime
+      const forwarded = process.argv.slice(2);
+      const relaunched = tryRelaunchViaBun(forwarded);
+      if (relaunched === null) {
+        const probe2 = spawnSync3("bun", ["--version"], { stdio: "ignore" });
+        const hasBun = !probe2.error && probe2.status === 0;
+        if (!hasBun) {
+          process.stderr.write(`✗ wtx terminal dashboard requires the Bun runtime
 `);
-      process.stderr.write(`  The TUI relies on Bun's FFI and React renderer which cannot run in Node/compiled binary.
+          process.stderr.write(`  The TUI relies on Bun's FFI and React renderer which cannot run in Node/compiled binary.
 `);
-      process.stderr.write(`  To use the dashboard, run it via Bun:
+          process.stderr.write(`  Bun was not found on your PATH. Install it from https://bun.sh, then run:
 `);
-      process.stderr.write(`    bunx --bun wtx terminal
+          process.stderr.write(`    wtx terminal
 
 `);
-      process.stderr.write("  Note: `wtx ls` provides a fast list view and works everywhere.\n");
-      process.exit(1);
+          process.stderr.write("  Note: `wtx ls` provides a fast list view and works everywhere.\n");
+          process.exit(1);
+        }
+        process.stderr.write(`✗ wtx terminal dashboard requires the Bun runtime
+`);
+        process.stderr.write(`  The TUI relies on Bun's FFI and React renderer which cannot run in Node/compiled binary.
+`);
+        process.stderr.write(`  Automatic relaunch via Bun failed. Try running directly:
+`);
+        process.stderr.write(`    bunx --bun wtx terminal
+`);
+        const entry = findEntry();
+        if (entry) {
+          process.stderr.write(`    bun ${entry} terminal
+`);
+        }
+        process.stderr.write("\n  Note: `wtx ls` provides a fast list view and works everywhere.\n");
+        process.exit(1);
+      }
+      return;
     }
     if (!process.stdin.isTTY || !process.stdout.isTTY) {
       process.stderr.write(`✗ wtx terminal requires an interactive terminal
@@ -32924,7 +33056,7 @@ init_deps();
 import readline3 from "readline";
 init_path_safety();
 init_stack();
-import fs33 from "fs";
+import fs34 from "fs";
 async function runMcpServer(opts = {}) {
   const input = opts.input ?? process.stdin;
   const output = opts.output ?? process.stdout;
@@ -33107,7 +33239,7 @@ async function handleToolCall(name, args, config2, _opts) {
         for (const wt of wts) {
           if (!wt.path.startsWith(repo.wtRoot))
             continue;
-          const dirtyCount = fs33.existsSync(wt.path) ? (await getDirtyFiles(wt.path)).length : 0;
+          const dirtyCount = fs34.existsSync(wt.path) ? (await getDirtyFiles(wt.path)).length : 0;
           items.push({
             repo: repo.name,
             branch: wt.branch || null,
@@ -33135,7 +33267,7 @@ async function handleToolCall(name, args, config2, _opts) {
       }
       const repo = resolveRepos(config2, [args.repo])[0];
       const wtPath = getWorktreePath(repo, args.branch);
-      if (!fs33.existsSync(wtPath)) {
+      if (!fs34.existsSync(wtPath)) {
         throw { isToolError: true, message: `Worktree not found for branch ${args.branch}` };
       }
       const mainBranch = await resolveMainBranch(repo, config2);
@@ -33254,7 +33386,7 @@ async function handleToolCall(name, args, config2, _opts) {
       if (children.length > 0 && args.force !== true) {
         throw { isToolError: true, message: `Branch has dependent worktrees: ${children.join(", ")}. Use force:true to override.` };
       }
-      if (!args.force && fs33.existsSync(wtPath)) {
+      if (!args.force && fs34.existsSync(wtPath)) {
         const dirty = await getDirtyFiles(wtPath);
         if (dirty.length > 0) {
           throw { isToolError: true, message: `Worktree is dirty. Use force:true to remove it.` };
@@ -33273,7 +33405,7 @@ async function handleToolCall(name, args, config2, _opts) {
       }
       const repo = resolveRepos(config2, [args.repo])[0];
       const wtPath = getWorktreePath(repo, args.branch);
-      if (!fs33.existsSync(wtPath)) {
+      if (!fs34.existsSync(wtPath)) {
         throw { isToolError: true, message: `Worktree not found for branch ${args.branch}` };
       }
       const mainBranch = await resolveMainBranch(repo, config2);
@@ -33495,7 +33627,7 @@ init_config();
 init_resolver();
 init_log();
 init_history();
-import fs34 from "fs";
+import fs35 from "fs";
 var program2 = new Command;
 program2.name("wtx").description("Multi-repo git worktree manager").version(VERSION).option("-q, --quiet", "Suppress progress indicators", false).option("--verbose", "Show git commands as they run", false).option("--dry-run", "Show what would happen", false);
 var MUTATING_COMMANDS = new Set([
@@ -33599,7 +33731,7 @@ program2.command("_resolve-path <repo> <branch>", { hidden: true }).description(
     }
     const repo = repos[0];
     const wtPath = getWorktreePath(repo, branch);
-    if (!fs34.existsSync(wtPath)) {
+    if (!fs35.existsSync(wtPath)) {
       process.stderr.write(`✗ No worktree at ${wtPath}
 `);
       process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ogpoyraz/wtx",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "Multi-repo git worktree manager",
   "type": "module",
   "bin": {