codedeck 0.7.1 → 0.7.2

package/dist/core/errors.js

@@ -8,55 +8,18 @@ export class RunAgentError extends Error {
         this.name = this.constructor.name;
     }
 }
-export class AgentNotInstalledError extends RunAgentError {
-    constructor(agent) {
-        super(`Agent "${agent}" is not installed`, "AGENT_NOT_INSTALLED", { agent });
-    }
-}
-export class AgentAuthenticationRequiredError extends RunAgentError {
-    constructor(agent) {
-        super(`Agent "${agent}" requires authentication`, "AGENT_AUTH_REQUIRED", { agent });
-    }
-}
-export class AgentStartFailedError extends RunAgentError {
-    constructor(agent, cause) {
-        super(`Failed to start agent "${agent}"`, "AGENT_START_FAILED", { agent, cause });
-    }
-}
 export class SessionNotFoundError extends RunAgentError {
     constructor(id) {
         super(`Session "${id}" not found`, "SESSION_NOT_FOUND", { id });
     }
 }
-export class SessionNotRunningError extends RunAgentError {
-    constructor(id) {
-        super(`Session "${id}" is not running`, "SESSION_NOT_RUNNING", { id });
-    }
-}
-export class CapabilityNotSupportedError extends RunAgentError {
-    constructor(agent, capability) {
-        super(`Agent "${agent}" does not support "${capability}"`, "CAPABILITY_NOT_SUPPORTED", { agent, capability });
-    }
-}
-export class RepositoryNotFoundError extends RunAgentError {
-    constructor(cwd) {
-        super(`No git repository found at "${cwd}"`, "REPOSITORY_NOT_FOUND", { cwd });
-    }
-}
 export class WorktreeCreationFailedError extends RunAgentError {
     constructor(cause) {
         super("Failed to create git worktree", "WORKTREE_CREATION_FAILED", { cause });
     }
 }
