@metamask-previews/wallet-cli 0.0.0-preview-429f86194 → 0.0.0-preview-e82188855

package/dist/daemon/daemon-spawn.mjs

@@ -1,8 +1,7 @@
 import { spawn } from "node:child_process";
-import { closeSync, existsSync, openSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { pingDaemon } from "./daemon-client.mjs";
-import { ensureOwnerOnlyDirectory } from "./data-dir.mjs";
 import { getDaemonPaths } from "./paths.mjs";
 const POLL_INTERVAL_MS = 100;
 const MAX_POLLS = 300; // 30 seconds
@@ -19,41 +18,26 @@ const MAX_POLLS = 300; // 30 seconds
  * @returns The state of the daemon and the socket path it's listening on.
  */
 export async function ensureDaemon(config) {
-    const { socketPath, logPath } = getDaemonPaths(config.dataDir);
+    const { socketPath } = getDaemonPaths(config.dataDir);
     const initialPing = await pingDaemon(socketPath);
-    switch (initialPing.status) {
-        case 'responsive':
-            return { state: 'already-running', socketPath };
-        case 'unreachable':
-            if (initialPing.reason === 'permission') {
-                throw new Error(`Refusing to start: the socket at ${socketPath} is owned by another user. ` +
-                    `Choose a different data directory (MM_DAEMON_DATA_DIR) or remove the socket manually. ` +
-                    `(${initialPing.error.message})`);
-            }
-            throw new Error(`Refusing to start: a daemon socket already exists at ${socketPath} but is unresponsive. ` +
-                `Run \`mm daemon stop\` (or \`mm daemon purge\`) before starting a new daemon. ` +
+    if (initialPing.status === 'responsive') {
+        return { state: 'already-running', socketPath };
+    }
+    if (initialPing.status === 'unreachable') {
+        if (initialPing.reason === 'permission') {
+            throw new Error(`Refusing to start: the socket at ${socketPath} is owned by another user. ` +
+                `Choose a different data directory (MM_DAEMON_DATA_DIR) or remove the socket manually. ` +
                 `(${initialPing.error.message})`);
-        case 'absent':
-            break;
-        /* istanbul ignore next -- exhaustiveness guard; unreachable for the current PingResult union */
-        default: {
-            const exhaustiveCheck = initialPing;
-            throw new Error(`Unexpected daemon ping status: ${String(exhaustiveCheck)}`);
         }
+        throw new Error(`Refusing to start: a daemon socket already exists at ${socketPath} but is unresponsive. ` +
+            `Run \`mm daemon stop\` (or \`mm daemon purge\`) before starting a new daemon. ` +
+            `(${initialPing.error.message})`);
     }
     process.stderr.write('Starting daemon...\n');
     const { entryPath, args } = resolveEntryPoint(config.packageRoot);
-    // Create the data directory before opening the log file inside it. The daemon
-    // entry also does this, but only after spawn — opening the log first would
-    // ENOENT on a fresh data directory.
-    await ensureOwnerOnlyDirectory(config.dataDir);
-    // Redirect the detached daemon's stderr to its log file rather than
-    // discarding it, so a crash after startup stays diagnosable. stdout stays
-    // ignored — structured status goes through the file logger.
-    const logFileDescriptor = openSync(logPath, 'a');
     const child = spawn(process.execPath, [...args, entryPath], {
         detached: true,
-        stdio: ['ignore', 'ignore', logFileDescriptor],
+        stdio: 'ignore',
         env: {
             ...process.env,
             MM_DAEMON_DATA_DIR: config.dataDir,
@@ -63,34 +47,29 @@ export async function ensureDaemon(config) {
             MM_WALLET_SRP: config.srp,
         },
     });
-    // The child dup'd the file descriptor into its stderr, so drop the parent's
-    // copy. Safe on the success path: `spawn` reports failures via the 'error'
-    // event, not a synchronous throw.
-    closeSync(logFileDescriptor);
+    const exitInfo = { value: null };
     // A failed spawn (bad interpreter, EACCES, ENOENT) emits 'error' and may
-    // never emit 'exit', so 'error' is recorded first and not overwritten by a
-    // later 'exit' — the loop surfaces the real cause instead of hanging.
-    const outcome = { current: { kind: 'pending' } };
+    // never emit 'exit'. Capture it so the readiness loop can surface the real
+    // cause immediately instead of hanging for the full timeout.
+    const spawnError = { value: null };
     child.on('error', (error) => {
         process.stderr.write(`Failed to spawn daemon process: ${String(error)}\n`);
-        outcome.current = { kind: 'error', error };
+        spawnError.value = error;
     });
     child.on('exit', (code, signal) => {
-        if (outcome.current.kind === 'pending') {
-            outcome.current = { kind: 'exited', code, signal };
-        }
+        exitInfo.value = { code, signal };
     });
     child.unref();
     for (let i = 0; i < MAX_POLLS; i++) {
         await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));
-        const settled = outcome.current;
-        if (settled.kind === 'error') {
-            throw new Error(`Failed to spawn daemon process: ${settled.error.message}. ` +
-                `Check the daemon log at ${logPath}.`);
+        if (spawnError.value !== null) {
+            throw new Error(`Failed to spawn daemon process: ${spawnError.value.message}. ` +
+                `Check the daemon log at ${getDaemonPaths(config.dataDir).logPath}.`);
         }
-        if (settled.kind === 'exited') {
-            throw new Error(`Daemon process exited during startup (code=${String(settled.code)}, signal=${String(settled.signal)}). ` +
-                `Check the daemon log at ${logPath}.`);
+        if (exitInfo.value !== null) {
+            const { code, signal } = exitInfo.value;
+            throw new Error(`Daemon process exited during startup (code=${String(code)}, signal=${String(signal)}). ` +
+                `Check the daemon log at ${getDaemonPaths(config.dataDir).logPath}.`);
         }
         const ping = await pingDaemon(socketPath);
         if (ping.status === 'responsive') {

package/dist/daemon/daemon-spawn.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"daemon-spawn.mjs","sourceRoot":"","sources":["../../src/daemon/daemon-spawn.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn } from 'node:child_process';\nimport { closeSync, existsSync, openSync } from 'node:fs';\nimport { join } from 'node:path';\n\nimport { pingDaemon } from './daemon-client';\nimport { ensureOwnerOnlyDirectory } from './data-dir';\nimport { getDaemonPaths } from './paths';\nimport type { DaemonSpawnConfig } from './types';\n\nconst POLL_INTERVAL_MS = 100;\nconst MAX_POLLS = 300; // 30 seconds\n\n/**\n * Outcome of {@link ensureDaemon}.\n *\n * - `'already-running'`: a responsive daemon was found at the configured\n *   socket path. The supplied flags (`infuraProjectId`, `password`, `srp`)\n *   were NOT applied to that daemon; the caller should surface this so a\n *   user who is trying to change them isn't silently ignored.\n * - `'started'`: a new daemon was spawned and is now responsive.\n */\nexport type EnsureDaemonResult = {\n  state: 'already-running' | 'started';\n  socketPath: string;\n};\n\n/**\n * Ensure the daemon is running. If a responsive daemon already exists, return\n * `'already-running'` (caller decides how to surface that). Otherwise spawn\n * one as a detached process and wait until the socket becomes responsive.\n *\n * Refuses to spawn when pinging the existing socket fails with anything other\n * than `ENOENT` (wedged or foreign daemon) — taking over could orphan the\n * existing process and corrupt its PID file.\n *\n * @param config - Spawn configuration.\n * @returns The state of the daemon and the socket path it's listening on.\n */\nexport async function ensureDaemon(\n  config: DaemonSpawnConfig,\n): Promise<EnsureDaemonResult> {\n  const { socketPath, logPath } = getDaemonPaths(config.dataDir);\n\n  const initialPing = await pingDaemon(socketPath);\n  switch (initialPing.status) {\n    case 'responsive':\n      return { state: 'already-running', socketPath };\n    case 'unreachable':\n      if (initialPing.reason === 'permission') {\n        throw new Error(\n          `Refusing to start: the socket at ${socketPath} is owned by another user. ` +\n            `Choose a different data directory (MM_DAEMON_DATA_DIR) or remove the socket manually. ` +\n            `(${initialPing.error.message})`,\n        );\n      }\n      throw new Error(\n        `Refusing to start: a daemon socket already exists at ${socketPath} but is unresponsive. ` +\n          `Run \\`mm daemon stop\\` (or \\`mm daemon purge\\`) before starting a new daemon. ` +\n          `(${initialPing.error.message})`,\n      );\n    case 'absent':\n      break;\n    /* istanbul ignore next -- exhaustiveness guard; unreachable for the current PingResult union */\n    default: {\n      const exhaustiveCheck: never = initialPing;\n      throw new Error(\n        `Unexpected daemon ping status: ${String(exhaustiveCheck)}`,\n      );\n    }\n  }\n\n  process.stderr.write('Starting daemon...\\n');\n\n  const { entryPath, args } = resolveEntryPoint(config.packageRoot);\n\n  // Create the data directory before opening the log file inside it. The daemon\n  // entry also does this, but only after spawn — opening the log first would\n  // ENOENT on a fresh data directory.\n  await ensureOwnerOnlyDirectory(config.dataDir);\n\n  // Redirect the detached daemon's stderr to its log file rather than\n  // discarding it, so a crash after startup stays diagnosable. stdout stays\n  // ignored — structured status goes through the file logger.\n  const logFileDescriptor = openSync(logPath, 'a');\n  const child = spawn(process.execPath, [...args, entryPath], {\n    detached: true,\n    stdio: ['ignore', 'ignore', logFileDescriptor],\n    env: {\n      ...process.env,\n      MM_DAEMON_DATA_DIR: config.dataDir,\n      MM_DAEMON_SOCKET_PATH: socketPath,\n      INFURA_PROJECT_ID: config.infuraProjectId,\n      MM_WALLET_PASSWORD: config.password,\n      MM_WALLET_SRP: config.srp,\n    },\n  });\n  // The child dup'd the file descriptor into its stderr, so drop the parent's\n  // copy. Safe on the success path: `spawn` reports failures via the 'error'\n  // event, not a synchronous throw.\n  closeSync(logFileDescriptor);\n\n  type StartupOutcome =\n    | { kind: 'pending' }\n    | { kind: 'error'; error: Error }\n    | { kind: 'exited'; code: number | null; signal: NodeJS.Signals | null };\n\n  // A failed spawn (bad interpreter, EACCES, ENOENT) emits 'error' and may\n  // never emit 'exit', so 'error' is recorded first and not overwritten by a\n  // later 'exit' — the loop surfaces the real cause instead of hanging.\n  const outcome: { current: StartupOutcome } = { current: { kind: 'pending' } };\n\n  child.on('error', (error: Error) => {\n    process.stderr.write(`Failed to spawn daemon process: ${String(error)}\\n`);\n    outcome.current = { kind: 'error', error };\n  });\n  child.on('exit', (code, signal) => {\n    if (outcome.current.kind === 'pending') {\n      outcome.current = { kind: 'exited', code, signal };\n    }\n  });\n  child.unref();\n\n  for (let i = 0; i < MAX_POLLS; i++) {\n    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));\n    const settled = outcome.current;\n    if (settled.kind === 'error') {\n      throw new Error(\n        `Failed to spawn daemon process: ${settled.error.message}. ` +\n          `Check the daemon log at ${logPath}.`,\n      );\n    }\n    if (settled.kind === 'exited') {\n      throw new Error(\n        `Daemon process exited during startup (code=${String(settled.code)}, signal=${String(settled.signal)}). ` +\n          `Check the daemon log at ${logPath}.`,\n      );\n    }\n    const ping = await pingDaemon(socketPath);\n    if (ping.status === 'responsive') {\n      process.stderr.write('Daemon ready.\\n');\n      return { state: 'started', socketPath };\n    }\n  }\n\n  throw new Error(\n    `Daemon did not start within ${(MAX_POLLS * POLL_INTERVAL_MS) / 1000}s`,\n  );\n}\n\n/**\n * Resolve the daemon entry point path and any extra Node.js args needed.\n *\n * In production, uses the compiled dist output. In development, uses tsx\n * to run TypeScript source directly.\n *\n * @param packageRoot - The root directory of the wallet-cli package.\n * @returns The entry path and any extra node args.\n */\nfunction resolveEntryPoint(packageRoot: string): {\n  entryPath: string;\n  args: string[];\n} {\n  const distEntry = join(packageRoot, 'dist', 'daemon', 'daemon-entry.mjs');\n  if (existsSync(distEntry)) {\n    return { entryPath: distEntry, args: [] };\n  }\n\n  const srcEntry = join(packageRoot, 'src', 'daemon', 'daemon-entry.ts');\n  return {\n    entryPath: srcEntry,\n    args: ['--import', 'tsx'],\n  };\n}\n"]}
+{"version":3,"file":"daemon-spawn.mjs","sourceRoot":"","sources":["../../src/daemon/daemon-spawn.ts"],"names":[],"mappings":"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","sourcesContent":["import { spawn } from 'node:child_process';\nimport { existsSync } from 'node:fs';\nimport { join } from 'node:path';\n\nimport { pingDaemon } from './daemon-client';\nimport { getDaemonPaths } from './paths';\nimport type { DaemonSpawnConfig } from './types';\n\nconst POLL_INTERVAL_MS = 100;\nconst MAX_POLLS = 300; // 30 seconds\n\n/**\n * Outcome of {@link ensureDaemon}.\n *\n * - `'already-running'`: a responsive daemon was found at the configured\n *   socket path. The supplied flags (`infuraProjectId`, `password`, `srp`)\n *   were NOT applied to that daemon; the caller should surface this so a\n *   user who is trying to change them isn't silently ignored.\n * - `'started'`: a new daemon was spawned and is now responsive.\n */\nexport type EnsureDaemonResult = {\n  state: 'already-running' | 'started';\n  socketPath: string;\n};\n\n/**\n * Ensure the daemon is running. If a responsive daemon already exists, return\n * `'already-running'` (caller decides how to surface that). Otherwise spawn\n * one as a detached process and wait until the socket becomes responsive.\n *\n * Refuses to spawn when pinging the existing socket fails with anything other\n * than `ENOENT` (wedged or foreign daemon) — taking over could orphan the\n * existing process and corrupt its PID file.\n *\n * @param config - Spawn configuration.\n * @returns The state of the daemon and the socket path it's listening on.\n */\nexport async function ensureDaemon(\n  config: DaemonSpawnConfig,\n): Promise<EnsureDaemonResult> {\n  const { socketPath } = getDaemonPaths(config.dataDir);\n\n  const initialPing = await pingDaemon(socketPath);\n  if (initialPing.status === 'responsive') {\n    return { state: 'already-running', socketPath };\n  }\n  if (initialPing.status === 'unreachable') {\n    if (initialPing.reason === 'permission') {\n      throw new Error(\n        `Refusing to start: the socket at ${socketPath} is owned by another user. ` +\n          `Choose a different data directory (MM_DAEMON_DATA_DIR) or remove the socket manually. ` +\n          `(${initialPing.error.message})`,\n      );\n    }\n    throw new Error(\n      `Refusing to start: a daemon socket already exists at ${socketPath} but is unresponsive. ` +\n        `Run \\`mm daemon stop\\` (or \\`mm daemon purge\\`) before starting a new daemon. ` +\n        `(${initialPing.error.message})`,\n    );\n  }\n\n  process.stderr.write('Starting daemon...\\n');\n\n  const { entryPath, args } = resolveEntryPoint(config.packageRoot);\n\n  const child = spawn(process.execPath, [...args, entryPath], {\n    detached: true,\n    stdio: 'ignore',\n    env: {\n      ...process.env,\n      MM_DAEMON_DATA_DIR: config.dataDir,\n      MM_DAEMON_SOCKET_PATH: socketPath,\n      INFURA_PROJECT_ID: config.infuraProjectId,\n      MM_WALLET_PASSWORD: config.password,\n      MM_WALLET_SRP: config.srp,\n    },\n  });\n\n  type ExitInfo = { code: number | null; signal: NodeJS.Signals | null };\n  const exitInfo: { value: ExitInfo | null } = { value: null };\n  // A failed spawn (bad interpreter, EACCES, ENOENT) emits 'error' and may\n  // never emit 'exit'. Capture it so the readiness loop can surface the real\n  // cause immediately instead of hanging for the full timeout.\n  const spawnError: { value: Error | null } = { value: null };\n\n  child.on('error', (error: Error) => {\n    process.stderr.write(`Failed to spawn daemon process: ${String(error)}\\n`);\n    spawnError.value = error;\n  });\n  child.on('exit', (code, signal) => {\n    exitInfo.value = { code, signal };\n  });\n  child.unref();\n\n  for (let i = 0; i < MAX_POLLS; i++) {\n    await new Promise((resolve) => setTimeout(resolve, POLL_INTERVAL_MS));\n    if (spawnError.value !== null) {\n      throw new Error(\n        `Failed to spawn daemon process: ${spawnError.value.message}. ` +\n          `Check the daemon log at ${getDaemonPaths(config.dataDir).logPath}.`,\n      );\n    }\n    if (exitInfo.value !== null) {\n      const { code, signal } = exitInfo.value;\n      throw new Error(\n        `Daemon process exited during startup (code=${String(code)}, signal=${String(signal)}). ` +\n          `Check the daemon log at ${getDaemonPaths(config.dataDir).logPath}.`,\n      );\n    }\n    const ping = await pingDaemon(socketPath);\n    if (ping.status === 'responsive') {\n      process.stderr.write('Daemon ready.\\n');\n      return { state: 'started', socketPath };\n    }\n  }\n\n  throw new Error(\n    `Daemon did not start within ${(MAX_POLLS * POLL_INTERVAL_MS) / 1000}s`,\n  );\n}\n\n/**\n * Resolve the daemon entry point path and any extra Node.js args needed.\n *\n * In production, uses the compiled dist output. In development, uses tsx\n * to run TypeScript source directly.\n *\n * @param packageRoot - The root directory of the wallet-cli package.\n * @returns The entry path and any extra node args.\n */\nfunction resolveEntryPoint(packageRoot: string): {\n  entryPath: string;\n  args: string[];\n} {\n  const distEntry = join(packageRoot, 'dist', 'daemon', 'daemon-entry.mjs');\n  if (existsSync(distEntry)) {\n    return { entryPath: distEntry, args: [] };\n  }\n\n  const srcEntry = join(packageRoot, 'src', 'daemon', 'daemon-entry.ts');\n  return {\n    entryPath: srcEntry,\n    args: ['--import', 'tsx'],\n  };\n}\n"]}

package/dist/daemon/socket-line.cjs

@@ -18,17 +18,13 @@ async function writeLine(socket, line) {
         };
         socket.once('error', onError);
         socket.write(`${line}\n`, (error) => {
+            socket.removeListener('error', onError);
             if (error) {
-                // A failed write (e.g. EPIPE) is delivered BOTH here AND as a later
-                // 'error' event. Leave `onError` attached to handle that event —
-                // detaching here would let Node treat it as unhandled and crash the
-                // process. This reject settles the promise; `onError` detaches itself
-                // when/if the event arrives.
                 reject(error);
-                return;
             }
-            socket.removeListener('error', onError);
-            resolve();
+            else {
+                resolve();
+            }
         });
     });
 }

package/dist/daemon/socket-line.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"socket-line.cjs","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAAC,MAAc,EAAE,IAAY;IAC1D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,sEAAsE;QACtE,yEAAyE;QACzE,uDAAuD;QACvD,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YAClC,IAAI,KAAK,EAAE,CAAC;gBACV,oEAAoE;gBACpE,iEAAiE;gBACjE,oEAAoE;gBACpE,sEAAsE;gBACtE,6BAA6B;gBAC7B,MAAM,CAAC,KAAK,CAAC,CAAC;gBACd,OAAO;YACT,CAAC;YACD,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAzBD,8BAyBC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,QAAQ,CAC5B,MAAc,EACd,SAAkB;IAElB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,KAAgD,CAAC;QAErD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACtB,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAC7C,CAAC,EAAE,SAAS,CAAC,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,IAAY,EAAQ,EAAE;YACpC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,GAAS,EAAE;YACvB,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF;;WAEG;QACH,SAAS,OAAO;YACd,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;YACD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC;AAzDD,4BAyDC","sourcesContent":["import type { Socket } from 'node:net';\n\n/**\n * Write a newline-delimited line to a socket.\n *\n * @param socket - The socket to write to.\n * @param line - The line to write (without trailing newline).\n */\nexport async function writeLine(socket: Socket, line: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    // A socket 'error' can fire while the write is in flight without ever\n    // reaching the write callback; without this listener Node would treat it\n    // as an unhandled 'error' event and crash the process.\n    const onError = (error: Error): void => {\n      socket.removeListener('error', onError);\n      reject(error);\n    };\n    socket.once('error', onError);\n\n    socket.write(`${line}\\n`, (error) => {\n      if (error) {\n        // A failed write (e.g. EPIPE) is delivered BOTH here AND as a later\n        // 'error' event. Leave `onError` attached to handle that event —\n        // detaching here would let Node treat it as unhandled and crash the\n        // process. This reject settles the promise; `onError` detaches itself\n        // when/if the event arrives.\n        reject(error);\n        return;\n      }\n      socket.removeListener('error', onError);\n      resolve();\n    });\n  });\n}\n\n/**\n * Read a single newline-delimited line from a socket.\n *\n * @param socket - The socket to read from.\n * @param timeoutMs - Optional timeout in milliseconds. Rejects with a timeout\n * error if no complete line is received within the limit.\n * @returns The line read (without trailing newline).\n */\nexport async function readLine(\n  socket: Socket,\n  timeoutMs?: number,\n): Promise<string> {\n  return new Promise((resolve, reject) => {\n    let buffer = '';\n    let timer: ReturnType<typeof setTimeout> | undefined;\n\n    if (timeoutMs !== undefined) {\n      timer = setTimeout(() => {\n        cleanup();\n        reject(new Error('Socket read timed out'));\n      }, timeoutMs);\n    }\n\n    const onData = (data: Buffer): void => {\n      buffer += data.toString();\n      const idx = buffer.indexOf('\\n');\n      if (idx !== -1) {\n        cleanup();\n        resolve(buffer.slice(0, idx));\n      }\n    };\n\n    const onError = (error: Error): void => {\n      cleanup();\n      reject(error);\n    };\n\n    const onEnd = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    const onClose = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    /**\n     * Remove listeners registered by this call and clear the timeout.\n     */\n    function cleanup(): void {\n      if (timer !== undefined) {\n        clearTimeout(timer);\n      }\n      socket.removeListener('data', onData);\n      socket.removeListener('error', onError);\n      socket.removeListener('end', onEnd);\n      socket.removeListener('close', onClose);\n    }\n\n    socket.on('data', onData);\n    socket.once('error', onError);\n    socket.once('end', onEnd);\n    socket.once('close', onClose);\n  });\n}\n"]}
+{"version":3,"file":"socket-line.cjs","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Socket } from 'node:net';\n\n/**\n * Write a newline-delimited line to a socket.\n *\n * @param socket - The socket to write to.\n * @param line - The line to write (without trailing newline).\n */\nexport async function writeLine(socket: Socket, line: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    // A socket 'error' can fire while the write is in flight without ever\n    // reaching the write callback; without this listener Node would treat it\n    // as an unhandled 'error' event and crash the process.\n    const onError = (error: Error): void => {\n      socket.removeListener('error', onError);\n      reject(error);\n    };\n    socket.once('error', onError);\n\n    socket.write(`${line}\\n`, (error) => {\n      socket.removeListener('error', onError);\n      if (error) {\n        reject(error);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n/**\n * Read a single newline-delimited line from a socket.\n *\n * @param socket - The socket to read from.\n * @param timeoutMs - Optional timeout in milliseconds. Rejects with a timeout\n * error if no complete line is received within the limit.\n * @returns The line read (without trailing newline).\n */\nexport async function readLine(\n  socket: Socket,\n  timeoutMs?: number,\n): Promise<string> {\n  return new Promise((resolve, reject) => {\n    let buffer = '';\n    let timer: ReturnType<typeof setTimeout> | undefined;\n\n    if (timeoutMs !== undefined) {\n      timer = setTimeout(() => {\n        cleanup();\n        reject(new Error('Socket read timed out'));\n      }, timeoutMs);\n    }\n\n    const onData = (data: Buffer): void => {\n      buffer += data.toString();\n      const idx = buffer.indexOf('\\n');\n      if (idx !== -1) {\n        cleanup();\n        resolve(buffer.slice(0, idx));\n      }\n    };\n\n    const onError = (error: Error): void => {\n      cleanup();\n      reject(error);\n    };\n\n    const onEnd = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    const onClose = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    /**\n     * Remove listeners registered by this call and clear the timeout.\n     */\n    function cleanup(): void {\n      if (timer !== undefined) {\n        clearTimeout(timer);\n      }\n      socket.removeListener('data', onData);\n      socket.removeListener('error', onError);\n      socket.removeListener('end', onEnd);\n      socket.removeListener('close', onClose);\n    }\n\n    socket.on('data', onData);\n    socket.once('error', onError);\n    socket.once('end', onEnd);\n    socket.once('close', onClose);\n  });\n}\n"]}

package/dist/daemon/socket-line.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-line.d.cts","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB;AAEvC;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB3E;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAsDjB"}
+{"version":3,"file":"socket-line.d.cts","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB;AAEvC;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB3E;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAsDjB"}

package/dist/daemon/socket-line.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"socket-line.d.mts","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB;AAEvC;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyB3E;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAsDjB"}
+{"version":3,"file":"socket-line.d.mts","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,iBAAiB;AAEvC;;;;;GAKG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAoB3E;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,CAAC,CAsDjB"}

package/dist/daemon/socket-line.mjs

@@ -15,17 +15,13 @@ export async function writeLine(socket, line) {
         };
         socket.once('error', onError);
         socket.write(`${line}\n`, (error) => {
+            socket.removeListener('error', onError);
             if (error) {
-                // A failed write (e.g. EPIPE) is delivered BOTH here AND as a later
-                // 'error' event. Leave `onError` attached to handle that event —
-                // detaching here would let Node treat it as unhandled and crash the
-                // process. This reject settles the promise; `onError` detaches itself
-                // when/if the event arrives.
                 reject(error);
-                return;
             }
-            socket.removeListener('error', onError);
-            resolve();
+            else {
+                resolve();
+            }
         });
     });
 }

