@qihoo/tuitui-openclaw-channel 1.0.14 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qihoo/tuitui-openclaw-channel",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "maintainers": [
     {
       "name": "huzunjie",

package/src/confs.ts

@@ -39,7 +39,7 @@ const baseFields = {
   },
   channelContext: {
     type: 'string',
-    default: 'channel',
+    default: 'thread',
     enum: ['channel', 'thread']
   },
   emojiReaction: {

package/src/histories.ts

@@ -0,0 +1,69 @@
+import {
+  DEFAULT_GROUP_HISTORY_LIMIT,
+  recordPendingHistoryEntryIfEnabled,
+  type HistoryEntry,
+} from "openclaw/plugin-sdk/reply-history";
+
+// 每个 accountId 独立的 group history map，防止多账户冲突
+const accountGroupHistories = new Map<string, Map<string, HistoryEntry[]>>();
+
+/**
+ * 记录没有被@，被忽略的群消息到对应 account 的 pending history 中
+ */
+export async function addUnmentionedHistory(apiRuntime, accountId: string, chatId: string, tuituiUserName: any, tuituiAccount: string, text: any, timestamp :any) {
+  const cfg = await apiRuntime.config.loadConfig();
+  const senderDesc = tuituiUserName ? `${tuituiUserName} (${tuituiAccount})` : tuituiAccount;
+
+  const entry: HistoryEntry = {
+    sender: senderDesc,
+    body: text,
+    timestamp: timestamp ? Number(timestamp) : Date.now(),
+ };
+
+  // 为每个 accountId 维护独立的 group history map
+  let groupHistories = accountGroupHistories.get(accountId);
+  if (!groupHistories) {
+    groupHistories = new Map<string, HistoryEntry[]>();
+    accountGroupHistories.set(accountId, groupHistories);
+  }
+
+  const historyLimit = resolveHistoryLimit(cfg);
+
+  // 这个API内部没啥神秘的，只是帮你维护map变量。openclaw本身不持有这些数据。
+  recordPendingHistoryEntryIfEnabled({
+    historyMap: groupHistories,
+    historyKey: chatId,
+    limit: historyLimit,
+    entry: entry,
+  });
+}
+
+/**
+ * 获取指定 account 和群组的 pending history，格式化为 ctx.InboundHistory 所需的格式
+ */
+export function popUnmentionedHistories(accountId: string, chatId: string): {sender: string, body: string, timestamp?: number}[] {
+  const groupHistories = accountGroupHistories.get(accountId);
+  if (!groupHistories) {
+    return [];
+  }
+  const his = groupHistories.get(chatId);
+  if (!his) {
+    return [];
+  }
+
+  groupHistories.delete(chatId);
+
+  return his.map((entry) => ({
+    sender: entry.sender,
+    body: entry.body,
+    timestamp: entry.timestamp,
+  }));
+}
+
+/**
+ * 从配置中解析 history limit
+ * dashboard->messages->groupChat->historyLimit
+ */
+export function resolveHistoryLimit(cfg: any): number {
+  return cfg.messages?.groupChat?.historyLimit ?? DEFAULT_GROUP_HISTORY_LIMIT;
+}

package/src/inbound.ts

@@ -23,6 +23,10 @@ import {
   teamsParseChatId,
 } from "./outbound";
 import { parseAllowFroms } from './utils';
+import {
+  addUnmentionedHistory,
+  popUnmentionedHistories,
+} from "./histories";
 
 /** 子函数共享的可变上下文，子函数直接修改字段，外层读取结果 */
 interface ChatPayload {
@@ -30,12 +34,14 @@ interface ChatPayload {
   chatId:       string | undefined;
   text:         string | undefined;
   groupName:    string | undefined;
+  channelName:  string | undefined;
   mediaUrls:    string[] | undefined;
   replyToId:    string | undefined;  // 引用ID
   msgId?:        string;       // 消息ID
   tuituiAccount:  string;
   tuituiUid:      string | undefined;
   tuituiUserName: string | undefined;
+  timestamp:      Number | undefined;
 }
 
 export interface InboundAccount {
@@ -227,6 +233,7 @@ const parseAndVerifyPayload: Record<string, Function> = {
     payload.chatId   = chatId;
     payload.groupName = msgData.group_name;
     payload.msgId  = msgData.msgid;
+    payload.text = buildMessageBody(msgData);
     log?.debug?.(
       `[${CHANNEL_ID}] AccountId: ${accountId}, inbound group_chat:
       tuituiAccount=${payload.tuituiAccount},
@@ -249,7 +256,8 @@ const parseAndVerifyPayload: Record<string, Function> = {
     }
 
     if (!msgData.at_me && account.requireMention) {
-      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore group message (not mentioned)`);
+      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore group message (not mentioned), add to history key: ${chatId}`);
+      await addUnmentionedHistory(apiRuntime, accountId, chatId, payload.tuituiUserName, payload.tuituiAccount, payload.text, payload.timestamp);
       return false;
     }
 
@@ -268,19 +276,20 @@ const parseAndVerifyPayload: Record<string, Function> = {
       return false;
     }
 
-    payload.text = buildMessageBody(msgData);
+    
 
     return true;
   },
   teams_post_create: async (payload: ChatPayload, msgData: any, account: InboundAccount, apiRuntime: any, log: any): Promise<boolean> => {
     const { accountId, groupPolicy, groupAllowFrom } = account;
     payload.chatType  = CHAT_TYPE_CHANNEL;
-    const { team_id, channel_id, parent_id, post_id, content } = msgData;
+    const { team_id, channel_id, parent_id, post_id, content, team_name, channel_name } = msgData;
     const thread_id   = (parent_id && parent_id != "0")?parent_id: post_id;
     const chatId      = teamsBuildChatId(team_id, channel_id, thread_id);
     payload.chatId    = chatId;
     payload.msgId     = post_id;
     payload.text      = content;
+    payload.channelName = channel_name;
     payload.replyToId = "";
     log?.debug?.(
       `[${CHANNEL_ID}] AccountId: ${accountId}, inbound teams:
@@ -305,7 +314,8 @@ const parseAndVerifyPayload: Record<string, Function> = {
     }
 
     if (!msgData.at_me && account.requireMention) {
-      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned)`);
+      log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, ignore teams post (not mentioned), add to history key: ${chatId}`);
+      await addUnmentionedHistory(apiRuntime, accountId, chatId, payload.tuituiUserName, payload.tuituiAccount, payload.text, payload.timestamp);
       return false;
     }
 
@@ -356,11 +366,13 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
     chatId:       undefined, 
     text:         undefined,
     groupName:    undefined,
+    channelName:  undefined,
     mediaUrls:    getMediaUrls(msgData),
     replyToId:    ref?.is_me && ref?.msgid ? ref.msgid : undefined,
     tuituiAccount: msg.user_account || "",
     tuituiUid:     msg.uid || "",
     tuituiUserName: msg.user_name || "",
+    timestamp:     msg.timestamp ? parseInt(msg.timestamp, 10)*1000 : undefined
   };
   const wsEvent = json.body.event;
   // 按event类型，标准化并校验基础数据
@@ -388,6 +400,14 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
   const sessionKey = getSessionKey(cfg, payload, account, apiRuntime);
   log?.info?.(`[${CHANNEL_ID}] AccountId: ${accountId}, dispatching to agent session=${sessionKey}, chatType: ${payload.chatType}, chatId ${payload.chatId}, routeSenderFrom: ${routeSenderFrom}`);
 
+  if(payload.text?.startsWith("/new") || payload.text?.endsWith("/new")) {
+    // 清理agent上下文时，同时清空历史
+    popUnmentionedHistories(accountId, payload.chatId);
+  }
+
+  // 字段意义 参考 openclaw 代码
+  // src\auto-reply\reply\inbound-meta.ts
+  // buildInboundUserContextPrefix()
   const ctx: any = {
     Body:               payload.text! || ' ',
     From:               String(routeSenderFrom),
@@ -401,13 +421,20 @@ export async function handleInboundMessage({ json, account, apiRuntime, log }: I
     Surface:            CHANNEL_ID,
     Provider:           CHANNEL_ID,
     SenderName:         payload.tuituiUserName,
-    MsgUname:           payload.tuituiAccount,
+    SenderId:           payload.tuituiAccount,
+    SenderUsername:     payload.tuituiAccount, 
     UserAccount:        payload.tuituiAccount,
+    Timestamp:          payload.timestamp,
     CommandAuthorized:  true,  // 允许 /new 等内置命令
   };
   if (payload.chatType == CHAT_TYPE_GROUP && payload.chatId) {
     ctx.GroupSubject = payload.groupName;
     ctx.GroupId      = payload.chatId;
+    ctx.InboundHistory = popUnmentionedHistories(accountId, payload.chatId);
+  }
+  if (payload.chatType == CHAT_TYPE_CHANNEL) {
+    ctx.GroupChannel = payload.channelName;
+    ctx.InboundHistory = popUnmentionedHistories(accountId, payload.chatId);
   }
   if (payload.mediaUrls?.length)  ctx.MediaUrls  = payload.mediaUrls;
   if (payload.replyToId)          ctx.ReplyToId  = payload.replyToId;

package/src/outbound.ts

@@ -491,6 +491,7 @@ export async function sendMediaMsg(
   atList?: string[],
 ): Promise<void> {
   if (!chatId) return console.error(`[${CHANNEL_ID}] sendMediaMsg Error ${auditCtx}: Missing "target"`);
+  console.log(`[${CHANNEL_ID}] sendMediaMsg ${chatType} ${chatId} ${auditCtx} uploading`);
   // Check if mediaUrl looks like an image
   const isImage = /^data:image\//i.test(mediaUrl) || /\.(jpg|jpeg|png|gif)(?:$|[?#])/i.test(mediaUrl);
   const mediaType = isImage ? 'image' : 'file';