@xmanrui/dsh-im 0.7.1 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xmanrui/dsh-im",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "通过扫码、App Manifest或机器人凭据把IM机器人接入DeepSeek Harness（支持飞书、微信、钉钉、企业微信、QQ、Slack、Telegram、Discord和WhatsApp）。",
   "license": "MIT",
   "type": "module",

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

@@ -8,6 +8,7 @@ import {
   harnessQuestionText,
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
+import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -123,7 +124,9 @@ export class DingtalkHarnessBridge {
   #queues = new Map();
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
+  #interactionTasks = new Set();
   #acceptedMessageIds = new Set();
+  #approvals;
 
   constructor({
     api,
@@ -149,6 +152,7 @@ export class DingtalkHarnessBridge {
     this.#state = state;
     this.#status = status;
     this.#logger = logger;
+    this.#approvals = new HarnessApprovalQueue({ label: 'DingTalk', logger });
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#maxMessageChars = maxMessageChars;
     this.#signal = signal;
@@ -179,7 +183,57 @@ export class DingtalkHarnessBridge {
       return Promise.resolve();
     }
 
+    let sessionWebhook = null;
+    try {
+      sessionWebhook = normalizeDingtalkSessionWebhook(message.sessionWebhook);
+    } catch {
+      // An unsafe reply route must never be able to submit an approval.
+    }
     const pending = this.#pendingInteractions.get(key);
+    const approvalReply = this.#approvals.claimReply({
+      key,
+      actor: sender,
+      messageId,
+      text: sessionWebhook && message?.msgtype === 'text'
+        ? nonEmptyString(message?.text?.content) ?? ''
+        : '',
+      addressed: String(message?.conversationType) !== '2' || message?.isInAtList === true,
+      hasPendingQuestion: Boolean(pending),
+      questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
+        ? pending.queue
+        : null,
+      isQuestionPending: () => this.#pendingInteractions.has(key),
+      send: sessionWebhook
+        ? (reply) => this.#send(sessionWebhook, reply)
+        : async () => undefined,
+    });
+    if (approvalReply) {
+      let current;
+      current = approvalReply.process(async () => {
+          if (this.#state.hasSeen(messageId)) return false;
+          await this.#state.markSeen(messageId);
+          increment(this.#status, 'messagesReceived');
+          this.#status.lastMessageAt = new Date().toISOString();
+          if (!sessionWebhook) {
+            increment(this.#status, 'messagesRejected');
+            this.#status.lastRejectedAt = new Date().toISOString();
+            this.#status.lastError = '钉钉消息没有安全的回复地址。';
+          }
+          return true;
+        })
+        .catch((error) => {
+          if (this.#signal?.aborted) return;
+          this.#status.lastError = '钉钉审批处理失败。';
+          this.#logger.error?.('[dsh-dingtalk] failed to process an approval reply', error);
+        })
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#interactionTasks.delete(current);
+        });
+      this.#interactionTasks.add(current);
+      return current;
+    }
+
     if (pending && pending.actor !== sender) {
       return this.#enqueueMessage(message, messageId, sender, key);
     }
@@ -233,6 +287,7 @@ export class DingtalkHarnessBridge {
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
         pending.queue ? [pending.queue] : []
       )),
+      ...this.#interactionTasks,
     ]);
   }
 
@@ -344,6 +399,7 @@ export class DingtalkHarnessBridge {
       }
     } finally {
       await this.#cancelPendingInteraction(key);
+      await this.#approvals.closeRoute(key);
     }
   }
 
@@ -475,8 +531,14 @@ export class DingtalkHarnessBridge {
     sessionWebhook,
     requiresMention,
   }) {
-    // The transport deliberately exposes every interaction kind. Approval is
-    // left unanswered until #5 adds its own policy and renderer.
+    if (await this.#approvals.handleRequested(interaction, {
+      key,
+      actor,
+      requiresMention,
+      send: (text) => this.#send(sessionWebhook, text),
+    })) return;
+
+    // Approval requests return above; the existing question state machine stays unchanged.
     if (interaction?.kind !== 'question') return;
     const questions = interaction?.payload?.questions;
     const interactionId = typeof interaction?.interactionId === 'string'
@@ -550,7 +612,8 @@ export class DingtalkHarnessBridge {
     await this.#presentInteraction(pending);
   }
 
