@quolu/lattice 0.70.0 → 0.71.1

package/sensor/dist/mcp/daemon-registry.js

@@ -38,6 +38,8 @@ exports.isProcessAlive = isProcessAlive;
 exports.registerDaemon = registerDaemon;
 exports.deregisterDaemon = deregisterDaemon;
 exports.listDaemons = listDaemons;
+exports.listVerifiedDaemons = listVerifiedDaemons;
+exports.clearStaleDaemonArtifacts = clearStaleDaemonArtifacts;
 exports.stopDaemonAt = stopDaemonAt;
 exports.stopAllDaemons = stopAllDaemons;
 /**
@@ -66,6 +68,7 @@ const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const crypto = __importStar(require("crypto"));
 const daemon_paths_1 = require("./daemon-paths");
+const writer_lock_1 = require("./writer-lock");
 /**
  * `~/.lattice/sensor/daemons` — GLOBAL, keyed off the home dir. (The per-project
  * index dir is fixed at `.lattice/sensor` and has no env override — see
@@ -174,24 +177,97 @@ function listDaemons(opts = {}) {
     }
     return live.sort((a, b) => b.startedAt - a.startedAt);
 }
-/** Remove a stopped daemon's leftover lockfile + socket + registry record. */
-function cleanupDaemonArtifacts(root) {
-    try {
-        fs.unlinkSync((0, daemon_paths_1.getDaemonPidPath)(root));
+/**
+ * Registry entries whose socket hello proves the recorded process is the
+ * daemon. Used by every user-facing list/stop-all path so a reused PID cannot
+ * appear as a phantom running daemon (#1553).
+ */
+async function listVerifiedDaemons(opts = {}) {
+    const prune = opts.prune ?? true;
+    const candidates = listDaemons({ prune });
+    const checks = await Promise.all(candidates.map(async (rec) => ({
+        rec,
+        verified: await (0, daemon_paths_1.probeDaemonIdentity)(rec),
+    })));
+    const verified = [];
+    for (const check of checks) {
+        if (check.verified)
+            verified.push(check.rec);
+        else if (prune)
+            deregisterDaemon(check.rec.root);
     }
-    catch { /* gone */ }
-    // POSIX sockets are real files; Windows named pipes vanish with the process.
-    // Sweep every candidate — a daemon that relocated past an unusable in-project
-    // FS (ExFAT/FAT; #997) left its socket at the tmpdir fallback, not candidate 0.
-    if (process.platform !== 'win32') {
-        for (const candidate of (0, daemon_paths_1.getDaemonSocketCandidates)(root)) {
+    return verified;
+}
+/** Remove stale artifacts while holding the project writer slot exclusively. */
+function cleanupDaemonArtifacts(root, expectedLockContents) {
+    const pidPath = (0, daemon_paths_1.getDaemonPidPath)(root);
+    // A daemon owns writer.pid before binding or relocating its socket. Claiming
+    // the writer slot therefore freezes every legitimate daemon artifact writer
+    // while we compare the inspected lock snapshot and clean it up.
+    if ((0, writer_lock_1.readWriterLock)(root)?.pid === process.pid)
+        return false;
+    const claim = (0, writer_lock_1.tryAcquireWriterLock)(root, 'cleanup');
+    if (claim.kind === 'taken')
+        return false;
+    try {
+        if (expectedLockContents === null) {
+            if (fs.existsSync(pidPath))
+                return false;
+        }
+        else {
             try {
-                fs.unlinkSync(candidate);
+                if (fs.readFileSync(pidPath, 'utf8') !== expectedLockContents)
+                    return false;
+            }
+            catch {
+                return false;
+            }
+        }
+        // POSIX sockets are real files; Windows named pipes vanish with the process.
+        // Sweep every candidate before releasing daemon.pid, so no successor can
+        // acquire the lock and bind a socket that this cleanup then removes.
+        if (process.platform !== 'win32') {
+            for (const candidate of (0, daemon_paths_1.getDaemonSocketCandidates)(root)) {
+                try {
+                    fs.unlinkSync(candidate);
+                }
+                catch { /* gone */ }
             }
-            catch { /* gone */ }
         }
+        deregisterDaemon(root);
+        try {
+            fs.unlinkSync(pidPath);
+        }
+        catch (err) {
+            if (err.code !== 'ENOENT')
+                return false;
+        }
+        return true;
     }
-    deregisterDaemon(root);
+    finally {
+        (0, writer_lock_1.releaseWriterLock)(root);
+    }
+}
+/** Remove daemon artifacts only when no matching daemon answers the socket hello. */
+async function clearStaleDaemonArtifacts(root) {
+    const pidPath = (0, daemon_paths_1.getDaemonPidPath)(root);
+    const hadArtifacts = fs.existsSync(pidPath) || (process.platform !== 'win32' && (0, daemon_paths_1.getDaemonSocketCandidates)(root).some((p) => fs.existsSync(p)));
+    if (!hadArtifacts)
+        return false;
+    let info = null;
+    let lockContents = null;
+    try {
+        lockContents = fs.readFileSync(pidPath, 'utf8');
+        info = (0, daemon_paths_1.decodeLockInfo)(lockContents);
+    }
+    catch { /* missing/corrupt */ }
+    if (info && isProcessAlive(info.pid)) {
+        // A live legacy holder has no socket path to probe. That is inconclusive,
+        // not proof of PID reuse, so preserve its lock rather than risk two writers.
+        if (!(0, daemon_paths_1.canProbeDaemonIdentity)(info) || await (0, daemon_paths_1.probeDaemonIdentity)(info))
+            return false;
+    }
+    return cleanupDaemonArtifacts(root, lockContents);
 }
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 async function waitForDeath(pid, timeoutMs) {
@@ -207,13 +283,17 @@ async function waitForDeath(pid, timeoutMs) {
  * Stop the daemon serving `root`: SIGTERM, wait, then SIGKILL if it won't go,
  * then sweep its artifacts. `root` must be realpath'd (match how the daemon
  * keys its socket/lockfile). Resolves the pid from the authoritative lockfile,
- * falling back to the registry.
+ * falling back to the registry. Rebuild callers preserve unverified live locks
+ * instead of interpreting a failed probe as permission to discard the database.
  */
-async function stopDaemonAt(root) {
+async function stopDaemonAt(root, options = {}) {
     let pid = null;
+    let identity = null;
+    let lockContents = null;
     try {
-        const info = (0, daemon_paths_1.decodeLockInfo)(fs.readFileSync((0, daemon_paths_1.getDaemonPidPath)(root), 'utf8'));
-        pid = info?.pid ?? null;
+        lockContents = fs.readFileSync((0, daemon_paths_1.getDaemonPidPath)(root), 'utf8');
+        identity = (0, daemon_paths_1.decodeLockInfo)(lockContents);
+        pid = identity?.pid ?? null;
     }
     catch {
         /* no lockfile */
@@ -221,15 +301,39 @@ async function stopDaemonAt(root) {
     if (pid == null) {
         const rec = listDaemons({ prune: false }).find((r) => path.resolve(r.root) === path.resolve(root));
         pid = rec?.pid ?? null;
+        if (rec)
+            identity = rec;
     }
     if (pid == null) {
-        cleanupDaemonArtifacts(root);
+        cleanupDaemonArtifacts(root, lockContents);
         return { root, pid: null, outcome: 'no-daemon' };
     }
     if (!isProcessAlive(pid)) {
-        cleanupDaemonArtifacts(root);
-        return { root, pid, outcome: 'not-running' };
+        const removed = cleanupDaemonArtifacts(root, lockContents);
+        return { root, pid, outcome: removed ? 'not-running' : 'unverified' };
+    }
+    // Never signal a process merely because it reused a stale daemon PID. The
+    // daemon's immediate hello is the process-identity proof (#1553).
+    if (!identity || !(0, daemon_paths_1.canProbeDaemonIdentity)(identity)) {
+        return { root, pid, outcome: 'unverified' };
+    }
+    if (!await (0, daemon_paths_1.probeDaemonIdentity)(identity)) {
+        if (options.preserveUnverified)
+            return { root, pid, outcome: 'unverified' };
+        const removed = cleanupDaemonArtifacts(root, lockContents);
+        return { root, pid, outcome: removed ? 'not-running' : 'unverified' };
     }
+    // Identity probing awaits I/O: never act on a superseded ownership record.
+    const sameLock = () => {
+        try {
+            return fs.readFileSync((0, daemon_paths_1.getDaemonPidPath)(root), 'utf8') === lockContents;
+        }
+        catch {
+            return lockContents === null;
+        }
+    };
+    if (!sameLock())
+        return { root, pid, outcome: 'unverified' };
     // POSIX: SIGTERM runs the daemon's graceful shutdown. Windows: TerminateProcess
     // (no graceful path), so we always sweep artifacts ourselves below.
     try {
@@ -238,20 +342,26 @@ async function stopDaemonAt(root) {
     catch { /* raced to exit */ }
     let outcome = 'term';
     if (!(await waitForDeath(pid, 3000))) {
+        // Re-prove identity before escalating; the old PID may have been reused.
+        if (!sameLock() || !await (0, daemon_paths_1.probeDaemonIdentity)(identity) || !sameLock()) {
+            return { root, pid, outcome: 'still-running' };
+        }
         try {
             process.kill(pid, 'SIGKILL');
         }
         catch { /* raced to exit */ }
-        await waitForDeath(pid, 2000);
+        if (!(await waitForDeath(pid, 2000))) {
+            return { root, pid, outcome: 'still-running' };
+        }
         outcome = 'kill';
     }
-    cleanupDaemonArtifacts(root);
+    cleanupDaemonArtifacts(root, lockContents);
     return { root, pid, outcome };
 }
 /** Stop every registered, live daemon. */
 async function stopAllDaemons() {
     const results = [];
-    for (const rec of listDaemons()) {
+    for (const rec of await listVerifiedDaemons()) {
         results.push(await stopDaemonAt(rec.root));
     }
     return results;

package/sensor/dist/mcp/daemon-registry.js.map

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

package/sensor/dist/mcp/daemon.d.ts

@@ -92,13 +92,13 @@ export interface DaemonStartResult {
  *
  * Race-safe: callers must first call `tryAcquireDaemonLock(projectRoot)` and
  * only construct a Daemon if they got the lock (`kind: 'acquired'`). The atomic
- * `O_EXCL` create inside the acquire helper — which now also writes the full
- * record before returning — is the only synchronization between competing
- * daemons.
+ * create/link inside the acquire helper elects one candidate. The project
+ * writer lock then fences bind/ownership refresh against stale-artifact cleanup.
  */
 export declare class Daemon {
     private projectRoot;
     private server;
+    private acceptedSockets;
     private clients;
     /** Per-client peer pids from the optional client-hello, for the liveness sweep. */
     private clientPeers;
@@ -117,10 +117,9 @@ export declare class Daemon {
         maxIdleMs?: number;
     });
     /**
-     * Bind the socket, kick off engine init, and register signal handlers. The
-     * lockfile body was already written atomically by `tryAcquireDaemonLock`, so
-     * there is nothing to write here. The promise resolves once the server is
-     * listening — the daemon then sticks around until idle/shutdown.
+     * Bind the socket, refresh the ownership record, kick off engine init, and
+     * register signal handlers. The promise resolves once the server is listening
+     * — the daemon then sticks around until idle/shutdown.
      */
     start(): Promise<DaemonStartResult>;
     /** Currently-connected client count. Exposed for tests / status output. */
@@ -177,6 +176,14 @@ export declare class Daemon {
     reapDeadClients(isAlive: (pid: number) => boolean): number;
     private cleanupLockfile;
 }
+/**
+ * Publish the bound socket without abandoning a live daemon on a transient
+ * Windows sharing violation. Keep this startup step synchronous: accepting a
+ * client before ownership is refreshed could initialize an engine too early.
+ * Retries wait per {@link LOCK_REFRESH_RETRY_DELAYS_MS}; permanent failures
+ * still abort startup.
+ */
+export declare function refreshDaemonLock(pidPath: string, initialContents: string, lock: DaemonLockInfo, platform?: NodeJS.Platform): void;
 /**
  * Result of `tryAcquireDaemonLock`. Either we got the lockfile (caller becomes
  * the daemon), or it already existed (caller should connect to the existing
@@ -189,6 +196,8 @@ export type AcquireResult = {
 } | {
     kind: 'taken';
     existing: DaemonLockInfo | null;
+    /** Exact record read after losing acquisition; null when it was unreadable. */
+    lockContents: string | null;
     pidPath: string;
 };
 /**
@@ -234,17 +243,21 @@ export declare function tryAcquireDaemonLock(projectRoot: string): AcquireResult
  */
 export declare function acquireLockViaExclusiveOpen(pidPath: string, info: DaemonLockInfo): boolean;
 /**
- * Remove a stale pidfile, but only if it still names a dead process. Re-reads
- * the file immediately before unlinking so we never delete a lock that a live
- * daemon (re)acquired in the meantime.
+ * Remove a stale pidfile. Re-reads the file immediately before unlinking so a
+ * different daemon that acquired the lock in the meantime is never disturbed.
  *
  * must-fix 1 (issue #411 review): the original unconditionally `unlink`'d,
  * which let a racing candidate delete a healthy daemon's lock. Passing
  * `expectedDeadPid` (the pid the caller believed was dead) makes the clear a
- * compare-and-delete: bail if the file now holds a different pid, or any live
- * pid. Returns true when the stale lock is gone (or was already gone).
+ * compare-and-delete: bail if the file now holds a different pid. By default a
+ * live pid is also preserved; `allowLivePid` is reserved for callers that have
+ * already disproved daemon identity with the socket hello (#1553). Returns true
+ * when the stale lock is gone (or was already gone).
  */
-export declare function clearStaleDaemonLock(pidPath: string, expectedDeadPid?: number): boolean;
+export declare function clearStaleDaemonLock(pidPath: string, expectedDeadPid?: number, opts?: {
+    allowLivePid?: boolean;
+    expectedLockContents?: string;
+}): boolean;
 /**
  * Probe whether `pid` is currently alive (signal-0). Treats EPERM as alive on
  * every platform (the process exists, it's just not ours to signal) so we never

package/sensor/dist/mcp/daemon.d.ts.map

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

package/sensor/dist/mcp/daemon.js

@@ -76,6 +76,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MAX_HELLO_LINE_BYTES = exports.Daemon = void 0;
 exports.finalizeDaemonExit = finalizeDaemonExit;
+exports.refreshDaemonLock = refreshDaemonLock;
 exports.tryAcquireDaemonLock = tryAcquireDaemonLock;
 exports.acquireLockViaExclusiveOpen = acquireLockViaExclusiveOpen;
 exports.clearStaleDaemonLock = clearStaleDaemonLock;
@@ -91,6 +92,7 @@ const session_1 = require("./session");
 const transport_1 = require("./transport");
 const daemon_paths_1 = require("./daemon-paths");
 const version_1 = require("./version");
+const writer_lock_1 = require("./writer-lock");
 const daemon_registry_1 = require("./daemon-registry");
 /** Default idle linger after the last client disconnects. */
 const DEFAULT_IDLE_TIMEOUT_MS = 300_000;
@@ -151,13 +153,15 @@ exports.MAX_HELLO_LINE_BYTES = MAX_HELLO_LINE_BYTES;
  *
  * Race-safe: callers must first call `tryAcquireDaemonLock(projectRoot)` and
  * only construct a Daemon if they got the lock (`kind: 'acquired'`). The atomic
- * `O_EXCL` create inside the acquire helper — which now also writes the full
- * record before returning — is the only synchronization between competing
- * daemons.
+ * create/link inside the acquire helper elects one candidate. The project
+ * writer lock then fences bind/ownership refresh against stale-artifact cleanup.
  */
 class Daemon {
     projectRoot;
     server = null;
+    // Includes sockets waiting for the optional client hello, before a session
+    // exists. server.close() waits for these too, so stop must destroy them.
+    acceptedSockets = new Set();
     clients = new Set();
     /** Per-client peer pids from the optional client-hello, for the liveness sweep. */
     clientPeers = new Map();
@@ -191,16 +195,32 @@ class Daemon {
         this.engine.setExecutionMode('daemon', 'daemon');
     }
     /**
-     * Bind the socket, kick off engine init, and register signal handlers. The
-     * lockfile body was already written atomically by `tryAcquireDaemonLock`, so
-     * there is nothing to write here. The promise resolves once the server is
-     * listening — the daemon then sticks around until idle/shutdown.
+     * Bind the socket, refresh the ownership record, kick off engine init, and
+     * register signal handlers. The promise resolves once the server is listening
+     * — the daemon then sticks around until idle/shutdown.
      */
     async start() {
-        // Engine init is deliberately backgrounded — see #172. The first session
-        // to land waits on `ensureInitialized` either way, and unloaded sessions
-        // (cross-project tool calls only) shouldn't pay any open cost.
-        void this.engine.ensureInitialized(this.projectRoot);
+        // #1740: claim the project writer lock before opening/watching so a
+        // concurrent direct-mode serve --mcp cannot start a second watcher.
+        (0, writer_lock_1.assertNoRebuild)(this.projectRoot);
+        const writer = (0, writer_lock_1.tryAcquireWriterLock)(this.projectRoot, 'daemon');
+        if (writer.kind === 'taken') {
+            const msg = (0, writer_lock_1.writerLockHeldMessage)(writer.existing, writer.pidPath);
+            process.stderr.write(`[LatticeSensor daemon] ${msg}\n`);
+            this.cleanupLockfile();
+            throw new Error(msg);
+        }
+        let initialLockContents;
+        try {
+            initialLockContents = fs.readFileSync(this.pidPath, 'utf8');
+            if ((0, daemon_paths_1.decodeLockInfo)(initialLockContents)?.pid !== process.pid) {
+                throw new Error('daemon lock belongs to another process');
+            }
+        }
+        catch {
+            (0, writer_lock_1.releaseWriterLock)(this.projectRoot);
+            throw new Error('Lost daemon lock ownership before startup.');
+        }
         // Walk the ordered socket candidates and bind the first that works. The
         // in-project path comes first; the deterministic tmpdir path is the fallback
         // for a filesystem that can't host an AF_UNIX node at all (ExFAT/FAT external
@@ -265,19 +285,24 @@ class Daemon {
             socketPath: this.socketPath,
             startedAt: Date.now(),
         };
-        // `tryAcquireDaemonLock` wrote the pidfile with the PREFERRED path (candidate
-        // 0) before we knew which one would bind. If we relocated, rewrite it so the
-        // per-project record is honest. Atomic temp+rename; safe because we hold the
-        // lock and we're alive — `clearStaleDaemonLock` pid-verifies, so no racing
-        // candidate clears or clobbers a live daemon's lock.
-        if (this.socketPath !== candidates[0]) {
+        // Refresh the lock on every successful bind, not only relocation. The
+        // writer lock prevents stale-artifact cleanup from racing this ownership
+        // check, and the exact snapshot prevents overwriting a replacement record.
+        try {
+            refreshDaemonLock(this.pidPath, initialLockContents, lock);
+        }
+        catch (err) {
             try {
-                const tmpPid = `${this.pidPath}.${process.pid}.relocate`;
-                fs.writeFileSync(tmpPid, (0, daemon_paths_1.encodeLockInfo)(lock), { mode: 0o600 });
-                fs.renameSync(tmpPid, this.pidPath);
+                bound.server.close();
             }
-            catch { /* best-effort; the registry record below carries the real path */ }
+            catch { /* best-effort */ }
+            this.cleanupLockfile();
+            throw err;
         }
+        // Engine init is deliberately backgrounded — see #172. It starts only
+        // after bind and ownership refresh, so a delayed daemon that lost election
+        // can never open a second watcher or writer.
+        void this.engine.ensureInitialized(this.projectRoot);
         // Drop a discovery record so `lattice sensor list` / `stop --all` can find us.
         // Best-effort; a missing record only means list's liveness prune covers it.
         (0, daemon_registry_1.registerDaemon)({ root: this.projectRoot, ...lock });
@@ -324,11 +349,14 @@ class Daemon {
             catch { /* best-effort */ }
         }
         this.clients.clear();
+        for (const socket of this.acceptedSockets)
+            socket.destroy();
+        this.acceptedSockets.clear();
         if (this.server) {
             await new Promise((resolve) => this.server.close(() => resolve()));
             this.server = null;
         }
-        this.engine.stop();
+        await this.engine.stop();
         this.cleanupLockfile();
         (0, daemon_registry_1.deregisterDaemon)(this.projectRoot);
         if (process.platform !== 'win32') {
@@ -343,6 +371,12 @@ class Daemon {
         finalizeDaemonExit(process.platform, (code) => process.exit(code));
     }
     handleConnection(socket) {
+        if (this.stopping) {
+            socket.destroy();
+            return;
+        }
+        this.acceptedSockets.add(socket);
+        socket.once('close', () => this.acceptedSockets.delete(socket));
         // Hello first so the proxy can verify versions before piping any
         // application bytes. The proxy reads exactly one line, then forwards.
         const hello = {
@@ -357,6 +391,10 @@ class Daemon {
         // timeout, a non-hello first line, an early close — yields null pids and we
         // fall back to the socket-close lifecycle exactly as before (#692).
         void readClientHello(socket).then((peers) => {
+            if (this.stopping || socket.destroyed) {
+                socket.destroy();
+                return;
+            }
             const transport = new transport_1.SocketTransport(socket);
             const session = new session_1.MCPSession(transport, this.engine, {
                 explicitProjectPath: this.projectRoot,
@@ -493,6 +531,7 @@ class Daemon {
         return reaped;
     }
     cleanupLockfile() {
+        (0, writer_lock_1.releaseWriterLock)(this.projectRoot);
         try {
             if (fs.existsSync(this.pidPath)) {
                 // Only remove if it still belongs to us — another daemon may have
@@ -508,6 +547,52 @@ class Daemon {
     }
 }
 exports.Daemon = Daemon;
+/**
+ * Waits between retries of the pid-file replace on Windows, doubling to a cap:
+ * eight attempts wait about 1.6s in all. Windows refuses to replace a file
+ * while any handle to it is open, so an antivirus scan, an indexer, or another
+ * session reading the lock can each hold it for a moment, and for longer on a
+ * loaded machine (#1773). The total stays well inside a launcher's ~6s connect
+ * window.
+ */
+const LOCK_REFRESH_RETRY_DELAYS_MS = [25, 50, 100, 200, 400, 400, 400];
+/**
+ * Publish the bound socket without abandoning a live daemon on a transient
+ * Windows sharing violation. Keep this startup step synchronous: accepting a
+ * client before ownership is refreshed could initialize an engine too early.
+ * Retries wait per {@link LOCK_REFRESH_RETRY_DELAYS_MS}; permanent failures
+ * still abort startup.
+ */
+function refreshDaemonLock(pidPath, initialContents, lock, platform = process.platform) {
+    const tmpPid = `${pidPath}.${process.pid}.bound`;
+    try {
+        fs.writeFileSync(tmpPid, (0, daemon_paths_1.encodeLockInfo)(lock), { mode: 0o600 });
+        for (let attempt = 0;; attempt++) {
+            // A retry must never replace a record whose owner changed while waiting.
+            if (fs.readFileSync(pidPath, 'utf8') !== initialContents) {
+                throw new Error('Lost daemon lock ownership after binding.');
+            }
+            try {
+                fs.renameSync(tmpPid, pidPath);
+                return;
+            }
+            catch (error) {
+                const code = error.code;
+                const delay = LOCK_REFRESH_RETRY_DELAYS_MS[attempt];
+                if (platform !== 'win32' || !['EPERM', 'EACCES', 'EBUSY'].includes(code ?? '') || delay === undefined) {
+                    throw error;
+                }
+                Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, delay);
+            }
+        }
+    }
+    finally {
+        try {
+            fs.unlinkSync(tmpPid);
+        }
+        catch { /* renamed, or best-effort cleanup */ }
+    }
+}
 /**
  * Atomically create the daemon pidfile with its full record already in place.
  * Returns either an `acquired` result (the caller is the daemon-elect and may
@@ -587,11 +672,13 @@ function tryAcquireDaemonLock(projectRoot) {
     // record — `existing` is null only for a genuinely corrupt leftover, never a
     // mid-write race.
     let existing = null;
+    let lockContents = null;
     try {
-        existing = (0, daemon_paths_1.decodeLockInfo)(fs.readFileSync(pidPath, 'utf8'));
+        lockContents = fs.readFileSync(pidPath, 'utf8');
+        existing = (0, daemon_paths_1.decodeLockInfo)(lockContents);
     }
     catch { /* unreadable lockfile — treat as malformed */ }
-    return { kind: 'taken', existing, pidPath };
+    return { kind: 'taken', existing, lockContents, pidPath };
 }
 /**
  * Exclusive-create the pidfile (O_CREAT|O_EXCL via the `wx` flag) and write the
@@ -621,26 +708,33 @@ function acquireLockViaExclusiveOpen(pidPath, info) {
     return true;
 }
 /**
- * Remove a stale pidfile, but only if it still names a dead process. Re-reads
- * the file immediately before unlinking so we never delete a lock that a live
- * daemon (re)acquired in the meantime.
+ * Remove a stale pidfile. Re-reads the file immediately before unlinking so a
+ * different daemon that acquired the lock in the meantime is never disturbed.
  *
  * must-fix 1 (issue #411 review): the original unconditionally `unlink`'d,
  * which let a racing candidate delete a healthy daemon's lock. Passing
  * `expectedDeadPid` (the pid the caller believed was dead) makes the clear a
- * compare-and-delete: bail if the file now holds a different pid, or any live
- * pid. Returns true when the stale lock is gone (or was already gone).
+ * compare-and-delete: bail if the file now holds a different pid. By default a
+ * live pid is also preserved; `allowLivePid` is reserved for callers that have
+ * already disproved daemon identity with the socket hello (#1553). Returns true
+ * when the stale lock is gone (or was already gone).
  */
-function clearStaleDaemonLock(pidPath, expectedDeadPid) {
+function clearStaleDaemonLock(pidPath, expectedDeadPid, opts = {}) {
     try {
         const raw = fs.readFileSync(pidPath, 'utf8');
+        // The identity record changed after the caller inspected it. Even the same
+        // PID may now advertise a newly-bound socket, so this snapshot was never
+        // disproved and must not be deleted.
+        if (opts.expectedLockContents !== undefined && raw !== opts.expectedLockContents)
+            return false;
         const info = (0, daemon_paths_1.decodeLockInfo)(raw);
         if (info) {
             // A different pid took over since we read it — not ours to clear.
             if (expectedDeadPid !== undefined && info.pid !== expectedDeadPid)
                 return false;
-            // Holder is actually alive — never clear a live daemon's lock.
-            if (info.pid > 0 && isProcessAlive(info.pid))
+            // PID liveness is normally sufficient. The takeover caller may override
+            // it only after a failed identity handshake proves PID reuse.
+            if (!opts.allowLivePid && info.pid > 0 && isProcessAlive(info.pid))
                 return false;
         }
         fs.unlinkSync(pidPath);