@wenbin_wb/dsh-bridge 2.2.2 → 2.2.4

package/lib/platform/conversation-bridge.js

@@ -416,20 +416,24 @@ export class ConversationBridge {
     if (!sender) return 'ignored'
 
     if (!this.isAllowed(sender)) {
-      // 扫码即自动加入：白名单为空时，首个发消息的真实用户自动纳入白名单。
-      // 这是"登录后第一条消息即完成授权"的一步到位体验。
-      if (this.config.allowFrom.length === 0 && !isGroup) {
-        if (text?.trim()) {
-          this.config.allowFrom = [sender]
-          this.logger?.info?.(`[dsh-bridge ${this.platform.id}] auto-approved first sender ${sender} into allowlist (onboarding)`)
-          try {
-            await this.onFirstSender?.(sender)
-          } catch (err) {
-            this.logger?.warn?.(`[dsh-bridge ${this.platform.id}] failed to persist first sender: ${err instanceof Error ? err.message : String(err)}`)
-          }
-        } else {
-          this.logger?.info?.(`[dsh-bridge ${this.platform.id}] media-only first message from ${sender} not auto-approved (waiting for text)`)
+      // 自动授权：
+      //  - 单聊：白名单为空时，首个发消息的真实用户自动纳入白名单
+      //  - 群聊：首次 @机器人 的群自动纳入（群维度授权，群内成员均可使用）
+      // 这是"登录后第一条消息/首次被 @即完成授权"的一步到位体验。
+      const shouldAutoApprove = Boolean(text?.trim()) && (
+        this.config.allowFrom.length === 0 || // 白名单为空：单聊/群聊都自动授权
+        isGroup                                // 群聊：始终自动授权群
+      )
+      if (shouldAutoApprove) {
+        this.config.allowFrom = Array.from(new Set([...this.config.allowFrom, sender]))
+        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] auto-approved ${isGroup ? 'group' : 'sender'} ${sender} into allowlist`)
+        try {
+          await this.onFirstSender?.(sender)
+        } catch (err) {
+          this.logger?.warn?.(`[dsh-bridge ${this.platform.id}] failed to persist first sender: ${err instanceof Error ? err.message : String(err)}`)
         }
+      } else {
+        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] media-only first message from ${sender} not auto-approved (waiting for text)`)
       }
 
       // 如果仍未通过白名单，拒绝处理（防止绕过白名单）
@@ -439,8 +443,9 @@ export class ConversationBridge {
       }
     }
 
-    if (isGroup) {
-      this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore group message from ${sender} (v0.1: no group support)`)
+    // 仅在不支持群聊的平台忽略群消息（QQ 等支持群聊的平台放行）
+    if (isGroup && !this.platform?.capabilities?.supportsGroup) {
+      this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore group message from ${sender} (no group support)`)
       return 'ignored'
     }
 
@@ -852,6 +857,16 @@ async function routeCommand(node, text) {
       }
       return true
     }
