@nextclaw/channel-runtime 0.1.7 → 0.1.8

package/dist/index.d.ts

@@ -64,6 +64,9 @@ declare class DiscordChannel extends BaseChannel<Config["channels"]["discord"]>
     send(msg: OutboundMessage): Promise<void>;
     private handleIncoming;
     private resolveProxyAgent;
+    private resolveAccountId;
+    private isAllowedByPolicy;
+    private resolveMentionState;
     private resolveInboundAttachment;
     private startTyping;
     private stopTyping;
@@ -192,6 +195,8 @@ declare class TelegramChannel extends BaseChannel<Config["channels"]["telegram"]
     private sessionManager?;
     name: string;
     private bot;
+    private botUserId;
+    private botUsername;
     private readonly typingController;
     private transcriber;
     constructor(config: Config["channels"]["telegram"], bus: MessageBus, groqApiKey?: string, sessionManager?: SessionManager | undefined);
@@ -202,6 +207,9 @@ declare class TelegramChannel extends BaseChannel<Config["channels"]["telegram"]
     private dispatchToBus;
     private startTyping;
     private stopTyping;
+    private resolveAccountId;
+    private isAllowedByPolicy;
+    private resolveMentionState;
 }
 
 declare class WeComChannel extends BaseChannel<Config["channels"]["wecom"]> {

package/dist/index.js

@@ -316,7 +316,12 @@ var DiscordChannel = class extends BaseChannel {
     }
     const senderId = message.author.id;
     const channelId = message.channelId;
-    if (!this.isAllowed(senderId)) {
+    const isGroup = Boolean(message.guildId);
+    if (!this.isAllowedByPolicy({ senderId, channelId, isGroup })) {
+      return;
+    }
+    const mentionState = this.resolveMentionState({ message, selfUserId, channelId, isGroup });
+    if (mentionState.requireMention && !mentionState.wasMentioned) {
       return;
     }
     const contentParts = [];
@@ -358,8 +363,16 @@ var DiscordChannel = class extends BaseChannel {
         attachments,
         metadata: {
           message_id: message.id,
+          channel_id: channelId,
           guild_id: message.guildId,
           reply_to: replyTo,
+          account_id: this.resolveAccountId(),
+          accountId: this.resolveAccountId(),
+          is_group: isGroup,
+          peer_kind: isGroup ? "channel" : "direct",
+          peer_id: isGroup ? channelId : senderId,
+          was_mentioned: mentionState.wasMentioned,
+          require_mention: mentionState.requireMention,
           ...attachmentIssues.length ? { attachment_issues: attachmentIssues } : {}
         }
       });
@@ -378,6 +391,62 @@ var DiscordChannel = class extends BaseChannel {
       return null;
     }
   }
