workon 3.2.0 → 3.2.2

package/dist/index.cjs

@@ -204,6 +204,18 @@ var Project = class {
 // src/lib/tmux.ts
 var import_child_process = require("child_process");
 var import_util = require("util");
+
+// src/lib/sanitize.ts
+function sanitizeForShell(input4) {
+  if (!input4) return "";
+  return input4.replace(/[^a-zA-Z0-9_\-.]/g, "_");
+}
+function escapeForSingleQuotes(input4) {
+  if (!input4) return "";
+  return input4.replace(/'/g, "'\\''");
+}
+
+// src/lib/tmux.ts
 var exec = (0, import_util.promisify)(import_child_process.exec);
 var TmuxManager = class {
   sessionPrefix = "workon-";
@@ -217,18 +229,18 @@ var TmuxManager = class {
   }
   async sessionExists(sessionName) {
     try {
-      await exec(`tmux has-session -t "${sessionName}"`);
+      await exec(`tmux has-session -t '${escapeForSingleQuotes(sessionName)}'`);
       return true;
     } catch {
       return false;
     }
   }
   getSessionName(projectName) {
-    return `${this.sessionPrefix}${projectName}`;
+    return `${this.sessionPrefix}${sanitizeForShell(projectName)}`;
   }
   async killSession(sessionName) {
     try {
-      await exec(`tmux kill-session -t "${sessionName}"`);
+      await exec(`tmux kill-session -t '${escapeForSingleQuotes(sessionName)}'`);
       return true;
     } catch {
       return false;
@@ -236,43 +248,62 @@ var TmuxManager = class {
   }
   async createSplitSession(projectName, projectPath, claudeArgs = []) {
     const sessionName = this.getSessionName(projectName);
+    const escapedSession = escapeForSingleQuotes(sessionName);
+    const escapedPath = escapeForSingleQuotes(projectPath);
     if (await this.sessionExists(sessionName)) {
       await this.killSession(sessionName);
     }
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
-    await exec(`tmux new-session -d -s "${sessionName}" -c "${projectPath}" '${claudeCommand}'`);
-    await exec(`tmux split-window -h -t "${sessionName}" -c "${projectPath}"`);
-    await exec(`tmux select-pane -t "${sessionName}:0.0"`);
+    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
+    await exec(
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${escapedClaudeCmd}'`
+    );
+    await exec(`tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`);
+    await exec(`tmux select-pane -t '${escapedSession}:0.0'`);
     return sessionName;
   }
   async createThreePaneSession(projectName, projectPath, claudeArgs = [], npmCommand = "npm run dev") {
     const sessionName = this.getSessionName(projectName);
+    const escapedSession = escapeForSingleQuotes(sessionName);
+    const escapedPath = escapeForSingleQuotes(projectPath);
     if (await this.sessionExists(sessionName)) {
       await this.killSession(sessionName);
     }
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
-    await exec(`tmux new-session -d -s "${sessionName}" -c "${projectPath}" '${claudeCommand}'`);
-    await exec(`tmux split-window -h -t "${sessionName}" -c "${projectPath}"`);
-    await exec(`tmux split-window -v -t "${sessionName}:0.1" -c "${projectPath}" '${npmCommand}'`);
-    await exec(`tmux set-option -t "${sessionName}:0.2" remain-on-exit on`);
-    await exec(`tmux resize-pane -t "${sessionName}:0.2" -y 10`);
-    await exec(`tmux select-pane -t "${sessionName}:0.0"`);
+    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
+    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
+    await exec(
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${escapedClaudeCmd}'`
+    );
+    await exec(`tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`);
+    await exec(
+      `tmux split-window -v -t '${escapedSession}:0.1' -c '${escapedPath}' '${escapedNpmCmd}'`
+    );
+    await exec(`tmux set-option -t '${escapedSession}:0.2' remain-on-exit on`);
+    await exec(`tmux resize-pane -t '${escapedSession}:0.2' -y 10`);
+    await exec(`tmux select-pane -t '${escapedSession}:0.0'`);
     return sessionName;
   }
   async createTwoPaneNpmSession(projectName, projectPath, npmCommand = "npm run dev") {
     const sessionName = this.getSessionName(projectName);
+    const escapedSession = escapeForSingleQuotes(sessionName);
+    const escapedPath = escapeForSingleQuotes(projectPath);
+    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
     if (await this.sessionExists(sessionName)) {
       await this.killSession(sessionName);
     }
-    await exec(`tmux new-session -d -s "${sessionName}" -c "${projectPath}"`);
-    await exec(`tmux split-window -h -t "${sessionName}" -c "${projectPath}" '${npmCommand}'`);
-    await exec(`tmux set-option -t "${sessionName}:0.1" remain-on-exit on`);
-    await exec(`tmux select-pane -t "${sessionName}:0.0"`);
+    await exec(`tmux new-session -d -s '${escapedSession}' -c '${escapedPath}'`);
+    await exec(
+      `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}' '${escapedNpmCmd}'`
+    );
+    await exec(`tmux set-option -t '${escapedSession}:0.1' remain-on-exit on`);
+    await exec(`tmux select-pane -t '${escapedSession}:0.0'`);
     return sessionName;
   }
   async attachToSession(sessionName) {
+    const escapedSession = escapeForSingleQuotes(sessionName);
     if (process.env.TMUX) {
-      await exec(`tmux switch-client -t "${sessionName}"`);
+      await exec(`tmux switch-client -t '${escapedSession}'`);
     } else {
       const isITerm = process.env.TERM_PROGRAM === "iTerm.app" || process.env.LC_TERMINAL === "iTerm2" || !!process.env.ITERM_SESSION_ID;
       const useiTermIntegration = isITerm && !process.env.TMUX_CC_NOT_SUPPORTED;
@@ -291,53 +322,64 @@ var TmuxManager = class {
   }
   buildShellCommands(projectName, projectPath, claudeArgs = []) {
     const sessionName = this.getSessionName(projectName);
+    const escapedSession = escapeForSingleQuotes(sessionName);
+    const escapedPath = escapeForSingleQuotes(projectPath);
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
+    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
     return [
-      `# Create tmux split session for ${projectName}`,
-      `tmux has-session -t "${sessionName}" 2>/dev/null && tmux kill-session -t "${sessionName}"`,
-      `tmux new-session -d -s "${sessionName}" -c "${projectPath}" '${claudeCommand}'`,
-      `tmux split-window -h -t "${sessionName}" -c "${projectPath}"`,
-      `tmux select-pane -t "${sessionName}:0.0"`,
+      `# Create tmux split session for ${sanitizeForShell(projectName)}`,
+      `tmux has-session -t '${escapedSession}' 2>/dev/null && tmux kill-session -t '${escapedSession}'`,
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${escapedClaudeCmd}'`,
+      `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`,
+      `tmux select-pane -t '${escapedSession}:0.0'`,
       this.getAttachCommand(sessionName)
     ];
   }
   buildThreePaneShellCommands(projectName, projectPath, claudeArgs = [], npmCommand = "npm run dev") {
     const sessionName = this.getSessionName(projectName);
+    const escapedSession = escapeForSingleQuotes(sessionName);
+    const escapedPath = escapeForSingleQuotes(projectPath);
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
+    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
+    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
     return [
-      `# Create tmux three-pane session for ${projectName}`,
-      `tmux has-session -t "${sessionName}" 2>/dev/null && tmux kill-session -t "${sessionName}"`,
-      `tmux new-session -d -s "${sessionName}" -c "${projectPath}" '${claudeCommand}'`,
-      `tmux split-window -h -t "${sessionName}" -c "${projectPath}"`,
-      `tmux split-window -v -t "${sessionName}:0.1" -c "${projectPath}" '${npmCommand}'`,
-      `tmux set-option -t "${sessionName}:0.2" remain-on-exit on`,
-      `tmux resize-pane -t "${sessionName}:0.2" -y 10`,
-      `tmux select-pane -t "${sessionName}:0.0"`,
+      `# Create tmux three-pane session for ${sanitizeForShell(projectName)}`,
+      `tmux has-session -t '${escapedSession}' 2>/dev/null && tmux kill-session -t '${escapedSession}'`,
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${escapedClaudeCmd}'`,
+      `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`,
+      `tmux split-window -v -t '${escapedSession}:0.1' -c '${escapedPath}' '${escapedNpmCmd}'`,
+      `tmux set-option -t '${escapedSession}:0.2' remain-on-exit on`,
+      `tmux resize-pane -t '${escapedSession}:0.2' -y 10`,
+      `tmux select-pane -t '${escapedSession}:0.0'`,
       this.getAttachCommand(sessionName)
     ];
   }
   buildTwoPaneNpmShellCommands(projectName, projectPath, npmCommand = "npm run dev") {
     const sessionName = this.getSessionName(projectName);
+    const escapedSession = escapeForSingleQuotes(sessionName);
+    const escapedPath = escapeForSingleQuotes(projectPath);
+    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
     return [
-      `# Create tmux two-pane session with npm for ${projectName}`,
-      `tmux has-session -t "${sessionName}" 2>/dev/null && tmux kill-session -t "${sessionName}"`,
-      `tmux new-session -d -s "${sessionName}" -c "${projectPath}"`,
-      `tmux split-window -h -t "${sessionName}" -c "${projectPath}" '${npmCommand}'`,
-      `tmux set-option -t "${sessionName}:0.1" remain-on-exit on`,
-      `tmux select-pane -t "${sessionName}:0.0"`,
+      `# Create tmux two-pane session with npm for ${sanitizeForShell(projectName)}`,
+      `tmux has-session -t '${escapedSession}' 2>/dev/null && tmux kill-session -t '${escapedSession}'`,
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}'`,
+      `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}' '${escapedNpmCmd}'`,
+      `tmux set-option -t '${escapedSession}:0.1' remain-on-exit on`,
+      `tmux select-pane -t '${escapedSession}:0.0'`,
       this.getAttachCommand(sessionName)
     ];
   }
   getAttachCommand(sessionName) {
+    const escapedSession = escapeForSingleQuotes(sessionName);
     if (process.env.TMUX) {
-      return `tmux switch-client -t "${sessionName}"`;
+      return `tmux switch-client -t '${escapedSession}'`;
     }
     const isITerm = process.env.TERM_PROGRAM === "iTerm.app" || process.env.LC_TERMINAL === "iTerm2" || process.env.ITERM_SESSION_ID;
     const useiTermIntegration = isITerm && !process.env.TMUX_CC_NOT_SUPPORTED;
     if (useiTermIntegration) {
-      return `tmux -CC attach-session -t "${sessionName}"`;
+      return `tmux -CC attach-session -t '${escapedSession}'`;
     }
-    return `tmux attach-session -t "${sessionName}"`;
+    return `tmux attach-session -t '${escapedSession}'`;
   }
   async listWorkonSessions() {
     try {
@@ -397,7 +439,8 @@ var EnvironmentRecognizer = class {
         const git = (0, import_simple_git.simpleGit)(gitDir.path);
         const branchSummary = await git.branchLocal();
         base.branch = branchSummary.current;
-      } catch {
+      } catch (error) {
+        this.log.debug(`Git branch detection failed: ${error.message}`);
       }
     }
     return this.getProjectEnvironment(base, matching);
@@ -499,18 +542,22 @@ var CwdEvent = class {
         const { project, isShellMode, shellCommands } = context;
         const projectPath = project.path.path;
         if (isShellMode) {
-          shellCommands.push(`cd "${projectPath}"`);
+          shellCommands.push(`pushd "${projectPath}" > /dev/null`);
         } else {
           const shell = process.env.SHELL || "/bin/bash";
-          (0, import_child_process2.spawn)(shell, [], {
+          const child = (0, import_child_process2.spawn)(shell, ["-i"], {
             cwd: projectPath,
             stdio: "inherit"
           });
+          await new Promise((resolve, reject) => {
+            child.on("close", () => resolve());
+            child.on("error", (err) => reject(err));
+          });
         }
       },
       generateShellCommand(context) {
         const projectPath = context.project.path.path;
-        return [`cd "${projectPath}"`];
+        return [`pushd "${projectPath}" > /dev/null`];
       }
     };
   }
@@ -569,7 +616,7 @@ var IdeEvent = class {
         const projectPath = project.path.path;
         const ide = project.ide || "code";
         if (isShellMode) {
-          shellCommands.push(`${ide} "${projectPath}" &`);
+          shellCommands.push(`set +m; ${ide} "${projectPath}" &>/dev/null &`);
         } else {
           (0, import_child_process3.spawn)(ide, [projectPath], {
             detached: true,
@@ -580,7 +627,7 @@ var IdeEvent = class {
       generateShellCommand(context) {
         const projectPath = context.project.path.path;
         const ide = context.project.ide || "code";
-        return [`${ide} "${projectPath}" &`];
+        return [`set +m; ${ide} "${projectPath}" &>/dev/null &`];
       }
     };
   }
@@ -1100,23 +1147,19 @@ var EventRegistryClass = class {
    */
   registerEvents() {
     for (const EventClass of ALL_EVENTS) {
-      if (this.isValidEvent(EventClass)) {
-        const metadata = EventClass.metadata;
-        this._events.set(metadata.name, EventClass);
+      if (this.isValidEventClass(EventClass)) {
+        this._events.set(EventClass.metadata.name, EventClass);
       }
     }
   }
   /**
-   * Validate if a class is a proper event
+   * Type guard to check if an object is a valid EventHandlerClass
    */
-  isValidEvent(EventClass) {
-    try {
-      if (typeof EventClass !== "function") return false;
-      const metadata = EventClass.metadata;
-      return metadata !== void 0 && typeof metadata.name === "string" && typeof metadata.displayName === "string" && typeof EventClass.validation === "object" && typeof EventClass.configuration === "object" && typeof EventClass.processing === "object";
-    } catch {
-      return false;
-    }
+  isValidEventClass(obj) {
+    if (typeof obj !== "function" && typeof obj !== "object") return false;
+    if (obj === null) return false;
+    const candidate = obj;
+    return candidate.metadata !== void 0 && typeof candidate.metadata.name === "string" && typeof candidate.metadata.displayName === "string" && candidate.validation !== void 0 && typeof candidate.validation.validateConfig === "function" && candidate.configuration !== void 0 && typeof candidate.configuration.configureInteractive === "function" && candidate.processing !== void 0 && typeof candidate.processing.processEvent === "function";
   }
   /**
    * Get all valid event names from registered events
@@ -1138,12 +1181,11 @@ var EventRegistryClass = class {
   getEventsForManageUI() {
     this.ensureInitialized();
     const events = [];
-    for (const [name, EventClass] of this._events) {
-      const metadata = EventClass.metadata;
+    for (const [name, eventClass] of this._events) {
       events.push({
-        name: metadata.displayName,
+        name: eventClass.metadata.displayName,
         value: name,
-        description: metadata.description
+        description: eventClass.metadata.description
       });
     }
     return events.sort((a, b) => a.name.localeCompare(b.name));
@@ -1154,13 +1196,13 @@ var EventRegistryClass = class {
   getTmuxEnabledEvents() {
     this.ensureInitialized();
     const tmuxEvents = [];
-    for (const [name, EventClass] of this._events) {
-      const tmux = EventClass.tmux;
+    for (const [name, eventClass] of this._events) {
+      const tmux = eventClass.tmux;
       if (tmux) {
         tmuxEvents.push({
           name,
-          event: EventClass,
-          priority: tmux.getLayoutPriority ? tmux.getLayoutPriority() : 0
+          event: eventClass,
+          priority: tmux.getLayoutPriority()
         });
       }
     }
@@ -1172,16 +1214,15 @@ var EventRegistryClass = class {
   getAllEvents() {
     this.ensureInitialized();
     const events = [];
-    for (const [name, EventClass] of this._events) {
-      const typedClass = EventClass;
+    for (const [name, eventClass] of this._events) {
       events.push({
         name,
-        metadata: typedClass.metadata,
-        hasValidation: !!typedClass.validation,
-        hasConfiguration: !!typedClass.configuration,
-        hasProcessing: !!typedClass.processing,
-        hasTmux: !!typedClass.tmux,
-        hasHelp: !!typedClass.help
+        metadata: eventClass.metadata,
+        hasValidation: !!eventClass.validation,
+        hasConfiguration: !!eventClass.configuration,
+        hasProcessing: !!eventClass.processing,
+        hasTmux: !!eventClass.tmux,
+        hasHelp: !!eventClass.help
       });
     }
     return events;