cross-agent-teams-mcp 0.5.12 → 0.5.14

package/dist/cli.js

@@ -3659,6 +3659,37 @@ function mountMcp(app, db, fanout, channelWakeFanout, opts = {}) {
     getSessionOrigin: (connectionId) => sessions.get(connectionId)?.originInfo
   });
   const sessionOwners = /* @__PURE__ */ new Map();
+  function normalizeGcOptions(opts2) {
+    if (typeof opts2 === "number") {
+      return { idleMs: opts2, maxAgeMs: opts2, maxSessions: Number.POSITIVE_INFINITY };
+    }
+    const idleMs = opts2?.idleMs ?? 3e5;
+    return {
+      idleMs,
+      maxAgeMs: opts2?.maxAgeMs ?? idleMs,
+      maxSessions: opts2?.maxSessions ?? Number.POSITIVE_INFINITY
+    };
+  }
+  function closeOrphanSession(session, now, reason) {
+    const ageS = Math.floor((now - session.createdAt) / 1e3);
+    const idleS = Math.floor((now - session.lastActivityAt) / 1e3);
+    try {
+      log(`mcp orphan session reap: sid=${session.sessionId} age_s=${ageS} idle_s=${idleS} reason=${reason}`);
+    } catch {
+    }
+    try {
+      void session.transport.close();
+    } catch {
+    }
+  }
+  function enforceOrphanSessionLimit(now, maxSessions, candidates) {
+    if (!Number.isFinite(maxSessions)) return;
+    const orphans = (candidates ?? Array.from(sessions.values())).filter((session) => session.agentIdHolder.current === void 0).sort((a, b) => a.createdAt - b.createdAt);
+    if (orphans.length <= maxSessions) return;
+    for (const session of orphans.slice(0, orphans.length - maxSessions)) {
+      closeOrphanSession(session, now, "max_sessions");
+    }
+  }
   function createSession() {
     const server = new McpServer(
       { name: "cross-agent-teams-mcp", version: "0.1.0" },
@@ -3724,6 +3755,9 @@ function mountMcp(app, db, fanout, channelWakeFanout, opts = {}) {
           clientInfo: void 0,
           originInfo: { origin: "local", remote_addr: null }
         });
+        if (opts.orphanSessionLimit !== void 0) {
+          enforceOrphanSessionLimit(now2, opts.orphanSessionLimit);
+        }
       }
     });
     transport.onclose = () => {
@@ -3860,18 +3894,40 @@ function mountMcp(app, db, fanout, channelWakeFanout, opts = {}) {
     await session.transport.handleRequest(req.raw, reply.raw);
     return reply;
   });
-  function reapOrphanSessions(now, graceMs = 18e5) {
+  function reapOrphanSessions(now, opts2) {
+    const gc = normalizeGcOptions(opts2);
+    const survivors = [];
     for (const session of sessions.values()) {
       if (session.agentIdHolder.current !== void 0) continue;
       const idleMs = now - session.lastActivityAt;
-      if (idleMs < graceMs) continue;
-      try {
-        void session.transport.close();
-      } catch {
+      const ageMs = now - session.createdAt;
+      if (idleMs >= gc.idleMs) {
+        closeOrphanSession(session, now, "idle");
+        continue;
+      }
+      if (ageMs >= gc.maxAgeMs) {
+        closeOrphanSession(session, now, "max_age");
+        continue;
       }
+      survivors.push(session);
     }
+    enforceOrphanSessionLimit(now, gc.maxSessions, survivors);
   }
-  return { reapOrphanSessions };
+  function sessionMetrics() {
+    let registered = 0;
+    let orphan = 0;
+    for (const session of sessions.values()) {
+      if (session.agentIdHolder.current === void 0) orphan += 1;
+      else registered += 1;
+    }
+    return {
+      total: sessions.size,
+      registered,
+      orphan,
+      fanout: fanout.peek().length
+    };
+  }
+  return { reapOrphanSessions, sessionMetrics };
 }
 
 // src/daemon/cleanup.ts
@@ -4051,7 +4107,9 @@ function bindHostCoversIpv4Loopback(host) {
 // src/daemon/server.ts
 var DEFAULT_KEEP_ALIVE_TIMEOUT_MS = 12e4;
 var DEFAULT_ORPHAN_GC_INTERVAL_MS = 6e4;
-var DEFAULT_ORPHAN_GC_IDLE_MS = 18e5;
+var DEFAULT_ORPHAN_GC_IDLE_MS = 3e5;
+var DEFAULT_ORPHAN_GC_MAX_AGE_MS = 3e5;
+var DEFAULT_ORPHAN_GC_MAX_SESSIONS = 100;
 function parsePositiveInt(raw, fallback) {
   const n = Number(raw);
   return Number.isInteger(n) && n > 0 ? n : fallback;
@@ -4074,8 +4132,17 @@ async function buildServer(opts) {
     ;
     req.xatsPeer = classifyPeerAddress(req.raw.socket.remoteAddress);
   });
-  app.get("/health", async () => ({ ok: true, version, uptime_seconds: Math.floor((Date.now() - startedAt) / 1e3) }));
-  const mcp = mountMcp(app, db, fanout, channelWakeFanout, { context });
+  const orphanGcMaxSessions = opts.orphanGcMaxSessions ?? parsePositiveInt(process.env.ORPHAN_GC_MAX_SESSIONS, DEFAULT_ORPHAN_GC_MAX_SESSIONS);
+  const mcp = mountMcp(app, db, fanout, channelWakeFanout, {
+    context,
+    orphanSessionLimit: orphanGcMaxSessions
+  });
+  app.get("/health", async () => ({
+    ok: true,
+    version,
+    uptime_seconds: Math.floor((Date.now() - startedAt) / 1e3),
+    mcp_sessions: mcp.sessionMetrics()
+  }));
   const cleanupIntervalMs = opts.cleanupIntervalMs ?? Number(process.env.CLEANUP_INTERVAL_MS ?? 60 * 60 * 1e3);
   const interval = setInterval(() => {
     try {
@@ -4086,9 +4153,14 @@ async function buildServer(opts) {
   if (typeof interval.unref === "function") interval.unref();
   const orphanGcIntervalMs = opts.orphanGcIntervalMs ?? parsePositiveInt(process.env.ORPHAN_GC_INTERVAL_MS, DEFAULT_ORPHAN_GC_INTERVAL_MS);
   const orphanGcIdleMs = opts.orphanGcIdleMs ?? parsePositiveInt(process.env.ORPHAN_GC_IDLE_MS, DEFAULT_ORPHAN_GC_IDLE_MS);
+  const orphanGcMaxAgeMs = opts.orphanGcMaxAgeMs ?? parsePositiveInt(process.env.ORPHAN_GC_MAX_AGE_MS, DEFAULT_ORPHAN_GC_MAX_AGE_MS);
   const orphanGcInterval = setInterval(() => {
     try {
-      mcp.reapOrphanSessions(Date.now(), orphanGcIdleMs);
+      mcp.reapOrphanSessions(Date.now(), {
+        idleMs: orphanGcIdleMs,
+        maxAgeMs: orphanGcMaxAgeMs,
+        maxSessions: orphanGcMaxSessions
+      });
     } catch {
     }
   }, orphanGcIntervalMs);