@xmanrui/dsh-im 4.20.2 → 4.21.1

package/src/channels/dingtalk/dingtalk-bridge.mjs

@@ -30,7 +30,11 @@ import {
 } from '../shared/preset-command.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
-import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
+import {
+  captureContextEnhancement,
+  captureContextEnhancementSource,
+  enhanceContextContent,
+} from '../shared/context-enhancement.mjs';
 import {
   BatchInputManager,
   batchInputBusyMessage,
@@ -43,6 +47,7 @@ import {
   imagePromptUserMessage,
 } from '../shared/image-prompt.mjs';
 import {
+  InboundFileError,
   hasInboundFiles,
   inboundFileUserMessage,
   prefetchInboundFiles,
@@ -195,6 +200,13 @@ function downloadCodeFor(value) {
   return nonEmptyString(value?.downloadCode) ?? nonEmptyString(value?.pictureDownloadCode);
 }
 
+function dingtalkImageEntries(msgtype, content) {
+  if (msgtype === 'picture') return [content];
+  if (msgtype !== 'richtext') return [];
+  return richTextEntries(content)
+    .filter((entry) => String(entry?.type ?? '').toLowerCase() === 'picture');
+}
+
 function dingtalkTimestampMs(value) {
   const number = typeof value === 'string' && value.trim() ? Number(value) : value;
   if (!Number.isFinite(number) || number < 0) return null;
@@ -206,24 +218,36 @@ function usefulReplyText(value) {
   return text && !/^\[interactive card message\]$/iu.test(text) ? text : null;
 }
 
-function dingtalkReplyReference(message, options) {
-  const replyEnvelope = message?.text;
-  if (replyEnvelope?.isReplyMsg !== true) return null;
-  const replied = replyEnvelope?.repliedMsg;
-  if (!replied || typeof replied !== 'object') {
-    return { unavailableReason: 'not-delivered' };
-  }
-
+function dingtalkReplyMessage(message) {
+  if (message?.text?.isReplyMsg !== true) return null;
+  const replied = message.text.repliedMsg;
+  if (!replied || typeof replied !== 'object') return null;
   const msgtype = nonEmptyString(replied.msgType ?? replied.msgtype)?.toLowerCase() ?? '';
   const repliedContent = parsedMessageContent({ content: replied.content }) ?? {};
-  const pseudoMessage = {
+  // Quoted richText entries use msgType instead of the direct callback's type.
+  const content = msgtype === 'richtext' ? {
+    ...repliedContent,
+    richText: richTextEntries(repliedContent).map((entry) => ({
+      ...entry, type: entry?.type ?? entry?.msgType ?? entry?.msgtype,
+    })),
+  } : repliedContent;
+  return {
     msgtype,
+    robotCode: message.robotCode,
     text: {
       content: nonEmptyString(repliedContent.text)
         ?? (typeof replied.content === 'string' ? replied.content : ''),
     },
-    content: repliedContent,
+    content,
   };
+}
+
+function dingtalkReplyReference(message, options) {
+  if (message?.text?.isReplyMsg !== true) return null;
+  const pseudoMessage = dingtalkReplyMessage(message);
+  if (!pseudoMessage) return { unavailableReason: 'not-delivered' };
+  const replied = message.text.repliedMsg;
+  const { msgtype, content: repliedContent } = pseudoMessage;
   const normalized = dingtalkInboundMessage(pseudoMessage, options);
   let attachments = [];
   if (msgtype === 'picture') {
@@ -232,8 +256,7 @@ function dingtalkReplyReference(message, options) {
     const name = nonEmptyString(repliedContent.fileName ?? repliedContent.file_name);
     attachments = [{ kind: 'file', ...(name ? { name } : {}) }];
   } else if (msgtype === 'richtext') {
-    attachments = richTextEntries(repliedContent)
-      .filter((entry) => String(entry?.type ?? '').toLowerCase() === 'picture')
+    attachments = dingtalkImageEntries(msgtype, repliedContent)
       .map(() => ({ kind: 'image' }));
   } else if (msgtype === 'voice' || msgtype === 'audio') {
     attachments = [{ kind: 'audio' }];
@@ -278,6 +301,43 @@ function dingtalkReplyReference(message, options) {
   };
 }
 
+// Resolve only the immediate quote, after command/interaction routing has finished.
+function prepareDingtalkReplyAttachments(message, promptMessage, options) {
+  const quoted = dingtalkReplyMessage(message);
+  if (!quoted) return promptMessage;
+  if (['audio', 'voice', 'video'].includes(quoted.msgtype)) quoted.msgtype = 'file';
+  const imageCodes = dingtalkImageEntries(quoted.msgtype, quoted.content).map(downloadCodeFor);
+  const fileCodes = quoted.msgtype === 'file' ? [downloadCodeFor(quoted.content)] : [];
+  if ([...imageCodes, ...fileCodes].some((code) => !code)) {
+    throw new InboundFileError(
+      'dingtalk-quoted-attachment-unavailable',
+      'DingTalk did not deliver a download reference for the quoted attachment.',
+      t('钉钉未提供引用附件的下载信息，无法读取原附件。请直接重新发送附件后再提问。'),
+    );
+  }
+  if (imageCodes.length === 0 && fileCodes.length === 0) return promptMessage;
+  const currentType = String(message?.msgtype ?? '').toLowerCase();
+  const currentContent = parsedMessageContent(message);
+  const seen = new Set([
+    ...dingtalkImageEntries(currentType, currentContent).map(downloadCodeFor),
+    ...(currentType === 'file' ? [downloadCodeFor(currentContent)] : []),
+  ].filter(Boolean));
+  const take = (code) => {
+    if (seen.has(code)) return false;
+    seen.add(code);
+    return true;
+  };
+  const normalized = dingtalkInboundMessage(quoted, options);
+  const images = normalized.images.filter((_, index) => take(imageCodes[index]));
+  const files = normalized.files.filter((_, index) => take(fileCodes[index]));
+  const prefetched = prefetchInboundFiles({ files }, { signal: options.signal });
+  return {
+    ...promptMessage,
+    images: [...promptMessage.images, ...images],
+    files: [...promptMessage.files, ...prefetched.files],
+  };
+}
+
 /** Normalize DingTalk picture and richText callbacks into lazy image references. */
 export function dingtalkInboundMessage(message, {
   api,
@@ -291,17 +351,7 @@ export function dingtalkInboundMessage(message, {
   const text = msgtype === 'text'
     ? nonEmptyString(message?.text?.content) ?? ''
     : richEntries.map(richTextEntryText).filter(Boolean).join('\n');
-  const imageCodes = [];
-  if (msgtype === 'picture') {
-    const code = downloadCodeFor(content);
-    if (code) imageCodes.push(code);
-  } else if (msgtype === 'richtext') {
-    for (const entry of richEntries) {
-      if (String(entry?.type ?? '').toLowerCase() !== 'picture') continue;
-      const code = downloadCodeFor(entry);
-      if (code) imageCodes.push(code);
-    }
-  }
+  const imageCodes = dingtalkImageEntries(msgtype, content).map(downloadCodeFor).filter(Boolean);
   const fileCode = msgtype === 'file' ? downloadCodeFor(content) : null;
   const replyTo = dingtalkReplyReference(message, {
     api,
@@ -838,6 +888,17 @@ export class DingtalkHarnessBridge {
       signal: this.#signal, isDirect: String(message.conversationType) === '1',
       pendingInteraction: this.#pendingInteractions.has(key) || this.#approvals.hasPending(key),
       control: { owner: this, key }, deferredDelivery: this.#deferred,
+      enhancement: captureContextEnhancementSource(
+        this.#contextEnhancement,
+        String(message.conversationType) === '1' ? 'direct' : 'group',
+        () => ({
+          channel: 'dingtalk',
+          senderId: senderStaffId(message),
+          senderName: message.senderNick,
+          conversationTitle: message.conversationTitle,
+          chatId: message.conversationId,
+        }),
+      ),
     };
     const access = evaluateInboundAccess(this.#accessPolicy, {
       conversationType: options.isDirect ? 'direct' : 'group',
@@ -1102,6 +1163,17 @@ export class DingtalkHarnessBridge {
           || this.#approvals.hasPending(key),
         control: { owner: this, key },
         deferredDelivery: this.#deferred,
+        enhancement: captureContextEnhancementSource(
+          this.#contextEnhancement,
+          String(message.conversationType) === '1' ? 'direct' : 'group',
+          () => ({
+            channel: 'dingtalk',
+            senderId: senderStaffId(message),
+            senderName: message.senderNick,
+            conversationTitle: message.conversationTitle,
+            chatId: message.conversationId,
+          }),
+        ),
       },
     );
     if (result?.stopped) {
@@ -1261,8 +1333,12 @@ export class DingtalkHarnessBridge {
         return;
       }
 
-      let content = hasImages || hasReply
-        ? await promptContentForInboundMessage(promptMessage, { signal: this.#signal })
+      const modelMessage = prepareDingtalkReplyAttachments(message, promptMessage, {
+        api: this.#api, clientId: this.#clientId, clientSecret: this.#clientSecret,
+        signal: this.#signal,
+      });
+      let content = hasInboundImages(modelMessage) || hasReply
+        ? await promptContentForInboundMessage(modelMessage, { signal: this.#signal })
         : undefined;
       const snapshot = this.#acceptedMessageIds.get(messageId);
       let contextEnhanced = false;
@@ -1299,6 +1375,8 @@ export class DingtalkHarnessBridge {
         key,
         text,
         content,
+        titleText: batchSubmission?.title,
+        sourceGuidance: snapshot?.config?.guidance,
         contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
@@ -1316,7 +1394,7 @@ export class DingtalkHarnessBridge {
             requiresMention: String(message.conversationType) === '2',
           }),
           onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
-          files: promptMessage.files,
+          files: modelMessage.files,
         },
       });
       if (batchSubmission) {

package/src/channels/discord/discord-runtime.mjs

@@ -66,7 +66,10 @@ function gatewayCloseError(code) {
 
 function stripBotMention(text, botId) {
   if (typeof text !== 'string') return '';
-  return text.replace(new RegExp(`<@!?${botId}>`, 'g'), '').trim();
+  return text
+    .split(`<@${botId}>`).join('')
+    .split(`<@!${botId}>`).join('')
+    .trim();
 }
 
 function cleanThreadName(message, botId) {

package/src/channels/feishu/bridge.mjs

@@ -60,7 +60,11 @@ import {
 } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 import { createDeferredDeliveryCoordinator, deferredOutcomeText } from '../shared/deferred-delivery-coordinator.mjs';
-import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
+import {
+  captureContextEnhancement,
+  captureContextEnhancementSource,
+  enhanceContextContent,
+} from '../shared/context-enhancement.mjs';
 import { deliverOutboundArtifacts } from '../shared/semantic/artifact-delivery.mjs';
 import {
   createDeliveryReceipt,
@@ -1037,12 +1041,16 @@ export class FeishuHarnessBridge {
         if (result.kind === 'submit') {
           const submissionEvent = {
             ...event,
-            batchSubmission: { token: result.token },
+            batchSubmission: { token: result.token, title: result.title },
             message: {
               ...event.message,
               message_type: 'text',
               content: JSON.stringify({ text: result.prompt }),
               mentions: [],
+              // The submission is exactly the collected text, so quoting the
+              // message that carried /send must not attach it to the batch.
+              parent_id: undefined,
+              root_id: undefined,
             },
           };
           return this.#enqueueMessage(
@@ -1412,6 +1420,16 @@ export class FeishuHarnessBridge {
         hasFiles: hasInboundFiles(message),
         pendingInteraction: this.#hasPendingInteraction(key),
         control: { owner: this, key },
+        enhancement: captureContextEnhancementSource(
+          this.#contextEnhancement,
+          event.message.chat_type === 'p2p' ? 'direct' : 'group',
+          () => ({
+            channel: 'feishu',
+            senderId: senderOpenId(event),
+            chatId: event.message.chat_id,
+            threadId: event.message.thread_id,
+          }),
+        ),
       },
     );
     if (result?.stopped) {
@@ -2471,7 +2489,7 @@ export class FeishuHarnessBridge {
         await this.#sendCard(chatId, customSteerCard(), { key, updateMessageId: messageId, replyTo: messageId });
         return;
       }
-      await this.#sendSteer({ key, chatId, messageId }, raw);
+      await this.#sendSteer({ key, chatId, messageId, actor }, raw);
       return;
     }
     if (action === 'presets') {
@@ -3197,11 +3215,26 @@ export class FeishuHarnessBridge {
    */
   async #sendSteer(entry, text) {
     const { key, chatId } = entry;
+    // Card routes carry the conversation key, not the raw event, so the topic
+    // id is recovered from the key the channel itself minted.
+    const threadId = typeof key === 'string'
+      ? /(?:^|:)thread:(.+)$/u.exec(key)?.[1]
+      : undefined;
     const result = await runControlCommand(
       `/steer ${text}`, this.#harness, this.#state, key, {
         signal: this.#signal,
         pendingInteraction: this.#hasPendingInteraction(key),
         control: { owner: this, key },
+        enhancement: captureContextEnhancementSource(
+          this.#contextEnhancement,
+          typeof key === 'string' && key.startsWith('p2p:') ? 'direct' : 'group',
+          () => ({
+            channel: 'feishu',
+            senderId: entry.actor ?? entry.operatorOpenId,
+            chatId,
+            threadId,
+          }),
+        ),
       },
     );
     await this.#send(chatId, result?.message || t('已提交补充指令。'), { replyTo: entry.messageId ?? null });
@@ -4959,6 +4992,8 @@ export class FeishuHarnessBridge {
       key,
       text,
       content,
+      titleText: event.batchSubmission?.title,
+      sourceGuidance: snapshot?.config?.guidance,
       contextEnhanced,
       createOptions: { signal: this.#signal },
       existsOptions: { signal: this.#signal },
@@ -5201,6 +5236,8 @@ export class FeishuHarnessBridge {
         key,
         text,
         content,
+        titleText: event.batchSubmission?.title,
+        sourceGuidance: snapshot?.config?.guidance,
         contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },
@@ -5280,6 +5317,8 @@ export class FeishuHarnessBridge {
             key,
             text,
             content,
+            titleText: event.batchSubmission?.title,
+            sourceGuidance: snapshot?.config?.guidance,
             contextEnhanced,
             createOptions: { signal: this.#signal },
             existsOptions: { signal: this.#signal },
@@ -5350,6 +5389,8 @@ export class FeishuHarnessBridge {
         key,
         text,
         content,
+        titleText: event.batchSubmission?.title,
+        sourceGuidance: snapshot?.config?.guidance,
         contextEnhanced,
         createOptions: { signal: this.#signal },
         existsOptions: { signal: this.#signal },

package/src/channels/feishu/feishu-channel.mjs

@@ -576,7 +576,7 @@ export class VerifiedFeishuChannel {
       assertApiSuccess('Feishu message delete', response);
       return true;
     } catch (error) {
-      console.warn(`[bridge] unable to recall ${label}:`, error.message);
+      console.warn('[bridge] unable to recall message:', label, error.message);
       return false;
     }
   }

package/src/channels/qq/qq-bridge.mjs

@@ -22,7 +22,11 @@ import {
   runPresetCommand,
 } from '../shared/preset-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
-import { captureContextEnhancement, enhanceContextContent } from '../shared/context-enhancement.mjs';
+import {
+  captureContextEnhancement,
+  captureContextEnhancementSource,
+  enhanceContextContent,
+} from '../shared/context-enhancement.mjs';
 import {
   BatchInputManager,
   batchInputBusyMessage,
@@ -570,7 +574,14 @@ export class QqHarnessBridge {
       if (result.handled) {
         if (result.kind === 'submit') {
           return this.#enqueueMessage(
-            { ...message, content: result.prompt, attachments: [] },
+            {
+              ...message,
+              content: result.prompt,
+              // The submission is exactly the collected text: the command
+              // message's own attachments and quoted message are not part of it.
+              attachments: [],
+              refMsgIdx: undefined,
+            },
             messageId,
             key,
             { batchSubmission: result },
@@ -752,7 +763,17 @@ export class QqHarnessBridge {
       return { message: t('当前任务仍在运行，请先停止任务或等待任务完成后再执行此操作。') };
     }
     const options = { signal: this.#signal, isDirect: message.kind === 'c2c', pendingInteraction,
-      control: { owner: this, key }, deferredDelivery: this.#deferred };
+      control: { owner: this, key }, deferredDelivery: this.#deferred,
+      enhancement: captureContextEnhancementSource(
+        this.#contextEnhancement,
+        message.kind === 'c2c' ? 'direct' : 'group',
+        () => ({
+          channel: 'qq',
+          senderId: nonEmptyString(message.senderId),
+          senderName: message.kind === 'group' ? message.senderName : undefined,
+          chatId: message.kind === 'group' ? message.groupOpenid : message.senderId,
+        }),
+      ) };
     // Existing runners own all Host mutations and control authorization.
     const execute = async () => {
       this.#signal?.throwIfAborted();
@@ -817,6 +838,16 @@ export class QqHarnessBridge {
         || this.#approvals.hasPending(key),
       control: { owner: this, key },
       deferredDelivery: this.#deferred,
+      enhancement: captureContextEnhancementSource(
+        this.#contextEnhancement,
+        message.kind === 'c2c' ? 'direct' : 'group',
+        () => ({
+          channel: 'qq',
+          senderId: nonEmptyString(message.senderId),
+          senderName: message.kind === 'group' ? message.senderName : undefined,
+          chatId: message.kind === 'group' ? message.groupOpenid : message.senderId,
+        }),
+      ),
     });
     if (result?.stopped) {
       await Promise.allSettled([
@@ -1038,6 +1069,8 @@ export class QqHarnessBridge {
           key,
           text,
           content,
+          titleText: batchSubmission?.title,
+          sourceGuidance: snapshot?.config?.guidance,
           contextEnhanced,
           createOptions: { signal: this.#signal },
           existsOptions: { signal: this.#signal },

package/src/channels/qq/qq-controller.mjs

@@ -4,6 +4,7 @@ import { connectionTestMessage } from '../shared/connection-test.mjs';
 import { t } from '../shared/i18n.mjs';
 import { publicMessageFailure } from '../shared/message-failure.mjs';
 import { deriveQqBotIdentity, maskQqAppId } from './config-store.mjs';
+import { publicQqStateError } from './state-error.mjs';
 
 const ACTIVE_ATTEMPT_STATES = new Set(['starting', 'pending', 'refreshing', 'connecting']);
 const TERMINAL_ATTEMPT_STATES = new Set(['connected', 'failed', 'cancelled']);
@@ -17,6 +18,10 @@ function safeError(code, message) {
   return Object.freeze({ code, message });
 }
 
+function connectionError(error, message) {
+  return publicQqStateError(error) ?? safeError('connection-failed', message);
+}
+
 function publicAttempt(record) {
   if (!record) return null;
   return {
@@ -86,7 +91,7 @@ export class QqController {
           await this.#startRuntime(config, appSecret);
           this.#errors.delete(config.botId);
         } catch (error) {
-          this.#errors.set(config.botId, safeError('connection-failed', t('QQ 连接未就绪，插件会自动重试。')));
+          this.#errors.set(config.botId, connectionError(error, t('QQ 连接未就绪，插件会自动重试。')));
           this.#logger.warn?.(`[dsh-im:qq] bot ${config.botId} failed to initialize:`, error);
         } finally {
           this.#touch();
@@ -209,7 +214,7 @@ export class QqController {
         await this.#startRuntime(config, normalizedSecret);
         this.#errors.delete(identity.botId);
       } catch (error) {
-        this.#errors.set(identity.botId, safeError('connection-failed', t('QQ 机器人已绑定，消息连接暂未就绪。')));
+        this.#errors.set(identity.botId, connectionError(error, t('QQ 机器人已绑定，消息连接暂未就绪。')));
         this.#logger.warn?.(`[dsh-im:qq] bot ${identity.botId} credential connection failed:`, error);
       }
       this.#touch();
@@ -242,7 +247,7 @@ export class QqController {
         await this.#startRuntime(config, secret);
         this.#errors.delete(botId);
       } catch (error) {
-        this.#errors.set(botId, safeError('connection-failed', t('QQ 连接仍未就绪，请稍后重试。')));
+        this.#errors.set(botId, connectionError(error, t('QQ 连接仍未就绪，请稍后重试。')));
         throw error;
       } finally {
         this.#touch();
@@ -326,7 +331,8 @@ export class QqController {
         health: {
           status: connected ? 'healthy' : state === 'error' ? 'error' : 'offline',
           summary: connected ? t('QQ WebSocket 长连接运行正常')
-            : state === 'error' ? t('QQ 连接未就绪，插件会自动重试') : t('QQ 连接当前离线'),
+            : this.#errors.get(config.botId)?.message
+              ?? (state === 'error' ? t('QQ 连接未就绪，插件会自动重试') : t('QQ 连接当前离线')),
           lastCheckedAt: runtimeStatus?.lastCheckedAt ?? null,
           lastConnectedAt: runtimeStatus?.lastConnectedAt ?? null,
         },
@@ -434,7 +440,7 @@ export class QqController {
           await this.#restoreCredential(identity.secretRef, previousSecret);
           throw error;
         }
-        this.#errors.set(identity.botId, safeError('connection-failed', t('QQ 机器人已绑定，消息连接暂未就绪。')));
+        this.#errors.set(identity.botId, connectionError(error, t('QQ 机器人已绑定，消息连接暂未就绪。')));
         this.#logger.warn?.(`[dsh-im:qq] bot ${identity.botId} activation connection failed:`, error);
       }
       this.#touch();

package/src/channels/qq/state-error.mjs

@@ -0,0 +1,17 @@
+import { t } from '../shared/i18n.mjs';
+
+const MESSAGES = Object.freeze({
+  'state-read-failed': '无法读取 QQ 本地状态，请检查数据目录及访问权限。',
+  'state-backup-failed': 'QQ 本地状态已损坏，但无法备份，原文件已保留。',
+  'state-write-failed': '无法保存 QQ 本地状态，请检查磁盘空间及目录写入权限。',
+});
+
+export function qqStateError(code, cause) {
+  return Object.assign(new Error('QQ state operation failed', { cause }), { code });
+}
+
+export function publicQqStateError(error) {
+  return Object.hasOwn(MESSAGES, error?.code ?? '')
+    ? { code: error.code, message: t(MESSAGES[error.code]) }
+    : null;
+}

package/src/channels/qq/state-store.mjs

@@ -1,6 +1,8 @@
 import { deferredStateAccess, normalizeDeferredState } from '../shared/deferred-state.mjs';
-import { mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
+import { randomUUID } from 'node:crypto';
+import fs from 'node:fs/promises';
 import { dirname } from 'node:path';
+import { qqStateError } from './state-error.mjs';
 
 const EMPTY_STATE = Object.freeze({ version: 1, sessions: {}, seenMessageIds: [] });
 
@@ -27,22 +29,46 @@ function normalizeState(value) {
 
 export class QqStateStore {
   #path;
+  #logger;
   #state = structuredClone(EMPTY_STATE);
   #writeQueue = Promise.resolve();
   #deferred = deferredStateAccess(() => this.#state, () => this.#persist());
 
-  constructor(path) {
+  constructor(path, { logger = console } = {}) {
     this.#path = path;
+    this.#logger = logger;
   }
 
   async load() {
+    let bytes;
     try {
-      this.#state = normalizeState(JSON.parse(await readFile(this.#path, 'utf8')));
+      bytes = await fs.readFile(this.#path);
     } catch (error) {
-      if (error?.code !== 'ENOENT') throw error;
+      if (error?.code !== 'ENOENT') throw qqStateError('state-read-failed', error);
+      this.#state = structuredClone(EMPTY_STATE);
+      await this.#persist();
+      return this;
+    }
+
+    let parsed;
+    try {
+      parsed = JSON.parse(bytes.toString('utf8'));
+    } catch (error) {
+      if (!(error instanceof SyntaxError)) throw error;
+      const backup = `${this.#path}.corrupt-${Date.now()}-${randomUUID()}`;
+      try {
+        // Copy the exact bytes before replacing anything. A failed rebuild
+        // leaves both the original and this exclusive backup available.
+        await fs.writeFile(backup, bytes, { flag: 'wx', mode: 0o600 });
+      } catch (cause) {
+        throw qqStateError('state-backup-failed', cause);
+      }
       this.#state = structuredClone(EMPTY_STATE);
       await this.#persist();
+      this.#logger.warn?.(`[dsh-im:qq] state-recovered: ${this.#path}; backup: ${backup}; conversation mappings, message deduplication and deferred deliveries have been reset.`);
+      return this;
     }
+    this.#state = normalizeState(parsed);
     return this;
   }
 
@@ -96,7 +122,7 @@ export class QqStateStore {
 
   async remove() {
     try {
-      await unlink(this.#path);
+      await fs.unlink(this.#path);
     } catch (error) {
       if (error?.code !== 'ENOENT') throw error;
     }
@@ -106,12 +132,12 @@ export class QqStateStore {
   async #persist() {
     const snapshot = `${JSON.stringify(this.#state, null, 2)}\n`;
     const operation = this.#writeQueue.then(async () => {
-      await mkdir(dirname(this.#path), { recursive: true, mode: 0o700 });
+      await fs.mkdir(dirname(this.#path), { recursive: true, mode: 0o700 });
       const temporary = `${this.#path}.tmp`;
-      await writeFile(temporary, snapshot, { encoding: 'utf8', mode: 0o600 });
-      await rename(temporary, this.#path);
+      await fs.writeFile(temporary, snapshot, { encoding: 'utf8', mode: 0o600 });
+      await fs.rename(temporary, this.#path);
     });
     this.#writeQueue = operation.then(() => undefined, () => undefined);
-    await operation;
+    await operation.catch(error => { throw qqStateError('state-write-failed', error); });
   }
 }

package/src/channels/shared/batch-input.mjs

@@ -33,6 +33,18 @@ function submissionPrompt(messages) {
   ].join('\n\n');
 }
 
+/**
+ * Session title for one submission.
+ *
+ * The submitted prompt is dsh-im's own composition -- a framing sentence plus
+ * `[消息 N]` labels -- so using it as the conversation title would put plugin
+ * text where the user's own words belong. The first collected message is what
+ * the user actually said first.
+ */
+function submissionTitle(messages) {
+  return messages.find((message) => message.trim()) ?? '';
+}
+
 export function isBatchInputCommand(text) {
   return commandName(text) !== null;
 }
@@ -73,7 +85,10 @@ export class BatchInputManager {
 
     if (!batch) {
       if (!name) return { handled: false };
-      if (!plainText) {
+      // Only starting a batch requires the plain-text command itself; /send and
+      // /cancel carry no content, so they must answer with their own state
+      // message instead of being refused as uncollectable content.
+      if (!plainText && name === 'batch') {
         return result('unsupported-content', t('批量输入命令仅支持纯文字，请移除图片、文件或引用消息后重试。'));
       }
       if (name === 'send') {
@@ -90,7 +105,11 @@ export class BatchInputManager {
       });
     }
 
-    if (!plainText && (batch.phase === 'collecting' || name)) {
+    // A command is never collected content: /send, /cancel and a repeated
+    // /batch must keep working even when the message that carries them is a
+    // quoted reply, an image caption or a file. Only the collected text itself
+    // has to be plain.
+    if (!plainText && batch.phase === 'collecting' && !name) {
       return result('unsupported-content', t(`批量输入模式目前仅支持文字，不支持图片、文件或引用消息，这条消息未收录。
 请继续发送文字，或使用 /send、/cancel。`), {
         count: batch.messages.length,
@@ -141,6 +160,7 @@ export class BatchInputManager {
         token,
         messages,
         prompt: submissionPrompt(messages),
+        title: submissionTitle(messages),
         count: messages.length,
       });
     }