@dcrays/dcgchat 0.2.19 → 0.2.32

package/src/bot.ts

@@ -1,87 +1,115 @@
-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,
+  getWsConnection,
+  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, sendText } from './transport.js'
+import { dcgLogger } from './utils/log.js'
+import { channelInfo, systemCommand, interruptCommand, ENV } 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
+
+/** Active LLM generation abort controllers, keyed by conversationId */
+const activeGenerations = new Map<string, AbortController>()
 
-const mediaMaxBytes = 300 * 1024 * 1024;
-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)}`);
+/** Abort an in-progress LLM generation for a given conversationId */
+export function abortMobookappGeneration(conversationId: string): void {
+  const ctrl = activeGenerations.get(conversationId)
+  if (ctrl) {
+    ctrl.abort()
+    activeGenerations.delete(conversationId)
+  }
+}
+
+/**
+ * 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)
+}
+
+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 = ''
-       if (/^https?:\/\//i.test(file.url)) {
-          data = file.url
-        } else {
-          data = await generateSignUrl(file.url, botToken);
-        }
-      log(`dcgchat media: [${i + 1}/${files.length}] generateSignUrl: ${data}`);
-      const response = await fetch(data);
+      if (/^https?:\/\//i.test(file.url)) {
+        data = file.url
+      } else {
+        data = await generateSignUrl(file.url, botToken)
+      }
+      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,
@@ -90,509 +118,247 @@ 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] : [];
-}
-
-function createFileExtractor() {
-  const globalSet = new Set()
-
-  function getNewFiles(text: string) {
-    if (!text) return []
-
-    const currentSet = new Set()
-    const lines = text.split(/\n+/)
-
-    for (const line of lines) {
-      const cleanLine = line.trim()
-      if (!cleanLine) continue
-
-      const matches = cleanLine.matchAll(/`([^`]+)`/g)
-      for (const m of matches) {
-        handlePath(m[1])
-      }
-
-      const rawMatches = cleanLine.match(/\/[^\s)）]+/g) || []
-      for (const p of rawMatches) {
-        handlePath(p)
-      }
-    }
-
-    function handlePath(p: string) {
-      const filePath = p.trim()
-      if (filePath.includes('\n')) return
-      if (isValidFile(filePath)) {
-        currentSet.add(filePath)
-      }
-    }
-
-    const newFiles = []
-    for (const file of currentSet) {
-      if (!globalSet.has(file)) {
-        globalSet.add(file)
-        newFiles.push(file)
-      }
-    }
-
-    return newFiles
-  }
-
-  function isValidFile(p: string) {
-    return (
-      /\/(upload|mobook)\//i.test(p) &&
-      /\.[a-zA-Z0-9]+$/.test(p)
-    )
-  }
-
-  return { getNewFiles }
-}
-
-/**
- * 从文本中提取 /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'
-];
-
-function extractMobookFiles(text = '') {
-  if (typeof text !== 'string' || !text.trim()) return [];
-
-  const result = new Set();
-
-  // ✅ 扩展名
-  const EXT = `(${EXT_LIST.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}`);
-      }
-    });
-
-  } catch (e) {
-    console.warn('extractMobookFiles error:', e);
+    MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined
   }
-
-  return [...result];
-}
-
-/**
- * 校验文件名是否合法（避免脏数据）
- */
-function isValidFileName(name: string) {
-  if (!name) return false;
-
-  // 过滤异常字符
-  if (/[\/\\<>:"|?*]/.test(name)) return false;
-
-  // 长度限制（防止异常长字符串）
-  if (name.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 = ''
+export async function handleDcgchatMessage(msg: InboundMessage, accountId: string): Promise<void> {
+  const msgCtx = createMsgContext(msg)
 
-  const account = resolveAccount(cfg, accountId);
-  const userId = msg._userId.toString();
-  const text = msg.content.text?.trim();
+  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 route = core.channel.routing.resolveAgentRoute({
-      cfg,
+      cfg: config,
       channel: "dcgchat",
       accountId: account.accountId,
-      peer: { kind: "direct", id: userId },
-    });
+      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 effectiveSessionKey = embeddedAgentId
+      ? `agent:${embeddedAgentId}:mobook:direct:${conversationId}`.toLowerCase()
+      : route.sessionKey
+
+    const agentEntry =
+      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 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,
       RawBody: text,
       CommandBody: text,
       From: userId,
-      To: userId,
-      SessionKey: route.sessionKey,
-      AccountId: msg.content.session_id,
-      ChatType: "direct",
-      SenderName: userId,
+      To: conversationId,
+      SessionKey: effectiveSessionKey,
+      AccountId: route.accountId,
+      ChatType: 'direct',
+      SenderName: agentDisplayName,
       SenderId: userId,
-      Provider: "dcgchat" as const,
-      Surface: "dcgchat" as const,
+      Provider: "dcgchat",
+      Surface: "dcgchat",
       MessageSid: msg.content.message_id,
       Timestamp: Date.now(),
       WasMentioned: true,
       CommandAuthorized: true,
-      OriginatingChannel: "dcgchat" as const,
+      OriginatingChannel: "dcgchat",
       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 = ''
-
-    const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
+    let streamedTextLen = 0
 
-    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: () => {},
-      });
+    const prefixContext = createReplyPrefixContext({
+      cfg: config,
+      agentId: effectiveAgentId ?? '',
+      channel: "dcgchat",
+      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) => {
+        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: () => {
+        sendFinal(msgCtx)
+      }
+    })
 
-    if (text === '/new') {
-      await core.channel.reply.dispatchReplyFromConfig({
-        ctx: ctxPayload,
-        cfg,
-        dispatcher,
-        replyOptions: {
-          ...replyOptions,
-          onModelSelected: prefixContext.onModelSelected
-        },
-      });
-      log(`dcgchat[${accountId}]: skipping agent dispatch for /new`);
-      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: 'chunk',
-        },
-      });
-      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',
-        },
-      });
-    } else {
-      log(`dcgchat[${accountId}]: dispatching to agent (session=${route.sessionKey})`);
-      await core.channel.reply.dispatchReplyFromConfig({
-        ctx: ctxPayload,
-        cfg,
-        dispatcher,
-        replyOptions: {
-          ...replyOptions,
-          onModelSelected: prefixContext.onModelSelected,
-          onPartialReply: async (payload: ReplyPayload) => {
-            log(`dcgchat[${accountId}][deliver]: received chunk, text length=${payload.text?.length || 0}`);
-            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;
-                if (!/^https?:\/\//i.test(mediaUrl) && !fs.existsSync(mediaUrl)) {
-                  log(`dcgchat[${accountId}][deliver]: media file not found, skipping: ${mediaUrl}`);
-                  continue;
+    let wasAborted = false
+    try {
+      if (systemCommand.includes(text?.trim())) {
+        dcgLogger(`dispatching /new`)
+        await core.channel.reply.dispatchReplyFromConfig({
+          ctx: ctxPayload,
+          cfg: config,
+          dispatcher,
+          replyOptions: {
+            ...replyOptions,
+            onModelSelected: prefixContext.onModelSelected
+          }
+        })
+      } else if (interruptCommand.includes(text?.trim())) {
+        dcgLogger(`interrupt command: ${text}`)
+        abortMobookappGeneration(conversationId)
+        sendFinal(msgCtx)
+        return
+      } 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) => {
+              // Accumulate full text
+              if (payload.text) {
+                completeText = payload.text
+              }
+              // --- Streaming text chunks ---
+              if (payload.text) {
+                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)}`)
                 }
-                sentMediaKeys.add(key);
-                await sendDcgchatMedia({
-                  cfg,
-                  accountId,
-                  log,
-                  mediaUrl,
-                  text: "",
-                });
+                streamedTextLen = payload.text.length
               }
-              log(`dcgchat[${accountId}][deliver]: sent ${mediaList.length} media file(s) through channel adapter`);
-            }
-            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`);
+              // --- 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: '' })
               }
-              textChunk = payload.text
-            } else {
-              log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
             }
-          },
-        },
-      });
-    }
-
-    const extractor = createFileExtractor()
-    const completeFiles = extractor.getNewFiles(completeText)
-    if (completeFiles.length > 0) {
-      for (let i = 0; i < completeFiles.length; i++) {
-        let url = completeFiles[i] as string
-        if (!path.isAbsolute(url)) {
-          url = path.join(getWorkspaceDir(), url)
-        }
-        const key = getMediaKey(url);
-        if (sentMediaKeys.has(key)) {
-          log(`dcgchat[${accountId}]: completeFiles already sent, skipping: ${url}`);
-          continue;
-        }
-        if (!fs.existsSync(url)) {
-          log(`dcgchat[${accountId}]: completeFiles file not found, skipping: ${url}`);
-          continue;
-        }
-        sentMediaKeys.add(key);
-        await sendDcgchatMedia({
-          cfg,
-          accountId,
-          log,
-          mediaUrl: url,
-          text: "",
-        });
+          }
+        })
+      }
+    } 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)
       }
-      log(`dcgchat[${accountId}][deliver]: sent ${completeFiles.length} media file(s) through channel adapter`);
     }
-    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;
-          }
+    try {
+      markRunComplete()
+    } catch (err) {
+      dcgLogger(` markRunComplete error: ${String(err)}`, 'error')
+    }
+    markDispatchIdle()
+    if (![...systemCommand, ...interruptCommand].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`);
     }
-    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`);
-
+    sendFinal(msgCtx)
+    clearSentMediaKeys(msg.content.message_id)
+    setMsgStatus('finished')
+
+    // Record session metadata
+    const storePath = core.channel.session.resolveStorePath(config.session?.store)
+    core.channel.session
+      .recordInboundSession({
+        storePath,
+        sessionKey: effectiveSessionKey,
+        ctx: ctxPayload,
+        onRecordError: (err) => {
+          dcgLogger(` session record error: ${String(err)}`, 'error')
+        }
+      })
+      .catch((err: unknown) => {
+        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))
   }
 }