@botcord/daemon 0.2.80 → 0.2.82

package/dist/daemon-singleton.d.ts

@@ -37,3 +37,4 @@ export declare function writeCurrentPid(opts?: {
     currentPid?: number;
 }): void;
 export declare function removePidFile(pidPath?: string): void;
+export declare function isBotCordDaemonStartCommand(command: string): boolean;

package/dist/daemon-singleton.js

@@ -147,12 +147,30 @@ export function removePidFile(pidPath = PID_PATH) {
         // ignore
     }
 }
-function isBotCordDaemonStartCommand(command) {
+export function isBotCordDaemonStartCommand(command) {
     if (!/\bstart\b/.test(command))
         return false;
-    return (command.includes("botcord-daemon") ||
-        /(?:^|\s)\S*botcord\S*\/daemon\/dist\/index\.js(?:\s|$)/.test(command) ||
-        /(?:^|\s)\S*packages\/daemon\/dist\/index\.js(?:\s|$)/.test(command));
+    // Only treat a row as "the daemon" when argv[0] is the real entry point:
+    // either the node interpreter (running `dist/index.js`) or the resolved
+    // `botcord-daemon` bin shim. Reject shell wrappers (`sh`, `bash`, `npm`,
+    // `npx`, `timeout`, ...) — their argv mentions `botcord-daemon` only as a
+    // literal arg, not as the executable being run. Killing a wrapper takes
+    // out the actual daemon it started, which is exactly the bug we want
+    // to avoid in cloud sandboxes.
+    const exe = (command.trim().split(/\s+/, 1)[0] ?? "").split("/").pop() ?? "";
+    const isNode = /^node(\d.*)?$/.test(exe);
+    const isDaemonBin = exe === "botcord-daemon";
+    if (!isNode && !isDaemonBin)
+        return false;
+    return (
+    // node-resolved bin shim, e.g. .../node_modules/.bin/botcord-daemon
+    /\/\.?bin\/botcord-daemon(?:\s|$)/.test(command) ||
+        // direct bin invocation, e.g. /usr/local/bin/botcord-daemon or argv[0]=botcord-daemon
+        /(?:^|\s)\S*botcord-daemon(?:\s|$)/.test(command) ||
+        // node running the published daemon entry script
+        /\bbotcord\S*\/daemon\/dist\/index\.js(?:\s|$)/.test(command) ||
+        // node running the in-repo daemon entry script (dev / monorepo)
+        /\bpackages\/daemon\/dist\/index\.js(?:\s|$)/.test(command));
 }
 function delay(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.80",
+  "version": "0.2.82",
   "description": "BotCord local daemon — bridges Hub inbox push to local Claude Code / Codex / Gemini CLIs",
   "type": "module",
   "bin": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@botcord/cli": "^0.1.7",
-    "@botcord/protocol-core": "^0.2.10",
+    "@botcord/protocol-core": "^0.2.11",
     "@larksuiteoapi/node-sdk": "^1.63.1",
     "ws": "^8.20.1"
   },

package/src/__tests__/daemon-singleton.test.ts

@@ -5,6 +5,7 @@ import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import {
   ensureNoOtherDaemonFromPidFile,
+  isBotCordDaemonStartCommand,
   parseDaemonProcesses,
   readPid,
   removePidFile,
@@ -90,6 +91,38 @@ describe("daemon singleton pid helpers", () => {
     expect(out.map((p) => p.pid)).toEqual([111, 222]);
   });
 
+  it("does not match shell wrappers whose argv mentions botcord-daemon as a literal", () => {
+    // These are the wrapper command lines we observed in cloud sandboxes;
+    // they must NOT be classified as the daemon, otherwise the singleton
+    // check kills the wrapper and takes the actual daemon down with it.
+    const wrappers = [
+      "npm exec --yes --package @botcord/daemon@latest -- botcord-daemon start --foreground",
+      "npx --yes --package @botcord/daemon@latest -- botcord-daemon start --foreground",
+      "sh -c botcord-daemon start --foreground",
+      "/bin/bash -l -c export npm_config_cache=/tmp/c; npm exec --yes --package @botcord/daemon@latest -- botcord-daemon start --foreground",
+      "timeout 30 npm exec --yes --package @botcord/daemon@latest -- botcord-daemon start --foreground",
+    ];
+    for (const cmd of wrappers) {
+      expect(isBotCordDaemonStartCommand(cmd), `wrongly matched wrapper: ${cmd}`).toBe(false);
+    }
+  });
+
+  it("matches the actual daemon entry processes", () => {
+    const matches = [
+      // node running the published daemon (npx / npm exec resolution under _npx)
+      "node /tmp/botcord-npm-cache/_npx/abc123/node_modules/@botcord/daemon/dist/index.js start --foreground",
+      // node running the resolved bin shim
+      "node /Users/me/.botcord/daemon/node_modules/.bin/botcord-daemon start --foreground",
+      // direct invocation of the bin
+      "/usr/local/bin/botcord-daemon start --foreground",
+      // monorepo dev: node running packages/daemon/dist/index.js
+      "node /home/dev/botcord/packages/daemon/dist/index.js start --foreground",
+    ];
+    for (const cmd of matches) {
+      expect(isBotCordDaemonStartCommand(cmd), `failed to match daemon: ${cmd}`).toBe(true);
+    }
+  });
+
   it("terminates extra daemon processes discovered outside the pid file", async () => {
     const child = spawn(process.execPath, ["-e", "setInterval(() => {}, 1000)"], {
       stdio: "ignore",

package/src/daemon-singleton.ts

@@ -193,12 +193,28 @@ export function removePidFile(pidPath = PID_PATH): void {
   }
 }
 
-function isBotCordDaemonStartCommand(command: string): boolean {
+export function isBotCordDaemonStartCommand(command: string): boolean {
   if (!/\bstart\b/.test(command)) return false;
+  // Only treat a row as "the daemon" when argv[0] is the real entry point:
+  // either the node interpreter (running `dist/index.js`) or the resolved
+  // `botcord-daemon` bin shim. Reject shell wrappers (`sh`, `bash`, `npm`,
+  // `npx`, `timeout`, ...) — their argv mentions `botcord-daemon` only as a
+  // literal arg, not as the executable being run. Killing a wrapper takes
+  // out the actual daemon it started, which is exactly the bug we want
+  // to avoid in cloud sandboxes.
+  const exe = (command.trim().split(/\s+/, 1)[0] ?? "").split("/").pop() ?? "";
+  const isNode = /^node(\d.*)?$/.test(exe);
+  const isDaemonBin = exe === "botcord-daemon";
+  if (!isNode && !isDaemonBin) return false;
   return (
-    command.includes("botcord-daemon") ||
-    /(?:^|\s)\S*botcord\S*\/daemon\/dist\/index\.js(?:\s|$)/.test(command) ||
-    /(?:^|\s)\S*packages\/daemon\/dist\/index\.js(?:\s|$)/.test(command)
+    // node-resolved bin shim, e.g. .../node_modules/.bin/botcord-daemon
+    /\/\.?bin\/botcord-daemon(?:\s|$)/.test(command) ||
+    // direct bin invocation, e.g. /usr/local/bin/botcord-daemon or argv[0]=botcord-daemon
+    /(?:^|\s)\S*botcord-daemon(?:\s|$)/.test(command) ||
+    // node running the published daemon entry script
+    /\bbotcord\S*\/daemon\/dist\/index\.js(?:\s|$)/.test(command) ||
+    // node running the in-repo daemon entry script (dev / monorepo)
+    /\bpackages\/daemon\/dist\/index\.js(?:\s|$)/.test(command)
   );
 }