modelstat 0.0.33 → 0.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelstat",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "description": "modelstat companion — reads local AI-tool usage and ships tokenised events to modelstat.",
   "license": "Apache-2.0",
   "type": "module",
@@ -15,19 +15,6 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "dev:connect": "tsx ./src/cli.ts connect",
-    "dev:scan": "tsx ./src/cli.ts scan",
-    "dev:watch": "tsx ./src/cli.ts watch",
-    "dev:discover": "tsx ./src/cli.ts discover",
-    "build": "tsup",
-    "build:tray": "bash ./scripts/build-tray.sh",
-    "prepack": "pnpm run build && pnpm run build:tray",
-    "pack:tarball": "pnpm run build && npm pack --pack-destination ../..",
-    "install:local": "bash ./scripts/install-local.sh",
-    "postinstall": "node ./scripts/postinstall.mjs",
-    "typecheck": "tsc --noEmit"
-  },
   "dependencies": {
     "chokidar": "^4.0.3",
     "conf": "^13.1.0",
@@ -37,13 +24,13 @@
     "undici": "^7.1.0"
   },
   "devDependencies": {
-    "@modelstat/companion-core": "workspace:*",
-    "@modelstat/core": "workspace:*",
-    "@modelstat/parsers": "workspace:*",
     "@types/node": "^22.10.5",
     "tsup": "^8.3.5",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.3"
+    "typescript": "^5.7.3",
+    "@modelstat/companion-core": "0.0.0",
+    "@modelstat/core": "0.0.0",
+    "@modelstat/parsers": "0.0.0"
   },
   "engines": {
     "node": ">=20.18.0"
@@ -71,5 +58,17 @@
     "type": "git",
     "url": "git+https://github.com/modelstat/modelstat.git",
     "directory": "apps/agent-dev"
+  },
+  "scripts": {
+    "dev:connect": "tsx ./src/cli.ts connect",
+    "dev:scan": "tsx ./src/cli.ts scan",
+    "dev:watch": "tsx ./src/cli.ts watch",
+    "dev:discover": "tsx ./src/cli.ts discover",
+    "build": "tsup",
+    "build:tray": "bash ./scripts/build-tray.sh",
+    "pack:tarball": "pnpm run build && npm pack --pack-destination ../..",
+    "install:local": "bash ./scripts/install-local.sh",
+    "postinstall": "node ./scripts/postinstall.mjs",
+    "typecheck": "tsc --noEmit"
   }
-}
+}

package/scripts/postinstall.mjs

@@ -317,13 +317,71 @@ async function setupNativeNodeModules(installedBundle) {
 }
 
 /**
- * Kill any daemon process the service supervisor didn't reap.
- * Reads ~/.modelstat/daemon.lock for the PID, sends SIGTERM, then
- * SIGKILL after a short grace period. Tolerates a missing/stale
- * lock file — we just want to make sure the new bundle is the only
- * thing holding the lock when we restart.
+ * Kill any modelstat-related process the service supervisor didn't
+ * reap. Two passes:
+ *   (1) PID from ~/.modelstat/daemon.lock — the most reliable hit
+ *       when the lock is fresh and our own daemon wrote it.
+ *   (2) Process scan via `pgrep -f` on macOS/Linux — catches stray
+ *       daemons launched by an OLDER bundle (different command
+ *       line, different lock format), zombies that survived a
+ *       launchd KeepAlive bounce, and the case where the user has
+ *       BOTH the launchd-managed daemon AND a hand-spawned one
+ *       running. The pattern is intentionally narrow
+ *       (`modelstat\\.mjs`) so we don't kill `modelstatd` or any
+ *       other process that happens to share a substring.
+ *
+ * SIGTERM first, escalate to SIGKILL after 2 s. All failures
+ * tolerated — we just want the new bundle to be the only modelstat
+ * process holding the lock when we restart.
  */
 async function killStaleDaemon(stateDir) {
+  await killByLockfile(stateDir);
+  await killByProcessScan();
+}
+
+async function killByProcessScan() {
+  const { spawnSync } = await import("node:child_process");
+  // pgrep is on macOS by default, Linux via procps.
+  const r = spawnSync("pgrep", ["-f", "modelstat\\.mjs"], {
+    encoding: "utf8",
+  });
+  if (r.status !== 0 || !r.stdout) return;
+  const pids = r.stdout
+    .split(/\s+/)
+    .map((s) => Number(s))
+    .filter((n) => Number.isInteger(n) && n > 0 && n !== process.pid);
+  if (pids.length === 0) return;
+  for (const pid of pids) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+      /* gone or not ours */
+    }
+  }
+  // Wait up to 2 s for graceful exits.
+  for (let i = 0; i < 20; i++) {
+    let alive = 0;
+    for (const pid of pids) {
+      try {
+        process.kill(pid, 0);
+        alive += 1;
+      } catch {
+        /* exited */
+      }
+    }
+    if (alive === 0) return;
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  for (const pid of pids) {
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+      /* gone or denied */
+    }
+  }
+}
+
+async function killByLockfile(stateDir) {
   const { readFileSync } = await import("node:fs");
   const lockPath = join(stateDir, "daemon.lock");
   let payload;