workon 3.6.0 → 3.7.0

package/dist/cli.js

@@ -283,6 +283,13 @@ var init_project = __esm({
         }
         return this._path;
       }
+      /**
+       * Override the project path with an absolute path.
+       * Used when targeting a worktree instead of the main project directory.
+       */
+      overridePath(absolutePath) {
+        this._path = File.from(absolutePath).absolutify();
+      }
       set branch(branch) {
         this._branch = branch;
       }
@@ -1421,24 +1428,6 @@ var init_tmux = __esm({
   }
 });
 
-// src/types/constants.ts
-var IDE_CHOICES;
-var init_constants = __esm({
-  "src/types/constants.ts"() {
-    "use strict";
-    IDE_CHOICES = [
-      { name: "Cursor", value: "cursor" },
-      { name: "Visual Studio Code", value: "vscode" },
-      { name: "Visual Studio Code (code)", value: "code" },
-      { name: "IntelliJ IDEA", value: "idea" },
-      { name: "Atom", value: "atom" },
-      { name: "Sublime Text", value: "subl" },
-      { name: "Vim", value: "vim" },
-      { name: "Emacs", value: "emacs" }
-    ];
-  }
-});
-
 // src/lib/worktree.ts
 import { exec as execCallback2 } from "child_process";
 import { promisify as promisify2 } from "util";
@@ -1771,6 +1760,24 @@ var init_worktree = __esm({
   }
 });
 
+// src/types/constants.ts
+var IDE_CHOICES;
+var init_constants = __esm({
+  "src/types/constants.ts"() {
+    "use strict";
+    IDE_CHOICES = [
+      { name: "Cursor", value: "cursor" },
+      { name: "Visual Studio Code", value: "vscode" },
+      { name: "Visual Studio Code (code)", value: "code" },
+      { name: "IntelliJ IDEA", value: "idea" },
+      { name: "Atom", value: "atom" },
+      { name: "Sublime Text", value: "subl" },
+      { name: "Vim", value: "vim" },
+      { name: "Emacs", value: "emacs" }
+    ];
+  }
+});
+
 // src/commands/worktrees/utils.ts
 import File3 from "phylo";
 import path from "path";