package/dist/daemon/socket-line.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"socket-line.mjs","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Socket } from 'node:net';\n\n/**\n * Write a newline-delimited line to a socket.\n *\n * @param socket - The socket to write to.\n * @param line - The line to write (without trailing newline).\n */\nexport async function writeLine(socket: Socket, line: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    // A socket 'error' can fire while the write is in flight without ever\n    // reaching the write callback; without this listener Node would treat it\n    // as an unhandled 'error' event and crash the process.\n    const onError = (error: Error): void => {\n      socket.removeListener('error', onError);\n      reject(error);\n    };\n    socket.once('error', onError);\n\n    socket.write(`${line}\\n`, (error) => {\n      if (error) {\n        // A failed write (e.g. EPIPE) is delivered BOTH here AND as a later\n        // 'error' event. Leave `onError` attached to handle that event —\n        // detaching here would let Node treat it as unhandled and crash the\n        // process. This reject settles the promise; `onError` detaches itself\n        // when/if the event arrives.\n        reject(error);\n        return;\n      }\n      socket.removeListener('error', onError);\n      resolve();\n    });\n  });\n}\n\n/**\n * Read a single newline-delimited line from a socket.\n *\n * @param socket - The socket to read from.\n * @param timeoutMs - Optional timeout in milliseconds. Rejects with a timeout\n * error if no complete line is received within the limit.\n * @returns The line read (without trailing newline).\n */\nexport async function readLine(\n  socket: Socket,\n  timeoutMs?: number,\n): Promise<string> {\n  return new Promise((resolve, reject) => {\n    let buffer = '';\n    let timer: ReturnType<typeof setTimeout> | undefined;\n\n    if (timeoutMs !== undefined) {\n      timer = setTimeout(() => {\n        cleanup();\n        reject(new Error('Socket read timed out'));\n      }, timeoutMs);\n    }\n\n    const onData = (data: Buffer): void => {\n      buffer += data.toString();\n      const idx = buffer.indexOf('\\n');\n      if (idx !== -1) {\n        cleanup();\n        resolve(buffer.slice(0, idx));\n      }\n    };\n\n    const onError = (error: Error): void => {\n      cleanup();\n      reject(error);\n    };\n\n    const onEnd = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    const onClose = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    /**\n     * Remove listeners registered by this call and clear the timeout.\n     */\n    function cleanup(): void {\n      if (timer !== undefined) {\n        clearTimeout(timer);\n      }\n      socket.removeListener('data', onData);\n      socket.removeListener('error', onError);\n      socket.removeListener('end', onEnd);\n      socket.removeListener('close', onClose);\n    }\n\n    socket.on('data', onData);\n    socket.once('error', onError);\n    socket.once('end', onEnd);\n    socket.once('close', onClose);\n  });\n}\n"]}
+{"version":3,"file":"socket-line.mjs","sourceRoot":"","sources":["../../src/daemon/socket-line.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAc,EAAE,IAAY;IAC1D,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,sEAAsE;QACtE,yEAAyE;QACzE,uDAAuD;QACvD,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE9B,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YAClC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;iBAAM,CAAC;gBACN,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,MAAc,EACd,SAAkB;IAElB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,KAAgD,CAAC;QAErD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;gBACtB,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAC7C,CAAC,EAAE,SAAS,CAAC,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,CAAC,IAAY,EAAQ,EAAE;YACpC,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,OAAO,EAAE,CAAC;gBACV,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YAChC,CAAC;QACH,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,CAAC,KAAY,EAAQ,EAAE;YACrC,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,GAAS,EAAE;YACvB,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,OAAO,EAAE,CAAC;YACV,MAAM,CAAC,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC,CAAC;QAC9D,CAAC,CAAC;QAEF;;WAEG;QACH,SAAS,OAAO;YACd,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,YAAY,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC;YACD,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACxC,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACpC,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import type { Socket } from 'node:net';\n\n/**\n * Write a newline-delimited line to a socket.\n *\n * @param socket - The socket to write to.\n * @param line - The line to write (without trailing newline).\n */\nexport async function writeLine(socket: Socket, line: string): Promise<void> {\n  return new Promise((resolve, reject) => {\n    // A socket 'error' can fire while the write is in flight without ever\n    // reaching the write callback; without this listener Node would treat it\n    // as an unhandled 'error' event and crash the process.\n    const onError = (error: Error): void => {\n      socket.removeListener('error', onError);\n      reject(error);\n    };\n    socket.once('error', onError);\n\n    socket.write(`${line}\\n`, (error) => {\n      socket.removeListener('error', onError);\n      if (error) {\n        reject(error);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n/**\n * Read a single newline-delimited line from a socket.\n *\n * @param socket - The socket to read from.\n * @param timeoutMs - Optional timeout in milliseconds. Rejects with a timeout\n * error if no complete line is received within the limit.\n * @returns The line read (without trailing newline).\n */\nexport async function readLine(\n  socket: Socket,\n  timeoutMs?: number,\n): Promise<string> {\n  return new Promise((resolve, reject) => {\n    let buffer = '';\n    let timer: ReturnType<typeof setTimeout> | undefined;\n\n    if (timeoutMs !== undefined) {\n      timer = setTimeout(() => {\n        cleanup();\n        reject(new Error('Socket read timed out'));\n      }, timeoutMs);\n    }\n\n    const onData = (data: Buffer): void => {\n      buffer += data.toString();\n      const idx = buffer.indexOf('\\n');\n      if (idx !== -1) {\n        cleanup();\n        resolve(buffer.slice(0, idx));\n      }\n    };\n\n    const onError = (error: Error): void => {\n      cleanup();\n      reject(error);\n    };\n\n    const onEnd = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    const onClose = (): void => {\n      cleanup();\n      reject(new Error('Socket closed before response received'));\n    };\n\n    /**\n     * Remove listeners registered by this call and clear the timeout.\n     */\n    function cleanup(): void {\n      if (timer !== undefined) {\n        clearTimeout(timer);\n      }\n      socket.removeListener('data', onData);\n      socket.removeListener('error', onError);\n      socket.removeListener('end', onEnd);\n      socket.removeListener('close', onClose);\n    }\n\n    socket.on('data', onData);\n    socket.once('error', onError);\n    socket.once('end', onEnd);\n    socket.once('close', onClose);\n  });\n}\n"]}

