@staff0rd/assist 0.245.0 → 0.245.2

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.245.0",
+  version: "0.245.2",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4098,7 +4098,14 @@ function startWebServer(label2, port, handler, initialPath) {
 
 // src/commands/sessions/daemon/ensureDaemonRunning.ts
 import { spawn as spawn4 } from "child_process";
-import { mkdirSync as mkdirSync4, openSync } from "fs";
+import {
+  closeSync,
+  mkdirSync as mkdirSync4,
+  openSync,
+  statSync,
+  unlinkSync as unlinkSync4,
+  writeSync
+} from "fs";
 
 // src/commands/sessions/daemon/connectToDaemon.ts
 import * as net from "net";
@@ -4111,7 +4118,8 @@ var daemonPaths = {
   dir: DAEMON_DIR,
   socket: process.platform === "win32" ? "\\\\.\\pipe\\assist-sessions-daemon" : join15(DAEMON_DIR, "daemon.sock"),
   log: join15(DAEMON_DIR, "daemon.log"),
-  pid: join15(DAEMON_DIR, "daemon.pid")
+  pid: join15(DAEMON_DIR, "daemon.pid"),
+  spawnLock: join15(DAEMON_DIR, "spawn.lock")
 };
 
 // src/commands/sessions/daemon/connectToDaemon.ts
@@ -4134,9 +4142,19 @@ async function isDaemonRunning() {
 // src/commands/sessions/daemon/ensureDaemonRunning.ts
 var SPAWN_TIMEOUT_MS = 1e4;
 var RETRY_DELAY_MS = 200;
-async function ensureDaemonRunning() {
+var STALE_LOCK_MS = SPAWN_TIMEOUT_MS + 5e3;
+async function ensureDaemonRunning(reason = "unspecified") {
   if (await isDaemonRunning()) return;
-  spawnDaemon();
+  mkdirSync4(daemonPaths.dir, { recursive: true });
+  const holdsLock = acquireSpawnLock();
+  if (holdsLock) spawnDaemon(reason);
+  try {
+    await waitForDaemon();
+  } finally {
+    if (holdsLock) releaseSpawnLock();
+  }
+}
+async function waitForDaemon() {
   const deadline = Date.now() + SPAWN_TIMEOUT_MS;
   while (Date.now() < deadline) {
     await delay(RETRY_DELAY_MS);
@@ -4146,12 +4164,44 @@ async function ensureDaemonRunning() {
     `Sessions daemon did not start within ${SPAWN_TIMEOUT_MS / 1e3}s; see ${daemonPaths.log}`
   );
 }
-function spawnDaemon() {
-  mkdirSync4(daemonPaths.dir, { recursive: true });
+function acquireSpawnLock() {
+  if (tryCreateLock()) return true;
+  if (!isLockStale()) return false;
+  try {
+    unlinkSync4(daemonPaths.spawnLock);
+  } catch {
+  }
+  return tryCreateLock();
+}
+function tryCreateLock() {
+  try {
+    const fd = openSync(daemonPaths.spawnLock, "wx");
+    writeSync(fd, String(process.pid));
+    closeSync(fd);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function isLockStale() {
+  try {
+    return Date.now() - statSync(daemonPaths.spawnLock).mtimeMs > STALE_LOCK_MS;
+  } catch {
+    return true;
+  }
+}
+function releaseSpawnLock() {
+  try {
+    unlinkSync4(daemonPaths.spawnLock);
+  } catch {
+  }
+}
+function spawnDaemon(reason) {
   const log = openSync(daemonPaths.log, "a");
   const child = spawn4(process.execPath, [process.argv[1], "daemon", "run"], {
     detached: true,
-    stdio: ["ignore", log, log]
+    stdio: ["ignore", log, log],
+    env: { ...process.env, ASSIST_DAEMON_SPAWN_REASON: reason }
   });
   child.unref();
 }
@@ -4500,7 +4550,7 @@ function handleSocket(ws, ctx) {
 }
 async function openDaemonConnection(ws, ctx) {
   try {
-    await ensureDaemonRunning();
+    await ensureDaemonRunning("web socket connection");
     const conn = await connectToDaemon();
     relayDaemonLines(conn, ws, ctx.repoCwd);
     return conn;
@@ -4554,7 +4604,7 @@ function withRepoCwd(line, repoCwd) {
 
 // src/commands/sessions/web/index.ts
 async function web(options2) {
-  await ensureDaemonRunning();
+  await ensureDaemonRunning("web server start");
   const port = Number.parseInt(options2.port, 10);
   const server = startWebServer(
     "Assist",
@@ -4926,7 +4976,7 @@ import chalk51 from "chalk";
 
 // src/commands/backlog/add/shared.ts
 import { spawnSync } from "child_process";
-import { mkdtempSync, readFileSync as readFileSync14, unlinkSync as unlinkSync4, writeFileSync as writeFileSync13 } from "fs";
+import { mkdtempSync, readFileSync as readFileSync14, unlinkSync as unlinkSync5, writeFileSync as writeFileSync13 } from "fs";
 import { tmpdir } from "os";
 import { join as join17 } from "path";
 import enquirer6 from "enquirer";
@@ -4973,11 +5023,11 @@ function openEditor() {
   writeFileSync13(filePath, "");
   const result = spawnSync(editor, [filePath], { stdio: "inherit" });
   if (result.status !== 0) {
-    unlinkSync4(filePath);
+    unlinkSync5(filePath);
     return void 0;
   }
   const content = readFileSync14(filePath, "utf-8").trim();
-  unlinkSync4(filePath);
+  unlinkSync5(filePath);
   return content || void 0;
 }
 async function promptAcceptanceCriteria() {
@@ -8306,7 +8356,7 @@ function registerDevlog(program2) {
 }
 
 // src/commands/dotnet/checkBuildLocks.ts
-import { closeSync, openSync as openSync2, readdirSync as readdirSync2 } from "fs";
+import { closeSync as closeSync2, openSync as openSync2, readdirSync as readdirSync2 } from "fs";
 import { join as join25 } from "path";
 import chalk95 from "chalk";
 
@@ -8338,7 +8388,7 @@ function isLockedDll(debugDir) {
     const dllPath = join25(debugDir, file);
     try {
       const fd = openSync2(dllPath, "r+");
-      closeSync(fd);
+      closeSync2(fd);
     } catch {
       return dllPath;
     }
@@ -8428,7 +8478,7 @@ function collectAllDeps(node) {
 }
 
 // src/commands/dotnet/findContainingSolutions.ts
-import { readdirSync as readdirSync3, readFileSync as readFileSync22, statSync } from "fs";
+import { readdirSync as readdirSync3, readFileSync as readFileSync22, statSync as statSync2 } from "fs";
 import path22 from "path";
 function findSlnFiles(dir, maxDepth, depth = 0) {
   if (depth > maxDepth) return [];
@@ -8444,7 +8494,7 @@ function findSlnFiles(dir, maxDepth, depth = 0) {
       continue;
     const full = path22.join(dir, entry);
     try {
-      const stat = statSync(full);
+      const stat = statSync2(full);
       if (stat.isFile() && entry.endsWith(".sln")) {
         results.push(full);
       } else if (stat.isDirectory()) {
@@ -8781,7 +8831,7 @@ function parseInspectReport(json) {
 
 // src/commands/dotnet/runInspectCode.ts
 import { execSync as execSync24 } from "child_process";
-import { existsSync as existsSync29, readFileSync as readFileSync23, unlinkSync as unlinkSync5 } from "fs";
+import { existsSync as existsSync29, readFileSync as readFileSync23, unlinkSync as unlinkSync6 } from "fs";
 import { tmpdir as tmpdir3 } from "os";
 import path25 from "path";
 import chalk102 from "chalk";
@@ -8817,7 +8867,7 @@ function runInspectCode(slnPath, include, swea) {
     process.exit(1);
   }
   const xml = readFileSync23(reportPath, "utf-8");
-  unlinkSync5(reportPath);
+  unlinkSync6(reportPath);
   return xml;
 }
 
@@ -8943,7 +8993,7 @@ function aggregateCommitters(authorLists) {
 
 // src/shared/runGhGraphql.ts
 import { spawnSync as spawnSync2 } from "child_process";
-import { unlinkSync as unlinkSync6, writeFileSync as writeFileSync18 } from "fs";
+import { unlinkSync as unlinkSync7, writeFileSync as writeFileSync18 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
 import { join as join27 } from "path";
 function buildArgs(queryFile, vars) {
@@ -8964,7 +9014,7 @@ function runGhGraphql(mutation, vars) {
     if (result.status !== 0) throw new Error(result.stderr || result.stdout);
     return result.stdout;
   } finally {
-    unlinkSync6(queryFile);
+    unlinkSync7(queryFile);
   }
 }
 
@@ -10258,12 +10308,12 @@ import { execSync as execSync32 } from "child_process";
 
 // src/commands/prs/resolveCommentWithReply.ts
 import { execSync as execSync31 } from "child_process";
-import { unlinkSync as unlinkSync8, writeFileSync as writeFileSync21 } from "fs";
+import { unlinkSync as unlinkSync9, writeFileSync as writeFileSync21 } from "fs";
 import { tmpdir as tmpdir5 } from "os";
 import { join as join32 } from "path";
 
 // src/commands/prs/loadCommentsCache.ts
-import { existsSync as existsSync33, readFileSync as readFileSync28, unlinkSync as unlinkSync7 } from "fs";
+import { existsSync as existsSync33, readFileSync as readFileSync28, unlinkSync as unlinkSync8 } from "fs";
 import { join as join31 } from "path";
 import { parse as parse2 } from "yaml";
 function getCachePath(prNumber) {
@@ -10280,7 +10330,7 @@ function loadCommentsCache(prNumber) {
 function deleteCommentsCache(prNumber) {
   const cachePath = getCachePath(prNumber);
   if (existsSync33(cachePath)) {
-    unlinkSync7(cachePath);
+    unlinkSync8(cachePath);
     console.log("No more unresolved line comments. Cache dropped.");
   }
 }
@@ -10302,7 +10352,7 @@ function resolveThread(threadId) {
       { stdio: ["inherit", "pipe", "inherit"] }
     );
   } finally {
-    unlinkSync8(queryFile);
+    unlinkSync9(queryFile);
   }
 }
 function requireCache(prNumber) {
@@ -10382,7 +10432,7 @@ import { stringify } from "yaml";
 
 // src/commands/prs/fetchThreadIds.ts
 import { execSync as execSync33 } from "child_process";
-import { unlinkSync as unlinkSync9, writeFileSync as writeFileSync22 } from "fs";
+import { unlinkSync as unlinkSync10, writeFileSync as writeFileSync22 } from "fs";
 import { tmpdir as tmpdir6 } from "os";
 import { join as join33 } from "path";
 var THREAD_QUERY = `query($owner: String!, $repo: String!, $prNumber: Int!) { repository(owner: $owner, name: $repo) { pullRequest(number: $prNumber) { reviewThreads(first: 100) { nodes { id isResolved comments(first: 100) { nodes { databaseId } } } } } } }`;
@@ -10407,7 +10457,7 @@ function fetchThreadIds(org, repo, prNumber) {
     }
     return { threadMap, resolvedThreadIds };
   } finally {
-    unlinkSync9(queryFile);
+    unlinkSync10(queryFile);
   }
 }
 
@@ -13315,10 +13365,10 @@ async function handlePostSynthesis(synthesisPath, options2) {
 }
 
 // src/commands/review/prepareReviewDir.ts
-import { existsSync as existsSync36, mkdirSync as mkdirSync11, unlinkSync as unlinkSync10, writeFileSync as writeFileSync25 } from "fs";
+import { existsSync as existsSync36, mkdirSync as mkdirSync11, unlinkSync as unlinkSync11, writeFileSync as writeFileSync25 } from "fs";
 function clearReviewFiles(paths) {
   for (const path54 of [paths.claudePath, paths.codexPath, paths.synthesisPath]) {
-    if (existsSync36(path54)) unlinkSync10(path54);
+    if (existsSync36(path54)) unlinkSync11(path54);
   }
 }
 function prepareReviewDir(paths, requestBody, force) {
@@ -13386,11 +13436,11 @@ async function runBacklogSession(synthesisPath) {
 }
 
 // src/commands/review/cachedReviewerResult.ts
-import { statSync as statSync2 } from "fs";
+import { statSync as statSync3 } from "fs";
 function cachedReviewerResult(name, outputPath) {
   let size;
   try {
-    size = statSync2(outputPath).size;
+    size = statSync3(outputPath).size;
   } catch {
     return null;
   }
@@ -13603,7 +13653,7 @@ function printReviewerFailures(results) {
 }
 
 // src/commands/review/runAndSynthesise.ts
-import { existsSync as existsSync38, unlinkSync as unlinkSync12 } from "fs";
+import { existsSync as existsSync38, unlinkSync as unlinkSync13 } from "fs";
 
 // src/commands/review/buildReviewerStdin.ts
 var REVIEW_PROMPT = `You are acting as a reviewer for a proposed code change made by another engineer. The full review request \u2014 branch, base, changed files, and unified diff \u2014 is in request.md in the current working directory.
@@ -14021,7 +14071,7 @@ function resolveClaude(args) {
 }
 
 // src/commands/review/runCodexReviewer.ts
-import { existsSync as existsSync37, unlinkSync as unlinkSync11 } from "fs";
+import { existsSync as existsSync37, unlinkSync as unlinkSync12 } from "fs";
 
 // src/commands/review/parseCodexEvent.ts
 function isItemStarted(value) {
@@ -14076,7 +14126,7 @@ async function runCodexReviewer(spec) {
     }
   });
   if (result.exitCode !== 0 && existsSync37(spec.outputPath)) {
-    unlinkSync11(spec.outputPath);
+    unlinkSync12(spec.outputPath);
   }
   return finaliseReviewerRun({ ...spec, command }, spinner, result);
 }
@@ -14224,7 +14274,7 @@ async function runAndSynthesise(args) {
     return { ok: false, failures };
   }
   if (anyFresh && existsSync38(paths.synthesisPath)) {
-    unlinkSync12(paths.synthesisPath);
+    unlinkSync13(paths.synthesisPath);
   }
   const synthesisResult = await synthesise(paths, { multi });
   if (synthesisResult.exitCode !== 0) failures.push(synthesisResult);
@@ -14999,7 +15049,7 @@ function registerSql(program2) {
 }
 
 // src/commands/transcript/shared.ts
-import { existsSync as existsSync39, readdirSync as readdirSync6, statSync as statSync3 } from "fs";
+import { existsSync as existsSync39, readdirSync as readdirSync6, statSync as statSync4 } from "fs";
 import { basename as basename6, join as join37, relative as relative2 } from "path";
 import * as readline2 from "readline";
 var DATE_PREFIX_REGEX = /^\d{4}-\d{2}-\d{2}/;
@@ -15019,7 +15069,7 @@ function collectFiles(dir, extension) {
   const results = [];
   for (const entry of readdirSync6(dir)) {
     const fullPath = join37(dir, entry);
-    if (statSync3(fullPath).isDirectory()) {
+    if (statSync4(fullPath).isDirectory()) {
       results.push(...collectFiles(fullPath, extension));
     } else if (entry.endsWith(extension)) {
       results.push(fullPath);
@@ -15893,7 +15943,7 @@ function status() {
 }
 
 // src/commands/voice/stop.ts
-import { existsSync as existsSync47, readFileSync as readFileSync37, unlinkSync as unlinkSync13 } from "fs";
+import { existsSync as existsSync47, readFileSync as readFileSync37, unlinkSync as unlinkSync14 } from "fs";
 function stop2() {
   if (!existsSync47(voicePaths.pid)) {
     console.log("Voice daemon is not running (no PID file)");
@@ -15907,12 +15957,12 @@ function stop2() {
     console.log(`Voice daemon (PID ${pid}) is not running`);
   }
   try {
-    unlinkSync13(voicePaths.pid);
+    unlinkSync14(voicePaths.pid);
   } catch {
   }
   try {
     const lockFile = getLockFile();
-    if (existsSync47(lockFile)) unlinkSync13(lockFile);
+    if (existsSync47(lockFile)) unlinkSync14(lockFile);
   } catch {
   }
   console.log("Voice daemon stopped");
@@ -16134,7 +16184,7 @@ async function auth() {
 
 // src/commands/roam/postRoamActivity.ts
 import { execFileSync as execFileSync7 } from "child_process";
-import { readdirSync as readdirSync7, readFileSync as readFileSync38, statSync as statSync4 } from "fs";
+import { readdirSync as readdirSync7, readFileSync as readFileSync38, statSync as statSync5 } from "fs";
 import { join as join48 } from "path";
 function findPortFile(roamDir) {
   let entries;
@@ -16146,7 +16196,7 @@ function findPortFile(roamDir) {
   const candidates = entries.filter((name) => /^roam-local-api(-[^.]+)?\.port$/.test(name)).map((name) => {
     const path54 = join48(roamDir, name);
     try {
-      return { path: path54, mtimeMs: statSync4(path54).mtimeMs };
+      return { path: path54, mtimeMs: statSync5(path54).mtimeMs };
     } catch {
       return void 0;
     }
@@ -16495,7 +16545,7 @@ function link2() {
 }
 
 // src/commands/run/remove.ts
-import { existsSync as existsSync49, unlinkSync as unlinkSync14 } from "fs";
+import { existsSync as existsSync49, unlinkSync as unlinkSync15 } from "fs";
 import { join as join51 } from "path";
 function findRemoveIndex() {
   const idx = process.argv.indexOf("remove");
@@ -16513,7 +16563,7 @@ function parseRemoveName() {
 function deleteCommandFile(name) {
   const filePath = join51(".claude", "commands", `${name}.md`);
   if (existsSync49(filePath)) {
-    unlinkSync14(filePath);
+    unlinkSync15(filePath);
     console.log(`Deleted command file: ${filePath}`);
   }
 }
@@ -16548,7 +16598,7 @@ function registerRun(program2) {
 
 // src/commands/screenshot/index.ts
 import { execSync as execSync47 } from "child_process";
-import { existsSync as existsSync50, mkdirSync as mkdirSync18, unlinkSync as unlinkSync15, writeFileSync as writeFileSync31 } from "fs";
+import { existsSync as existsSync50, mkdirSync as mkdirSync18, unlinkSync as unlinkSync16, writeFileSync as writeFileSync31 } from "fs";
 import { tmpdir as tmpdir7 } from "os";
 import { join as join52, resolve as resolve13 } from "path";
 import chalk156 from "chalk";
@@ -16695,7 +16745,7 @@ function runPowerShellScript(processName, outputPath) {
       { stdio: ["ignore", "pipe", "pipe"], encoding: "utf-8" }
     );
   } finally {
-    unlinkSync15(scriptPath);
+    unlinkSync16(scriptPath);
   }
 }
 function screenshot(processName) {
@@ -16713,21 +16763,93 @@ function screenshot(processName) {
   }
 }
 
-// src/commands/sessions/daemon/daemonStatus.ts
-import { existsSync as existsSync51, readFileSync as readFileSync39 } from "fs";
+// src/commands/sessions/daemon/listDaemonPids.ts
+import { execFileSync as execFileSync9 } from "child_process";
+function listDaemonPids() {
+  if (process.platform === "win32") return [];
+  try {
+    const out = execFileSync9("ps", ["-eo", "pid=,args="], {
+      encoding: "utf-8"
+    });
+    return out.split("\n").filter((line) => line.includes("assist") && / daemon run\b/.test(line)).map((line) => Number.parseInt(line.trim(), 10)).filter((pid) => Number.isInteger(pid));
+  } catch {
+    return [];
+  }
+}
+
+// src/commands/sessions/daemon/queryDaemon.ts
 import { createInterface as createInterface4 } from "readline";
 var STATUS_TIMEOUT_MS = 5e3;
+function queryDaemon(socket) {
+  socket.write(`${JSON.stringify({ type: "ping" })}
+`);
+  return new Promise((resolve16) => {
+    const result = { sessions: [] };
+    const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
+    const timer = setTimeout(() => resolve16(result), STATUS_TIMEOUT_MS);
+    const lines = createInterface4({ input: socket });
+    lines.on("error", () => {
+    });
+    lines.on("line", (line) => {
+      applyLine(result, pending, line);
+      if (pending.size === 0) {
+        clearTimeout(timer);
+        resolve16(result);
+      }
+    });
+  });
+}
+function applyLine(result, pending, line) {
+  try {
+    const data = JSON.parse(line);
+    if (data.type === "sessions") {
+      result.sessions = data.sessions ?? [];
+      pending.delete("sessions");
+    } else if (data.type === "pong") {
+      result.pid = data.pid;
+      pending.delete("pong");
+    }
+  } catch {
+  }
+}
+
+// src/commands/sessions/daemon/reportStolenSocket.ts
+import { readFileSync as readFileSync39 } from "fs";
+function reportStolenSocket(socketPid) {
+  if (!socketPid) return;
+  const filePid = readPidFile();
+  if (filePid === void 0 || filePid === socketPid) return;
+  console.error(
+    `Warning: daemon.pid records PID ${filePid} but the socket is owned by PID ${socketPid} (stolen socket)`
+  );
+}
+function readPidFile() {
+  try {
+    const pid = Number.parseInt(
+      readFileSync39(daemonPaths.pid, "utf-8").trim(),
+      10
+    );
+    return Number.isInteger(pid) ? pid : void 0;
+  } catch {
+    return void 0;
+  }
+}
+
+// src/commands/sessions/daemon/daemonStatus.ts
 async function daemonStatus() {
   let socket;
   try {
     socket = await connectToDaemon();
   } catch {
     console.log("Sessions daemon is not running");
+    reportStrays(listDaemonPids());
     return;
   }
-  const sessions = await readSessionList(socket);
+  const { pid, sessions } = await queryDaemon(socket);
   socket.destroy();
-  console.log(`Sessions daemon is running${describePid()}`);
+  console.log(`Sessions daemon is running${pid ? ` (PID ${pid})` : ""}`);
+  reportStolenSocket(pid);
+  reportStrays(listDaemonPids().filter((p) => p !== pid));
   if (sessions.length === 0) {
     console.log("No sessions");
     return;
@@ -16737,26 +16859,11 @@ async function daemonStatus() {
     console.log(`  [${session.status}] ${session.name}${restored}`);
   }
 }
-function describePid() {
-  if (!existsSync51(daemonPaths.pid)) return "";
-  return ` (PID ${readFileSync39(daemonPaths.pid, "utf-8").trim()})`;
-}
-function readSessionList(socket) {
-  return new Promise((resolve16) => {
-    const timer = setTimeout(() => resolve16([]), STATUS_TIMEOUT_MS);
-    const lines = createInterface4({ input: socket });
-    lines.on("error", () => {
-    });
-    lines.on("line", (line) => {
-      try {
-        const data = JSON.parse(line);
-        if (data.type !== "sessions") return;
-        clearTimeout(timer);
-        resolve16(data.sessions ?? []);
-      } catch {
-      }
-    });
-  });
+function reportStrays(pids) {
+  if (pids.length === 0) return;
+  console.error(
+    `Warning: stray daemon process(es) detected: ${pids.join(", ")}`
+  );
 }
 
 // src/commands/sessions/daemon/stopDaemon.ts
@@ -16799,15 +16906,14 @@ function closedBeforeTimeout(socket) {
 // src/commands/sessions/daemon/restartDaemon.ts
 async function restartDaemon() {
   await stopDaemon();
-  await ensureDaemonRunning();
+  await ensureDaemonRunning("daemon restart");
   console.log(
     "Sessions daemon restarted; previously running claude sessions will resume"
   );
 }
 
 // src/commands/sessions/daemon/runDaemon.ts
-import { existsSync as existsSync53, mkdirSync as mkdirSync19, unlinkSync as unlinkSync16, writeFileSync as writeFileSync32 } from "fs";
-import * as net2 from "net";
+import { mkdirSync as mkdirSync19 } from "fs";
 
 // src/commands/sessions/daemon/createAutoExit.ts
 var DEFAULT_GRACE_MS = 6e4;
@@ -16823,137 +16929,9 @@ function createAutoExit(exit, graceMs = DEFAULT_GRACE_MS) {
   };
 }
 
-// src/commands/sessions/daemon/handleConnection.ts
-import { createInterface as createInterface5 } from "readline";
-
-// src/commands/sessions/daemon/broadcast.ts
-function sendTo(client, msg) {
-  client.send(JSON.stringify(msg));
-}
-function broadcast(clients, msg) {
-  const json = JSON.stringify(msg);
-  for (const client of clients) {
-    client.send(json);
-  }
-}
-
-// src/commands/sessions/daemon/handleRunConfigs.ts
-function handleRunConfigs(client, cwd) {
-  try {
-    const { config, configDir } = loadConfigFrom(cwd);
-    const configs = resolveRunConfigs(config.run, configDir);
-    sendTo(client, {
-      type: "run-configs",
-      configs: configs.map(({ name, params }) => ({ name, params }))
-    });
-  } catch {
-    sendTo(client, { type: "run-configs", configs: [] });
-  }
-}
-
-// src/commands/sessions/daemon/dispatchMessage.ts
-function sendCreated(client, id) {
-  sendTo(client, { type: "created", sessionId: id });
-}
-function handleCreate(client, manager, data) {
-  sendCreated(
-    client,
-    manager.spawn(
-      data.prompt,
-      data.cwd
-    )
-  );
-}
-function handleCreateRun(client, manager, data) {
-  sendCreated(
-    client,
-    manager.spawnRun(
-      data.runName,
-      data.runArgs ?? [],
-      data.cwd
-    )
-  );
-}
-function handleCreateAssist(client, manager, data) {
-  sendCreated(
-    client,
-    manager.spawnAssist(
-      data.assistArgs ?? [],
-      data.cwd
-    )
-  );
-}
-function handleResume(client, manager, data) {
-  sendCreated(
-    client,
-    manager.resume(
-      data.sessionId,
-      data.cwd,
-      data.name
-    )
-  );
-}
-function runConfigs(client, _manager, data) {
-  handleRunConfigs(client, data.cwd);
-}
-function handleHistory(client, manager) {
-  manager.getHistory().then((history) => {
-    sendTo(client, { type: "history", sessions: history });
-  });
-}
-function handleShutdown(client, manager) {
-  manager.shutdown();
-  sendTo(client, { type: "shutting-down" });
-  setImmediate(() => process.exit(0));
-}
-var handlers = {
-  create: handleCreate,
-  "create-run": handleCreateRun,
-  "create-assist": handleCreateAssist,
-  resume: handleResume,
-  "run-configs": runConfigs,
-  history: handleHistory,
-  shutdown: handleShutdown,
-  input: (_client, m, d) => m.writeToSession(d.sessionId, d.data),
-  resize: (_client, m, d) => m.resizeSession(d.sessionId, d.cols, d.rows),
-  retry: (_client, m, d) => m.retrySession(d.sessionId),
-  dismiss: (_client, m, d) => m.dismissSession(d.sessionId)
-};
-function dispatchMessage(client, manager, data) {
-  handlers[data.type]?.(client, manager, data);
-}
-
-// src/commands/sessions/daemon/handleConnection.ts
-function handleConnection(socket, manager) {
-  const client = {
-    send: (data) => {
-      if (socket.writable) socket.write(`${data}
-`);
-    }
-  };
-  manager.addClient(client);
-  const lines = createInterface5({ input: socket });
-  lines.on("error", () => {
-  });
-  lines.on("line", (line) => {
-    let data;
-    try {
-      data = JSON.parse(line);
-    } catch {
-      return;
-    }
-    try {
-      dispatchMessage(client, manager, data);
-    } catch (e) {
-      sendTo(client, {
-        type: "error",
-        message: `${data.type} failed: ${e instanceof Error ? e.message : String(e)}`
-      });
-    }
-  });
-  socket.on("error", () => {
-  });
-  socket.on("close", () => manager.removeClient(client));
+// src/commands/sessions/daemon/daemonLog.ts
+function daemonLog(message) {
+  console.log(`${(/* @__PURE__ */ new Date()).toISOString()} [${process.pid}] ${message}`);
 }
 
 // src/commands/sessions/shared/discoverSessions.ts
@@ -17071,6 +17049,17 @@ async function discoverSessions() {
   return sessions;
 }
 
+// src/commands/sessions/daemon/broadcast.ts
+function sendTo(client, msg) {
+  client.send(JSON.stringify(msg));
+}
+function broadcast(clients, msg) {
+  const json = JSON.stringify(msg);
+  for (const client of clients) {
+    client.send(json);
+  }
+}
+
 // src/commands/sessions/daemon/repoPrefix.ts
 import * as path47 from "path";
 function repoPrefix(cwd) {
@@ -17082,7 +17071,7 @@ function repoPrefix(cwd) {
 import * as pty from "node-pty";
 
 // src/commands/sessions/daemon/ensureSpawnHelperExecutable.ts
-import { chmodSync, existsSync as existsSync52, statSync as statSync5 } from "fs";
+import { chmodSync, existsSync as existsSync51, statSync as statSync6 } from "fs";
 import { createRequire as createRequire3 } from "module";
 import path48 from "path";
 var require4 = createRequire3(import.meta.url);
@@ -17097,8 +17086,8 @@ function ensureSpawnHelperExecutable() {
     `${process.platform}-${process.arch}`,
     "spawn-helper"
   );
-  if (!existsSync52(helper)) return;
-  const mode = statSync5(helper).mode;
+  if (!existsSync51(helper)) return;
+  const mode = statSync6(helper).mode;
   if ((mode & 73) === 0) chmodSync(helper, mode | 493);
 }
 
@@ -17492,9 +17481,10 @@ var SessionManager = class {
     shutdownSessions(this.sessions);
   }
   restore() {
-    for (const persisted of loadPersistedSessions()) {
+    return loadPersistedSessions().map((persisted) => {
       this.add(restoreSession(String(this.nextId++), persisted));
-    }
+      return persisted.name;
+    });
   }
   add(session) {
     this.wire(session);
@@ -17556,31 +17546,231 @@ var SessionManager = class {
   };
 };
 
+// src/commands/sessions/daemon/startDaemonServer.ts
+import { unlinkSync as unlinkSync18 } from "fs";
+import * as net2 from "net";
+
+// src/commands/sessions/daemon/handleConnection.ts
+import { createInterface as createInterface5 } from "readline";
+
+// src/commands/sessions/daemon/handleRunConfigs.ts
+function handleRunConfigs(client, cwd) {
+  try {
+    const { config, configDir } = loadConfigFrom(cwd);
+    const configs = resolveRunConfigs(config.run, configDir);
+    sendTo(client, {
+      type: "run-configs",
+      configs: configs.map(({ name, params }) => ({ name, params }))
+    });
+  } catch {
+    sendTo(client, { type: "run-configs", configs: [] });
+  }
+}
+
+// src/commands/sessions/daemon/dispatchMessage.ts
+function sendCreated(client, id) {
+  sendTo(client, { type: "created", sessionId: id });
+}
+function handleCreate(client, manager, data) {
+  sendCreated(
+    client,
+    manager.spawn(
+      data.prompt,
+      data.cwd
+    )
+  );
+}
+function handleCreateRun(client, manager, data) {
+  sendCreated(
+    client,
+    manager.spawnRun(
+      data.runName,
+      data.runArgs ?? [],
+      data.cwd
+    )
+  );
+}
+function handleCreateAssist(client, manager, data) {
+  sendCreated(
+    client,
+    manager.spawnAssist(
+      data.assistArgs ?? [],
+      data.cwd
+    )
+  );
+}
+function handleResume(client, manager, data) {
+  sendCreated(
+    client,
+    manager.resume(
+      data.sessionId,
+      data.cwd,
+      data.name
+    )
+  );
+}
+function runConfigs(client, _manager, data) {
+  handleRunConfigs(client, data.cwd);
+}
+function handleHistory(client, manager) {
+  manager.getHistory().then((history) => {
+    sendTo(client, { type: "history", sessions: history });
+  });
+}
+function handleShutdown(client, manager) {
+  manager.shutdown();
+  sendTo(client, { type: "shutting-down" });
+  setImmediate(() => process.exit(0));
+}
+var handlers = {
+  ping: (client) => sendTo(client, { type: "pong", pid: process.pid }),
+  create: handleCreate,
+  "create-run": handleCreateRun,
+  "create-assist": handleCreateAssist,
+  resume: handleResume,
+  "run-configs": runConfigs,
+  history: handleHistory,
+  shutdown: handleShutdown,
+  input: (_client, m, d) => m.writeToSession(d.sessionId, d.data),
+  resize: (_client, m, d) => m.resizeSession(d.sessionId, d.cols, d.rows),
+  retry: (_client, m, d) => m.retrySession(d.sessionId),
+  dismiss: (_client, m, d) => m.dismissSession(d.sessionId)
+};
+function dispatchMessage(client, manager, data) {
+  handlers[data.type]?.(client, manager, data);
+}
+
+// src/commands/sessions/daemon/handleConnection.ts
+function handleConnection(socket, manager) {
+  const client = {
+    send: (data) => {
+      if (socket.writable) socket.write(`${data}
+`);
+    }
+  };
+  manager.addClient(client);
+  const lines = createInterface5({ input: socket });
+  lines.on("error", () => {
+  });
+  lines.on("line", (line) => {
+    let data;
+    try {
+      data = JSON.parse(line);
+    } catch {
+      return;
+    }
+    try {
+      dispatchMessage(client, manager, data);
+    } catch (e) {
+      sendTo(client, {
+        type: "error",
+        message: `${data.type} failed: ${e instanceof Error ? e.message : String(e)}`
+      });
+    }
+  });
+  socket.on("error", () => {
+  });
+  socket.on("close", () => manager.removeClient(client));
+}
+
+// src/commands/sessions/daemon/onListening.ts
+import { unlinkSync as unlinkSync17, writeFileSync as writeFileSync32 } from "fs";
+
+// src/commands/sessions/daemon/startPidFileWatchdog.ts
+import { readFileSync as readFileSync40 } from "fs";
+var WATCHDOG_INTERVAL_MS = 5e3;
+function startPidFileWatchdog(onLost, intervalMs = WATCHDOG_INTERVAL_MS) {
+  const timer = setInterval(() => {
+    if (!ownsPidFile()) onLost();
+  }, intervalMs);
+  timer.unref();
+  return timer;
+}
+function ownsPidFile() {
+  try {
+    return readFileSync40(daemonPaths.pid, "utf-8").trim() === String(process.pid);
+  } catch {
+    return false;
+  }
+}
+
+// src/commands/sessions/daemon/onListening.ts
+function onListening(manager, checkAutoExit) {
+  writeFileSync32(daemonPaths.pid, String(process.pid));
+  startPidFileWatchdog(() => {
+    daemonLog("lost daemon.pid ownership; shutting down sessions and exiting");
+    manager.shutdown();
+    process.exit(0);
+  });
+  process.on("exit", cleanupOwnedFiles);
+  const restored = manager.restore();
+  daemonLog(
+    restored.length > 0 ? `restored ${restored.length} session(s): ${restored.join(", ")}` : "no persisted sessions to restore"
+  );
+  daemonLog(`listening on ${daemonPaths.socket}`);
+  checkAutoExit(manager.isIdle());
+}
+function cleanupOwnedFiles() {
+  if (!ownsPidFile()) return;
+  try {
+    unlinkSync17(daemonPaths.pid);
+  } catch {
+  }
+  if (process.platform !== "win32") {
+    try {
+      unlinkSync17(daemonPaths.socket);
+    } catch {
+    }
+  }
+}
+
+// src/commands/sessions/daemon/startDaemonServer.ts
+function startDaemonServer(manager, checkAutoExit) {
+  const server = net2.createServer(
+    (socket) => handleConnection(socket, manager)
+  );
+  let retried = false;
+  server.on("error", (e) => {
+    if (e.code !== "EADDRINUSE" || retried) {
+      daemonLog(`server error: ${e.message}; exiting`);
+      process.exit(1);
+    }
+    retried = true;
+    void recoverFromAddrInUse(server, manager, checkAutoExit);
+  });
+  server.listen(daemonPaths.socket, () => onListening(manager, checkAutoExit));
+}
+async function recoverFromAddrInUse(server, manager, checkAutoExit) {
+  if (await isDaemonRunning()) {
+    daemonLog("another daemon owns the socket; exiting");
+    process.exit(1);
+  }
+  daemonLog("removing stale socket left by a crashed daemon");
+  if (process.platform !== "win32") {
+    try {
+      unlinkSync18(daemonPaths.socket);
+    } catch {
+    }
+  }
+  server.listen(daemonPaths.socket, () => onListening(manager, checkAutoExit));
+}
+
 // src/commands/sessions/daemon/runDaemon.ts
 async function runDaemon() {
   mkdirSync19(daemonPaths.dir, { recursive: true });
+  daemonLog(
+    `starting (reason: ${process.env.ASSIST_DAEMON_SPAWN_REASON ?? "manual"})`
+  );
   if (await isDaemonRunning()) {
-    console.error("Sessions daemon is already running");
+    daemonLog("already running; exiting");
     process.exitCode = 1;
     return;
   }
-  if (process.platform !== "win32" && existsSync53(daemonPaths.socket)) {
-    unlinkSync16(daemonPaths.socket);
-  }
   const checkAutoExit = createAutoExit(() => {
-    console.log("No sessions and no connected server; exiting");
+    daemonLog("no sessions and no connected server; exiting");
     process.exit(0);
   });
-  const manager = new SessionManager(checkAutoExit);
-  manager.restore();
-  const server = net2.createServer(
-    (socket) => handleConnection(socket, manager)
-  );
-  server.listen(daemonPaths.socket, () => {
-    writeFileSync32(daemonPaths.pid, String(process.pid));
-    console.log(`Sessions daemon listening on ${daemonPaths.socket}`);
-    checkAutoExit(manager.isIdle());
-  });
+  startDaemonServer(new SessionManager(checkAutoExit), checkAutoExit);
 }
 
 // src/commands/sessions/daemon/registerDaemon.ts
@@ -17589,7 +17779,9 @@ function registerDaemon(program2) {
   cmd.command("run").description(
     "Run the sessions daemon in the foreground (auto-spawned by assist sessions)"
   ).action(runDaemon);
-  cmd.command("status").description("Show sessions daemon status and live sessions").action(daemonStatus);
+  cmd.command("status").description(
+    "Show sessions daemon status, live sessions, and any stray daemon processes"
+  ).action(daemonStatus);
   cmd.command("stop").description(
     "Stop the sessions daemon; running claude sessions resume on next start"
   ).action(stopDaemon);
@@ -17616,7 +17808,7 @@ function summaryPathFor(jsonlPath2) {
 }
 
 // src/commands/sessions/summarise/summariseSession.ts
-import { execFileSync as execFileSync9 } from "child_process";
+import { execFileSync as execFileSync10 } from "child_process";
 
 // src/commands/sessions/summarise/iterateUserMessages.ts
 import * as fs28 from "fs";
@@ -17693,7 +17885,7 @@ function summariseSession(jsonlPath2) {
   }
   const prompt = buildPrompt2(firstMessage, backlogIds);
   try {
-    const output = execFileSync9("claude", ["-p", "--model", "haiku", prompt], {
+    const output = execFileSync10("claude", ["-p", "--model", "haiku", prompt], {
       encoding: "utf8",
       timeout: 3e4,
       stdio: ["ignore", "pipe", "ignore"]