@popoverinstall/cli 0.7.2 → 0.8.1

package/dist/daemon-lock.js

@@ -0,0 +1,321 @@
+import { execFileSync } from "node:child_process";
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import path from "node:path";
+import { daemonLockPath, popoverHome } from "@popoverinstall/shared";
+/**
+ * Reading the daemon's lock file, and refusing to act on it when it is stale.
+ *
+ * The lock is advisory. A daemon is running if and only if it answers on the pipe; the file
+ * exists so that a daemon which has stopped answering can still be signalled. That makes
+ * every use of it an act of trust in a number written by a process that may be long gone,
+ * and this module exists to make that trust conditional.
+ *
+ * Two ways it used to be misplaced, both reproduced:
+ *
+ *   1. **A recycled pid.** A daemon killed without its graceful path — `taskkill /F`, Task
+ *      Manager, a power cut — leaves the file behind, and Windows reissues pids aggressively.
+ *      `popover daemon stop` then sent SIGTERM to whatever now holds that number, and
+ *      `popover update` runs the same path, so this was not a rare route into someone else's
+ *      process.
+ *   2. **A zero-byte lock.** A crash mid-write, or a full disk, leaves an empty file.
+ *      `Number("")` is `0` and `Number.isFinite(0)` is `true`, so the pid check passed and
+ *      `process.kill(0, "SIGTERM")` went out — which on macOS and Linux signals the *caller's
+ *      entire process group*, killing the user's shell.
+ *
+ * So: the pid must be a positive integer, and the process wearing it must still look like the
+ * one that wrote the file — same start time, running the same script. When that cannot be
+ * established, nothing is signalled. Refusing to act is always recoverable; signalling the
+ * wrong process is not.
+ */
+/** How far the OS-reported start time may differ from the recorded one. */
+const START_TIME_TOLERANCE_MS = 5_000;
+/**
+ * Parse the lock file, tolerating the format that predates it.
+ *
+ * A daemon installed before this change is still a daemon somebody may need to stop, and its
+ * lock holds a bare pid. It is accepted, flagged `legacy`, and verified against a weaker
+ * signal — see `verifyDaemonLock`.
+ */
+export function readDaemonLock(file = daemonLockPath()) {
+    let raw;
+    try {
+        raw = readFileSync(file, "utf8").trim();
+    }
+    catch {
+        return null;
+    }
+    // Includes the zero-byte case, which is the whole reason this returns null rather than
+    // letting `Number("")` become a pid of 0.
+    if (!raw)
+        return null;
+    if (raw.startsWith("{")) {
+        try {
+            const parsed = JSON.parse(raw);
+            const pid = Number(parsed.pid);
+            if (!Number.isInteger(pid))
+                return null;
+            return {
+                pid,
+                ...(Number.isFinite(Number(parsed.startedAt)) && Number(parsed.startedAt) > 0
+                    ? { startedAt: Number(parsed.startedAt) }
+                    : {}),
+                ...(parsed.entry ? { entry: String(parsed.entry) } : {}),
+                legacy: false,
+            };
+        }
+        catch {
+            return null;
+        }
+    }
+    const pid = Number(raw);
+    if (!Number.isInteger(pid))
+        return null;
+    return { pid, legacy: true };
+}
+/**
+ * Whether the process named by the lock is still the daemon that wrote it.
+ *
+ * `expectedEntry` is the daemon build this CLI would start, used as the identity test for a
+ * legacy lock that records no entry of its own. It is a weaker test — it says "this pid is
+ * running the daemon" rather than "this pid is the one that wrote the file" — but combined
+ * with the pid still existing it is enough to rule out an unrelated process, which is the
+ * failure that matters.
+ */
+export function verifyDaemonLock(lock, opts = {}) {
+    // `pid > 0` rather than `Number.isFinite`: 0 is a real, finite number and a catastrophic
+    // signal target, and a negative pid signals a process group on POSIX.
+    if (!Number.isInteger(lock.pid) || lock.pid <= 0) {
+        return { ok: false, reason: "bad-pid", detail: `the lock names pid ${lock.pid}` };
+    }
+    const probe = opts.probe ?? inspectProcess;
+    const info = probe(lock.pid);
+    if (info.state === "gone") {
+        return { ok: false, reason: "gone", detail: `no process is running as pid ${lock.pid}` };
+    }
+    if (info.state === "unknown") {
+        return {
+            ok: false,
+            reason: "unknown",
+            detail: `this machine would not say what pid ${lock.pid} is`,
+        };
+    }
+    // The start time is the strongest available evidence against a recycled pid: a reissued
+    // number belongs to a process that started later, by definition.
+    if (lock.startedAt !== undefined) {
+        if (info.startedAt === undefined) {
+            return {
+                ok: false,
+                reason: "unknown",
+                detail: `could not read the start time of pid ${lock.pid}`,
+            };
+        }
+        if (Math.abs(info.startedAt - lock.startedAt) > START_TIME_TOLERANCE_MS) {
+            return {
+                ok: false,
+                reason: "not-ours",
+                detail: `pid ${lock.pid} started at a different time than the daemon that wrote the lock`,
+            };
+        }
+    }
+    const wanted = lock.entry ?? opts.expectedEntry ?? null;
+    if (wanted) {
+        if (info.commandLine === undefined) {
+            return {
+                ok: false,
+                reason: "unknown",
+                detail: `could not read the command line of pid ${lock.pid}`,
+            };
+        }
+        if (!commandLineNames(info.commandLine, wanted)) {
+            return {
+                ok: false,
+                reason: "not-ours",
+                detail: `pid ${lock.pid} is not running the popover daemon`,
+            };
+        }
+    }
+    else if (lock.legacy) {
+        // Nothing recorded and nothing to compare against. A legacy lock plus no known daemon
+        // build is exactly the situation this module exists to refuse.
+        return {
+            ok: false,
+            reason: "unknown",
+            detail: "the lock predates this version and there is no daemon build to check it against",
+        };
+    }
+    return { ok: true, pid: lock.pid };
+}
+/**
+ * Whether a command line is running a given script.
+ *
+ * Compared on the path as text rather than by resolving it: the daemon recorded
+ * `process.argv[1]` and the OS reports the same string back, so an exact substring match is
+ * both sufficient and free of filesystem calls that could themselves fail. Windows gets a
+ * case-insensitive comparison with separators normalised, because a path can come back with
+ * either slash and either case and still be the same file.
+ */
+function commandLineNames(commandLine, entry) {
+    if (process.platform !== "win32")
+        return commandLine.includes(entry);
+    const norm = (s) => s.replace(/\\/g, "/").toLowerCase();
+    return norm(commandLine).includes(norm(entry));
+}
+/**
+ * Ask the OS what a pid is, without ever throwing.
+ *
+ * Deliberately not `process.kill(pid, 0)`, which answers only "does something hold this
+ * number" — the exact question that led here. What is needed is identity, and identity means
+ * the start time and the command line, neither of which Node exposes for another process.
+ *
+ * Costs one subprocess. That is fine: this runs on the fallback path of `popover daemon
+ * stop`, after the pipe has already failed, and never on any hot path.
+ */
+export function inspectProcess(pid) {
+    try {
+        return process.platform === "win32" ? inspectWindows(pid) : inspectPosix(pid);
+    }
+    catch {
+        // A probe that could not run tells us nothing, and "nothing" must not read as "gone" —
+        // that would send us on to clean the lock of a daemon that is alive and well.
+        return { state: "unknown" };
+    }
+}
+function inspectPosix(pid) {
+    let out;
+    try {
+        out = execFileSync("ps", ["-o", "lstart=,args=", "-p", String(pid)], {
+            encoding: "utf8",
+            timeout: 8_000,
+            stdio: ["ignore", "pipe", "ignore"],
+        });
+    }
+    catch (err) {
+        // `ps` exits non-zero with no output when the pid does not exist, which is an answer.
+        // Anything else — no `ps`, a timeout — is not.
+        const status = err.status;
+        if (status === 1)
+            return { state: "gone" };
+        return { state: "unknown" };
+    }
+    const line = out.split("\n").find((l) => l.trim().length > 0);
+    if (!line)
+        return { state: "gone" };
+    // `lstart` is `%a %b %e %H:%M:%S %Y`, space-padded to a fixed width, so the date and the
+    // command are separable without knowing anything about the command.
+    const m = /^\s*(\w{3}\s+\w{3}\s+[\d ]?\d\s+\d{2}:\d{2}:\d{2}\s+\d{4})\s+(.*)$/.exec(line);
+    if (!m)
+        return { state: "running", commandLine: line.trim() };
+    const at = Date.parse(m[1].replace(/\s+/g, " "));
+    return {
+        state: "running",
+        ...(Number.isFinite(at) ? { startedAt: at } : {}),
+        commandLine: m[2].trim(),
+    };
+}
+function inspectWindows(pid) {
+    // One CIM query, because `Get-Process` reports a start time but not a command line and the
+    // command line is what identifies the script. Emitted as JSON so nothing has to be parsed
+    // out of a localised table.
+    const script = `$ErrorActionPreference='Stop';` +
+        `$p = Get-CimInstance Win32_Process -Filter "ProcessId=${pid}";` +
+        `if ($null -eq $p) { exit 3 };` +
+        `$o = [ordered]@{ ` +
+        `start = [int64]([DateTimeOffset]$p.CreationDate).ToUnixTimeMilliseconds(); ` +
+        `cmd = [string]$p.CommandLine };` +
+        `[Console]::Out.Write(($o | ConvertTo-Json -Compress))`;
+    let out;
+    try {
+        out = execFileSync("powershell.exe", ["-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command", script], { encoding: "utf8", timeout: 8_000, stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
+    }
+    catch (err) {
+        // Exit 3 is our own "no such process"; every other failure is the probe, not the answer.
+        if (err.status === 3)
+            return { state: "gone" };
+        return { state: "unknown" };
+    }
+    try {
+        const parsed = JSON.parse(out.trim());
+        const at = Number(parsed.start);
+        return {
+            state: "running",
+            ...(Number.isFinite(at) && at > 0 ? { startedAt: at } : {}),
+            ...(parsed.cmd ? { commandLine: String(parsed.cmd) } : {}),
+        };
+    }
+    catch {
+        return { state: "unknown" };
+    }
+}
+/** Remove a lock that has been shown to name nothing of ours. Never throws. */
+export function clearDaemonLock(file = daemonLockPath()) {
+    try {
+        rmSync(file, { force: true });
+    }
+    catch {
+        /* the next start overwrites it anyway */
+    }
+}
+// ---------------------------------------------------------------------------
+// The update interlock
+// ---------------------------------------------------------------------------
+/**
+ * Marker saying "an upgrade is replacing the install tree; do not start a daemon".
+ *
+ * `popover update` stops the daemon and then hands npm up to five minutes to replace the
+ * global package. The SessionStart hook runs in *every* Claude Code session, pings, finds
+ * nothing, and starts `node <entry>` pointing into the tree npm is halfway through replacing.
+ * On Windows the daemon it starts then holds those files open, npm's rename fails EPERM or
+ * EBUSY, and the update aborts with a half-replaced global install — a machine with no
+ * working `popover` at all.
+ *
+ * The deadline is what keeps this from being worse than the problem. A marker with no expiry
+ * that survives a crashed update would suppress the daemon forever, on a machine whose owner
+ * has no idea this file exists.
+ */
+export function updateLockPath() {
+    return path.join(popoverHome(), "update.lock");
+}
+export function beginUpdateLock(ttlMs) {
+    try {
+        mkdirSync(popoverHome(), { recursive: true });
+        writeFileSync(updateLockPath(), `${JSON.stringify({ v: 1, pid: process.pid, deadline: Date.now() + ttlMs })}\n`, "utf8");
+    }
+    catch {
+        // Best effort. Failing to write it makes the race possible again, which is where we
+        // started; failing the update over it would be worse.
+    }
+}
+export function clearUpdateLock() {
+    try {
+        rmSync(updateLockPath(), { force: true });
+    }
+    catch {
+        /* a stale marker expires on its own */
+    }
+}
+/**
+ * Whether an upgrade is in flight right now.
+ *
+ * Every branch fails towards starting the daemon. Only a marker that is present, readable and
+ * unexpired holds anything back; a torn or truncated one means the process that wrote it was
+ * interrupted, which is a dead update rather than a running one. Reading it the other way
+ * round would leave a machine permanently without a daemon over a file its owner has never
+ * heard of — worse than the race this guards against, and far harder to diagnose.
+ *
+ * `packages/plugin/scripts/ensure-daemon.mjs` duplicates this check, down to that choice. It
+ * must stay dependency-free — a hook that fails to resolve an import breaks every session on
+ * the machine — so it cannot import this. Change both together.
+ */
+export function updateInProgress() {
+    try {
+        const file = updateLockPath();
+        if (!existsSync(file))
+            return false;
+        const deadline = Number(JSON.parse(readFileSync(file, "utf8")).deadline);
+        return Number.isFinite(deadline) && Date.now() < deadline;
+    }
+    catch {
+        return false;
+    }
+}
+//# sourceMappingURL=daemon-lock.js.map

package/dist/daemon-lock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"daemon-lock.js","sourceRoot":"","sources":["../src/daemon-lock.ts"],"names":[],"mappings":"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"}

package/dist/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAWA,6HAA6H;AAC7H,eAAO,MAAM,kBAAkB,sBAAuB,CAAC;AAEvD;;;;;GAKG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CA0H9C;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQ5D;AAcD,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAS/F"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAWA,6HAA6H;AAC7H,eAAO,MAAM,kBAAkB,sBAAuB,CAAC;AAEvD;;;;;GAKG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAuI9C;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAQ5D;AAcD,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAS/F"}