package/dist/daemon/stop-daemon.cjs

@@ -5,25 +5,15 @@ const promises_1 = require("node:fs/promises");
 const daemon_client_1 = require("./daemon-client.cjs");
 const utils_1 = require("./utils.cjs");
 /**
- * Stop the daemon, preferring a graceful shutdown.
+ * Stop the daemon via a `shutdown` RPC call. Falls back to PID + SIGTERM if
+ * the socket is unresponsive, and escalates to SIGKILL if SIGTERM is ignored.
  *
- * Resolution order when a live daemon is present:
- * 1. If the socket is responsive, request a graceful `shutdown` over it.
- * 2. If the recorded PID is still alive, escalate to SIGTERM.
- * 3. ...then SIGKILL.
- *
- * Signals (steps 2-3) are only ever sent against a PID that is observed alive.
- * The socket-absent + alive-PID branch trades a small risk of signalling a
+ * Signals are sent when EITHER the socket was observed (`responsive` or
+ * `unreachable`) OR the recorded PID is still alive on its own. The
+ * socket-absent + alive-PID branch trades a small risk of signalling a
  * recycled PID for the larger risk of leaving an orphan daemon holding the
- * SQLite database — which `daemon purge` would otherwise wipe out from under
- * it.
- *
- * When the socket is NOT responsive AND the recorded PID is dead (or there is
- * no PID file), there is no live daemon: a lingering socket or PID file is
- * stale leftovers from a daemon that already exited — typically one that
- * crashed without running its own cleanup. Those files are removed and the
- * stop is reported as successful, rather than failing on a daemon that is
- * already gone.
+ * SQLite database — which `daemon purge` would otherwise wipe out from
+ * under it.
  *
  * @param socketPath - The daemon socket path.
  * @param pidPath - The daemon PID file path.
@@ -35,13 +25,9 @@ async function stopDaemon(socketPath, pidPath, log) {
     const ping = await (0, daemon_client_1.pingDaemon)(socketPath);
     const socketObserved = ping.status === 'responsive' || ping.status === 'unreachable';
     const processAlive = pid !== undefined && (0, utils_1.isProcessAlive)(pid);
-    // Only `absent` and `refused` prove no live daemon; `permission`/`timeout`/
-    // `protocol` may be a wedged or foreign daemon, so those fall through.
-    const socketProvenGone = ping.status === 'absent' ||
-        (ping.status === 'unreachable' && ping.reason === 'refused');
-    if (socketProvenGone && !processAlive) {
+    if (!socketObserved && !processAlive) {
+        // No live daemon evidence. Just remove the stale PID file if any.
         await cleanupFile(pidPath, 'PID file', log);
-        await cleanupFile(socketPath, 'socket file', log);
         return true;
     }
     log?.('Stopping daemon...');

package/dist/daemon/stop-daemon.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"stop-daemon.cjs","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"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","sourcesContent":["import { rm } from 'node:fs/promises';\n\nimport { pingDaemon, sendCommand } from './daemon-client';\nimport { isProcessAlive, readPidFile, sendSignal, waitFor } from './utils';\n\n/**\n * Stop the daemon, preferring a graceful shutdown.\n *\n * Resolution order when a live daemon is present:\n * 1. If the socket is responsive, request a graceful `shutdown` over it.\n * 2. If the recorded PID is still alive, escalate to SIGTERM.\n * 3. ...then SIGKILL.\n *\n * Signals (steps 2-3) are only ever sent against a PID that is observed alive.\n * The socket-absent + alive-PID branch trades a small risk of signalling a\n * recycled PID for the larger risk of leaving an orphan daemon holding the\n * SQLite database — which `daemon purge` would otherwise wipe out from under\n * it.\n *\n * When the socket is NOT responsive AND the recorded PID is dead (or there is\n * no PID file), there is no live daemon: a lingering socket or PID file is\n * stale leftovers from a daemon that already exited — typically one that\n * crashed without running its own cleanup. Those files are removed and the\n * stop is reported as successful, rather than failing on a daemon that is\n * already gone.\n *\n * @param socketPath - The daemon socket path.\n * @param pidPath - The daemon PID file path.\n * @param log - Optional logging function for status messages.\n * @returns True if the daemon was stopped (or was not running).\n */\nexport async function stopDaemon(\n  socketPath: string,\n  pidPath: string,\n  log?: (message: string) => void,\n): Promise<boolean> {\n  const pid = await readPidFile(pidPath);\n  const ping = await pingDaemon(socketPath);\n  const socketObserved =\n    ping.status === 'responsive' || ping.status === 'unreachable';\n  const processAlive = pid !== undefined && isProcessAlive(pid);\n\n  // Only `absent` and `refused` prove no live daemon; `permission`/`timeout`/\n  // `protocol` may be a wedged or foreign daemon, so those fall through.\n  const socketProvenGone =\n    ping.status === 'absent' ||\n    (ping.status === 'unreachable' && ping.reason === 'refused');\n\n  if (socketProvenGone && !processAlive) {\n    await cleanupFile(pidPath, 'PID file', log);\n    await cleanupFile(socketPath, 'socket file', log);\n    return true;\n  }\n\n  log?.('Stopping daemon...');\n\n  let stopped = false;\n\n  // Strategy 1: Graceful socket-based shutdown.\n  if (ping.status === 'responsive') {\n    try {\n      await sendCommand({ socketPath, method: 'shutdown' });\n    } catch (error) {\n      log?.(`Graceful shutdown request failed: ${String(error)}`);\n    }\n    // A quiet socket does not prove the process exited; require the recorded\n    // pid to be gone too, so a daemon that outlived its socket falls through to\n    // SIGTERM/SIGKILL rather than being orphaned.\n    stopped = await waitFor(\n      async () =>\n        (await pingDaemon(socketPath)).status !== 'responsive' &&\n        (pid === undefined || !isProcessAlive(pid)),\n      5_000,\n    );\n  }\n\n  // Strategy 2: SIGTERM. Signal when either the socket was observed or the\n  // recorded PID is alive; the absent+alive case typically means someone\n  // removed the socket from under a live daemon.\n  if (!stopped && processAlive && pid !== undefined) {\n    if (!socketObserved) {\n      log?.(\n        `Socket at ${socketPath} is absent but recorded pid ${pid} is alive; signalling anyway.`,\n      );\n    }\n    try {\n      if (sendSignal(pid, 'SIGTERM')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 5_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGTERM failed: ${String(error)}`);\n    }\n  }\n\n  // Strategy 3: SIGKILL.\n  if (!stopped && processAlive && pid !== undefined) {\n    try {\n      if (sendSignal(pid, 'SIGKILL')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 2_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGKILL failed: ${String(error)}`);\n    }\n  }\n\n  if (stopped) {\n    await cleanupFile(pidPath, 'PID file', log);\n    await cleanupFile(socketPath, 'socket file', log);\n    log?.('Daemon stopped.');\n  }\n\n  return stopped;\n}\n\n/**\n * Remove a file best-effort, logging any failure rather than letting it\n * propagate. ENOENT is silently ignored via `force: true`.\n *\n * @param path - The file path to remove.\n * @param label - Human-readable label for log messages.\n * @param log - Optional log sink.\n */\nasync function cleanupFile(\n  path: string,\n  label: string,\n  log: ((message: string) => void) | undefined,\n): Promise<void> {\n  await rm(path, { force: true }).catch((error: unknown) => {\n    log?.(`Failed to remove ${label}: ${String(error)}`);\n  });\n}\n"]}
+{"version":3,"file":"stop-daemon.cjs","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":";;;AAAA,+CAAsC;AAEtC,uDAA0D;AAC1D,uCAA2E;AAE3E;;;;;;;;;;;;;;;GAeG;AACI,KAAK,UAAU,UAAU,CAC9B,UAAkB,EAClB,OAAe,EACf,GAA+B;IAE/B,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IACvC,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAU,EAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,cAAc,GAClB,IAAI,CAAC,MAAM,KAAK,YAAY,IAAI,IAAI,CAAC,MAAM,KAAK,aAAa,CAAC;IAChE,MAAM,YAAY,GAAG,GAAG,KAAK,SAAS,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,CAAC;IAE9D,IAAI,CAAC,cAAc,IAAI,CAAC,YAAY,EAAE,CAAC;QACrC,kEAAkE;QAClE,MAAM,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC;IAE5B,IAAI,OAAO,GAAG,KAAK,CAAC;IAEpB,8CAA8C;IAC9C,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,IAAA,2BAAW,EAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,EAAE,CAAC,qCAAqC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,yEAAyE;QACzE,4EAA4E;QAC5E,8CAA8C;QAC9C,OAAO,GAAG,MAAM,IAAA,eAAO,EACrB,KAAK,IAAI,EAAE,CACT,CAAC,MAAM,IAAA,0BAAU,EAAC,UAAU,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY;YACtD,CAAC,GAAG,KAAK,SAAS,IAAI,CAAC,IAAA,sBAAc,EAAC,GAAG,CAAC,CAAC,EAC7C,IAAK,CACN,CAAC;IACJ,CAAC;IAED,yEAAyE;IACzE,uEAAuE;IACvE,+CAA+C;IAC/C,IAAI,CAAC,OAAO,IAAI,YAAY,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QAClD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,GAAG,EAAE,CACH,aAAa,UAAU,+BAA+B,GAAG,+BAA+B,CACzF,CAAC;QACJ,CAAC;QACD,IAAI,CAAC;YACH,IAAI,IAAA,kBAAU,EAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC;gBAC/B,OAAO,GAAG,MAAM,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,CAAC,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE,IAAK,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,IAAI,CAAC,CAAC,gCAAgC;YAClD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,EAAE,CAAC,mBAAmB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,IAAI,CAAC,OAAO,IAAI,YAAY,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QAClD,IAAI,CAAC;YACH,IAAI,IAAA,kBAAU,EAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC;gBAC/B,OAAO,GAAG,MAAM,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,CAAC,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE,IAAK,CAAC,CAAC;YAC7D,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,IAAI,CAAC,CAAC,gCAAgC;YAClD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,EAAE,CAAC,mBAAmB,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,WAAW,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;QAClD,GAAG,EAAE,CAAC,iBAAiB,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AA/ED,gCA+EC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,WAAW,CACxB,IAAY,EACZ,KAAa,EACb,GAA4C;IAE5C,MAAM,IAAA,aAAE,EAAC,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;QACvD,GAAG,EAAE,CAAC,oBAAoB,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import { rm } from 'node:fs/promises';\n\nimport { pingDaemon, sendCommand } from './daemon-client';\nimport { isProcessAlive, readPidFile, sendSignal, waitFor } from './utils';\n\n/**\n * Stop the daemon via a `shutdown` RPC call. Falls back to PID + SIGTERM if\n * the socket is unresponsive, and escalates to SIGKILL if SIGTERM is ignored.\n *\n * Signals are sent when EITHER the socket was observed (`responsive` or\n * `unreachable`) OR the recorded PID is still alive on its own. The\n * socket-absent + alive-PID branch trades a small risk of signalling a\n * recycled PID for the larger risk of leaving an orphan daemon holding the\n * SQLite database — which `daemon purge` would otherwise wipe out from\n * under it.\n *\n * @param socketPath - The daemon socket path.\n * @param pidPath - The daemon PID file path.\n * @param log - Optional logging function for status messages.\n * @returns True if the daemon was stopped (or was not running).\n */\nexport async function stopDaemon(\n  socketPath: string,\n  pidPath: string,\n  log?: (message: string) => void,\n): Promise<boolean> {\n  const pid = await readPidFile(pidPath);\n  const ping = await pingDaemon(socketPath);\n  const socketObserved =\n    ping.status === 'responsive' || ping.status === 'unreachable';\n  const processAlive = pid !== undefined && isProcessAlive(pid);\n\n  if (!socketObserved && !processAlive) {\n    // No live daemon evidence. Just remove the stale PID file if any.\n    await cleanupFile(pidPath, 'PID file', log);\n    return true;\n  }\n\n  log?.('Stopping daemon...');\n\n  let stopped = false;\n\n  // Strategy 1: Graceful socket-based shutdown.\n  if (ping.status === 'responsive') {\n    try {\n      await sendCommand({ socketPath, method: 'shutdown' });\n    } catch (error) {\n      log?.(`Graceful shutdown request failed: ${String(error)}`);\n    }\n    // A quiet socket does not prove the process exited; require the recorded\n    // pid to be gone too, so a daemon that outlived its socket falls through to\n    // SIGTERM/SIGKILL rather than being orphaned.\n    stopped = await waitFor(\n      async () =>\n        (await pingDaemon(socketPath)).status !== 'responsive' &&\n        (pid === undefined || !isProcessAlive(pid)),\n      5_000,\n    );\n  }\n\n  // Strategy 2: SIGTERM. Signal when either the socket was observed or the\n  // recorded PID is alive; the absent+alive case typically means someone\n  // removed the socket from under a live daemon.\n  if (!stopped && processAlive && pid !== undefined) {\n    if (!socketObserved) {\n      log?.(\n        `Socket at ${socketPath} is absent but recorded pid ${pid} is alive; signalling anyway.`,\n      );\n    }\n    try {\n      if (sendSignal(pid, 'SIGTERM')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 5_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGTERM failed: ${String(error)}`);\n    }\n  }\n\n  // Strategy 3: SIGKILL.\n  if (!stopped && processAlive && pid !== undefined) {\n    try {\n      if (sendSignal(pid, 'SIGKILL')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 2_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGKILL failed: ${String(error)}`);\n    }\n  }\n\n  if (stopped) {\n    await cleanupFile(pidPath, 'PID file', log);\n    await cleanupFile(socketPath, 'socket file', log);\n    log?.('Daemon stopped.');\n  }\n\n  return stopped;\n}\n\n/**\n * Remove a file best-effort, logging any failure rather than letting it\n * propagate. ENOENT is silently ignored via `force: true`.\n *\n * @param path - The file path to remove.\n * @param label - Human-readable label for log messages.\n * @param log - Optional log sink.\n */\nasync function cleanupFile(\n  path: string,\n  label: string,\n  log: ((message: string) => void) | undefined,\n): Promise<void> {\n  await rm(path, { force: true }).catch((error: unknown) => {\n    log?.(`Failed to remove ${label}: ${String(error)}`);\n  });\n}\n"]}

