@lmcl/ailo-mcp-feishu 0.0.8 → 0.1.0

package/dist/feishu-handler.js

@@ -9,22 +9,17 @@ export class FeishuHandler {
     config;
     client;
     wsClient = null;
-    onMessageHandler = null;
+    ctx = null;
     onP2PChatEntered = null;
     onBotAddedToGroup = null;
     onBotRemovedFromGroup = null;
     onMessageRead = null;
-    // bot 自身的 open_id，用于检测 mentionsSelf
     botOpenId = "";
-    // @提及名称 → open_id 缓存，用于将出站文本中的 @Name 转为飞书 <at> 标签
     mentionNameToId = new Map();
-    // 懒加载缓存
     userCache = new Map();
     chatCache = new Map();
-    // 外部用户顺序编号（userId → 编号标签），通过 ChannelStorage 持久化，跨重启保持稳定
     externalUserCounter = 0;
     externalUserLabels = new Map();
-    storage = null;
     // messageId → 消息元数据映射缓存（供撤回/Reaction 等事件查找）
     msgMetaMap = new Map();
     MSG_META_MAP_MAX = 2000;
@@ -42,12 +37,8 @@ export class FeishuHandler {
             loggerLevel: Lark.LoggerLevel.fatal,
         });
     }
-    /**
-     * 注入持久化存储（SDK 连接后注入，含 getData/setData/deleteData）。
-     */
-    setDataProvider(provider) {
-        this.storage = provider;
-        this.loadExternalUserLabels();
+    get storage() {
+        return this.ctx?.storage ?? null;
     }
     /** 外部用户数据单 key：{ _counter, [userId]: label } */
     static EXTERNAL_USERS_KEY = "external_users";
@@ -293,8 +284,10 @@ export class FeishuHandler {
         }
         return { text: resolved, mentionsSelf };
     }
