palz-connector 1.2.1 → 1.2.2

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "palz-connector",
   "name": "Palz Connector Channel",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Palz IM 接入 OpenClaw",
   "channels": [
     "palz-connector"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "palz-connector",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "type": "module",
   "main": "index.ts",
   "description": "Palz IM 接入 OpenClaw — 模块化架构，基于 OpenClaw Runtime 消息管道",

package/palz-connector.staging.config.json

@@ -1,6 +1,6 @@
 {
   "enabled": true,
-  "streamUrl": "wss://claw-server.csjkagent.com/ws/bot",
-  "apiBaseUrl": "https://claw-server.csjkagent.com/api",
+  "streamUrl": "wss://claw-server.csagentai.com/ws/bot",
+  "apiBaseUrl": "https://claw-server.csagentai.com/api",
   "sessionTimeout": 1800000
 }

package/src/bot.ts

@@ -46,6 +46,91 @@ function createChatQueue() {
 
 const enqueue = createChatQueue();
 
+// ============ 群聊历史记录 ============
+
+interface HistoryEntry {
+  sender: string;
+  body: string;
+  timestamp: number;
+  messageId: string;
+}
+
+const DEFAULT_GROUP_HISTORY_LIMIT = 50;
+const MAX_HISTORY_KEYS = 3000;
+
+/** 群聊历史缓存，key = historyKey（agentId:conversationId） */
+const chatHistories = new Map<string, HistoryEntry[]>();
+
+function recordGroupHistoryEntry(params: {
+  historyKey: string;
+  entry: HistoryEntry;
+  limit: number;
+  log?: (...args: any[]) => void;
+}): void {
+  const log = params.log ?? console.log;
+  if (params.limit <= 0) {
+    log(`[HISTORY record] 跳过: limit=${params.limit} historyKey=${params.historyKey}`);
+    return;
+  }
+  const history = chatHistories.get(params.historyKey) ?? [];
+  const beforeLen = history.length;
+  history.push(params.entry);
+  while (history.length > params.limit) {
+    history.shift();
+  }
+  // 刷新插入顺序（LRU）
+  if (chatHistories.has(params.historyKey)) {
+    chatHistories.delete(params.historyKey);
+  }
+  chatHistories.set(params.historyKey, history);
+  log(`[HISTORY record] historyKey=${params.historyKey} before=${beforeLen} after=${history.length} limit=${params.limit} sender=${params.entry.sender} msgId=${params.entry.messageId} body="${params.entry.body.slice(0, 80)}" totalKeys=${chatHistories.size}`);
+  // 超过最大 key 数量时淘汰最老的
+  if (chatHistories.size > MAX_HISTORY_KEYS) {
+    const keysToDelete = chatHistories.size - MAX_HISTORY_KEYS;
+    const iterator = chatHistories.keys();
+    for (let i = 0; i < keysToDelete; i++) {
+      const key = iterator.next().value;
+      if (key !== undefined) chatHistories.delete(key);
+    }
+    log(`[HISTORY evict] 淘汰了 ${keysToDelete} 个 key, 剩余 ${chatHistories.size}`);
+  }
+}
+
+function buildGroupHistoryContext(params: {
+  historyKey: string;
+  currentMessage: string;
+  formatEntry: (entry: HistoryEntry) => string;
+  log?: (...args: any[]) => void;
+}): string {
+  const log = params.log ?? console.log;
+  const entries = chatHistories.get(params.historyKey) ?? [];
+  log(`[HISTORY build] historyKey=${params.historyKey} entriesCount=${entries.length} currentMsgLen=${params.currentMessage.length}`);
+  if (entries.length === 0) {
+    log(`[HISTORY build] 无历史记录, 返回原始消息`);
+    return params.currentMessage;
+  }
+  for (let i = 0; i < entries.length; i++) {
+    log(`[HISTORY build] entry[${i}] sender=${entries[i].sender} msgId=${entries[i].messageId} body="${entries[i].body.slice(0, 80)}" ts=${entries[i].timestamp}`);
+  }
+  const historyText = entries.map(params.formatEntry).join("\n");
+  const combined = [
+    "[Chat messages since your last reply - for context]",
+    historyText,
+    "",
+    "[Current message - respond to this]",
+    params.currentMessage,
+  ].join("\n");
+  log(`[HISTORY build] 拼接完成: historyTextLen=${historyText.length} combinedLen=${combined.length}`);
+  return combined;
+}
+
+function clearGroupHistory(historyKey: string, log?: (...args: any[]) => void): void {
+  const _log = log ?? console.log;
+  const entries = chatHistories.get(historyKey) ?? [];
+  _log(`[HISTORY clear] historyKey=${historyKey} clearedEntries=${entries.length}`);
+  chatHistories.set(historyKey, []);
+}
+
 // ============ 媒体 payload 构建 ============
 
 function buildMediaPayload(
@@ -80,7 +165,10 @@ export async function handlePalzMessage(params: HandlePalzMessageParams): Promis
   const error = typeof runtime?.error === "function" ? runtime.error : console.error;
   const tag = `palz[${accountId}]`;
 
-  log(`${tag}: [STEP 1/6 入站过滤] msg_id=${msg.msg_id} sender=${msg.sender_id} conv=${msg.conversation_id}`);
+  const isGroup = msg.conversation_type === "group";
+  const effectiveAgentId = msg.agent_id || "main";
+
+  log(`${tag}: [STEP 1/6 入站过滤] msg_id=${msg.msg_id} sender=${msg.sender_id} conv=${msg.conversation_id} type=${msg.conversation_type} agent=${effectiveAgentId}`);
 
   const content = msg.content;
   if (!content) {
@@ -102,14 +190,38 @@ export async function handlePalzMessage(params: HandlePalzMessageParams): Promis
     return;
   }
 
-  // 去重
-  const claimed = tryClaimMessage(msg.msg_id);
-  log(`${tag}: [STEP 2/6 去重] msg_id=${msg.msg_id} claimed=${claimed}`);
+  // 群聊 @提及检测
+  const wasMentioned = isGroup ? (msg.mentioned_bot === true) : true;
+  if (isGroup && !wasMentioned) {
+    // 未@机器人：记录到群聊历史，下次被@时作为上下文
+    const historyKey = `${effectiveAgentId}:${msg.conversation_id}`;
+    const senderName = msg.sender_name || msg.sender_id;
+    log(`${tag}: [STEP 1 群聊历史] 未@机器人, 准备记录历史 historyKey=${historyKey} mentioned_bot=${msg.mentioned_bot} conversation_type=${msg.conversation_type}`);
+    recordGroupHistoryEntry({
+      historyKey,
+      entry: {
+        sender: msg.sender_id,
+        body: `${senderName}: ${plainText}`,
+        timestamp: Date.now(),
+        messageId: msg.msg_id,
+      },
+      limit: DEFAULT_GROUP_HISTORY_LIMIT,
+      log,
+    });
+    log(`${tag}: [STEP 1 跳过] 原因=群聊中未@机器人, 已记录到历史 historyKey=${historyKey}`);
+    return;
+  }
+
+  // 去重（按 agentId + conversationId 隔离，同群多 bot 场景）
+  const claimed = tryClaimMessage(msg.msg_id, effectiveAgentId, msg.conversation_id);
+  log(`${tag}: [STEP 2/6 去重] msg_id=${msg.msg_id} agent=${effectiveAgentId} conv=${msg.conversation_id} claimed=${claimed}`);
   if (!claimed) return;
 
-  // 入队
-  const queueKey = `${msg.sender_id}:${msg.conversation_id}`;
-  log(`${tag}: [STEP 3/6 入队] queueKey="${queueKey}"`);
+  // 入队（按 agentId 隔离，不同 agent 并行处理）
+  const queueKey = isGroup
+    ? `${effectiveAgentId}:${msg.conversation_id}`
+    : `${effectiveAgentId}:${msg.sender_id}:${msg.conversation_id}`;
+  log(`${tag}: [STEP 3/6 入队] queueKey="${queueKey}" isGroup=${isGroup}`);
 
   enqueue(queueKey, async () => {
     const startMs = Date.now();
@@ -130,9 +242,14 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
   const account = resolvePalzAccount({ cfg, accountId });
   const config = account.config;
 
+  const isGroup = msg.conversation_type === "group";
   const plainText = extractPlainText(msg.content).trim();
   const useStream = msg.stream === true;
-  const peerId = `${msg.sender_id}:${msg.conversation_id}`;
+  const senderName = msg.sender_name || msg.sender_id;
+
+  // 群聊：peerId = chat:conversation_id（整群共享 session，与 palzTo 格式一致）
+  // DM：peerId = sender_id:conversation_id（每用户每会话独立 session）
+  const peerId = isGroup ? `chat:${msg.conversation_id}` : `${msg.sender_id}:${msg.conversation_id}`;
 
   // STEP 4: 解析媒体
   log(`${tag}: [STEP 4/6 媒体解析] 输入: contentType=${typeof msg.content === "string" ? "string" : "array"} imageCount=${Array.isArray(msg.content) ? msg.content.filter((p: ContentPart) => p.type === "image_url").length : 0}`);
@@ -141,13 +258,14 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
   log(`${tag}: [STEP 4 输出] mediaList=${JSON.stringify(mediaList.map((m) => ({ path: m.path, contentType: m.contentType })))} mediaPayload=${JSON.stringify(mediaPayload)}`);
 
   // STEP 5: 解析路由
-  const routeInput = { cfg: "(cfg)", channel: "palz-connector", accountId, peer: { kind: "direct", id: peerId } };
+  const peerKind = isGroup ? "group" : "direct";
+  const routeInput = { cfg: "(cfg)", channel: "palz-connector", accountId, peer: { kind: peerKind, id: peerId } };
   log(`${tag}: [STEP 5/6 路由解析] 输入: ${JSON.stringify(routeInput)} agent_id=${msg.agent_id ?? "(auto)"}`);
   const route = core.channel.routing.resolveAgentRoute({
     cfg,
     channel: "palz-connector",
     accountId,
-    peer: { kind: "direct", id: peerId },
+    peer: { kind: peerKind, id: peerId },
   });
 
   // IM 指定 agent_id 时走指定 agent，否则强制走 main
@@ -163,11 +281,13 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
 
   // STEP 6a: 构建 envelope body
   const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
-  const messageBody = `${msg.sender_id}: ${plainText}`;
-  log(`${tag}: [STEP 6a/6 envelope构建] 输入: channel=Palz from=${msg.sender_id} messageBody="${messageBody.slice(0, 120)}" envelopeOptions=${JSON.stringify(envelopeOptions)}`);
+  const messageBody = `${senderName}: ${plainText}`;
+  // 群聊 from 带上 conversation_id 以区分不同用户
+  const envelopeFrom = isGroup ? `${msg.conversation_id}:${msg.sender_id}` : msg.sender_id;
+  log(`${tag}: [STEP 6a/6 envelope构建] 输入: channel=Palz from=${envelopeFrom} messageBody="${messageBody.slice(0, 120)}" envelopeOptions=${JSON.stringify(envelopeOptions)}`);
   const body = core.channel.reply.formatAgentEnvelope({
     channel: "Palz",
-    from: msg.sender_id,
+    from: envelopeFrom,
     timestamp: new Date(msg.timestamp || Date.now()),
     body: messageBody,
     envelope: envelopeOptions,
@@ -176,10 +296,11 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
 
   // STEP 6b: 构建 inbound context
   const palzFrom = `palz:${msg.sender_id}`;
-  const palzTo = `${msg.sender_id}:${msg.conversation_id}`;
+  // 群聊：To 指向群，DM：To 指向用户会话
+  const palzTo = isGroup ? `chat:${msg.conversation_id}` : `${msg.sender_id}:${msg.conversation_id}`;
 
-  // Palz DM 场景：检测是否包含斜杠命令，并计算命令授权。
-  // DM 用户默认视为已授权（与飞书插件 dmPolicy=open 时的行为一致）。
+  // 命令授权：DM 默认允许，群聊也默认允许（可后续扩展 allowlist）
+  const wasMentioned = isGroup ? (msg.mentioned_bot === true) : true;
   const needsCommandAuth = core.channel.commands.shouldComputeCommandAuthorized(plainText, cfg);
   const commandAuthorized = needsCommandAuth
     ? core.channel.commands.resolveCommandAuthorizedFromAuthorizers({
@@ -189,23 +310,60 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
     : undefined;
   log(`${tag}: [STEP 6b 命令授权] needsCommandAuth=${needsCommandAuth} commandAuthorized=${commandAuthorized}`);
 
+  const chatType = isGroup ? "group" : "direct";
+
+  // 群聊历史：将积攒的未@消息拼入 Body 上下文
+  const historyKey = isGroup ? `${effectiveAgentId}:${msg.conversation_id}` : undefined;
+  let combinedBody = body;
+  if (isGroup && historyKey) {
+    log(`${tag}: [STEP 6b 群聊历史] 开始构建, historyKey=${historyKey} bodyLen=${body.length}`);
+    combinedBody = buildGroupHistoryContext({
+      historyKey,
+      currentMessage: body,
+      formatEntry: (entry) =>
+        core.channel.reply.formatAgentEnvelope({
+          channel: "Palz",
+          from: entry.sender,
+          timestamp: new Date(entry.timestamp),
+          body: entry.body,
+          envelope: envelopeOptions,
+        }),
+      log,
+    });
+    log(`${tag}: [STEP 6b 群聊历史] 构建完成, historyKey=${historyKey} bodyLen=${body.length} combinedBodyLen=${combinedBody.length} hasHistory=${combinedBody.length !== body.length}`);
+    // log(`${tag}: [STEP 6b 群聊历史] combinedBody=\n${combinedBody}`);
+  }
+
+  // 构建 InboundHistory（结构化历史数据，Runtime 会注入到系统提示中）
+  const inboundHistory =
+    isGroup && historyKey
+      ? (chatHistories.get(historyKey) ?? []).map((entry) => ({
+          sender: entry.sender,
+          body: entry.body,
+          timestamp: entry.timestamp,
+        }))
+      : undefined;
+  log(`${tag}: [STEP 6b InboundHistory] count=${inboundHistory?.length ?? 0}`);
+
   const rawCtx = {
-    Body: `(envelope, len=${body.length})`,
+    Body: `(envelope, len=${combinedBody.length})`,
     BodyForAgent: messageBody.slice(0, 100),
+    InboundHistory: inboundHistory ? `(${inboundHistory.length} entries)` : undefined,
     RawBody: plainText.slice(0, 100),
     CommandBody: plainText.slice(0, 100),
     From: palzFrom,
     To: palzTo,
     SessionKey: route.sessionKey,
     AccountId: route.accountId,
-    ChatType: "direct",
+    ChatType: chatType,
+    GroupSubject: isGroup ? msg.conversation_id : undefined,
     SenderId: msg.sender_id,
-    SenderName: msg.sender_id,
+    SenderName: senderName,
     Provider: "palz-connector",
     Surface: "palz-connector",
     MessageSid: msg.msg_id,
     Timestamp: Date.now(),
-    WasMentioned: true,
+    WasMentioned: wasMentioned,
     CommandAuthorized: commandAuthorized,
     OriginatingChannel: "palz-connector",
     OriginatingTo: palzTo,
@@ -214,22 +372,24 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
   log(`${tag}: [STEP 6b inbound context] 输入: ${JSON.stringify(rawCtx)}`);
 
   const ctx = core.channel.reply.finalizeInboundContext({
-    Body: body,
+    Body: combinedBody,
     BodyForAgent: messageBody,
+    InboundHistory: inboundHistory,
     RawBody: plainText,
     CommandBody: plainText,
     From: palzFrom,
     To: palzTo,
     SessionKey: route.sessionKey,
     AccountId: route.accountId,
-    ChatType: "direct",
+    ChatType: chatType,
+    GroupSubject: isGroup ? msg.conversation_id : undefined,
     SenderId: msg.sender_id,
-    SenderName: msg.sender_id,
+    SenderName: senderName,
     Provider: "palz-connector",
     Surface: "palz-connector",
     MessageSid: msg.msg_id,
     Timestamp: Date.now(),
-    WasMentioned: true,
+    WasMentioned: wasMentioned,
     CommandAuthorized: commandAuthorized,
     OriginatingChannel: "palz-connector",
     OriginatingTo: palzTo,
@@ -276,6 +436,11 @@ async function dispatchPalzMessage(params: HandlePalzMessageParams): Promise<voi
       }),
   });
 
+  // AI 回复完成后清空群聊历史（已拼入上下文，避免下次重复）
+  if (isGroup && historyKey) {
+    clearGroupHistory(historyKey, log);
+  }
+
   const dispatchElapsedMs = Date.now() - dispatchStartMs;
   log(
     `${tag}: [STEP 6d 输出] queuedFinal=${queuedFinal} counts=${JSON.stringify(counts)} 耗时=${dispatchElapsedMs}ms`,

package/src/channel.ts

@@ -25,7 +25,7 @@ export const palzPlugin = {
   },
 
   capabilities: {
-    chatTypes: ["direct"],
+    chatTypes: ["direct", "channel"],
     polls: false,
     threads: false,
     media: true,

package/src/dedup.ts

@@ -1,7 +1,8 @@
 /**
  * 消息去重
  *
- * 基于 msg_id 防止重复处理，TTL 5 分钟。
+ * 基于 agentId + conversationId + msg_id 防止重复处理，TTL 5 分钟。
+ * 同一条消息可以被不同 agent 各自处理一次（同群多 bot 场景）。
  */
 
 const processedMessages = new Map<string, number>();
@@ -10,8 +11,8 @@ const MESSAGE_DEDUP_TTL = 5 * 60 * 1000;
 function cleanup(): void {
   const before = processedMessages.size;
   const now = Date.now();
-  for (const [msgId, ts] of processedMessages) {
-    if (now - ts > MESSAGE_DEDUP_TTL) processedMessages.delete(msgId);
+  for (const [key, ts] of processedMessages) {
+    if (now - ts > MESSAGE_DEDUP_TTL) processedMessages.delete(key);
   }
   console.log(`palz-dedup: cleanup ${before} → ${processedMessages.size} entries`);
 }
@@ -20,11 +21,15 @@ function cleanup(): void {
  * 尝试标记消息为已处理。
  * 返回 true 表示此消息之前未处理过（可以继续处理），
  * 返回 false 表示重复消息（应跳过）。
+ *
+ * agentId 用于同群多 bot 场景：同一条 msg_id 可被不同 agent 各自处理。
+ * conversationId 防止不同会话间 msg_id 碰撞导致误去重。
  */
-export function tryClaimMessage(msgId: string): boolean {
+export function tryClaimMessage(msgId: string, agentId: string = "main", conversationId: string = ""): boolean {
   if (!msgId) return true;
-  if (processedMessages.has(msgId)) return false;
-  processedMessages.set(msgId, Date.now());
+  const key = `${agentId}:${conversationId}:${msgId}`;
+  if (processedMessages.has(key)) return false;
+  processedMessages.set(key, Date.now());
   if (processedMessages.size >= 200) cleanup();
   return true;
 }

package/src/outbound.ts

@@ -20,14 +20,15 @@ export const palzOutbound = {
     log(`palz-outbound: [sendText] 输入: to="${to}" accountId="${accountId}" textLen=${text?.length || 0} text="${(text || "").slice(0, 120)}"`);
 
     const account = resolvePalzAccount({ cfg, accountId });
-    const { senderId, conversationId } = parsePalzTarget(to);
-    log(`palz-outbound: [sendText] 解析: senderId="${senderId}" conversationId="${conversationId}" botId=${account.config.botId}`);
+    const { senderId, conversationId, conversationType } = parsePalzTarget(to);
+    log(`palz-outbound: [sendText] 解析: senderId="${senderId}" conversationId="${conversationId}" conversationType="${conversationType}" botId=${account.config.botId}`);
 
     const result = await sendToPalzIM({
       config: account.config,
       conversationId,
       content: text,
       senderId,
+      conversationType,
     });
 
     const output = { channel: "palz-connector", messageId: Date.now().toString() };
@@ -41,8 +42,8 @@ export const palzOutbound = {
     log(`palz-outbound: [sendMedia] 输入: to="${to}" accountId="${accountId}" textLen=${text?.length || 0} mediaUrl="${(mediaUrl || "").slice(0, 200)}"`);
 
     const account = resolvePalzAccount({ cfg, accountId });
-    const { senderId, conversationId } = parsePalzTarget(to);
-    log(`palz-outbound: [sendMedia] 解析: senderId="${senderId}" conversationId="${conversationId}" botId=${account.config.botId}`);
+    const { senderId, conversationId, conversationType } = parsePalzTarget(to);
+    log(`palz-outbound: [sendMedia] 解析: senderId="${senderId}" conversationId="${conversationId}" conversationType="${conversationType}" botId=${account.config.botId}`);
 
     const contentParts: ContentPart[] = [];
 
@@ -73,6 +74,7 @@ export const palzOutbound = {
       conversationId,
       content,
       senderId,
+      conversationType,
     });
 
     const output = { channel: "palz-connector", messageId: Date.now().toString() };

package/src/targets.ts

@@ -16,18 +16,26 @@ export function looksLikePalzId(raw: string): boolean {
 
 /**
  * 从 "to" 地址中解析出 senderId 和 conversationId。
- * 格式: "{senderId}:{conversationId}"
+ * 格式:
+ *   DM:    "{senderId}:{conversationId}"
+ *   群聊:  "chat:{conversationId}"（senderId 为空，群消息不需要指定 senderId）
  */
 export function parsePalzTarget(to: string): {
   senderId?: string;
   conversationId: string;
+  conversationType: string;
 } {
+  // 群聊目标：chat:xxx → senderId 留空
+  if (to.startsWith("chat:")) {
+    return { conversationId: to.slice(5), conversationType: "group" };
+  }
   const parts = to.split(":");
   if (parts.length >= 2) {
     return {
       senderId: parts[0],
       conversationId: parts.slice(1).join(":"),
+      conversationType: "direct",
     };
   }
-  return { conversationId: to };
+  return { conversationId: to, conversationType: "direct" };
 }

package/src/types.ts

@@ -17,6 +17,7 @@ export type OpenAIContent = string | ContentPart[];
 export interface PalzMessageEvent {
   event: string;
   sender_id: string;
+  sender_name?: string;
   receiver_id: string;
   conversation_id: string;
   conversation_type: string;
@@ -26,6 +27,8 @@ export interface PalzMessageEvent {
   timestamp: number;
   /** 可选，指定 OpenClaw agent ID，覆盖默认路由 */
   agent_id?: string;
+  /** 群聊中是否 @了机器人 */
+  mentioned_bot?: boolean;
 }
 
 // ============ 配置 ============