@xmanrui/dsh-im 0.7.0 → 0.7.2

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

@@ -1,6 +1,14 @@
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
+import {
+  harnessAnswerForQuestion,
+  harnessQuestionText,
+  validHarnessQuestion,
+} from '../shared/harness-question.mjs';
+import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
+const INTERACTION_RESOLVED_TEXT = '这个问题已在其他客户端处理，无需再次回答。';
+
 const HELP_TEXT = [
   'QQ 机器人已连接 DeepSeek Harness。',
   '',
@@ -22,6 +30,17 @@ function safeText(message) {
   return typeof message?.content === 'string' ? message.content.trim() : '';
 }
 
+function nonEmptyString(value) {
+  return typeof value === 'string' && value.trim() ? value.trim() : null;
+}
+
+function canClaimInteractionReply(message, pending) {
+  return pending.questions[pending.index]
+    && nonEmptyString(message?.senderId) === pending.actor
+    && (message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE')
+    && nonEmptyString(safeText(message));
+}
+
 export function createQqBridgeStatus() {
   return {
     messagesReceived: 0,
@@ -42,7 +61,13 @@ export class QqHarnessBridge {
   #status;
   #logger;
   #replyTimeoutMs;
+  #signal;
   #queues = new Map();
+  #pendingInteractions = new Map();
+  #interactionKeys = new Map();
+  #acceptedMessageIds = new Set();
+  #approvalTasks = new Set();
+  #approvals;
 
   constructor({
     bot,
@@ -52,6 +77,7 @@ export class QqHarnessBridge {
     status = createQqBridgeStatus(),
     logger = console,
     replyTimeoutMs = 600_000,
+    signal,
   }) {
     if (!bot || typeof bot.sendText !== 'function') throw new TypeError('QQ bot client is required');
     if (!ownerUserOpenid) throw new TypeError('QQ scanner identity is required');
@@ -63,6 +89,8 @@ export class QqHarnessBridge {
     this.#status = status;
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
+    this.#signal = signal;
+    this.#approvals = new HarnessApprovalQueue({ label: 'qq', logger });
   }
 
   get status() {
@@ -70,12 +98,81 @@ export class QqHarnessBridge {
   }
 
   accept(message) {
+    if (this.#signal?.aborted) return Promise.resolve();
+    const messageId = nonEmptyString(message?.messageId);
+    const sender = nonEmptyString(message?.senderId);
+    if (!messageId || !sender || message?.senderIsBot === true
+      || !['c2c', 'group'].includes(message?.kind)
+      || this.#state.hasSeen(messageId)
+      || this.#acceptedMessageIds.has(messageId)) return Promise.resolve();
     const key = conversationKey(message);
+    this.#acceptedMessageIds.add(messageId);
+    const pending = this.#pendingInteractions.get(key);
+    const approval = this.#approvals.claimReply({
+      key,
+      actor: sender,
+      messageId,
+      text: safeText(message),
+      addressed: message.kind !== 'group' || message.rawEventType === 'GROUP_AT_MESSAGE_CREATE',
+      hasPendingQuestion: Boolean(pending),
+      questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
+        ? pending.queue
+        : null,
+      isQuestionPending: () => this.#pendingInteractions.has(key),
+      send: (text) => this.#bot.sendText(message.replyTarget, text),
+    });
+    if (approval) {
+      let task;
+      task = approval.process(async () => {
+          if (this.#state.hasSeen(messageId)) return false;
+          await this.#state.markSeen(messageId);
+          this.#status.messagesReceived += 1;
+          this.#status.lastMessageAt = new Date().toISOString();
+          return true;
+        })
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#approvalTasks.delete(task);
+        });
+      this.#approvalTasks.add(task);
+      return task;
+    }
+    if (pending && sender !== pending.actor) {
+      return this.#enqueueMessage(message, messageId, key);
+    }
+    if (pending?.submitting || pending?.claimedReplyMessageId) {
+      return this.#enqueueMessage(message, messageId, key);
+    }
+    if (pending) {
+      if (canClaimInteractionReply(message, pending)) {
+        pending.claimedReplyMessageId = messageId;
+      }
+      const previous = pending.queue ?? Promise.resolve();
+      const current = previous
+        .catch(() => undefined)
+        .then(() => this.#processInteractionReply(message, messageId, key, pending))
+        .catch((error) => this.#handleInteractionFailure(message, messageId, error))
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          if (pending.claimedReplyMessageId === messageId) pending.claimedReplyMessageId = null;
+          if (pending.queue === current) pending.queue = null;
+        });
+      pending.queue = current;
+      return current;
+    }
+    return this.#enqueueMessage(message, messageId, key);
+  }
+
+  #enqueueMessage(message, messageId, key, {
+    releaseMessageId = true,
+    alreadyRecorded = false,
+  } = {}) {
     const previous = this.#queues.get(key) ?? Promise.resolve();
     const current = previous
       .catch(() => undefined)
-      .then(() => this.#process(message))
+      .then(() => this.#process(message, key, { alreadyRecorded }))
       .finally(() => {
+        if (releaseMessageId) this.#acceptedMessageIds.delete(messageId);
         if (this.#queues.get(key) === current) this.#queues.delete(key);
       });
     this.#queues.set(key, current);
@@ -83,17 +180,26 @@ export class QqHarnessBridge {
   }
 
   async waitForIdle() {
-    await Promise.allSettled([...this.#queues.values()]);
+    await Promise.allSettled([
+      ...this.#queues.values(),
+      ...[...this.#pendingInteractions.values()].flatMap((pending) => (
+        pending.queue ? [pending.queue] : []
+      )),
+      ...this.#approvalTasks,
+    ]);
   }
 
-  async #process(message) {
-    const messageId = typeof message?.messageId === 'string' ? message.messageId : '';
-    const sender = typeof message?.senderId === 'string' ? message.senderId : '';
+  async #process(message, key, { alreadyRecorded = false } = {}) {
+    if (this.#signal?.aborted) return;
+    const messageId = nonEmptyString(message?.messageId);
+    const sender = nonEmptyString(message?.senderId);
     if (!messageId || !sender || message.senderIsBot === true) return;
-    if (!['c2c', 'group'].includes(message.kind) || this.#state.hasSeen(messageId)) return;
-
-    this.#status.messagesReceived += 1;
-    this.#status.lastMessageAt = new Date().toISOString();
+    if (!['c2c', 'group'].includes(message.kind)) return;
+    if (!alreadyRecorded) {
+      if (this.#state.hasSeen(messageId)) return;
+      this.#status.messagesReceived += 1;
+      this.#status.lastMessageAt = new Date().toISOString();
+    }
     if (this.#ownerUserOpenid !== '*' && sender !== this.#ownerUserOpenid) {
       this.#status.messagesRejected += 1;
       this.#status.lastRejectedAt = new Date().toISOString();
@@ -116,12 +222,11 @@ export class QqHarnessBridge {
         return;
       }
       if (command === '/status') {
-        await this.#harness.ensureRunning();
+        await this.#harness.ensureRunning({ signal: this.#signal });
         await this.#bot.sendText(target, 'QQ 机器人与 DeepSeek Harness 连接正常。');
         await this.#state.markSeen(messageId);
         return;
       }
-      const key = conversationKey(message);
       if (command === '/new') {
         await this.#state.clearSession(key);
         await this.#bot.sendText(target, '已开启新会话。请发送你的问题。');
@@ -146,23 +251,41 @@ export class QqHarnessBridge {
           this.#logger.warn?.('[dsh-im:qq] unable to start a QQ stream; using a text reply:', error);
         }
       }
-      const { answer } = await askInWorkspaceSession({
-        harness: this.#harness,
-        state: this.#state,
-        key,
-        text,
-        askOptions: {
-          timeoutMs: this.#replyTimeoutMs,
-          onUpdate: stream ? async (update) => {
-            const progress = update.type === 'text'
-              ? update.text
-              : update.type === 'tool'
-                ? `正在使用${update.name}…`
-                : update.text;
-            if (progress) await stream.update(progress);
-          } : undefined,
-        },
-      });
+      let answer;
+      try {
+        ({ answer } = await askInWorkspaceSession({
+          harness: this.#harness,
+          state: this.#state,
+          key,
+          text,
+          createOptions: { signal: this.#signal },
+          existsOptions: { signal: this.#signal },
+          askOptions: {
+            timeoutMs: this.#replyTimeoutMs,
+            signal: this.#signal,
+            onUpdate: stream ? async (update) => {
+              const progress = update.type === 'text'
+                ? update.text
+                : update.type === 'tool'
+                  ? `正在使用${update.name}…`
+                  : update.text;
+              if (progress) await stream.update(progress);
+            } : undefined,
+            onInteraction: (interaction) => this.#handleInteraction(interaction, {
+              key,
+              actor: sender,
+              target,
+              requiresMention: message.kind === 'group',
+            }),
+            onInteractionResolved: (resolution) => this.#handleInteractionResolved(resolution),
+          },
+        }));
+      } finally {
+        await Promise.allSettled([
+          this.#cancelPendingInteraction(key),
+          this.#approvals.closeRoute(key),
+        ]);
+      }
       if (stream) {
         try {
           await stream.update(answer);
@@ -179,6 +302,7 @@ export class QqHarnessBridge {
       this.#status.lastReplyAt = new Date().toISOString();
       this.#status.lastError = null;
     } catch (error) {
+      if (this.#signal?.aborted) return;
       this.#status.lastError = error?.message ?? String(error);
       this.#logger.error?.('[dsh-im:qq] failed to process an inbound message:', error);
       try {
@@ -189,4 +313,280 @@ export class QqHarnessBridge {
       }
     }
   }
+
+  async #processInteractionReply(message, messageId, key, expected) {
+    this.#signal?.throwIfAborted();
+    const current = this.#pendingInteractions.get(key);
+    const claimed = expected.claimedReplyMessageId === messageId;
+    if (!current || current !== expected || current.submitting) {
+      if (claimed && (!current || current !== expected)) {
+        return this.#discardResolvedInteractionReply(message, messageId);
+      }
+      return this.#enqueueMessage(message, messageId, key, { releaseMessageId: false });
+    }
+    if (this.#state.hasSeen(messageId)) return;
+    await this.#state.markSeen(messageId);
+    this.#status.messagesReceived += 1;
+    this.#status.lastMessageAt = new Date().toISOString();
+
+    if (message.kind === 'group' && message.rawEventType !== 'GROUP_AT_MESSAGE_CREATE') return;
+    const text = nonEmptyString(safeText(message));
+    if (!text) {
+      await this.#bot.sendText(message.replyTarget, '请用文字回答当前问题。');
+      return;
+    }
+
+    const pending = this.#pendingInteractions.get(key);
+    if (!pending || pending !== expected || pending.submitting) {
+      if (claimed && (!pending || pending !== expected)) {
+        await this.#bot.sendText(message.replyTarget, INTERACTION_RESOLVED_TEXT);
+        return;
+      }
+      return this.#enqueueMessage(message, messageId, key, {
+        releaseMessageId: false,
+        alreadyRecorded: true,
+      });
+    }
+    pending.target = message.replyTarget;
+    if (pending.needsPresentation) {
+      try {
+        await this.#presentInteraction(pending);
+      } catch {
+        this.#status.lastError = 'QQ 交互问题发送失败。';
+        this.#logger.error?.('[dsh-im:qq] failed to retry an interaction question');
+        pending.interaction.reconnect?.();
+        return;
+      }
+      const presentedPending = this.#pendingInteractions.get(key);
+      if (!presentedPending || presentedPending !== expected || presentedPending.submitting) {
+        if (claimed && (!presentedPending || presentedPending !== expected)) {
+          await this.#bot.sendText(message.replyTarget, INTERACTION_RESOLVED_TEXT)
+            .catch(() => undefined);
+          return;
+        }
+        return this.#enqueueMessage(message, messageId, key, {
+          releaseMessageId: false,
+          alreadyRecorded: true,
+        });
+      }
+    }
+
+    const question = pending.questions[pending.index];
+    if (!question) return;
+    pending.answers.push(harnessAnswerForQuestion(question, text));
+    pending.index += 1;
+    if (pending.index < pending.questions.length) {
+      if (pending.claimedReplyMessageId === messageId) {
+        pending.claimedReplyMessageId = null;
+      }
+      pending.needsPresentation = true;
+      try {
+        await this.#presentInteraction(pending);
+      } catch {
+        this.#status.lastError = 'QQ 交互问题发送失败。';
+        this.#logger.error?.('[dsh-im:qq] failed to send the next interaction question');
+        pending.interaction.reconnect?.();
+      }
+      return;
+    }
+
+    pending.submitting = true;
+    try {
+      await pending.interaction.respond({
+        ok: true,
+        value: {
+          sessionId: pending.sessionId,
+          answer: { answers: pending.answers },
+        },
+      });
+      this.#clearPendingInteraction(key, pending.interactionId);
+      this.#status.lastError = null;
+    } catch (error) {
+      if (this.#signal?.aborted) return;
+      if (error?.code === 'interaction-not-pending') {
+        this.#clearPendingInteraction(key, pending.interactionId);
+        await this.#bot.sendText(pending.target, INTERACTION_RESOLVED_TEXT).catch(() => undefined);
+        return;
+      }
+      if (this.#pendingInteractions.get(key) !== pending) return;
+      pending.submitting = false;
+      pending.answers.pop();
+      pending.index -= 1;
+      this.#status.lastError = '回答提交失败。';
+      this.#logger.error?.('[dsh-im:qq] failed to answer a Harness interaction');
+      await this.#bot.sendText(pending.target, '回答提交失败，请重新发送当前问题的答案。')
+        .catch(() => undefined);
+    }
+  }
+
+  async #handleInteraction(interaction, {
+    key,
+    actor,
+    target,
+    requiresMention,
+  }) {
+    if (interaction?.kind === 'approval') {
+      return this.#approvals.handleRequested(interaction, {
+        key,
+        actor,
+        requiresMention,
+        send: (text) => this.#bot.sendText(target, text),
+      });
+    }
+    if (interaction?.kind !== 'question') return;
+    const questions = interaction?.payload?.questions;
+    const interactionId = typeof interaction?.interactionId === 'string'
+      ? interaction.interactionId
+      : interaction?.rpcId;
+    if (typeof interaction?.rpcId !== 'string'
+      || typeof interactionId !== 'string'
+      || typeof interaction.sessionId !== 'string'
+      || !Array.isArray(questions)
+      || questions.length === 0
+      || questions.some((question) => !validHarnessQuestion(question))) {
+      this.#logger.warn?.('[dsh-im:qq] ignored an invalid Harness question interaction');
+      return;
+    }
+
+    if (interaction.recovered === true) {
+      await interaction.respond({
+        ok: false,
+        error: {
+          code: 'cancelled',
+          message: 'QQ safely cancelled an interaction left by an earlier client.',
+          details: {},
+        },
+      });
+      await this.#bot.sendText(
+        target,
+        '检测到这个 Session 中遗留的待回答问题，已安全取消并继续处理你刚才的消息。',
+      ).catch(() => undefined);
+      return;
+    }
+
+    const existing = this.#pendingInteractions.get(key);
+    if (existing?.interactionId === interactionId) {
+      existing.interaction = interaction;
+      if (existing.needsPresentation) await this.#presentInteraction(existing);
+      return;
+    }
+    if (this.#interactionKeys.has(interactionId)) return;
+    if (existing) {
+      await interaction.respond({
+        ok: false,
+        error: {
+          code: 'cancelled',
+          message: 'QQ is already handling another user interaction.',
+          details: {},
+        },
+      });
+      return;
+    }
+
+    const pending = {
+      kind: 'question',
+      interactionId,
+      sessionId: interaction.sessionId,
+      interaction,
+      actor,
+      requiresMention,
+      questions,
+      answers: [],
+      index: 0,
+      target,
+      queue: null,
+      claimedReplyMessageId: null,
+      presentationPromise: null,
+      submitting: false,
+      needsPresentation: true,
+    };
+    this.#pendingInteractions.set(key, pending);
+    this.#interactionKeys.set(interactionId, key);
+    await this.#presentInteraction(pending);
+  }
+
+  async #handleInteractionResolved(resolution) {
+    if (resolution?.kind === 'approval') {
+      await this.#approvals.handleResolved(resolution);
+      return;
+    }
+    const interactionId = resolution?.interactionId;
+    if (resolution?.kind !== 'question' || typeof interactionId !== 'string') return;
+    const key = this.#interactionKeys.get(interactionId);
+    if (!key) return;
+    this.#clearPendingInteraction(key, interactionId);
+  }
+
+  #presentInteraction(pending) {
+    if (!pending.needsPresentation) return Promise.resolve();
+    if (pending.presentationPromise) return pending.presentationPromise;
+    const question = pending.questions[pending.index];
+    if (!question) return Promise.resolve();
+    const presentation = this.#bot.sendText(
+      pending.target,
+      harnessQuestionText(
+        question,
+        pending.index,
+        pending.questions.length,
+        { requiresMention: pending.requiresMention },
+      ),
+    ).then(() => {
+      pending.needsPresentation = false;
+    }).finally(() => {
+      if (pending.presentationPromise === presentation) pending.presentationPromise = null;
+    });
+    pending.presentationPromise = presentation;
+    return presentation;
+  }
+
+  async #discardResolvedInteractionReply(message, messageId) {
+    if (this.#state.hasSeen(messageId)) return;
+    await this.#state.markSeen(messageId);
+    this.#status.messagesReceived += 1;
+    this.#status.lastMessageAt = new Date().toISOString();
+    await this.#bot.sendText(message.replyTarget, INTERACTION_RESOLVED_TEXT).catch(() => undefined);
+  }
+
+  #takePendingInteraction(key, interactionId) {
+    const pending = this.#pendingInteractions.get(key);
+    if (!pending
+      || (interactionId !== undefined && pending.interactionId !== interactionId)) return null;
+    this.#pendingInteractions.delete(key);
+    this.#interactionKeys.delete(pending.interactionId);
+    return pending;
+  }
+
+  #clearPendingInteraction(key, interactionId) {
+    return this.#takePendingInteraction(key, interactionId) !== null;
+  }
+
+  async #cancelPendingInteraction(key) {
+    const pending = this.#takePendingInteraction(key);
+    if (!pending || pending.kind !== 'question') return;
+    try {
+      await pending.interaction.respond({
+        ok: false,
+        error: {
+          code: 'cancelled',
+          message: 'The QQ interaction ended before the user answered.',
+          details: {},
+        },
+      }, { signal: AbortSignal.timeout(5_000) });
+    } catch (error) {
+      if (error?.code !== 'interaction-not-pending') {
+        this.#logger.warn?.('[dsh-im:qq] failed to cancel a pending Harness interaction');
+      }
+    }
+  }
+
+  async #handleInteractionFailure(message, messageId, error) {
+    if (this.#signal?.aborted) return;
+    this.#status.lastError = error?.message ?? String(error);
+    this.#logger.error?.('[dsh-im:qq] failed to process an interaction reply:', error);
+    if (!this.#state.hasSeen(messageId)) {
+      await this.#state.markSeen(messageId).catch(() => undefined);
+    }
+    await this.#bot.sendText(message.replyTarget, '消息处理失败，请稍后重试。')
+      .catch(() => undefined);
+  }
 }

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

@@ -101,6 +101,8 @@ export class QqRuntime {
     if (!bot || typeof bot.start !== 'function' || typeof bot.stop !== 'function') {
       throw new TypeError('QQ bot factory returned an invalid client');
     }
+    const controller = new AbortController();
+    this.#abortController = controller;
     this.#bot = bot;
     this.#bridge = new QqHarnessBridge({
       bot,
@@ -110,6 +112,7 @@ export class QqRuntime {
       status: this.#status,
       logger: this.#logger,
       replyTimeoutMs: this.#replyTimeoutMs,
+      signal: controller.signal,
     });
     bot.use?.(this.#typingMiddleware({
       keepAlive: true,
@@ -117,8 +120,6 @@ export class QqRuntime {
         || ctx?.message?.senderId === this.#config.ownerUserOpenid,
     }));
 
-    const controller = new AbortController();
-    this.#abortController = controller;
     let readyResolve;
     let readyReject;
     const ready = new Promise((resolve, reject) => {
@@ -141,7 +142,17 @@ export class QqRuntime {
         this.#logger.warn?.(`[dsh-im:qq] bot ${this.#config.botId} connection error:`, error);
       }
     };
-    const onMessage = (_ctx, message) => this.#bridge?.accept(message);
+    const onMessage = (_ctx, message) => {
+      const task = this.#bridge?.accept(message);
+      if (!task) return;
+      void task.catch((error) => {
+        if (controller.signal.aborted) return;
+        this.#logger.error?.(
+          `[dsh-im:qq] bot ${this.#config.botId} message handling failed:`,
+          error,
+        );
+      });
+    };
     bot.on('ready', onReady);
     bot.on('resumed', onReady);
     bot.on('error', onError);