@agent-chat/mention-watcher 0.1.2 → 0.1.8

package/dist/watch.js

@@ -4,7 +4,6 @@
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
-import { execSync } from "child_process";
 import * as pty from "node-pty";
 import { WebSocket } from "ws";
 function loadEnvFile(filePath) {
@@ -58,53 +57,6 @@ function syncMcpToken(workspaceDir, mcpServerName) {
     }
   }
 }
-function resolveShellPath() {
-  const parts = new Set((process.env.PATH || "").split(":").filter(Boolean));
-  const nvmDir = process.env.NVM_DIR || path.join(os.homedir(), ".nvm");
-  const nvmNodeDir = path.join(nvmDir, "versions", "node");
-  if (fs.existsSync(nvmNodeDir)) {
-    try {
-      for (const v of fs.readdirSync(nvmNodeDir)) {
-        const bin = path.join(nvmNodeDir, v, "bin");
-        if (fs.existsSync(bin)) parts.add(bin);
-      }
-    } catch {
-    }
-  }
-  try {
-    const shell = process.env.SHELL || "/bin/zsh";
-    const nvmSh = path.join(nvmDir, "nvm.sh");
-    const raw = execSync(
-      `${shell} -c 'source "${nvmSh}" 2>/dev/null; echo $PATH'`,
-      { encoding: "utf8", timeout: 4e3 }
-    ).trim();
-    for (const p of raw.split(":").filter(Boolean)) parts.add(p);
-  } catch {
-  }
-  for (const p of ["/opt/homebrew/bin", "/usr/local/bin", "/usr/bin", "/bin"]) {
-    parts.add(p);
-  }
-  return [...parts].join(":");
-}
-function findExecutable(cmd, searchPath) {
-  if (path.isAbsolute(cmd)) {
-    try {
-      fs.accessSync(cmd, fs.constants.X_OK);
-      return cmd;
-    } catch {
-      return null;
-    }
-  }
-  for (const dir of searchPath.split(":").filter(Boolean)) {
-    const full = path.join(dir, cmd);
-    try {
-      fs.accessSync(full, fs.constants.X_OK);
-      return full;
-    } catch {
-    }
-  }
-  return null;
-}
 var _WORKSPACE = process.env.WORKSPACE_DIR ?? process.cwd();
 {
   const dirsToCheck = [.../* @__PURE__ */ new Set([process.cwd(), _WORKSPACE])];
@@ -246,28 +198,24 @@ async function main() {
 `);
   process.stderr.write(`[mention-watcher] Spawning: ${COMMAND} ${CMD_ARGS.join(" ")}
 `);
-  const shellPath = resolveShellPath();
-  const spawnEnv = { ...process.env, PATH: shellPath };
-  const resolvedCmd = findExecutable(COMMAND, shellPath) ?? COMMAND;
-  if (resolvedCmd !== COMMAND) {
-    process.stderr.write(`[mention-watcher] Resolved "${COMMAND}" \u2192 ${resolvedCmd}
+  const userShell = process.env.SHELL || "/bin/zsh";
+  const quotedArgs = [COMMAND, ...CMD_ARGS].map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
+  const shellCmd = `exec ${quotedArgs}`;
+  process.stderr.write(`[mention-watcher] Spawning via: ${userShell} -l -c "${shellCmd}"
 `);
-  }
   let proc;
   try {
-    proc = pty.spawn(resolvedCmd, CMD_ARGS, {
+    proc = pty.spawn(userShell, ["-l", "-c", shellCmd], {
       name: "xterm-256color",
       cols,
       rows,
       cwd: WORKSPACE_DIR,
-      env: spawnEnv
+      env: process.env
     });
   } catch (err) {
     process.stderr.write(`[mention-watcher] Failed to spawn "${COMMAND}": ${err.message}
 `);
     process.stderr.write(`  Run "which ${COMMAND}" in your terminal to confirm it is installed.
-`);
-    process.stderr.write(`  Searched PATH: ${shellPath}
 `);
     process.exit(1);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-chat/mention-watcher",
-  "version": "0.1.2",
+  "version": "0.1.8",
   "description": "PTY wrapper that pushes @mentions from agent-chat into Claude Code (or any LLM CLI)",
   "type": "module",
   "bin": {