@dcrays/dcgchat 0.2.18 → 0.2.25

package/src/bot.ts

@@ -1,6 +1,10 @@
 import fs from "node:fs";
 import path from "node:path";
-import type { ClawdbotConfig, ReplyPayload, RuntimeEnv } from "openclaw/plugin-sdk";
+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";
@@ -16,33 +20,68 @@ type MediaInfo = {
 };
 
 const mediaMaxBytes = 300 * 1024 * 1024;
-async function resolveMediaFromUrls(files: { name: string, url: string }[], botToken: string, log: (message: string) => void): Promise<MediaInfo[]> {
+
+/** Active LLM generation abort controllers, keyed by conversationId */
+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)
+  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: { 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)}`);
+  log(
+    `dcgchat media: starting resolve for ${files.length} file(s): ${JSON.stringify(files)}`,
+  );
 
   for (let i = 0; i < files.length; i++) {
     const file = files[i];
     try {
-      let data = ''
-       if (/^https?:\/\//i.test(file.url)) {
-          data = file.url
-        } else {
-          data = await generateSignUrl(file.url, botToken);
-        }
+      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 (!response.ok) {
-        log?.(`dcgchat media: [${i + 1}/${files.length}] fetch failed with HTTP ${response.status}, skipping`);
+        log?.(
+          `dcgchat media: [${i + 1}/${files.length}] fetch failed with HTTP ${response.status}, skipping`,
+        );
         continue;
       }
       const buffer = Buffer.from(await response.arrayBuffer());
 
       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 fileName =
+        file.name || path.basename(new URL(file.url).pathname) || "file";
       const saved = await core.channel.media.saveMediaBuffer(
         buffer,
         contentType,
@@ -57,12 +96,15 @@ async function resolveMediaFromUrls(files: { name: string, url: string }[], botT
         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)}`);
+      log(
+        `dcgchat media: [${i + 1}/${files.length}] FAILED to process ${file.url}: ${String(err)}`,
+      );
     }
   }
-  log(`dcgchat media: resolve complete, ${out.length}/${files.length} file(s) succeeded`);
+  log(
+    `dcgchat media: resolve complete, ${out.length}/${files.length} file(s) succeeded`,
+  );
 
   return out;
 }
