@cored-im/openclaw-plugin 0.1.10 → 0.1.11

package/src/messaging/inbound.test.ts

@@ -5,7 +5,6 @@ import { describe, it, expect, beforeEach, vi } from "vitest";
 import {
   parseMessageEvent,
   checkMessageGate,
-  isBotMentioned,
   isDuplicate,
   _resetDedup,
   buildContext,
@@ -26,15 +25,12 @@ function makeAccount(
 ): CoredAccountConfig {
   return {
     accountId: "test-account",
-    enabled: true,
     appId: "app_test",
     appSecret: "secret",
     backendUrl: "https://your-backend-url.com",
+    enabled: true,
     enableEncryption: true,
     requestTimeout: 30_000,
-    requireMention: true,
-    botUserId: "bot_user_001",
-    inboundWhitelist: [],
     ...overrides,
   };
 }
@@ -197,112 +193,11 @@ describe("parseMessageEvent", () => {
 describe("checkMessageGate", () => {
   it("passes a normal direct message", () => {
     const msg = parseMessageEvent(makeEvent())!;
-    const account = makeAccount({ requireMention: false });
-    const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(true);
-  });
-
-  it("blocks self-messages", () => {
-    const event = makeEvent({
-      sender: { userId: "bot_user_001" },
-    });
-    const msg = parseMessageEvent(event)!;
     const account = makeAccount();
     const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(false);
-    expect(result.reason).toBe("self-message");
-  });
-
-  it("blocks sender not in whitelist when whitelist is set", () => {
-    const msg = parseMessageEvent(makeEvent())!;
-    const account = makeAccount({
-      inboundWhitelist: ["allowed_user"],
-    });
-    const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(false);
-    expect(result.reason).toBe("sender-not-in-whitelist");
-  });
-
-  it("passes sender in whitelist", () => {
-    const msg = parseMessageEvent(makeEvent())!;
-    const account = makeAccount({
-      inboundWhitelist: ["user_sender_001"],
-      requireMention: false,
-    });
-    const result = checkMessageGate(msg, account);
     expect(result.pass).toBe(true);
   });
 
-  it("blocks group message without mention when requireMention is true", () => {
-    const event = makeEvent({ chatType: "group" });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount({ requireMention: true });
-    const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(false);
-    expect(result.reason).toBe("group-no-mention");
-  });
-
-  it("passes group message with mention", () => {
-    const event = makeEvent({
-      chatType: "group",
-      mentionUserList: [{ userId: "bot_user_001" }],
-    });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount({ requireMention: true });
-    const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(true);
-  });
-
-  it("passes group message when requireMention is false", () => {
-    const event = makeEvent({ chatType: "group" });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount({ requireMention: false });
-    const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(true);
-  });
-
-  it("skips self-message check when botUserId is not set", () => {
-    const event = makeEvent({
-      sender: { userId: "any_user" },
-    });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount({ botUserId: undefined });
-    const result = checkMessageGate(msg, account);
-    expect(result.pass).toBe(true);
-  });
-});
-
-// ---------------------------------------------------------------------------
-// isBotMentioned
-// ---------------------------------------------------------------------------
-
-describe("isBotMentioned", () => {
-  it("returns true when bot is in mentionUserIds", () => {
-    const event = makeEvent({
-      mentionUserList: [{ userId: "bot_user_001" }],
-    });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount();
-    expect(isBotMentioned(msg, account)).toBe(true);
-  });
-
-  it("returns false when bot is not mentioned", () => {
-    const event = makeEvent({
-      mentionUserList: [{ userId: "other_user" }],
-    });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount();
-    expect(isBotMentioned(msg, account)).toBe(false);
-  });
-
-  it("returns false when botUserId is not set", () => {
-    const event = makeEvent({
-      mentionUserList: [{ userId: "bot_user_001" }],
-    });
-    const msg = parseMessageEvent(event)!;
-    const account = makeAccount({ botUserId: undefined });
-    expect(isBotMentioned(msg, account)).toBe(false);
-  });
 });
 
 // ---------------------------------------------------------------------------
@@ -348,7 +243,7 @@ describe("buildContext", () => {
     expect(ctx.AccountId).toBe("test-account");
     expect(ctx.Body).toBe("hello world");
     expect(ctx.From).toBe("cored:user:user_sender_001");
-    expect(ctx.To).toBe("cored:bot:bot_user_001");
+    expect(ctx.To).toBe("cored:bot:app_test");
     expect(ctx.SessionKey).toBe("cored:user:user_sender_001");
     expect(ctx.CommandAuthorized).toBe(true);
     expect(ctx._cored.isGroup).toBe(false);
@@ -367,12 +262,6 @@ describe("buildContext", () => {
     expect(ctx._cored.chatId).toBe("chat_group_1");
   });
 
-  it("falls back to appId when botUserId is not set", () => {
-    const msg = parseMessageEvent(makeEvent())!;
-    const account = makeAccount({ botUserId: undefined });
-    const ctx = buildContext(msg, account);
-    expect(ctx.To).toBe("cored:bot:app_test");
-  });
 });
 
 // ---------------------------------------------------------------------------
@@ -386,7 +275,7 @@ describe("processInboundMessage", () => {
 
   it("dispatches a valid direct message", async () => {
     const api = makeMockApi();
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent();
     const deliver = vi.fn().mockResolvedValue(undefined);
 
@@ -397,21 +286,9 @@ describe("processInboundMessage", () => {
     expect(api.runtime.channel.session.recordInboundSession).toHaveBeenCalledOnce();
   });
 
-  it("filters self-messages", async () => {
-    const api = makeMockApi();
-    const account = makeAccount();
-    const event = makeEvent({ sender: { userId: "bot_user_001" } });
-    const deliver = vi.fn();
-
-    const result = await processInboundMessage(api, account, event, { deliver });
-
-    expect(result).toBe(false);
-    expect(api.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher).not.toHaveBeenCalled();
-  });
-
   it("filters duplicate messages", async () => {
     const api = makeMockApi();
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const msgId = "msg_dedup_test";
     const event = makeEvent({ messageId: msgId });
     const deliver = vi.fn();
@@ -423,31 +300,6 @@ describe("processInboundMessage", () => {
     expect(second).toBe(false);
   });
 
-  it("filters group messages without mention when required", async () => {
-    const api = makeMockApi();
-    const account = makeAccount({ requireMention: true });
-    const event = makeEvent({ chatType: "group" });
-    const deliver = vi.fn();
-
-    const result = await processInboundMessage(api, account, event, { deliver });
-
-    expect(result).toBe(false);
-  });
-
-  it("dispatches group message with mention", async () => {
-    const api = makeMockApi();
-    const account = makeAccount({ requireMention: true });
-    const event = makeEvent({
-      chatType: "group",
-      mentionUserList: [{ userId: "bot_user_001" }],
-    });
-    const deliver = vi.fn().mockResolvedValue(undefined);
-
-    const result = await processInboundMessage(api, account, event, { deliver });
-
-    expect(result).toBe(true);
-  });
-
   it("returns false for unparseable event", async () => {
     const api = makeMockApi();
     const account = makeAccount();
@@ -463,7 +315,7 @@ describe("processInboundMessage", () => {
     const api = makeMockApi();
     // Remove dispatch function
     (api.runtime.channel.reply as Record<string, unknown>).dispatchReplyWithBufferedBlockDispatcher = undefined;
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent();
     const deliver = vi.fn();
 
@@ -482,7 +334,7 @@ describe("processInboundMessage", () => {
     });
     api.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher = mockDispatch;
 
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent({ chatId: "chat_deliver_test" });
     const deliver = vi.fn().mockResolvedValue(undefined);
 
@@ -500,7 +352,7 @@ describe("processInboundMessage", () => {
     });
     api.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher = mockDispatch;
 
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent();
     const deliver = vi.fn();
 
@@ -511,7 +363,7 @@ describe("processInboundMessage", () => {
 
   it("records session with updateLastRoute for DM", async () => {
     const api = makeMockApi();
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent({ chatId: "chat_dm_001" });
     const deliver = vi.fn().mockResolvedValue(undefined);
 
@@ -528,7 +380,7 @@ describe("processInboundMessage", () => {
 
   it("does not set updateLastRoute for group messages", async () => {
     const api = makeMockApi();
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent({ chatType: "group" });
     const deliver = vi.fn().mockResolvedValue(undefined);
 
@@ -547,7 +399,7 @@ describe("processInboundMessage", () => {
     });
     api.runtime.channel.reply.dispatchReplyWithBufferedBlockDispatcher = mockDispatch;
 
-    const account = makeAccount({ requireMention: false });
+    const account = makeAccount();
     const event = makeEvent();
     const deliver = vi.fn();
 

package/src/messaging/inbound.ts

@@ -151,41 +151,9 @@ export function checkMessageGate(
   msg: ParsedInboundMessage,
   account: CoredAccountConfig,
 ): GateResult {
-  // 1. Self-message filter: ignore messages from the bot itself
-  if (account.botUserId && msg.senderId === account.botUserId) {
-    return { pass: false, reason: "self-message" };
-  }
-
-  // 2. Whitelist filter: if whitelist is non-empty, only allow listed senders
-  if (account.inboundWhitelist.length > 0) {
-    if (!account.inboundWhitelist.includes(msg.senderId)) {
-      return { pass: false, reason: "sender-not-in-whitelist" };
-    }
-  }
-
-  // 3. Group mention filter: in group chats, require @mention if configured
-  if (
-    msg.chatType === "group" &&
-    account.requireMention &&
-    !isBotMentioned(msg, account)
-  ) {
-    return { pass: false, reason: "group-no-mention" };
-  }
-
   return { pass: true };
 }
 
-/**
- * Check if the bot was @mentioned in a message.
- */
-export function isBotMentioned(
-  msg: ParsedInboundMessage,
-  account: CoredAccountConfig,
-): boolean {
-  if (!account.botUserId) return false;
-  return msg.mentionUserIds.includes(account.botUserId);
-}
-
 // ---------------------------------------------------------------------------
 // Dedup — skip already-processed message IDs
 // ---------------------------------------------------------------------------
@@ -279,7 +247,7 @@ export function buildContext(
   return {
     Body: msg.body,
     From: isGroup ? `cored:chat:${msg.chatId}` : `cored:user:${msg.senderId}`,
-    To: `cored:bot:${account.botUserId ?? account.appId}`,
+    To: `cored:bot:${account.appId}`,
     SessionKey: sessionKey,
     AccountId: account.accountId,
     ChatType: isGroup ? "group" : "direct",

package/src/setup-entry.ts

@@ -2,6 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { defineSetupPluginEntry } from "openclaw/plugin-sdk/core";
-import { coredPlugin } from "./channel.js";
+import { base } from "./channel.js";
 
-export default defineSetupPluginEntry(coredPlugin);
+export default defineSetupPluginEntry(base);

package/src/types.ts

@@ -5,39 +5,30 @@
 
 export interface CoredAccountConfig {
   accountId: string;
-  enabled: boolean;
   appId: string;
   appSecret: string;
   backendUrl: string;
+  enabled: boolean;
   enableEncryption: boolean;
   requestTimeout: number;
-  requireMention: boolean;
-  botUserId?: string;
-  inboundWhitelist: string[];
 }
 
 export interface CoredRawAccountConfig {
   appId?: string;
   appSecret?: string;
   backendUrl?: string;
+  enabled?: boolean;
   enableEncryption?: boolean;
   requestTimeout?: number;
-  requireMention?: boolean;
-  enabled?: boolean;
-  botUserId?: string;
-  inboundWhitelist?: string[];
 }
 
 export interface CoredChannelConfig {
   appId?: string;
   appSecret?: string;
   backendUrl?: string;
+  enabled?: boolean;
   enableEncryption?: boolean;
   requestTimeout?: number;
-  requireMention?: boolean;
-  enabled?: boolean;
-  botUserId?: string;
-  inboundWhitelist?: string[];
   accounts?: Record<string, CoredRawAccountConfig>;
 }