@agent-chat/mention-watcher 0.1.10 → 0.1.11

package/dist/watch.js

@@ -103,13 +103,54 @@ function buildPtyEnv(env) {
     out[k] = v;
   }
   if (!out.PATH && typeof env.PATH === "string") out.PATH = env.PATH;
+  if (!out.PATH && typeof env.Path === "string") out.PATH = env.Path;
   if (!out.HOME && typeof env.HOME === "string") out.HOME = env.HOME;
   if (!out.SHELL && typeof env.SHELL === "string") out.SHELL = env.SHELL;
   if (!out.TERM) out.TERM = "xterm-256color";
   return out;
 }
+function escapePosixArg(arg) {
+  return `'${arg.replace(/'/g, "'\\''")}'`;
+}
+function escapeCmdArg(arg) {
+  if (arg.length === 0) return '""';
+  if (/[\s"]/g.test(arg)) return `"${arg.replace(/"/g, '\\"')}"`;
+  return arg;
+}
+function buildCommandLine(command, args, platform) {
+  if (platform === "win32") {
+    return [command, ...args].map(escapeCmdArg).join(" ");
+  }
+  return [command, ...args].map(escapePosixArg).join(" ");
+}
+function getShellFallbackPlan(command, args, env) {
+  if (process.platform === "win32") {
+    const cmd = env.ComSpec || process.env.ComSpec || "cmd.exe";
+    const shellCmd2 = buildCommandLine(command, args, "win32");
+    return {
+      shell: cmd,
+      argv: ["/d", "/s", "/c", shellCmd2],
+      display: `${cmd} /d /s /c "${shellCmd2}"`
+    };
+  }
+  const userShell = env.SHELL || process.env.SHELL || "/bin/zsh";
+  const shellCmd = `exec ${buildCommandLine(command, args, process.platform)}`;
+  return {
+    shell: userShell,
+    argv: ["-lc", shellCmd],
+    display: `${userShell} -lc "${shellCmd}"`
+  };
+}
+function hasScriptPtySupport() {
+  if (process.platform === "win32") return false;
+  return fs.existsSync("/usr/bin/script") || fs.existsSync("/bin/script");
+}
 function spawnViaScriptPty(command, args, cwd, env) {
-  const child = spawn("script", ["-q", "/dev/null", command, ...args], {
+  if (!hasScriptPtySupport()) {
+    throw new Error("script command is not available on this platform");
+  }
+  const scriptArgs = process.platform === "darwin" ? ["-q", "/dev/null", command, ...args] : ["-q", "-c", buildCommandLine(command, args, process.platform), "/dev/null"];
+  const child = spawn("script", scriptArgs, {
     cwd,
     env,
     stdio: ["pipe", "pipe", "pipe"]
@@ -139,7 +180,12 @@ function spawnViaScriptPty(command, args, cwd, env) {
   };
 }
 function spawnWithoutPty(command, args, cwd, env) {
-  const child = spawn(command, args, { cwd, env, stdio: ["pipe", "pipe", "pipe"] });
+  const child = spawn(command, args, {
+    cwd,
+    env,
+    stdio: ["pipe", "pipe", "pipe"],
+    shell: process.platform === "win32"
+  });
   return {
     mode: "plain",
     write(data) {
@@ -339,21 +385,19 @@ async function main() {
 `);
       process.exit(1);
     }
-    const userShell = process.env.SHELL || "/bin/zsh";
-    const quotedArgs = [COMMAND, ...CMD_ARGS].map((a) => `'${a.replace(/'/g, "'\\''")}'`).join(" ");
-    const shellCmd = `exec ${quotedArgs}`;
+    const shellPlan = getShellFallbackPlan(COMMAND, CMD_ARGS, ptyEnv);
     process.stderr.write(
-      `[mention-watcher] Direct spawn failed, retry via shell: ${userShell} -lc "${shellCmd}"
+      `[mention-watcher] Direct spawn failed, retry via shell: ${shellPlan.display}
 `
     );
     try {
-      const p = pty.spawn(userShell, ["-lc", shellCmd], spawnOptions);
+      const p = pty.spawn(shellPlan.shell, shellPlan.argv, spawnOptions);
       proc = { ...p, mode: "pty" };
     } catch (shellErr) {
       const shellMsg = String(shellErr?.message ?? shellErr);
       process.stderr.write(`[mention-watcher] Shell fallback failed: ${shellMsg}
 `);
-      process.stderr.write("[mention-watcher] Falling back to script PTY mode\n");
+      process.stderr.write("[mention-watcher] Falling back to script PTY mode (if available)\n");
       try {
         proc = spawnViaScriptPty(COMMAND, CMD_ARGS, WORKSPACE_DIR, ptyEnv);
       } catch (scriptErr) {

package/package.json

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