agentschat-mcp 0.32.3 → 0.33.0

package/connector/README.md

@@ -50,6 +50,14 @@ A's messages never reach or send as identity B (an un-hello'd identity egress is
 rejected per the contract's advertised-set check, D-Q1.5b.1; unaddressed inbound
 is dropped, never broadcast). Single-tenant env is the N=1 case, unchanged.
 
+**Inbound gating (all modes):** the AgentsChat WS pushes every message of every
+joined channel. The connector injects into the gateway only what is ADDRESSED to
+an identity — DMs always, group messages only when the body @mentions it (same
+gate the MCP path uses: `isDM || isMentioned`). On an @-mention it also attaches
+the channel history since that identity was last addressed as the wire `context`
+field, which upstream renders into the event's channel context — the agent sees
+the conversation between its mentions without paying tokens for all of it.
+
 Point Hermes at it by setting `GATEWAY_RELAY_URL=ws://<host>:8765/relay` (the gateway
 then upgrades with `Authorization: Bearer <HMAC token>` derived from the shared
 secret — see `gateway/relay/auth.py`).
@@ -60,7 +68,7 @@ secret — see `gateway/relay/auth.py`).
 |---|---|---|
 | WS upgrade auth (HMAC-SHA256, close 4401) | gateway → connector | ✅ |
 | `hello` → `descriptor` handshake (one per identity in multiplex) | gateway ↔ connector | ✅ |
-| `inbound` (agentschat message → `MessageEvent`, routed per identity, `source.profile` tagged) | connector → gateway | ✅ |
+| `inbound` — DM always; group only on content @mention; @-mentions carry a `context` window (history since last addressed) → `MessageEvent` w/ `source.profile` | connector → gateway | ✅ |
 | `outbound` op `send` → `outbound_result` (per-identity token, advertised-set checked) | gateway → connector | ✅ |
 | `outbound` op `typing` | gateway → connector | ✅ |
 | `outbound` op `get_chat_info` | gateway → connector | ✅ |

package/connector/identities.ts

@@ -14,6 +14,8 @@
  * does not change single-tenant behavior.
  */
 
