@qihoo/tuitui-openclaw-channel 1.0.16 → 1.0.18

package/package.json

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

package/src/channel.ts

@@ -2,7 +2,6 @@
  * TuiTui Channel Plugin for OpenClaw.
  *
  * Implements the ChannelPlugin interface following the Synology Chat pattern.
- * Supports single chat (text, image, voice, file) and group chat with @mentions.
  */
 import WebSocket from 'ws';
 import { DEFAULT_ACCOUNT_ID } from 'openclaw/plugin-sdk/account-id';
@@ -24,8 +23,27 @@ const isConfigured = (account: any)=> !!(account?.appId && account?.appSecret);
 
 const wsReadyStates = ['CONNECTING', 'OPEN', 'CLOSING', 'CLOSED'] as const;
 let wsNumber = 0;
+const checkTuiTuiConfig = async (apiRuntime: any) => {
+  const cfg = await apiRuntime.config.loadConfig();
+  const channels = cfg?.channels || {};
+  const currChannel = channels?.[CHANNEL_ID] || {};
+  if (currChannel?.appId === undefined && !currChannel.accounts) {
+    await apiRuntime.config.writeConfigFile({
+      ...cfg,
+      channels: {
+        ...channels,
+        [CHANNEL_ID]: {
+          ...currChannel,
+          ...baseFildsDefault,
+          appSecret: undefined,
+        }
+      }
+    });
+  }
+};
 
 export function createTuiTuiChannelPlugin(apiRuntime: any) {
+  checkTuiTuiConfig(apiRuntime);
   return {
     id: CHANNEL_ID,
     meta: {
@@ -44,16 +62,15 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
     config: {
       listAccountIds: (cfg: any) => {
         const base = cfg?.channels?.[CHANNEL_ID];
-        if (!base) return [];
         const ids = new Set<string>();
-        if (isEnabled(base.enabled)) ids.add(DEFAULT_ACCOUNT_ID);
-        if (base.accounts) for (const k in base.accounts) ids.add(k);
+        ids.add(DEFAULT_ACCOUNT_ID);
+        if (base?.accounts) for (const k in base.accounts) ids.add(k);
         return Array.from(ids);
       },
 
       resolveAccount,
 
-      defaultAccountId: (_cfg: any) => DEFAULT_ACCOUNT_ID,
+      defaultAccountId: () => DEFAULT_ACCOUNT_ID,
 
       isEnabled,
 
@@ -102,11 +119,18 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
     },
 
     status: {
+      defaultRuntime: {
+        accountId: DEFAULT_ACCOUNT_ID,
+        running: false,
+        lastStartAt: null,
+        lastStopAt: null,
+        lastError: null,
+      },
       buildAccountSnapshot: (params: any) => {
         const account = params.account;
         return {
           ...params.runtime,
-          accountId: params.accountId ?? account?.accountId ?? DEFAULT_ACCOUNT_ID,
+          accountId: params.accountId || account?.accountId || DEFAULT_ACCOUNT_ID,
           enabled: isEnabled(account?.enabled),
           configured: isConfigured(account),
         };
@@ -220,7 +244,7 @@ export function createTuiTuiChannelPlugin(apiRuntime: any) {
         wsNumber++;
         const wsId = `${wsNumber}-${Date.now()}`;
         const wsEvtIds = new Set<string>();
-        let wsRetryTimerId = 0;
+        let wsRetryTimerId: any = 0;
 
         const wsUrl = `wss://im.live.360.cn:8282/robot/callback/ws?auth=${account.appId}.${account.appSecret}`;
         const defSendMsg = (msg: any) => {

package/src/confs.ts

@@ -13,8 +13,8 @@ export const capabilities = {
 
 /*** 一些配置字段设定信息 ***/
 const baseFields = {
-  appId: { type: 'string' } ,
-  appSecret: { type: 'string' },
+  appId: { type: 'string', default: '' } ,
+  appSecret: { type: 'string', default: '' },
   dmPolicy: {
     type: 'string',
     default: 'pairing',
@@ -22,6 +22,7 @@ const baseFields = {
   },
   allowFrom: {
     type: 'array',
+    default: [],
     items: { type: 'string' }
   },
   groupPolicy: {
@@ -35,6 +36,7 @@ const baseFields = {
   },
   groupAllowFrom: {
     type: 'array',
+    default: [],
     items: { type: 'string' }
   },
   channelContext: {

package/src/inbound.ts

@@ -14,7 +14,6 @@ import type { TuiTuiInboundMessage, TuiTuiOutboundDeliverOptions } from './types
 import { CHANNEL_ID } from './const';
 import {
   CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType,
-  buildMessageBody,
   tuituiEmojiReaction,
   sendTextMsg,
   sendPageMsg,
@@ -22,6 +21,7 @@ import {
   teamsBuildChatId,
   teamsParseChatId,
 } from "./outbound";
+import { parseChatMessageBody } from './inbound_body_parse';
 import { parseAllowFroms } from './utils';
 import {
   addUnmentionedHistory,
@@ -87,11 +87,13 @@ function getSessionKey(cfg: any, payload: ChatPayload, account: InboundAccount,
   return String(sessionKey).replace(/\//g, '_');
 }
 
-function getMediaUrls({ msg_type, images, voice, file }: any): string[] | undefined {
+function getMediaUrls({ msg_type, images, voice, video, file }: any): string[] | undefined {
   if (msg_type === 'image' || msg_type === 'mixed') {
     if (images?.length) return images;
   } else if (msg_type === 'voice') {
     if (voice) return [voice];
+  } else if (msg_type === 'video') {
+    if (video) return [video];
   } else if (msg_type === 'file') {
     if (file?.url) return [file.url];
   }
@@ -189,7 +191,7 @@ const parseAndVerifyPayload: Record<string, Function> = {
 
     payload.chatType = CHAT_TYPE_DIRECT;
     payload.chatId   = chatId;
-    payload.text     = buildMessageBody(msgData);
+    payload.text     = parseChatMessageBody(msgData);
     payload.msgId    = msgData.msgid;
     log?.debug?.(
       `[${CHANNEL_ID}] AccountId: ${accountId}, inbound single_chat:
@@ -233,7 +235,7 @@ const parseAndVerifyPayload: Record<string, Function> = {
     payload.chatId   = chatId;
     payload.groupName = msgData.group_name;
     payload.msgId  = msgData.msgid;
-    payload.text = buildMessageBody(msgData);
+    payload.text = parseChatMessageBody(msgData);
     log?.debug?.(
       `[${CHANNEL_ID}] AccountId: ${accountId}, inbound group_chat:
       tuituiAccount=${payload.tuituiAccount},

package/src/inbound_body_parse.ts

@@ -0,0 +1,100 @@
+import type { TuiTuiMessageData, TuiTuiMergedData, TuituiMsgBase } from './types';
+
+function buildSenderDesc(msg: TuituiMsgBase) {
+  return `${msg?.user_name} (${msg.user_account})`;
+}
+
+function buildMsgText(msg: TuituiMsgBase): string[] {
+  const parts: string[] = [];
+
+  const pushImgs = (imgs: string[] | undefined) => {
+    if (!imgs || imgs.length === 0) return;
+    if (imgs.length === 1) {
+      parts.push(`[图片] ${imgs[0]}`);
+    } else {
+      parts.push(`[图片] 共 ${imgs.length} 张图片:`);
+      imgs.forEach((url, i) => parts.push(`  ${i + 1}. ${url}`));
+    }
+  };
+
+  switch (msg.msg_type) {
+    case 'text':
+      parts.push(msg.text || '');
+      break;
+    case 'mixed':
+      if (msg.text) parts.push(msg.text);
+      pushImgs(msg.images);
+      break;
+    case 'image':
+      pushImgs(msg.images);
+      break;
+    case 'voice':
+      if (msg.voice) parts.push(`[语音] ${msg.voice}`);
+      break;
+    case 'video':
+      if (msg.video) parts.push(`[视频] ${msg.video}`);
+      break;
+    case 'file':
+      if (msg.file) parts.push(`[文件] ${msg.file?.name} : ${msg.file?.url}`);
+      break;
+    case 'card':
+      if (msg.card) parts.push(`[名片]\n名字: ${msg.card?.name}\n推推账号: ${msg.card?.account}`);
+      break;
+    case 'link':
+      if (msg.link) parts.push(`[网页链接]\n${msg.link?.title}\n${msg.link?.url}`);
+      break;
+    case 'merged':
+      parts.push(buildMergedBody(msg.merged));
+      break;
+  }
+
+  return parts;
+}
+
+/**
+ * 将合并转发（merged）数据渲染为可读文本。
+ * 支持递归嵌套：子消息的 msg_type 也可以是 merged。
+ */
+function buildMergedBody(merged: TuiTuiMergedData | undefined): string {
+  if (!merged) return '[合并转发]';
+
+  const source = merged.source || '聊天记录';
+  const lines: string[] = [`[合并转发：${source}]`];
+
+  for (const msg of merged.msgs ?? []) {
+    lines.push("------");
+    if (msg.timestamp) {
+      const date = new Date(Number(msg.timestamp) * 1000);
+      lines.push("时间: " + date.toLocaleString('sv-SE', { hour12: false }).replace('T', ' '));
+    }
+
+    lines.push(`发言人: ` + buildSenderDesc(msg));
+    lines.push(`内容：`);
+
+    // 消息内容，每个片段单独一行
+    const msgParts = buildMsgText(msg);
+    for (const part of msgParts) {
+      lines.push(part);
+    }
+  }
+
+  return lines.join('\n');
+}
+
+/**
+ * 将 TuiTui 入站消息数据解析为可读文本。
+ */
+export function parseChatMessageBody(data: TuiTuiMessageData): string {
+  const parts: string[] = buildMsgText(data);
+
+  // Handle reference/reply
+  const { ref } = data;
+  if (ref) {
+    const refParts = buildMsgText(ref);
+    const refContent = refParts.join('\n');
+    const senderDesc = buildSenderDesc(ref);
+    parts.push(`\n[引用来自 ${senderDesc} 的消息，内容如下]\n ${refContent}`);
+  }
+
+  return parts.join('\n');
+}

package/src/outbound.ts

@@ -101,6 +101,8 @@ export async function postTuituiMsg(account: any, json: any, auditCtx: string):
     }
   } catch(err) {
     console.error(`[${CHANNEL_ID}] ${auditCtx} postTuituiMsg error:`, err, `\njson: ${JSON.stringify(json)}`);
+    // 必须抛出错误，否则上层无法知道失败了（channel机器人问答、agent调用tool的场景）
+    throw err;
   } finally {
     await release();
   }
@@ -239,77 +241,6 @@ export async function uploadFileToTuiTui(fileSrc: string, account: any, type: 'i
   }
 }
 
-/**
- * Build message body text from TuiTui inbound message data.
- * Handles text, image, voice, file, and reference messages.
- */
-export function buildMessageBody(data: TuiTuiMessageData): string {
-  const parts: string[] = [];
-
-  const pushTxt = () => parts.push(data.text || '');
-  const pushImgs = (imgs: string[] | undefined, parts: string[]) => {
-    if (!imgs) return;
-    const imgLen = imgs?.length || 0;
-    if (imgLen === 0) return;
-    if (imgLen === 1) {
-      parts.push(`[图片] ${imgs[0]}`);
-    } else {
-      parts.push(`[图片] 共 ${imgLen} 张图片:`);
-      imgs.forEach((url, i) => parts.push(`  ${i + 1}. ${url}`));
-    }
-  };
-
-  switch (data.msg_type) {
-    case 'text':
-      pushTxt();
-      break;
-    case 'mixed':
-      pushTxt();
-      pushImgs(data.images, parts);
-      break;
-    case 'image':
-      pushImgs(data.images, parts);
-      break;
-    case 'voice':
-      if (data.voice) parts.push(`[语音] ${data.voice}`);
-      break;
-    case "file":
-      if (data.file) parts.push(`[文件] ${data.file.name}: ${data.file.url}`);
-      break;
-  }
-
-  // Handle reference/reply
-  const { ref } = data;
-  if (ref) {
-    const { msg_type, is_me, user_name, user_account} = ref;
-    let refContent = `[${msg_type}]`;
-    let refParts: string[] = [];
-    switch (msg_type) {
-      case 'text':
-        refContent = ref.text || '';
-        break;
-      case 'image':
-        pushImgs(ref.images, refParts);
-        refContent = refParts.join("\n");
-        break;
-      case 'mixed':
-        refContent = ref.text || '';
-        pushImgs(ref.images, refParts);
-        refContent += "\n" + refParts.join("\n");
-        break;
-      case "file":
-        const name = ref.file?.name || '';
-        const url = ref.file?.url || '';
-        refContent = `\n文件名: ${name}  下载地址 ${url}\n`;
-        break;
-    
-    }
-    parts.push(`\n[引用来自 ${user_name} 的消息，内容如下]\n ${refContent}`);
-  }
-
-  return parts.join("\n");
-}
-
 export async function tuituiEmojiReaction(
   account: any,
   target: string,
@@ -351,17 +282,23 @@ export async function tuituiEmojiReaction(
 }
 
 export function teamsBuildChatId(team_id: string, channel_id:string, thread_id:string) : string{
-  return `teams_${team_id}_${channel_id}_${thread_id}`;
+  if(thread_id) {
+    return `teams_${team_id}_${channel_id}_${thread_id}`;
+  } else {
+    return `teams_${team_id}_${channel_id}`;
+  }
 }
 
 export function teamsParseChatId(chatId: string): TuiTuiTeamsTarget {
   const [team_id, channel_id, parent_id] = chatId.replace(/^teams_/, '').split('_');
   
-  if (!team_id || !channel_id || !parent_id) {
+  if (!team_id || !channel_id) {
     throw new Error('Invalid teams chat ID format');
   }
-  
-  return { team_id, channel_id, parent_id} as TuiTuiTeamsTarget;
+
+  const ret = { team_id, channel_id} as TuiTuiTeamsTarget;
+  if(parent_id) ret.parent_id = parent_id;
+  return ret;
 }
 
 interface TuiTuiToTargets { tousers?: string[], togroups?: string[], toteams?: TuiTuiTeamsTarget[] }
@@ -376,7 +313,7 @@ function getTargets(chatId: string, chatType: ChatType): TuiTuiToTargets {
 
 function replaceSingleNewlines(content: string): string {
   // 匹配单个换行符，前后都不是换行符
-  return content.replace(/([^\n])\n([^\n])/g, '$1\n\n$2');
+  return content.replace(/([^\n|])\n([^\n|])/g, '$1\n\n$2');
 }
 
 /*

package/src/tools.ts

@@ -4,74 +4,78 @@ import { CHANNEL_ID} from "./const";
 import { resolveAccount } from "./accounts"
 import { Type } from "@sinclair/typebox";
 
-import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType, getChatRecord} from "./outbound"
+import {CHAT_TYPE_DIRECT,CHAT_TYPE_GROUP,CHAT_TYPE_CHANNEL,ChatType, getChatRecord, sendTextMsg, teamsBuildChatId} from "./outbound"
   
-
-
-export const tuitui_im_get_messages_schema = Type.Object(
-  {
-    chatId: Type.String({ description: "聊天ID，单聊指tuitui用户的account，群聊是群ID" }),
-    chatType: Type.String({ description: `聊天类型。 单聊:${CHAT_TYPE_DIRECT}   群聊:${CHAT_TYPE_GROUP}`}),
-    relativeTime: Type.Optional(Type.String({ description: `相对时间范围：today / yesterday / day_before_yesterday / this_week / last_week / this_month / last_month / last_{N}_{unit}（unit: minutes/hours/days）。与 startTime/endTime 互斥`})),
-    startTime: Type.Optional(Type.String({ description: `起始时间（ISO 8601 格式，如 2026-02-27T00:00:00+08:00），非必填，默认指2000年代表。与 relativeTime 互斥`})),
-    endTime: Type.Optional(Type.String({ description: `结束时间（ISO 8601 格式，如 2026-02-27T00:00:00+08:00），非必填，默认当前时间。与 relativeTime 互斥`})),
-    limit: Type.Optional(Type.Number({ description: `每页条数，1~100，默认 100`})),
-    cursor: Type.Optional(Type.String({ description: `游标首次调用填 "0"，返回结果中has_more为true时代表可以获取下一页，如果你需要下一页，可以传返回结果的cursor代表继续拉取下一页`})),
-    orderAsc: Type.Optional(Type.Boolean({ description: `返回数据是否按时间正序排序，默认 false（按时间逆序，即从最新的开始拉取）`})),
-  },
-  { additionalProperties: false },
-);
-
 function tool_errmsg(str:string) {
-  const ret = `tuitui_im_get_messages() error: ${str}`
-  console.log(ret);
+  const ret = `error: ${str}`
+  console.error(ret);
   return ret;
 }
 
-async function tuitui_im_get_messages(config: any, agentAccountId:string, params:any) {
-  const account = resolveAccount(config, agentAccountId);
-  if(!account || !account.enabled || !account.appId || !account.appSecret) {
-    return tool_errmsg(`invalid tuitui account ${agentAccountId}`);
-  }
-
-  const chatType = params?.chatType || "";
-  const chatId = params?.chatId || "";
-  if(!chatId || !chatType) {
-    return tool_errmsg(`chatType or chatId empty`);
-  }
+const tuitui_im_get_messages_factory = (ctx: OpenClawPluginToolContext) => {
+  return {
+    name: "tuitui_im_get_messages",
+    label: "tuitui_im_get_messages",
+    description: "推推(tuitui) 聊天记录获取，可查询私聊和群聊的聊天记录。\n\n",
+    parameters: Type.Object({
+      chatId: Type.String({ description: "聊天ID，单聊指tuitui用户的account，群聊是群ID" }),
+      chatType: Type.String({ description: `聊天类型。 单聊:${CHAT_TYPE_DIRECT}   群聊:${CHAT_TYPE_GROUP}`}),
+      relativeTime: Type.Optional(Type.String({ description: `相对时间范围：today / yesterday / day_before_yesterday / this_week / last_week / this_month / last_month / last_{N}_{unit}（unit: minutes/hours/days）。与 startTime/endTime 互斥`})),
+      startTime: Type.Optional(Type.String({ description: `起始时间（ISO 8601 格式，如 2026-02-27T00:00:00+08:00），非必填，默认指2000年代表。与 relativeTime 互斥`})),
+      endTime: Type.Optional(Type.String({ description: `结束时间（ISO 8601 格式，如 2026-02-27T00:00:00+08:00），非必填，默认当前时间。与 relativeTime 互斥`})),
+      limit: Type.Optional(Type.Number({ description: `每页条数，1~100，默认 100`})),
+      cursor: Type.Optional(Type.String({ description: `游标首次调用填 "0"，返回结果中has_more为true时代表可以获取下一页，如果你需要下一页，可以传返回结果的cursor代表继续拉取下一页`})),
+      orderAsc: Type.Optional(Type.Boolean({ description: `返回数据是否按时间正序排序，默认 false（按时间逆序，即从最新的开始拉取）`})),
+    }),
+    execute: async (_toolCallId: any, params: any) => {
+      console.log(`tuitui_im_get_messages(): agentAccountId: ${ctx.agentAccountId}, sessionKey: ${ctx.sessionKey}`, params);
+      const account = resolveAccount(ctx.config, ctx.agentAccountId);
+      if(!account || !account.enabled || !account.appId || !account.appSecret) {
+        return tool_errmsg(`invalid tuitui account ${ctx.agentAccountId}`);
+      }
+    
+      const chatType = params?.chatType || "";
+      const chatId = params?.chatId || "";
+      if(!chatId || !chatType) {
+        return tool_errmsg(`chatType or chatId empty`);
+      }
+    
+      if(chatType != CHAT_TYPE_DIRECT && chatType != CHAT_TYPE_GROUP) {
+        return tool_errmsg(`unknown chatType: ${chatType}`);
+      }
 
-  if(chatType == CHAT_TYPE_DIRECT || chatType == CHAT_TYPE_GROUP) {
-    return await getChatRecord(account, chatId, chatType, {
-      startTime: params?.startTime,
-      endTime:   params?.endTime,
-      relativeTime: params?.relativeTime,
-      limit:     params?.limit,
-      cursor:    params?.cursor,
-      orderAsc:  params?.orderAsc,
-    });
-  } else {
-    return tool_errmsg(`unknown chatType: ${chatType}`);
-  }  
-}
+      return await getChatRecord(account, chatId, chatType, {
+        startTime: params?.startTime,
+        endTime:   params?.endTime,
+        relativeTime: params?.relativeTime,
+        limit:     params?.limit,
+        cursor:    params?.cursor,
+        orderAsc:  params?.orderAsc,
+      });
+    },
+  };
+};
 
-const tuituiToolFactory = (ctx: OpenClawPluginToolContext) => {
-  const agentAccountId  = ctx.agentAccountId;
-  const messageChannel   = ctx.messageChannel;
-  const sessionKey = ctx.sessionKey;
-  const config = ctx.config;
 
+const tuitui_send_channel_post_factory = (ctx: OpenClawPluginToolContext) => {
   return {
-    name: "tuitui_im_get_messages",
-    label: "tuitui IM",
-    description: "推推(tuitui) 聊天记录获取，可查询群聊和私聊的聊天记录。\n\n",
-    parameters: tuitui_im_get_messages_schema,
+    name: "tuitui_send_channel_post",
+    label: "tuitui_send_channel_post",
+    description: "推推(tuitui) 发送团队中的频道里面的帖子，帖子内容是markdown格式\n\n",
+    parameters: Type.Object({
+      team_id: Type.String({ description: "推推团队ID" }),
+      channel_id: Type.String({ description: "推推频道ID，频道属于团队" }),
+      markdown: Type.String({ description: `帖子正文，markdown格式`}),
+      parent_id: Type.Optional(Type.String({ description: `帖子ID，如果要回复一个帖子，需要填写这个字段`})),
+    }),
     execute: async (_toolCallId: any, params: any) => {
-      if(messageChannel != CHANNEL_ID) {
-        console.log(`tuitui_im_get_messages(): bad channel ${messageChannel}`);
-        return
+      console.log(`tuitui_send_channel_post(): agentAccountId: ${ctx.agentAccountId}, sessionKey: ${ctx.sessionKey}`, params);
+      const account = resolveAccount(ctx.config, ctx.agentAccountId);
+      if(!account || !account.enabled || !account.appId || !account.appSecret) {
+        return tool_errmsg(`invalid tuitui account ${ctx.agentAccountId}`);
       }
-      console.log(`tuitui_im_get_messages(): agentAccountId: ${agentAccountId}, sessionKey: ${sessionKey}`, params);
-      return await tuitui_im_get_messages(config, String(agentAccountId), params);
+      const chatId = teamsBuildChatId(params?.team_id, params?.channel_id, params?.parent_id);
+      return await sendTextMsg(account, chatId, CHAT_TYPE_CHANNEL, params?.markdown);      
     },
   };
 };
@@ -82,6 +86,7 @@ export function registerTuituiTools(api: OpenClawPluginApi) {
     return;
   }
   
-  api.registerTool(tuituiToolFactory);
+  api.registerTool(tuitui_im_get_messages_factory);
+  api.registerTool(tuitui_send_channel_post_factory);
   api.logger.info?.(`tuitui: Registered tool`);
 }

package/src/types.ts

@@ -2,47 +2,67 @@
  * Shared TypeScript types for the TuiTui channel plugin.
  */
 
+
+export interface TuituiMsgBase {
+  user_account: string;
+  user_name: string;
+  msg_type: string;
+  timestamp?: string;
+  text?: string;
+  images?: string[];
+  voice?: string;
+  video?: string;
+  file?: { name?: string; url?: string };
+  card?: { name?: string; account?: string };
+  link?: { title?: string; url?: string };
+  merged?: TuiTuiMergedData;
+}
+
 export interface TuiTuiInboundMessage {
   cid: string;
   uid: string;
   user_account: string;
   user_name: string;
   timestamp: string;
-  event: 'single_chat' | 'group_chat';
+  event: string;
   data: TuiTuiMessageData;
 }
 
-export interface TuiTuiMessageData {
+/** 合并转发消息中的单条子消息，继承 TuituiMsgBase 并添加额外字段 */
+export interface TuiTuiMergedMsg extends TuituiMsgBase {
+  cid: string;
+  uid: string;
+  is_me: boolean;
+}
+
+/** 合并转发的 merged 字段 */
+export interface TuiTuiMergedData {
+  /** 聊天记录来源描述，例如"XXX和YYY的聊天记录" */
+  source?: string;
+  /** 摘要文本 */
+  summary?: string;
+  /** 子消息列表 */
+  msgs: TuiTuiMergedMsg[];
+}
+
+export interface TuiTuiRefMsg extends TuituiMsgBase {
+  cid: string;
+  uid: string;
+  is_me?: boolean;
+  msgid?: string;
+}
+
+
+/** 实际消息数据结构，继承 TuituiMsgBase 并添加额外字段 */
+export interface TuiTuiMessageData extends TuituiMsgBase {
   msgid?: string;
-  msg_type: 'text' | 'image' | 'mixed' | 'voice' | 'file';
-  text?: string;
-  images?: string[];
-  image_ids?: string[];
-  voice?: string;
-  voice_id?: string;
-  file?: { name: string; url: string; file_id: string };
   // Group chat fields
   group_id?: string;
   group_name?: string;
   at_me?: boolean;
   at?: Array<{ is_at_all: boolean; cid?: string; uid?: string; name?: string }>;
   // Reference/reply fields
-  ref?: {
-    cid: string;
-    uid: string;
-    user_account?: string;
-    user_name: string;
-    is_me?: boolean;
-    msgid: string;
-    msg_type: 'text' | 'image' | 'mixed' | 'file' | 'voice';
-    text?: string;
-    images?: string[];
-    image_ids?: string[];
-    file?: {
-      url?: string;
-      name?: string;
-    }
-  };
+  ref?: TuiTuiRefMsg;
 }
 
 export interface TuiTuiOutboundTextMessage {
@@ -143,6 +163,6 @@ export interface TuiTuiOutboundDeliverOptions {
 export interface TuiTuiTeamsTarget {
   team_id: string;
   channel_id: string;
-  post_id: string;
-  parent_id: string;
+  post_id?: string;
+  parent_id?: string;
 }