@dcrays/dcgchat-test 0.2.27 → 0.2.28

package/src/bot.ts

@@ -1,36 +1,36 @@
-import fs from "node:fs";
-import path from "node:path";
-import type {
-  ClawdbotConfig,
-  ReplyPayload,
-  RuntimeEnv,
-} from "openclaw/plugin-sdk";
-import { createReplyPrefixContext } from "openclaw/plugin-sdk";
-import type { InboundMessage, OutboundReply } from "./types.js";
-import { getDcgchatRuntime, getWorkspaceDir } from "./runtime.js";
-import { resolveAccount, sendDcgchatMedia } from "./channel.js";
-import { setMsgStatus } from "./tool.js";
-import { generateSignUrl } from "./api.js";
+import fs from 'node:fs'
+import path from 'node:path'
+import type { ReplyPayload } from 'openclaw/plugin-sdk'
+import { createReplyPrefixContext } from 'openclaw/plugin-sdk'
+import type { InboundMessage } from './types.js'
+import { clearSentMediaKeys, getDcgchatRuntime, getOpenClawConfig, getWorkspaceDir, setMsgStatus } from './utils/global.js'
+import { resolveAccount, sendDcgchatMedia } from './channel.js'
+import { generateSignUrl } from './request/api.js'
+import { extractMobookFiles } from './utils/searchFile.js'
+import { createMsgContext, sendChunk, sendFinal, sendText as sendTextMsg, sendError } from './transport.js'
+import { dcgLogger } from './utils/log.js'
+import { emptyToolText } from './utils/constant.js'
 
 type MediaInfo = {
-  path: string;
-  fileName: string;
-  contentType: string;
-  placeholder: string;
-};
+  path: string
+  fileName: string
+  contentType: string
+  placeholder: string
+}
+
+type TFileInfo = { name: string; url: string }
 
-const mediaMaxBytes = 300 * 1024 * 1024;
+const mediaMaxBytes = 300 * 1024 * 1024
 
 /** Active LLM generation abort controllers, keyed by conversationId */
-const activeGenerations = new Map<string, AbortController>();
+const activeGenerations = new Map<string, AbortController>()
 
 /** Abort an in-progress LLM generation for a given conversationId */
 export function abortMobookappGeneration(conversationId: string): void {
-  const ctrl = activeGenerations.get(conversationId);
-  console.log("🚀 ~ abortMobookappGeneration ~ ctrl:", ctrl)
+  const ctrl = activeGenerations.get(conversationId)
   if (ctrl) {
-    ctrl.abort();
-    activeGenerations.delete(conversationId);
+    ctrl.abort()
+    activeGenerations.delete(conversationId)
   }
 }
 
