workon 3.4.0 → 3.5.1

package/dist/cli.js

@@ -269,10 +269,11 @@ var init_project = __esm({
         return this._events;
       }
       set path(path8) {
-        if (this._base) {
+        const pathFile = File.from(path8);
+        if (this._base && !pathFile.isAbsolute()) {
           this._path = this._base.join(path8);
         } else {
-          this._path = File.from(path8);
+          this._path = pathFile;
         }
         this._path = this._path.absolutify();
       }
@@ -365,17 +366,17 @@ var init_environment = __esm({
           return this.projects;
         }
         const defaults = this.config.getDefaults();
-        if (!defaults?.base) {
-          this.projects = [];
-          return this.projects;
-        }
-        const baseDir = File2.from(defaults.base);
+        const baseDir = defaults?.base ? File2.from(defaults.base).absolutify() : null;
         const projectsMap = this.config.getProjects();
-        this.projects = Object.entries(projectsMap).map(([name, project]) => ({
-          ...project,
-          name,
-          path: baseDir.join(project.path)
-        }));
+        this.projects = Object.entries(projectsMap).map(([name, project]) => {
+          const projectPath = File2.from(project.path);
+          const resolvedPath = baseDir && !projectPath.isAbsolute() ? baseDir.join(project.path) : projectPath;
+          return {
+            ...project,
+            name,
+            path: resolvedPath
+          };
+        });
         return this.projects;
       }
       static getProjectEnvironment(base, _matching) {
@@ -1443,20 +1444,36 @@ import { exec as execCallback2 } from "child_process";
 import { promisify as promisify2 } from "util";
 import { existsSync as existsSync2, chmodSync } from "fs";
 import { join, basename } from "path";
+import { createHash } from "crypto";
+import { homedir } from "os";
 import { simpleGit as simpleGit2 } from "simple-git";
-var exec2, WORKTREES_DIR, HOOK_DIR, SETUP_HOOK, WorktreeManager;
+function shortHash(input7) {
+  return createHash("sha256").update(input7).digest("hex").substring(0, 8);
+}
+function deriveProjectIdentifier(projectPath) {
+  const name = basename(projectPath);
+  const hash = shortHash(projectPath);
+  return `${name}-${hash}`;
+}
+function getWorktreesDirForProject(projectIdentifier) {
+  return join(homedir(), WORKON_DIR, WORKTREES_SUBDIR, projectIdentifier);
+}
+var exec2, WORKON_DIR, WORKTREES_SUBDIR, HOOK_DIR, SETUP_HOOK, WorktreeManager;
 var init_worktree = __esm({
   "src/lib/worktree.ts"() {
     "use strict";
     exec2 = promisify2(execCallback2);
-    WORKTREES_DIR = ".worktrees";
+    WORKON_DIR = ".workon";
+    WORKTREES_SUBDIR = "worktrees";
     HOOK_DIR = ".workon";
     SETUP_HOOK = "worktree-setup.sh";
     WorktreeManager = class {
       projectPath;
+      projectIdentifier;
       git;
-      constructor(projectPath) {
+      constructor(projectPath, _projectName) {
         this.projectPath = projectPath;
+        this.projectIdentifier = deriveProjectIdentifier(projectPath);
         this.git = simpleGit2(projectPath);
       }
       /**
@@ -1472,9 +1489,10 @@ var init_worktree = __esm({
       }
       /**
        * Get the worktrees directory path
+       * Stored at ~/.workon/worktrees/{project-identifier}/
        */
       getWorktreesDir() {
-        return join(this.projectPath, WORKTREES_DIR);
+        return join(homedir(), WORKON_DIR, WORKTREES_SUBDIR, this.projectIdentifier);
       }
       /**
        * Convert branch name to directory name (replace slashes with dashes)
@@ -1765,7 +1783,8 @@ async function findWorktreeNameByPath(mainRepoPath, worktreePath) {
     const git = simpleGit3(mainRepoPath);
     const result = await git.raw(["worktree", "list", "--porcelain"]);
     const blocks = result.trim().split("\n\n");
-    const worktreesDir = path.join(mainRepoPath, ".worktrees");
+    const projectIdentifier = deriveProjectIdentifier(mainRepoPath);
+    const projectWorktreesDir = getWorktreesDirForProject(projectIdentifier);
     for (const block of blocks) {
       if (!block.trim()) continue;
       const lines = block.split("\n");
@@ -1781,7 +1800,7 @@ async function findWorktreeNameByPath(mainRepoPath, worktreePath) {
         }
       }
       if (wtPath === worktreePath) {
-        if (wtPath.startsWith(worktreesDir)) {
+        if (wtPath.startsWith(projectWorktreesDir)) {
           return path.basename(wtPath);
         } else {
           return branch && branch !== "(detached)" ? branch.replace(/\//g, "-") : path.basename(wtPath);
@@ -1904,6 +1923,7 @@ async function promptToRegisterProject(projectPath, config, log) {
 var init_utils = __esm({
   "src/commands/worktrees/utils.ts"() {
     "use strict";
+    init_worktree();
     init_registry();
     init_constants();
   }
@@ -1926,7 +1946,7 @@ function createListCommand(ctx) {
     }
     const { projectPath, projectName } = projectCtx;
     const displayName = projectName || path2.basename(projectPath);
-    const manager = new WorktreeManager(projectPath);
+    const manager = new WorktreeManager(projectPath, projectName ?? void 0);
     const allWorktrees = await manager.list();
     const managedWorktrees = await manager.listManagedWorktrees();
     const managedPaths = new Set(managedWorktrees.map((wt) => wt.path));
@@ -1990,7 +2010,7 @@ function createAddCommand(ctx) {
       }
     }
     const { projectPath, projectName } = projectCtx;
-    const manager = new WorktreeManager(projectPath);
+    const manager = new WorktreeManager(projectPath, projectName ?? void 0);
     const branchExists = await manager.branchExists(branch);
     let baseBranch = options.base;
     if (!branchExists && !baseBranch) {
@@ -2099,7 +2119,7 @@ function createRemoveCommand(ctx) {
     }
     const { projectPath, projectName } = projectCtx;
     const displayName = projectName || path3.basename(projectPath);
-    const manager = new WorktreeManager(projectPath);
+    const manager = new WorktreeManager(projectPath, projectName ?? void 0);
     const worktree = await manager.get(name);
     if (!worktree) {
       log.error(`Worktree '${name}' not found for '${displayName}'`);
@@ -2193,7 +2213,7 @@ function createMergeCommand(ctx) {
     }
     const { projectPath, projectName } = projectCtx;
     const displayName = projectName || path4.basename(projectPath);
-    const manager = new WorktreeManager(projectPath);
+    const manager = new WorktreeManager(projectPath, projectName ?? void 0);
     const worktree = await manager.get(name);
     if (!worktree) {
       log.error(`Worktree '${name}' not found for '${displayName}'`);
@@ -2339,7 +2359,7 @@ function createBranchCommand(ctx) {
     }
     const { projectPath, projectName } = projectCtx;
     const displayName = projectName || path5.basename(projectPath);
-    const manager = new WorktreeManager(projectPath);
+    const manager = new WorktreeManager(projectPath, projectName ?? void 0);
     const worktree = await manager.get(worktreeName);
     if (!worktree) {
       log.error(`Worktree '${worktreeName}' not found for '${displayName}'`);
@@ -2527,7 +2547,7 @@ async function runWorktreeOpen(projectCtx, worktreeName, options, ctx) {
   const { config, log } = ctx;
   const { projectPath, projectName, projectConfig, isRegistered } = projectCtx;
   const displayName = projectName || path6.basename(projectPath);
-  const manager = new WorktreeManager(projectPath);
+  const manager = new WorktreeManager(projectPath, projectName ?? void 0);
   const worktree = await manager.get(worktreeName);
   if (!worktree) {
     log.error(`Worktree '${worktreeName}' not found for '${displayName}'`);
@@ -2555,6 +2575,7 @@ async function runWorktreeOpen(projectCtx, worktreeName, options, ctx) {
     hasClaudeEvent = !!events.claude;
     hasNpmEvent = !!events.npm;
   }
+  const shouldAttach = options.attach !== false;
   if (isShellMode) {
     const shellCommands = await buildWorktreeShellCommands(
       project,
@@ -2571,10 +2592,20 @@ async function runWorktreeOpen(projectCtx, worktreeName, options, ctx) {
           hasClaudeEvent,
           hasNpmEvent
         });
-        await tmux.attachToSession(sessionName);
-        console.log(
-          chalk6.green(`Opened worktree '${worktreeName}' in tmux session '${sessionName}'`)
-        );
+        if (shouldAttach) {
+          await tmux.attachToSession(sessionName);
+          console.log(
+            chalk6.green(`Opened worktree '${worktreeName}' in tmux session '${sessionName}'`)
+          );
+        } else {
+          console.log(
+            chalk6.green(`
+Created tmux session '${sessionName}' for worktree '${worktreeName}'`)
+          );
+          console.log(`
+To attach to this session, run:`);
+          console.log(chalk6.cyan(`  tmux attach -t '${sessionName}'`));
+        }
       } catch (error) {
         log.error(`Failed to create tmux session: ${error.message}`);
         process.exit(1);
@@ -2874,7 +2905,7 @@ async function initProject(defaultName, fromUser, ctx) {
       default: defaults?.base ? File5.from(defaults.base).join(name).path : name
     });
     let answerFile = File5.from(pathAnswer);
-    const defaultBase = defaults?.base ? File5.from(defaults.base) : File5.cwd();
+    const defaultBase = defaults?.base ? File5.from(defaults.base).absolutify() : File5.cwd();
     if (!answerFile.isAbsolute()) {
       answerFile = defaultBase.join(answerFile.path);
     }
@@ -2888,7 +2919,8 @@ async function initProject(defaultName, fromUser, ctx) {
     } catch {
       answerFile = answerFile.absolutify();
     }
-    basePath = answerFile.relativize(defaultBase.path).path;
+    const relPath = answerFile.relativize(defaultBase.path);
+    basePath = relPath && !relPath.path.startsWith("..") ? relPath.path : answerFile.path;
   }
   const ide = await select4({
     message: "What is the IDE?",
@@ -3081,18 +3113,21 @@ async function createProjectManage(ctx) {
       return true;
     }
   });
-  const defaultPath = defaults?.base ? File5.from(defaults.base).join(name).path : name;
+  const defaultPath = defaults?.base ? File5.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);
+    const baseDir = File5.from(defaults.base).absolutify();
     const pathFile = File5.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
-        relativePath = pathFile.relativize(baseDir.path).path;
+        const relPath = pathFile.relativize(baseDir.path);
+        if (relPath && !relPath.path.startsWith("..")) {
+          relativePath = relPath.path;
+        }
       }
     } catch {
       relativePath = pathInput;
@@ -3153,11 +3188,14 @@ async function editProjectManage(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File5.from(defaults.base);
+    const baseDir = File5.from(defaults.base).absolutify();
     const pathFile = File5.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
-        relativePath = pathFile.relativize(baseDir.path).path;
+        const relPath = pathFile.relativize(baseDir.path);
+        if (relPath && !relPath.path.startsWith("..")) {
+          relativePath = relPath.path;
+        }
       }
     } catch {
       relativePath = pathInput;
@@ -3386,7 +3424,7 @@ async function manageWorktrees(projectName, ctx) {
   } else {
     projectPath = configPath.absolutify().path;
   }
-  const manager = new WorktreeManager(projectPath);
+  const manager = new WorktreeManager(projectPath, projectName);
   if (!await manager.isGitRepository()) {
     log.error(`'${projectName}' is not a git repository`);
     return;
@@ -3535,7 +3573,7 @@ async function openWorktreeManage(projectName, manager, config, log) {
     }
   };
   const { runWorktreeOpen: runWorktreeOpen2 } = await Promise.resolve().then(() => (init_open(), open_exports));
-  await runWorktreeOpen2(projectCtx, worktreeName, {}, { config, log });
+  await runWorktreeOpen2(projectCtx, worktreeName, { attach: false }, { config, log });
 }
 async function removeWorktreeManage(projectName, manager, log) {
   const worktrees = await manager.list();
@@ -3670,7 +3708,7 @@ async function manageWorktreesInteractive(projectCtx, ctx) {
   const { config, log } = ctx;
   const { projectPath, projectName } = projectCtx;
   const displayName = projectName || path7.basename(projectPath);
-  const manager = new WorktreeManager(projectPath);
+  const manager = new WorktreeManager(projectPath, projectName ?? void 0);
   if (!await manager.isGitRepository()) {
     log.error(`'${displayName}' is not a git repository`);
     return;
@@ -4247,10 +4285,13 @@ async function createProject(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File7.from(defaults.base);
+    const baseDir = File7.from(defaults.base).absolutify();
     const pathFile = File7.from(pathInput);
     try {
-      relativePath = pathFile.relativize(baseDir.path).path;
+      const relPath = pathFile.relativize(baseDir.path);
+      if (relPath && !relPath.path.startsWith("..")) {
+        relativePath = relPath.path;
+      }
     } catch {
       relativePath = pathInput;
     }
@@ -4322,11 +4363,14 @@ async function editProject(ctx) {
   });
   let relativePath = pathInput;
   if (defaults?.base) {
-    const baseDir = File7.from(defaults.base);
+    const baseDir = File7.from(defaults.base).absolutify();
     const pathFile = File7.from(pathInput);
     try {
       if (pathFile.isAbsolute()) {
-        relativePath = pathFile.relativize(baseDir.path).path;
+        const relPath = pathFile.relativize(baseDir.path);
+        if (relPath && !relPath.path.startsWith("..")) {
+          relativePath = relPath.path;
+        }
       }
     } catch {
       relativePath = pathInput;
@@ -4494,7 +4538,7 @@ async function addProject(pathArg, options, ctx) {
   log.debug(`IDE: ${ide}`);
   let relativePath = targetPath;
   if (defaults?.base) {
-    const baseDir = File8.from(defaults.base);
+    const baseDir = File8.from(defaults.base).absolutify();
     try {
       const relPath = pathFile.relativize(baseDir.path);
       if (relPath && !relPath.path.startsWith("..")) {