-    setOnMessage(handler) {
-        this.onMessageHandler = handler;
+    acceptMessage(msg) {
+        if (!this.ctx)
+            return;
+        this.ctx.accept(msg).catch((err) => console.error("[feishu] accept failed:", err));
     }
     setOnP2PChatEntered(handler) {
         this.onP2PChatEntered = handler;
@@ -309,30 +302,30 @@ export class FeishuHandler {
         this.onMessageRead = handler;
     }
     buildBridgeMessage(opts) {
-        const { chatId, text, chatType, senderId = "", senderName = "", chatName, mentionsSelf, timestamp, attachments } = opts;
+        const { chatId, text, chatType, senderId = "", senderName = "", chatName, attachments } = opts;
         const isPrivate = chatType === "私聊";
+        // 新 ContextTag 格式（kind/streamKey/routing）：
+        // - TagChannel 由网关根据 displayName 自动注入，飞书不重复添加
+        // - chat_id 参与 stream_key 推导（streamKey=true），仅路由（routing=true）
+        // - 私聊：stream_key = feishu:{ou_xxx}（用户 ID）
+        // - 群聊：stream_key = feishu:{oc_xxx}（群 ID）
+        // - "@我" 是内容语义不是时空场，不放 contextTags
+        // - "时间" 由框架在接收时自动渲染，不由通道传入
         const tags = [
-            { desc: "类型", value: chatType, core: true },
-            { desc: "会话", value: chatId, core: true },
+            { kind: "conv_type", value: chatType, streamKey: false },
+            { kind: "chat_id", value: chatId, streamKey: true, routing: true },
         ];
-        if (!isPrivate && chatName) {
-            tags.push({ desc: "群名", value: chatName, core: true });
+        if (!isPrivate) {
+            // 群聊：群名作为 stream_key 语义补充，group 标签不参与 stream_key（chat_id 已足够）
+            const groupName = chatName || `群${chatId.slice(-8)}`;
+            tags.push({ kind: "group", value: groupName, streamKey: false });
         }
-        else if (!isPrivate && chatId) {
-            tags.push({ desc: "群名", value: `群${chatId.slice(-8)}`, core: true });
+        if (senderName) {
+            tags.push({ kind: "participant", value: senderName, streamKey: false });
         }
-        tags.push({ desc: "昵称", value: senderName, core: isPrivate }, { desc: "用户", value: senderId, core: isPrivate });
-        if (mentionsSelf) {
-            tags.push({ desc: "@我", value: "是", core: isPrivate });
-        }
-        if (timestamp != null && timestamp > 0) {
-            const d = new Date(timestamp);
-            const pad = (n) => String(n).padStart(2, "0");
-            tags.push({
-                desc: "时间",
-                value: `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`,
-                core: false,
-            });
+        if (senderId) {
+            // sender_id 仅路由备用（recall agent 按参与者查询时使用），不展示在历史邮戳
+            tags.push({ kind: "sender_id", value: senderId, streamKey: false, routing: true });
         }
         return { text, contextTags: tags, attachments };
     }
@@ -533,8 +526,9 @@ export class FeishuHandler {
      * 使用飞书 WebSocket 长连接接收事件，无需配置回调地址。
      * 需在飞书开放平台「事件与回调」中选择「使用长连接接收事件」并保存（本客户端需在线）。
      */
-    start() {
-        // 获取 bot 自身的 open_id（异步，不阻塞启动）
+    start(ctx) {
+        this.ctx = ctx;
+        this.loadExternalUserLabels();
         this.fetchBotOpenId();
         // MCP stdio 占用 stdout，Lark SDK 的 logger 必须写到 stderr
         const stderrLogger = {
@@ -561,7 +555,7 @@ export class FeishuHandler {
         eventDispatcher.register({
             "im.message.receive_v1": async (data) => {
                 const event = data;
-                if (!event.message || !this.onMessageHandler)
+                if (!event.message || !this.ctx)
                     return;
                 const msg = event.message;
                 const chatId = msg.chat_id ?? "";
@@ -665,7 +659,7 @@ export class FeishuHandler {
                 }
                 if (chatId || messageId) {
                     const isP2p = chatType === "p2p";
-                    this.onMessageHandler(this.buildBridgeMessage({
+                    this.acceptMessage(this.buildBridgeMessage({
                         chatId: chatId ?? messageId ?? "",
                         text,
                         chatType: isP2p ? "私聊" : "群聊",
@@ -701,7 +695,7 @@ export class FeishuHandler {
                     this.onMessageRead(data);
             },
             "im.message.recalled_v1": async (data) => {
-                if (!this.onMessageHandler)
+                if (!this.ctx)
                     return;
                 const event = data;
                 const messageId = event.message_id ?? "";
@@ -769,7 +763,7 @@ export class FeishuHandler {
                 }
                 console.error(`[feishu] message recalled: ${messageId} by ${msgSenderName || "(unknown)"}(${msgSenderId}) recall_type=${recallType} in ${chatId}`);
                 const isP2pRecall = chatType === "p2p";
-                this.onMessageHandler(this.buildBridgeMessage({
+                this.acceptMessage(this.buildBridgeMessage({
                     chatId,
                     text,
                     chatType: isP2pRecall ? "私聊" : "群聊",
@@ -779,7 +773,7 @@ export class FeishuHandler {
                 }));
             },
             "im.message.reaction.created_v1": async (data) => {
-                if (!this.onMessageHandler)
+                if (!this.ctx)
                     return;
                 const event = data;
                 const messageId = event.message_id ?? "";
@@ -796,7 +790,7 @@ export class FeishuHandler {
                 const chatType = this.inferChatType(chatId);
                 console.error(`[feishu] reaction ${emoji} on ${messageId} by ${reactorName}(${reactorId})`);
                 const isP2pReaction = chatType === "p2p";
-                this.onMessageHandler(this.buildBridgeMessage({
+                this.acceptMessage(this.buildBridgeMessage({
                     chatId,
                     text: `[${reactorName} 对一条消息贴了表情 ${emoji} (message_id: ${messageId})]`,
                     chatType: isP2pReaction ? "私聊" : "群聊",
@@ -806,7 +800,7 @@ export class FeishuHandler {
                 }));
             },
             "im.message.reaction.deleted_v1": async (data) => {
-                if (!this.onMessageHandler)
+                if (!this.ctx)
                     return;
                 const event = data;
                 const messageId = event.message_id ?? "";
@@ -823,7 +817,7 @@ export class FeishuHandler {
                 const chatType = this.inferChatType(chatId);
                 console.error(`[feishu] reaction removed ${emoji} on ${messageId} by ${reactorName}(${reactorId})`);
                 const isP2pDel = chatType === "p2p";
-                this.onMessageHandler(this.buildBridgeMessage({
+                this.acceptMessage(this.buildBridgeMessage({
                     chatId,
                     text: `[${reactorName} 移除了表情 ${emoji} (message_id: ${messageId})]`,
                     chatType: isP2pDel ? "私聊" : "群聊",
@@ -1047,6 +1041,9 @@ export class FeishuHandler {
             });
         }
     }
+    async stop() {
+        this.ctx = null;
+    }
     /** 处理来自 MCP 工具 feishu action=set_nickname 的命令 */
     async onCommand(command, params) {
         if (command !== "set_nickname")

package/dist/index.js

@@ -25,6 +25,8 @@ function feishuBuildChannelPrompt() {
 const mcpServer = createFeishuMcpServer(handler);
 runMcpChannel({
     handler,
+    displayName: "飞书",
+    defaultRequiresResponse: true,
     buildChannelPrompt: feishuBuildChannelPrompt,
     mcpServer,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lmcl/ailo-mcp-feishu",
-  "version": "0.0.8",
+  "version": "0.1.0",
   "description": "Ailo 飞书/Lark 通道 MCP",
   "type": "module",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.56.1",
-    "@lmcl/ailo-mcp-sdk": "^0.0.3",
+    "@lmcl/ailo-mcp-sdk": "^0.1.0",
     "@modelcontextprotocol/sdk": "^1.26.0",
     "dotenv": "^16.4.5",
     "form-data": "^4.0.0",

package/src/feishu-handler.ts

@@ -2,7 +2,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import * as Lark from "@larksuiteoapi/node-sdk";
-import { getWorkDir, type BridgeHandler, type BridgeMessage, type ContextTag } from "@lmcl/ailo-mcp-sdk";
+import { getWorkDir, type BridgeHandler, type BridgeMessage, type ChannelContext, type ChannelStorage, type ContextTag } from "@lmcl/ailo-mcp-sdk";
 import {
   type CacheEntry,
   type ChatInfo,
@@ -29,35 +29,21 @@ import {
 
 export type { FeishuConfig, FeishuAttachment, OnChatId } from "./feishu-types.js";
 
-type ChannelStorage = {
-  getData(key: string): Promise<string | null>;
-  setData(key: string, value: string): Promise<void>;
-  deleteData(key: string): Promise<void>;
-};
-
 export class FeishuHandler implements BridgeHandler {
   private client: Lark.Client;
   private wsClient: Lark.WSClient | null = null;
-  private onMessageHandler: ((msg: BridgeMessage) => void | Promise<void>) | null = null;
+  private ctx: ChannelContext | null = null;
   private onP2PChatEntered: OnChatId | null = null;
   private onBotAddedToGroup: OnChatId | null = null;
   private onBotRemovedFromGroup: OnChatId | null = null;
   private onMessageRead: ((data: unknown) => void) | null = null;
 
-  // bot 自身的 open_id，用于检测 mentionsSelf
   private botOpenId: string = "";
-
-  // @提及名称 → open_id 缓存，用于将出站文本中的 @Name 转为飞书 <at> 标签
   private mentionNameToId = new Map<string, string>();
-
-  // 懒加载缓存
   private userCache = new Map<string, CacheEntry<UserInfo>>();
   private chatCache = new Map<string, CacheEntry<ChatInfo>>();
-
-  // 外部用户顺序编号（userId → 编号标签），通过 ChannelStorage 持久化，跨重启保持稳定
   private externalUserCounter = 0;
   private externalUserLabels = new Map<string, string>();
-  private storage: ChannelStorage | null = null;
 
   // messageId → 消息元数据映射缓存（供撤回/Reaction 等事件查找）
   private msgMetaMap = new Map<string, { chatId: string; senderId: string; senderName: string }>();
@@ -79,12 +65,8 @@ export class FeishuHandler implements BridgeHandler {
 
   }
 
-  /**
-   * 注入持久化存储（SDK 连接后注入，含 getData/setData/deleteData）。
-   */
-  setDataProvider?(provider: ChannelStorage): void {
-    this.storage = provider;
-    this.loadExternalUserLabels();
+  private get storage(): ChannelStorage | null {
+    return this.ctx?.storage ?? null;
   }
 
   /** 外部用户数据单 key：{ _counter, [userId]: label } */
@@ -350,8 +332,9 @@ export class FeishuHandler implements BridgeHandler {
     return { text: resolved, mentionsSelf };
   }
 
-  setOnMessage(handler: (msg: BridgeMessage) => void | Promise<void>): void {
-    this.onMessageHandler = handler;
+  private acceptMessage(msg: BridgeMessage): void {
+    if (!this.ctx) return;
+    this.ctx.accept(msg).catch((err) => console.error("[feishu] accept failed:", err));
   }
 
   setOnP2PChatEntered(handler: OnChatId | null): void {
@@ -381,33 +364,36 @@ export class FeishuHandler implements BridgeHandler {
     timestamp?: number;
     attachments?: Array<{ type: string; path?: string; url?: string; base64?: string; mime?: string; name?: string }>;
   }): BridgeMessage {
-    const { chatId, text, chatType, senderId = "", senderName = "", chatName, mentionsSelf, timestamp, attachments } = opts;
+    const { chatId, text, chatType, senderId = "", senderName = "", chatName, attachments } = opts;
     const isPrivate = chatType === "私聊";
+
+    // 新 ContextTag 格式（kind/streamKey/routing）：
+    // - TagChannel 由网关根据 displayName 自动注入，飞书不重复添加
+    // - chat_id 参与 stream_key 推导（streamKey=true），仅路由（routing=true）
+    // - 私聊：stream_key = feishu:{ou_xxx}（用户 ID）
+    // - 群聊：stream_key = feishu:{oc_xxx}（群 ID）
+    // - "@我" 是内容语义不是时空场，不放 contextTags
+    // - "时间" 由框架在接收时自动渲染，不由通道传入
     const tags: ContextTag[] = [
-      { desc: "类型", value: chatType, core: true },
-      { desc: "会话", value: chatId, core: true },
+      { kind: "conv_type", value: chatType, streamKey: false },
+      { kind: "chat_id", value: chatId, streamKey: true, routing: true },
     ];
-    if (!isPrivate && chatName) {
-      tags.push({ desc: "群名", value: chatName, core: true });
-    } else if (!isPrivate && chatId) {
-      tags.push({ desc: "群名", value: `群${chatId.slice(-8)}`, core: true });
+
+    if (!isPrivate) {
+      // 群聊：群名作为 stream_key 语义补充，group 标签不参与 stream_key（chat_id 已足够）
+      const groupName = chatName || `群${chatId.slice(-8)}`;
+      tags.push({ kind: "group", value: groupName, streamKey: false });
     }
-    tags.push(
-      { desc: "昵称", value: senderName, core: isPrivate },
-      { desc: "用户", value: senderId, core: isPrivate }
-    );
-    if (mentionsSelf) {
-      tags.push({ desc: "@我", value: "是", core: isPrivate });
+
+    if (senderName) {
+      tags.push({ kind: "participant", value: senderName, streamKey: false });
     }
-    if (timestamp != null && timestamp > 0) {
-      const d = new Date(timestamp);
-      const pad = (n: number) => String(n).padStart(2, "0");
-      tags.push({
-        desc: "时间",
-        value: `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`,
-        core: false,
-      });
+
+    if (senderId) {
+      // sender_id 仅路由备用（recall agent 按参与者查询时使用），不展示在历史邮戳
+      tags.push({ kind: "sender_id", value: senderId, streamKey: false, routing: true });
     }
+
     return { text, contextTags: tags, attachments };
   }
 
@@ -625,8 +611,9 @@ export class FeishuHandler implements BridgeHandler {
    * 使用飞书 WebSocket 长连接接收事件，无需配置回调地址。
    * 需在飞书开放平台「事件与回调」中选择「使用长连接接收事件」并保存（本客户端需在线）。
    */
-  start(): void {
-    // 获取 bot 自身的 open_id（异步，不阻塞启动）
+  start(ctx: ChannelContext): void {
+    this.ctx = ctx;
+    this.loadExternalUserLabels();
     this.fetchBotOpenId();
 
     // MCP stdio 占用 stdout，Lark SDK 的 logger 必须写到 stderr
@@ -660,7 +647,7 @@ export class FeishuHandler implements BridgeHandler {
     eventDispatcher.register({
       "im.message.receive_v1": async (data: unknown) => {
         const event = data as FeishuMessageEvent;
-        if (!event.message || !this.onMessageHandler) return;
+        if (!event.message || !this.ctx) return;
 
         const msg = event.message;
         const chatId = msg.chat_id ?? "";
@@ -777,7 +764,7 @@ export class FeishuHandler implements BridgeHandler {
 
         if (chatId || messageId) {
           const isP2p = chatType === "p2p";
-          this.onMessageHandler!(this.buildBridgeMessage({
+          this.acceptMessage(this.buildBridgeMessage({
             chatId: chatId ?? messageId ?? "",
             text,
             chatType: isP2p ? "私聊" : "群聊",
@@ -809,7 +796,7 @@ export class FeishuHandler implements BridgeHandler {
         if (this.onMessageRead) this.onMessageRead(data);
       },
       "im.message.recalled_v1": async (data: unknown) => {
-        if (!this.onMessageHandler) return;
+        if (!this.ctx) return;
         const event = data as FeishuRecalledEvent;
         const messageId = event.message_id ?? "";
         const recallType = event.recall_type ?? "unknown";
@@ -877,7 +864,7 @@ export class FeishuHandler implements BridgeHandler {
         console.error(`[feishu] message recalled: ${messageId} by ${msgSenderName || "(unknown)"}(${msgSenderId}) recall_type=${recallType} in ${chatId}`);
 
         const isP2pRecall = chatType === "p2p";
-        this.onMessageHandler!(this.buildBridgeMessage({
+        this.acceptMessage(this.buildBridgeMessage({
           chatId,
           text,
           chatType: isP2pRecall ? "私聊" : "群聊",
@@ -887,7 +874,7 @@ export class FeishuHandler implements BridgeHandler {
         }));
       },
       "im.message.reaction.created_v1": async (data: unknown) => {
-        if (!this.onMessageHandler) return;
+        if (!this.ctx) return;
         const event = data as FeishuReactionEvent;
         const messageId = event.message_id ?? "";
         const emoji = event.reaction_type?.emoji_type ?? "UNKNOWN";
@@ -907,7 +894,7 @@ export class FeishuHandler implements BridgeHandler {
         console.error(`[feishu] reaction ${emoji} on ${messageId} by ${reactorName}(${reactorId})`);
 
         const isP2pReaction = chatType === "p2p";
-        this.onMessageHandler!(this.buildBridgeMessage({
+        this.acceptMessage(this.buildBridgeMessage({
           chatId,
           text: `[${reactorName} 对一条消息贴了表情 ${emoji} (message_id: ${messageId})]`,
           chatType: isP2pReaction ? "私聊" : "群聊",
@@ -917,7 +904,7 @@ export class FeishuHandler implements BridgeHandler {
         }));
       },
       "im.message.reaction.deleted_v1": async (data: unknown) => {
-        if (!this.onMessageHandler) return;
+        if (!this.ctx) return;
         const event = data as FeishuReactionEvent;
         const messageId = event.message_id ?? "";
         const emoji = event.reaction_type?.emoji_type ?? "UNKNOWN";
@@ -937,7 +924,7 @@ export class FeishuHandler implements BridgeHandler {
         console.error(`[feishu] reaction removed ${emoji} on ${messageId} by ${reactorName}(${reactorId})`);
 
         const isP2pDel = chatType === "p2p";
-        this.onMessageHandler!(this.buildBridgeMessage({
+        this.acceptMessage(this.buildBridgeMessage({
           chatId,
           text: `[${reactorName} 移除了表情 ${emoji} (message_id: ${messageId})]`,
           chatType: isP2pDel ? "私聊" : "群聊",
@@ -1183,6 +1170,10 @@ export class FeishuHandler implements BridgeHandler {
     }
   }
 
+  async stop(): Promise<void> {
+    this.ctx = null;
+  }
+
   /** 处理来自 MCP 工具 feishu action=set_nickname 的命令 */
   async onCommand(command: string, params: Record<string, unknown>): Promise<void> {
     if (command !== "set_nickname") return;

package/src/index.ts

@@ -32,6 +32,8 @@ const mcpServer = createFeishuMcpServer(handler);
 
 runMcpChannel({
   handler,
+  displayName: "飞书",
+  defaultRequiresResponse: true,
   buildChannelPrompt: feishuBuildChannelPrompt,
   mcpServer,
 });