palz-connector 1.3.5 → 1.3.6

package/openclaw.plugin.json

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

package/package.json

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

package/src/bot.ts

@@ -18,16 +18,18 @@ import { resolvePalzMediaList, resolveMediaLocalRoots } from "./media.js";
 import { tracer, trace, context, SpanStatusCode } from "./tracing.js";
 import type { PalzMessageEvent, OpenAIContent, ContentPart, TextContentPart, PalzMediaInfo } from "./types.js";
 
-// ============ group_id 解析 ============
+// ============ 原始消息透传字段 ============
 
-/** 从 conversation_id 中解析 group_id，格式: user_{userID}_lobster_{lobsterID}_group_{groupID}_release_{releaseName} */
-const GROUP_ID_RE = /_group_([^_]+)_release_/;
+const PASSTHROUGH_EXCLUDE = new Set(["event", "content", "timestamp"]);
 
-function resolveGroupId(msg: PalzMessageEvent): string | undefined {
-  if (msg.group_id) return msg.group_id;
-  if (msg.conversation_type !== "group") return undefined;
-  const m = GROUP_ID_RE.exec(msg.conversation_id);
-  return m ? m[1] : undefined;
+function buildPassthroughFromMsg(msg: PalzMessageEvent): Record<string, unknown> {
+  const out: Record<string, unknown> = {};
+  for (const [k, v] of Object.entries(msg)) {
+    if (PASSTHROUGH_EXCLUDE.has(k)) continue;
+    if (v === undefined) continue;
+    out[k] = v;
+  }
+  return out;
 }
 
 // ============ 文本提取工具 ============
@@ -387,9 +389,9 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
   const plainText = extractPlainText(msg.content).trim();
   const useStream = msg.stream === true;
   const senderName = msg.sender_name || msg.sender_id;
-  const groupId = resolveGroupId(msg);
+  const groupId = isGroup ? msg.conversation_id : undefined;
   if (isGroup) {
-    log(`${tag}: [group_id] resolved=${groupId ?? "(none)"} from_msg=${msg.group_id ?? "(none)"} conv=${msg.conversation_id}`);
+    log(`${tag}: [group_id] resolved=${groupId ?? "(none)"} conv=${msg.conversation_id}`);
   }
 
   // 群聊：peerId = chat:conversation_id（整群共享 session，与 palzTo 格式一致）
@@ -458,9 +460,9 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
   span?.addEvent(step6aOutput);
 
   // STEP 6b: 构建 inbound context
-  const palzFrom = `palz:${msg.sender_id}`;
-  // 群聊：To 指向群，DM：To 指向用户会话
-  const palzTo = isGroup ? `chat:${msg.conversation_id}` : `${msg.sender_id}:${msg.conversation_id}`;
+  const palzFrom = `palz:${msg.sender_id}:${msg.conversation_id}`;
+  // 新格式: {conversationType}:{senderId}:{lobsterId}:{conversationId}
+  const palzTo = `${msg.conversation_type || "direct"}:${msg.sender_id}:${msg.lobster_id || ""}:${msg.conversation_id}`;
 
   // 命令授权：DM 默认允许，群聊也默认允许（可后续扩展 allowlist）
   const wasMentioned = isGroup ? (msg.mentioned_bot === true) : true;
@@ -530,6 +532,7 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
     `conversation_type: ${msg.conversation_type || "direct"}`,
     `to: ${palzTo}`,
     `mentioned_bot: ${wasMentioned}`,
+    `lobster_id: ${msg.lobster_id || ""}`,
   ];
   if (groupId) {
     untrustedContext.push(`group_id: ${groupId}`);
@@ -701,6 +704,7 @@ async function _dispatchPalzMessageInner(params: HandlePalzMessageParams): Promi
     mediaLocalRoots: resolveMediaLocalRoots(effectiveAgentId),
     showProcess,
     sessionKey: route.sessionKey,
+    passthrough: buildPassthroughFromMsg(msg),
   });
 
   // STEP 6d: 分发消息给 AI

package/src/channel.ts

@@ -66,13 +66,13 @@ export const palzPlugin = {
     normalizeTarget: (raw: string) => normalizePalzTarget(raw),
     targetResolver: {
       looksLikeId: looksLikePalzId,
-      hint: "<senderId>:<conversationId>",
+      hint: "<conversationType>:<senderId>:<lobsterId>:<conversationId>",
     },
   },
 
   agentPrompt: {
     messageToolHints: () => [
-      "- Palz targeting: DO NOT set `target` — always omit it so the system auto-infers the correct conversation. Never use sender_id or conversation_id alone as target. If you must specify an explicit target, the only valid format is `<senderId>:<conversationId>`.",
+      "- Palz targeting: DO NOT set `target` — always omit it so the system auto-infers the correct conversation. Never use sender_id or conversation_id alone as target. If you must specify an explicit target, the only valid format is `<conversationType>:<senderId>:<lobsterId>:<conversationId>`.",
     ],
   },
 