+    case 'end': {
+      // 结束当前会话：停止 agent 并清除活动会话（进入"无活动会话"状态）
+      const agent = node.activeAgent()
+      if (agent) agent.cancel({ kind: 'user' })
+      node.activeSessionId = null
+      await node.onActiveSessionChange?.(null)
+      // 文本含"没有活动会话"→ 有按钮权限时附带快捷按钮；无按钮时文字指引也能操作
+      await node.sendText(`${node.mark.ok} 已结束当前会话（没有活动会话）。\n\n发送以下任一命令开始：\n/new <提示词> — 新建会话\n/sessions — 查看已有会话\n/help — 命令帮助`)
+      return true
+    }
     case 'status': {
       const agent = node.activeAgent()
       const session = node.activeSession()
@@ -954,6 +969,7 @@ function helpText() {
     '/new <提示词> @路径 — 在指定目录新建会话',
     '/new <提示词> @N — 用编号选择工作区（/workspaces）',
     '/stop — 停止当前任务',
+    '/end — 结束当前会话（回到无活动会话状态）',
     '/status — 查看状态',
     '/yes /no 或 1/2 — 回应权限请求',
     '/help — 本帮助',

package/lib/qq/gateway.js

@@ -6,16 +6,22 @@ import WebSocket from 'ws'
 
 const TOKEN_URL = 'https://bots.qq.com/app/getAppAccessToken'
 const API_BASE = 'https://api.bot.qq.com'
-const DEFAULT_GATEWAY = 'wss://api.sgroup.qq.com/websocket/'
+// 官方 WebSocket 网关地址（2026-08-10 起域名统一为 api.bot.qq.com）
+// 参考：https://bot.q.qq.com/wiki/develop/api-v2/dev-prepare/event-emit/websocket.html
+const DEFAULT_GATEWAY = 'wss://api.bot.qq.com/websocket/'
 const MAX_MESSAGE_CHARS = 2000
 const TOKEN_MARGIN_MS = 5 * 60_000
 const REQUEST_TIMEOUT_MS = 15_000
 const RECONNECT_DELAY_MS = 3000
 
 export const QQ_INTENTS = {
+  // 官方 Intent 表：C2C_MESSAGE_CREATE 与 GROUP_AT_MESSAGE_CREATE 同属 GROUP_AND_C2C_EVENT (1<<25)
+  // 参考：https://bot.q.qq.com/wiki/develop/api-v2/autogen/event/c2c_message_create.html
+  //       https://bot.q.qq.com/wiki/develop/api-v2/autogen/event/group_at_message_create.html
+  GROUP_AND_C2C_EVENT: 1 << 25,
   C2C_MESSAGE_CREATE: 1 << 25,
+  GROUP_AT_MESSAGE_CREATE: 1 << 25, // 之前误标 1<<30（无效值）
   INTERACTION_CREATE: 1 << 26,
-  GROUP_AT_MESSAGE_CREATE: 1 << 30,
   PUBLIC_GUILD_MESSAGES: 1 << 9,
   DIRECT_MESSAGE: 1 << 12,
 }
@@ -62,9 +68,12 @@ function normalizeEvent(payload) {
       text: stringValue(data.content).trim(),
       message: data,
       messageReference: data.message_reference,
+      msgSeq: data.msg_seq, // 用于避免去重
     }
   }
-  if (event === 'GROUP_AT_MESSAGE_CREATE') {
+  if (event === 'GROUP_AT_MESSAGE_CREATE' || event === 'GROUP_MESSAGE_CREATE') {
+    // GROUP_AT_MESSAGE_CREATE：用户@机器人触发；GROUP_MESSAGE_CREATE：开启"接收所有消息"后每条群消息
+    // 两者字段结构完全一致（官方文档），content 已去除 @机器人 前缀
     return {
       type: 'message', scope: 'group', event,
       id: data.id || data.msg_id,
@@ -74,6 +83,7 @@ function normalizeEvent(payload) {
       text: stringValue(data.content).trim(),
       message: data,
       messageReference: data.message_reference,
+      msgSeq: data.msg_seq, // 用于避免去重
     }
   }
   if (event === 'AT_MESSAGE_CREATE') {
@@ -93,6 +103,7 @@ function normalizeEvent(payload) {
       type: 'interaction', scope: data.group_openid ? 'group' : 'c2c', event,
       id: data.id,
       interactionId: data.id,
+      interactionType: Number(data.type), // 11=消息按钮回调, 12=快捷菜单回调, 13=消息反馈...
       senderId: data.group_member_openid || data.user_openid,
       peerId: data.group_openid || data.user_openid,
       groupId: data.group_openid,
@@ -133,7 +144,8 @@ export class QqGateway extends Service {
   get status() { return this.statusValue }
   get configured() { return Boolean(this.config.appId && this.config.clientSecret) }
   get capabilities() {
-    return { supportsGroup: true, supportsMedia: true, supportsVoice: true, supportsTyping: false, maxMessageChars: MAX_MESSAGE_CHARS }
+    // QQ 支持输入状态（msg_type=6 + input_notify）、群聊、富媒体
+    return { supportsGroup: true, supportsMedia: true, supportsVoice: true, supportsTyping: true, maxMessageChars: MAX_MESSAGE_CHARS }
   }
 
   setStatus(status) {
@@ -205,8 +217,10 @@ export class QqGateway extends Service {
       try {
         this.setStatus('starting')
         const token = await this.refreshAccessToken()
+        // 官方「获取带分片 WSS 接入点」接口，返回网关地址与建议分片数
+        // 参考：https://bot.q.qq.com/wiki/develop/api-v2/dev-prepare/event-emit/websocket.html
         const gateway = this.config.gatewayUrl
-          || ((await requestJson(`${API_BASE}/gateway`, { token, timeoutMs: this.config.apiTimeoutMs })).url)
+          || ((await requestJson(`${API_BASE}/gateway/bot`, { token, timeoutMs: this.config.apiTimeoutMs })).url)
           || DEFAULT_GATEWAY
         await this.connect(gateway, token)
       } catch (error) {
@@ -307,43 +321,43 @@ export class QqGateway extends Service {
   }
 
   async sendText(peerId, content, opts = {}) {
-    return this.api(this.endpoint(peerId, opts.scope), {
-      method: 'POST',
-      body: {
-        content: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
-        msg_type: 0,
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-      },
-    })
+    const body = {
+      content: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
+      msg_type: 0,
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(this.endpoint(peerId, opts.scope), { method: 'POST', body })
   }
 
   async sendMarkdown(peerId, markdown, opts = {}) {
-    return this.api(this.endpoint(peerId, opts.scope), {
-      method: 'POST',
-      body: {
-        markdown: typeof markdown === 'string' ? { content: markdown } : markdown,
-        keyboard: opts.keyboard,
-        msg_type: 2,
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-      },
-    })
+    const body = {
+      markdown: typeof markdown === 'string' ? { content: markdown } : markdown,
+      msg_type: 2,
+    }
+    // 只添加有值的可选字段
+    if (opts.keyboard !== undefined) body.keyboard = opts.keyboard
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(this.endpoint(peerId, opts.scope), { method: 'POST', body })
   }
 
   async sendKeyboard(peerId, content, keyboard, opts = {}) {
     // 官方文档：keyboard 为附加字段，配合 msg_type=0(content) 或 msg_type=2(markdown) 使用
     // 纯文本 + 键盘时使用 msg_type=0
-    return this.api(this.endpoint(peerId, opts.scope), {
-      method: 'POST',
-      body: {
-        content: stringValue(content),
-        keyboard,
-        msg_type: 0,
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-      },
-    })
+    const body = {
+      content: stringValue(content),
+      keyboard,
+      msg_type: 0,
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(this.endpoint(peerId, opts.scope), { method: 'POST', body })
   }
 
   async sendMedia(peerId, media, opts = {}) {
@@ -359,20 +373,19 @@ export class QqGateway extends Service {
 
   async sendStream(peerId, content, opts = {}) {
     const endpoint = this.endpoint(peerId, opts.scope, 'stream_messages')
-    return this.api(endpoint, {
-      method: 'POST',
-      body: {
-        content_type: opts.contentType || 'text',
-        content_raw: stringValue(content).slice(0, MAX_MESSAGE_CHARS),
-        input_mode: opts.inputMode || 'replace',
-        input_state: opts.inputState, // 1=生成中, 10=生成结束
-        index: opts.index, // 分片序号，从0递增
-        stream_msg_id: opts.streamMsgId, // 第一片由服务端返回，后续片需携带
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
-        msg_seq: opts.msgSeq,
-      },
-    })
+    const body = {
+      content_type: opts.contentType || 'text',
+      content_raw: stringValue(content), // 流式 replace 模式每片是全量前缀，不截断
+      input_mode: opts.inputMode || 'replace',
+      input_state: opts.inputState, // 1=生成中, 10=生成结束
+      index: opts.index, // 分片序号，从0递增
+    }
+    // 只添加有值的可选字段，避免 undefined 被序列化
+    if (opts.streamMsgId !== undefined) body.stream_msg_id = opts.streamMsgId
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(endpoint, { method: 'POST', body })
   }
 
   async respondInteraction(interactionId, response) {
@@ -386,18 +399,30 @@ export class QqGateway extends Service {
     // QQ Bot API v2 使用 msg_type: 6 发送输入状态通知
     // 参考：https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_users_user_openid_messages.post.html
     const endpoint = this.endpoint(peerId, opts.scope)
-    return this.api(endpoint, {
-      method: 'POST',
-      body: {
-        msg_type: 6,
-        input_notify: {
-          input_type: 1,
-          input_second: Math.min(opts.durationSeconds || 5, 60), // 最长60秒
-        },
-        msg_id: opts.msgId,
-        event_id: opts.eventId,
+    const body = {
+      msg_type: 6,
+      input_notify: {
+        input_type: 1,
+        input_second: Math.min(opts.durationSeconds || 5, 60), // 最长60秒
       },
-    })
+    }
+    // 只添加有值的可选字段
+    if (opts.msgId !== undefined) body.msg_id = opts.msgId
+    if (opts.eventId !== undefined) body.event_id = opts.eventId
+    if (opts.msgSeq !== undefined) body.msg_seq = opts.msgSeq
+    return this.api(endpoint, { method: 'POST', body })
+  }
+
+  /**
+   * 撤回机器人发送的消息（发送超过 2 分钟不可撤回）。
+   * 参考：https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_users_user_openid_messages_message_id.delete.html
+   * @param {string} peerId   用户/群 OpenID（u_xxx / g_xxx）
+   * @param {string} messageId 要撤回的消息 ID
+   * @param {object} [opts]   { scope }
+   */
+  async withdrawMessage(peerId, messageId, opts = {}) {
+    const endpoint = `${this.endpoint(peerId, opts.scope)}/${encodeURIComponent(messageId)}`
+    return this.api(endpoint, { method: 'DELETE' })
   }
 
   // ---- 自定义菜单（单聊底部菜单，全局生效）----

package/lib/qq/index.js

@@ -60,7 +60,7 @@ export class QqService extends Platform {
       sendChunkDelayMs: config.sendChunkDelayMs,
       activeSessionId: config.activeSessionId,
     }, logger, {
-      onFirstSender: (senderId) => this.persist({ allowFrom: [senderId] }),
+      onFirstSender: () => this.persist({ allowFrom: [...(this.node?.config?.allowFrom ?? [])] }),
       onActiveSessionChange: (sessionId) => this.persist({ activeSessionId: sessionId }),
     })
     this.bridge = this.node
@@ -240,14 +240,23 @@ export class QqService extends Platform {
     }
 
     // 自定义菜单：单聊底部菜单（send_message 类型，点击自动填入命令）
+    // 幂等：先查询，内容一致则跳过 PUT，避免每次重启都覆盖（version 递增）
     try {
       const menuItems = [
         { name: '新建', type: 'send_message', send_message: '/new' },
         { name: '列表', type: 'send_message', send_message: '/list' },
         { name: '帮助', type: 'send_message', send_message: '/help' },
       ]
-      await gate.setMenu(menuItems)
-      this.logger.info('[dsh-bridge qq] custom menu configured')
+      const existing = await gate.getMenu()
+      const existingItems = existing?.menu?.items || []
+      const same = existingItems.length === menuItems.length &&
+        menuItems.every((item, i) => existingItems[i]?.name === item.name && existingItems[i]?.send_message === item.send_message)
+      if (!same) {
+        await gate.setMenu(menuItems)
+        this.logger.info('[dsh-bridge qq] custom menu configured')
+      } else {
+        this.logger.info('[dsh-bridge qq] custom menu already configured')
+      }
     } catch (err) {
       this.logger.warn('[dsh-bridge qq] custom menu setup skipped: %s', err?.message ?? err)
     }

package/lib/qq/node.js

@@ -52,6 +52,25 @@ function sanitizeQQMarkdown(text) {
   return out.join('\n')
 }
 
+/**
+ * replace 模式流式分片：把完整内容切成「递增前缀」序列。
+ * 官方要求 replace 模式下每片 content_raw 为当前全量正文，
+ * 且须以上游已下发内容开头；服务端逐片覆盖显示 → 手机端看到一条消息逐渐变长。
+ * @param {string} content
+ * @param {number} maxChunk - 单片最大字符数（用户配置的 maxMessageChars）
+ * @returns {string[]} 递增前缀数组，最后一片为完整内容
+ */
+function splitIntoIncremental(content, maxChunk) {
+  const segs = splitIntoChunks(content, maxChunk)
+  const slices = []
+  let acc = ''
+  for (const s of segs) {
+    acc += s
+    slices.push(acc)
+  }
+  return slices
+}
+
 /**
  * 按段落边界切分内容（避免切断行内内容），单块时拆两片保证流式过渡
  * @param {string} content - 要分片的内容
@@ -143,51 +162,86 @@ export class QqConversationNode extends ConversationBridge {
 
     if (isPromptMessage) {
       // 发送带按钮的消息，方便用户快速操作
+      // 官方键盘结构：keyboard.content.rows；action.type=1（回调按钮，触发 INTERACTION_CREATE）
+      // 参考：https://bot.q.qq.com/wiki/develop/api-v2/server-inter/message/trans/msg-btn.html
       const keyboard = {
-        rows: [
-          {
-            buttons: [
-              { id: 'new_conversation', render_data: { label: '🆕 新建会话', visited_label: '新建会话' }, action: { type: 2, permission: { type: 2 } } },
-              { id: 'list_sessions', render_data: { label: '📋 会话列表', visited_label: '会话列表' }, action: { type: 2, permission: { type: 2 } } },
-            ],
-          },
-          {
-            buttons: [
-              { id: 'help', render_data: { label: '❓ 帮助', visited_label: '帮助' }, action: { type: 2, permission: { type: 2 } } },
-            ],
-          },
-        ],
+        content: {
+          rows: [
+            {
+              buttons: [
+                {
+                  id: 'new_conversation',
+                  render_data: { label: '🆕 新建会话', visited_label: '新建会话', style: 1 },
+                  action: { type: 1, permission: { type: 2 }, data: 'new', unsupport_tips: '请升级QQ客户端后使用' },
+                },
+                {
+                  id: 'list_sessions',
+                  render_data: { label: '📋 会话列表', visited_label: '会话列表', style: 1 },
+                  action: { type: 1, permission: { type: 2 }, data: 'list', unsupport_tips: '请升级QQ客户端后使用' },
+                },
+              ],
+            },
+            {
+              buttons: [
+                {
+                  id: 'help',
+                  render_data: { label: '❓ 帮助', visited_label: '帮助', style: 1 },
+                  action: { type: 1, permission: { type: 2 }, data: 'help', unsupport_tips: '请升级QQ客户端后使用' },
+                },
+              ],
+            },
+          ],
+        },
       }
-      return this.gateway.sendKeyboard(peerId, text, keyboard, { scope, msgId: replyMsgId })
+      // 官方按钮基于 markdown 消息（msg_type=2）挂载
+      return this._sendMarkdown(peerId, text, { scope, msgId: replyMsgId, keyboard })
     }
 
-    // 其他回复统一走「流式 Markdown」：content_type=markdown 让手机端渲染，append 模式逐段追加
+    // 其他回复统一走「流式 Markdown」：content_type=markdown 让手机端渲染
     const content = String(text || '').trim()
     if (content.length === 0) return { success: true }
-
     const md = sanitizeQQMarkdown(content)
-    // 使用用户配置的 maxMessageChars（默认 2000），而非硬编码 200
+
+    // 群消息不支持流式参数（官方文档明确说明），直接发送 Markdown
+    // 参考：https://bot.q.qq.com/wiki/develop/api-v2/autogen/api/v2_groups_group_openid_messages.post.html
+    if (scope === 'group') {
+      return this._sendMarkdown(peerId, md, { scope, msgId: replyMsgId })
+    }
+
+    // 单聊：replace 模式（每片是全量前缀），服务端逐片覆盖 → 一条消息逐渐变长
     const maxChars = this.config.maxMessageChars || 2000
-    const chunks = splitIntoChunks(md, maxChars)
+    const slices = splitIntoIncremental(md, maxChars)
+
+    // 被动回复的 msg_id 每片都带（官方示例如此）；主动消息（digest 等）无 msg_id 则不传
+    const baseSeq = Number(this._msgSeq) || 0
+    const streamCommon = {
+      scope,
+      contentType: 'markdown',
+      inputMode: 'replace',
+    }
 
     try {
       let streamMsgId = null
-      for (let i = 0; i < chunks.length; i++) {
-        const isLast = i === chunks.length - 1
-        const result = await this.gateway.sendStream(peerId, chunks[i], {
-          scope,
-          contentType: 'markdown', // 流式 Markdown，手机端正常渲染
-          msgId: i === 0 ? replyMsgId : undefined, // 首片带被动回复 msg_id
+      for (let i = 0; i < slices.length; i++) {
+        const isLast = i === slices.length - 1
+        const result = await this.gateway.sendStream(peerId, slices[i], {
+          ...streamCommon,
+          msgId: replyMsgId, // 每片都带被动回复 msg_id（官方示例如此）
+          msgSeq: replyMsgId ? baseSeq + 1 + i : undefined, // 递增避免去重（40054005）
           streamMsgId, // 后续片携带服务端返回的 stream_msg_id
           index: i, // 分片序号从 0 递增
           inputState: isLast ? 10 : 1, // 1=生成中, 10=生成结束
-          inputMode: 'append', // 追加模式：服务端拼接到同一条消息
         })
 
         // 首片返回 stream_msg_id，后续片需携带
-        if (i === 0 && result?.id) {
-          streamMsgId = result.id
-          this.lastMessageId = result.id // 保存消息 ID 用于消息引用
+        if (i === 0) {
+          streamMsgId = result?.id || result?.message_id || result?.stream_msg_id
+          if (streamMsgId) {
+            this.lastMessageId = streamMsgId
+            this.logger?.info?.('[dsh-bridge qq] stream started, stream_msg_id=%s, slices=%d', streamMsgId, slices.length)
+          } else {
+            this.logger?.warn?.('[dsh-bridge qq] stream first chunk returned no id: %o', result)
+          }
         }
 
         if (result?.code !== undefined && result.code !== 0) {
@@ -202,30 +256,52 @@ export class QqConversationNode extends ConversationBridge {
       }
       return { success: true }
     } catch (err) {
-      // 流式失败（如被动回复 msg_id 过期）→ 依次回退：带 msg_id 的 Markdown → 主动 Markdown
-      this.logger?.warn?.('[dsh-bridge qq] stream send failed, fallback to markdown: %s', err?.message ?? err)
+      // 流式失败 → 补发完整内容 replace 收尾（input_state=10），尽量合并成一条
+      this.logger?.warn?.('[dsh-bridge qq] stream send failed, patch final replace: %s', err?.message ?? err)
       try {
-        const result = await this.gateway.sendMarkdown(peerId, md, { scope, msgId: replyMsgId })
+        const result = await this.gateway.sendStream(peerId, md, {
+          ...streamCommon,
+          msgId: replyMsgId,
+          msgSeq: replyMsgId ? baseSeq + slices.length + 1 : undefined,
+          streamMsgId,
+          index: slices.length,
+          inputState: 10,
+        })
         if (result?.id) this.lastMessageId = result.id
         return result
       } catch (fallbackErr1) {
-        try {
-          // 主动消息兜底（digest 心跳等非回复场景，msg_id 已过期或无）
-          const result = await this.gateway.sendMarkdown(peerId, md, { scope })
-          if (result?.id) this.lastMessageId = result.id
-          return result
-        } catch (fallbackErr2) {
-          this.logger?.error?.('[dsh-bridge qq] markdown send failed: %s', fallbackErr2?.message ?? fallbackErr2)
-          return { success: false, error: fallbackErr2?.message ?? String(fallbackErr2) }
-        }
+        // 主动消息兜底（digest 心跳等非回复场景，msg_id 已过期或无）
+        return this._sendMarkdown(peerId, md, { scope })
       }
     }
   }
 
-  /** 发送"正在输入"状态（QQ 通过 msg_type=6 + input_notify 显示 N 秒） */
+  /** 发送 Markdown 消息：先带被动回复 msg_id，失败则降级为主动消息。 */
+  async _sendMarkdown(peerId, md, { scope, msgId, keyboard } = {}) {
+    try {
+      const result = await this.gateway.sendMarkdown(peerId, md, { scope, msgId, keyboard })
+      if (result?.id) this.lastMessageId = result.id
+      return result
+    } catch (fallbackErr1) {
+      // 被动回复失败（msg_id 过期等）→ 主动消息兜底
+      this.logger?.warn?.('[dsh-bridge qq] markdown send failed with msg_id, retry as active: %s', fallbackErr1?.message ?? fallbackErr1)
+      try {
+        const result = await this.gateway.sendMarkdown(peerId, md, { scope, keyboard })
+        if (result?.id) this.lastMessageId = result.id
+        return result
+      } catch (fallbackErr2) {
+        this.logger?.error?.('[dsh-bridge qq] markdown send failed: %s', fallbackErr2?.message ?? fallbackErr2)
+        return { success: false, error: fallbackErr2?.message ?? String(fallbackErr2) }
+      }
+    }
+  }
+
+  /** 发送"正在输入"状态（QQ 通过 msg_type=6 + input_notify 显示 N 秒；群聊不支持） */
   async sendTyping(state) {
     const peerInfo = this._currentPeer()
     if (!peerInfo) return
+    // 群聊消息类型列表不含 msg_type=6（输入状态），跳过
+    if (peerInfo.scope === 'group') return { ok: true }
     // state=2（停止）时无需显式结束——input_second 到期自动消失
     if (Number(state) === 2) return { ok: true }
     return this.gateway.sendTyping(peerInfo.peerId, {
@@ -241,9 +317,18 @@ export class QqConversationNode extends ConversationBridge {
     const sender = String(event.senderId ?? '').trim()
     if (!sender) return
 
-    // 快速预检查：白名单非空时，未授权发件人直接忽略
-    if (!this.isAllowed(sender) && this.config.allowFrom.length > 0) {
-      this.logger?.info?.(`[dsh-bridge qq] ignore message from non-allowlisted sender ${sender}`)
+    // 群聊：仅在群聊 @ 机器人事件中处理（GROUP_AT_MESSAGE_CREATE 已由网关归一化）
+    const isGroup = event.scope === 'group' || event.scope === 'guild'
+
+    // 记录当前 peer 信息与被动回复消息 ID（事件 d.id）、msg_seq，供出站使用
+    const peerId = isGroup ? event.groupId || event.peerId : event.peerId || event.senderId
+    // 授权主体：群聊按群维度（group_openid），单聊按用户（user_openid）
+    const authId = isGroup ? (event.groupId || peerId || sender) : sender
+
+    // 快速预检查：白名单非空时，未授权单聊发件人直接忽略；
+    // 群聊不在此拦截——交给 handleInbound 自动授权（首次 @机器人 即授权该群）
+    if (!isGroup && !this.isAllowed(authId) && this.config.allowFrom.length > 0) {
+      this.logger?.info?.(`[dsh-bridge qq] ignore message from non-allowlisted sender ${authId}`)
       return
     }
 
@@ -253,14 +338,10 @@ export class QqConversationNode extends ConversationBridge {
       return
     }
 
-    // 群聊：仅在群聊 @ 机器人事件中处理（GROUP_AT_MESSAGE_CREATE 已由网关归一化）
-    const isGroup = event.scope === 'group' || event.scope === 'guild'
-
-    // 记录当前 peer 信息与被动回复消息 ID（事件 d.id），供出站使用
-    const peerId = isGroup ? event.groupId || event.peerId : event.peerId || event.senderId
     if (peerId) {
       this._lastPeer = { peerId: String(peerId), scope: isGroup ? 'group' : 'c2c' }
       if (event.id) this._replyMsgId = String(event.id)
+      if (event.msgSeq !== undefined) this._msgSeq = event.msgSeq
     }
 
     // 检测消息引用（文本交互）：如果用户回复了机器人的消息，且当前没有活动会话或消息以 /new 开头，
@@ -269,13 +350,13 @@ export class QqConversationNode extends ConversationBridge {
     if (messageReference && !this.activeSessionId && !text.startsWith('/')) {
       this.logger?.info?.(`[dsh-bridge qq] detected message reference from ${sender}, auto-starting conversation`)
       // 先创建新会话，再处理消息
-      await this.handleInbound({ senderId: sender, text: '/new', isGroup })
+      await this.handleInbound({ senderId: authId, text: '/new', isGroup })
       // 等待一小段时间确保会话创建完成
       await new Promise(resolve => setTimeout(resolve, 100))
     }
 
     // 交给平台无关核心：白名单/群消息/命令路由/agent 分发
-    await this.handleInbound({ senderId: sender, text, isGroup })
+    await this.handleInbound({ senderId: authId, text, isGroup })
   }
 
   // ---- 互动事件 ----
@@ -284,36 +365,54 @@ export class QqConversationNode extends ConversationBridge {
     const sender = String(event.senderId ?? '').trim()
     if (!sender) return
 
-    // 快速预检查：白名单非空时，未授权发件人直接忽略
-    if (!this.isAllowed(sender) && this.config.allowFrom.length > 0) {
-      this.logger?.info?.(`[dsh-bridge qq] ignore interaction from non-allowlisted sender ${sender}`)
+    // 群聊按钮点击：授权主体按群维度（group_openid），与消息处理一致
+    const isGroup = event.scope === 'group'
+    const peerId = isGroup ? event.groupId || event.peerId : event.peerId || sender
+    const authId = isGroup ? (event.groupId || peerId || sender) : sender
+
+    // 快速预检查：白名单非空时，未授权单聊发件人直接忽略；
+    // 群聊不在此拦截——handleInbound 会按群自动授权
+    if (!isGroup && !this.isAllowed(authId) && this.config.allowFrom.length > 0) {
+      this.logger?.info?.(`[dsh-bridge qq] ignore interaction from non-allowlisted sender ${authId}`)
       return
     }
 
+    const type = Number(event.interactionType ?? event?.data?.type ?? 0)
+    // 仅消息按钮(11)与快捷菜单(12)需要回应；其他类型（反馈/清空会话/故事集/授权等）无需回应
+    const needsRespond = type === 11 || type === 12
+
     // 记录 peer 信息，供命令回复使用
-    const isGroup = event.scope === 'group'
-    const peerId = isGroup ? event.groupId || event.peerId : event.peerId || sender
     if (peerId) {
       this._lastPeer = { peerId: String(peerId), scope: isGroup ? 'group' : 'c2c' }
       this._replyMsgId = null
     }
 
+    // 回应互动：告知后台已收到，避免客户端一直 loading（同一 interaction_id 只能回应一次）
+    if (needsRespond && event.interactionId) {
+      try {
+        await this.gateway.respondInteraction(event.interactionId, { code: 0 })
+      } catch (err) {
+        this.logger?.warn?.('[dsh-bridge qq] respond interaction failed: %s', err?.message ?? err)
+      }
+    }
+
+    if (!needsRespond) {
+      this.logger?.info?.(`[dsh-bridge qq] skip non-button interaction type=${type} from ${authId}`)
+      return
+    }
+
     const data = event.data || {}
     const resolved = data.resolved || {}
     const buttonId = resolved.button_id || ''
 
-    // 响应互动
-    await this.gateway.respondInteraction(event.interactionId, {
-      code: 0,
-    })
-
-    // 根据按钮 ID 执行对应操作
+    // 根据按钮 ID 执行对应操作（消息按钮 11 与快捷菜单 12 都映射到命令）
+    this.logger?.info?.('[dsh-bridge qq] button interaction type=%s button_id=%s from %s', type, buttonId, authId)
     if (buttonId === 'new_conversation') {
-      await this.handleInbound({ senderId: sender, text: '/new', isGroup: event.scope === 'group' })
+      await this.handleInbound({ senderId: authId, text: '/new', isGroup })
     } else if (buttonId === 'list_sessions') {
-      await this.handleInbound({ senderId: sender, text: '/list', isGroup: event.scope === 'group' })
+      await this.handleInbound({ senderId: authId, text: '/list', isGroup })
     } else if (buttonId === 'help') {
-      await this.handleInbound({ senderId: sender, text: '/help', isGroup: event.scope === 'group' })
+      await this.handleInbound({ senderId: authId, text: '/help', isGroup })
     } else {
       this.logger?.info?.(`[dsh-bridge qq] unknown button interaction: ${buttonId}`)
     }
@@ -329,5 +428,6 @@ export const qqNodeHelpers = {
   sessionsInDisplayOrder: conversationBridgeHelpers.sessionsInDisplayOrder,
   sanitizeQQMarkdown,
   splitIntoChunks,
+  splitIntoIncremental,
   STREAM_CHUNK_SIZE,
 }

package/lib/wechat/index.js

@@ -44,7 +44,7 @@ export class WechatService extends Platform {
       sendChunkDelayMs: config.sendChunkDelayMs,
       activeSessionId: config.activeSessionId, // v0.2.1：恢复活动会话
     }, logger, {
-      onFirstSender: (senderId) => this.persist({ allowFrom: [senderId] }),
+      onFirstSender: () => this.persist({ allowFrom: [...(this.node?.config?.allowFrom ?? [])] }),
       onActiveSessionChange: (sessionId) => this.persist({ activeSessionId: sessionId }), // v0.2.1：持久化活动会话
     })
     this.bridge = this.node

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenbin_wb/dsh-bridge",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 Bot（多工作区/会话持久化/媒体/审批），无需自己搭公网服务器。",
   "type": "module",
   "main": "lib/index.js",