@xmanrui/dsh-im 4.34.0 → 4.34.2

package/src/channels/feishu/bridge.mjs

@@ -1,6 +1,7 @@
 import { isPermissionCommand, runPermissionCommand } from '../shared/permission-command.mjs';
 import { randomUUID } from 'node:crypto';
 import QRCode from 'qrcode';
+import { waitForFeishuOperation } from './feishu-channel.mjs';
 import {
   conversationKey,
   conversationScope,
@@ -77,6 +78,7 @@ import {
 import {
   channelDeliveryFailure,
   clearLastMessageFailure,
+  messageFailureDiagnostic,
   messageFailureText,
   setLastMessageFailure,
 } from '../shared/message-failure.mjs';
@@ -720,6 +722,7 @@ export class FeishuHarnessBridge {
   /** Conversation keys with an IM ask in flight (set BEFORE the turn starts). */
   #imTurnKeys = new Set();
   #cardDataTimeoutMs;
+  #requestTimeoutMs;
   /** When true, approval/question interactions render as Feishu cards (buttons). */
   #interactionCards = true;
 
@@ -744,6 +747,7 @@ export class FeishuHarnessBridge {
     repairPollIntervalMs = REPAIR_POLL_INTERVAL_MS,
     repairLinkWaitMs = REPAIR_LINK_WAIT_MS,
     cardDataTimeoutMs = CARD_DATA_TIMEOUT_MS,
+    requestTimeoutMs = 15_000,
     replyTimeoutMs = 600_000,
     interactionCards = true,
     sessionSyncTargetsFor = null,
@@ -766,7 +770,8 @@ export class FeishuHarnessBridge {
     }
     if (!Number.isFinite(repairPollIntervalMs) || repairPollIntervalMs <= 0
       || !Number.isFinite(repairLinkWaitMs) || repairLinkWaitMs <= 0
-      || !Number.isFinite(cardDataTimeoutMs) || cardDataTimeoutMs <= 0) {
+      || !Number.isFinite(cardDataTimeoutMs) || cardDataTimeoutMs <= 0
+      || !Number.isFinite(requestTimeoutMs) || requestTimeoutMs <= 0) {
       throw new TypeError('Feishu timing values must be positive numbers');
     }
     if (stepPushClock !== null
@@ -803,6 +808,7 @@ export class FeishuHarnessBridge {
     this.#repairPollIntervalMs = repairPollIntervalMs;
     this.#repairLinkWaitMs = repairLinkWaitMs;
     this.#cardDataTimeoutMs = cardDataTimeoutMs;
+    this.#requestTimeoutMs = requestTimeoutMs;
     this.#replyTimeoutMs = replyTimeoutMs;
     this.#interactionCards = interactionCards === true;
     this.#sessionSyncTargetsFor = typeof sessionSyncTargetsFor === 'function'
@@ -1411,11 +1417,20 @@ export class FeishuHarnessBridge {
     return current;
   }
 
+  #logAccessDenied(conversationType, reason) {
+    this.#logger.info?.('[dsh-feishu] inbound access denied', {
+      botId: this.#accessPolicy?.botId,
+      conversationType,
+      reason,
+    });
+  }
+
   #finishAccessDecision(event, messageId, access) {
     let current;
     current = Promise.resolve().then(async () => {
       if (this.#state.hasSeen(messageId)) return;
       await this.#state.markSeen(messageId);
+      this.#logAccessDenied(event.message.chat_type === 'p2p' ? 'direct' : 'group', access.reason);
       if (access.reason === 'command-not-allowed') {
         this.#status.lastMessageAt = new Date().toISOString();
         this.#status.messagesReceived += 1;
@@ -1484,7 +1499,7 @@ export class FeishuHarnessBridge {
     const failure = setLastMessageFailure(this.#status, error, { userMessage, reason });
     this.#logger?.[logLevel]?.(
       `[dsh-feishu] ${logLabel} failed [${failure.referenceId}]:`,
-      error?.message ?? String(error),
+      messageFailureDiagnostic(error, failure),
     );
     return failure;
   }
@@ -1659,6 +1674,7 @@ export class FeishuHarnessBridge {
           || (!hasImages && !hasFiles && NUMBER_REPLY.test(text) && this.#menus.has(key)),
       });
       if (!transcribedAccess.allowed) {
+        this.#logAccessDenied(event.message.chat_type === 'p2p' ? 'direct' : 'group', transcribedAccess.reason);
         if (transcribedAccess.reason === 'command-not-allowed') {
           await this.#send(
             event.message.chat_id,
@@ -2310,11 +2326,11 @@ export class FeishuHarnessBridge {
       isCommand: !isInteractionResponse,
     });
     if (!access.allowed) {
+      this.#logAccessDenied(conversationType, access.reason);
       if (access.reason === 'command-not-allowed') {
         return this.#send(route.chatId, t(COMMAND_PERMISSION_DENIED_MESSAGE))
           .catch(() => undefined);
       }
-      this.#logger.warn?.('[dsh-feishu] ignoring card action blocked by access policy');
       return Promise.resolve();
     }
     // A used card is recent even if it was first created long ago.
@@ -3117,6 +3133,14 @@ export class FeishuHarnessBridge {
     }
   }
 
+  #cardRequest(stage, operation) {
+    return waitForFeishuOperation(operation, {
+      signal: this.#signal,
+      timeoutMs: this.#requestTimeoutMs,
+      stage: `${stage} (${this.#requestTimeoutMs}ms)`,
+    });
+  }
+
   async #sendCard(chatId, cardJson, options = {}) {
     const updateMessageId = nonEmptyString(options.updateMessageId);
     const replyTo = nonEmptyString(options.replyTo);
@@ -3124,14 +3148,14 @@ export class FeishuHarnessBridge {
     // Session-sync cards target the user's openId (the synced DM is a user,
     // not a chat), delivered fresh without topic/thread handling.
     if (options.receiveIdType === 'open_id') {
-      const response = await this.#client.im.v1.message.create({
+      const response = await this.#cardRequest('card create', () => this.#client.im.v1.message.create({
         params: { receive_id_type: 'open_id' },
         data: {
           receive_id: chatId,
           msg_type: 'interactive',
           content: cardJson,
         },
-      });
+      }));
       if (response?.code && response.code !== 0) {
         throw new Error(`Feishu card send failed: ${response.msg || response.code}`);
       }
@@ -3142,10 +3166,10 @@ export class FeishuHarnessBridge {
 
     if (updateMessageId) {
       try {
-        const response = await this.#client.im.v1.message.patch({
+        const response = await this.#cardRequest('card patch', () => this.#client.im.v1.message.patch({
           path: { message_id: updateMessageId },
           data: { content: cardJson },
-        });
+        }));
         if (response?.code && response.code !== 0) {
           throw new Error(`Feishu card update failed: ${response.msg || response.code}`);
         }
@@ -3162,14 +3186,14 @@ export class FeishuHarnessBridge {
     const content = cardJson;
     if (replyTo) {
       try {
-        const response = await this.#client.im.v1.message.reply({
+        const response = await this.#cardRequest('card reply', () => this.#client.im.v1.message.reply({
           path: { message_id: replyTo },
           data: {
             msg_type: 'interactive',
             content,
             ...(this.#replyInThreadFor(replyTo) ? { reply_in_thread: true } : {}),
           },
-        });
+        }));
         if (response?.code && response.code !== 0) {
           throw new Error(`Feishu card reply failed: ${response.msg || response.code}`);
         }
