workon 3.7.0 → 3.7.1

package/dist/cli.js

@@ -1275,7 +1275,7 @@ var init_tmux = __esm({
       getWorktreeSessionName(projectName, worktreeName) {
         const sanitizedProject = sanitizeForShell(projectName);
         const sanitizedWorktree = sanitizeForShell(worktreeName);
-        return `${this.sessionPrefix}${sanitizedProject}-${sanitizedWorktree}`;
+        return `${this.sessionPrefix}${sanitizedProject}_wt_${sanitizedWorktree}`;
       }
       async killSession(sessionName) {
         try {
@@ -3942,6 +3942,13 @@ async function processProject(projectParam, options, ctx) {
   const projects = config.getProjects();
   const environment = await EnvironmentRecognizer.recognize(File5.cwd());
   if (environment.$isProjectEnvironment && (projectName === "this" || projectName === ".")) {
+    if (worktreeName) {
+      log.error(
+        `Worktree syntax is not supported with '${projectName}'. Use the full project name instead:`
+      );
+      log.info(`  workon ${environment.project.name}::${worktreeName}`);
+      process.exit(1);
+    }
     log.info(`Opening current project: ${environment.project.name}`);
     await switchTo(environment, requestedCommands, options, ctx);
     return;
@@ -3969,7 +3976,7 @@ async function processProject(projectParam, options, ctx) {
       log.debug(`Using worktree path: ${worktree.path}`);
       projectEnv.project.overridePath(worktree.path);
     }
-    await switchTo(projectEnv, requestedCommands, options, ctx);
+    await switchTo(projectEnv, requestedCommands, options, ctx, worktreeName);
   } else {
     log.error(`Project '${projectName}' not found.`);
     log.info(`Run 'workon' without arguments to see available projects or create a new one.`);
@@ -3987,7 +3994,7 @@ Available commands: ${availableCommands}`
     );
   }
 }
-async function switchTo(environment, requestedCommands, options, ctx) {
+async function switchTo(environment, requestedCommands, options, ctx, worktreeName) {
   const { log } = ctx;
   const project = environment.project;
   let events;
@@ -4011,11 +4018,35 @@ async function switchTo(environment, requestedCommands, options, ctx) {
   const hasNpmEvent = events.includes("npm");
   const dryRun = options.dryRun || false;
   if (hasCwd && hasClaudeEvent && hasNpmEvent) {
-    await handleThreePaneLayout(project, isShellMode, dryRun, shellCommands, events, ctx);
+    await handleThreePaneLayout(
+      project,
+      isShellMode,
+      dryRun,
+      shellCommands,
+      events,
+      ctx,
+      worktreeName
+    );
   } else if (hasCwd && hasNpmEvent) {
-    await handleTwoPaneNpmLayout(project, isShellMode, dryRun, shellCommands, events, ctx);
+    await handleTwoPaneNpmLayout(
+      project,
+      isShellMode,
+      dryRun,
+      shellCommands,
+      events,
+      ctx,
+      worktreeName
+    );
   } else if (hasCwd && hasClaudeEvent) {
-    await handleSplitTerminal(project, isShellMode, dryRun, shellCommands, events, ctx);
+    await handleSplitTerminal(
+      project,
+      isShellMode,
+      dryRun,
+      shellCommands,
+      events,
+      ctx,
+      worktreeName
+    );
   } else {
     for (const event of events) {
       if (!dryRun) {
@@ -4049,10 +4080,11 @@ async function getNpmCommand2(project) {
   const { NpmEvent: NpmEvent2 } = await Promise.resolve().then(() => (init_npm(), npm_exports));
   return NpmEvent2.getNpmCommand(npmConfig);
 }
-async function handleTmuxLayout(project, layout, options, shellCommands, events, ctx) {
+async function handleTmuxLayout(project, layout, options, shellCommands, events, ctx, worktreeName) {
   const { log } = ctx;
   const tmux = new TmuxManager();
   const { isShellMode, dryRun } = options;
+  const tmuxSessionId = worktreeName ? `${project.name}_wt_${worktreeName}` : project.name;
   let tmuxHandled = false;
   if (isShellMode) {
     if (await tmux.isTmuxAvailable()) {
@@ -4068,7 +4100,7 @@ async function handleTmuxLayout(project, layout, options, shellCommands, events,
           shellCommands.push(...cmds);
         }
       }
-      const commands = buildLayoutShellCommands(tmux, project, layout);
+      const commands = buildLayoutShellCommands(tmux, tmuxSessionId, project, layout);
       shellCommands.push(...commands);
       tmuxHandled = true;
     } else {
@@ -4080,7 +4112,7 @@ async function handleTmuxLayout(project, layout, options, shellCommands, events,
   } else if (!dryRun) {
     if (await tmux.isTmuxAvailable()) {
       try {
-        const sessionName = await createTmuxSession(tmux, project, layout);
+        const sessionName = await createTmuxSession(tmux, tmuxSessionId, project, layout);
         await tmux.attachToSession(sessionName);
         tmuxHandled = true;
       } catch (error) {
@@ -4104,19 +4136,19 @@ async function handleTmuxLayout(project, layout, options, shellCommands, events,
     }
   }
 }
-function buildLayoutShellCommands(tmux, project, layout) {
+function buildLayoutShellCommands(tmux, sessionId, project, layout) {
   switch (layout.type) {
     case "split-claude":
-      return tmux.buildShellCommands(project.name, project.path.path, layout.claudeArgs);
+      return tmux.buildShellCommands(sessionId, project.path.path, layout.claudeArgs);
     case "three-pane":
       return tmux.buildThreePaneShellCommands(
-        project.name,
+        sessionId,
         project.path.path,
         layout.claudeArgs,
         layout.npmCommand
       );
     case "two-pane-npm":
-      return tmux.buildTwoPaneNpmShellCommands(project.name, project.path.path, layout.npmCommand);
+      return tmux.buildTwoPaneNpmShellCommands(sessionId, project.path.path, layout.npmCommand);
   }
 }
 function buildFallbackCommandsWithEvents(shellCommands, project, layout, remainingEvents, _ctx) {
@@ -4134,50 +4166,77 @@ function buildFallbackCommandsWithEvents(shellCommands, project, layout, remaini
     }
   }
 }
-async function createTmuxSession(tmux, project, layout) {
+async function createTmuxSession(tmux, sessionId, project, layout) {
   switch (layout.type) {
     case "split-claude":
-      return tmux.createSplitSession(project.name, project.path.path, layout.claudeArgs);
+      return tmux.createSplitSession(sessionId, project.path.path, layout.claudeArgs);
     case "three-pane":
       return tmux.createThreePaneSession(
-        project.name,
+        sessionId,
         project.path.path,
         layout.claudeArgs,
         layout.npmCommand
       );
     case "two-pane-npm":
-      return tmux.createTwoPaneNpmSession(project.name, project.path.path, layout.npmCommand);
+      return tmux.createTwoPaneNpmSession(sessionId, project.path.path, layout.npmCommand);
   }
 }
-async function handleSplitTerminal(project, isShellMode, dryRun, shellCommands, events, ctx) {
+async function handleSplitTerminal(project, isShellMode, dryRun, shellCommands, events, ctx, worktreeName) {
+  const sessionLabel = worktreeName ? `${project.name}::${worktreeName}` : project.name;
   const layout = {
     type: "split-claude",
     handledEvents: ["cwd", "claude"],
-    dryRunMessage: `Would create split tmux session '${project.name}' with Claude`,
+    dryRunMessage: `Would create split tmux session '${sessionLabel}' with Claude`,
     claudeArgs: getClaudeArgs2(project),
     npmCommand: null
   };
-  await handleTmuxLayout(project, layout, { isShellMode, dryRun }, shellCommands, events, ctx);
+  await handleTmuxLayout(
+    project,
+    layout,
+    { isShellMode, dryRun },
+    shellCommands,
+    events,
+    ctx,
+    worktreeName
+  );
 }
-async function handleThreePaneLayout(project, isShellMode, dryRun, shellCommands, events, ctx) {
+async function handleThreePaneLayout(project, isShellMode, dryRun, shellCommands, events, ctx, worktreeName) {
+  const sessionLabel = worktreeName ? `${project.name}::${worktreeName}` : project.name;
   const layout = {
     type: "three-pane",
     handledEvents: ["cwd", "claude", "npm"],
-    dryRunMessage: `Would create three-pane tmux session '${project.name}' with Claude and NPM`,
+    dryRunMessage: `Would create three-pane tmux session '${sessionLabel}' with Claude and NPM`,
     claudeArgs: getClaudeArgs2(project),
     npmCommand: await getNpmCommand2(project)
   };
-  await handleTmuxLayout(project, layout, { isShellMode, dryRun }, shellCommands, events, ctx);
+  await handleTmuxLayout(
+    project,
+    layout,
+    { isShellMode, dryRun },
+    shellCommands,
+    events,
+    ctx,
+    worktreeName
+  );
 }
-async function handleTwoPaneNpmLayout(project, isShellMode, dryRun, shellCommands, events, ctx) {
+async function handleTwoPaneNpmLayout(project, isShellMode, dryRun, shellCommands, events, ctx, worktreeName) {
+  const sessionLabel = worktreeName ? `${project.name}::${worktreeName}` : project.name;
   const layout = {
     type: "two-pane-npm",
     handledEvents: ["cwd", "npm"],
-    dryRunMessage: `Would create two-pane tmux session '${project.name}' with NPM`,
+    dryRunMessage: `Would create two-pane tmux session '${sessionLabel}' with NPM`,
     claudeArgs: [],
     npmCommand: await getNpmCommand2(project)
   };
-  await handleTmuxLayout(project, layout, { isShellMode, dryRun }, shellCommands, events, ctx);
+  await handleTmuxLayout(
+    project,
+    layout,
+    { isShellMode, dryRun },
+    shellCommands,
+    events,
+    ctx,
+    worktreeName
+  );
 }
 async function processEvent(event, context, ctx) {
   const { log } = ctx;