+  resolveAccountId() {
+    const accountId = this.config.accountId?.trim();
+    return accountId || "default";
+  }
+  isAllowedByPolicy(params) {
+    if (!params.isGroup) {
+      if (this.config.dmPolicy === "disabled") {
+        return false;
+      }
+      const allowFrom = this.config.allowFrom ?? [];
+      if (this.config.dmPolicy === "allowlist" || this.config.dmPolicy === "pairing") {
+        return this.isAllowed(params.senderId);
+      }
+      if (allowFrom.includes("*")) {
+        return true;
+      }
+      return allowFrom.length === 0 ? true : this.isAllowed(params.senderId);
+    }
+    if (this.config.groupPolicy === "disabled") {
+      return false;
+    }
+    if (this.config.groupPolicy === "allowlist") {
+      const allowFrom = this.config.groupAllowFrom ?? [];
+      return allowFrom.includes("*") || allowFrom.includes(params.channelId);
+    }
+    return true;
+  }
+  resolveMentionState(params) {
+    if (!params.isGroup) {
+      return { wasMentioned: false, requireMention: false };
+    }
+    const groups = this.config.groups ?? {};
+    const groupRule = groups[params.channelId] ?? groups["*"];
+    const requireMention = groupRule?.requireMention ?? this.config.requireMention ?? false;
+    if (!requireMention) {
+      return { wasMentioned: false, requireMention: false };
+    }
+    const patterns = [
+      ...this.config.mentionPatterns ?? [],
+      ...groupRule?.mentionPatterns ?? []
+    ].map((pattern) => pattern.trim()).filter(Boolean);
+    const content = params.message.content ?? "";
+    const wasMentionedByUserRef = Boolean(params.selfUserId) && params.message.mentions.users.has(params.selfUserId ?? "");
+    const wasMentionedByText = Boolean(params.selfUserId) && (content.includes(`<@${params.selfUserId}>`) || content.includes(`<@!${params.selfUserId}>`));
+    const wasMentionedByPattern = patterns.some((pattern) => {
+      try {
+        return new RegExp(pattern, "i").test(content);
+      } catch {
+        return content.toLowerCase().includes(pattern.toLowerCase());
+      }
+    });
+    return {
+      wasMentioned: wasMentionedByUserRef || wasMentionedByText || wasMentionedByPattern,
+      requireMention
+    };
+  }
   async resolveInboundAttachment(params) {
     const { attachment, mediaDir, maxBytes, proxy } = params;
     const id = attachment.id;
@@ -2395,6 +2464,8 @@ var TelegramChannel = class extends BaseChannel {
   }
   name = "telegram";
   bot = null;
+  botUserId = null;
+  botUsername = null;
   typingController;
   transcriber;
   async start() {
@@ -2407,6 +2478,14 @@ var TelegramChannel = class extends BaseChannel {
       options.request = { proxy: this.config.proxy };
     }
     this.bot = new TelegramBot(this.config.token, options);
+    try {
+      const me = await this.bot.getMe();
+      this.botUserId = me.id;
+      this.botUsername = me.username ?? null;
+    } catch {
+      this.botUserId = null;
+      this.botUsername = null;
+    }
     this.bot.onText(/^\/start$/, async (msg) => {
       await this.bot?.sendMessage(
         msg.chat.id,
@@ -2432,12 +2511,31 @@ Just send me a text message to chat!`;
         await this.bot?.sendMessage(msg.chat.id, "\u26A0\uFE0F Session management is not available.");
         return;
       }
-      const sessionKey = `${this.name}:${chatId}`;
-      const session = this.sessionManager.getOrCreate(sessionKey);
-      const count = session.messages.length;
-      this.sessionManager.clear(session);
-      this.sessionManager.save(session);
-      await this.bot?.sendMessage(msg.chat.id, `\u{1F504} Conversation history cleared (${count} messages).`);
+      const accountId = this.resolveAccountId();
+      const candidates = this.sessionManager.listSessions().filter((entry) => {
+        const metadata = entry.metadata ?? {};
+        const lastChannel = typeof metadata.last_channel === "string" ? metadata.last_channel : "";
+        const lastTo = typeof metadata.last_to === "string" ? metadata.last_to : "";
+        const lastAccountId = typeof metadata.last_account_id === "string" ? metadata.last_account_id : typeof metadata.last_accountId === "string" ? metadata.last_accountId : "default";
+        return lastChannel === this.name && lastTo === chatId && lastAccountId === accountId;
+      }).map((entry) => String(entry.key ?? "")).filter(Boolean);
+      let totalCleared = 0;
+      for (const key of candidates) {
+        const session = this.sessionManager.getIfExists(key);
+        if (!session) {
+          continue;
+        }
+        totalCleared += session.messages.length;
+        this.sessionManager.clear(session);
+        this.sessionManager.save(session);
+      }
+      if (candidates.length === 0) {
+        const legacySession = this.sessionManager.getOrCreate(`${this.name}:${chatId}`);
+        totalCleared = legacySession.messages.length;
+        this.sessionManager.clear(legacySession);
+        this.sessionManager.save(legacySession);
+      }
+      await this.bot?.sendMessage(msg.chat.id, `\u{1F504} Conversation history cleared (${totalCleared} messages).`);
     });
     this.bot.on("message", async (msg) => {
       if (!msg.text && !msg.caption && !msg.photo && !msg.voice && !msg.audio && !msg.document) {
@@ -2498,6 +2596,14 @@ Just send me a text message to chat!`;
       return;
     }
     const chatId = String(message.chat.id);
+    const isGroup = message.chat.type !== "private";
+    if (!this.isAllowedByPolicy({ senderId: String(sender.id), chatId, isGroup })) {
+      return;
+    }
+    const mentionState = this.resolveMentionState({ message, chatId, isGroup });
+    if (mentionState.requireMention && !mentionState.wasMentioned) {
+      return;
+    }
     let senderId = String(sender.id);
     if (sender.username) {
       senderId = `${senderId}|${sender.username}`;
@@ -2546,7 +2652,13 @@ Just send me a text message to chat!`;
         first_name: sender.firstName,
         sender_type: sender.type,
         is_bot: sender.isBot,
-        is_group: message.chat.type !== "private"
+        is_group: isGroup,
+        account_id: this.resolveAccountId(),
+        accountId: this.resolveAccountId(),
+        peer_kind: isGroup ? "group" : "direct",
+        peer_id: isGroup ? chatId : String(sender.id),
+        was_mentioned: mentionState.wasMentioned,
+        require_mention: mentionState.requireMention
       });
     } finally {
       this.stopTyping(chatId);
@@ -2561,6 +2673,63 @@ Just send me a text message to chat!`;
   stopTyping(chatId) {
     this.typingController.stop(chatId);
   }
+  resolveAccountId() {
+    const accountId = this.config.accountId?.trim();
+    return accountId || "default";
+  }
+  isAllowedByPolicy(params) {
+    if (!params.isGroup) {
+      if (this.config.dmPolicy === "disabled") {
+        return false;
+      }
+      const allowFrom = this.config.allowFrom ?? [];
+      if (this.config.dmPolicy === "allowlist" || this.config.dmPolicy === "pairing") {
+        return this.isAllowed(params.senderId);
+      }
+      if (allowFrom.includes("*")) {
+        return true;
+      }
+      return allowFrom.length === 0 ? true : this.isAllowed(params.senderId);
+    }
+    if (this.config.groupPolicy === "disabled") {
+      return false;
+    }
+    if (this.config.groupPolicy === "allowlist") {
+      const allowFrom = this.config.groupAllowFrom ?? [];
+      return allowFrom.includes("*") || allowFrom.includes(params.chatId);
+    }
+    return true;
+  }
+  resolveMentionState(params) {
+    if (!params.isGroup) {
+      return { wasMentioned: false, requireMention: false };
+    }
+    const groups = this.config.groups ?? {};
+    const groupRule = groups[params.chatId] ?? groups["*"];
+    const requireMention = groupRule?.requireMention ?? this.config.requireMention ?? false;
+    if (!requireMention) {
+      return { wasMentioned: false, requireMention: false };
+    }
+    const content = `${params.message.text ?? ""}
+${params.message.caption ?? ""}`.trim();
+    const patterns = [
+      ...this.config.mentionPatterns ?? [],
+      ...groupRule?.mentionPatterns ?? []
+    ].map((pattern) => pattern.trim()).filter(Boolean);
+    const usernameMentioned = this.botUsername ? content.includes(`@${this.botUsername}`) : false;
+    const replyToBot = Boolean(this.botUserId) && Boolean(params.message.reply_to_message?.from) && params.message.reply_to_message?.from?.id === this.botUserId;
+    const patternMentioned = patterns.some((pattern) => {
+      try {
+        return new RegExp(pattern, "i").test(content);
+      } catch {
+        return content.toLowerCase().includes(pattern.toLowerCase());
+      }
+    });
+    return {
+      wasMentioned: usernameMentioned || replyToBot || patternMentioned,
+      requireMention
+    };
+  }
 };
 function resolveSender(message) {
   if (message.from) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/channel-runtime",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "private": false,
   "description": "Runtime implementations for NextClaw builtin channel plugins.",
   "type": "module",
@@ -15,7 +15,7 @@
   ],
   "dependencies": {
     "@larksuiteoapi/node-sdk": "^1.58.0",
-    "@nextclaw/core": "^0.6.21",
+    "@nextclaw/core": "^0.6.22",
     "@slack/socket-mode": "^1.3.3",
     "@slack/web-api": "^7.6.0",
     "dingtalk-stream": "^2.1.4",