cli-chat-mcp 0.3.0 → 0.3.1

package/README.md

@@ -17,10 +17,12 @@ agent surfaces the message and helps them reply.
 See [PLAN.md](./PLAN.md) for the full concept and roadmap.
 
 ## Requirements
-Node 22+ (uses the native global `WebSocket` for push; the inbox cache uses
-`node-sqlite3-wasm` — WebAssembly SQLite, no native build). That's all an end user
-needs — `npx` fetches the rest. State (identity, contacts, inbox cache) lives in
-`~/.cli-chat`, not next to the code, so it survives across `npx` runs.
+Node 22+ (uses the native global `WebSocket` for push). The inbox cache picks its
+SQLite driver automatically: native `node:sqlite` on Node 24+ (one shared WAL
+handle), falling back to `node-sqlite3-wasm` — WebAssembly SQLite, no native build
+— on Node 22/23. That's all an end user needs — `npx` fetches the rest. State
+(identity, contacts, inbox cache) lives in `~/.cli-chat`, not next to the code, so
+it survives across `npx` runs.
 
 ## Set up to message someone (no clone)
 

package/dist/check-inbox.js

@@ -52,30 +52,138 @@ function displayNameByKey(book, signPub) {
 }
 
 // src/db.ts
+import { createRequire } from "node:module";
 import sqlite from "node-sqlite3-wasm";
