@xmanrui/dsh-im 4.13.0 → 4.15.0

package/src/channels/feishu/multi-bot-controller.mjs

@@ -91,6 +91,7 @@ function configuredBotFingerprint(config) {
     activated: config.activated,
     groupResponseMode: normalizeFeishuGroupResponseMode(config.groupResponseMode),
     groupTopicReply: config.groupTopicReply === true,
+    stepPush: config.stepPush === true,
     groupMessagePermissionGranted: config.groupMessagePermissionGranted === true,
     deletionPending: config.deletionPending === true,
     connectedAt: config.connectedAt ?? null,
@@ -599,6 +600,20 @@ export class MultiBotDshFeishuController {
     }));
   }
 
+  async updateStepPush(botId, stepPush) {
+    this.#assertOpen();
+    if (typeof stepPush !== 'boolean') {
+      throw new TypeError('Invalid Feishu step push flag');
+    }
+    return this.#serializeConfig(() => this.#withBotTransition(botId, async () => {
+      const config = this.#requireBot(botId);
+      const saved = await this.#configStore.saveBot({ ...config, stepPush });
+      this.#runtimes.get(botId)?.setStepPush?.(saved.stepPush);
+      this.#touch();
+      return this.status(botId);
+    }));
+  }
+
   async deleteBot(botId) {
     this.#assertOpen();
     return this.#serializeConfig(() => this.#withBotTransition(botId, async () => {
@@ -662,6 +677,7 @@ export class MultiBotDshFeishuController {
         configured: true,
         groupResponseMode: normalizeFeishuGroupResponseMode(config.groupResponseMode),
         groupTopicReply: config.groupTopicReply === true,
+        stepPush: config.stepPush === true,
         groupMessagePermissionGranted: config.groupMessagePermissionGranted === true,
         bot: publicBot(config),
         connection,

package/src/channels/feishu/plugin-config-store.mjs

@@ -46,6 +46,7 @@ function normalizeBot(value, { legacy = false } = {}) {
     activated: value.activated ?? null,
     groupResponseMode: normalizeFeishuGroupResponseMode(value.groupResponseMode),
     groupTopicReply: value.groupTopicReply === true,
+    stepPush: value.stepPush === true,
     groupMessagePermissionGranted: value.groupMessagePermissionGranted === true,
     deletionPending: value.deletionPending === true,
     connectedAt: cleanString(value.connectedAt),

package/src/channels/feishu/plugin-controller.mjs

@@ -6,6 +6,7 @@ export const FEISHU_SECRET_REF = 'DSH_FEISHU_APP_SECRET';
 export const REQUIRED_TENANT_SCOPES = Object.freeze([
   'im:message.p2p_msg:readonly',
   'im:message.group_at_msg:readonly',
+  'im:message.group_at_msg.include_bot:readonly',
   'im:message:readonly',
   'im:message:send_as_bot',
   'im:message.reactions:write_only',

package/src/channels/feishu/repair-manager.mjs

@@ -76,8 +76,8 @@ export function assertCallbackRepairUrl(value, expectedAppId, domain = 'feishu')
  * shares RegistrationManager's polling/state implementation while fixing the
  * update manifest in one place so callers can add only the card callback, the
  * message-read scope needed to download user-sent media, the resource scope
- * needed to upload bot-sent images/files, and the Slash Command scopes needed
- * for the native command panel, without adding unrelated scopes, events,
+ * needed to upload bot-sent images/files, the group bot-mention scope, and the
+ * Slash Command scopes for the native command panel, without adding unrelated scopes, events,
  * presets, or createOnly.
  */
 export class CallbackRepairManager {
@@ -116,6 +116,7 @@ export class CallbackRepairManager {
           tenant: [
             FEISHU_MESSAGE_READ_SCOPE,
             FEISHU_RESOURCE_SCOPE,
+            'im:message.group_at_msg.include_bot:readonly',
             ...SLASH_COMMAND_TENANT_SCOPES,
           ],
         },

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

@@ -161,7 +161,20 @@ function normalizeDeliveryTargets(value, { version } = {}) {
       if (!targets || typeof targets !== 'object' || Array.isArray(targets)) return null;
       const normalizedTargets = Object.create(null);
       for (const [targetId, target] of Object.entries(targets)) {
-        const normalized = normalizeDeliveryTarget(target, {
+        // Backward compatibility: some released builds persisted the target id
+        // inside the stored object as well. Accept a redundant targetId that
+        // matches the map key when loading a stored document; a mismatch stays
+        // invalid so a corrupted file still fails closed.
+        let candidate = target;
+        if (target && typeof target === 'object' && !Array.isArray(target)
+          && target.targetId !== undefined) {
+          if (target.targetId !== targetId) {
+            throw deliveryTargetError('invalid-target', 'Invalid target id');
+          }
+          const { targetId: _legacyTargetId, ...withoutLegacyId } = target;
+          candidate = withoutLegacyId;
+        }
+        const normalized = normalizeDeliveryTarget(candidate, {
           targetId,
           allowSessionSync: version >= CURRENT_DOCUMENT_VERSION,
         });

package/src/channels/shared/harness-client.mjs

@@ -590,6 +590,9 @@ export class HarnessReplyTracker {
         const text = assistantMessageText(event);
         const step = Number.isSafeInteger(event.data?.step) ? event.data.step : null;
         this.#assistantText.setCanonical(step, text);
+        // canonical 定稿且非空时按 step 透出，供分步推送消费方使用；
+        // 先于 commitText 透出，保持 text 更新作为批次末尾的既有语义。
+        if (text) pushUpdate({ type: 'assistant-message', step, text });
         this.#commitText(this.#assistantText.text, pushUpdate);
         continue;
       }
@@ -600,7 +603,19 @@ export class HarnessReplyTracker {
           ?? nonEmptyText(event.data?.subCallId);
         if (callId) this.#toolNames.set(callId, name);
         this.#lastToolName = name;
-        pushUpdate({ type: 'tool', name, ...(callId ? { callId } : {}) });
+        let argsText = null;
+        if (event.data?.arguments !== undefined && event.data?.arguments !== null) {
+          if (typeof event.data.arguments === 'string') {
+            argsText = event.data.arguments;
+          } else {
+            try {
+              argsText = JSON.stringify(event.data.arguments);
+            } catch {
+              argsText = undefined;
+            }
+          }
+        }
+        pushUpdate({ type: 'tool', name, ...(argsText ? { arguments: argsText } : {}), ...(callId ? { callId } : {}) });
       } else if (event.type === 'tool/result') {
         const callId = nonEmptyText(event.data?.message?.source?.callId)
           ?? nonEmptyText(event.data?.callId)
@@ -1562,7 +1577,11 @@ export class HarnessClient {
           lastPollSeq = tracker.lastSeq;
           if (seqAdvanced) lastProgressAt = Date.now();
           if (onUpdate) {
-            const visibleUpdates = progressMode === 'all' ? updates : updates.slice(-1);
+            // latest 模式只投递一条最新进展；assistant-message 是分步推送专用更新，
+            // 且 canonical 去重后可能成为批次唯一变化，绝不能冒充进度投给全部渠道。
+            const visibleUpdates = progressMode === 'all'
+              ? updates
+              : updates.filter((update) => update.type !== 'assistant-message').slice(-1);
             for (const update of visibleUpdates) {
               try {
                 await onUpdate(update);

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

@@ -72,8 +72,8 @@ export default {
   '旧授权链接已作废，已生成新的修复链接。':
     'The previous authorization link was invalidated and a new repair link was generated.',
   '🔧 准备补全权限与回调。': '🔧 Preparing to complete permissions and the callback.',
-  '本次会增量添加当前缺少项：卡片回调 card.action.trigger；飞书显示为“获取单聊、群组消息”的租户权限 im:message:readonly（用于读取用户消息中的图片或文件）；im:resource（用于上传机器人发送的图片或文件）；以及原生命令面板所需的 application:app_slash_command:read / write。确认页只会显示当前缺少的项；若出现上述范围之外的配置，请取消。':
-    'This incrementally adds the currently missing items: the card callback card.action.trigger; the tenant scope im:message:readonly, shown by Feishu as “Read direct and group messages” and used to read images or files in user messages; im:resource, used to upload images or files sent by the bot; and application:app_slash_command:read / write for the native command panel. The confirmation page shows only items the app is currently missing; cancel if anything outside this scope appears.',
+  '本次会增量添加当前缺少项：卡片回调 card.action.trigger；飞书显示为“获取单聊、群组消息”的租户权限 im:message:readonly（用于读取用户消息中的图片或文件）；im:resource（用于上传机器人发送的图片或文件）；im:message.group_at_msg.include_bot:readonly（用于接收群内其他机器人 @ 当前机器人的消息）；以及原生命令面板所需的 application:app_slash_command:read / write。确认页只会显示当前缺少的项；若出现上述范围之外的配置，请取消。':
+    'This incrementally adds the currently missing items: the card callback card.action.trigger; the tenant scope im:message:readonly, shown by Feishu as “Read direct and group messages” and used to read images or files in user messages; im:resource, used to upload images or files sent by the bot; im:message.group_at_msg.include_bot:readonly, used to receive group messages from other bots that mention this bot; and application:app_slash_command:read / write for the native command panel. The confirmation page shows only items the app is currently missing; cancel if anything outside this scope appears.',
   '当前设备直接打开：': 'Open directly on this device:',
   '若要用另一台设备扫码，发送 /repair qr。{expiry}。':
     'To scan with another device, send /repair qr. {expiry}.',
@@ -373,4 +373,6 @@ export default {
   '已请求停止后台任务。': 'Requested to stop the background task.',
   '无法安全停止后台任务，请在 Harness 中查看并停止对应任务。': 'Unable to safely stop the background task. Please inspect and stop the matching task in Harness.',
   '任务失败': 'Failed',
+  // feishu/bridge.mjs — step push context injection
+  '📎 已注入会话上下文': '📎 Context injected',
 };

package/src/channels/shared/semantic/artifact.mjs

@@ -46,7 +46,9 @@ function artifactError(code, message) {
 }
 
 function currentTurn(agent) {
-  const events = agent?.session?.events;
+  const events = typeof agent?.session?.snapshotEvents === 'function'
+    ? agent.session.snapshotEvents()
+    : agent?.session?.events;
   if (!Array.isArray(events)) return null;
   let turn = null;
   for (const event of events) {

package/src/channels/shared/session-channel-labels.mjs

@@ -0,0 +1,26 @@
+export const SESSION_CHANNEL_LABELS = Object.freeze(Object.fromEntries(Object.entries({
+  weixin: ['微信', 'WeChat'],
+  feishu: ['飞书', 'Feishu'],
+  dingtalk: ['钉钉', 'DingTalk'],
+  wecom: ['企业微信', 'WeCom'],
+  qq: ['QQ', 'QQ'],
+  slack: ['Slack', 'Slack'],
+  telegram: ['Telegram', 'Telegram'],
+  discord: ['Discord', 'Discord'],
+  whatsapp: ['WhatsApp', 'WhatsApp'],
+  office: ['AI Office', 'AI Office'],
+}).map(([channel, labels]) => [channel, Object.freeze(labels)])));
+
+/** Read only the exact, leading title prefix emitted by dsh-im. */
+export function parseSessionChannelTitle(title) {
+  if (typeof title !== 'string') return null;
+  for (const [channel, labels] of Object.entries(SESSION_CHANNEL_LABELS)) {
+    for (const label of labels) {
+      const prefix = `${label} · `;
+      if (title.startsWith(prefix) && title.slice(prefix.length).trim()) {
+        return { channel, title: title.slice(prefix.length) };
+      }
+    }
+  }
+  return null;
+}