workon 3.5.1 → 3.6.0

package/dist/cli.js

@@ -1458,7 +1458,7 @@ function deriveProjectIdentifier(projectPath) {
 function getWorktreesDirForProject(projectIdentifier) {
   return join(homedir(), WORKON_DIR, WORKTREES_SUBDIR, projectIdentifier);
 }
-var exec2, WORKON_DIR, WORKTREES_SUBDIR, HOOK_DIR, SETUP_HOOK, WorktreeManager;
+var exec2, WORKON_DIR, WORKTREES_SUBDIR, HOOK_DIR, SETUP_HOOK, TEARDOWN_HOOK, WorktreeManager;
 var init_worktree = __esm({
   "src/lib/worktree.ts"() {
     "use strict";
@@ -1467,6 +1467,7 @@ var init_worktree = __esm({
     WORKTREES_SUBDIR = "worktrees";
     HOOK_DIR = ".workon";
     SETUP_HOOK = "worktree-setup.sh";
+    TEARDOWN_HOOK = "worktree-teardown.sh";
     WorktreeManager = class {
       projectPath;
       projectIdentifier;
@@ -1569,11 +1570,12 @@ var init_worktree = __esm({
         if (worktree.isMain) {
           throw new Error("Cannot remove the main worktree");
         }
-        if (!force && await this.hasUncommittedChanges(name)) {
+        const pathMissing = !existsSync2(worktree.path);
+        if (!pathMissing && !force && await this.hasUncommittedChanges(name)) {
           throw new Error(`Worktree '${name}' has uncommitted changes. Use --force to remove anyway.`);
         }
         const args = ["worktree", "remove"];
-        if (force) {
+        if (force || pathMissing) {
           args.push("--force");
         }
         args.push(worktree.path);
@@ -1592,6 +1594,9 @@ var init_worktree = __esm({
         if (!worktree) {
           throw new Error(`Worktree '${nameOrPath}' not found`);
         }
+        if (!existsSync2(worktree.path)) {
+          return false;
+        }
         const worktreeGit = simpleGit2(worktree.path);
         const status = await worktreeGit.status();
         return !status.isClean();
@@ -1680,6 +1685,42 @@ var init_worktree = __esm({
         });
         return { stdout, stderr };
       }
+      /**
+       * Check if a pre-teardown hook exists
+       */
+      hasTeardownHook() {
+        const hookPath = this.getTeardownHookPath();
+        return existsSync2(hookPath);
+      }
+      /**
+       * Get the path to the teardown hook
+       */
+      getTeardownHookPath() {
+        return join(this.projectPath, HOOK_DIR, TEARDOWN_HOOK);
+      }
+      /**
+       * Run the pre-teardown hook for a worktree
+       */
+      async runPreTeardownHook(worktreePath) {
+        const hookPath = this.getTeardownHookPath();
+        if (!existsSync2(hookPath)) {
+          throw new Error("Teardown hook not found");
+        }
+        try {
+          chmodSync(hookPath, "755");
+        } catch {
+        }
+        const env = {
+          ...process.env,
+          WORKTREE_PATH: worktreePath,
+          PROJECT_PATH: this.projectPath
+        };
+        const { stdout, stderr } = await exec2(hookPath, {
+          cwd: worktreePath,
+          env
+        });
+        return { stdout, stderr };
+      }
       /**
        * Parse the porcelain output of git worktree list
        */
@@ -1933,6 +1974,7 @@ var init_utils = __esm({
 import { Command } from "commander";
 import chalk from "chalk";
 import path2 from "path";
+import { existsSync as existsSync3 } from "fs";
 function createListCommand(ctx) {
   const { config, log } = ctx;
   return new Command("list").description("List worktrees for the current project").option("-a, --all", "Show all worktrees (including main)").action(async (options) => {
@@ -1966,9 +2008,10 @@ Worktrees for ${displayName}:`));
     for (const wt of worktrees) {
       const isManaged = managedPaths.has(wt.path);
       const mainLabel = wt.isMain ? chalk.gray(" (main)") : "";
-      const externalLabel = !wt.isMain && !isManaged ? chalk.yellow(" (external)") : "";
+      const missingLabel = !wt.isMain && !existsSync3(wt.path) ? chalk.red(" (missing)") : "";
+      const externalLabel = !wt.isMain && !isManaged && !missingLabel ? chalk.yellow(" (external)") : "";
       const branchDisplay = wt.branch === "(detached)" ? chalk.yellow(wt.branch) : chalk.green(wt.branch);
-      console.log(`  ${chalk.cyan(wt.name)}${mainLabel}${externalLabel}`);
+      console.log(`  ${chalk.cyan(wt.name)}${mainLabel}${missingLabel}${externalLabel}`);
       console.log(`    Branch: ${branchDisplay}`);
       console.log(`    Path:   ${chalk.gray(wt.path)}`);
       console.log(`    HEAD:   ${chalk.gray(wt.head.substring(0, 8))}`);
@@ -2105,10 +2148,11 @@ import { Command as Command3 } from "commander";
 import chalk3 from "chalk";
 import ora2 from "ora";
 import path3 from "path";
+import { existsSync as existsSync4 } from "fs";
 import { confirm as confirm5 } from "@inquirer/prompts";
 function createRemoveCommand(ctx) {
   const { config, log } = ctx;
-  return new Command3("remove").description("Remove a worktree").argument("<name>", "Worktree name").option("-f, --force", "Force removal even with uncommitted changes").option("-y, --yes", "Skip confirmation prompt").action(async (name, options) => {
+  return new Command3("remove").description("Remove a worktree").argument("<name>", "Worktree name").option("-f, --force", "Force removal even with uncommitted changes").option("-y, --yes", "Skip confirmation prompt").option("--no-hook", "Skip running the pre-teardown hook").action(async (name, options) => {
     const projectCtx = await resolveProjectFromCwd(config, log);
     if (!projectCtx) {
       log.error("Not in a git repository. Run this command from within a git project.");
@@ -2134,22 +2178,29 @@ function createRemoveCommand(ctx) {
       log.error("Cannot remove the main worktree");
       process.exit(1);
     }
-    const hasChanges = await manager.hasUncommittedChanges(name);
-    if (hasChanges && !options.force) {
-      log.warn(`Worktree '${name}' has uncommitted changes.`);
-      if (!options.yes) {
-        const shouldForce = await confirm5({
-          message: "Do you want to force removal and lose these changes?",
-          default: false
-        });
-        if (!shouldForce) {
-          log.info("Removal cancelled.");
-          return;
+    const pathMissing = !existsSync4(worktree.path);
+    if (pathMissing) {
+      log.warn(`Worktree directory is missing from disk: ${worktree.path}`);
+      options.force = true;
+    }
+    if (!pathMissing) {
+      const hasChanges = await manager.hasUncommittedChanges(name);
+      if (hasChanges && !options.force) {
+        log.warn(`Worktree '${name}' has uncommitted changes.`);
+        if (!options.yes) {
+          const shouldForce = await confirm5({
+            message: "Do you want to force removal and lose these changes?",
+            default: false
+          });
+          if (!shouldForce) {
+            log.info("Removal cancelled.");
+            return;
+          }
+          options.force = true;
+        } else {
+          log.error("Use --force to remove worktrees with uncommitted changes.");
+          process.exit(1);
         }
-        options.force = true;
-      } else {
-        log.error("Use --force to remove worktrees with uncommitted changes.");
-        process.exit(1);
       }
     }
     if (!options.yes) {
@@ -2174,6 +2225,21 @@ ${chalk3.bold("Worktree to remove:")}`);
       log.debug(`Killing tmux session: ${sessionName}`);
       await tmux.killSession(sessionName);
     }
+    if (options.hook !== false && !pathMissing && manager.hasTeardownHook()) {
+      const hookSpinner = ora2("Running pre-teardown hook...").start();
+      try {
+        const { stdout, stderr } = await manager.runPreTeardownHook(worktree.path);
+        hookSpinner.succeed("Pre-teardown hook completed");
+        if (stdout.trim()) {
+          console.log(chalk3.gray(stdout.trim()));
+        }
+        if (stderr.trim()) {
+          console.log(chalk3.yellow(stderr.trim()));
+        }
+      } catch (error) {
+        hookSpinner.warn(`Pre-teardown hook failed: ${error.message}`);
+      }
+    }
     const spinner = ora2(`Removing worktree '${name}'...`).start();
     try {
       await manager.remove(name, options.force);
@@ -2788,6 +2854,7 @@ __export(interactive_exports, {
   runInteractive: () => runInteractive
 });
 import { select as select4, input as input5, checkbox as checkbox2, confirm as confirm8 } from "@inquirer/prompts";
+import { existsSync as existsSync5 } from "fs";
 import File5 from "phylo";
 import path7 from "path";
 import deepAssign2 from "deep-assign";
@@ -3607,6 +3674,18 @@ async function removeWorktreeManage(projectName, manager, log) {
   });
   if (confirmed) {
     try {
+      if (manager.hasTeardownHook()) {
+        const worktree = await manager.get(worktreeName);
+        if (worktree && existsSync5(worktree.path)) {
+          log.info("Running pre-teardown hook...");
+          try {
+            await manager.runPreTeardownHook(worktree.path);
+            log.info("Pre-teardown hook completed.");
+          } catch (error) {
+            log.warn(`Pre-teardown hook failed: ${error.message}`);
+          }
+        }
+      }
       await manager.remove(worktreeName, true);
       log.info(`Worktree '${worktreeName}' removed.`);
     } catch (error) {
@@ -3656,6 +3735,15 @@ async function mergeWorktreeManage(projectName, manager, log) {
     await manager.merge(worktreeName, { targetBranch, squash });
     log.info(`Merged '${worktree.branch}' into '${targetBranch}'`);
     if (removeAfter) {
+      if (manager.hasTeardownHook() && existsSync5(worktree.path)) {
+        log.info("Running pre-teardown hook...");
+        try {
+          await manager.runPreTeardownHook(worktree.path);
+          log.info("Pre-teardown hook completed.");
+        } catch (error) {
+          log.warn(`Pre-teardown hook failed: ${error.message}`);
+        }
+      }
       await manager.remove(worktreeName, true);
       log.info(`Worktree '${worktreeName}' removed.`);
     }
@@ -4105,7 +4193,7 @@ init_environment();
 init_registry();
 init_open2();
 import { Command as Command16 } from "commander";
-import { readFileSync as readFileSync2, existsSync as existsSync4 } from "fs";
+import { readFileSync as readFileSync2, existsSync as existsSync7 } from "fs";
 import { join as join2, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import loog from "loog";
@@ -4478,7 +4566,7 @@ async function listProjects(ctx) {
 
 // src/commands/add.ts
 import { Command as Command14 } from "commander";
-import { existsSync as existsSync3, readFileSync } from "fs";
+import { existsSync as existsSync6, readFileSync } from "fs";
 import { basename as basename2, resolve } from "path";
 import File8 from "phylo";
 import { confirm as confirm10 } from "@inquirer/prompts";
@@ -4500,7 +4588,7 @@ async function addProject(pathArg, options, ctx) {
   const projects = config.getProjects();
   const targetPath = resolve(pathArg);
   log.debug(`Resolved path: ${targetPath}`);
-  if (!existsSync3(targetPath)) {
+  if (!existsSync6(targetPath)) {
     log.error(`Path does not exist: ${targetPath}`);
     process.exit(1);
   }
@@ -4584,7 +4672,7 @@ function discoverProject(targetPath, log) {
     packageJson: null
   };
   const packageJsonPath = resolve(targetPath, "package.json");
-  if (existsSync3(packageJsonPath)) {
+  if (existsSync6(packageJsonPath)) {
     discovery.isNode = true;
     log.debug("Detected Node project (package.json found)");
     try {
@@ -4600,25 +4688,25 @@ function discoverProject(targetPath, log) {
     }
   }
   const bunLockPath = resolve(targetPath, "bun.lockb");
-  if (existsSync3(bunLockPath)) {
+  if (existsSync6(bunLockPath)) {
     discovery.isBun = true;
     log.debug("Detected Bun project (bun.lockb found)");
   }
   const vscodeDir = resolve(targetPath, ".vscode");
   const cursorDir = resolve(targetPath, ".cursor");
   const ideaDir = resolve(targetPath, ".idea");
-  if (existsSync3(cursorDir)) {
+  if (existsSync6(cursorDir)) {
     discovery.detectedIde = "cursor";
     log.debug("Detected Cursor (.cursor directory found)");
-  } else if (existsSync3(vscodeDir)) {
+  } else if (existsSync6(vscodeDir)) {
     discovery.detectedIde = "code";
     log.debug("Detected VS Code (.vscode directory found)");
-  } else if (existsSync3(ideaDir)) {
+  } else if (existsSync6(ideaDir)) {
     discovery.detectedIde = "idea";
     log.debug("Detected IntelliJ IDEA (.idea directory found)");
   }
   const claudeMdPath = resolve(targetPath, "CLAUDE.md");
-  if (existsSync3(claudeMdPath)) {
+  if (existsSync6(claudeMdPath)) {
     discovery.hasClaude = true;
     log.debug("Detected Claude Code project (CLAUDE.md found)");
   }
@@ -4914,7 +5002,7 @@ function findPackageJson() {
     join2(process.cwd(), "package.json")
   ];
   for (const p of paths) {
-    if (existsSync4(p)) {
+    if (existsSync7(p)) {
       return p;
     }
   }