package/dist/doctor.js

@@ -61,6 +61,17 @@ export async function doctor() {
         if (!pong.authenticated) {
             fail("daemon is running but not authenticated", "Its token exchange failed. Check the backend, then `popover daemon restart`.");
         }
+        // A blocked client is a failure, not a suggestion: the backend is refusing its writes,
+        // so this machine's agents are invisible to the team no matter how healthy everything
+        // else here looks. Reported before the roster check below, which would otherwise show
+        // an empty team and read as "nobody is around".
+        if (pong.update?.blocked) {
+            fail("this build is too old to publish to your team", `The backend refuses its writes, so your agents are invisible to teammates. Run \`${pong.update.command}\`.`);
+        }
+        else if (pong.update) {
+            warn(`a newer release is available (${pong.update.current} → ${pong.update.latest})`);
+            dim(`Run \`${pong.update.command}\`.`);
+        }
     }
     // 5. Backend round trip — the check that actually exercises the JWT path.
     if (creds) {

package/dist/doctor.js.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAe,MAAM,wBAAwB,CAAC;AACjG,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAE7C,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAE1C,6HAA6H;AAC7H,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAU,CAAC;AAEvD;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM;IAC1B,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,MAAM,IAAI,GAAG,CAAC,GAAW,EAAE,IAAa,EAAE,EAAE;QAC1C,GAAG,CAAC,GAAG,CAAC,CAAC;QACT,IAAI,IAAI;YAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,QAAQ,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;IAEF,iBAAiB;IACjB,MAAM,OAAO,GAAG,MAAM,aAAa,EAAE,CAAC;IACtC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,IAAI,CAAC,8BAA8B,EAAE,iDAAiD,CAAC,CAAC;IAC1F,CAAC;SAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACxD,IAAI,CACF,UAAU,OAAO,qBAAqB,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EACtE,oFAAoF,CACrF,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,UAAU,OAAO,EAAE,CAAC,CAAC;IAC1B,CAAC;IAED,kBAAkB;IAClB,MAAM,cAAc,GAAG,oBAAoB,EAAE,CAAC;IAC9C,IAAI,cAAc;QAAE,EAAE,CAAC,sBAAsB,CAAC,CAAC;SAC1C,CAAC;QACJ,IAAI,CAAC,0CAA0C,CAAC,CAAC;QACjD,GAAG,CAAC,wDAAwD,CAAC,CAAC;QAC9D,GAAG,CAAC,yDAAyD,CAAC,CAAC;IACjE,CAAC;IAED,iBAAiB;IACjB,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,IAAI,CAAC,+BAA+B,EAAE,sBAAsB,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,sBAAsB,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,YAAY;IACZ,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;IAChE,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC;QAC/B,IAAI,CAAC,uBAAuB,EAAE,mDAAmD,aAAa,EAAE,EAAE,CAAC,CAAC;IACtG,CAAC;SAAM,CAAC;QACN,EAAE,CAAC,oBAAoB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACxB,IAAI,CACF,yCAAyC,EACzC,8EAA8E,CAC/E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,0EAA0E;IAC1E,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,qBAAqB,EAAE;gBAC7D,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,+EAA+E;gBAC/E,8EAA8E;gBAC9E,4EAA4E;gBAC5E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC;aAC3D,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;gBACX,EAAE,CAAC,sBAAsB,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;YAC7C,CAAC;iBAAM,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC9B,IAAI,CAAC,mCAAmC,EAAE,mCAAmC,CAAC,CAAC;YACjF,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,oBAAoB,GAAG,CAAC,MAAM,EAAE,EAAE,0CAA0C,CAAC,CAAC;YACrF,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CACF,gBAAgB,KAAK,CAAC,OAAO,EAAE,EAC/B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CACjD,CAAC;QACJ,CAAC;IACH,CAAC;IAED,qEAAqE;IACrE,IAAI,MAAM,UAAU,EAAE,EAAE,CAAC;QACvB,EAAE,CAAC,WAAW,CAAC,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,IAAI,CACF,uBAAuB,EACvB,qFAAqF;YACnF,0DAA0D,CAC7D,CAAC;IACJ,CAAC;IAED,qEAAqE;IACrE,IAAI,IAAI,EAAE,CAAC,KAAK,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;QAC7C,MAAM,MAAM,GAAG,MAAM,SAAS,CAC5B,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,EAChE,KAAK,CACN,CAAC;QACF,IAAI,MAAM,EAAE,CAAC,KAAK,WAAW,EAAE,CAAC;YAC9B,kFAAkF;YAClF,0DAA0D;YAC1D,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,KAAK,MAAM;gBAAE,EAAE,CAAC,qBAAqB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;iBAC3E,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,KAAK,KAAK,EAAE,CAAC;gBACtC,IAAI,CAAC,wCAAwC,CAAC,CAAC;gBAC/C,GAAG,CAAC,2EAA2E,CAAC,CAAC;YACnF,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;YAC9D,EAAE,CAAC,WAAW,MAAM,CAAC,OAAO,CAAC,MAAM,cAAc,MAAM,iBAAiB,CAAC,CAAC;YAC1E,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAChC,GAAG,CAAC,iEAAiE,CAAC,CAAC;YACzE,CAAC;YACD,IAAI,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,IAAI,CAAC,GAAG,MAAM,CAAC,kBAAkB,8CAA8C,CAAC,CAAC;gBACjF,GAAG,CAAC,mDAAmD,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;aAAM,IAAI,MAAM,EAAE,CAAC,KAAK,OAAO,EAAE,CAAC;YACjC,IAAI,CAAC,kBAAkB,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChB,IAAI,QAAQ,KAAK,CAAC;QAAE,EAAE,CAAC,2BAA2B,CAAC,CAAC;;QAC/C,GAAG,CAAC,GAAG,QAAQ,oBAAoB,CAAC,CAAC;IAC1C,OAAO,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,QAAQ,CAAC;IACvD,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3E,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,UAAU;IACvB,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,CAAC,WAAW,CAAC,EAAE;YAC3D,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,GAAsC;IACpF,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACpE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAE,CAAC;QACrB,IAAI,GAAG,GAAG,IAAI;YAAE,OAAO,IAAI,CAAC;QAC5B,IAAI,GAAG,GAAG,IAAI;YAAE,OAAO,KAAK,CAAC;IAC/B,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB;IAC3B,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,eAAe,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,qBAAqB,CAAC;KAC3D,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,SAAS;YAChC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC/E,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,mDAAmD;QACrD,CAAC;IACH,CAAC;IACD,qFAAqF;IACrF,yFAAyF;IACzF,0FAA0F;IAC1F,mFAAmF;IACnF,wCAAwC;IACxC,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../src/doctor.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AA6BA;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,EAAE,MAEb,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAsCA;;;;;;GAMG;AACH,eAAO,MAAM,OAAO,EAAE,MAEb,CAAC"}

package/dist/index.js

@@ -5,11 +5,13 @@ import os from "node:os";
 import path from "node:path";
 import { PACKAGE_NAME, clearCredentials, daemonEntryPointerPath, daemonLogPath, defaultApiUrl, installCommand, loadCredentials, parseChangelog, popoverHome, releasesInstalled, renderReleaseNotes, } from "@popoverinstall/shared";
 import { changelog } from "./changelog.js";
+import { beginUpdateLock, clearDaemonLock, clearUpdateLock, readDaemonLock, updateInProgress, verifyDaemonLock, } from "./daemon-lock.js";
 import { resolveDaemonEntry } from "./daemon-entry.js";
 import { doctor } from "./doctor.js";
 import { execTool } from "./exec.js";
 import { askDaemon, daemonIsRunning } from "./ipc-client.js";
 import { login } from "./login.js";
+import { rename } from "./rename.js";
 import { setup } from "./setup.js";
 import { forkCommand } from "./snapshot.js";
 import { bad, c, dim, info, ok, warn } from "./ui.js";
@@ -36,7 +38,9 @@ async function main() {
             return welcome({ apiUrl: flag(rest, "--api") ?? defaultApiUrl() });
         case "logout":
             clearCredentials();
-            ok("Signed out. The daemon will stop publishing after it restarts.");
+            // No longer "after it restarts": a running daemon re-reads this file on every publish
+            // tick and drops its connection when it goes, so signing out takes effect in seconds.
+            ok("Signed out. The daemon stops publishing within a few seconds.");
             dim("Revoke the machine at the dashboard to cut off access immediately.");
             return 0;
         case "update":
@@ -49,6 +53,8 @@ async function main() {
             return doctor();
         case "team":
             return team();
+        case "rename":
+            return rename(rest);
         case "daemon":
             return daemonCommand(rest[0] ?? "status");
         case "fork":
@@ -71,7 +77,7 @@ async function main() {
         case "ask":
         case "tell":
             bad(`\`popover ${command}\` has moved into the session.`);
-            dim(`Run /popover:team ${command} <agent> <${command === "ask" ? "question" : "message"}> in Claude Code instead.`);
+            dim(`Run /popover:${command} <agent> <${command === "ask" ? "question" : "message"}> in Claude Code instead.`);
             dim("An agent there has the context to write a question worth answering — and to");
             dim("do something with the answer.");
             return 1;
@@ -135,7 +141,7 @@ function usage() {
 ${c.bold("popover")} — connect this machine, and see what your team's agents are doing
 ${next ? `\n${next}` : ""}
   Asking and telling happen inside a session, where the agent doing them has the
-  context to be worth reading: ${c.bold("/popover:team ask B1 …")} and ${c.bold("/popover:team tell B1 …")}
+  context to be worth reading: ${c.bold("/popover:ask B1 …")} and ${c.bold("/popover:tell B1 …")}
 
   ${c.bold("popover login")} [--api URL]   Connect this machine to your team
   ${c.bold("popover logout")}              Forget this machine's credentials
@@ -145,6 +151,7 @@ ${next ? `\n${next}` : ""}
   ${c.bold("popover changelog")} [--all]   What the last update changed
   ${c.bold("popover status")}              Show this machine's sessions and connection
   ${c.bold("popover team")}                Print the team roster
+  ${c.bold("popover rename")} [handle]     Name an agent, so your team can tell them apart
   ${c.bold("popover fork")} <create|open|launch|list|revoke>
   ${c.bold("popover doctor")}              Diagnose setup problems
   ${c.bold("popover daemon")} <start|stop|restart|status|logs>
@@ -177,15 +184,51 @@ ${next ? `\n${next}` : ""}
  * `setup()` has to run afterwards. Claude Code caches plugins by version, so without
  * re-registering, the user keeps running the previous plugin against the new daemon — a
  * version skew that produces no error, just quietly stale behaviour.
+ *
+ * 3. **Something else will try to start the daemon while npm is mid-install.** Stopping the
+ *    daemon is necessary but not sufficient: the plugin's SessionStart hook runs in every
+ *    Claude Code session on the machine, and all it knows is that no daemon is answering. It
+ *    would then spawn one out of the tree npm is replacing, whose open file handles make
+ *    npm's rename fail EPERM/EBUSY on Windows and abort the update half-done. The marker
+ *    written below is the interlock; `updateInProgress()` is what the hook and `daemon start`
+ *    both check.
+ *
+ *    Its scope is exactly the window it guards — from before the stop, because the race opens
+ *    the instant the daemon stops answering, to the moment npm is done with the tree. It is
+ *    released before anything restarts the daemon, or the interlock would suppress our own
+ *    restart, and it is released in a `finally` with a deadline on top, so neither a thrown
+ *    npm, a Ctrl-C, nor a power cut can leave a machine that refuses to start its daemon.
  */
+const UPDATE_LOCK_TTL_MS = 360_000; // the npm timeout below, with room to spare
 async function update() {
     // Asked before stopping it, because the daemon is the only thing that knows which
     // version the backend publishes.
     const pong = await askDaemon({ t: "ping", id: "update" }, 2_000);
     const expected = pong?.t === "pong" ? pong.update?.latest : undefined;
     info(`Updating ${PACKAGE_NAME} (${VERSION} → ${expected ?? "latest"})`);
-    await daemonCommand("stop").catch(() => 0);
+    let failure;
+    beginUpdateLock(UPDATE_LOCK_TTL_MS);
     try {
+        const stopped = await daemonCommand("stop").catch(() => 1);
+        // A refused stop is not a stopped daemon. `daemon stop` deliberately signals nothing
+        // when it cannot verify the lock's pid is ours — which includes any case where the
+        // process probe itself is unavailable or slow, and on Windows that is a real
+        // possibility (no PowerShell on PATH, constrained language mode, a timed-out probe).
+        // Carrying on hands npm an install tree the daemon is still holding open, and npm's
+        // rename fails EPERM/EBUSY partway through, leaving a half-replaced global install —
+        // the precise failure the update interlock exists to prevent, arrived at from the one
+        // direction the interlock does not cover.
+        //
+        // Liveness is the real test, not the exit code: if nothing answers a ping then the
+        // daemon is gone whatever the lock file claimed, and the update is safe to run.
+        if (stopped !== 0) {
+            const stillAlive = await askDaemon({ t: "ping", id: "update" }, 1_500);
+            if (stillAlive?.t === "pong") {
+                bad("The daemon is still running and could not be stopped, so nothing was installed.");
+                dim("Stop it by hand or reboot, then run `popover update` again.");
+                return 1;
+            }
+        }
         // `execTool`, not `execFile`: on Windows `npm` is a `.cmd` that Node will not spawn
         // directly, and the update used to die on `spawn npm ENOENT` before reaching the
         // registry. See packages/cli/src/exec.ts.
@@ -197,6 +240,15 @@ async function update() {
         process.stdout.write(stdout);
     }
     catch (err) {
+        failure = err;
+    }
+    finally {
+        // npm is finished with the install tree either way, so nothing is gained by holding the
+        // interlock over the restart below — and holding it would block that restart.
+        clearUpdateLock();
+    }
+    if (failure) {
+        const err = failure;
         process.stdout.write(err.stdout ?? "");
         const output = `${err.stdout ?? ""}${err.stderr ?? ""}`;
         // A release that the registry will not serve yet: publishing is a separate step from the
@@ -383,6 +435,13 @@ async function daemonCommand(sub) {
                 ok("Daemon is already running.");
                 return 0;
             }
+            // An upgrade is replacing the tree the daemon runs out of. Starting one now would hold
+            // those files open and make npm's rename fail — see `update()`. `popover update` clears
+            // this before its own restart, so this can never suppress that.
+            if (updateInProgress()) {
+                warn("An update is in progress; not starting the daemon until it finishes.");
+                return 0;
+            }
             const entry = resolveDaemonEntry();
             if (!entry) {
                 bad("Could not find the daemon build.");
@@ -424,30 +483,57 @@ async function daemonCommand(sub) {
                 warn("The daemon accepted the stop but is still running; signalling it.");
             }
             // Fallback: a daemon too old to know this request, or one that is wedged.
-            const lock = path.join(popoverHome(), "daemon.lock");
-            if (!existsSync(lock)) {
-                warn("No daemon lock file; it may not be running.");
+            //
+            // Everything below treats the lock file as a claim to be checked rather than an
+            // instruction to be followed. It is written by a process that may have died without
+            // removing it, and pids are reused — so a lock that cannot be tied to a running popover
+            // daemon is reported and cleaned, never signalled. See packages/cli/src/daemon-lock.ts.
+            const lock = readDaemonLock();
+            if (!lock) {
+                warn("No readable daemon lock file; it may not be running.");
+                clearDaemonLock();
                 return 0;
             }
-            const pid = Number(readFileSync(lock, "utf8").trim());
-            if (!Number.isFinite(pid)) {
-                bad("Lock file is unreadable.");
-                return 1;
-            }
-            try {
-                process.kill(pid, "SIGTERM");
-                ok(`Signalled daemon (pid ${pid}).`);
-                return 0;
+            const verdict = verifyDaemonLock(lock, { expectedEntry: resolveDaemonEntry() });
+            if (verdict.ok) {
+                try {
+                    process.kill(verdict.pid, "SIGTERM");
+                    ok(`Signalled daemon (pid ${verdict.pid}).`);
+                    return 0;
+                }
+                catch {
+                    // It exited between the check and the signal, which is a stop by any other name.
+                    warn("Daemon was not running.");
+                    clearDaemonLock();
+                    return 0;
+                }
             }
-            catch {
-                warn("Daemon was not running.");
-                return 0;
+            if (verdict.reason === "unknown") {
+                // The one case where doing nothing is the answer: we could not establish what that
+                // pid is, and a wrong guess signals a process that has nothing to do with popover.
+                // The lock is left alone too — it may belong to a daemon that is perfectly alive.
+                bad(`Could not confirm that pid ${lock.pid} is the popover daemon (${verdict.detail}).`);
+                dim("Nothing was signalled. Stop it by hand if you are sure, or reboot.");
+                return 1;
             }
+            warn(`Ignoring a stale daemon lock — ${verdict.detail}.`);
+            clearDaemonLock();
+            return 0;
         }
-        case "restart":
-            await daemonCommand("stop");
+        case "restart": {
+            const stopped = await daemonCommand("stop");
             await sleep(1200);
+            // Starting unconditionally after a refused stop is how you end up with two daemons
+            // racing for one socket. `stop` refuses when it cannot confirm the locked pid is
+            // ours, so check whether anything is actually still answering before starting
+            // another — the ping is the truth, the lock is only a hint.
+            if (stopped !== 0 && (await daemonIsRunning())) {
+                bad("The daemon is still running and could not be stopped, so it was not restarted.");
+                dim("Stop it by hand or reboot, then run `popover daemon start`.");
+                return 1;
+            }
             return daemonCommand("start");
+        }
         case "status":
             if (await daemonIsRunning()) {
                 ok("Daemon is running.");