@xmanrui/dsh-im 4.35.1 → 4.36.0

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

@@ -70,6 +70,9 @@ export default {
   '已批准，仅对本次操作有效。':
     'Approved — valid for this operation only.',
   '已拒绝此次操作。': 'This operation was rejected.',
+  '机器人端无法处理这次审批，请到 Web 查看。': 'The bot cannot handle this approval. Please check the Web interface.',
+  '未找到可处理端，本次操作未获批准。': 'No approval interface is available. This operation was not approved.',
+  '有操作在等待审批：{tool}，请到 Web 处理。': 'An operation is awaiting approval: {tool}. Please handle it in the Web interface.',
   '无法完整展示这次操作，已安全拒绝此次审批。':
     'The operation could not be displayed in full, so this approval was safely rejected.',
   '审批提交失败，请重新回复「批准」或「拒绝」。':

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

@@ -1381,6 +1381,12 @@ export class TextHarnessBridge {
     });
   }
 
+  async presentSessionSyncApproval(interaction, context, options = {}) {
+    return this.#approvals.handleSessionSyncRequested(interaction, context, {
+      ...options, runtimeSignal: this.#signal ?? options.runtimeSignal, accessPolicy: this.#accessPolicy,
+    });
+  }
+
   async #handleInteraction(interaction, {
     key,
     actor,

package/src/channels/shared/token-bot-controller.mjs

@@ -247,6 +247,22 @@ export class TokenBotController {
     });
   }
 
+  async presentSessionSyncApproval(botId, target, interaction, options = {}) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error(`Unknown ${this.#descriptor.label} bot`);
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.presentSessionSyncApproval !== 'function') {
+        const error = new Error(t('{label}机器人尚未连接', {
+          label: this.#descriptor.label,
+        }));
+        error.code = 'bot-not-connected';
+        throw error;
+      }
+      return runtime.presentSessionSyncApproval(target, interaction, options);
+    });
+  }
+
   async deleteBot(botId) {
     const warnings = [];
     const config = this.#configStore.get(botId);

package/src/channels/slack/manifest.mjs

@@ -21,6 +21,7 @@ oauth_config:
       - files:read
       - files:write
       - groups:history
+      - im:read
       - im:history
       - mpim:history
       - reactions:write

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

@@ -234,6 +234,13 @@ export class SlackApi {
     });
   }
 
+  async conversationInfo({ channelId, signal } = {}) {
+    const value = await this.#request('conversations.info', {
+      tokenKind: 'bot', signal, body: { channel: slackId(channelId, 'channel id') },
+    });
+    return value.channel;
+  }
+
   async fileInfo({ fileId, signal } = {}) {
     const value = await this.#request('files.info', {
       tokenKind: 'bot',

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

@@ -207,6 +207,20 @@ export class SlackController {
     });
   }
 
+  async presentSessionSyncApproval(botId, target, interaction, options = {}) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error('Unknown Slack bot');
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.presentSessionSyncApproval !== 'function') {
+        const error = new Error(t('Slack机器人尚未连接'));
+        error.code = 'bot-not-connected';
+        throw error;
+      }
+      return runtime.presentSessionSyncApproval(target, interaction, options);
+    });
+  }
+
   async deleteBot(botId) {
     const warnings = [];
     const config = this.#configStore.get(botId);

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

@@ -473,6 +473,18 @@ export class SlackRuntime {
     return this.#bridge.sendConnectionTest(text);
   }
 
+  async presentSessionSyncApproval(target, interaction, options = {}) {
+    if (!this.#status.ready || !this.#bridge) return false;
+    const channelId = target?.route?.channelId;
+    const channel = await this.#api.conversationInfo({ channelId, signal: options.signal });
+    const actor = channel?.is_im === true && typeof channel.user === 'string' ? channel.user : '';
+    if (!actor) return false;
+    return this.#bridge.presentSessionSyncApproval(interaction, {
+      key: options.key, actor, validate: options.validate,
+      send: (text) => this.sendProactiveText(target, text),
+    }, options);
+  }
+
   async sendProactiveText(target, text, options = {}) {
     if (!this.#status.ready || !this.#bridge) {
       const error = new Error('Slack bot is not connected');

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

@@ -1171,6 +1171,16 @@ export class TelegramRuntime {
     return this.#bridge.sendConnectionTest(text);
   }
 
+  async presentSessionSyncApproval(target, interaction, options = {}) {
+    if (!this.#status.ready || !this.#bridge) return false;
+    const actor = typeof target?.route?.chatId === 'string' ? target.route.chatId.trim() : '';
+    if (!actor) return false;
+    return this.#bridge.presentSessionSyncApproval(interaction, {
+      key: options.key, actor, validate: options.validate,
+      send: (text) => this.sendProactiveText(target, text),
+    }, options);
+  }
+
   async sendProactiveText(target, text, options = {}) {
     if (!this.#status.ready || !this.#bridge) {
       const error = new Error('Telegram bot is not connected');

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

@@ -1668,6 +1668,12 @@ export class WecomHarnessBridge {
     }
   }
 
+  async presentSessionSyncApproval(interaction, context, options = {}) {
+    return this.#approvals.handleSessionSyncRequested(interaction, context, {
+      ...options, runtimeSignal: this.#signal, accessPolicy: this.#accessPolicy,
+    });
+  }
+
   async #handleInteraction(interaction, {
     key,
     actor,

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