-var { Database } = sqlite;
-function openMailbox(path) {
-  const db = new Database(path);
+var { Database: WasmDatabase } = sqlite;
+var nodeMajor = Number(process.versions.node.split(".")[0]);
+var forcedDriver = process.env.MESSENGER_DB_DRIVER?.trim().toLowerCase();
+function loadNative() {
   try {
-    db.exec(`PRAGMA journal_mode = WAL; PRAGMA busy_timeout = 3000;`);
+    return createRequire(import.meta.url)("node:sqlite").DatabaseSync;
   } catch {
+    return void 0;
   }
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS messages (
-      id          TEXT PRIMARY KEY,
-      recipient   TEXT NOT NULL,
-      sender      TEXT NOT NULL,
-      body        TEXT NOT NULL,
-      tags        TEXT,
-      created_at  INTEGER NOT NULL,
-      fetched_at  INTEGER,
-      read_at     INTEGER,
-      in_reply_to TEXT
-    );
-    CREATE INDEX IF NOT EXISTS idx_recipient ON messages (recipient, created_at);
-  `);
+}
+var NativeDatabase = nodeMajor >= 24 || forcedDriver === "native" ? loadNative() : void 0;
+function chooseDriver() {
+  if (forcedDriver === "wasm") return "wasm";
+  if (forcedDriver === "native") return NativeDatabase ? "native" : "wasm";
+  return NativeDatabase ? "native" : "wasm";
+}
+var SCHEMA = `
+  CREATE TABLE IF NOT EXISTS messages (
+    id          TEXT PRIMARY KEY,
+    recipient   TEXT NOT NULL,
+    sender      TEXT NOT NULL,
+    body        TEXT NOT NULL,
+    tags        TEXT,
+    created_at  INTEGER NOT NULL,
+    fetched_at  INTEGER,
+    read_at     INTEGER,
+    in_reply_to TEXT
+  );
+  CREATE INDEX IF NOT EXISTS idx_recipient ON messages (recipient, created_at);
+`;
+var NativeStore = class {
+  #db;
+  constructor(path) {
+    const Db = NativeDatabase;
+    this.#db = new Db(path);
+    try {
+      this.#db.exec("PRAGMA journal_mode = WAL; PRAGMA busy_timeout = 5000;");
+    } catch {
+    }
+    this.#db.exec(SCHEMA);
+  }
+  run(sql, params = []) {
+    this.#db.prepare(sql).run(...params);
+  }
+  all(sql, params = []) {
+    return this.#db.prepare(sql).all(...params);
+  }
+  get(sql, params = []) {
+    return this.#db.prepare(sql).get(...params) ?? void 0;
+  }
+  close() {
+    this.#db.close();
+  }
+};
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function withRetry(fn, attempts = 6) {
+  let delay = 15;
+  for (let i = 0; ; i++) {
+    try {
+      return fn();
+    } catch (e) {
+      const msg = String(e?.message ?? e);
+      const retriable = /unable to open|database is locked|database table is locked|is busy/i.test(msg);
+      if (!retriable || i >= attempts) throw e;
+      sleepSync(delay);
+      delay = Math.min(delay * 2, 200);
+    }
+  }
+}
+function openWasm(path) {
+  const db = new WasmDatabase(path);
+  try {
+    db.exec("PRAGMA busy_timeout = 4000;");
+  } catch {
+  }
+  db.exec(SCHEMA);
   return db;
 }
+var WasmMemoryStore = class {
+  #db;
+  constructor(path) {
+    this.#db = openWasm(path);
+  }
+  run(sql, params = []) {
+    this.#db.run(sql, params);
+  }
+  all(sql, params = []) {
+    return this.#db.all(sql, params);
+  }
+  get(sql, params = []) {
+    return this.#db.get(sql, params) ?? void 0;
+  }
+  close() {
+    this.#db.close();
+  }
+};
+var WasmPerOpStore = class {
+  #path;
+  constructor(path) {
+    this.#path = path;
+  }
+  #with(fn) {
+    return withRetry(() => {
+      const db = openWasm(this.#path);
+      try {
+        return fn(db);
+      } finally {
+        db.close();
+      }
+    });
+  }
+  run(sql, params = []) {
+    this.#with((db) => db.run(sql, params));
+  }
+  all(sql, params = []) {
+    return this.#with((db) => db.all(sql, params));
+  }
+  get(sql, params = []) {
+    return this.#with((db) => db.get(sql, params)) ?? void 0;
+  }
+  close() {
+  }
+};
+function openMailbox(path) {
+  if (chooseDriver() === "native") return new NativeStore(path);
+  if (path === ":memory:") return new WasmMemoryStore(path);
+  return new WasmPerOpStore(path);
+}
 function insertMessage(db, m) {
   db.run(
     `INSERT INTO messages

package/dist/server-net.js

@@ -89,30 +89,138 @@ function contactByKey(book, signPub) {
 }
 
 // src/db.ts
+import { createRequire } from "node:module";
 import sqlite from "node-sqlite3-wasm";
-var { Database } = sqlite;
-function openMailbox(path) {
-  const db = new Database(path);
+var { Database: WasmDatabase } = sqlite;
+var nodeMajor = Number(process.versions.node.split(".")[0]);
+var forcedDriver = process.env.MESSENGER_DB_DRIVER?.trim().toLowerCase();
+function loadNative() {
   try {
-    db.exec(`PRAGMA journal_mode = WAL; PRAGMA busy_timeout = 3000;`);
+    return createRequire(import.meta.url)("node:sqlite").DatabaseSync;
   } catch {
+    return void 0;
   }
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS messages (
-      id          TEXT PRIMARY KEY,
-      recipient   TEXT NOT NULL,
-      sender      TEXT NOT NULL,
-      body        TEXT NOT NULL,
-      tags        TEXT,
-      created_at  INTEGER NOT NULL,
-      fetched_at  INTEGER,
-      read_at     INTEGER,
-      in_reply_to TEXT
-    );
-    CREATE INDEX IF NOT EXISTS idx_recipient ON messages (recipient, created_at);
-  `);
+}
+var NativeDatabase = nodeMajor >= 24 || forcedDriver === "native" ? loadNative() : void 0;
+function chooseDriver() {
+  if (forcedDriver === "wasm") return "wasm";
+  if (forcedDriver === "native") return NativeDatabase ? "native" : "wasm";
+  return NativeDatabase ? "native" : "wasm";
+}
+var SCHEMA = `
+  CREATE TABLE IF NOT EXISTS messages (
+    id          TEXT PRIMARY KEY,
+    recipient   TEXT NOT NULL,
+    sender      TEXT NOT NULL,
+    body        TEXT NOT NULL,
+    tags        TEXT,
+    created_at  INTEGER NOT NULL,
+    fetched_at  INTEGER,
+    read_at     INTEGER,
+    in_reply_to TEXT
+  );
+  CREATE INDEX IF NOT EXISTS idx_recipient ON messages (recipient, created_at);
+`;
+var NativeStore = class {
+  #db;
+  constructor(path) {
+    const Db = NativeDatabase;
+    this.#db = new Db(path);
+    try {
+      this.#db.exec("PRAGMA journal_mode = WAL; PRAGMA busy_timeout = 5000;");
+    } catch {
+    }
+    this.#db.exec(SCHEMA);
+  }
+  run(sql, params = []) {
+    this.#db.prepare(sql).run(...params);
+  }
+  all(sql, params = []) {
+    return this.#db.prepare(sql).all(...params);
+  }
+  get(sql, params = []) {
+    return this.#db.prepare(sql).get(...params) ?? void 0;
+  }
+  close() {
+    this.#db.close();
+  }
+};
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+function withRetry(fn, attempts = 6) {
+  let delay = 15;
+  for (let i = 0; ; i++) {
+    try {
+      return fn();
+    } catch (e) {
+      const msg = String(e?.message ?? e);
+      const retriable = /unable to open|database is locked|database table is locked|is busy/i.test(msg);
+      if (!retriable || i >= attempts) throw e;
+      sleepSync(delay);
+      delay = Math.min(delay * 2, 200);
+    }
+  }
+}
+function openWasm(path) {
+  const db = new WasmDatabase(path);
+  try {
+    db.exec("PRAGMA busy_timeout = 4000;");
+  } catch {
+  }
+  db.exec(SCHEMA);
   return db;
 }
+var WasmMemoryStore = class {
+  #db;
+  constructor(path) {
+    this.#db = openWasm(path);
+  }
+  run(sql, params = []) {
+    this.#db.run(sql, params);
+  }
+  all(sql, params = []) {
+    return this.#db.all(sql, params);
+  }
+  get(sql, params = []) {
+    return this.#db.get(sql, params) ?? void 0;
+  }
+  close() {
+    this.#db.close();
+  }
+};
+var WasmPerOpStore = class {
+  #path;
+  constructor(path) {
+    this.#path = path;
+  }
+  #with(fn) {
+    return withRetry(() => {
+      const db = openWasm(this.#path);
+      try {
+        return fn(db);
+      } finally {
+        db.close();
+      }
+    });
+  }
+  run(sql, params = []) {
+    this.#with((db) => db.run(sql, params));
+  }
+  all(sql, params = []) {
+    return this.#with((db) => db.all(sql, params));
+  }
+  get(sql, params = []) {
+    return this.#with((db) => db.get(sql, params)) ?? void 0;
+  }
+  close() {
+  }
+};
+function openMailbox(path) {
+  if (chooseDriver() === "native") return new NativeStore(path);
+  if (path === ":memory:") return new WasmMemoryStore(path);
+  return new WasmPerOpStore(path);
+}
 function insertMessage(db, m) {
   db.run(
     `INSERT INTO messages
@@ -346,6 +454,9 @@ function resolveDir(sel) {
   }
   return null;
 }
+function resolveIdentity(sel) {
+  return resolveDir(sel);
+}
 function currentUser() {
   const env = process.env.MESSENGER_USER?.trim();
   if (env) return resolveDir(env) ?? env;
@@ -623,7 +734,15 @@ function buildSession(user) {
   const contactsPath = contactsFile(user);
   const me = loadIdentity(identityFile(user));
   const book = loadContacts(contactsPath);
-  const cache = openMailbox(inboxFile(user));
+  let cache;
+  try {
+    cache = openMailbox(inboxFile(user));
+  } catch (e) {
+    console.error(
+      `Inbox cache for "${user}" is unavailable (${e.message}); using a temporary in-memory cache for this session.`
+    );
+    cache = openMailbox(":memory:");
+  }
   const ctx = {
     me,
     book,
@@ -768,6 +887,23 @@ server.registerTool(
       });
     }
     const display = (name ?? process.env.MESSENGER_USER ?? userInfo().username ?? "me").trim() || "me";
+    const pin = process.env.MESSENGER_USER?.trim();
+    for (const sel of [name?.trim(), pin].filter((s2) => !!s2)) {
+      const dir = resolveIdentity(sel);
+      if (dir) {
+        S = buildSession(dir);
+        if (!pin) setCurrentUser(dir);
+        ensureWarmer();
+        return ok({
+          ok: true,
+          created: false,
+          name: S.me.name,
+          handle: S.me.handle,
+          fullKey: encodeKey(S.me.signPub, S.me.boxPub),
+          note: "You already have an account \u2014 this is your code to share."
+        });
+      }
+    }
     const id = generateIdentity();
     id.name = display;
     id.handle = await claimHandle(createMailboxClient(mailboxUrl, id, now));
@@ -777,7 +913,7 @@ server.registerTool(
       contactsFile(id.handle),
       JSON.stringify({ me: id.signPub, contacts: [] }, null, 2) + "\n"
     );
-    setCurrentUser(id.handle);
+    if (!process.env.MESSENGER_USER?.trim()) setCurrentUser(id.handle);
     S = buildSession(id.handle);
     ensureWarmer();
     return ok({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-chat-mcp",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "type": "module",
   "description": "Headless cross-CLI messenger for coding agents (MCP)",
   "bin": {
@@ -22,6 +22,7 @@
     "test:coverage": "node --test --experimental-test-coverage \"test/unit/*.test.ts\" \"test/integration/*.test.ts\"",
     "test:e2e": "node test/e2e/live-net.ts",
     "test:mcp": "node test/e2e/live-net-mcp.ts",
+    "test:push": "node test/e2e/live-push.ts",
     "init": "node src/init-identity.ts",
     "migrate": "node src/migrate.ts",
     "install-clis": "node src/install.ts",