swarm-mail 1.1.1 → 1.2.0

package/dist/daemon.d.ts

@@ -9,10 +9,10 @@
  * import { startDaemon, stopDaemon, isDaemonRunning, healthCheck } from 'swarm-mail/daemon';
  *
  * // Start daemon
- * const { pid, port } = await startDaemon({ port: 5433 });
+ * const { pid, port } = await startDaemon({ port: 15433 });
  *
  * // Check health
- * const healthy = await healthCheck({ port: 5433 });
+ * const healthy = await healthCheck({ port: 15433 });
  *
  * // Stop daemon
  * await stopDaemon('/path/to/project');
@@ -22,7 +22,7 @@
  * Daemon start options
  */
 export interface DaemonOptions {
-    /** TCP port to bind (default: 5433) */
+    /** TCP port to bind (default: 15433) */
     port?: number;
     /** Host to bind (default: 127.0.0.1) */
     host?: string;
@@ -55,6 +55,29 @@ export interface DaemonInfo {
  * @returns Absolute path to PID file
  */
 export declare function getPidFilePath(projectPath?: string): string;
+/**
+ * Read PID from PID file
+ *
+ * @param projectPath - Optional project root path
+ * @returns Process ID, or null if file doesn't exist or is invalid
+ */
+export declare function readPidFile(projectPath?: string): Promise<number | null>;
+/**
+ * Clean up stale PID file
+ *
+ * Removes PID file if it points to a dead process or doesn't exist.
+ * Used for self-healing when daemon startup fails due to stale state.
+ *
+ * @param projectPath - Optional project root path
+ *
+ * @example
+ * ```typescript
+ * // Clean up before starting daemon
+ * await cleanupPidFile('/path/to/project');
+ * await startDaemon({ port: 15433, projectPath: '/path/to/project' });
+ * ```
+ */
+export declare function cleanupPidFile(projectPath?: string): Promise<void>;
 /**
  * Check if daemon is running
  *
@@ -104,7 +127,7 @@ export declare function healthCheck(options: Pick<DaemonOptions, "port" | "host"
  * @example
  * ```typescript
  * // Start with TCP port
- * const { pid, port } = await startDaemon({ port: 5433 });
+ * const { pid, port } = await startDaemon({ port: 15433 });
  *
  * // Start with Unix socket
  * const { pid, socketPath } = await startDaemon({
@@ -113,7 +136,7 @@ export declare function healthCheck(options: Pick<DaemonOptions, "port" | "host"
  *
  * // Start with custom database path
  * const { pid, port } = await startDaemon({
- *   port: 5433,
+ *   port: 15433,
  *   dbPath: '/custom/path/to/db'
  * });
  * ```

package/dist/daemon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAoCH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,uCAAuC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,iBAAiB;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB3D;AAqGD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAM5E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,GACrD,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,WAAW,CAC/B,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAyErB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDpE"}
+{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../src/daemon.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAoCH;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gFAAgF;IAChF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uEAAuE;IACvE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,iBAAiB;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB3D;AA4BD;;;;;GAKG;AACH,wBAAsB,WAAW,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAe9E;AA2BD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKxE;AA2BD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAM5E;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC,GACrD,OAAO,CAAC,OAAO,CAAC,CA2BlB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAsB,WAAW,CAC/B,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC,CAsFrB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,UAAU,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmDpE"}

package/dist/index.js

@@ -19004,6 +19004,12 @@ async function deletePidFile(projectPath) {
     await unlink(pidFilePath);
   } catch {}
 }
+async function cleanupPidFile(projectPath) {
+  const pid = await readPidFile(projectPath);
+  if (!pid || !isProcessAlive(pid)) {
+    await deletePidFile(projectPath);
+  }
+}
 async function waitFor(condition, timeoutMs, intervalMs = 100) {
   const start = Date.now();
   while (Date.now() - start < timeoutMs) {
@@ -19026,7 +19032,7 @@ async function healthCheck(options) {
     const postgres = await import("postgres").then((m) => m.default);
     const sql = options.path ? postgres({ path: options.path }) : postgres({
       host: options.host || "127.0.0.1",
-      port: options.port || 5433,
+      port: options.port || 15433,
       max: 1
     });
     try {
@@ -19043,7 +19049,7 @@ async function healthCheck(options) {
   }
 }
 async function startDaemon(options = {}) {
-  const { port = 5433, host = "127.0.0.1", path: path2, dbPath, projectPath } = options;
+  const { port = 15433, host = "127.0.0.1", path: path2, dbPath, projectPath } = options;
   if (activeServer && activeProjectPath === projectPath) {
     return {
       pid: process.pid,
@@ -19062,6 +19068,15 @@ async function startDaemon(options = {}) {
       socketPath: path2
     };
   }
+  const healthOptions = path2 ? { path: path2 } : { port, host };
+  if (await healthCheck(healthOptions)) {
+    console.log(`[daemon] Port/socket already in use and healthy, assuming external daemon`);
+    return {
+      pid: process.pid,
+      port: path2 ? undefined : port,
+      socketPath: path2
+    };
+  }
   const finalDbPath = dbPath || getDatabasePath2(projectPath);
   const db = await PGlite2.create({
     dataDir: finalDbPath,
@@ -19073,7 +19088,6 @@ async function startDaemon(options = {}) {
   activeDb = db;
   activeProjectPath = projectPath;
   await writePidFile(process.pid, projectPath);
-  const healthOptions = path2 ? { path: path2 } : { port, host };
   const ready = await waitFor(() => healthCheck(healthOptions), 1e4);
   if (!ready) {
     await server.stop();
@@ -19357,17 +19371,50 @@ async function getSwarmMailSocketInternal(projectPath) {
   const projectKey = projectPath || getDatabasePath2(projectPath);
   const dbPath = getDatabasePath2(projectPath);
   const socketPath = process.env.SWARM_MAIL_SOCKET_PATH;
-  const port = process.env.SWARM_MAIL_SOCKET_PORT ? Number.parseInt(process.env.SWARM_MAIL_SOCKET_PORT, 10) : 5433;
+  const port = process.env.SWARM_MAIL_SOCKET_PORT ? Number.parseInt(process.env.SWARM_MAIL_SOCKET_PORT, 10) : 15433;
   const host = process.env.SWARM_MAIL_SOCKET_HOST || "127.0.0.1";
-  const running = await isDaemonRunning(projectPath);
-  if (!running) {
-    const daemonOptions = socketPath ? { path: socketPath, dbPath, projectPath } : { port, host, dbPath, projectPath };
-    await startDaemon(daemonOptions);
-  }
   const healthOptions = socketPath ? { path: socketPath } : { port, host };
-  const healthy = await healthCheck(healthOptions);
-  if (!healthy) {
-    throw new Error(`Daemon health check failed after startup (${socketPath ? `socket: ${socketPath}` : `TCP: ${host}:${port}`})`);
+  if (await healthCheck(healthOptions)) {
+    console.log("[swarm-mail] Daemon already healthy, connecting...");
+    const adapterOptions2 = socketPath ? { path: socketPath } : { host, port };
+    const db2 = await createSocketAdapter(adapterOptions2);
+    const adapter2 = createSwarmMailAdapter(db2, projectKey);
+    await adapter2.runMigrations();
+    return adapter2;
+  }
+  const pid = await readPidFile(projectPath);
+  if (pid) {
+    try {
+      process.kill(pid, 0);
+    } catch (e) {
+      const err = e;
+      if (err.code === "ESRCH") {
+        console.log(`[swarm-mail] Cleaning up stale PID file (dead process ${pid})`);
+        await cleanupPidFile(projectPath);
+      }
+    }
+  }
+  const daemonOptions = socketPath ? { path: socketPath, dbPath, projectPath } : { port, host, dbPath, projectPath };
+  for (let attempt = 0;attempt < 3; attempt++) {
+    try {
+      await startDaemon(daemonOptions);
+      break;
+    } catch (error45) {
+      const err = error45;
+      if (err.message?.includes("EADDRINUSE") || err.message?.includes("Failed to listen") || err.code === "EADDRINUSE") {
+        console.log(`[swarm-mail] Port busy on attempt ${attempt + 1}, checking if daemon is healthy...`);
+        await new Promise((resolve) => setTimeout(resolve, 100 * (attempt + 1)));
+        if (await healthCheck(healthOptions)) {
+          console.log("[swarm-mail] Daemon started by another process, connecting...");
+          break;
+        }
+      } else {
+        throw error45;
+      }
+    }
+  }
+  if (!await healthCheck(healthOptions)) {
+    throw new Error(`Failed to start or connect to daemon after retries (${socketPath ? `socket: ${socketPath}` : `TCP: ${host}:${port}`})`);
   }
   const adapterOptions = socketPath ? { path: socketPath } : { host, port };
   const db = await createSocketAdapter(adapterOptions);

package/dist/pglite.d.ts

@@ -109,7 +109,7 @@ export declare function getSwarmMail(projectPath?: string): Promise<SwarmMailAda
  *
  * **Port/Path Resolution:**
  * - Checks SWARM_MAIL_SOCKET_PATH env var for Unix socket
- * - Falls back to TCP on SWARM_MAIL_SOCKET_PORT (default: 5433)
+ * - Falls back to TCP on SWARM_MAIL_SOCKET_PORT (default: 15433)
  * - Host defaults to 127.0.0.1
  *
  * @param projectPath - Optional project root path
@@ -123,7 +123,7 @@ export declare function getSwarmMail(projectPath?: string): Promise<SwarmMailAda
  * const swarmMail = await getSwarmMailSocket('/path/to/project');
  *
  * // TCP socket
- * process.env.SWARM_MAIL_SOCKET_PORT = '5433';
+ * process.env.SWARM_MAIL_SOCKET_PORT = '15433';
  * const swarmMail = await getSwarmMailSocket('/path/to/project');
  * ```
  */

package/dist/pglite.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pglite.d.ts","sourceRoot":"","sources":["../src/pglite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAqDjE;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAkC1D;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQjE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB5D;AA0HD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAsB,YAAY,CAChC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAqD3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAS3B;AA0DD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,SAAS,GAClB,OAAO,CAAC,gBAAgB,CAAC,CAQ3B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYxE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAUvD;AAGD,OAAO,EAAE,MAAM,EAAE,CAAC"}
+{"version":3,"file":"pglite.d.ts","sourceRoot":"","sources":["../src/pglite.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAqDjE;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe,CAkC1D;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQjE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB5D;AA0HD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAsB,YAAY,CAChC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAqD3B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAsB,kBAAkB,CACtC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAS3B;AAuGD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,SAAS,GAClB,OAAO,CAAC,gBAAgB,CAAC,CAQ3B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYxE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAUvD;AAGD,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swarm-mail",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Event sourcing primitives for multi-agent coordination. Local-first, no external servers.",
   "type": "module",
   "main": "./dist/index.js",