-export class DaemonUnavailableError extends RunAgentError {
-    constructor(cause) {
-        super("CodeDeck daemon is unavailable", "DAEMON_UNAVAILABLE", { cause });
-    }
-}
-export class ProtocolError extends RunAgentError {
-    constructor(message, cause) {
-        super(message, "PROTOCOL_ERROR", { cause });
-    }
+export function errorMessage(e) {
+    return e instanceof Error ? e.message : String(e);
 }
 // Order matters: the most specific signatures first. "EPIPE" alone is LAST —
 // it is a substring task output can legitimately contain (e.g. a test grepping

package/dist/core/errors.js.map

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

package/dist/daemon/daemon.js

@@ -21,7 +21,7 @@ import { readSessionProcessMetadata } from "../drivers/session-runtime.js";
 import { loadConfig, resolveDefaultSandbox } from "../config/config.js";
 import { invalidWebHostMessage, resolveWebHost } from "../config/web-host.js";
 import { invalidWebPortMessage, resolveWebPort } from "../config/web-port.js";
-import { classifyFailure, isStoreBusy, RunAgentError } from "../core/errors.js";
+import { classifyFailure, errorMessage, isStoreBusy, RunAgentError } from "../core/errors.js";
 import { parseRole } from "../core/roles.js";
 import { getCachedOrDiscoverModels } from "../core/models.js";
 import { aggregateRunUsage } from "../core/run-usage.js";
@@ -97,6 +97,7 @@ class Daemon {
     nativeLinks;
     registry = getRegistry();
     server;
+    boundPaths;
     subscribers = new Map(); // sessionId -> sockets
     startTime = Date.now();
     startupReconcilePromise = Promise.resolve();
@@ -261,7 +262,7 @@ class Daemon {
     queueReleasedTranscriptCursorCleanup(sessionId) {
         queueMicrotask(() => {
             void this.cleanupReleasedTranscriptCursors(sessionId).catch((error) => {
-                const detail = error instanceof Error ? error.message : String(error);
+                const detail = errorMessage(error);
                 try {
                     fs.appendFileSync(getPaths().daemonLog, `[${new Date().toISOString()}] usage cursor cleanup failed session=${sessionId}: ${detail}\n`);
                 }
@@ -315,7 +316,7 @@ class Daemon {
                 await this.handleRequest(req, socket);
             }
             catch (e) {
-                const res = { id: req.id, error: { code: "INTERNAL", message: e instanceof Error ? e.message : String(e) } };
+                const res = { id: req.id, error: { code: "INTERNAL", message: errorMessage(e) } };
                 try {
                     socket.write(JSON.stringify(res) + "\n");
                 }
@@ -326,6 +327,10 @@ class Daemon {
             this.server.listen(paths.daemonSock, () => resolve());
             this.server.on("error", reject);
         });
+        this.boundPaths = {
+            sock: paths.daemonSock,
+            pid: paths.daemonPid,
+        };
         // Write pid file
         try {
             fs.writeFileSync(paths.daemonPid, String(process.pid), "utf-8");
@@ -554,7 +559,7 @@ class Daemon {
                 this.sessions.update(sessionId, { completedAt: heal.endedAt });
         }
         catch (error) {
-            appendDaemonLog(`heal timestamps for ${sessionId} failed: ${error instanceof Error ? error.message : String(error)}`);
+            appendDaemonLog(`heal timestamps for ${sessionId} failed: ${errorMessage(error)}`);
         }
     }
     async reconcileOpenUsage(sessionId, nativeIds) {
@@ -605,7 +610,7 @@ class Daemon {
             return true;
         }
         catch (error) {
-            const detail = error instanceof Error ? error.message : String(error);
+            const detail = errorMessage(error);
             try {
                 fs.appendFileSync(getPaths().daemonLog, `[${new Date().toISOString()}] usage reconcile failed session=${sessionId}: ${detail}\n`);
             }
@@ -626,6 +631,23 @@ class Daemon {
     releaseSessionId(sessionId) {
         this.reservedSessionIds.delete(sessionId);
     }
+    resolveRegisteredAgent(rawAgent) {
+        const agent = (normalizeAgentId(rawAgent) ?? rawAgent);
+        return { agent, registered: this.registry.has(agent) };
+    }
+    handleClaimRequest(requestedSessionId, operation, result, send) {
+        try {
+            const sessionId = this.sessions.get(requestedSessionId)?.id ?? requestedSessionId;
+            send(result(operation(sessionId)));
+        }
+        catch (error) {
+            if (error instanceof RunAgentError) {
+                send({ error: { code: error.code, message: error.message, details: error.details } });
+                return;
+            }
+            throw error;
+        }
+    }
     async handleRequest(req, socket) {
         const { id, method, params } = req;
         const send = (res) => {
@@ -634,11 +656,13 @@ class Daemon {
             }
             catch { }
         };
+        const sendSessionNotFound = (sessionId) => send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${sessionId} not found` } });
+        const sendShuttingDown = () => send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
         // Power-shutdown guard: while draining, refuse new work so a send/stop
         // cannot race the interrupted persist. daemon.stop is the shutdown
         // trigger itself, so it stays admitted (idempotent via handleShutdown).
         if (this.shuttingDown && method !== "daemon.stop") {
-            send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
+            sendShuttingDown();
             return;
         }
         try {
@@ -653,8 +677,8 @@ class Daemon {
                     const cwdIn = p.cwd || process.cwd();
                     const cfg = loadConfig();
                     const rawAgent = p.agent || cfg.defaultAgent || "claude";
-                    let agent = (normalizeAgentId(rawAgent) ?? rawAgent);
-                    if (!this.registry.has(agent)) {
+                    const { agent, registered } = this.resolveRegisteredAgent(rawAgent);
+                    if (!registered) {
                         send({ error: { code: "AGENT_NOT_FOUND", message: `Unknown agent ${agent}` } });
                         return;
                     }
@@ -682,7 +706,7 @@ class Daemon {
                     }
                     if (this.shuttingDown) {
                         this.releaseSessionId(sessionId);
-                        send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
+                        sendShuttingDown();
                         return;
                     }
                     if (gitInfo)
@@ -694,7 +718,7 @@ class Daemon {
                             const wt = await createWorktree({ repoRoot: gitInfo.root, sessionId, prompt, name: p.name });
                             if (this.shuttingDown) {
                                 this.releaseSessionId(sessionId);
-                                send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
+                                sendShuttingDown();
                                 return;
                             }
                             worktree = wt.path;
@@ -704,7 +728,7 @@ class Daemon {
                         }
                         catch (e) {
                             this.releaseSessionId(sessionId);
-                            send({ error: { code: "WORKTREE_FAILED", message: e instanceof Error ? e.message : String(e) } });
+                            send({ error: { code: "WORKTREE_FAILED", message: errorMessage(e) } });
                             return;
                         }
                     }
@@ -741,13 +765,12 @@ class Daemon {
                         this.releaseSessionId(sessionId);
                     }
                     // Start driver async (don't block response too long)
-                    // But we need to start before returning? Return quickly then start
                     send({ result: { session } });
                     // Now start driver in background
                     this.startDriverForSession(sessionId, prompt, p.model).catch((e) => {
                         if (this.shuttingDown)
                             return;
-                        const msg = e instanceof Error ? e.message : String(e);
+                        const msg = errorMessage(e);
                         const failure = classifyFailure(msg);
                         const failEv = {
                             type: "session.failed",
@@ -769,8 +792,8 @@ class Daemon {
                     const p = params;
                     const cwdIn = p.cwd || process.cwd();
                     const rawAgent = p.agent || "claude";
-                    const agent = (normalizeAgentId(rawAgent) ?? rawAgent);
-                    if (!this.registry.has(agent)) {
+                    const { agent, registered } = this.resolveRegisteredAgent(rawAgent);
+                    if (!registered) {
                         send({ error: { code: "AGENT_NOT_FOUND", message: `Unknown agent ${agent}` } });
                         return;
                     }
@@ -779,7 +802,7 @@ class Daemon {
                     let baseCommit = p.baseCommit;
                     const gitInfo = await getGitInfo(cwd);
                     if (this.shuttingDown) {
-                        send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
+                        sendShuttingDown();
                         return;
                     }
                     const matchingSession = typeof p.resume === "string" && p.resume.length > 0
@@ -808,8 +831,7 @@ class Daemon {
                             agent,
                             nativeSessionId: p.resume,
                         };
-                        this.events.append(revived.id, event);
-                        this.broadcast(revived.id, event);
+                        this.emit(revived.id, event);
                         send({ result: { session: revived } });
                         break;
                     }
@@ -851,7 +873,7 @@ class Daemon {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     let pidStartTime = p.pidStartTime;
@@ -884,7 +906,7 @@ class Daemon {
                     }
                     const session = this.sessions.get(p.id);
                     if (!session) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     if (session.origin !== "open") {
@@ -901,7 +923,7 @@ class Daemon {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     // Release owns the terminal outcome: a queued message must not
@@ -953,8 +975,7 @@ class Daemon {
                             timestamp: new Date().toISOString(),
                             reason: "released",
                         };
-                    this.events.append(s.id, ev);
-                    this.broadcast(s.id, ev);
+                    this.emit(s.id, ev);
                     const updated = this.sessions.get(s.id);
                     send({ result: { session: updated } });
                     break;
@@ -964,7 +985,6 @@ class Daemon {
                     const all = p?.all;
                     const list = this.sessions.list(100, all).map(withLiveStatus);
                     const hidden = all ? 0 : this.sessions.countHiddenByWindow();
-                    // Enrich with last event?
                     send({ result: { sessions: list, hidden } });
                     break;
                 }
@@ -972,7 +992,7 @@ class Daemon {
                     const p = params;
                     const stored = this.sessions.get(p.id);
                     if (!stored) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     const s = withLiveStatus(stored);
@@ -985,7 +1005,7 @@ class Daemon {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     if (!p.name || !p.name.trim()) {
@@ -1006,7 +1026,7 @@ class Daemon {
                     const message = validated.message;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     if (s.origin === "open") {
@@ -1053,7 +1073,7 @@ class Daemon {
                             this.sessions.update(s.id, { pendingMessage: message, pendingAt });
                         }
                         catch (e) {
-                            send({ error: { code: "SEND_FAILED", message: e instanceof Error ? e.message : String(e) } });
+                            send({ error: { code: "SEND_FAILED", message: errorMessage(e) } });
                             return;
                         }
                         const queuedEvent = {
@@ -1089,7 +1109,7 @@ class Daemon {
                         send({ result: { ok: true, queued: false } });
                     }
                     catch (e) {
-                        const errText = e instanceof Error ? e.message : String(e);
+                        const errText = errorMessage(e);
                         const code = e instanceof Error && e.code === "SERVICE_UNAVAILABLE"
                             ? "SERVICE_UNAVAILABLE"
                             : this.shuttingDown ? "SERVICE_UNAVAILABLE" : "SEND_FAILED";
@@ -1113,7 +1133,7 @@ class Daemon {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     // Stop cancels a queued message on every exit (explicit cancel),
@@ -1126,10 +1146,7 @@ class Daemon {
                     }
                     const handle = driver.getHandle?.(s.id);
                     const hasRuntime = handle !== undefined;
-                    const liveIdentity = s.pid != null &&
-                        s.pidStartTime != null &&
-                        processAlive(s.pid) &&
-                        processStartTime(s.pid) === s.pidStartTime;
+                    const liveIdentity = livePidIdentity(s);
                     if (isTerminalStatus(s.status) && !hasRuntime && !liveIdentity) {
                         send({ error: { code: "SESSION_NOT_RUNNING", message: `Session ${s.id} is ${s.status}` } });
                         return;
@@ -1155,7 +1172,7 @@ class Daemon {
                             pidStartTime: s.pidStartTime,
                         });
                         if (this.shuttingDown) {
-                            send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
+                            sendShuttingDown();
                             return;
                         }
                         const last = this.events.last(s.id);
@@ -1177,8 +1194,7 @@ class Daemon {
                                 reason: "stopped",
                                 exitCode: 130,
                             };
-                            this.events.append(s.id, ev);
-                            this.broadcast(s.id, ev);
+                            this.emit(s.id, ev);
                         }
                         // A send may have persisted a slot after the entry clear (it saw a
                         // live turn before this stop took the lock): stop wins, clear again.
@@ -1187,14 +1203,14 @@ class Daemon {
                     }
                     catch (e) {
                         if (this.shuttingDown) {
-                            send({ error: { code: "SERVICE_UNAVAILABLE", message: "daemon is shutting down" } });
+                            sendShuttingDown();
                             return;
                         }
                         try {
                             this.sessions.setStatus(s.id, previousStatus);
                         }
                         catch { }
-                        send({ error: { code: "STOP_FAILED", message: e instanceof Error ? e.message : String(e) } });
+                        send({ error: { code: "STOP_FAILED", message: errorMessage(e) } });
                     }
                     finally {
                         if (!this.shuttingDown)
@@ -1206,7 +1222,7 @@ class Daemon {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     if (p.follow) {
@@ -1230,7 +1246,7 @@ class Daemon {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     // A late subscriber must not wait forever for a broadcast that already
@@ -1250,23 +1266,14 @@ class Daemon {
                         catch { }
                         return;
                     }
-                    // Send buffered events first?
-                    // Then keep streaming
                     this.addSubscriber(s.id, socket);
-                    // Send ack? keep open
-                    // Optionally send done when session terminal? We'll handle via broadcast.
-                    // Don't send immediate response; just keep socket open for events
-                    // But we should send an initial ack to confirm subscription?
-                    // Use a separate message to indicate subscription started
-                    // Let's not send anything; client will just wait for events
-                    // Keep socket open
                     return;
                 }
                 case "session.diff": {
                     const p = params;
                     const s = this.sessions.get(p.id);
                     if (!s) {
-                        send({ error: { code: "SESSION_NOT_FOUND", message: `Session ${p.id} not found` } });
+                        sendSessionNotFound(p.id);
                         return;
                     }
                     const diff = await getDiff({ cwd: s.cwd, worktree: s.worktree, baseCommit: s.baseCommit, repository: s.repository });
@@ -1275,56 +1282,17 @@ class Daemon {
                 }
                 case "claims.add": {
                     const p = params;
-                    try {
-                        const sessionId = this.sessions.get(p.sessionId)?.id ?? p.sessionId;
-                        const claim = this.claims.add(sessionId, p.pathGlob, p.reason);
-                        send({ result: { claim } });
-                    }
-                    catch (error) {
-                        if (error instanceof RunAgentError) {
-                            send({ error: { code: error.code, message: error.message, details: error.details } });
-                            return;
-                        }
-                        throw error;
-                    }
+                    this.handleClaimRequest(p.sessionId, (sessionId) => this.claims.add(sessionId, p.pathGlob, p.reason), (claim) => ({ result: { claim } }), send);
                     break;
                 }
                 case "claims.query": {
                     const p = params;
-                    try {
-                        const sessionId = this.sessions.get(p.sessionId)?.id ?? p.sessionId;
-                        const claims = this.claims.query(sessionId, p.path);
-                        send({ result: { claims } });
-                    }
-                    catch (error) {
-                        if (error instanceof RunAgentError) {
-                            send({ error: { code: error.code, message: error.message, details: error.details } });
-                            return;
-                        }
-                        throw error;
-                    }
+                    this.handleClaimRequest(p.sessionId, (sessionId) => this.claims.query(sessionId, p.path), (claims) => ({ result: { claims } }), send);
                     break;
                 }
                 case "claims.release": {
                     const p = params;
-                    try {
-                        const sessionId = this.sessions.get(p.sessionId)?.id ?? p.sessionId;
-                        const claim = this.claims.release(sessionId, p.claimId);
-                        send({ result: { claim } });
-                    }
-                    catch (error) {
-                        if (error instanceof RunAgentError) {
-                            send({ error: { code: error.code, message: error.message, details: error.details } });
-                            return;
-                        }
-                        throw error;
-                    }
-                    break;
-                }
-                case "daemon.status": {
-                    const paths = getPaths();
-                    let uptime = Date.now() - this.startTime;
-                    send({ result: { running: true, pid: process.pid, uptime, db: paths.db } });
+                    this.handleClaimRequest(p.sessionId, (sessionId) => this.claims.release(sessionId, p.claimId), (claim) => ({ result: { claim } }), send);
                     break;
                 }
                 case "doctor": {
@@ -1461,7 +1429,7 @@ class Daemon {
                         send({ result });
                     }
                     catch (error) {
-                        send({ error: { code: "USAGE_QUERY_ERROR", message: error instanceof Error ? error.message : String(error) } });
+                        send({ error: { code: "USAGE_QUERY_ERROR", message: errorMessage(error) } });
                     }
                     break;
                 }
@@ -1475,7 +1443,7 @@ class Daemon {
                             send({ error: { code: error.code, message: error.message, ...(error.details ? { details: error.details } : {}) } });
                         }
                         else {
-                            send({ error: { code: "WEB_START_FAILED", message: error instanceof Error ? error.message : String(error) } });
+                            send({ error: { code: "WEB_START_FAILED", message: errorMessage(error) } });
                         }
                     }
                     break;
@@ -1531,6 +1499,10 @@ class Daemon {
             }
         }
     }
+    emit(sessionId, event) {
+        this.events.append(sessionId, event);
+        this.broadcast(sessionId, event);
+    }
     webHost() {
         this.web ??= new WebSupervisor({ log: appendDaemonLog, spawnChild: this.spawnWebChild });
         return this.web;
@@ -1549,7 +1521,7 @@ class Daemon {
             appendDaemonLog(invalidWebHostMessage(invalidHost));
         this.webHost()
             .ensure({ preferredPort: port, preferredHost: host })
-            .catch((error) => appendDaemonLog(`web autostart failed: ${error instanceof Error ? error.message : String(error)}`));
+            .catch((error) => appendDaemonLog(`web autostart failed: ${errorMessage(error)}`));
     }
     async startDriverForSession(sessionId, prompt, model) {
         if (this.shuttingDown)
@@ -1564,8 +1536,7 @@ class Daemon {
             return;
         this.sessions.update(sessionId, { status: "working" });
         const turnEvent = { type: "turn.started", sessionId, timestamp: new Date().toISOString(), prompt };
-        this.events.append(sessionId, turnEvent);
-        this.broadcast(sessionId, turnEvent);
+        this.emit(sessionId, turnEvent);
         const drvSession = await driver.start({
             sessionId,
             prompt,
@@ -1632,10 +1603,10 @@ class Daemon {
         catch { }
     }
     /**
-    +   * Starts a resumed turn; caller MUST hold sessionLocks for the session.
-    +   * Shared by session.send (immediate) and tryDispatch (queued) so both
-    +   * paths emit the same frames in the same order.
-    +   */
+     * Starts a resumed turn; caller MUST hold sessionLocks for the session.
+     * Shared by session.send (immediate) and tryDispatch (queued) so both
+     * paths emit the same frames in the same order.
+     */
     async runResumeTurn(s, message) {
         const driver = this.registry.get(s.agent);
         if (this.shuttingDown) {
@@ -1650,8 +1621,7 @@ class Daemon {
             timestamp: new Date().toISOString(),
             prompt: message,
         };
-        this.events.append(s.id, turnEvent);
-        this.broadcast(s.id, turnEvent);
+        this.emit(s.id, turnEvent);
         const drvSession = {
             id: s.id,
             runId: s.runId ?? undefined,
@@ -1756,7 +1726,7 @@ class Daemon {
             return true;
         }
         catch (e) {
-            const errText = e instanceof Error ? e.message : String(e);
+            const errText = errorMessage(e);
             const unavailable = e?.code === "SERVICE_UNAVAILABLE" || this.shuttingDown;
             if (!unavailable) {
                 const failure = classifyFailure(errText);
@@ -1859,7 +1829,7 @@ class Daemon {
                 return;
             // A driver exception mid-stream is a harness/pipe failure, not task
             // output — classify so agents can retry instead of blaming the work.
-            const msg = e instanceof Error ? e.message : String(e);
+            const msg = errorMessage(e);
             const failure = classifyFailure(msg);
             const errEv = {
                 type: "session.failed",
@@ -1869,8 +1839,7 @@ class Daemon {
                 failure,
                 raw: e,
             };
-            this.events.append(sessionId, errEv);
-            this.broadcast(sessionId, errEv);
+            this.emit(sessionId, errEv);
             this.sessions.setStatus(sessionId, "failed", { lastEvent: msg.slice(0, 200), failure });
             return;
         }
@@ -1902,8 +1871,7 @@ class Daemon {
                 };
                 const error = sess.lastEvent || "event stream ended without a terminal event";
                 const errEv = { type: "session.failed", sessionId, timestamp: new Date().toISOString(), error, failure };
-                this.events.append(sessionId, errEv);
-                this.broadcast(sessionId, errEv);
+                this.emit(sessionId, errEv);
                 this.sessions.setStatus(sessionId, "failed", { lastEvent: error.slice(0, 200), failure });
             }
         }
@@ -2068,25 +2036,23 @@ class Daemon {
             handle.exec("PRAGMA wal_checkpoint(TRUNCATE)");
         }
         catch { }
-        try {
-            const paths = getPaths();
-            try {
-                fs.unlinkSync(paths.daemonSock);
-            }
-            catch { }
-            try {
-                fs.unlinkSync(paths.daemonPid);
-            }
-            catch { }
+        if (this.boundPaths) {
             try {
-                this.server?.close();
+                fs.unlinkSync(this.boundPaths.sock);
             }
             catch { }
             try {
-                this.db.close();
+                fs.unlinkSync(this.boundPaths.pid);
             }
             catch { }
         }
+        try {
+            this.server?.close();
+        }
+        catch { }
+        try {
+            this.db.close();
+        }
         catch { }
     }
     safeListActive() {
@@ -2152,8 +2118,7 @@ class Daemon {
                 failure,
                 raw: { reason },
             };
-            this.events.append(s.id, event);
-            this.broadcast(s.id, event);
+            this.emit(s.id, event);
             this.sessions.setStatus(s.id, "interrupted", { lastEvent: detail.slice(0, 200), failure });
         }
         catch { }