-  #handleInteractionResolved(resolution) {
+  async #handleInteractionResolved(resolution) {
+    if (await this.#approvals.handleResolved(resolution)) return;
     const interactionId = resolution?.interactionId;
     if (resolution?.kind !== 'question' || typeof interactionId !== 'string') return;
     const key = this.#interactionKeys.get(interactionId);

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

@@ -108,7 +108,7 @@ export class DiscordApi {
         headers: {
           authorization: `Bot ${this.#token}`,
           'content-type': 'application/json',
-          'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 0.7.1)',
+          'user-agent': 'DeepSeek-Harness-dsh-im (https://github.com/xmanrui/dsh-im, 0.7.2)',
         },
         ...(body === undefined ? {} : { body: JSON.stringify(body) }),
         signal: requestSignal(signal, timeoutMs),

package/src/channels/feishu/bridge.mjs

@@ -10,6 +10,7 @@ import {
   harnessQuestionText,
   validHarnessQuestion,
 } from '../shared/harness-question.mjs';
+import { HarnessApprovalQueue } from '../shared/harness-approval.mjs';
 import { runWorkspaceCommand } from '../shared/workspace-command.mjs';
 import { askInWorkspaceSession } from '../shared/workspace-session.mjs';
 
@@ -67,6 +68,7 @@ export class FeishuHarnessBridge {
   #resolvedQuestionReplies = new Map();
   #acceptedMessageIds = new Set();
   #interactionTasks = new Set();
+  #approvals;
   #status;
   #allowedSenderOpenIds;
   #replyTimeoutMs;
@@ -95,6 +97,7 @@ export class FeishuHarnessBridge {
     this.#allowedSenderOpenIds = allowedSenderOpenIds;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#logger = logger;
+    this.#approvals = new HarnessApprovalQueue({ label: 'Feishu', logger });
     this.#signal = signal;
     ensureStatus(this.#status);
   }
@@ -138,6 +141,44 @@ export class FeishuHarnessBridge {
       return current;
     }
     const pending = this.#pendingInteractions.get(key);
+    const approvalReply = this.#approvals.claimReply({
+      key,
+      actor: senderOpenId(event),
+      messageId,
+      text: extractText(event) ?? '',
+      addressed: event?.message?.chat_type === 'p2p'
+        || (Array.isArray(event?.message?.mentions) && event.message.mentions.length > 0),
+      hasPendingQuestion: Boolean(pending),
+      questionCompletion: pending?.submitting || pending?.claimedReplyMessageId
+        ? pending.queue
+        : null,
+      isQuestionPending: () => this.#pendingInteractions.has(key),
+      send: (text) => this.#send(event.message.chat_id, text),
+    });
+    if (approvalReply) {
+      const processing = approvalReply.process(async () => {
+        if (this.#state.hasSeen(messageId)) return false;
+        await this.#state.markSeen(messageId);
+        this.#status.lastMessageAt = new Date().toISOString();
+        this.#status.messagesReceived += 1;
+        return true;
+      });
+      let current;
+      current = processing
+        .then(() => this.#finishReaction(messageId, processingReaction, 'DONE'))
+        .catch((error) => this.#handleMessageFailure(
+          event,
+          messageId,
+          processingReaction,
+          error,
+        ))
+        .finally(() => {
+          this.#acceptedMessageIds.delete(messageId);
+          this.#interactionTasks.delete(current);
+        });
+      this.#interactionTasks.add(current);
+      return current;
+    }
     if (pending && senderOpenId(event) !== pending.actor) {
       return this.#enqueueMessage(event, messageId, key, processingReaction);
     }
@@ -290,6 +331,7 @@ export class FeishuHarnessBridge {
       this.#status.lastError = null;
     } finally {
       await this.#cancelPendingInteraction(key);
+      await this.#approvals.closeRoute(key);
     }
   }
 
@@ -490,8 +532,14 @@ export class FeishuHarnessBridge {
     chatId,
     requiresMention,
   }) {
-    // Approval is deliberately exposed by the transport but remains
-    // unanswered until #5 adds an authenticated policy and renderer.
+    if (await this.#approvals.handleRequested(interaction, {
+      key,
+      actor,
+      requiresMention,
+      send: (text) => this.#send(chatId, text),
+    })) return;
+
+    // Approval requests return above; the existing question state machine stays unchanged.
     if (interaction?.kind !== 'question') return;
     const questions = interaction?.payload?.questions;
     const interactionId = typeof interaction?.interactionId === 'string'
@@ -566,7 +614,8 @@ export class FeishuHarnessBridge {
     await this.#presentInteraction(pending);
   }
 
-  #handleInteractionResolved(resolution) {
+  async #handleInteractionResolved(resolution) {
+    if (await this.#approvals.handleResolved(resolution)) return;
     const interactionId = resolution?.interactionId;
     if (resolution?.kind !== 'question' || typeof interactionId !== 'string') return;
     const key = this.#interactionKeys.get(interactionId);

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

@@ -4,6 +4,7 @@ import {
   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 = '这个问题已在其他客户端处理，无需再次回答。';
@@ -65,6 +66,8 @@ export class QqHarnessBridge {
   #pendingInteractions = new Map();
   #interactionKeys = new Map();
   #acceptedMessageIds = new Set();
+  #approvalTasks = new Set();
+  #approvals;
 
   constructor({
     bot,
@@ -87,6 +90,7 @@ export class QqHarnessBridge {
     this.#logger = logger;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#signal = signal;
+    this.#approvals = new HarnessApprovalQueue({ label: 'qq', logger });
   }
 
   get status() {
@@ -104,6 +108,35 @@ export class QqHarnessBridge {
     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);
     }
@@ -152,6 +185,7 @@ export class QqHarnessBridge {
       ...[...this.#pendingInteractions.values()].flatMap((pending) => (
         pending.queue ? [pending.queue] : []
       )),
+      ...this.#approvalTasks,
     ]);
   }
 
@@ -247,7 +281,10 @@ export class QqHarnessBridge {
           },
         }));
       } finally {
-        await this.#cancelPendingInteraction(key);
+        await Promise.allSettled([
+          this.#cancelPendingInteraction(key),
+          this.#approvals.closeRoute(key),
+        ]);
       }
       if (stream) {
         try {
@@ -388,7 +425,14 @@ export class QqHarnessBridge {
     target,
     requiresMention,
   }) {
-    // Approval remains fail-closed until #5 adds an authenticated policy.
+    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'
@@ -461,7 +505,11 @@ export class QqHarnessBridge {
     await this.#presentInteraction(pending);
   }
 
-  #handleInteractionResolved(resolution) {
+  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);