@@ -38,92 +38,71 @@ export function abortMobookappGeneration(conversationId: string): void {
  * Extract agentId from conversation_id formatted as "agentId::suffix".
  * Returns null if the conversation_id does not contain the "::" separator.
  */
-export function extractAgentIdFromConversationId(
-  conversationId: string,
-): string | null {
-  const idx = conversationId.indexOf("::");
-  if (idx <= 0) return null;
-  return conversationId.slice(0, idx);
+export function extractAgentIdFromConversationId(conversationId: string): string | null {
+  const idx = conversationId.indexOf('::')
+  if (idx <= 0) return null
+  return conversationId.slice(0, idx)
 }
 
-async function resolveMediaFromUrls(
-  files: { name: string; url: string }[],
-  botToken: string,
-  log: (message: string) => void,
-): Promise<MediaInfo[]> {
-  const core = getDcgchatRuntime();
-  const out: MediaInfo[] = [];
-  log(
-    `dcgchat media: starting resolve for ${files.length} file(s): ${JSON.stringify(files)}`,
-  );
+async function resolveMediaFromUrls(files: TFileInfo[], botToken: string): Promise<MediaInfo[]> {
+  const core = getDcgchatRuntime()
+  const out: MediaInfo[] = []
+  dcgLogger(`media: user upload files: ${JSON.stringify(files)}`)
 
   for (let i = 0; i < files.length; i++) {
-    const file = files[i];
+    const file = files[i]
     try {
-      let data = "";
+      let data = ''
       if (/^https?:\/\//i.test(file.url)) {
-        data = file.url;
+        data = file.url
       } else {
-        data = await generateSignUrl(file.url, botToken);
+        data = await generateSignUrl(file.url, botToken)
       }
-      log(`dcgchat media: [${i + 1}/${files.length}] generateSignUrl: ${data}`);
-      const response = await fetch(data);
+      dcgLogger(`media: generateSignUrl: ${data}`)
+      const response = await fetch(data)
       if (!response.ok) {
-        log?.(
-          `dcgchat media: [${i + 1}/${files.length}] fetch failed with HTTP ${response.status}, skipping`,
-        );
-        continue;
+        dcgLogger?.(`media: ${file.url} fetch failed with HTTP ${response.status}`, 'error')
+        continue
       }
-      const buffer = Buffer.from(await response.arrayBuffer());
+      const buffer = Buffer.from(await response.arrayBuffer())
 
-      let contentType = response.headers.get("content-type") || "";
+      let contentType = response.headers.get('content-type') || ''
       if (!contentType) {
-        contentType = (await core.media.detectMime({ buffer })) || "";
+        contentType = (await core.media.detectMime({ buffer })) || ''
       }
-      const fileName =
-        file.name || path.basename(new URL(file.url).pathname) || "file";
-      const saved = await core.channel.media.saveMediaBuffer(
-        buffer,
-        contentType,
-        "inbound",
-        mediaMaxBytes,
-        fileName,
-      );
-      const isImage = contentType.startsWith("image/");
+      const fileName = file.name || path.basename(new URL(file.url).pathname) || 'file'
+      const saved = await core.channel.media.saveMediaBuffer(buffer, contentType, 'inbound', mediaMaxBytes, fileName)
+      const isImage = contentType.startsWith('image/')
       out.push({
         path: saved.path,
         fileName,
-        contentType: saved.contentType || "",
-        placeholder: isImage ? "<media:image>" : "<media:file>",
-      });
+        contentType: saved.contentType || '',
+        placeholder: isImage ? '<media:image>' : '<media:file>'
+      })
     } catch (err) {
-      log(
-        `dcgchat media: [${i + 1}/${files.length}] FAILED to process ${file.url}: ${String(err)}`,
-      );
+      dcgLogger(`media: ${file.url} FAILED to process: ${String(err)}`, 'error')
     }
   }
-  log(
-    `dcgchat media: resolve complete, ${out.length}/${files.length} file(s) succeeded`,
-  );
-
-  return out;
+  dcgLogger(`media: resolve complete, ${out.length}/${files.length} file(s) succeeded`)
+  return out
 }
 
-function buildMediaPayload(mediaList: MediaInfo[]): {
-  MediaPath?: string;
-  MediaFileName?: string;
-  MediaType?: string;
-  MediaUrl?: string;
-  MediaFileNames?: string[];
-  MediaPaths?: string[];
-  MediaUrls?: string[];
-  MediaTypes?: string[];
-} {
-  if (mediaList.length === 0) return {};
-  const first = mediaList[0];
-  const mediaFileNames = mediaList.map((m) => m.fileName).filter(Boolean);
-  const mediaPaths = mediaList.map((m) => m.path);
-  const mediaTypes = mediaList.map((m) => m.contentType).filter(Boolean);
+type MediaPayload = {
+  MediaPath?: string
+  MediaFileName?: string
+  MediaType?: string
+  MediaUrl?: string
+  MediaFileNames?: string[]
+  MediaPaths?: string[]
+  MediaUrls?: string[]
+  MediaTypes?: string[]
+}
+function buildMediaPayload(mediaList: MediaInfo[]): MediaPayload {
+  if (mediaList.length === 0) return {}
+  const first = mediaList[0]
+  const mediaFileNames = mediaList.map((m) => m.fileName).filter(Boolean)
+  const mediaPaths = mediaList.map((m) => m.path)
+  const mediaTypes = mediaList.map((m) => m.contentType).filter(Boolean)
   return {
     MediaPath: first?.path,
     MediaFileName: first?.fileName,
@@ -132,333 +111,84 @@ function buildMediaPayload(mediaList: MediaInfo[]): {
     MediaFileNames: mediaFileNames.length > 0 ? mediaFileNames : undefined,
     MediaPaths: mediaPaths.length > 0 ? mediaPaths : undefined,
     MediaUrls: mediaPaths.length > 0 ? mediaPaths : undefined,
-    MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
-  };
-}
-
-function resolveReplyMediaList(payload: ReplyPayload): string[] {
-  if (payload.mediaUrls?.length) return payload.mediaUrls.filter(Boolean);
-  return payload.mediaUrl ? [payload.mediaUrl] : [];
-}
-
-
-/**
- * 从文本中提取 /mobook 目录下的文件
- * @param {string} text
- * @returns {string[]}
- */
-const EXT_LIST = [
-  // 文档类
-  "doc",
-  "docx",
-  "xls",
-  "xlsx",
-  "ppt",
-  "pptx",
-  "pdf",
-  "txt",
-  "rtf",
-  "odt",
-
-  // 数据/开发
-  "json",
-  "xml",
-  "csv",
-  "yaml",
-  "yml",
-
-  // 前端/文本
-  "html",
-  "htm",
-  "md",
-  "markdown",
-  "css",
-  "js",
-  "ts",
-
-  // 图片
-  "png",
-  "jpg",
-  "jpeg",
-  "gif",
-  "bmp",
-  "webp",
-  "svg",
-  "ico",
-  "tiff",
-
-  // 音频
-  "mp3",
-  "wav",
-  "ogg",
-  "aac",
-  "flac",
-  "m4a",
-
-  // 视频
-  "mp4",
-  "avi",
-  "mov",
-  "wmv",
-  "flv",
-  "mkv",
-  "webm",
-
-  // 压缩包
-  "zip",
-  "rar",
-  "7z",
-  "tar",
-  "gz",
-  "bz2",
-  "xz",
-
-  // 可执行/程序
-  "exe",
-  "dmg",
-  "pkg",
-  "apk",
-  "ipa",
-
-  // 其他常见
-  "log",
-  "dat",
-  "bin",
-];
-
-/**
- * 扩展名按长度降序，用于正则交替，避免 xls 抢先匹配 xlsx、htm 抢先匹配 html 等
- */
-const EXT_SORTED_FOR_REGEX = [...EXT_LIST].sort((a, b) => b.length - a.length);
-
-/** 去除控制符、零宽字符等常见脏值 */
-function stripMobookNoise(s: string) {
-  return s.replace(/[\u0000-\u001F\u007F\u200B-\u200D\u200E\u200F\uFEFF]/g, "");
-}
-
-/**
- * 从文本中扫描 `/mobook/` 片段，按最长后缀匹配合法扩展名（兜底，不依赖 FILE_NAME 字符集）
- */
-function collectMobookPathsByScan(text: string, result: Set<string>): void {
-  const lower = text.toLowerCase();
-  const needle = "/mobook/";
-  let from = 0;
-  while (from < text.length) {
-    const i = lower.indexOf(needle, from);
-    if (i < 0) break;
-    const start = i + needle.length;
-    const tail = text.slice(start);
-    const seg = tail.match(/^([^\s\]\)'"}\u3002，,]+)/);
-    if (!seg) {
-      from = start + 1;
-      continue;
-    }
-    let raw = stripMobookNoise(seg[1]).trim();
-    if (!raw || raw.includes("\uFFFD")) {
-      from = start + 1;
-      continue;
-    }
-    const low = raw.toLowerCase();
-    let matchedExt: string | undefined;
-    for (const ext of EXT_SORTED_FOR_REGEX) {
-      if (low.endsWith(`.${ext}`)) {
-        matchedExt = ext;
-        break;
-      }
-    }
-    if (!matchedExt) {
-      from = start + 1;
-      continue;
-    }
-    const base = raw.slice(0, -(matchedExt.length + 1));
-    const fileName = `${base}.${matchedExt}`;
-    if (isValidFileName(fileName)) {
-      result.add(normalizePath(`/mobook/${fileName}`));
-    }
-    from = start + 1;
-  }
-}
-
-function extractMobookFiles(text = "") {
-  if (typeof text !== "string" || !text.trim()) return [];
-  const result = new Set<string>();
-  // ✅ 扩展名（必须长扩展名优先，见 EXT_SORTED_FOR_REGEX）
-  const EXT = `(${EXT_SORTED_FOR_REGEX.join("|")})`;
-  // ✅ 文件名字符（增强：支持中文、符号）
-  const FILE_NAME = `[\\w\\u4e00-\\u9fa5：:《》()（）\\-\\s]+?`;
-  try {
-    // 1️⃣ `xxx.xxx`
-    const backtickReg = new RegExp(`\`([^\\\`]+?\\.${EXT})\``, "gi");
-    (text.match(backtickReg) || []).forEach((item) => {
-      const name = item.replace(/`/g, "").trim();
-      if (isValidFileName(name)) {
-        result.add(`/mobook/${name}`);
-      }
-    });
-    // 2️⃣ /mobook/xxx.xxx
-    const fullPathReg = new RegExp(`/mobook/${FILE_NAME}\\.${EXT}`, "gi");
-    (text.match(fullPathReg) || []).forEach((p) => {
-      result.add(normalizePath(p));
-    });
-    // 3️⃣ mobook下的 xxx.xxx
-    const inlineReg = new RegExp(`mobook下的\\s*(${FILE_NAME}\\.${EXT})`, "gi");
-    (text.match(inlineReg) || []).forEach((item) => {
-      const match = item.match(new RegExp(`${FILE_NAME}\\.${EXT}`, "i"));
-      if (match && isValidFileName(match[0])) {
-        result.add(`/mobook/${match[0].trim()}`);
-      }
-    });
-    // 🆕 4️⃣ **xxx.xxx**
-    const boldReg = new RegExp(`\\*\\*(${FILE_NAME}\\.${EXT})\\*\\*`, "gi");
-    (text.match(boldReg) || []).forEach((item) => {
-      const name = item.replace(/\*\*/g, "").trim();
-      if (isValidFileName(name)) {
-        result.add(`/mobook/${name}`);
-      }
-    });
-    // 🆕 5️⃣ xxx.xxx (123字节)
-    const looseReg = new RegExp(`(${FILE_NAME}\\.${EXT})\\s*\\(`, "gi");
-    (text.match(looseReg) || []).forEach((item) => {
-      const name = item.replace(/\s*\(.+$/, "").trim();
-      if (isValidFileName(name)) {
-        result.add(`/mobook/${name}`);
-      }
-    });
-    // 6️⃣ 兜底：绝对路径等 `.../mobook/<文件名>.<扩展名>` + 最长后缀匹配 + 去脏字符
-    collectMobookPathsByScan(text, result);
-  } catch (e) {
-    console.warn("extractMobookFiles error:", e);
+    MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined
   }
-  return [...result];
 }
 
-/**
- * 校验文件名是否合法（避免脏数据）
- */
-function isValidFileName(name: string) {
-  if (!name) return false;
-  const cleaned = stripMobookNoise(name).trim();
-  if (!cleaned) return false;
-  if (cleaned.includes("\uFFFD")) return false;
-  // 过滤异常字符
-  if (/[\/\\<>:"|?*]/.test(cleaned)) return false;
-  // 长度限制（防止异常长字符串）
-  if (cleaned.length > 200) return false;
-  return true;
-}
-
-/**
- * 规范路径（去重用）
- */
-function normalizePath(path: string) {
-  return path
-    .replace(/\/+/g, "/") // 多斜杠 → 单斜杠
-    .replace(/\/$/, ""); // 去掉结尾 /
+function resolveReplyMediaList(payload: ReplyPayload): string[] {
+  if (payload.mediaUrls?.length) return payload.mediaUrls.filter(Boolean)
+  return payload.mediaUrl ? [payload.mediaUrl] : []
 }
 
 /**
  * 处理一条用户消息，调用 Agent 并返回回复
  */
-export async function handleDcgchatMessage(params: {
-  cfg: ClawdbotConfig;
-  msg: InboundMessage;
-  accountId: string;
-  runtime?: RuntimeEnv;
-  onChunk: (reply: OutboundReply) => void;
-}): Promise<void> {
-  const { cfg, msg, accountId, runtime } = params;
-  const log = runtime?.log ?? console.log;
-  const error = runtime?.error ?? console.error;
-  //  完整的文本
-  let completeText = "";
-
-  const account = resolveAccount(cfg, accountId);
-  const userId = msg._userId.toString();
-  const text = msg.content.text?.trim();
+export async function handleDcgchatMessage(msg: InboundMessage, accountId: string): Promise<void> {
+  const msgCtx = createMsgContext(msg)
+
+  let completeText = ''
+  const config = getOpenClawConfig()
+  if (!config) {
+    dcgLogger('no config available', 'error')
+    return
+  }
+  const account = resolveAccount(config, accountId)
+  const userId = msg._userId.toString()
+  const text = msg.content.text?.trim()
 
   if (!text) {
-    params.onChunk({
-      messageType: "openclaw_bot_chat",
-      _userId: msg._userId,
-      source: "client",
-      // @ts-ignore
-      content: {
-        bot_token: msg.content.bot_token,
-        domain_id: msg.content.domain_id,
-        app_id: msg.content.app_id,
-        bot_id: msg.content.bot_id,
-        agent_id: msg.content.agent_id,
-        session_id: msg.content.session_id,
-        message_id: msg.content.message_id,
-        response: "你需要我帮你做什么呢？",
-      },
-    });
-    return;
+    sendTextMsg(msgCtx, '你需要我帮你做什么呢？')
+    sendFinal(msgCtx)
+    return
   }
 
   try {
-    const core = getDcgchatRuntime();
+    const core = getDcgchatRuntime()
 
-    const conversationId = msg.content.session_id?.trim();
+    const conversationId = msg.content.session_id?.trim()
 
     const route = core.channel.routing.resolveAgentRoute({
-      cfg,
+      cfg: config,
       channel: "dcgchat-test",
       accountId: account.accountId,
-      peer: { kind: "direct", id: conversationId },
-    });
+      peer: { kind: 'direct', id: conversationId }
+    })
 
     // If conversation_id encodes an agentId prefix ("agentId::suffix"), override the route.
-    const embeddedAgentId = extractAgentIdFromConversationId(conversationId);
-    const effectiveAgentId = embeddedAgentId ?? route.agentId;
+    const embeddedAgentId = extractAgentIdFromConversationId(conversationId)
+    const effectiveAgentId = embeddedAgentId ?? route.agentId
     const effectiveSessionKey = embeddedAgentId
       ? `agent:${embeddedAgentId}:mobook:direct:${conversationId}`.toLowerCase()
-      : route.sessionKey;
+      : route.sessionKey
 
     const agentEntry =
-      effectiveAgentId && effectiveAgentId !== "main"
-        ? cfg.agents?.list?.find((a) => a.id === effectiveAgentId)
-        : undefined;
-    const agentDisplayName =
-      agentEntry?.name ??
-      (effectiveAgentId && effectiveAgentId !== "main"
-        ? effectiveAgentId
-        : undefined);
+      effectiveAgentId && effectiveAgentId !== 'main' ? config.agents?.list?.find((a) => a.id === effectiveAgentId) : undefined
+    const agentDisplayName = agentEntry?.name ?? (effectiveAgentId && effectiveAgentId !== 'main' ? effectiveAgentId : undefined)
 
     // Abort any existing generation for this conversation, then start a new one
-    const existingCtrl = activeGenerations.get(conversationId);
-    if (existingCtrl) existingCtrl.abort();
-    const genCtrl = new AbortController();
-    const genSignal = genCtrl.signal;
-    activeGenerations.set(conversationId, genCtrl);
+    const existingCtrl = activeGenerations.get(conversationId)
+    if (existingCtrl) existingCtrl.abort()
+    const genCtrl = new AbortController()
+    const genSignal = genCtrl.signal
+    activeGenerations.set(conversationId, genCtrl)
 
     // 处理用户上传的文件
-    const files = msg.content.files ?? [];
-    let mediaPayload: Record<string, unknown> = {};
+    const files = msg.content.files ?? []
+    let mediaPayload: Record<string, unknown> = {}
     if (files.length > 0) {
-      const mediaList = await resolveMediaFromUrls(
-        files,
-        msg.content.bot_token,
-        log,
-      );
-      mediaPayload = buildMediaPayload(mediaList);
-      log(
-        `dcgchat[${accountId}]: media resolved ${mediaList.length}/${files.length} file(s), payload=${JSON.stringify(mediaList)}`,
-      );
+      const mediaList = await resolveMediaFromUrls(files, msg.content.bot_token)
+      mediaPayload = buildMediaPayload(mediaList)
     }
 
-    const envelopeOptions =
-      core.channel.reply.resolveEnvelopeFormatOptions(cfg);
-    // const messageBody = `${userId}: ${text}`;
-    // 补充消息
-    const messageBody = text;
+    const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(config)
+    const messageBody = text
     const bodyFormatted = core.channel.reply.formatAgentEnvelope({
-      channel: "书灵墨宝",
+      channel: '书灵墨宝',
       from: userId,
       timestamp: new Date(),
       envelope: envelopeOptions,
-      body: messageBody,
-    });
+      body: messageBody
+    })
 
     const ctxPayload = core.channel.reply.finalizeInboundContext({
       Body: bodyFormatted,
@@ -468,260 +198,152 @@ export async function handleDcgchatMessage(params: {
       To: conversationId,
       SessionKey: effectiveSessionKey,
       AccountId: route.accountId,
-      ChatType: "direct",
+      ChatType: 'direct',
       SenderName: agentDisplayName,
       SenderId: userId,
-      Provider: "dcgchat-test" as const,
-      Surface: "dcgchat-test" as const,
+      Provider: "dcgchat-test",
+      Surface: "dcgchat-test",
       MessageSid: msg.content.message_id,
       Timestamp: Date.now(),
       WasMentioned: true,
       CommandAuthorized: true,
-      OriginatingChannel: "dcgchat-test" as const,
+      OriginatingChannel: "dcgchat-test",
       OriginatingTo: `user:${userId}`,
-      ...mediaPayload,
-    });
-
-    log(`dcgchat[${accountId}]: ctxPayload=${JSON.stringify(ctxPayload)}`);
+      ...mediaPayload
+    })
 
     const sentMediaKeys = new Set<string>()
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
-    let textChunk = ''
+    let streamedTextLen = 0
 
     const prefixContext = createReplyPrefixContext({
-      cfg,
-      agentId: effectiveAgentId ?? "",
+      cfg: config,
+      agentId: effectiveAgentId ?? '',
       channel: "dcgchat-test",
-      accountId: account.accountId,
-    });
-
-    const { dispatcher, replyOptions, markDispatchIdle } =
-      core.channel.reply.createReplyDispatcherWithTyping({
-        responsePrefix: prefixContext.responsePrefix,
-        responsePrefixContextProvider:
-          prefixContext.responsePrefixContextProvider,
-        humanDelay: core.channel.reply.resolveHumanDelayConfig(
-          cfg,
-          route.agentId,
-        ),
-        onReplyStart: async () => {},
-        deliver: async (payload: ReplyPayload) => {
-          log(
-            `dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`,
-          );
-        },
-        onError: (err: any, info: { kind: any }) => {
-          error(
-            `dcgchat[${accountId}] ${info.kind} reply failed: ${String(err)}`,
-          );
-        },
-        onIdle: () => {},
-      });
+      accountId: account.accountId
+    })
+
+    const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } = core.channel.reply.createReplyDispatcherWithTyping({
+      responsePrefix: prefixContext.responsePrefix,
+      responsePrefixContextProvider: prefixContext.responsePrefixContextProvider,
+      humanDelay: core.channel.reply.resolveHumanDelayConfig(config, route.agentId),
+      onReplyStart: async () => {},
+      deliver: async (payload: ReplyPayload, info) => {
+        dcgLogger(`[deliver]: kind=${info.kind}, text=${payload.text?.length ?? 0} chars`)
+        // Media from the outbound pipeline (post-streaming)
+        const mediaList = resolveReplyMediaList(payload)
+        for (const mediaUrl of mediaList) {
+          const key = getMediaKey(mediaUrl)
+          if (sentMediaKeys.has(key)) continue
+          sentMediaKeys.add(key)
+          await sendDcgchatMedia({ msgCtx, mediaUrl, text: '' })
+        }
+      },
+      onError: (err: unknown, info: { kind: string }) => {
+        dcgLogger(`${info.kind} reply failed: ${String(err)}`, 'error')
+      },
+      onIdle: () => {}
+    })
 
-      let wasAborted = false;
-      try {
-        if (text === '/new') {
-          log(`dcgchat[${accountId}]: skipping agent dispatch for /new`);
-          await core.channel.reply.dispatchReplyFromConfig({
-            ctx: ctxPayload,
-            cfg,
-            dispatcher,
-            replyOptions: {
-              ...replyOptions,
-              onModelSelected: prefixContext.onModelSelected
-            },
-          });
-        } else {
-        log(
-          `dcgchat[${accountId}]: dispatching to agent (session=${route.sessionKey})`,
-        );
+    let wasAborted = false
+    try {
+      if (emptyToolText.includes(text?.trim())) {
+        dcgLogger(`dispatching /new`)
         await core.channel.reply.dispatchReplyFromConfig({
           ctx: ctxPayload,
-          cfg,
+          cfg: config,
+          dispatcher,
+          replyOptions: {
+            ...replyOptions,
+            onModelSelected: prefixContext.onModelSelected
+          }
+        })
+      } else {
+        dcgLogger(`dispatching to agent (session=${route.sessionKey})`)
+        await core.channel.reply.dispatchReplyFromConfig({
+          ctx: ctxPayload,
+          cfg: config,
           dispatcher,
           replyOptions: {
             ...replyOptions,
             abortSignal: genSignal,
             onModelSelected: prefixContext.onModelSelected,
             onPartialReply: async (payload: ReplyPayload) => {
-              log(
-                `dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`,
-              );
+              // Accumulate full text
               if (payload.text) {
-                completeText = payload.text;
-              }
-              const mediaList = resolveReplyMediaList(payload);
-              if (mediaList.length > 0) {
-                for (let i = 0; i < mediaList.length; i++) {
-                  const mediaUrl = mediaList[i];
-                  const key = getMediaKey(mediaUrl);
-                  if (sentMediaKeys.has(key)) continue;
-                  sentMediaKeys.add(key);
-                  await sendDcgchatMedia({
-                    cfg,
-                    accountId,
-                    log,
-                    mediaUrl,
-                    text: "",
-                  });
-                }
-                log(
-                  `dcgchat[${accountId}][deliver]: sent ${mediaList.length} media file(s) through channel adapter`,
-                );
+                completeText = payload.text
               }
+              // --- Streaming text chunks ---
               if (payload.text) {
-                const nextTextChunk = payload.text.replace(textChunk, "");
-                if (nextTextChunk.trim()) {
-                  log(
-                    `dcgchat[${accountId}][deliver]: sending chunk to user ${msg._userId}, text="${nextTextChunk.slice(0, 50)}..."`,
-                  );
-                  params.onChunk({
-                    messageType: "openclaw_bot_chat",
-                    _userId: msg._userId,
-                    source: "client",
-                    content: {
-                      bot_token: msg.content.bot_token,
-                      domain_id: msg.content.domain_id,
-                      app_id: msg.content.app_id,
-                      bot_id: msg.content.bot_id,
-                      agent_id: msg.content.agent_id,
-                      session_id: msg.content.session_id,
-                      message_id: msg.content.message_id,
-                      response: nextTextChunk,
-                      state: "chunk",
-                    },
-                  });
-                  log(
-                    `dcgchat[${accountId}][deliver]: chunk sent successfully`,
-                  );
+                const delta = payload.text.startsWith(completeText.slice(0, streamedTextLen))
+                  ? payload.text.slice(streamedTextLen)
+                  : payload.text
+                if (delta.trim()) {
+                  sendChunk(msgCtx, delta)
+                  dcgLogger(`[stream]: chunk ${delta.length} chars to user ${msg._userId} ${delta.slice(0, 100)}`)
                 }
-                textChunk = payload.text;
-              } else {
-                log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
+                streamedTextLen = payload.text.length
+              }
+              // --- Media from payload ---
+              const mediaList = resolveReplyMediaList(payload)
+              for (const mediaUrl of mediaList) {
+                const key = getMediaKey(mediaUrl)
+                if (sentMediaKeys.has(key)) continue
+                sentMediaKeys.add(key)
+                await sendDcgchatMedia({ msgCtx, mediaUrl, text: '' })
               }
-            },
-          },
-        });
+            }
+          }
+        })
       }
-      } catch (err: unknown) {
-        if (genSignal.aborted) {
-          wasAborted = true;
-          log(
-            `dcgchat[${accountId}]: generation aborted for conversationId=${conversationId}`,
-          );
-        } else if (err instanceof Error && err.name === "AbortError") {
-          wasAborted = true;
-          log(
-            `dcgchat[${accountId}]: generation aborted by session for conversationId=${conversationId}`,
-          );
-        } else {
-          error(
-            `dcgchat[${accountId}]: dispatchReplyFromConfig error: ${String(err)}`,
-          );
-        }
-      } finally {
-        if (activeGenerations.get(conversationId) === genCtrl) {
-          activeGenerations.delete(conversationId);
-        }
-        if (wasAborted) {
-          //TODO：是否需要发消息给移动端，通知停止生成
-        }
+    } catch (err: unknown) {
+      if (genSignal.aborted) {
+        wasAborted = true
+        dcgLogger(` generation aborted for conversationId=${conversationId}`)
+      } else if (err instanceof Error && err.name === 'AbortError') {
+        wasAborted = true
+        dcgLogger(` generation aborted for conversationId=${conversationId}`)
+      } else {
+        dcgLogger(` dispatchReplyFromConfig error: ${String(err)}`, 'error')
+      }
+    } finally {
+      if (activeGenerations.get(conversationId) === genCtrl) {
+        activeGenerations.delete(conversationId)
       }
+    }
 
-    const mobookFiles = extractMobookFiles(completeText);
-    if (mobookFiles.length > 0) {
-      for (let i = 0; i < mobookFiles.length; i++) {
-        let url = mobookFiles[i] as string;
-        const key = getMediaKey(url);
-        if (sentMediaKeys.has(key)) {
-          log(
-            `dcgchat[${accountId}]: mobookFiles already sent, skipping: ${url}`,
-          );
-          continue;
-        }
-        if (!fs.existsSync(url)) {
-          url = path.join(getWorkspaceDir(), url);
-          if (!fs.existsSync(url)) {
-            log(
-              `dcgchat[${accountId}]: mobookFiles file not found, skipping: ${url}`,
-            );
-            continue;
-          }
+    markRunComplete()
+    markDispatchIdle()
+    if (!emptyToolText.includes(text?.trim())) {
+      for (const file of extractMobookFiles(completeText)) {
+        let resolved = file
+        if (!fs.existsSync(resolved)) {
+          resolved = path.join(getWorkspaceDir(), file)
+          if (!fs.existsSync(resolved)) return
         }
-        sentMediaKeys.add(key);
-        await sendDcgchatMedia({
-          cfg,
-          accountId,
-          log,
-          mediaUrl: url,
-          text: "",
-        });
+        await sendDcgchatMedia({ msgCtx, mediaUrl: resolved, text: '' })
       }
-      log(
-        `dcgchat[${accountId}][deliver]: sent ${mobookFiles.length} media file(s) through channel adapter`,
-      );
+      sendFinal(msgCtx)
     }
-    log(`dcgchat[${accountId}]: dispatch complete, sending final state`);
-    params.onChunk({
-      messageType: "openclaw_bot_chat",
-      _userId: msg._userId,
-      source: "client",
-      content: {
-        bot_token: msg.content.bot_token,
-        domain_id: msg.content.domain_id,
-        app_id: msg.content.app_id,
-        bot_id: msg.content.bot_id,
-        agent_id: msg.content.agent_id,
-        session_id: msg.content.session_id,
-        message_id: msg.content.message_id,
-        response: "",
-        state: "final",
-      },
-    });
-
-    setMsgStatus("finished");
-    textChunk = "";
-    log(`dcgchat[${accountId}]: final state sent`);
-
-    markDispatchIdle();
-    log(`dcgchat[${accountId}]: message handling complete`);
+    clearSentMediaKeys(msg.content.message_id)
+    setMsgStatus('finished')
 
     // Record session metadata
-    const storePath = core.channel.session.resolveStorePath(cfg.session?.store);
+    const storePath = core.channel.session.resolveStorePath(config.session?.store)
     core.channel.session
       .recordInboundSession({
         storePath,
         sessionKey: effectiveSessionKey,
         ctx: ctxPayload,
         onRecordError: (err) => {
-          log(
-            `easyclawapp[${account.accountId}]: session record error: ${String(err)}`,
-          );
-        },
+          dcgLogger(` session record error: ${String(err)}`, 'error')
+        }
       })
       .catch((err: unknown) => {
-        log(
-          `easyclawapp[${account.accountId}]: recordInboundSession failed: ${String(err)}`,
-        );
-      });
+        dcgLogger(` recordInboundSession failed: ${String(err)}`, 'error')
+      })
   } catch (err) {
-    error(`dcgchat[${accountId}]: handle message failed: ${String(err)}`);
-    params.onChunk({
-      messageType: "openclaw_bot_chat",
-      _userId: msg._userId,
-      source: "client",
-      content: {
-        bot_token: msg.content.bot_token,
-        domain_id: msg.content.domain_id,
-        app_id: msg.content.app_id,
-        bot_id: msg.content.bot_id,
-        agent_id: msg.content.agent_id,
-        session_id: msg.content.session_id,
-        message_id: msg.content.message_id,
-        response: `[错误] ${err instanceof Error ? err.message : String(err)}`,
-        state: "final",
-      },
-    });
+    dcgLogger(` handle message failed: ${String(err)}`, 'error')
+    sendError(msgCtx, err instanceof Error ? err.message : String(err))
   }
 }
-