jefrichat-mcp 0.31.0 → 0.32.0

package/dist/http.js

@@ -60681,7 +60681,7 @@ var JefriClient = class _JefriClient {
   isAlive = true;
   // heartbeat: did we get a pong since the last ping?
   hasConnected = false;
-  // armed for auto-reconnect only after the first open
+  // armed for auto-reconnect only after the hub `registered` us
   lastPresence = "online";
   // re-announce this on reconnect
   clientInfo;
@@ -60713,31 +60713,46 @@ var JefriClient = class _JefriClient {
     }
     client.token = token;
     client.clientInfo = opts.clientInfo;
-    await client.openSocket();
-    if (!client.identity) {
-      await new Promise((resolve, reject) => {
-        let done = false;
-        const finish = (fn) => {
-          if (done) return;
-          done = true;
-          client.off("registered", onReg);
-          client.off("error", onErr);
-          clearTimeout(timer);
-          fn();
-        };
-        const onReg = () => finish(resolve);
-        const onErr = (ev) => finish(
-          () => reject(
-            /auth/i.test(ev?.message ?? "") ? new JefriAuthError("invalid or expired Jefri Chat token \u2014 get a fresh connect command") : new Error(ev?.message ?? "hub rejected the connection")
-          )
-        );
-        const timer = setTimeout(
-          () => finish(() => reject(new Error("timed out waiting for the hub to register the connection"))),
-          8e3
-        );
-        client.on("registered", onReg);
-        client.on("error", onErr);
-      });
+    let onReg = () => {
+    };
+    let onErr = () => {
+    };
+    let timer;
+    const registered = new Promise((resolve, reject) => {
+      let done = false;
+      const finish = (fn) => {
+        if (done) return;
+        done = true;
+        client.off("registered", onReg);
+        client.off("error", onErr);
+        clearTimeout(timer);
+        fn();
+      };
+      onReg = () => finish(resolve);
+      onErr = (ev) => finish(
+        () => reject(
+          /auth/i.test(ev?.message ?? "") ? new JefriAuthError("invalid or expired Jefri Chat token \u2014 get a fresh connect command") : new Error(ev?.message ?? "hub rejected the connection")
+        )
+      );
+      const regTimeoutMs = typeof process !== "undefined" && Number(process.env?.JEFRI_REGISTER_TIMEOUT_MS) || 8e3;
+      timer = setTimeout(
+        () => finish(() => reject(new Error("timed out waiting for the hub to register the connection"))),
+        regTimeoutMs
+      );
+      client.on("registered", onReg);
+      client.on("error", onErr);
+    });
+    try {
+      await Promise.all([client.openSocket(), registered]);
+    } catch (e) {
+      client.off("registered", onReg);
+      client.off("error", onErr);
+      clearTimeout(timer);
+      try {
+        client.close();
+      } catch {
+      }
+      throw e;
     }
     if (opts.status) client.presence(opts.status);
     await client.ensureE2EKey().catch(() => {
@@ -60750,8 +60765,6 @@ var JefriClient = class _JefriClient {
     return new Promise((resolve, reject) => {
       let settled = false;
       this.ws.on("open", () => {
-        this.reconnectAttempts = 0;
-        this.hasConnected = true;
         this.startPing();
         try {
           this.ws.send(JSON.stringify({ type: "presence", status: this.lastPresence }));
@@ -60781,7 +60794,11 @@ var JefriClient = class _JefriClient {
         } catch {
           return;
         }
-        if (ev.event === "registered") this.identity = ev.identity;
+        if (ev.event === "registered") {
+          this.identity = ev.identity;
+          this.hasConnected = true;
+          this.reconnectAttempts = 0;
+        }
         if (ev.event === "error" && /auth/i.test(ev.message ?? "")) {
           this.authFailed = true;
         }
@@ -61181,6 +61198,48 @@ var JefriClient = class _JefriClient {
 };
 var serveDir = path2.join(os.homedir(), ".acp", "serve");
 
+// src/conn-pool.ts
+function attachRef(c, id) {
+  if (c.closed) return false;
+  c.refs.add(id);
+  return true;
+}
+function detachRef(c, id) {
+  c.refs.delete(id);
+  return c.refs.size === 0;
+}
+function createKeyedPool() {
+  const ready = /* @__PURE__ */ new Map();
+  const pending = /* @__PURE__ */ new Map();
+  return {
+    async acquire(key, create) {
+      const existing = ready.get(key);
+      if (existing !== void 0) return existing;
+      const inflight = pending.get(key);
+      if (inflight) return inflight;
+      const p = (async () => {
+        const value = await create();
+        ready.set(key, value);
+        return value;
+      })();
+      pending.set(key, p);
+      try {
+        return await p;
+      } finally {
+        pending.delete(key);
+      }
+    },
+    get: (key) => ready.get(key),
+    drop: (key) => {
+      const v = ready.get(key);
+      ready.delete(key);
+      return v;
+    },
+    has: (key) => ready.has(key),
+    size: () => ready.size
+  };
+}
+
 // src/tools.ts
 import fs4 from "node:fs";
 import np3 from "node:path";
@@ -61756,6 +61815,72 @@ ${e?.message ?? e}`);
       return ok3(lines.length ? header + lines.join("\n") : "No other identities on the network yet.");
     })
   );
+  const NOT_OWNER = "This only works when you run the Jefri connector as your OWN (human) account and own this agent. An agent session can't manage agents \u2014 use the web app or an owner session.";
+  const ownerApi = async (c, path3, method) => {
+    const res = await fetch(`${ctx.serverUrl}${path3}`, {
+      method,
+      headers: { Authorization: `Bearer ${c.token}` }
+    });
+    let body = {};
+    try {
+      body = await res.json();
+    } catch {
+    }
+    return { status: res.status, body };
+  };
+  server.registerTool(
+    "jefri_agent_apps",
+    {
+      title: "See where your agents are running",
+      description: `For an agent you OWN, show which app currently holds its live connection (the label you gave that key, e.g. "Claude Code" or "Codex"), whether it's online, and whether it's active or deactivated. Omit \`agent\` to list all your agents. Requires running this connector as the agent's human OWNER.`,
+      inputSchema: {
+        agent: external_exports.string().optional().describe("username of one of YOUR agents; omit to list all of them")
+      }
+    },
+    async ({ agent }) => withClient(async (c) => {
+      if (agent) {
+        const { status, body } = await ownerApi(c, `/api/agents/${encodeURIComponent(agent)}/status`, "GET");
+        if (status !== 200) return fail(body?.error === "not allowed" ? NOT_OWNER : `Could not read @${agent} (HTTP ${status}).`);
+        const dot = body.online ? "\u{1F7E2} online" : "\u26AA offline";
+        const state = body.active ? "active" : "\u{1F6D1} deactivated";
+        const app2 = body.online ? ` \xB7 app: ${body.app || "connected app"}` : "";
+        return ok3(`@${agent} \u2014 ${dot}${app2} \xB7 ${state}`);
+      }
+      const mine = (await c.identities()).filter((i) => i.type === "agent" && i.owner === c.identity?.username);
+      if (!mine.length) return ok3("You don't own any agents (or you're not connected as their owner).");
+      const lines = mine.map((i) => `${i.status && i.status !== "offline" ? "\u{1F7E2}" : "\u26AA"} @${i.username} \u2014 ${i.displayName}`);
+      return ok3(`Your agents:
+${lines.join("\n")}
+
+Use jefri_agent_apps with agent=<name> to see its live app + active state.`);
+    })
+  );
+  server.registerTool(
+    "jefri_deactivate",
+    {
+      title: "Deactivate an agent",
+      description: "Deactivate an agent you OWN: it is immediately disconnected and CANNOT reconnect from any app (Claude, Codex, SDK, \u2026) until you reactivate it. Reversible via jefri_activate. Requires running this connector as the agent's human OWNER \u2014 an agent session cannot deactivate agents.",
+      inputSchema: { agent: external_exports.string().describe("username of YOUR agent to deactivate") }
+    },
+    async ({ agent }) => withClient(async (c) => {
+      const { status, body } = await ownerApi(c, `/api/agents/${encodeURIComponent(agent)}/deactivate`, "POST");
+      if (status !== 200) return fail(body?.error === "not allowed" ? NOT_OWNER : `Could not deactivate @${agent} (HTTP ${status}).`);
+      return ok3(`\u{1F6D1} Deactivated @${agent}. It's disconnected and can't reconnect from any app until you reactivate it.`);
+    })
+  );
+  server.registerTool(
+    "jefri_activate",
+    {
+      title: "Reactivate an agent",
+      description: "Reactivate an agent you OWN that was previously deactivated, so it can connect again. Requires running this connector as the agent's human OWNER.",
+      inputSchema: { agent: external_exports.string().describe("username of YOUR agent to reactivate") }
+    },
+    async ({ agent }) => withClient(async (c) => {
+      const { status, body } = await ownerApi(c, `/api/agents/${encodeURIComponent(agent)}/activate`, "POST");
+      if (status !== 200) return fail(body?.error === "not allowed" ? NOT_OWNER : `Could not reactivate @${agent} (HTTP ${status}).`);
+      return ok3(`\u2705 Reactivated @${agent}. It can connect again now.`);
+    })
+  );
   server.registerTool(
     "jefri_send",
     {
@@ -62818,6 +62943,7 @@ var HUB = process.env.JEFRI_SERVER ?? "http://localhost:4000";
 var PORT = Number(process.env.MCP_HTTP_PORT ?? 4001);
 var log = (...a) => console.error("[jefrichat-mcp-http]", ...a);
 var sessions = /* @__PURE__ */ new Map();
+var hubPool = createKeyedPool();
 var SESSION_TTL_MS = Number(process.env.MCP_SESSION_TTL_MS ?? 4 * 60 * 60 * 1e3);
 var MAX_SESSIONS = Number(process.env.MCP_MAX_SESSIONS ?? 1500);
 var MAX_SESSIONS_PER_IDENTITY = Number(process.env.MCP_MAX_SESSIONS_PER_IDENTITY ?? 20);
@@ -62841,14 +62967,41 @@ function closeSession(sid, reason) {
   if (!s) return;
   sessions.delete(sid);
   try {
-    s.acp.close();
+    s.transport.close?.();
   } catch {
   }
+  const pooled = hubPool.get(s.poolKey);
+  if (pooled && detachRef(pooled, sid)) teardownPool(s.poolKey, pooled, "last session gone");
+  log(`session ${sid.slice(0, 8)}\u2026 closed (${reason}) (${sessions.size} active)`);
+}
+function teardownPool(poolKey, pooled, reason) {
+  pooled.closed = true;
+  if (hubPool.get(poolKey) === pooled) hubPool.drop(poolKey);
   try {
-    s.transport.close?.();
+    pooled.acp.close();
   } catch {
   }
-  log(`session ${sid.slice(0, 8)}\u2026 closed (${reason}) (${sessions.size} active)`);
+  log(`hub connection ${poolKey.slice(0, 8)}\u2026 closed (${reason})`);
+}
+function closePool(poolKey, reason) {
+  const pooled = hubPool.get(poolKey);
+  if (!pooled) return;
+  pooled.closed = true;
+  for (const sid of [...pooled.refs]) closeSession(sid, reason);
+  if (hubPool.get(poolKey) === pooled) teardownPool(poolKey, pooled, reason);
+}
+async function acquirePooledConn(token, poolKey) {
+  return hubPool.acquire(poolKey, async () => {
+    const acp = await JefriClient.connect({ server: HUB, token, status: "online" });
+    const inbox = [];
+    if (acp.identity) attachInbox(acp, inbox, acp.identity.username);
+    const pooled = { acp, inbox, refs: /* @__PURE__ */ new Set(), closed: false };
+    acp.on("force_disconnect", () => closePool(poolKey, "credential revoked"));
+    acp.on("error", (ev) => {
+      if (/auth|revoked|unauthor|disabled/i.test(String(ev?.message ?? ""))) closePool(poolKey, "auth revoked");
+    });
+    return pooled;
+  });
 }
 function touch(sid) {
   if (!sid) return;
@@ -62967,9 +63120,10 @@ app.post("/mcp", async (req, res) => {
       });
       return;
     }
-    let acp;
+    const poolKey = sha256(token).toString("hex");
+    let pooled;
     try {
-      acp = await JefriClient.connect({ server: HUB, token, status: "online" });
+      pooled = await acquirePooledConn(token, poolKey);
     } catch (e) {
       if (e instanceof JefriAuthError || e?.code === "ACP_AUTH_FAILED") {
         res.status(401).json({
@@ -62985,7 +63139,9 @@ app.post("/mcp", async (req, res) => {
       res.status(502).json({ jsonrpc: "2.0", error: { code: -32002, message: `Hub unreachable: ${e?.message ?? e}` }, id: null });
       return;
     }
+    const acp = pooled.acp;
     if (!acp.identity) {
+      closePool(poolKey, "no identity");
       res.status(401).json({
         jsonrpc: "2.0",
         error: { code: -32001, message: "Invalid or expired Jefri Chat token \u2014 rotate it in the Jefri Chat web app and reconnect." },
@@ -62993,13 +63149,19 @@ app.post("/mcp", async (req, res) => {
       });
       return;
     }
-    const inbox = [];
-    attachInbox(acp, inbox, acp.identity.username);
     const mcp = new McpServer({ name: "jefrichat", version: "0.1.0" });
-    registerAcpTools(mcp, { ensureClient: async () => acp, inbox, serverUrl: HUB, local: false });
+    registerAcpTools(mcp, { ensureClient: async () => acp, inbox: pooled.inbox, serverUrl: HUB, local: false });
     const transport = new StreamableHTTPServerTransport({
       sessionIdGenerator: () => randomUUID(),
       onsessioninitialized: (sid) => {
+        if (pooled.closed) {
+          try {
+            transport.close?.();
+          } catch {
+          }
+          log(`session ${sid.slice(0, 8)}\u2026 refused (connection torn down during init)`);
+          return;
+        }
         const meName = acp.identity.username;
         const mine = [...sessions.entries()].filter(([, s]) => s.acp.identity?.username === meName);
         if (mine.length >= MAX_SESSIONS_PER_IDENTITY) {
@@ -63017,20 +63179,31 @@ app.post("/mcp", async (req, res) => {
           }
           if (oldest) closeSession(oldest, "evicted (cap)");
         }
-        sessions.set(sid, { transport, acp, lastActive: Date.now(), tokenHash: sha256(token), inflight: 0 });
-        log(`session ${sid.slice(0, 8)}\u2026 open as @${acp.identity.username} (${sessions.size} active)`);
-        acp.on("force_disconnect", () => closeSession(sid, "credential revoked"));
-        acp.on("error", (ev) => {
-          if (/auth|revoked|unauthor|disabled/i.test(String(ev?.message ?? ""))) closeSession(sid, "auth revoked");
-        });
+        if (!attachRef(pooled, sid)) {
+          try {
+            transport.close?.();
+          } catch {
+          }
+          log(`session ${sid.slice(0, 8)}\u2026 refused (connection torn down during init)`);
+          return;
+        }
+        sessions.set(sid, { transport, acp, lastActive: Date.now(), tokenHash: sha256(token), inflight: 0, poolKey });
+        log(`session ${sid.slice(0, 8)}\u2026 open as @${acp.identity.username} (${sessions.size} active, ${pooled.refs.size} on this connection)`);
       }
     });
     transport.onclose = () => {
       const sid = transport.sessionId;
       if (sid) closeSession(sid, "client closed");
     };
-    await mcp.connect(transport);
-    await transport.handleRequest(req, res, req.body);
+    const reservation = "init:" + randomUUID();
+    pooled.refs.add(reservation);
+    try {
+      await mcp.connect(transport);
+      await transport.handleRequest(req, res, req.body);
+    } finally {
+      pooled.refs.delete(reservation);
+      if (pooled.refs.size === 0 && hubPool.get(poolKey) === pooled) teardownPool(poolKey, pooled, "init failed, no session");
+    }
     return;
   }
   res.status(404).json({

package/dist/index.js

@@ -36668,7 +36668,7 @@ var JefriClient = class _JefriClient {
   isAlive = true;
   // heartbeat: did we get a pong since the last ping?
   hasConnected = false;
-  // armed for auto-reconnect only after the first open
+  // armed for auto-reconnect only after the hub `registered` us
   lastPresence = "online";
   // re-announce this on reconnect
   clientInfo;
@@ -36700,31 +36700,46 @@ var JefriClient = class _JefriClient {
     }
     client.token = token;
     client.clientInfo = opts.clientInfo;
-    await client.openSocket();
-    if (!client.identity) {
-      await new Promise((resolve, reject) => {
-        let done = false;
-        const finish = (fn) => {
-          if (done) return;
-          done = true;
-          client.off("registered", onReg);
-          client.off("error", onErr);
-          clearTimeout(timer);
-          fn();
-        };
-        const onReg = () => finish(resolve);
-        const onErr = (ev) => finish(
-          () => reject(
-            /auth/i.test(ev?.message ?? "") ? new JefriAuthError("invalid or expired Jefri Chat token \u2014 get a fresh connect command") : new Error(ev?.message ?? "hub rejected the connection")
-          )
-        );
-        const timer = setTimeout(
-          () => finish(() => reject(new Error("timed out waiting for the hub to register the connection"))),
-          8e3
-        );
-        client.on("registered", onReg);
-        client.on("error", onErr);
-      });
+    let onReg = () => {
+    };
+    let onErr = () => {
+    };
+    let timer;
+    const registered = new Promise((resolve, reject) => {
+      let done = false;
+      const finish = (fn) => {
+        if (done) return;
+        done = true;
+        client.off("registered", onReg);
+        client.off("error", onErr);
+        clearTimeout(timer);
+        fn();
+      };
+      onReg = () => finish(resolve);
+      onErr = (ev) => finish(
+        () => reject(
+          /auth/i.test(ev?.message ?? "") ? new JefriAuthError("invalid or expired Jefri Chat token \u2014 get a fresh connect command") : new Error(ev?.message ?? "hub rejected the connection")
+        )
+      );
+      const regTimeoutMs = typeof process !== "undefined" && Number(process.env?.JEFRI_REGISTER_TIMEOUT_MS) || 8e3;
+      timer = setTimeout(
+        () => finish(() => reject(new Error("timed out waiting for the hub to register the connection"))),
+        regTimeoutMs
+      );
+      client.on("registered", onReg);
+      client.on("error", onErr);
+    });
+    try {
+      await Promise.all([client.openSocket(), registered]);
+    } catch (e) {
+      client.off("registered", onReg);
+      client.off("error", onErr);
+      clearTimeout(timer);
+      try {
+        client.close();
+      } catch {
+      }
+      throw e;
     }
     if (opts.status) client.presence(opts.status);
     await client.ensureE2EKey().catch(() => {
@@ -36737,8 +36752,6 @@ var JefriClient = class _JefriClient {
     return new Promise((resolve, reject) => {
       let settled = false;
       this.ws.on("open", () => {
-        this.reconnectAttempts = 0;
-        this.hasConnected = true;
         this.startPing();
         try {
           this.ws.send(JSON.stringify({ type: "presence", status: this.lastPresence }));
@@ -36768,7 +36781,11 @@ var JefriClient = class _JefriClient {
         } catch {
           return;
         }
-        if (ev.event === "registered") this.identity = ev.identity;
+        if (ev.event === "registered") {
+          this.identity = ev.identity;
+          this.hasConnected = true;
+          this.reconnectAttempts = 0;
+        }
         if (ev.event === "error" && /auth/i.test(ev.message ?? "")) {
           this.authFailed = true;
         }
@@ -38420,6 +38437,72 @@ ${e?.message ?? e}`);
       return ok3(lines.length ? header + lines.join("\n") : "No other identities on the network yet.");
     })
   );
+  const NOT_OWNER = "This only works when you run the Jefri connector as your OWN (human) account and own this agent. An agent session can't manage agents \u2014 use the web app or an owner session.";
+  const ownerApi = async (c, path4, method) => {
+    const res = await fetch(`${ctx.serverUrl}${path4}`, {
+      method,
+      headers: { Authorization: `Bearer ${c.token}` }
+    });
+    let body = {};
+    try {
+      body = await res.json();
+    } catch {
+    }
+    return { status: res.status, body };
+  };
+  server2.registerTool(
+    "jefri_agent_apps",
+    {
+      title: "See where your agents are running",
+      description: `For an agent you OWN, show which app currently holds its live connection (the label you gave that key, e.g. "Claude Code" or "Codex"), whether it's online, and whether it's active or deactivated. Omit \`agent\` to list all your agents. Requires running this connector as the agent's human OWNER.`,
+      inputSchema: {
+        agent: external_exports.string().optional().describe("username of one of YOUR agents; omit to list all of them")
+      }
+    },
+    async ({ agent }) => withClient(async (c) => {
+      if (agent) {
+        const { status, body } = await ownerApi(c, `/api/agents/${encodeURIComponent(agent)}/status`, "GET");
+        if (status !== 200) return fail(body?.error === "not allowed" ? NOT_OWNER : `Could not read @${agent} (HTTP ${status}).`);
+        const dot = body.online ? "\u{1F7E2} online" : "\u26AA offline";
+        const state = body.active ? "active" : "\u{1F6D1} deactivated";
+        const app = body.online ? ` \xB7 app: ${body.app || "connected app"}` : "";
+        return ok3(`@${agent} \u2014 ${dot}${app} \xB7 ${state}`);
+      }
+      const mine = (await c.identities()).filter((i) => i.type === "agent" && i.owner === c.identity?.username);
+      if (!mine.length) return ok3("You don't own any agents (or you're not connected as their owner).");
+      const lines = mine.map((i) => `${i.status && i.status !== "offline" ? "\u{1F7E2}" : "\u26AA"} @${i.username} \u2014 ${i.displayName}`);
+      return ok3(`Your agents:
+${lines.join("\n")}
+
+Use jefri_agent_apps with agent=<name> to see its live app + active state.`);
+    })
+  );
+  server2.registerTool(
+    "jefri_deactivate",
+    {
+      title: "Deactivate an agent",
+      description: "Deactivate an agent you OWN: it is immediately disconnected and CANNOT reconnect from any app (Claude, Codex, SDK, \u2026) until you reactivate it. Reversible via jefri_activate. Requires running this connector as the agent's human OWNER \u2014 an agent session cannot deactivate agents.",
+      inputSchema: { agent: external_exports.string().describe("username of YOUR agent to deactivate") }
+    },
+    async ({ agent }) => withClient(async (c) => {
+      const { status, body } = await ownerApi(c, `/api/agents/${encodeURIComponent(agent)}/deactivate`, "POST");
+      if (status !== 200) return fail(body?.error === "not allowed" ? NOT_OWNER : `Could not deactivate @${agent} (HTTP ${status}).`);
+      return ok3(`\u{1F6D1} Deactivated @${agent}. It's disconnected and can't reconnect from any app until you reactivate it.`);
+    })
+  );
+  server2.registerTool(
+    "jefri_activate",
+    {
+      title: "Reactivate an agent",
+      description: "Reactivate an agent you OWN that was previously deactivated, so it can connect again. Requires running this connector as the agent's human OWNER.",
+      inputSchema: { agent: external_exports.string().describe("username of YOUR agent to reactivate") }
+    },
+    async ({ agent }) => withClient(async (c) => {
+      const { status, body } = await ownerApi(c, `/api/agents/${encodeURIComponent(agent)}/activate`, "POST");
+      if (status !== 200) return fail(body?.error === "not allowed" ? NOT_OWNER : `Could not reactivate @${agent} (HTTP ${status}).`);
+      return ok3(`\u2705 Reactivated @${agent}. It can connect again now.`);
+    })
+  );
   server2.registerTool(
     "jefri_send",
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jefrichat-mcp",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "description": "Jefri Chat connector — join the Jefri Chat network (WhatsApp for AI agents) from any MCP client (Claude, Codex, Cursor, …).",
   "type": "module",
   "bin": {