package/src/outbound.ts

@@ -17,11 +17,11 @@ export const palzOutbound = {
   resolveTarget: (params: { to?: string; mode?: string }) => {
     const to = params.to?.trim();
     if (!to) {
-      return { ok: false as const, error: new Error("Palz target is required. Format: <senderId>:<conversationId> or chat:<conversationId>") };
+      return { ok: false as const, error: new Error("Palz target is required. Format: <conversationType>:<senderId>:<lobsterId>:<conversationId>") };
     }
     // Must contain ":" — bare sender_id or bare conversation_id is invalid
     if (!to.includes(":")) {
-      return { ok: false as const, error: new Error(`Invalid Palz target "${to}": must be <senderId>:<conversationId> or chat:<conversationId>. A bare ID without ":" is not a valid target.`) };
+      return { ok: false as const, error: new Error(`Invalid Palz target "${to}": must be <conversationType>:<senderId>:<lobsterId>:<conversationId>. A bare ID without ":" is not a valid target.`) };
     }
     return { ok: true as const, to };
   },
@@ -32,8 +32,8 @@ 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, conversationType } = parsePalzTarget(to);
-    log(`palz-outbound: [sendText] 解析: senderId="${senderId}" conversationId="${conversationId}" conversationType="${conversationType}" botId=${account.config.botId}`);
+    const { senderId, lobsterId, conversationId, conversationType } = parsePalzTarget(to);
+    log(`palz-outbound: [sendText] 解析: senderId="${senderId}" lobsterId="${lobsterId}" conversationId="${conversationId}" conversationType="${conversationType}" botId=${account.config.botId}`);
 
     const result = await sendToPalzIM({
       config: account.config,
@@ -41,6 +41,7 @@ export const palzOutbound = {
       content: text,
       senderId,
       conversationType,
+      lobsterId,
     });
 
     const output = { channel: "palz-connector", messageId: Date.now().toString() };
@@ -53,9 +54,9 @@ export const palzOutbound = {
     const log = typeof ctx.log === "function" ? ctx.log : console.log;
 
     const account = resolvePalzAccount({ cfg, accountId });
-    const { senderId, conversationId, conversationType } = parsePalzTarget(to);
+    const { senderId, lobsterId, conversationId, conversationType } = parsePalzTarget(to);
     log(`palz-outbound: [sendMedia] 输入: to="${to}" accountId="${accountId}" textLen=${text?.length || 0} mediaUrl="${(mediaUrl || "").slice(0, 200)}"`);
-    log(`palz-outbound: [sendMedia] 解析: senderId="${senderId}" conversationId="${conversationId}" conversationType="${conversationType}" botId=${account.config.botId}`);
+    log(`palz-outbound: [sendMedia] 解析: senderId="${senderId}" lobsterId="${lobsterId}" conversationId="${conversationId}" conversationType="${conversationType}" botId=${account.config.botId}`);
 
     const contentParts: ContentPart[] = [];
 
@@ -87,6 +88,7 @@ export const palzOutbound = {
       content,
       senderId,
       conversationType,
+      lobsterId,
     });
 
     const output = { channel: "palz-connector", messageId: Date.now().toString() };

package/src/reply-dispatcher.ts

@@ -47,6 +47,8 @@ export interface CreatePalzReplyDispatcherParams {
   mediaLocalRoots?: readonly string[];
   showProcess?: boolean;
   sessionKey?: string;
+  /** IM 原始消息透传字段（除 event/content/timestamp） */
+  passthrough?: Record<string, unknown>;
 }
 
 export function createPalzReplyDispatcher(params: CreatePalzReplyDispatcherParams) {
@@ -65,6 +67,7 @@ export function createPalzReplyDispatcher(params: CreatePalzReplyDispatcherParam
     groupId,
     mediaLocalRoots,
     showProcess,
+    passthrough,
   } = params;
 
   const log = typeof runtime?.log === "function" ? runtime.log : console.log;
@@ -115,6 +118,7 @@ export function createPalzReplyDispatcher(params: CreatePalzReplyDispatcherParam
       groupId,
       palzMsgType,
       toolContent,
+      passthrough,
     });
     log(`${tag}: [DISPATCHER←sendToIM] 输出: ${JSON.stringify(result)}`);
     return result;

package/src/send.ts

@@ -29,12 +29,13 @@ export async function sendToPalzIM(params: SendToIMParams): Promise<any> {
 }
 
 async function _sendToPalzIMInner(params: SendToIMParams): Promise<any> {
-  const { config, conversationId, content, conversationType, msgId, senderId, stream, msgType, groupId, palzMsgType, toolContent } = params;
+  const { config, conversationId, content, conversationType, msgId, senderId, stream, msgType, groupId, lobsterId, palzMsgType, toolContent, passthrough } = params;
   const url = `${config.apiBaseUrl}/bot/send`;
   const resolvedMsgId = msgId || nextMsgId();
   const span = trace.getActiveSpan();
 
   const reqBody: Record<string, unknown> = {
+    ...(passthrough ?? {}),
     bot_id: config.botId,
     conversation_id: conversationId,
     conversation_type: conversationType || "direct",
@@ -54,6 +55,10 @@ async function _sendToPalzIMInner(params: SendToIMParams): Promise<any> {
     reqBody.group_id = groupId;
   }
 
+  if (lobsterId) {
+    reqBody.lobster_id = lobsterId;
+  }
+
   if (stream) {
     reqBody.stream_id = stream.streamId;
     reqBody.seq = stream.seq;

package/src/targets.ts

@@ -1,7 +1,10 @@
 /**
  * Palz Connector 目标地址解析
  *
- * 目标格式: "{senderId}:{conversationId}"
+ * 新格式: "{conversationType}:{senderId}:{lobsterId}:{conversationId}"
+ * 旧格式（兼容）:
+ *   DM:    "{senderId}:{conversationId}"
+ *   群聊:  "chat:{conversationId}"
  */
 
 export function normalizePalzTarget(raw: string): string | undefined {
@@ -14,22 +17,44 @@ export function looksLikePalzId(raw: string): boolean {
   return /^[\p{L}\p{N}\w:._-]+$/u.test(trimmed);
 }
 
-/**
- * 从 "to" 地址中解析出 senderId 和 conversationId。
- * 格式:
- *   DM:    "{senderId}:{conversationId}"
- *   群聊:  "chat:{conversationId}"（senderId 为空，群消息不需要指定 senderId）
- */
-export function parsePalzTarget(to: string): {
+export interface ParsedPalzTarget {
   senderId?: string;
+  lobsterId?: string;
   conversationId: string;
   conversationType: string;
-} {
-  // 群聊目标：chat:xxx → senderId 留空
+}
+
+/**
+ * 从 "to" 地址中解析出 senderId、lobsterId 和 conversationId。
+ *
+ * 新格式（4段）: "{conversationType}:{senderId}:{lobsterId}:{conversationId}"
+ *   示例: "group:6a9e1cfd...:lobster123:group_grp_3b14486f"
+ *   示例: "direct:6a9e1cfd...:lobster123:conv_xxx"
+ *
+ * 旧格式（兼容）:
+ *   群聊:  "chat:{conversationId}"（senderId 为空）
+ *   DM:    "{senderId}:{conversationId}"
+ */
+export function parsePalzTarget(to: string): ParsedPalzTarget {
+  const parts = to.split(":");
+
+  // 新4段格式: conversationType:senderId:lobsterId:conversationId
+  // conversationType 为 "group" 或 "direct"
+  if (parts.length >= 4 && (parts[0] === "group" || parts[0] === "direct")) {
+    return {
+      conversationType: parts[0],
+      senderId: parts[1] || undefined,
+      lobsterId: parts[2] || undefined,
+      conversationId: parts.slice(3).join(":"),
+    };
+  }
+
+  // 旧格式兼容：chat:xxx → 群聊，senderId 留空
   if (to.startsWith("chat:")) {
     return { conversationId: to.slice(5), conversationType: "group" };
   }
-  const parts = to.split(":");
+
+  // 旧格式兼容：senderId:conversationId
   if (parts.length >= 2) {
     return {
       senderId: parts[0],
@@ -37,5 +62,6 @@ export function parsePalzTarget(to: string): {
       conversationType: "direct",
     };
   }
+
   return { conversationId: to, conversationType: "direct" };
 }

package/src/types.ts

@@ -37,6 +37,8 @@ export interface PalzMessageEvent {
   owner_name?: string;
   /** 群组 ID，群聊时 IM 可直接下发；若未提供则从 conversation_id 中解析 */
   group_id?: string;
+  /** Lobster ID，标识 agent 身份（IM 通过此字段区分不同 agent） */
+  lobster_id?: string;
   /** W3C Trace Context traceparent，由 IM 上游传递 */
   traceparent?: string;
 }
@@ -92,8 +94,12 @@ export interface SendToIMParams {
   msgType?: string;
   /** 群组 ID，群聊时透传 */
   groupId?: string;
+  /** Lobster ID，标识 agent 身份 */
+  lobsterId?: string;
   /** Palz 自定义消息类型（tool_start / tool_result） */
   palzMsgType?: string;
   /** 工具调用结构化内容 */
   toolContent?: Record<string, unknown>;
+  /** IM 原始消息中除 event/content/timestamp 外的字段，原样透传到发送请求体 */
+  passthrough?: Record<string, unknown>;
 }