@@ -3185,10 +3209,10 @@ export class FeishuHarnessBridge {
         this.#forgetTopicRoot(replyTo);
       }
     }
-    const response = await this.#client.im.v1.message.create({
+    const response = await this.#cardRequest('card create', () => this.#client.im.v1.message.create({
       params: { receive_id_type: 'chat_id' },
       data: { receive_id: chatId, msg_type: 'interactive', content: cardJson },
-    });
+    }));
     if (response?.code && response.code !== 0) {
       throw new Error(`Feishu card send failed: ${response.msg || response.code}`);
     }
@@ -4824,7 +4848,8 @@ export class FeishuHarnessBridge {
       );
       if (card.deliveryViaOpenId) {
         this.#logger.warn?.('[dsh-feishu] session-sync mirror card render failed:',
-          error?.message ?? String(error));
+          error?.message ?? String(error),
+          { sessionId: card.sessionSyncSessionId, turn: card.sessionSyncTurn });
       }
     }
   }
@@ -4875,6 +4900,7 @@ export class FeishuHarnessBridge {
       this.#logger.warn?.(
         '[dsh-feishu] step streaming card finish failed:',
         error?.message ?? String(error),
+        { sessionId: card.sessionSyncSessionId, turn: card.sessionSyncTurn },
       );
       return null;
     }