@@ -2035,7 +2042,7 @@ import ora from "ora";
 import { select as select2, confirm as confirm4 } from "@inquirer/prompts";
 function createAddCommand(ctx) {
   const { config, log } = ctx;
-  return new Command2("add").description("Create a new worktree for a branch").argument("<branch>", "Branch name for the worktree").option("-b, --base <branch>", "Base branch to create new branch from").option("-f, --force", "Overwrite existing worktree").option("-o, --open", "Open the worktree after creation").option("--no-hook", "Skip running the post-setup hook").action(async (branch, options) => {
+  return new Command2("add").description("Create a new worktree for a branch").argument("<branch>", "Branch name for the worktree").option("-b, --base <branch>", "Base branch to create new branch from").option("-f, --force", "Overwrite existing worktree").option("-o, --open", "Open the worktree after creation").option("--no-hook", "Skip running the post-setup hook").option("-y, --yes", "Skip all confirmation prompts (non-interactive mode)").action(async (branch, options) => {
     const projectCtx = await resolveProjectFromCwd(config, log);
     if (!projectCtx) {
       log.error("Not in a git repository. Run this command from within a git project.");
@@ -2045,11 +2052,15 @@ function createAddCommand(ctx) {
       process.exit(1);
     }
     if (!projectCtx.isRegistered) {
-      const result = await promptToRegisterProject(projectCtx.projectPath, config, log);
-      if (result) {
-        projectCtx.projectName = result.projectName;
-        projectCtx.projectConfig = result.projectConfig;
-        projectCtx.isRegistered = true;
+      if (options.yes) {
+        log.info("Project is not registered. Proceeding without registration.");
+      } else {
+        const result = await promptToRegisterProject(projectCtx.projectPath, config, log);
+        if (result) {
+          projectCtx.projectName = result.projectName;
+          projectCtx.projectConfig = result.projectConfig;
+          projectCtx.isRegistered = true;
+        }
       }
     }
     const { projectPath, projectName } = projectCtx;
@@ -2057,16 +2068,21 @@ function createAddCommand(ctx) {
     const branchExists = await manager.branchExists(branch);
     let baseBranch = options.base;
     if (!branchExists && !baseBranch) {
-      const branches = await manager.getBranches();
-      const currentBranch = await manager.getCurrentBranch();
-      baseBranch = await select2({
-        message: `Branch '${branch}' doesn't exist. Create from which branch?`,
-        choices: branches.map((b) => ({
-          name: b === currentBranch ? `${b} (current)` : b,
-          value: b
-        })),
-        default: currentBranch
-      });
+      if (options.yes) {
+        baseBranch = await manager.getCurrentBranch();
+        log.info(`Branch '${branch}' doesn't exist. Creating from '${baseBranch}'.`);
+      } else {
+        const branches = await manager.getBranches();
+        const currentBranch = await manager.getCurrentBranch();
+        baseBranch = await select2({
+          message: `Branch '${branch}' doesn't exist. Create from which branch?`,
+          choices: branches.map((b) => ({
+            name: b === currentBranch ? `${b} (current)` : b,
+            value: b
+          })),
+          default: currentBranch
+        });
+      }
     }
     const spinner = ora(`Creating worktree for branch '${branch}'...`).start();
     try {
@@ -2099,6 +2115,9 @@ ${chalk2.bold("Worktree details:")}`);
       if (projectCtx.isRegistered && projectName) {
         if (options.open) {
           await openWorktreeSession(projectCtx, worktree.name, config, log);
+        } else if (options.yes) {
+          console.log(`
+To open later: ${chalk2.cyan(`workon worktrees open ${worktree.name}`)}`);
         } else {
           const shouldOpen = await confirm4({
             message: "Open workon session in this worktree?",
@@ -2268,7 +2287,7 @@ import path4 from "path";
 import { select as select3, confirm as confirm6 } from "@inquirer/prompts";
 function createMergeCommand(ctx) {
   const { config, log } = ctx;
-  return new Command4("merge").description("Merge a worktree branch and optionally remove the worktree").argument("<name>", "Worktree name").option("-i, --into <branch>", "Target branch to merge into").option("-s, --squash", "Use squash merge").option("-k, --keep", "Keep the worktree after merging").option("-y, --yes", "Skip confirmation prompts").action(async (name, options) => {
+  return new Command4("merge").description("Merge a worktree branch and optionally remove the worktree").argument("<name>", "Worktree name").option("-i, --into <branch>", "Target branch to merge into").option("-s, --squash", "Use squash merge").option("-k, --keep", "Keep the worktree after merging").option("-y, --yes", "Skip confirmation prompts").option("--delete-branch", "Delete the merged branch after merge").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.");
@@ -2310,14 +2329,19 @@ function createMergeCommand(ctx) {
       }
       const commonTargets = ["main", "master", "develop", "dev"];
       const defaultTarget = commonTargets.find((t) => targetBranches.includes(t)) || targetBranches[0];
-      targetBranch = await select3({
-        message: `Merge '${worktree.branch}' into which branch?`,
-        choices: targetBranches.map((b) => ({
-          name: b,
-          value: b
-        })),
-        default: defaultTarget
-      });
+      if (options.yes) {
+        targetBranch = defaultTarget;
+        log.info(`Auto-selected target branch: '${targetBranch}'`);
+      } else {
+        targetBranch = await select3({
+          message: `Merge '${worktree.branch}' into which branch?`,
+          choices: targetBranches.map((b) => ({
+            name: b,
+            value: b
+          })),
+          default: defaultTarget
+        });
+      }
     }
     if (!await manager.branchExists(targetBranch)) {
       log.error(`Target branch '${targetBranch}' does not exist.`);
@@ -2359,6 +2383,11 @@ ${chalk4.bold("Merge operation:")}`);
       log.info("You may need to resolve conflicts manually.");
       process.exit(1);
     }
+    if (options.keep && options.deleteBranch) {
+      log.warn(
+        "--delete-branch is ignored when --keep is set (branch is needed by the worktree)."
+      );
+    }
     if (!options.keep) {
       const tmux = new TmuxManager();
       const sessionName = tmux.getWorktreeSessionName(displayName, name);
@@ -2374,21 +2403,22 @@ ${chalk4.bold("Merge operation:")}`);
         removeSpinner.warn(`Failed to remove worktree: ${error.message}`);
         log.info(`You can remove it manually with: workon worktrees remove ${name}`);
       }
-      if (!options.yes) {
-        const shouldDeleteBranch = await confirm6({
+      let shouldDeleteBranch = options.deleteBranch || false;
+      if (!shouldDeleteBranch && !options.yes) {
+        shouldDeleteBranch = await confirm6({
           message: `Delete the merged branch '${worktree.branch}'?`,
           default: false
         });
-        if (shouldDeleteBranch) {
-          const deleteSpinner = ora3(`Deleting branch '${worktree.branch}'...`).start();
-          try {
-            const { simpleGit: simpleGit6 } = await import("simple-git");
-            const git = simpleGit6(projectPath);
-            await git.deleteLocalBranch(worktree.branch, true);
-            deleteSpinner.succeed(`Branch '${worktree.branch}' deleted`);
-          } catch (error) {
-            deleteSpinner.warn(`Failed to delete branch: ${error.message}`);
-          }
+      }
+      if (shouldDeleteBranch) {
+        const deleteSpinner = ora3(`Deleting branch '${worktree.branch}'...`).start();
+        try {
+          const { simpleGit: simpleGit6 } = await import("simple-git");
+          const git = simpleGit6(projectPath);
+          await git.deleteLocalBranch(worktree.branch, true);
+          deleteSpinner.succeed(`Branch '${worktree.branch}' deleted`);
+        } catch (error) {
+          deleteSpinner.warn(`Failed to delete branch: ${error.message}`);
         }
       }
     }
@@ -2414,7 +2444,7 @@ import { confirm as confirm7 } from "@inquirer/prompts";
 import { simpleGit as simpleGit4 } from "simple-git";
 function createBranchCommand(ctx) {
   const { config, log } = ctx;
-  return new Command5("branch").description("Create a branch from a worktree (useful for detached HEAD state)").argument("<worktree>", "Worktree name").argument("<branch>", "New branch name to create").option("-p, --push", "Push the branch to origin after creating").option("-f, --force", "Overwrite existing branch").action(async (worktreeName, branchName, options) => {
+  return new Command5("branch").description("Create a branch from a worktree (useful for detached HEAD state)").argument("<worktree>", "Worktree name").argument("<branch>", "New branch name to create").option("-p, --push", "Push the branch to origin after creating").option("-f, --force", "Overwrite existing branch").option("-y, --yes", "Skip all confirmation prompts (non-interactive mode)").action(async (worktreeName, branchName, options) => {
     const projectCtx = await resolveProjectFromCwd(config, log);
     if (!projectCtx) {
       log.error("Not in a git repository. Run this command from within a git project.");
@@ -2477,6 +2507,8 @@ ${chalk5.bold("Action:")}`);
           pushSpinner.fail(`Failed to push: ${error.message}`);
           log.info(`You can push manually with: git push -u origin ${branchName}`);
         }
+      } else if (options.yes) {
+        log.info(`You can push manually with: git push -u origin ${branchName}`);
       } else {
         const shouldPush = await confirm7({
           message: "Push branch to origin for PR?",
@@ -2579,13 +2611,12 @@ __export(open_exports, {
 });
 import { Command as Command7 } from "commander";
 import chalk6 from "chalk";
-import File4 from "phylo";
 import path6 from "path";
 import { exec as execCallback3 } from "child_process";
 import { promisify as promisify3 } from "util";
 function createOpenCommand(ctx) {
   const { config, log } = ctx;
-  return new Command7("open").description("Open a workon session in a worktree").argument("<name>", "Worktree name").option("-d, --debug", "Enable debug logging").option("--shell", "Output shell commands instead of spawning processes").action(async (name, options) => {
+  return new Command7("open").description("Open a workon session in a worktree").argument("<name>", "Worktree name").option("-d, --debug", "Enable debug logging").option("--shell", "Output shell commands instead of spawning processes").option("-y, --yes", "Skip all confirmation prompts (non-interactive mode)").action(async (name, options) => {
     if (options.debug) {
       log.setLogLevel("debug");
     }
@@ -2598,12 +2629,16 @@ function createOpenCommand(ctx) {
       process.exit(1);
     }
     if (!projectCtx.isRegistered) {
-      log.warn("Project is not registered. Opening with basic shell layout.");
-      const shouldRegister = await promptToRegisterProject(projectCtx.projectPath, config, log);
-      if (shouldRegister) {
-        projectCtx.projectName = shouldRegister.projectName;
-        projectCtx.projectConfig = shouldRegister.projectConfig;
-        projectCtx.isRegistered = true;
+      if (options.yes) {
+        log.info("Project is not registered. Opening with basic shell layout.");
+      } else {
+        log.warn("Project is not registered. Opening with basic shell layout.");
+        const shouldRegister = await promptToRegisterProject(projectCtx.projectPath, config, log);
+        if (shouldRegister) {
+          projectCtx.projectName = shouldRegister.projectName;
+          projectCtx.projectConfig = shouldRegister.projectConfig;
+          projectCtx.isRegistered = true;
+        }
       }
     }
     await runWorktreeOpen(projectCtx, name, options, { config, log });
@@ -2636,7 +2671,7 @@ async function runWorktreeOpen(projectCtx, worktreeName, options, ctx) {
   let hasNpmEvent = false;
   if (isRegistered && projectName && projectConfig) {
     project = new Project(projectName, projectConfig, defaults);
-    project._path = File4.from(worktree.path).absolutify();
+    project.overridePath(worktree.path);
     const events = project.events || {};
     hasClaudeEvent = !!events.claude;
     hasNpmEvent = !!events.npm;
@@ -2855,7 +2890,7 @@ __export(interactive_exports, {
 });
 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 File4 from "phylo";
 import path7 from "path";
 import deepAssign2 from "deep-assign";
 import chalk7 from "chalk";
@@ -2863,7 +2898,7 @@ async function runInteractive(ctx) {
   const { config, log, environment, suggestedName } = ctx;
   showLogo(config);
   log.log("");
-  const defaultName = suggestedName ?? (environment.$isProjectEnvironment ? environment.project.name : File5.cwd().name);
+  const defaultName = suggestedName ?? (environment.$isProjectEnvironment ? environment.project.name : File4.cwd().name);
   const fromUser = !!suggestedName;
   await startInteractive(defaultName, fromUser, ctx);
 }
@@ -2964,15 +2999,15 @@ async function initProject(defaultName, fromUser, ctx) {
   let basePath;
   if (isBranch) {
     const projectName = name.substring(0, name.indexOf("#"));
-    basePath = defaults?.base ? File5.from(defaults.base).join(projects[projectName].path).absolutePath() : projects[projectName].path;
+    basePath = defaults?.base ? File4.from(defaults.base).join(projects[projectName].path).absolutePath() : projects[projectName].path;
     log.log(`Project path: ${basePath}`);
   } else {
     const pathAnswer = await input5({
       message: "What is the path to the project?",
-      default: defaults?.base ? File5.from(defaults.base).join(name).path : name
+      default: defaults?.base ? File4.from(defaults.base).join(name).path : name
     });
-    let answerFile = File5.from(pathAnswer);
-    const defaultBase = defaults?.base ? File5.from(defaults.base).absolutify() : File5.cwd();
+    let answerFile = File4.from(pathAnswer);
+    const defaultBase = defaults?.base ? File4.from(defaults.base).absolutify() : File4.cwd();
     if (!answerFile.isAbsolute()) {
       answerFile = defaultBase.join(answerFile.path);
     }
@@ -3180,15 +3215,15 @@ async function createProjectManage(ctx) {
       return true;
     }
   });
-  const defaultPath = defaults?.base ? File5.from(defaults.base).absolutify().join(name).path : name;
+  const defaultPath = defaults?.base ? File4.from(defaults.base).absolutify().join(name).path : name;
   const pathInput = await input5({
     message: "Project path:",
     default: defaultPath
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File5.from(defaults.base).absolutify();
-    const pathFile = File5.from(pathInput);
+    const baseDir = File4.from(defaults.base).absolutify();
+    const pathFile = File4.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
         const relPath = pathFile.relativize(baseDir.path);
@@ -3255,8 +3290,8 @@ async function editProjectManage(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File5.from(defaults.base).absolutify();
-    const pathFile = File5.from(pathInput);
+    const baseDir = File4.from(defaults.base).absolutify();
+    const pathFile = File4.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
         const relPath = pathFile.relativize(baseDir.path);
@@ -3359,7 +3394,7 @@ function listProjectsManage(ctx) {
   const baseProjects = Object.keys(projects).filter((name) => !name.includes("#"));
   for (const name of baseProjects) {
     const project = projects[name];
-    const fullPath = defaults?.base ? File5.from(defaults.base).join(project.path).path : project.path;
+    const fullPath = defaults?.base ? File4.from(defaults.base).join(project.path).path : project.path;
     console.log(`  ${name}`);
     console.log(`    Path: ${fullPath}`);
     console.log(`    IDE: ${project.ide || "not set"}`);
@@ -3483,11 +3518,11 @@ async function manageWorktrees(projectName, ctx) {
   const projectConfig = projects[projectName];
   const basePath = defaults?.base || "";
   let projectPath;
-  const configPath = File5.from(projectConfig.path);
+  const configPath = File4.from(projectConfig.path);
   if (configPath.path.startsWith("/") || configPath.path.startsWith("~")) {
     projectPath = configPath.absolutify().path;
   } else if (basePath) {
-    projectPath = File5.from(basePath).absolutify().join(projectConfig.path).path;
+    projectPath = File4.from(basePath).absolutify().join(projectConfig.path).path;
   } else {
     projectPath = configPath.absolutify().path;
   }
@@ -3618,11 +3653,11 @@ async function openWorktreeManage(projectName, manager, config, log) {
   const projectConfig = projects[projectName];
   const basePath = defaults?.base || "";
   let projectPath;
-  const configPath = File5.from(projectConfig.path);
+  const configPath = File4.from(projectConfig.path);
   if (configPath.path.startsWith("/") || configPath.path.startsWith("~")) {
     projectPath = configPath.absolutify().path;
   } else if (basePath) {
-    projectPath = File5.from(basePath).absolutify().join(projectConfig.path).path;
+    projectPath = File4.from(basePath).absolutify().join(projectConfig.path).path;
   } else {
     projectPath = configPath.absolutify().path;
   }
@@ -3865,7 +3900,7 @@ __export(open_exports2, {
   runOpen: () => runOpen
 });
 import { Command as Command8 } from "commander";
-import File6 from "phylo";
+import File5 from "phylo";
 async function runOpen(projectArg, options, ctx) {
   const { log } = ctx;
   if (options.debug) {
@@ -3884,7 +3919,7 @@ function createOpenCommand2(ctx) {
     } else {
       log.debug("No project name provided, starting interactive mode");
       const { runInteractive: runInteractive2 } = await Promise.resolve().then(() => (init_interactive(), interactive_exports));
-      const environment = await EnvironmentRecognizer.recognize(File6.cwd());
+      const environment = await EnvironmentRecognizer.recognize(File5.cwd());
       await runInteractive2({ config, log, environment });
     }
   });
@@ -3892,17 +3927,20 @@ function createOpenCommand2(ctx) {
 }
 async function processProject(projectParam, options, ctx) {
   const { config, log } = ctx;
-  const [projectName, commandsString] = projectParam.split(":");
-  const requestedCommands = commandsString ? commandsString.split(",").map((cmd) => cmd.trim()) : null;
+  const parts = projectParam.split(":");
+  const projectName = parts[0];
+  const commandsString = parts[1] || null;
+  const worktreeName = parts[2] || null;
+  const requestedCommands = commandsString && commandsString !== "help" ? commandsString.split(",").map((cmd) => cmd.trim()) : null;
   if (commandsString === "help") {
     await showProjectHelp(projectName, ctx);
     return;
   }
   log.debug(
-    `Project: ${projectName}, Commands: ${requestedCommands ? requestedCommands.join(", ") : "all"}`
+    `Project: ${projectName}, Commands: ${requestedCommands ? requestedCommands.join(", ") : "all"}` + (worktreeName ? `, Worktree: ${worktreeName}` : "")
   );
   const projects = config.getProjects();
-  const environment = await EnvironmentRecognizer.recognize(File6.cwd());
+  const environment = await EnvironmentRecognizer.recognize(File5.cwd());
   if (environment.$isProjectEnvironment && (projectName === "this" || projectName === ".")) {
     log.info(`Opening current project: ${environment.project.name}`);
     await switchTo(environment, requestedCommands, options, ctx);
@@ -3915,6 +3953,22 @@ async function processProject(projectParam, options, ctx) {
       validateRequestedCommands(requestedCommands, projectCfg, projectName);
     }
     const projectEnv = ProjectEnvironment.load(projectCfg, config.getDefaults());
+    if (worktreeName) {
+      const projectPath = projectEnv.project.path.path;
+      const manager = new WorktreeManager(projectPath, projectName);
+      const worktree = await manager.get(worktreeName);
+      if (!worktree) {
+        log.error(`Worktree '${worktreeName}' not found for project '${projectName}'.`);
+        const worktrees = await manager.listManagedWorktrees();
+        if (worktrees.length > 0) {
+          log.info("Available worktrees:");
+          worktrees.forEach((wt) => log.info(`  - ${wt.name}`));
+        }
+        process.exit(1);
+      }
+      log.debug(`Using worktree path: ${worktree.path}`);
+      projectEnv.project.overridePath(worktree.path);
+    }
     await switchTo(projectEnv, requestedCommands, options, ctx);
   } else {
     log.error(`Project '${projectName}' not found.`);
@@ -4175,7 +4229,9 @@ Available commands for '${projectName}':`);
     const twoCommands = configuredEvents.slice(0, 2).join(",");
     console.log(`  workon ${projectName}:${twoCommands.padEnd(12)} # Multiple commands`);
   }
-  console.log(`  workon ${projectName}:cwd --shell       # Output shell commands
+  console.log(`  workon ${projectName}:cwd --shell       # Output shell commands`);
+  console.log(`  workon ${projectName}:cwd:my-worktree   # Run in a worktree`);
+  console.log(`  workon ${projectName}::my-worktree      # All commands in a worktree
 `);
 }
 var init_open2 = __esm({
@@ -4184,6 +4240,7 @@ var init_open2 = __esm({
     init_environment();
     init_tmux();
     init_registry();
+    init_worktree();
   }
 });
 
@@ -4198,7 +4255,7 @@ import { join as join2, dirname as dirname2 } from "path";
 import { fileURLToPath } from "url";
 import loog from "loog";
 import omelette from "omelette";
-import File9 from "phylo";
+import File8 from "phylo";
 
 // src/commands/config/index.ts
 import { Command as Command12 } from "commander";
@@ -4295,7 +4352,7 @@ init_registry();
 init_constants();
 import { Command as Command13 } from "commander";
 import { select as select5, input as input6, confirm as confirm9, checkbox as checkbox3 } from "@inquirer/prompts";
-import File7 from "phylo";
+import File6 from "phylo";
 function createManageCommand(ctx) {
   const { log } = ctx;
   return new Command13("manage").description("Interactive project management").option("-d, --debug", "Enable debug logging").action(async (options) => {
@@ -4354,12 +4411,12 @@ async function createProject(ctx) {
       return true;
     }
   });
-  const defaultPath = defaults?.base ? File7.from(defaults.base).join(name).path : name;
+  const defaultPath = defaults?.base ? File6.from(defaults.base).join(name).path : name;
   const pathInput = await input6({
     message: "Project path:",
     default: defaultPath,
     validate: (value) => {
-      const path8 = File7.from(value);
+      const path8 = File6.from(value);
       try {
         const exists = path8.exists();
         if (!exists) return `Path does not exist: ${value}`;
@@ -4373,8 +4430,8 @@ async function createProject(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File7.from(defaults.base).absolutify();
-    const pathFile = File7.from(pathInput);
+    const baseDir = File6.from(defaults.base).absolutify();
+    const pathFile = File6.from(pathInput);
     try {
       const relPath = pathFile.relativize(baseDir.path);
       if (relPath && !relPath.path.startsWith("..")) {
@@ -4451,8 +4508,8 @@ async function editProject(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File7.from(defaults.base).absolutify();
-    const pathFile = File7.from(pathInput);
+    const baseDir = File6.from(defaults.base).absolutify();
+    const pathFile = File6.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
         const relPath = pathFile.relativize(baseDir.path);
@@ -4552,7 +4609,7 @@ async function listProjects(ctx) {
   const defaults = config.getDefaults();
   console.log("\nConfigured projects:\n");
   for (const [name, project] of Object.entries(projects)) {
-    const fullPath = defaults?.base ? File7.from(defaults.base).join(project.path).path : project.path;
+    const fullPath = defaults?.base ? File6.from(defaults.base).join(project.path).path : project.path;
     console.log(`  ${name}`);
     console.log(`    Path: ${fullPath}`);
     console.log(`    IDE: ${project.ide || "not set"}`);
@@ -4568,7 +4625,7 @@ async function listProjects(ctx) {
 import { Command as Command14 } from "commander";
 import { existsSync as existsSync6, readFileSync } from "fs";
 import { basename as basename2, resolve } from "path";
-import File8 from "phylo";
+import File7 from "phylo";
 import { confirm as confirm10 } from "@inquirer/prompts";
 function createAddCommand2(ctx) {
   const { log } = ctx;
@@ -4592,7 +4649,7 @@ async function addProject(pathArg, options, ctx) {
     log.error(`Path does not exist: ${targetPath}`);
     process.exit(1);
   }
-  const pathFile = File8.from(targetPath);
+  const pathFile = File7.from(targetPath);
   try {
     const stat = pathFile.stat();
     if (!stat.isDirectory()) {
@@ -4626,7 +4683,7 @@ async function addProject(pathArg, options, ctx) {
   log.debug(`IDE: ${ide}`);
   let relativePath = targetPath;
   if (defaults?.base) {
-    const baseDir = File8.from(defaults.base).absolutify();
+    const baseDir = File7.from(defaults.base).absolutify();
     try {
       const relPath = pathFile.relativize(baseDir.path);
       if (relPath && !relPath.path.startsWith("..")) {
@@ -4755,19 +4812,21 @@ function createWorktreeCommand(ctx) {
     }
     await showWorktreeStatus(worktreeInfo, log);
   });
-  command.command("merge").description("Merge this worktree branch into a target branch").option("-i, --into <branch>", "Target branch to merge into").option("-s, --squash", "Use squash merge").option("-k, --keep", "Keep the worktree after merging").option("-y, --yes", "Skip confirmation prompts").action(async (options) => {
-    const worktreeInfo = await detectWorktreeContext();
-    if (!worktreeInfo) {
-      log.error("Not in a git repository.");
-      process.exit(1);
-    }
-    if (!worktreeInfo.isWorktree) {
-      log.error("You're in the main repository, not a worktree.");
-      log.info(`Use 'workon worktrees merge <name>' from the main repository.`);
-      process.exit(1);
+  command.command("merge").description("Merge this worktree branch into a target branch").option("-i, --into <branch>", "Target branch to merge into").option("-s, --squash", "Use squash merge").option("-k, --keep", "Keep the worktree after merging").option("-y, --yes", "Skip confirmation prompts").option("--delete-branch", "Delete the merged branch after merge").action(
+    async (options) => {
+      const worktreeInfo = await detectWorktreeContext();
+      if (!worktreeInfo) {
+        log.error("Not in a git repository.");
+        process.exit(1);
+      }
+      if (!worktreeInfo.isWorktree) {
+        log.error("You're in the main repository, not a worktree.");
+        log.info(`Use 'workon worktrees merge <name>' from the main repository.`);
+        process.exit(1);
+      }
+      await mergeCurrentWorktree(worktreeInfo, options, ctx);
     }
-    await mergeCurrentWorktree(worktreeInfo, options, ctx);
-  });
+  );
   command.command("remove").description("Remove the current worktree").option("-f, --force", "Force removal even with uncommitted changes").option("-y, --yes", "Skip confirmation prompt").action(async (options) => {
     const worktreeInfo = await detectWorktreeContext();
     if (!worktreeInfo) {
@@ -4852,11 +4911,16 @@ async function mergeCurrentWorktree(worktreeInfo, options, ctx) {
     }
     const commonTargets = ["main", "master", "develop", "dev"];
     const defaultTarget = commonTargets.find((t) => targetBranches.includes(t)) || targetBranches[0];
-    targetBranch = await select6({
-      message: `Merge '${worktreeInfo.branch}' into which branch?`,
-      choices: targetBranches.map((b) => ({ name: b, value: b })),
-      default: defaultTarget
-    });
+    if (options.yes) {
+      targetBranch = defaultTarget;
+      log.info(`Auto-selected target branch: '${targetBranch}'`);
+    } else {
+      targetBranch = await select6({
+        message: `Merge '${worktreeInfo.branch}' into which branch?`,
+        choices: targetBranches.map((b) => ({ name: b, value: b })),
+        default: defaultTarget
+      });
+    }
   }
   if (!await manager.branchExists(targetBranch)) {
     log.error(`Target branch '${targetBranch}' does not exist.`);
@@ -4898,12 +4962,18 @@ ${chalk8.bold("Merge operation:")}`);
     log.info("You may need to resolve conflicts manually.");
     process.exit(1);
   }
+  if (options.keep && options.deleteBranch) {
+    log.warn("--delete-branch is ignored when --keep is set (branch is needed by the worktree).");
+  }
   if (!options.keep) {
-    log.warn("You need to exit this worktree directory before it can be removed.");
-    const shouldContinue = await confirm11({
-      message: `Remove worktree '${worktreeInfo.worktreeName}'? (You'll need to cd out first)`,
-      default: true
-    });
+    let shouldContinue = true;
+    if (!options.yes) {
+      log.warn("You need to exit this worktree directory before it can be removed.");
+      shouldContinue = await confirm11({
+        message: `Remove worktree '${worktreeInfo.worktreeName}'? (You'll need to cd out first)`,
+        default: true
+      });
+    }
     if (shouldContinue) {
       const tmux = new TmuxManager();
       const sessionName = tmux.getWorktreeSessionName(
@@ -4919,20 +4989,21 @@ To complete removal, run from the main project directory:`);
       console.log(chalk8.cyan(`  cd ${worktreeInfo.mainRepoPath}`));
       console.log(chalk8.cyan(`  workon worktrees remove ${worktreeInfo.worktreeName}`));
     }
-    if (!options.yes) {
-      const shouldDeleteBranch = await confirm11({
+    let shouldDeleteBranch = options.deleteBranch || false;
+    if (!shouldDeleteBranch && !options.yes) {
+      shouldDeleteBranch = await confirm11({
         message: `Delete the merged branch '${worktreeInfo.branch}'?`,
         default: false
       });
-      if (shouldDeleteBranch) {
-        const deleteSpinner = ora5(`Deleting branch '${worktreeInfo.branch}'...`).start();
-        try {
-          const git = simpleGit5(worktreeInfo.mainRepoPath);
-          await git.deleteLocalBranch(worktreeInfo.branch, true);
-          deleteSpinner.succeed(`Branch '${worktreeInfo.branch}' deleted`);
-        } catch (error) {
-          deleteSpinner.warn(`Failed to delete branch: ${error.message}`);
-        }
+    }
+    if (shouldDeleteBranch) {
+      const deleteSpinner = ora5(`Deleting branch '${worktreeInfo.branch}'...`).start();
+      try {
+        const git = simpleGit5(worktreeInfo.mainRepoPath);
+        await git.deleteLocalBranch(worktreeInfo.branch, true);
+        deleteSpinner.succeed(`Branch '${worktreeInfo.branch}' deleted`);
+      } catch (error) {
+        deleteSpinner.warn(`Failed to delete branch: ${error.message}`);
       }
     }
   }
@@ -5046,7 +5117,7 @@ function createCli() {
         await runOpen2(project, { debug: options.debug, shell: options.shell }, { config, log });
         return;
       }
-      const environment = await EnvironmentRecognizer.recognize(File9.cwd());
+      const environment = await EnvironmentRecognizer.recognize(File8.cwd());
       program2.setOptionValue("_environment", environment);
       program2.setOptionValue("_config", config);
       program2.setOptionValue("_log", log);