cross-agent-teams-mcp 0.5.1 → 0.5.3

package/dist/cli.js

@@ -195,10 +195,18 @@ function migrateMessagesNeedReplyColumn(db) {
   if (existing.has("need_reply")) return;
   db.exec(`ALTER TABLE messages ADD COLUMN need_reply INTEGER NOT NULL DEFAULT 1`);
 }
+function migrateAgentsCursorWatermark(db) {
+  db.exec(
+    `UPDATE agents
+        SET last_processed_event_id = COALESCE((SELECT MAX(event_id) FROM events), 0)
+      WHERE last_processed_event_id = 0`
+  );
+}
 function applySchema(db) {
   for (const sql of DDL) db.exec(sql);
   migrateAgentsDeliveryColumns(db);
   migrateMessagesNeedReplyColumn(db);
+  migrateAgentsCursorWatermark(db);
 }
 
 // src/daemon/auth.ts
@@ -425,9 +433,11 @@ var AgentsRepo = class {
     this.db.prepare(
       `INSERT INTO agents (
          agent_id, agent_type, agent_type_name, team, role, name, model, registered_at, last_seen_at,
-         tmux_pane_id, claude_ui_pid, runtime_ui_pid, delivery_kind, delivery_payload
+         tmux_pane_id, claude_ui_pid, runtime_ui_pid, delivery_kind, delivery_payload,
+         last_processed_event_id
        )
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
+               COALESCE((SELECT MAX(event_id) FROM events), 0))
        ON CONFLICT (team, name) DO UPDATE SET
          agent_type = excluded.agent_type,
          agent_type_name = excluded.agent_type_name,
@@ -1364,27 +1374,40 @@ var GetInboxService = class {
     const caller = this.agents.findById(args.caller);
     if (!caller) return { messages: [], has_more: false, last_event_id: args.since_event_id ?? 0 };
     const callerTeam = caller.team;
-    const callerRole = this.db.prepare("SELECT role FROM agents WHERE agent_id=?").get(args.caller);
+    const callerRoleRow = this.db.prepare("SELECT role, last_processed_event_id FROM agents WHERE agent_id=?").get(args.caller);
+    const callerRole = callerRoleRow?.role;
+    const storedCursor = callerRoleRow?.last_processed_event_id ?? 0;
     const limit = Math.min(args.limit ?? 50, 200);
-    const since = args.since_event_id ?? 0;
-    const rows = this.db.prepare(
-      `SELECT m.id, m.event_id, m.from_team, m.to_team, m.from_agent_id, m.to_agent_id, m.to_role, m.subject, m.body, m.need_reply, m.sent_at,
-              a.role as from_role
-         FROM messages m
-         LEFT JOIN agents a ON a.agent_id = m.from_agent_id
-        WHERE m.to_team = ?
-          AND m.event_id > ?
-          AND ( m.to_agent_id = ? OR (m.to_role IS NOT NULL AND m.to_role = ?) )
-        ORDER BY m.event_id ASC
-        LIMIT ?`
-    ).all(callerTeam, since, args.caller, callerRole?.role ?? "__none__", limit + 1);
-    const has_more = rows.length > limit;
-    const trimmed = (has_more ? rows.slice(0, limit) : rows).map((row) => ({
-      ...row,
-      need_reply: row.need_reply === 1
-    }));
-    const last_event_id = trimmed.length > 0 ? trimmed[trimmed.length - 1].event_id : since;
-    return { messages: trimmed, has_more, last_event_id };
+    const implicit = args.since_event_id === void 0;
+    const effectiveSince = implicit ? storedCursor : args.since_event_id;
+    const tx = this.db.transaction(() => {
+      const rows = this.db.prepare(
+        `SELECT m.id, m.event_id, m.from_team, m.to_team, m.from_agent_id, m.to_agent_id, m.to_role, m.subject, m.body, m.need_reply, m.sent_at,
+                a.role as from_role
+           FROM messages m
+           LEFT JOIN agents a ON a.agent_id = m.from_agent_id
+          WHERE m.to_team = ?
+            AND m.event_id > ?
+            AND ( m.to_agent_id = ? OR (m.to_role IS NOT NULL AND m.to_role = ?) )
+          ORDER BY m.event_id ASC
+          LIMIT ?`
+      ).all(callerTeam, effectiveSince, args.caller, callerRole ?? "__none__", limit + 1);
+      const has_more = rows.length > limit;
+      const trimmed = (has_more ? rows.slice(0, limit) : rows).map((row) => ({
+        ...row,
+        need_reply: row.need_reply === 1
+      }));
+      const last_event_id = trimmed.length > 0 ? trimmed[trimmed.length - 1].event_id : effectiveSince;
+      if (implicit && last_event_id > storedCursor) {
+        this.db.prepare(
+          `UPDATE agents
+              SET last_processed_event_id = ?
+            WHERE agent_id = ? AND last_processed_event_id < ?`
+        ).run(last_event_id, args.caller, last_event_id);
+      }
+      return { messages: trimmed, has_more, last_event_id };
+    });
+    return tx();
   }
 };
 
@@ -3701,7 +3724,13 @@ function registerBusinessTools(server, db, getCallerAgentId, fanout, onRegisterS
     "get_inbox",
     {
       title: "Get inbox",
-      description: "Return messages addressed to caller after since_event_id",
+      description: [
+        "Return messages addressed to the caller (by agent_id or matching role) within the caller team.",
+        "Default behaviour (since_event_id omitted): the daemon reads the caller's server-side cursor (`agents.last_processed_event_id`), returns mail past it, and ADVANCES the cursor to the highest returned event_id in the same transaction. Subsequent default calls return only newer mail.",
+        "Pagination via `limit` advances the cursor only to the last RETURNED event_id; the next default call resumes from there.",
+        "Explicit `since_event_id` (any number, including 0) is read-only inspection: the daemon uses the supplied value as the lower bound and does NOT advance the stored cursor \u2014 useful for re-reading history or debugging without disturbing live read position.",
+        "Retention: messages older than 30 days are deleted by the cleanup routine regardless of read state. Agents that go offline for more than 30 days forfeit any unread mail in that window."
+      ].join(" "),
       inputSchema: {
         since_event_id: z3.number().int().optional(),
         limit: z3.number().int().optional()
@@ -4196,14 +4225,10 @@ function mountMcp(app, db, fanout, channelWakeFanout, opts = {}) {
     return reply;
   });
   function reapOrphanSessions(now, graceMs = 6e4) {
-    for (const [sid, session] of sessions) {
+    for (const session of sessions.values()) {
       if (session.agentIdHolder.current !== void 0) continue;
       const ageMs = now - session.createdAt;
       if (ageMs < graceMs) continue;
-      try {
-        log(`mcp orphan session reap: sid=${sid} age_s=${Math.round(ageMs / 1e3)}`);
-      } catch {
-      }
       try {
         void session.transport.close();
       } catch {
@@ -4214,30 +4239,23 @@ function mountMcp(app, db, fanout, channelWakeFanout, opts = {}) {
 }
 
 // src/daemon/cleanup.ts
-var DELETE_AGED_EVENTS_SQL = `
-  WITH online_cursor AS (
-    SELECT team AS to_team, MIN(last_processed_event_id) AS min_cursor
-    FROM agents
-    WHERE last_seen_at >= :cutoffOnline
-    GROUP BY team
-  )
-  DELETE FROM events
-  WHERE created_at < :ageCutoff
-    AND (
-      events.to_team NOT IN (SELECT to_team FROM online_cursor)
-      OR events.event_id < (
-        SELECT min_cursor FROM online_cursor WHERE online_cursor.to_team = events.to_team
-      )
-    )
-`;
 function runCleanup(db, opts = {}) {
   const now = opts.now ?? /* @__PURE__ */ new Date();
-  const maxAgeDays = opts.maxAgeDays ?? 7;
-  const onlineWindowMs = opts.onlineWindowMs ?? 5 * 60 * 1e3;
+  const maxAgeDays = opts.maxAgeDays ?? 30;
   const ageCutoff = new Date(now.getTime() - maxAgeDays * 86400 * 1e3).toISOString();
-  const cutoffOnline = new Date(now.getTime() - onlineWindowMs).toISOString();
-  const info = db.prepare(DELETE_AGED_EVENTS_SQL).run({ ageCutoff, cutoffOnline });
-  return { deleted: Number(info.changes) };
+  const deleteStatus = db.prepare(
+    `DELETE FROM message_delivery_status
+      WHERE message_id IN (SELECT id FROM messages WHERE sent_at < ?)`
+  );
+  const deleteMessages = db.prepare(`DELETE FROM messages WHERE sent_at < ?`);
+  const deleteEvents = db.prepare(`DELETE FROM events WHERE created_at < ?`);
+  const tx = db.transaction(() => {
+    const s = deleteStatus.run(ageCutoff);
+    const m = deleteMessages.run(ageCutoff);
+    const e = deleteEvents.run(ageCutoff);
+    return Number(s.changes) + Number(m.changes) + Number(e.changes);
+  });
+  return { deleted: tx() };
 }
 
 // src/daemon/sse-fanout.ts