workon 3.2.2 → 3.2.4

package/dist/index.cjs

@@ -42,14 +42,95 @@ module.exports = __toCommonJS(src_exports);
 
 // src/lib/config.ts
 var import_conf = __toESM(require("conf"), 1);
+var import_fs = require("fs");
+var import_path = require("path");
 var TRANSIENT_PROPS = ["pkg", "work"];
-var Config = class {
+var FileLock = class _FileLock {
+  lockPath;
+  fd = null;
+  static LOCK_TIMEOUT_MS = 5e3;
+  static RETRY_INTERVAL_MS = 50;
+  constructor(configPath) {
+    this.lockPath = `${configPath}.lock`;
+  }
+  async acquire() {
+    const startTime = Date.now();
+    const lockDir = (0, import_path.dirname)(this.lockPath);
+    if (!(0, import_fs.existsSync)(lockDir)) {
+      (0, import_fs.mkdirSync)(lockDir, { recursive: true });
+    }
+    while (Date.now() - startTime < _FileLock.LOCK_TIMEOUT_MS) {
+      try {
+        this.fd = (0, import_fs.openSync)(this.lockPath, "wx");
+        return;
+      } catch (error) {
+        if (error.code === "EEXIST") {
+          try {
+            const stat = await import("fs").then((fs) => fs.promises.stat(this.lockPath));
+            const age = Date.now() - stat.mtimeMs;
+            if (age > _FileLock.LOCK_TIMEOUT_MS) {
+              try {
+                (0, import_fs.unlinkSync)(this.lockPath);
+              } catch {
+              }
+            }
+          } catch {
+          }
+          await new Promise((resolve) => setTimeout(resolve, _FileLock.RETRY_INTERVAL_MS));
+        } else {
+          throw error;
+        }
+      }
+    }
+    throw new Error("Failed to acquire config lock: timeout");
+  }
+  release() {
+    if (this.fd !== null) {
+      try {
+        (0, import_fs.closeSync)(this.fd);
+      } catch {
+      }
+      this.fd = null;
+    }
+    try {
+      (0, import_fs.unlinkSync)(this.lockPath);
+    } catch {
+    }
+  }
+};
+var Config = class _Config {
+  static _instance = null;
   _transient = {};
+  // Using definite assignment assertion since singleton pattern may return existing instance
   _store;
+  _lock;
   constructor() {
+    if (_Config._instance && process.env.NODE_ENV !== "test") {
+      return _Config._instance;
+    }
     this._store = new import_conf.default({
-      projectName: "workon"
+      projectName: "workon",
+      ...process.env.WORKON_CONFIG_DIR && { cwd: process.env.WORKON_CONFIG_DIR }
     });
+    this._lock = new FileLock(this._store.path);
+    if (process.env.NODE_ENV !== "test") {
+      _Config._instance = this;
+    }
+  }
+  /**
+   * Get the singleton instance (creates one if needed)
+   */
+  static getInstance() {
+    if (!_Config._instance) {
+      _Config._instance = new _Config();
+    }
+    return _Config._instance;
+  }
+  /**
+   * Reset the singleton instance (for testing purposes)
+   */
+  static resetInstance() {
+    _Config._instance = null;
   }
   get(key, defaultValue) {
     const rootKey = key.split(".")[0];
@@ -64,10 +145,9 @@ var Config = class {
       this._transient[key] = value;
     } else {
       if (value === void 0) {
-        this._store.set(key, value);
-      } else {
-        this._store.set(key, value);
+        throw new Error(`Cannot set '${key}' to undefined. Use delete() to remove keys.`);
       }
+      this._store.set(key, value);
     }
   }
   has(key) {
@@ -85,6 +165,9 @@ var Config = class {
       this._store.delete(key);
     }
   }
+  /**
+   * Get all projects. Returns a fresh copy from the store.
+   */
   getProjects() {
     return this.get("projects") ?? {};
   }
@@ -92,15 +175,50 @@ var Config = class {
     const projects = this.getProjects();
     return projects[name];
   }
+  /**
+   * Set a project with file locking to prevent race conditions.
+   * This ensures atomic read-modify-write operations.
+   */
+  async setProjectSafe(name, config) {
+    await this._lock.acquire();
+    try {
+      const freshProjects = this._store.get("projects") ?? {};
+      freshProjects[name] = config;
+      this._store.set("projects", freshProjects);
+    } finally {
+      this._lock.release();
+    }
+  }
+  /**
+   * Synchronous version of setProject for backwards compatibility.
+   * Note: This is less safe than setProjectSafe() in concurrent scenarios.
+   * Consider migrating to setProjectSafe() for critical operations.
+   */
   setProject(name, config) {
-    const projects = this.getProjects();
-    projects[name] = config;
-    this.set("projects", projects);
+    const freshProjects = this._store.get("projects") ?? {};
+    freshProjects[name] = config;
+    this._store.set("projects", freshProjects);
+  }
+  /**
+   * Delete a project with file locking to prevent race conditions.
+   */
+  async deleteProjectSafe(name) {
+    await this._lock.acquire();
+    try {
+      const freshProjects = this._store.get("projects") ?? {};
+      delete freshProjects[name];
+      this._store.set("projects", freshProjects);
+    } finally {
+      this._lock.release();
+    }
   }
+  /**
+   * Synchronous version of deleteProject for backwards compatibility.
+   */
   deleteProject(name) {
-    const projects = this.getProjects();
-    delete projects[name];
-    this.set("projects", projects);
+    const freshProjects = this._store.get("projects") ?? {};
+    delete freshProjects[name];
+    this._store.set("projects", freshProjects);
   }
   getDefaults() {
     return this.get("project_defaults");
@@ -217,6 +335,9 @@ function escapeForSingleQuotes(input4) {
 
 // src/lib/tmux.ts
 var exec = (0, import_util.promisify)(import_child_process.exec);
+function wrapWithShellFallback(command) {
+  return `${command}; exec $SHELL`;
+}
 var TmuxManager = class {
   sessionPrefix = "workon-";
   async isTmuxAvailable() {
@@ -254,9 +375,9 @@ var TmuxManager = class {
       await this.killSession(sessionName);
     }
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
-    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
+    const wrappedClaudeCmd = escapeForSingleQuotes(wrapWithShellFallback(claudeCommand));
     await exec(
-      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${escapedClaudeCmd}'`
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${wrappedClaudeCmd}'`
     );
     await exec(`tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`);
     await exec(`tmux select-pane -t '${escapedSession}:0.0'`);
@@ -270,16 +391,15 @@ var TmuxManager = class {
       await this.killSession(sessionName);
     }
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
-    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
-    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
+    const wrappedClaudeCmd = escapeForSingleQuotes(wrapWithShellFallback(claudeCommand));
+    const wrappedNpmCmd = escapeForSingleQuotes(wrapWithShellFallback(npmCommand));
     await exec(
-      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${escapedClaudeCmd}'`
+      `tmux new-session -d -s '${escapedSession}' -c '${escapedPath}' '${wrappedClaudeCmd}'`
     );
     await exec(`tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`);
     await exec(
-      `tmux split-window -v -t '${escapedSession}:0.1' -c '${escapedPath}' '${escapedNpmCmd}'`
+      `tmux split-window -v -t '${escapedSession}:0.1' -c '${escapedPath}' '${wrappedNpmCmd}'`
     );
-    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;
@@ -288,15 +408,14 @@ var TmuxManager = class {
     const sessionName = this.getSessionName(projectName);
     const escapedSession = escapeForSingleQuotes(sessionName);
     const escapedPath = escapeForSingleQuotes(projectPath);
-    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
+    const wrappedNpmCmd = escapeForSingleQuotes(wrapWithShellFallback(npmCommand));
     if (await this.sessionExists(sessionName)) {
       await this.killSession(sessionName);
     }
     await exec(`tmux new-session -d -s '${escapedSession}' -c '${escapedPath}'`);
     await exec(
-      `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}' '${escapedNpmCmd}'`
+      `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}' '${wrappedNpmCmd}'`
     );
-    await exec(`tmux set-option -t '${escapedSession}:0.1' remain-on-exit on`);
     await exec(`tmux select-pane -t '${escapedSession}:0.0'`);
     return sessionName;
   }
@@ -325,11 +444,11 @@ var TmuxManager = class {
     const escapedSession = escapeForSingleQuotes(sessionName);
     const escapedPath = escapeForSingleQuotes(projectPath);
     const claudeCommand = claudeArgs.length > 0 ? `claude ${claudeArgs.join(" ")}` : "claude";
-    const escapedClaudeCmd = escapeForSingleQuotes(claudeCommand);
+    const wrappedClaudeCmd = escapeForSingleQuotes(wrapWithShellFallback(claudeCommand));
     return [
       `# 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 new-session -d -s '${escapedSession}' -c '${escapedPath}' '${wrappedClaudeCmd}'`,
       `tmux split-window -h -t '${escapedSession}' -c '${escapedPath}'`,
       `tmux select-pane -t '${escapedSession}:0.0'`,
       this.getAttachCommand(sessionName)
@@ -340,15 +459,14 @@ var TmuxManager = class {
     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);
+    const wrappedClaudeCmd = escapeForSingleQuotes(wrapWithShellFallback(claudeCommand));
+    const wrappedNpmCmd = escapeForSingleQuotes(wrapWithShellFallback(npmCommand));
     return [
       `# 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 new-session -d -s '${escapedSession}' -c '${escapedPath}' '${wrappedClaudeCmd}'`,
       `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 split-window -v -t '${escapedSession}:0.1' -c '${escapedPath}' '${wrappedNpmCmd}'`,
       `tmux resize-pane -t '${escapedSession}:0.2' -y 10`,
       `tmux select-pane -t '${escapedSession}:0.0'`,
       this.getAttachCommand(sessionName)
@@ -358,13 +476,12 @@ var TmuxManager = class {
     const sessionName = this.getSessionName(projectName);
     const escapedSession = escapeForSingleQuotes(sessionName);
     const escapedPath = escapeForSingleQuotes(projectPath);
-    const escapedNpmCmd = escapeForSingleQuotes(npmCommand);
+    const wrappedNpmCmd = escapeForSingleQuotes(wrapWithShellFallback(npmCommand));
     return [
       `# 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 split-window -h -t '${escapedSession}' -c '${escapedPath}' '${wrappedNpmCmd}'`,
       `tmux select-pane -t '${escapedSession}:0.0'`,
       this.getAttachCommand(sessionName)
     ];
@@ -483,7 +600,7 @@ var EnvironmentRecognizer = class {
   }
   static ensureConfigured() {
     if (!this.configured) {
-      this.config = new Config();
+      this.config = Config.getInstance();
       this.log = {
         debug: () => {
         },
@@ -811,10 +928,10 @@ var ClaudeEvent = class _ClaudeEvent {
   }
   static getClaudeCommand(config) {
     if (typeof config === "boolean" || config === void 0) {
-      return "claude";
+      return "claude --dangerously-skip-permissions";
     }
     const flags = config.flags || [];
-    return flags.length > 0 ? `claude ${flags.join(" ")}` : "claude";
+    return flags.length > 0 ? `claude --dangerously-skip-permissions ${flags.join(" ")}` : "claude --dangerously-skip-permissions";
   }
   static get processing() {
     return {