@@ -281,6 +281,20 @@ export class WecomController {
     });
   }
 
+  async presentSessionSyncApproval(botId, target, interaction, options = {}) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error('Unknown Enterprise WeChat bot');
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.presentSessionSyncApproval !== 'function') {
+        const error = new Error(t('企业微信连接当前离线'));
+        error.code = 'bot-not-connected';
+        throw error;
+      }
+      return runtime.presentSessionSyncApproval(target, interaction, options);
+    });
+  }
+
   async deleteBot(botId) {
     const warnings = [];
     const config = this.#configStore.get(botId);

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

@@ -230,6 +230,16 @@ export class WecomRuntime {
     });
   }
 
+  async presentSessionSyncApproval(target, interaction, options = {}) {
+    if (!this.#status.ready || !this.#bridge) return false;
+    const actor = typeof target?.route?.chatId === 'string' ? target.route.chatId.trim() : '';
+    if (!actor) return false;
+    return this.#bridge.presentSessionSyncApproval(interaction, {
+      key: options.key, actor, validate: options.validate,
+      send: (text) => this.sendProactiveText(target, text),
+    }, options);
+  }
+
   async sendProactiveText(target, text, { signal } = {}) {
     const chatId = typeof target?.route?.chatId === 'string'
       ? target.route.chatId.trim() : '';

package/src/channels/wecom-app/wecom-app-bridge.mjs

@@ -855,6 +855,12 @@ export class WecomAppBridge {
     }
   }
 
+  async presentSessionSyncApproval(interaction, context, options = {}) {
+    return this.#approvals.handleSessionSyncRequested(interaction, context, {
+      ...options, runtimeSignal: this.#signal, accessPolicy: this.#accessPolicy,
+    });
+  }
+
   async #handleInteraction(interaction, { key, actor }) {
     if (interaction?.kind === 'approval') {
       return this.#approvals.handleRequested(interaction, {

package/src/channels/wecom-app/wecom-app-controller.mjs

@@ -290,6 +290,20 @@ export class WecomAppController {
     });
   }
 
+  async presentSessionSyncApproval(botId, target, interaction, options = {}) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error('Unknown Enterprise WeChat app bot');
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.presentSessionSyncApproval !== 'function') {
+        const error = new Error(t('企业微信应用当前离线'));
+        error.code = 'bot-not-connected';
+        throw error;
+      }
+      return runtime.presentSessionSyncApproval(target, interaction, options);
+    });
+  }
+
   async deleteBot(botId) {
     const warnings = [];
     const config = this.#configStore.get(botId);

package/src/channels/wecom-app/wecom-app-runtime.mjs

@@ -193,6 +193,16 @@ export class WecomAppRuntime {
     });
   }
 