@@ -4925,10 +4951,10 @@ export class FeishuHarnessBridge {
   }
 
   async #patchStepCard(messageId, cardJson) {
-    const response = await this.#client.im.v1.message.patch({
+    const response = await this.#cardRequest('step card patch', () => this.#client.im.v1.message.patch({
       path: { message_id: messageId },
       data: { content: cardJson },
-    });
+    }));
     if (response?.code && response.code !== 0) {
       throw new Error(`Feishu step card patch failed: ${response.msg || response.code}`);
     }

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

@@ -80,12 +80,13 @@ function abortReason(signal) {
 }
 
 function operationTimeout(stage) {
-  const error = new Error(`Feishu file ${stage} timed out.`);
+  const error = new Error(`Feishu ${stage} timed out.`);
   error.code = 'provider-timeout';
   return error;
 }
 
-function waitForFileOperation(operation, { signal, timeoutMs, stage }) {
+// Bound the caller's wait even when the SDK does not honor cancellation.
+export function waitForFeishuOperation(operation, { signal, timeoutMs, stage = 'request' }) {
   signal?.throwIfAborted();
   const deadline = new AbortController();
   const operationSignal = signal
@@ -108,7 +109,10 @@ function waitForFileOperation(operation, { signal, timeoutMs, stage }) {
     const timer = setTimeout(() => deadline.abort(), timeoutMs);
     operationSignal.addEventListener('abort', onAbort, { once: true });
 
-    Promise.resolve().then(() => operation(operationSignal)).then(
+    Promise.resolve().then(() => {
+      operationSignal.throwIfAborted();
+      return operation(operationSignal);
+    }).then(
       (value) => finish(resolve, value),
       (error) => finish(reject, error),
     );
@@ -116,6 +120,10 @@ function waitForFileOperation(operation, { signal, timeoutMs, stage }) {
   });
 }
 
+function waitForFileOperation(operation, { stage, ...options }) {
+  return waitForFeishuOperation(operation, { ...options, stage: `file ${stage}` });
+}
+
 function deliveryUuid(file, chatId, messageType) {
   const seed = `${file.deliveryKey}\u0000${chatId}`;
   const digest = createHash('sha256')

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

@@ -2,7 +2,7 @@ import { createConnectionDiagnostics, atConnectionStage } from '../shared/connec
 import { randomUUID } from 'node:crypto';
 import { FeishuHarnessBridge } from './bridge.mjs';
 import { cardActionProbeCard } from './feishu-cards.mjs';
-import { VerifiedFeishuChannel } from './feishu-channel.mjs';
+import { VerifiedFeishuChannel, waitForFeishuOperation } from './feishu-channel.mjs';
 import { normalizeFeishuGroupResponseMode } from './group-response-mode.mjs';
 import { normalizeFeishuStepPushMode } from './step-push-mode.mjs';
 import { createVoice } from './voice.mjs';
@@ -367,6 +367,7 @@ export class FeishuRuntime {
         voice: this.#voice,
         sessionSyncTargetsFor: this.#sessionSyncTargetsFor,
         repair: this.#repair,
+        requestTimeoutMs: this.#requestTimeoutMs,
         replyTimeoutMs: this.#replyTimeoutMs,
         // Interaction cards (approval/question buttons) are on by default.
         // Set DSH_IM_INTERACTION_CARDS=0 to fall back to plain-text replies.
@@ -703,13 +704,20 @@ export class FeishuRuntime {
     const content = format === 'markdown'
       ? { schema: '2.0', body: { elements: [{ tag: 'markdown', content: text }] } }
       : { text };
-    const response = await this.#client.im.v1.message.create({
+    const activeSignal = signal
+      ? AbortSignal.any([signal, this.#abortController.signal])
+      : this.#abortController.signal;
+    const response = await waitForFeishuOperation(() => this.#client.im.v1.message.create({
       params: { receive_id_type: receiveIdType },
       data: {
         receive_id: receiveId,
         msg_type: format === 'markdown' ? 'interactive' : 'text',
         content: JSON.stringify(content),
       },
+    }), {
+      signal: activeSignal,
+      timeoutMs: this.#requestTimeoutMs,
+      stage: `proactive text send (${this.#requestTimeoutMs}ms)`,
     });
     if (response?.code && response.code !== 0) {
       const error = new Error(`Feishu proactive delivery failed: ${response.msg || response.code}`);

package/src/channels/shared/bot-workspace-store.mjs

@@ -2136,6 +2136,7 @@ export function createWorkspaceAwareController(controller, {
   stateFor,
   agentPresetCatalog,
   modelCatalog,
+  validateAccessPolicyForBot,
 } = {}) {
   if (!controller || !workspaces || typeof stateFor !== 'function') {
     throw new TypeError('controller, workspaces, and stateFor are required');
@@ -2289,6 +2290,9 @@ export function createWorkspaceAwareController(controller, {
         error.code = 'workspace-bot-not-found';
         throw error;
       }
+      // Channel-specific identity checks must finish before projecting or
+      // committing the new policy. Existing channels need no extra validation.
+      await validateAccessPolicyForBot?.(botId, policy);
       const [catalog, models] = await Promise.all([
         resolveAgentPresetCatalog(agentPresetCatalog),
         resolveModelCatalog(modelCatalog),

package/src/channels/shared/connection-error.mjs

@@ -6,7 +6,7 @@ import { t } from './i18n.mjs';
 const reported = new WeakMap();
 const lastReport = new WeakMap();
 const stages = new WeakMap();
-const OWNED_REASONS = { 'connect-timeout': 'timeout', 'telegram-timeout': 'timeout', 'cli-timeout': 'timeout', 'telegram-response-invalid': 'invalid-response', 'office-protocol-mismatch': 'invalid-response' };
+const OWNED_REASONS = { 'connect-timeout': 'timeout', 'telegram-timeout': 'timeout', 'cli-timeout': 'timeout', 'provider-timeout': 'timeout', 'telegram-response-invalid': 'invalid-response', 'office-protocol-mismatch': 'invalid-response' };
 const STANDARD_NAMES = new Set(['Error', 'TypeError', 'SyntaxError', 'AggregateError', 'DOMException', 'AxiosError', 'TimeoutError', 'AbortError']);
 const KNOWN_MESSAGES = {
   'discord-401': 'Discord Bot Token 无效，请重新填写。',
@@ -37,18 +37,24 @@ export function extractConnectionEvidence(error) {
   const { chain, truncated } = connectionErrorChain(error);
   const errors = chain.map(e => ({
     type: STANDARD_NAMES.has(e.name) ? e.name : 'Error',
+    // Host RPC adapters carry safe diagnostic facts without the original Error graph.
     ...normalizeDiagnosticDetails({
-      reason: OWNED_REASONS[e.code] ?? e.code ?? (e.name === 'TimeoutError' ? 'timeout' : e instanceof SyntaxError ? 'invalid-json' : undefined),
+      reason: e.details?.reason, reasons: e.details?.reasons,
+      httpStatus: e.details?.httpStatus, providerCode: e.details?.providerCode,
+    }),
+    ...normalizeDiagnosticDetails({
+      // DOMException TimeoutError has a numeric legacy code; its name is authoritative.
+      reason: OWNED_REASONS[e.code] ?? (e.name === 'TimeoutError' ? 'timeout' : e.code ?? (e instanceof SyntaxError ? 'invalid-json' : undefined)),
       httpStatus: e.status ?? e.statusCode ?? e.response?.status,
       providerCode: e.providerCode,
     }),
     hasCause: Boolean(e.cause && typeof e.cause === 'object'),
     hasErrors: Array.isArray(e.errors),
   }));
-  const allReasons = [...new Set(errors.map(e => e.reason).filter(r => r && !['unknown', 'multiple-causes'].includes(r)))];
+  const allReasons = [...new Set(errors.flatMap(e => e.reason === 'multiple-causes' ? e.reasons ?? [] : [e.reason]).filter(r => r && !['unknown', 'multiple-causes'].includes(r)))];
   const precise = allReasons.filter(r => !['timeout', 'http-error', 'provider-rejected', 'invalid-response'].includes(r));
   const reasons = precise.length ? precise : allReasons;
-  const first = field => chain.map(e => normalizeDiagnosticDetails({ [field]: e[field] })[field]).find(v => v !== undefined);
+  const first = field => chain.map(e => normalizeDiagnosticDetails({ [field]: e[field] ?? e.details?.[field] })[field]).find(v => v !== undefined);
   return {
     chain, errors,
     details: normalizeDiagnosticDetails({

package/src/channels/shared/i18n-en/feishu.mjs

@@ -1,5 +1,7 @@
 // English translations (feishu area). Keys are exact Chinese literals passed to t().
 export default {
+  '这里需要填写用户的 Open ID，不能填写机器人自己的 Open ID。':
+    'Enter a user Open ID here, not the bot’s own Open ID.',
   '已结束本轮提问，将在当前会话中继续处理图片。':
     'The questions have been closed. Your image will be processed in this conversation.',
   '图片已排队，但暂时无法结束当前提问。请先回答问题或发送 /stop，结束后会继续处理图片。':

package/src/channels/shared/i18n-en/shared-a.mjs

@@ -104,6 +104,10 @@ export default {
     'This message contains an image or file that cannot be processed. Adjust it and send it again.',
   '任务未完成，暂时无法确定原因。请重试；若持续发生，请将参考号提供给管理员。':
     'The task did not finish and the cause could not be determined. Try again; if it persists, give the reference ID to an administrator.',
+  '请求超时，当前操作结果尚未确认。请先检查任务状态或聊天记录，不要立即重复提交。':
+    'The request timed out and its outcome is unconfirmed. Check the task status or chat history before submitting it again.',
+  '网络请求失败，当前操作结果尚未确认。请先检查任务状态或聊天记录，不要立即重复提交。':
+    'The network request failed and its outcome is unconfirmed. Check the task status or chat history before submitting it again.',
   '错误码：{code}；参考号：{referenceId}': 'Error code: {code}; reference: {referenceId}',
   '{label}机器人': '{label} bot',
   '目前支持文字和图片消息。': 'Only text and image messages are supported at the moment.',

package/src/channels/shared/message-failure.mjs

@@ -1,4 +1,4 @@
-import { extractConnectionEvidence } from './connection-error.mjs';
+import { connectionHint, extractConnectionEvidence } from './connection-error.mjs';
 import { diagnosticFields } from './diagnostic-details.mjs';
 import { randomUUID } from 'node:crypto';
 
@@ -90,6 +90,10 @@ const FAILURE_MESSAGES = Object.freeze({
     '回复已经生成，但当前渠道暂时无法发送。请稍后重试。',
   INPUT_INVALID:
     '当前消息包含无法处理的图片或文件。请调整后重新发送。',
+  REQUEST_TIMEOUT:
+    '请求超时，当前操作结果尚未确认。请先检查任务状态或聊天记录，不要立即重复提交。',
+  NETWORK_ERROR:
+    '网络请求失败，当前操作结果尚未确认。请先检查任务状态或聊天记录，不要立即重复提交。',
   INTERNAL_UNKNOWN:
     '任务未完成，暂时无法确定原因。请重试；若持续发生，请将参考号提供给管理员。',
 });
@@ -156,16 +160,30 @@ function failureCode(error) {
     return 'CHANNEL_RATE_LIMIT';
   }
   if (['channel-delivery-uncertain', 'delivery-uncertain', 'artifact-delivery-uncertain']
-    .includes(code)) {
+    .includes(code) || error?.deliveryOutcome === 'unknown') {
     return 'CHANNEL_DELIVERY_UNCERTAIN';
   }
   if (code === 'channel-delivery-failed' || code.startsWith('artifact-')
-    || ['network-error', 'timeout'].includes(code)) {
+    || code === 'network-error') {
     return 'CHANNEL_DELIVERY';
   }
   return 'INTERNAL_UNKNOWN';
 }
 
+// Only refine the unknown fallback, using the same allowlisted evidence as the UI.
+// Mixed unrelated causes and cancellation do not establish a network diagnosis.
+function transportFailureCode(error, details) {
+  if (error?.name === 'AbortError' || error?.code === 'cancelled') return 'INTERNAL_UNKNOWN';
+  const reasons = details.reason === 'multiple-causes' ? details.reasons : [details.reason];
+  const timeout = reason => reason === 'timeout' || reason === 'ETIMEDOUT' || /_TIMEOUT$/u.test(reason);
+  if (reasons?.length && reasons.every(timeout)) return 'REQUEST_TIMEOUT';
+  const network = reason => timeout(reason) || [
+    'ENOTFOUND', 'EAI_AGAIN', 'ECONNREFUSED', 'ECONNRESET', 'EPIPE', 'UND_ERR_SOCKET',
+    'ENETUNREACH', 'EHOSTUNREACH', 'ERR_NETWORK_ACCESS_DENIED', 'ERR_PROXY_CONNECTION_FAILED',
+  ].includes(reason) || /CERT|TLS|SSL|ISSUER|SIGNATURE/u.test(reason);
+  return reasons?.length && reasons.every(network) ? 'NETWORK_ERROR' : 'INTERNAL_UNKNOWN';
+}
+
 function safeReferenceId(value) {
   return typeof value === 'string' && /^[A-Z0-9-]{6,40}$/u.test(value)
     ? value
@@ -185,13 +203,17 @@ export function classifyMessageFailure(error, {
 } = {}) {
   const safeReason = safeFailureReason(reason);
   const classifiedCode = failureCode(error);
-  const code = classifiedCode === 'INTERNAL_UNKNOWN'
+  const businessCode = classifiedCode === 'INTERNAL_UNKNOWN'
     && safeReason
     && typeof userMessage === 'string'
     && userMessage.trim()
     ? 'INPUT_INVALID'
     : classifiedCode;
   const details = extractConnectionEvidence(error).details;
+  const code = businessCode === 'INTERNAL_UNKNOWN'
+    ? transportFailureCode(error, details)
+    : businessCode;
+  if (code === 'REQUEST_TIMEOUT' || code === 'NETWORK_ERROR') details.hint = connectionHint(details);
   return Object.freeze({
     ...(code === 'INTERNAL_UNKNOWN' || details.reason !== 'unknown' || details.httpStatus || details.providerCode ? { details } : {}),
     code,

package/src/channels/shared/text-harness-bridge.mjs

@@ -936,12 +936,12 @@ export class TextHarnessBridge {
       const finalDeliveryUnknown = textReceipt?.deliveryOutcome === 'unknown';
       if (textReceipt?.deliveryOutcome === 'failed') {
         textDeliveryError = channelDeliveryFailure(
-          new Error(`Final text delivery failed (${textReceipt.reason ?? 'unknown'})`),
+          Object.assign(new Error('Final text delivery failed'), { code: textReceipt.reason }),
           { uncertain: false },
         );
       } else if (finalDeliveryUnknown) {
         textDeliveryError = channelDeliveryFailure(
-          new Error(`Final text delivery outcome is unknown (${textReceipt.reason ?? 'unknown'})`),
+          Object.assign(new Error('Final text delivery outcome is unknown'), { code: textReceipt.reason }),
         );
       }
       // A failed final text must not discard an already registered result file.