@@ -99,58 +141,6 @@ function resolveReplyMediaList(payload: ReplyPayload): string[] {
   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 目录下的文件
@@ -159,91 +149,186 @@ function createFileExtractor() {
  */
 const EXT_LIST = [
   // 文档类
-  'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt', 'rtf', 'odt',
+  "doc",
+  "docx",
+  "xls",
+  "xlsx",
+  "ppt",
+  "pptx",
+  "pdf",
+  "txt",
+  "rtf",
+  "odt",
 
   // 数据/开发
-  'json', 'xml', 'csv', 'yaml', 'yml',
+  "json",
+  "xml",
+  "csv",
+  "yaml",
+  "yml",
 
   // 前端/文本
-  'html', 'htm', 'md', 'markdown', 'css', 'js', 'ts',
+  "html",
+  "htm",
+  "md",
+  "markdown",
+  "css",
+  "js",
+  "ts",
 
   // 图片
-  'png', 'jpg', 'jpeg', 'gif', 'bmp', 'webp', 'svg', 'ico', 'tiff',
+  "png",
+  "jpg",
+  "jpeg",
+  "gif",
+  "bmp",
+  "webp",
+  "svg",
+  "ico",
+  "tiff",
 
   // 音频
-  'mp3', 'wav', 'ogg', 'aac', 'flac', 'm4a',
+  "mp3",
+  "wav",
+  "ogg",
+  "aac",
+  "flac",
+  "m4a",
 
   // 视频
-  'mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm',
+  "mp4",
+  "avi",
+  "mov",
+  "wmv",
+  "flv",
+  "mkv",
+  "webm",
 
   // 压缩包
-  'zip', 'rar', '7z', 'tar', 'gz', 'bz2', 'xz',
+  "zip",
+  "rar",
+  "7z",
+  "tar",
+  "gz",
+  "bz2",
+  "xz",
 
   // 可执行/程序
-  'exe', 'dmg', 'pkg', 'apk', 'ipa',
+  "exe",
+  "dmg",
+  "pkg",
+  "apk",
+  "ipa",
 
   // 其他常见
-  'log', 'dat', 'bin'
+  "log",
+  "dat",
+  "bin",
 ];
 
-function extractMobookFiles(text = '') {
-  if (typeof text !== 'string' || !text.trim()) return [];
+/**
+ * 扩展名按长度降序，用于正则交替，避免 xls 抢先匹配 xlsx、htm 抢先匹配 html 等
+ */
+const EXT_SORTED_FOR_REGEX = [...EXT_LIST].sort((a, b) => b.length - a.length);
 
-  const result = new Set();
+/** 去除控制符、零宽字符等常见脏值 */
+function stripMobookNoise(s: string) {
+  return s.replace(/[\u0000-\u001F\u007F\u200B-\u200D\u200E\u200F\uFEFF]/g, "");
+}
 
-  // ✅ 扩展名
-  const EXT = `(${EXT_LIST.join('|')})`;
+/**
+ * 从文本中扫描 `/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();
+    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 => {
+    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'));
+    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();
+    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();
+    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);
+    console.warn("extractMobookFiles error:", e);
   }
-
   return [...result];
 }
 
@@ -252,13 +337,13 @@ function extractMobookFiles(text = '') {
  */
 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(name)) return false;
-
+  if (/[\/\\<>:"|?*]/.test(cleaned)) return false;
   // 长度限制（防止异常长字符串）
-  if (name.length > 200) return false;
-
+  if (cleaned.length > 200) return false;
   return true;
 }
 
@@ -267,8 +352,8 @@ function isValidFileName(name: string) {
  */
 function normalizePath(path: string) {
   return path
-    .replace(/\/+/g, '/')   // 多斜杠 → 单斜杠
-    .replace(/\/$/, '');    // 去掉结尾 /
+    .replace(/\/+/g, "/") // 多斜杠 → 单斜杠
+    .replace(/\/$/, ""); // 去掉结尾 /
 }
 
 /**
@@ -285,7 +370,7 @@ export async function handleDcgchatMessage(params: {
   const log = runtime?.log ?? console.log;
   const error = runtime?.error ?? console.error;
   //  完整的文本
-  let completeText = ''
+  let completeText = "";
 
   const account = resolveAccount(cfg, accountId);
   const userId = msg._userId.toString();
@@ -314,23 +399,56 @@ export async function handleDcgchatMessage(params: {
   try {
     const core = getDcgchatRuntime();
 
+    const conversationId = msg.content.session_id?.trim();
+
     const route = core.channel.routing.resolveAgentRoute({
       cfg,
       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"
+        ? cfg.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> = {};
     if (files.length > 0) {
-      const mediaList = await resolveMediaFromUrls(files, msg.content.bot_token, log)
+      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)}`);
+      log(
+        `dcgchat[${accountId}]: media resolved ${mediaList.length}/${files.length} file(s), payload=${JSON.stringify(mediaList)}`,
+      );
     }
 
-    const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
+    const envelopeOptions =
+      core.channel.reply.resolveEnvelopeFormatOptions(cfg);
     // const messageBody = `${userId}: ${text}`;
     // 补充消息
     const messageBody = text;
@@ -347,11 +465,11 @@ export async function handleDcgchatMessage(params: {
       RawBody: text,
       CommandBody: text,
       From: userId,
-      To: userId,
-      SessionKey: route.sessionKey,
-      AccountId: msg.content.session_id,
+      To: conversationId,
+      SessionKey: effectiveSessionKey,
+      AccountId: route.accountId,
       ChatType: "direct",
-      SenderName: userId,
+      SenderName: agentDisplayName,
       SenderId: userId,
       Provider: "dcgchat" as const,
       Surface: "dcgchat" as const,
@@ -370,173 +488,163 @@ export async function handleDcgchatMessage(params: {
     const getMediaKey = (url: string) => url.split(/[\\/]/).pop() ?? url
     let textChunk = ''
 
-    const prefixContext = createReplyPrefixContext({ cfg, agentId: route.agentId });
+    const prefixContext = createReplyPrefixContext({
+      cfg,
+      agentId: effectiveAgentId ?? "",
+      channel: "dcgchat",
+      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),
+        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}`);
+          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)}`);
+        onError: (err: any, info: { kind: any }) => {
+          error(
+            `dcgchat[${accountId}] ${info.kind} reply failed: ${String(err)}`,
+          );
         },
         onIdle: () => {},
       });
 
-    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 (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})`,
+        );
+        await core.channel.reply.dispatchReplyFromConfig({
+          ctx: ctxPayload,
+          cfg,
+          dispatcher,
+          replyOptions: {
+            ...replyOptions,
+            abortSignal: genSignal,
+            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;
+                  sentMediaKeys.add(key);
+                  await sendDcgchatMedia({
+                    cfg,
+                    accountId,
+                    log,
+                    mediaUrl,
+                    text: "",
+                  });
                 }
-                sentMediaKeys.add(key);
-                await sendDcgchatMedia({
-                  cfg,
-                  accountId,
-                  log,
-                  mediaUrl,
-                  text: "",
-                });
+                log(
+                  `dcgchat[${accountId}][deliver]: sent ${mediaList.length} media file(s) through channel adapter`,
+                );
               }
-              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`);
+              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`,
+                  );
+                }
+                textChunk = payload.text;
+              } else {
+                log(`dcgchat[${accountId}][deliver]: skipping empty chunk`);
               }
-              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)
+        });
+      }
+      } 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)}`,
+          );
         }
-        const key = getMediaKey(url);
-        if (sentMediaKeys.has(key)) {
-          log(`dcgchat[${accountId}]: completeFiles already sent, skipping: ${url}`);
-          continue;
+      } finally {
+        if (activeGenerations.get(conversationId) === genCtrl) {
+          activeGenerations.delete(conversationId);
         }
-        if (!fs.existsSync(url)) {
-          log(`dcgchat[${accountId}]: completeFiles file not found, skipping: ${url}`);
-          continue;
+        if (wasAborted) {
+          //TODO：是否需要发消息给移动端，通知停止生成
         }
-        sentMediaKeys.add(key);
-        await sendDcgchatMedia({
-          cfg,
-          accountId,
-          log,
-          mediaUrl: url,
-          text: "",
-        });
       }
-      log(`dcgchat[${accountId}][deliver]: sent ${completeFiles.length} media file(s) through channel adapter`);
-    }
-    const mobookFiles = extractMobookFiles(completeText)
+
+    const mobookFiles = extractMobookFiles(completeText);
     if (mobookFiles.length > 0) {
       for (let i = 0; i < mobookFiles.length; i++) {
-        let url = mobookFiles[i] as string
+        let url = mobookFiles[i] as string;
         const key = getMediaKey(url);
         if (sentMediaKeys.has(key)) {
-          log(`dcgchat[${accountId}]: mobookFiles already sent, skipping: ${url}`);
+          log(
+            `dcgchat[${accountId}]: mobookFiles already sent, skipping: ${url}`,
+          );
           continue;
         }
         if (!fs.existsSync(url)) {
-          url = path.join(getWorkspaceDir(), url)
+          url = path.join(getWorkspaceDir(), url);
           if (!fs.existsSync(url)) {
-            log(`dcgchat[${accountId}]: mobookFiles file not found, skipping: ${url}`);
+            log(
+              `dcgchat[${accountId}]: mobookFiles file not found, skipping: ${url}`,
+            );
             continue;
           }
         }
@@ -549,7 +657,9 @@ export async function handleDcgchatMessage(params: {
           text: "",
         });
       }
-      log(`dcgchat[${accountId}][deliver]: sent ${mobookFiles.length} media file(s) through channel adapter`);
+      log(
+        `dcgchat[${accountId}][deliver]: sent ${mobookFiles.length} media file(s) through channel adapter`,
+      );
     }
     log(`dcgchat[${accountId}]: dispatch complete, sending final state`);
     params.onChunk({
@@ -564,18 +674,36 @@ export async function handleDcgchatMessage(params: {
         agent_id: msg.content.agent_id,
         session_id: msg.content.session_id,
         message_id: msg.content.message_id,
-        response: '',
-        state: 'final',
+        response: "",
+        state: "final",
       },
     });
 
-    setMsgStatus('finished');
-    textChunk = ''
+    setMsgStatus("finished");
+    textChunk = "";
     log(`dcgchat[${accountId}]: final state sent`);
 
     markDispatchIdle();
     log(`dcgchat[${accountId}]: message handling complete`);
 
+    // Record session metadata
+    const storePath = core.channel.session.resolveStorePath(cfg.session?.store);
+    core.channel.session
+      .recordInboundSession({
+        storePath,
+        sessionKey: effectiveSessionKey,
+        ctx: ctxPayload,
+        onRecordError: (err) => {
+          log(
+            `easyclawapp[${account.accountId}]: session record error: ${String(err)}`,
+          );
+        },
+      })
+      .catch((err: unknown) => {
+        log(
+          `easyclawapp[${account.accountId}]: recordInboundSession failed: ${String(err)}`,
+        );
+      });
   } catch (err) {
     error(`dcgchat[${accountId}]: handle message failed: ${String(err)}`);
     params.onChunk({
@@ -591,8 +719,9 @@ export async function handleDcgchatMessage(params: {
         session_id: msg.content.session_id,
         message_id: msg.content.message_id,
         response: `[错误] ${err instanceof Error ? err.message : String(err)}`,
-        state: 'final',
+        state: "final",
       },
     });
   }
 }
+