@agent-chat/mention-watcher 0.1.1 → 0.1.5

package/dist/watch.js

@@ -59,26 +59,32 @@ function syncMcpToken(workspaceDir, mcpServerName) {
   }
 }
 function resolveShellPath() {
-  const shell = process.env.SHELL || "/bin/zsh";
-  const attempts = [
-    `${shell} -i -c 'echo $PATH'`,
-    // interactive (sources .zshrc, nvm)
-    `${shell} -l -c 'echo $PATH'`
-    // login (sources .zprofile)
-  ];
-  for (const cmd of attempts) {
+  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 {
-      const raw = execSync(cmd, {
-        encoding: "utf8",
-        timeout: 4e3,
-        stdio: ["ignore", "pipe", "ignore"]
-      });
-      const pathLine = raw.split("\n").map((l) => l.trim()).find((l) => l.startsWith("/") && l.includes(":"));
-      if (pathLine) return pathLine;
+      for (const v of fs.readdirSync(nvmNodeDir)) {
+        const bin = path.join(nvmNodeDir, v, "bin");
+        if (fs.existsSync(bin)) parts.add(bin);
+      }
     } catch {
     }
   }
-  return process.env.PATH || "";
+  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(":");
 }
 var _WORKSPACE = process.env.WORKSPACE_DIR ?? process.cwd();
 {
@@ -223,9 +229,14 @@ async function main() {
 `);
   const shellPath = resolveShellPath();
   const spawnEnv = { ...process.env, PATH: shellPath };
+  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] Shell: ${userShell} -c "${shellCmd}"
+`);
   let proc;
   try {
-    proc = pty.spawn(COMMAND, CMD_ARGS, {
+    proc = pty.spawn(userShell, ["-c", shellCmd], {
       name: "xterm-256color",
       cols,
       rows,
@@ -235,7 +246,7 @@ async function main() {
   } catch (err) {
     process.stderr.write(`[mention-watcher] Failed to spawn "${COMMAND}": ${err.message}
 `);
-    process.stderr.write(`  Run "which ${COMMAND}" in your terminal to check it is installed.
+    process.stderr.write(`  Run "which ${COMMAND}" in your terminal to confirm it is installed.
 `);
     process.exit(1);
   }

package/package.json

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