modelstat 0.0.30 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "modelstat",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "modelstat companion — reads local AI-tool usage and ships tokenised events to modelstat.",
   "license": "Apache-2.0",
   "type": "module",

package/scripts/postinstall.mjs

@@ -167,12 +167,20 @@ async function rebootServiceIfInstalled() {
   const { spawnSync } = await import("node:child_process");
   console.log("[modelstat] refreshing background service…");
 
-  // Stop first — best effort, ignore failures.
+  // Stop the SERVICE (launchctl bootout / systemctl --user disable)
+  // via the fresh bundle's own knowledge of each platform.
   spawnSync(process.execPath, [freshBundle, "stop"], {
     stdio: "ignore",
     timeout: 30_000,
   });
 
+  // Belt-and-braces: kill any stray daemon process that the service
+  // supervisor didn't reap (stale lock, killed parent, KeepAlive
+  // race during the bundle swap below). Lock file at
+  // ~/.modelstat/daemon.lock has the live PID; SIGTERM it gently
+  // first, escalate to SIGKILL if it's still around 2 s later.
+  await killStaleDaemon(stateDir);
+
   // Copy the new bundle over the old `~/.modelstat/bin/modelstat.mjs`
   // so the service supervisor (launchd/systemd) loads the new code on
   // next launch. The fresh bundle's `connect` / `start` does this on
@@ -201,6 +209,48 @@ async function rebootServiceIfInstalled() {
   console.log("[modelstat] ✓ background service restarted with new build");
 }
 
+/**
+ * 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.
+ */
+async function killStaleDaemon(stateDir) {
+  const { readFileSync } = await import("node:fs");
+  const lockPath = join(stateDir, "daemon.lock");
+  let payload;
+  try {
+    payload = JSON.parse(readFileSync(lockPath, "utf8"));
+  } catch {
+    return; // no lock file — nothing to do
+  }
+  const pid = Number(payload?.pid);
+  if (!Number.isInteger(pid) || pid <= 0) return;
+  if (pid === process.pid) return; // shouldn't happen, but defensive
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch (err) {
+    if (err && err.code === "ESRCH") return; // already gone
+    // EPERM: not our process — leave it alone.
+    return;
+  }
+  // Wait up to 2 s for graceful exit.
+  for (let i = 0; i < 20; i++) {
+    try {
+      process.kill(pid, 0); // signal 0 = existence check
+    } catch {
+      return; // exited
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  try {
+    process.kill(pid, "SIGKILL");
+  } catch {
+    /* gone or denied */
+  }
+}
+
 main().catch((err) => {
   console.warn(
     `[modelstat] postinstall failed: ${err && err.message ? err.message : err}`,