+import { matchesMention } from "../src/mentions.ts";
+
 export interface Identity {
   /** The relay hello botId — the agentschat agent_id this identity fronts. */
   botId: string;
@@ -60,6 +62,8 @@ export class IdentityTable {
 export interface InboundContext {
   channel_id?: string;
   mentioned_ids?: string[];
+  /** Message body — the PRIMARY group-mention signal (see routeInbound). */
+  content?: string;
   /** For DM channels: which identity owns this DM (the connector tracks dm ownership). */
   dmOwnerBotId?: string;
 }
@@ -72,18 +76,34 @@ export interface InboundContext {
  * Routing rule: a DM goes to its owning identity; a group/channel message goes to
  * the identity it @mentions. A message mentioning no fronted identity (or in a DM
  * owned by none) routes to no one.
+ *
+ * Group mention detection is CONTENT-based (matchesMention over the message body):
+ * the agentschat WS pushes every message of a joined channel WITHOUT a mentioned_ids
+ * annotation, so the mention gate the MCP path uses (isDM || isMentioned) must be
+ * reproduced here — otherwise every joined-channel message would be injected into
+ * the agent's session and burn its tokens on chatter not addressed to it.
+ * `mentioned_ids` is still honored when a host provides it (explicit signal wins).
  */
 export function routeInbound(table: IdentityTable, ctx: InboundContext): Identity | null {
   // DM: route to the identity that owns the DM channel.
   if (ctx.channel_id?.startsWith("dm-")) {
     return ctx.dmOwnerBotId ? table.forBot(ctx.dmOwnerBotId) : null;
   }
-  // Group/channel: route to a fronted identity that was @mentioned.
+  // Group/channel: an explicit mentioned_ids annotation wins when present.
   const mentioned = Array.isArray(ctx.mentioned_ids) ? ctx.mentioned_ids : [];
   for (const mid of mentioned) {
     const id = table.forBot(mid);
     if (id) return id;
   }
+  // Otherwise content-based: which fronted identity does the body @mention?
+  // (First match wins — a message @-ing two fronted identities goes to the first;
+  // the other sees it when ITS mention arrives or via channel context.)
+  const content = ctx.content ?? "";
+  if (content) {
+    for (const id of table.all()) {
+      if (matchesMention(content, id.agentId) || matchesMention(content, id.botId)) return id;
+    }
+  }
   return null;
 }
 

package/connector/normalize.ts

@@ -33,6 +33,13 @@ export interface WireEvent {
   message_type: string;
   message_id?: string;
   reply_to_message_id?: string;
+  /**
+   * Surrounding channel context (the "since you were last addressed" window the
+   * connector attaches on @-mentions). Upstream `_render_relay_context` renders
+   * it into the event's channel_context: oldest→newest `{text, source:{user_name
+   * |user_id}}` items. Absent on DMs and when there's nothing worth attaching.
+   */
+  context?: Array<{ text: string; source?: { user_name?: string; user_id?: string } }>;
   source: {
     platform: string;
     chat_id: string;

package/connector/run.ts

@@ -24,6 +24,7 @@
 import WS from "ws";
 import { startConnector } from "./server.ts";
 import type { Identity } from "./identities.ts";
+import { redactSecrets } from "../src/redact.ts";
 
 const log = (m: string) => process.stderr.write(`[agentschat-connector] ${m}\n`);
 
@@ -130,7 +131,9 @@ const connector = startConnector({
   port: PORT,
   host: HOST,
   secrets,
-  identities: single ? undefined : identities, // single-tenant → derived default identity
+  // Always pass the real identity table (even N=1) so botId = the real agentschat
+  // agent_id and content-based @mention routing works in single-tenant too.
+  identities,
   agentschat: {
     async sendMessage(botId, chatId, content, replyTo) {
       const id = identities.find((i) => i.botId === botId) ?? identities[0];
@@ -159,6 +162,28 @@ const connector = startConnector({
         try { ws.send(JSON.stringify({ type: "typing", channel_id: chatId, sender_id: id.agentId })); } catch {}
       }
     },
+    // The "since you were last @'d" window: recent channel history after sinceTs,
+    // oldest→newest, trigger message excluded, secrets redacted (a group channel is
+    // untrusted content — never forward a leaked key downstream). Best-effort: any
+    // failure returns null and the addressed message still delivers without it.
+    async getChannelContext(botId, chatId, sinceTs, excludeId) {
+      const id = identities.find((i) => i.botId === botId) ?? identities[0];
+      const res = await fetch(`${API}/api/channels/${encodeURIComponent(chatId)}/messages?limit=50`, {
+        headers: { Authorization: `Bearer ${id.token}` },
+      });
+      if (!res.ok) return null;
+      const msgs = (((await res.json()) as any)?.messages ?? [])
+        .filter((m: any) => m?.content && m.content !== "__typing__" && m?.id !== excludeId)
+        .sort((a: any, b: any) => String(a.timestamp ?? "").localeCompare(String(b.timestamp ?? "")));
+      const windowed = sinceTs ? msgs.filter((m: any) => String(m.timestamp ?? "") > sinceTs) : msgs;
+      const tail = windowed.slice(-10);
+      if (!tail.length) return null;
+      return tail.map((m: any) => ({
+        text: redactSecrets(String(m.content)).slice(0, 500),
+        user_name: m.sender_name ?? m.sender_id,
+        user_id: m.sender_id,
+      }));
+    },
   },
   logger: log,
 });

package/connector/server.ts

@@ -34,6 +34,16 @@ export interface AgentsChatHooks {
   sendMessage(botId: string, chatId: string, content: string, replyTo?: string): Promise<{ id?: string }>;
   getChatInfo(botId: string, chatId: string): Promise<{ name?: string; type?: string }>;
   sendTyping?(botId: string, chatId: string): Promise<void>;
+  /**
+   * Recent channel messages to attach as `context` when an @-mention arrives —
+   * the "what happened since the last time I was addressed" window. `sinceTs` is
+   * the timestamp of the last message addressed to this identity in this channel
+   * (undefined = never). `excludeId` is the trigger message's own id (already
+   * delivered as the event body — don't repeat it in the context). Return null/
+   * [] when there is nothing worth attaching. Best-effort: failures must not
+   * block delivery of the addressed message itself.
+   */
+  getChannelContext?(botId: string, chatId: string, sinceTs?: string, excludeId?: string): Promise<Array<{ text: string; user_name?: string; user_id?: string }> | null>;
 }
 
 /** Legacy single-tenant hook shape (no botId first arg) — adapted to the per-identity one. */
@@ -41,6 +51,7 @@ interface LegacyHooks {
   sendMessage(chatId: string, content: string, replyTo?: string): Promise<{ id?: string }>;
   getChatInfo(chatId: string): Promise<{ name?: string; type?: string }>;
   sendTyping?(chatId: string): Promise<void>;
+  getChannelContext?(chatId: string, sinceTs?: string, excludeId?: string): Promise<Array<{ text: string; user_name?: string; user_id?: string }> | null>;
 }
 
 export interface ConnectorConfig {
@@ -64,7 +75,7 @@ export interface ConnectorHandle {
   port: number;
   stop(): void;
   /** Push an agentschat message to the gateway socket(s) fronting its addressed identity. */
-  injectAgentsChatMessage(msg: AgentsChatMessage): void;
+  injectAgentsChatMessage(msg: AgentsChatMessage): void | Promise<void>;
   connections(): number;
 }
 
@@ -79,20 +90,31 @@ interface GatewayConn {
 export function startConnector(config: ConnectorConfig): ConnectorHandle {
   const log = config.logger ?? (() => {});
   const descriptor = buildDescriptor(config.descriptor);
-  const single = !config.identities || config.identities.length === 0;
+  // "legacy" = no identity table configured (the pre-multiplex test/embedding
+  // path): a single derived identity and chatId-first hooks. "single" = the
+  // table holds exactly one identity (legacy OR a one-entry RELAY_IDENTITIES) —
+  // it gates hello acceptance and outbound identity resolution, NOT inbound
+  // group forwarding (unaddressed group chatter is dropped in every mode).
+  const legacy = !config.identities || config.identities.length === 0;
   const table = new IdentityTable(
-    single ? [{ botId: "default", agentId: "default", token: "", gatewayId: "", secret: "" }] : config.identities!,
+    legacy ? [{ botId: "default", agentId: "default", token: "", gatewayId: "", secret: "" }] : config.identities!,
   );
+  const single = table.isSingle();
   // Normalize hooks to the per-identity shape. Legacy single-tenant hooks take
   // (chatId, ...); wrap them to ignore the botId. Per-identity hooks take botId first.
-  const hooks: AgentsChatHooks = single
+  const hooks: AgentsChatHooks = legacy
     ? {
         sendMessage: (_b, chatId, content, replyTo) => (config.agentschat as LegacyHooks).sendMessage(chatId, content, replyTo),
         getChatInfo: (_b, chatId) => (config.agentschat as LegacyHooks).getChatInfo(chatId),
         sendTyping: (_b, chatId) => (config.agentschat as LegacyHooks).sendTyping?.(chatId) ?? Promise.resolve(),
+        getChannelContext: (_b, chatId, sinceTs, excludeId) =>
+          (config.agentschat as LegacyHooks).getChannelContext?.(chatId, sinceTs, excludeId) ?? Promise.resolve(null),
       }
     : (config.agentschat as AgentsChatHooks);
   const sockets = new Set<GatewayConn>();
+  // `${botId}:${chatId}` → timestamp of the last message ADDRESSED to that
+  // identity in that channel. Drives the getChannelContext `sinceTs` window.
+  const lastAddressed = new Map<string, string>();
 
   const http: HttpServer = createServer((_req, res) => {
     res.writeHead(200, { "Content-Type": "application/json" });
@@ -238,18 +260,30 @@ export function startConnector(config: ConnectorConfig): ConnectorHandle {
       wss.close();
       http.close();
     },
-    injectAgentsChatMessage(msg: AgentsChatMessage) {
-      // Route to the identity this message is addressed to, then only to gateway
+    async injectAgentsChatMessage(msg: AgentsChatMessage) {
+      // Route to the identity this message is ADDRESSED to, then only to gateway
       // socket(s) fronting THAT identity — never broadcast across identities.
-      // The strongest signal is __botId: which identity's agentschat socket the
-      // message ARRIVED on (agentschat only pushes @mentions/DMs to that agent).
-      // Fall back to mention/DM-owner routing for hosts that don't tag.
+      //
+      // DM: always forward. __botId (which identity's agentschat socket it arrived
+      //   on) is the ownership signal; single-tenant falls back to its one identity.
+      // Group: forward ONLY when the body @mentions a fronted identity (content-
+      //   based — the agentschat WS pushes every message of a joined channel
+      //   unannotated, and arrival on a socket is NOT an addressing signal). The
+      //   MCP path's gate is isDM || isMentioned; this reproduces it. Anything
+      //   unaddressed is dropped — injecting joined-channel chatter into the
+      //   agent's session would burn its tokens on messages not meant for it.
+      const isDm = typeof msg.channel_id === "string" && msg.channel_id.startsWith("dm-");
       const bySocket = (msg as any).__botId ? table.forBot(String((msg as any).__botId)) : null;
-      const target = bySocket ?? routeInbound(table, {
-        channel_id: msg.channel_id,
-        mentioned_ids: (msg as any).mentioned_ids,
-        dmOwnerBotId: (msg as any).dm_owner,
-      }) ?? (table.isSingle() ? table.all()[0] : null);
+      const target = isDm
+        ? bySocket ?? routeInbound(table, {
+            channel_id: msg.channel_id,
+            dmOwnerBotId: (msg as any).dm_owner,
+          }) ?? (table.isSingle() ? table.all()[0] : null)
+        : routeInbound(table, {
+            channel_id: msg.channel_id,
+            mentioned_ids: (msg as any).mentioned_ids,
+            content: msg.content,
+          });
       if (!target) {
         log(`[connector] inbound unaddressed (channel=${(msg as any).channel_id ?? "?"} mentions=${JSON.stringify((msg as any).mentioned_ids ?? [])}) — dropped`);
         return;
@@ -258,6 +292,29 @@ export function startConnector(config: ConnectorConfig): ConnectorHandle {
       if (!event) return;
       // Tag the fronting identity so the gateway keys the right session/profile.
       (event.source as any).profile = target.botId;
+      if (!isDm) {
+        // Attach "what happened since you were last addressed" so the agent gets
+        // the conversation BETWEEN its @-mentions without being injected into
+        // every unaddressed message. Upstream renders event.context into the
+        // event's channel_context ("[Recent channel messages]") — gateway needs
+        // no change. Best-effort: a context failure never delays the message.
+        const key = `${target.botId}:${msg.channel_id}`;
+        const since = lastAddressed.get(key);
+        if (hooks.getChannelContext) {
+          try {
+            const ctx = await hooks.getChannelContext(target.botId, msg.channel_id!, since, msg.id);
+            if (ctx && ctx.length) {
+              event.context = ctx.slice(-10).map((c) => ({
+                text: String(c?.text ?? "").slice(0, 500),
+                source: { user_name: c?.user_name, user_id: c?.user_id },
+              }));
+            }
+          } catch (e) {
+            log(`[connector] context fetch failed for ${key} (delivering without it): ${e}`);
+          }
+        }
+        if (msg.timestamp) lastAddressed.set(key, msg.timestamp);
+      }
       for (const conn of sockets) {
         if (conn.fronted.has(target.botId)) send(conn.ws, { type: "inbound", event });
       }

package/dist/connector.js

@@ -104,6 +104,17 @@ function toWireEvent(msg, platform = "agentschat") {
   };
 }
 
+// src/mentions.ts
+function matchesMention(content, agentId) {
+  if (!content || !agentId)
+    return false;
+  if (content.includes(`@${agentId}`))
+    return true;
+  const idEsc = agentId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const displayMentionRe = new RegExp(`@[^(\\n]+\\(${idEsc}\\)`);
+  return displayMentionRe.test(content);
+}
+
 // connector/identities.ts
 class IdentityTable {
   byBot = new Map;
@@ -138,6 +149,13 @@ function routeInbound(table, ctx) {
     if (id)
       return id;
   }
+  const content = ctx.content ?? "";
+  if (content) {
+    for (const id of table.all()) {
+      if (matchesMention(content, id.agentId) || matchesMention(content, id.botId))
+        return id;
+    }
+  }
   return null;
 }
 
@@ -145,14 +163,17 @@ function routeInbound(table, ctx) {
 function startConnector(config) {
   const log = config.logger ?? (() => {});
   const descriptor = buildDescriptor(config.descriptor);
-  const single = !config.identities || config.identities.length === 0;
-  const table = new IdentityTable(single ? [{ botId: "default", agentId: "default", token: "", gatewayId: "", secret: "" }] : config.identities);
-  const hooks = single ? {
+  const legacy = !config.identities || config.identities.length === 0;
+  const table = new IdentityTable(legacy ? [{ botId: "default", agentId: "default", token: "", gatewayId: "", secret: "" }] : config.identities);
+  const single = table.isSingle();
+  const hooks = legacy ? {
     sendMessage: (_b, chatId, content, replyTo) => config.agentschat.sendMessage(chatId, content, replyTo),
     getChatInfo: (_b, chatId) => config.agentschat.getChatInfo(chatId),
-    sendTyping: (_b, chatId) => config.agentschat.sendTyping?.(chatId) ?? Promise.resolve()
+    sendTyping: (_b, chatId) => config.agentschat.sendTyping?.(chatId) ?? Promise.resolve(),
+    getChannelContext: (_b, chatId, sinceTs, excludeId) => config.agentschat.getChannelContext?.(chatId, sinceTs, excludeId) ?? Promise.resolve(null)
   } : config.agentschat;
   const sockets = new Set;
+  const lastAddressed = new Map;
   const http = createServer((_req, res) => {
     res.writeHead(200, { "Content-Type": "application/json" });
     res.end(JSON.stringify({ ok: true, service: "agentschat-connector", contract_version: 1, identities: table.size }));
@@ -272,13 +293,17 @@ function startConnector(config) {
       wss.close();
       http.close();
     },
-    injectAgentsChatMessage(msg) {
+    async injectAgentsChatMessage(msg) {
+      const isDm = typeof msg.channel_id === "string" && msg.channel_id.startsWith("dm-");
       const bySocket = msg.__botId ? table.forBot(String(msg.__botId)) : null;
-      const target = bySocket ?? routeInbound(table, {
+      const target = isDm ? bySocket ?? routeInbound(table, {
         channel_id: msg.channel_id,
-        mentioned_ids: msg.mentioned_ids,
         dmOwnerBotId: msg.dm_owner
-      }) ?? (table.isSingle() ? table.all()[0] : null);
+      }) ?? (table.isSingle() ? table.all()[0] : null) : routeInbound(table, {
+        channel_id: msg.channel_id,
+        mentioned_ids: msg.mentioned_ids,
+        content: msg.content
+      });
       if (!target) {
         log(`[connector] inbound unaddressed (channel=${msg.channel_id ?? "?"} mentions=${JSON.stringify(msg.mentioned_ids ?? [])}) — dropped`);
         return;
@@ -287,6 +312,25 @@ function startConnector(config) {
       if (!event)
         return;
       event.source.profile = target.botId;
+      if (!isDm) {
+        const key = `${target.botId}:${msg.channel_id}`;
+        const since = lastAddressed.get(key);
+        if (hooks.getChannelContext) {
+          try {
+            const ctx = await hooks.getChannelContext(target.botId, msg.channel_id, since, msg.id);
+            if (ctx && ctx.length) {
+              event.context = ctx.slice(-10).map((c) => ({
+                text: String(c?.text ?? "").slice(0, 500),
+                source: { user_name: c?.user_name, user_id: c?.user_id }
+              }));
+            }
+          } catch (e) {
+            log(`[connector] context fetch failed for ${key} (delivering without it): ${e}`);
+          }
+        }
+        if (msg.timestamp)
+          lastAddressed.set(key, msg.timestamp);
+      }
       for (const conn of sockets) {
         if (conn.fronted.has(target.botId))
           send(conn.ws, { type: "inbound", event });
@@ -309,6 +353,11 @@ function peekPayload(token) {
   }
 }
 
+// src/redact.ts
+function redactSecrets(text) {
+  return text.replace(/ac_[A-Za-z0-9_-]{16,}/g, "ac_***REDACTED***").replace(/eyJ[A-Za-z0-9_-]{20,}\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/g, "***JWT_REDACTED***");
+}
+
 // connector/run.ts
 var log = (m) => process.stderr.write(`[agentschat-connector] ${m}
 `);
@@ -405,7 +454,7 @@ var connector = startConnector({
   port: PORT,
   host: HOST,
   secrets,
-  identities: single ? undefined : identities,
+  identities,
   agentschat: {
     async sendMessage(botId, chatId, content, replyTo) {
       const id = identities.find((i) => i.botId === botId) ?? identities[0];
@@ -437,6 +486,24 @@ var connector = startConnector({
           ws.send(JSON.stringify({ type: "typing", channel_id: chatId, sender_id: id.agentId }));
         } catch {}
       }
+    },
+    async getChannelContext(botId, chatId, sinceTs, excludeId) {
+      const id = identities.find((i) => i.botId === botId) ?? identities[0];
+      const res = await fetch(`${API}/api/channels/${encodeURIComponent(chatId)}/messages?limit=50`, {
+        headers: { Authorization: `Bearer ${id.token}` }
+      });
+      if (!res.ok)
+        return null;
+      const msgs = ((await res.json())?.messages ?? []).filter((m) => m?.content && m.content !== "__typing__" && m?.id !== excludeId).sort((a, b) => String(a.timestamp ?? "").localeCompare(String(b.timestamp ?? "")));
+      const windowed = sinceTs ? msgs.filter((m) => String(m.timestamp ?? "") > sinceTs) : msgs;
+      const tail = windowed.slice(-10);
+      if (!tail.length)
+        return null;
+      return tail.map((m) => ({
+        text: redactSecrets(String(m.content)).slice(0, 500),
+        user_name: m.sender_name ?? m.sender_id,
+        user_id: m.sender_id
+      }));
     }
   },
   logger: log

package/dist/server.js

@@ -361,7 +361,7 @@ async function fireGrokWake(msg, cfg) {
 var package_default = {
   name: "agentschat-mcp",
   mcpName: "io.github.swswordholy-tech/agentschat-mcp",
-  version: "0.32.3",
+  version: "0.33.0",
   description: "Connect Claude Code to AgentsChat — AI Agent social network. Core tools stay lean while extended tool groups load on demand for lower token overhead and cleaner role-specific context.",
   type: "module",
   bin: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "agentschat-mcp",
   "mcpName": "io.github.swswordholy-tech/agentschat-mcp",
-  "version": "0.32.3",
+  "version": "0.33.0",
   "description": "Connect Claude Code to AgentsChat — AI Agent social network. Core tools stay lean while extended tool groups load on demand for lower token overhead and cleaner role-specific context.",
   "type": "module",
   "bin": {