package/dist/daemon/stop-daemon.d.cts

@@ -1,23 +1,13 @@
 /**
- * Stop the daemon, preferring a graceful shutdown.
+ * Stop the daemon via a `shutdown` RPC call. Falls back to PID + SIGTERM if
+ * the socket is unresponsive, and escalates to SIGKILL if SIGTERM is ignored.
  *
- * Resolution order when a live daemon is present:
- * 1. If the socket is responsive, request a graceful `shutdown` over it.
- * 2. If the recorded PID is still alive, escalate to SIGTERM.
- * 3. ...then SIGKILL.
- *
- * Signals (steps 2-3) are only ever sent against a PID that is observed alive.
- * The socket-absent + alive-PID branch trades a small risk of signalling a
+ * Signals are sent when EITHER the socket was observed (`responsive` or
+ * `unreachable`) OR the recorded PID is still alive on its own. The
+ * socket-absent + alive-PID branch trades a small risk of signalling a
  * recycled PID for the larger risk of leaving an orphan daemon holding the
- * SQLite database — which `daemon purge` would otherwise wipe out from under
- * it.
- *
- * When the socket is NOT responsive AND the recorded PID is dead (or there is
- * no PID file), there is no live daemon: a lingering socket or PID file is
- * stale leftovers from a daemon that already exited — typically one that
- * crashed without running its own cleanup. Those files are removed and the
- * stop is reported as successful, rather than failing on a daemon that is
- * already gone.
+ * SQLite database — which `daemon purge` would otherwise wipe out from
+ * under it.
  *
  * @param socketPath - The daemon socket path.
  * @param pidPath - The daemon PID file path.

package/dist/daemon/stop-daemon.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"stop-daemon.d.cts","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,UAAU,CAC9B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,CAAC,OAAO,CAAC,CAiFlB"}
+{"version":3,"file":"stop-daemon.d.cts","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,UAAU,CAC9B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,CAAC,OAAO,CAAC,CA2ElB"}

package/dist/daemon/stop-daemon.d.mts

@@ -1,23 +1,13 @@
 /**
- * Stop the daemon, preferring a graceful shutdown.
+ * Stop the daemon via a `shutdown` RPC call. Falls back to PID + SIGTERM if
+ * the socket is unresponsive, and escalates to SIGKILL if SIGTERM is ignored.
  *
- * Resolution order when a live daemon is present:
- * 1. If the socket is responsive, request a graceful `shutdown` over it.
- * 2. If the recorded PID is still alive, escalate to SIGTERM.
- * 3. ...then SIGKILL.
- *
- * Signals (steps 2-3) are only ever sent against a PID that is observed alive.
- * The socket-absent + alive-PID branch trades a small risk of signalling a
+ * Signals are sent when EITHER the socket was observed (`responsive` or
+ * `unreachable`) OR the recorded PID is still alive on its own. The
+ * socket-absent + alive-PID branch trades a small risk of signalling a
  * recycled PID for the larger risk of leaving an orphan daemon holding the
- * SQLite database — which `daemon purge` would otherwise wipe out from under
- * it.
- *
- * When the socket is NOT responsive AND the recorded PID is dead (or there is
- * no PID file), there is no live daemon: a lingering socket or PID file is
- * stale leftovers from a daemon that already exited — typically one that
- * crashed without running its own cleanup. Those files are removed and the
- * stop is reported as successful, rather than failing on a daemon that is
- * already gone.
+ * SQLite database — which `daemon purge` would otherwise wipe out from
+ * under it.
  *
  * @param socketPath - The daemon socket path.
  * @param pidPath - The daemon PID file path.

package/dist/daemon/stop-daemon.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"stop-daemon.d.mts","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,UAAU,CAC9B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,CAAC,OAAO,CAAC,CAiFlB"}
+{"version":3,"file":"stop-daemon.d.mts","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,UAAU,CAC9B,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC9B,OAAO,CAAC,OAAO,CAAC,CA2ElB"}

package/dist/daemon/stop-daemon.mjs

@@ -2,25 +2,15 @@ import { rm } from "node:fs/promises";
 import { pingDaemon, sendCommand } from "./daemon-client.mjs";
 import { isProcessAlive, readPidFile, sendSignal, waitFor } from "./utils.mjs";
 /**
- * Stop the daemon, preferring a graceful shutdown.
+ * Stop the daemon via a `shutdown` RPC call. Falls back to PID + SIGTERM if
+ * the socket is unresponsive, and escalates to SIGKILL if SIGTERM is ignored.
  *
- * Resolution order when a live daemon is present:
- * 1. If the socket is responsive, request a graceful `shutdown` over it.
- * 2. If the recorded PID is still alive, escalate to SIGTERM.
- * 3. ...then SIGKILL.
- *
- * Signals (steps 2-3) are only ever sent against a PID that is observed alive.
- * The socket-absent + alive-PID branch trades a small risk of signalling a
+ * Signals are sent when EITHER the socket was observed (`responsive` or
+ * `unreachable`) OR the recorded PID is still alive on its own. The
+ * socket-absent + alive-PID branch trades a small risk of signalling a
  * recycled PID for the larger risk of leaving an orphan daemon holding the
- * SQLite database — which `daemon purge` would otherwise wipe out from under
- * it.
- *
- * When the socket is NOT responsive AND the recorded PID is dead (or there is
- * no PID file), there is no live daemon: a lingering socket or PID file is
- * stale leftovers from a daemon that already exited — typically one that
- * crashed without running its own cleanup. Those files are removed and the
- * stop is reported as successful, rather than failing on a daemon that is
- * already gone.
+ * SQLite database — which `daemon purge` would otherwise wipe out from
+ * under it.
  *
  * @param socketPath - The daemon socket path.
  * @param pidPath - The daemon PID file path.
@@ -32,13 +22,9 @@ export async function stopDaemon(socketPath, pidPath, log) {
     const ping = await pingDaemon(socketPath);
     const socketObserved = ping.status === 'responsive' || ping.status === 'unreachable';
     const processAlive = pid !== undefined && isProcessAlive(pid);
-    // Only `absent` and `refused` prove no live daemon; `permission`/`timeout`/
-    // `protocol` may be a wedged or foreign daemon, so those fall through.
-    const socketProvenGone = ping.status === 'absent' ||
-        (ping.status === 'unreachable' && ping.reason === 'refused');
-    if (socketProvenGone && !processAlive) {
+    if (!socketObserved && !processAlive) {
+        // No live daemon evidence. Just remove the stale PID file if any.
         await cleanupFile(pidPath, 'PID file', log);
-        await cleanupFile(socketPath, 'socket file', log);
         return true;
     }
     log?.('Stopping daemon...');

package/dist/daemon/stop-daemon.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"stop-daemon.mjs","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"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","sourcesContent":["import { rm } from 'node:fs/promises';\n\nimport { pingDaemon, sendCommand } from './daemon-client';\nimport { isProcessAlive, readPidFile, sendSignal, waitFor } from './utils';\n\n/**\n * Stop the daemon, preferring a graceful shutdown.\n *\n * Resolution order when a live daemon is present:\n * 1. If the socket is responsive, request a graceful `shutdown` over it.\n * 2. If the recorded PID is still alive, escalate to SIGTERM.\n * 3. ...then SIGKILL.\n *\n * Signals (steps 2-3) are only ever sent against a PID that is observed alive.\n * The socket-absent + alive-PID branch trades a small risk of signalling a\n * recycled PID for the larger risk of leaving an orphan daemon holding the\n * SQLite database — which `daemon purge` would otherwise wipe out from under\n * it.\n *\n * When the socket is NOT responsive AND the recorded PID is dead (or there is\n * no PID file), there is no live daemon: a lingering socket or PID file is\n * stale leftovers from a daemon that already exited — typically one that\n * crashed without running its own cleanup. Those files are removed and the\n * stop is reported as successful, rather than failing on a daemon that is\n * already gone.\n *\n * @param socketPath - The daemon socket path.\n * @param pidPath - The daemon PID file path.\n * @param log - Optional logging function for status messages.\n * @returns True if the daemon was stopped (or was not running).\n */\nexport async function stopDaemon(\n  socketPath: string,\n  pidPath: string,\n  log?: (message: string) => void,\n): Promise<boolean> {\n  const pid = await readPidFile(pidPath);\n  const ping = await pingDaemon(socketPath);\n  const socketObserved =\n    ping.status === 'responsive' || ping.status === 'unreachable';\n  const processAlive = pid !== undefined && isProcessAlive(pid);\n\n  // Only `absent` and `refused` prove no live daemon; `permission`/`timeout`/\n  // `protocol` may be a wedged or foreign daemon, so those fall through.\n  const socketProvenGone =\n    ping.status === 'absent' ||\n    (ping.status === 'unreachable' && ping.reason === 'refused');\n\n  if (socketProvenGone && !processAlive) {\n    await cleanupFile(pidPath, 'PID file', log);\n    await cleanupFile(socketPath, 'socket file', log);\n    return true;\n  }\n\n  log?.('Stopping daemon...');\n\n  let stopped = false;\n\n  // Strategy 1: Graceful socket-based shutdown.\n  if (ping.status === 'responsive') {\n    try {\n      await sendCommand({ socketPath, method: 'shutdown' });\n    } catch (error) {\n      log?.(`Graceful shutdown request failed: ${String(error)}`);\n    }\n    // A quiet socket does not prove the process exited; require the recorded\n    // pid to be gone too, so a daemon that outlived its socket falls through to\n    // SIGTERM/SIGKILL rather than being orphaned.\n    stopped = await waitFor(\n      async () =>\n        (await pingDaemon(socketPath)).status !== 'responsive' &&\n        (pid === undefined || !isProcessAlive(pid)),\n      5_000,\n    );\n  }\n\n  // Strategy 2: SIGTERM. Signal when either the socket was observed or the\n  // recorded PID is alive; the absent+alive case typically means someone\n  // removed the socket from under a live daemon.\n  if (!stopped && processAlive && pid !== undefined) {\n    if (!socketObserved) {\n      log?.(\n        `Socket at ${socketPath} is absent but recorded pid ${pid} is alive; signalling anyway.`,\n      );\n    }\n    try {\n      if (sendSignal(pid, 'SIGTERM')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 5_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGTERM failed: ${String(error)}`);\n    }\n  }\n\n  // Strategy 3: SIGKILL.\n  if (!stopped && processAlive && pid !== undefined) {\n    try {\n      if (sendSignal(pid, 'SIGKILL')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 2_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGKILL failed: ${String(error)}`);\n    }\n  }\n\n  if (stopped) {\n    await cleanupFile(pidPath, 'PID file', log);\n    await cleanupFile(socketPath, 'socket file', log);\n    log?.('Daemon stopped.');\n  }\n\n  return stopped;\n}\n\n/**\n * Remove a file best-effort, logging any failure rather than letting it\n * propagate. ENOENT is silently ignored via `force: true`.\n *\n * @param path - The file path to remove.\n * @param label - Human-readable label for log messages.\n * @param log - Optional log sink.\n */\nasync function cleanupFile(\n  path: string,\n  label: string,\n  log: ((message: string) => void) | undefined,\n): Promise<void> {\n  await rm(path, { force: true }).catch((error: unknown) => {\n    log?.(`Failed to remove ${label}: ${String(error)}`);\n  });\n}\n"]}
+{"version":3,"file":"stop-daemon.mjs","sourceRoot":"","sources":["../../src/daemon/stop-daemon.ts"],"names":[],"mappings":"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","sourcesContent":["import { rm } from 'node:fs/promises';\n\nimport { pingDaemon, sendCommand } from './daemon-client';\nimport { isProcessAlive, readPidFile, sendSignal, waitFor } from './utils';\n\n/**\n * Stop the daemon via a `shutdown` RPC call. Falls back to PID + SIGTERM if\n * the socket is unresponsive, and escalates to SIGKILL if SIGTERM is ignored.\n *\n * Signals are sent when EITHER the socket was observed (`responsive` or\n * `unreachable`) OR the recorded PID is still alive on its own. The\n * socket-absent + alive-PID branch trades a small risk of signalling a\n * recycled PID for the larger risk of leaving an orphan daemon holding the\n * SQLite database — which `daemon purge` would otherwise wipe out from\n * under it.\n *\n * @param socketPath - The daemon socket path.\n * @param pidPath - The daemon PID file path.\n * @param log - Optional logging function for status messages.\n * @returns True if the daemon was stopped (or was not running).\n */\nexport async function stopDaemon(\n  socketPath: string,\n  pidPath: string,\n  log?: (message: string) => void,\n): Promise<boolean> {\n  const pid = await readPidFile(pidPath);\n  const ping = await pingDaemon(socketPath);\n  const socketObserved =\n    ping.status === 'responsive' || ping.status === 'unreachable';\n  const processAlive = pid !== undefined && isProcessAlive(pid);\n\n  if (!socketObserved && !processAlive) {\n    // No live daemon evidence. Just remove the stale PID file if any.\n    await cleanupFile(pidPath, 'PID file', log);\n    return true;\n  }\n\n  log?.('Stopping daemon...');\n\n  let stopped = false;\n\n  // Strategy 1: Graceful socket-based shutdown.\n  if (ping.status === 'responsive') {\n    try {\n      await sendCommand({ socketPath, method: 'shutdown' });\n    } catch (error) {\n      log?.(`Graceful shutdown request failed: ${String(error)}`);\n    }\n    // A quiet socket does not prove the process exited; require the recorded\n    // pid to be gone too, so a daemon that outlived its socket falls through to\n    // SIGTERM/SIGKILL rather than being orphaned.\n    stopped = await waitFor(\n      async () =>\n        (await pingDaemon(socketPath)).status !== 'responsive' &&\n        (pid === undefined || !isProcessAlive(pid)),\n      5_000,\n    );\n  }\n\n  // Strategy 2: SIGTERM. Signal when either the socket was observed or the\n  // recorded PID is alive; the absent+alive case typically means someone\n  // removed the socket from under a live daemon.\n  if (!stopped && processAlive && pid !== undefined) {\n    if (!socketObserved) {\n      log?.(\n        `Socket at ${socketPath} is absent but recorded pid ${pid} is alive; signalling anyway.`,\n      );\n    }\n    try {\n      if (sendSignal(pid, 'SIGTERM')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 5_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGTERM failed: ${String(error)}`);\n    }\n  }\n\n  // Strategy 3: SIGKILL.\n  if (!stopped && processAlive && pid !== undefined) {\n    try {\n      if (sendSignal(pid, 'SIGKILL')) {\n        stopped = await waitFor(() => !isProcessAlive(pid), 2_000);\n      } else {\n        stopped = true; // Process already gone (ESRCH).\n      }\n    } catch (error) {\n      log?.(`SIGKILL failed: ${String(error)}`);\n    }\n  }\n\n  if (stopped) {\n    await cleanupFile(pidPath, 'PID file', log);\n    await cleanupFile(socketPath, 'socket file', log);\n    log?.('Daemon stopped.');\n  }\n\n  return stopped;\n}\n\n/**\n * Remove a file best-effort, logging any failure rather than letting it\n * propagate. ENOENT is silently ignored via `force: true`.\n *\n * @param path - The file path to remove.\n * @param label - Human-readable label for log messages.\n * @param log - Optional log sink.\n */\nasync function cleanupFile(\n  path: string,\n  label: string,\n  log: ((message: string) => void) | undefined,\n): Promise<void> {\n  await rm(path, { force: true }).catch((error: unknown) => {\n    log?.(`Failed to remove ${label}: ${String(error)}`);\n  });\n}\n"]}

package/dist/daemon/utils.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.waitFor = exports.sendSignal = exports.isProcessAlive = exports.readPidFile = exports.isStringArray = exports.formatJsonRpcError = exports.makeDaemonConnectionError = exports.isErrorWithCode = void 0;
+exports.waitFor = exports.sendSignal = exports.isProcessAlive = exports.readPidFile = exports.isErrorWithCode = void 0;
 const utils_1 = require("@metamask/utils");
 const promises_1 = require("node:fs/promises");
 /**
@@ -14,57 +14,6 @@ function isErrorWithCode(error, code) {
     return (0, utils_1.isErrorWithCode)(error) && error.code === code;
 }
 exports.isErrorWithCode = isErrorWithCode;
-/**
- * Turn an error thrown while contacting the daemon socket into a user-facing
- * message for `Command.error`, so every command reports the same failure the
- * same way. Distinguishes a stopped daemon (`ENOENT`/`ECONNREFUSED`), a
- * connection dropped mid-request (`ECONNRESET`), and a permission problem
- * (`EACCES`/`EPERM`), falling back to the raw error message.
- *
- * @param error - The value thrown while contacting the daemon.
- * @returns A human-readable explanation of the failure.
- */
-function makeDaemonConnectionError(error) {
-    if (isErrorWithCode(error, 'ENOENT') ||
-        isErrorWithCode(error, 'ECONNREFUSED')) {
-        return 'Daemon is not running. Start it with `mm daemon start`.';
-    }
-    // A reset drops an already-established connection, so the daemon was running
-    // — most likely it crashed mid-request. Don't tell the user to start it.
-    if (isErrorWithCode(error, 'ECONNRESET')) {
-        return ('Lost the connection to the daemon; it may have crashed while ' +
-            'handling the request. Check `mm daemon status` and the daemon log.');
-    }
-    if (isErrorWithCode(error, 'EACCES') || isErrorWithCode(error, 'EPERM')) {
-        return ('Cannot connect to the daemon socket: permission denied. ' +
-            'The socket may be owned by another user, or MM_DATA_DIR ' +
-            'may point to a directory you cannot access.');
-    }
-    return error instanceof Error ? error.message : String(error);
-}
-exports.makeDaemonConnectionError = makeDaemonConnectionError;
-/**
- * Format the error of a JSON-RPC failure response into a user-facing message
- * for `Command.error`, so every command reports RPC failures the same way.
- *
- * @param error - The `error` field of a JSON-RPC failure response.
- * @returns The error message annotated with its numeric code.
- */
-function formatJsonRpcError(error) {
-    return `${error.message} (code ${String(error.code)})`;
-}
-exports.formatJsonRpcError = formatJsonRpcError;
-/**
- * Check whether a value is an array of strings. Used to validate untyped RPC
- * results (e.g. the daemon's `listActions`) before treating them as `string[]`.
- *
- * @param value - The value to check.
- * @returns True if the value is an array whose every element is a string.
- */
-function isStringArray(value) {
-    return (Array.isArray(value) && value.every((item) => typeof item === 'string'));
-}
-exports.isStringArray = isStringArray;
 /**
  * Read a PID from a file. The file may contain just the PID, or the PID on
  * the first line followed by additional metadata (e.g. start time written by