@ogpoyraz/wtx 0.8.4 → 0.8.5

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);

package/package.json

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