+  async presentSessionSyncApproval(target, interaction, options = {}) {
+    if (!this.#started || !this.#bridge) return false;
+    const actor = typeof target?.route?.chatId === 'string' ? target.route.chatId.trim() : '';
+    if (!actor) return false;
+    return this.#bridge.presentSessionSyncApproval(interaction, {
+      key: options.key, actor, validate: options.validate,
+      send: (text) => this.sendProactiveText(target, text),
+    }, options);
+  }
+
   async sendProactiveText(target, text, { signal } = {}) {
     const chatId = typeof target?.route?.chatId === 'string' ? target.route.chatId.trim() : '';
     if ((target?.kind !== 'user') || !chatId) {

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

@@ -1102,6 +1102,12 @@ export class WeixinHarnessBridge {
     }
   }
 
+  async presentSessionSyncApproval(interaction, context, options = {}) {
+    return this.#approvals.handleSessionSyncRequested(interaction, context, {
+      ...options, runtimeSignal: this.#signal, accessPolicy: this.#accessPolicy,
+    });
+  }
+
   async #handleInteraction(interaction, {
     key,
     actor,

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

@@ -289,6 +289,20 @@ export class WeixinController {
     });
   }
 
+  async presentSessionSyncApproval(botId, target, interaction, options = {}) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error('Unknown Weixin account');
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.presentSessionSyncApproval !== 'function') {
+        const error = new Error(t('微信连接当前离线'));
+        error.code = 'bot-not-connected';
+        throw error;
+      }
+      return runtime.presentSessionSyncApproval(target, interaction, options);
+    });
+  }
+
   async deleteBot(botId) {
     const config = this.#configStore.get(botId);
     if (!config) throw weixinStageError('workspace-bot-not-found', undefined, 'account.remove');

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

@@ -392,6 +392,16 @@ export class WeixinRuntime {
     return result;
   }
 
+  async presentSessionSyncApproval(target, interaction, options = {}) {
+    if (!this.#status.ready || !this.#bridge) return false;
+    const actor = typeof target?.route?.toUserId === 'string' ? target.route.toUserId.trim() : '';
+    if (!actor) return false;
+    return this.#bridge.presentSessionSyncApproval(interaction, {
+      key: options.key, actor, validate: options.validate,
+      send: (text) => this.sendProactiveText(target, text),
+    }, options);
+  }
+
   async sendProactiveText(target, text, { signal } = {}) {
     const toUserId = typeof target?.route?.toUserId === 'string'
       ? target.route.toUserId.trim() : '';

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

@@ -248,6 +248,20 @@ export class WhatsappController {
     });
   }
 
+  async presentSessionSyncApproval(botId, target, interaction, options = {}) {
+    const config = this.#configStore.get(botId);
+    if (!config) throw new Error('Unknown WhatsApp bot');
+    return this.#withBotTransition(botId, async () => {
+      const runtime = this.#runtimes.get(botId);
+      if (!runtime?.status?.ready || typeof runtime.presentSessionSyncApproval !== 'function') {
+        const error = new Error(t('WhatsApp机器人尚未连接'));
+        error.code = 'bot-not-connected';
+        throw error;
+      }
+      return runtime.presentSessionSyncApproval(target, interaction, options);
+    });
+  }
+
   async setAccessPolicy(botId, value) {
     if (this.#closed) throw new Error('WhatsApp controller is closed');
     const accessPolicy = normalizeWhatsappAccessPolicy(value);

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

@@ -876,6 +876,16 @@ export class WhatsappRuntime {
     return { sent: true };
   }
 
+  async presentSessionSyncApproval(target, interaction, options = {}) {
+    if (!this.#status.ready || !this.#bridge) return false;
+    const actor = typeof target?.route?.jid === 'string' ? target.route.jid.trim() : '';
+    if (!actor) return false;
+    return this.#bridge.presentSessionSyncApproval(interaction, {
+      key: options.key, actor, validate: options.validate,
+      send: (text) => this.sendProactiveText(target, text),
+    }, options);
+  }
+
   async sendProactiveText(target, text, { signal } = {}) {
     const jid = typeof target?.route?.jid === 'string' ? target.route.jid.trim() : '';
     const validUser = target?.kind === 'user'