@zaofan/dsh-qqbot 0.9.6 → 1.0.1

package/client/qqbot-settings.js

@@ -851,10 +851,8 @@ window.__ModuleLoader__.load({
           var nm = c.name || (nameByMid[c.id] && nameByMid[c.id].name) || ''
           c2c.push({ scope: 'c2c', id: c.id, name: nm, lastSeen: c.lastSeen || 0, count: c.count || 0 })
         })
-        // 台账里没有但成员表有名字的 openid 也补上(私聊候选)
-        Object.keys(nameByMid).forEach(function (mid) {
-          if (!seen[mid]) { seen[mid] = 1; c2c.push({ scope: 'c2c', id: mid, name: nameByMid[mid].name, lastSeen: nameByMid[mid].ts, count: 0 }) }
-        })
+        // 只列真·私聊过的人(known-chats scope=c2c): 群成员没有可私聊会话(dsh 一会话一对象),
+        // 且群 member_openid 与 c2c openid 不同域, 补进来定时发私聊必失败 —— 不混入。
         c2c.sort(function (a, b) { return (b.lastSeen || 0) - (a.lastSeen || 0) })
         return { group: groups, c2c: c2c }
       })
@@ -1888,7 +1886,9 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
       setInterval(refreshBadge, 20000)
 
       // ── 面板状态(每个实例独立保存, 切回不丢) ──
-      var state = { ns: '', accts: [], gid: '', groups: [], tab: 'chat', sendScope: 'group', sendTo: '', sendName: '', sendText: '', insertCtx: true, targetQ: '', c2cs: [], joins: null, mutes: null, members: null, muteSecs: '60', bindGid: '', bindName: '', msg: '', busy: '', wantPeer: null, lookedUp: false, detected: null, detectedHit: null, chatItems: [], chatMore: false, chatBusy: '', chatErr: '', chatOldest: 0, chatText: '', chatIns: true, outMode: '', outRev: undefined }
+      var state = { ns: '', accts: [], gid: '', groups: [], tab: 'chat', sendScope: 'group', sendTo: '', sendName: '', sendText: '', insertCtx: true, targetQ: '', c2cs: [], joins: null, mutes: null, members: null, muteSecs: '60', bindGid: '', bindName: '', msg: '', busy: '', wantPeer: null, lookedUp: false, detected: null, detectedHit: null, chatItems: [], chatMore: false, chatBusy: '', chatErr: '', chatOldest: 0, chatText: '', chatIns: true, outMode: '', outRev: undefined, bpEvents: [], bpSel: null, bpDraft: null, rosterSel: {}, rosterScope: 'all', rosterQ: '', hubSid: '', hubRev: undefined, hubBusy: '', hubMsg: '' }
+      // 📇 群组管理 M1: 勾选集合本地持久化(刷新/重开不丢, 供后续群发/批量操作使用)
+      try { var _rs = localStorage.getItem('qqs-roster-sel'); if (_rs) { var _rso = JSON.parse(_rs); if (_rso && typeof _rso === 'object') state.rosterSel = _rso } } catch (e) {}
       var chatFlash = '' // 发送结果/错误提示(短时展示, 不被列表计数覆盖)
       // @ mention(输入框敲 @ 弹成员候选): 群聊目标才启用
       var atM = { members: [], open: false, kw: '', idx: 0, range: null, key: '' }
@@ -1979,7 +1979,7 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         state.groups = []
         var q = state.ns ? 'ns=' + encodeURIComponent(state.ns) : ''
         api('group/accounts', q).then(function (d) {
-          state.groups = (d && Array.isArray(d.groups) ? d.groups : []).map(function (g) { return { gid: g.gid, name: g.name || '', from: g.from || '' } })
+          state.groups = (d && Array.isArray(d.groups) ? d.groups : []).map(function (g) { return { gid: g.gid, name: g.name || '', from: g.from || '', lastAt: (g && g.lastAt) || 0 } })
           // 期望目标(wantPeer)命中则选中它, 否则回落第一个
           var wantGid = (state.wantPeer && state.wantPeer.scope === 'group') ? state.wantPeer.peerId : ''
           if (state.groups.some(function (g) { return g.gid === state.gid })) { /* 保持现选 */ }
@@ -1993,7 +1993,9 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         var dd = curDataDir()
         state.c2cs = []
         if (!dd) { paintBody(); return }
-        // 与定时任务同款三源合并: 台账 + 本地成员表补名(不露裸 id)
+        // 目标候选 = 真·私聊台账(known-chats scope=c2c, 即"与该机器人私聊过/开过会话"的人)。
+        // ⚠️ 不能混入 group-members(群成员≠私聊对象: 群 member_openid 与 c2c openid 不同域,
+        //    且 dsh 里一个 QQ 会话只绑定一个对象, 仅群里见过的人没有可私聊会话 → 发不出去)。
         var qNs = state.ns ? ('?ns=' + encodeURIComponent(state.ns)) : ''
         var qDD = dd ? ('?dataDir=' + encodeURIComponent(dd)) : ''
         Promise.all([
@@ -2001,6 +2003,7 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           api('group/members_local', qNs.replace('?', '')),
         ]).then(function (rs) {
           var known = ((rs[0] && rs[0].chats) || [])
+          // 群成员表仅用于给同 id 的私聊对象补昵称(不同域通常不命中, 无副作用)
           var nameByMid = {}
           ;((rs[1] && rs[1].members) || []).forEach(function (m) {
             if (m.mid && m.name) {
@@ -2016,9 +2019,6 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
             var nm = c.name || (nameByMid[c.id] && nameByMid[c.id].name) || ''
             c2c.push({ id: c.id, name: nm, lastSeen: c.lastSeen || 0, count: c.count || 0 })
           })
-          Object.keys(nameByMid).forEach(function (mid) {
-            if (!seen[mid]) { seen[mid] = 1; c2c.push({ id: mid, name: nameByMid[mid].name, lastSeen: nameByMid[mid].ts, count: 0 }) }
-          })
           c2c.sort(function (a, b) { return (b.lastSeen || 0) - (a.lastSeen || 0) })
           state.c2cs = c2c
           // 期望目标(wantPeer)是私聊 → 自动选中该对象
@@ -2046,6 +2046,160 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         var c = null; state.c2cs.forEach(function (x) { if (x.id === state.sendTo) c = x })
         return c ? (c.name || c.id.slice(0, 10)) : '(未选)'
       }
+      // ── 📇 群组管理 M1: 会话台账勾选(群 = 群会话; 个人 = 真私聊过的人(c2c 会话), 复用 state.groups+state.c2cs) ──
+      function rosterRows() {
+        var rows = []
+        state.groups.forEach(function (g) { rows.push({ key: 'group:' + g.gid, scope: 'group', id: g.gid, name: g.name || '', lastSeen: (g && g.lastAt) || 0, count: 0 }) })
+        state.c2cs.forEach(function (c) { rows.push({ key: 'c2c:' + c.id, scope: 'c2c', id: c.id, name: c.name || '', lastSeen: (c && c.lastSeen) || 0, count: (c && c.count) || 0 }) })
+        var sel = state.rosterScope
+        var q = String(state.rosterQ || '').trim().toLowerCase()
+        return rows.filter(function (r) {
+          if (sel !== 'all' && r.scope !== sel) return false
+          if (!q) return true
+          return (r.name || '').toLowerCase().indexOf(q) >= 0 || r.id.toLowerCase().indexOf(q) >= 0
+        }).sort(function (a, b) { return (b.lastSeen || 0) - (a.lastSeen || 0) })
+      }
+      function fmtRosterTime(ts) {
+        if (!ts) return ''
+        try { var d = new Date(ts); var mm = d.getMonth() + 1; var hh = d.getHours() < 10 ? '0' + d.getHours() : d.getHours(); var mi = d.getMinutes() < 10 ? '0' + d.getMinutes() : d.getMinutes(); return mm + '/' + d.getDate() + ' ' + hh + ':' + mi } catch (e) { return '' }
+      }
+      function rosterSelN() { var n = 0; for (var k in state.rosterSel) { if (state.rosterSel[k]) n++ } return n }
+      function renderRosterList() {
+        if (!panel || !open) return
+        var box = panel.querySelector('#dk-roster-list')
+        if (!box) return
+        var rows = rosterRows()
+        var stat = panel.querySelector('#dk-roster-stat')
+        if (stat) stat.textContent = '共 ' + rows.length + ' 条 · 已选 ' + rosterSelN()
+        if (!rows.length) {
+          box.innerHTML = '<div class="dk-empty">' + ((state.rosterScope === 'all' && !String(state.rosterQ || '').trim()) ? '没有会话记录: 机器人被拉进群/有人私聊过后会自动累积(仅这些对象可被直接投递)。' : '没有匹配项。') + '</div>'
+          return
+        }
+        var html = ''
+        rows.forEach(function (r) {
+          var on = !!state.rosterSel[r.key]
+          var tail = r.id.length > 10 ? '…' + r.id.slice(-6) : r.id
+          var nm = r.name || '(未知名)'
+          html += '<label class="dk-item" style="cursor:pointer;background:' + (on ? '#f1ecff' : 'transparent') + '">'
+            + '<input type="checkbox" data-rkey="' + r.key + '"' + (on ? ' checked' : '') + ' style="accent-color:#7c6cf0;flex:none">'
+            + '<span style="flex:1;min-width:0;display:flex;gap:6px;align-items:baseline;flex-wrap:wrap"><b>' + esc(nm) + '</b>'
+            + '<span style="color:#aaa;font-size:11px">' + (r.scope === 'group' ? '👥 群' : '👤 私聊') + ' · ' + esc(tail) + '</span></span>'
+            + '<span style="color:#9aa0a8;font-size:11px;flex:none">' + fmtRosterTime(r.lastSeen) + '</span></label>'
+        })
+        box.innerHTML = html
+      }
+      function rosterToggle(key) {
+        if (!key) return
+        if (state.rosterSel[key]) delete state.rosterSel[key]
+        else state.rosterSel[key] = true
+        try { localStorage.setItem('qqs-roster-sel', JSON.stringify(state.rosterSel)) } catch (e) {}
+        renderRosterList()
+      }
+      function bindRosterEvents() {
+        if (!panel) return
+        var qEl = panel.querySelector('#dk-roster-q')
+        if (qEl) qEl.oninput = function (e) { state.rosterQ = e.target.value; renderRosterList() }
+        var scopes = panel.querySelectorAll('input[name="dk-rscope"]')
+        scopes.forEach(function (r) { r.onchange = function () { state.rosterScope = r.value; renderRosterList() } })
+        var ref = panel.querySelector('#dk-roster-refresh')
+        if (ref) ref.onclick = function () {
+          var q2 = panel.querySelector('#dk-roster-q'); if (q2) q2.value = ''
+          state.rosterQ = ''; refreshAll(); loadHubState()
+        }
+        var allB = panel.querySelector('#dk-roster-all')
+        if (allB) allB.onclick = function () {
+          rosterRows().forEach(function (r) { state.rosterSel[r.key] = true })
+          try { localStorage.setItem('qqs-roster-sel', JSON.stringify(state.rosterSel)) } catch (e) {}
+          renderRosterList()
+        }
+        var clr = panel.querySelector('#dk-roster-clear')
+        if (clr) clr.onclick = function () {
+          state.rosterSel = {}
+          try { localStorage.setItem('qqs-roster-sel', JSON.stringify(state.rosterSel)) } catch (e) {}
+          renderRosterList()
+        }
+        var box = panel.querySelector('#dk-roster-list')
+        if (box) box.onclick = function (e) {
+          var cb = e.target
+          while (cb && cb !== box && !(cb.tagName === 'INPUT' && cb.type === 'checkbox')) cb = cb.parentNode
+          if (!cb || cb === box) return
+          rosterToggle(cb.getAttribute('data-rkey'))
+        }
+        // 🎯 群组管理器: 设本会话/取消(走 settings groupAdmin.hubSessionId, live 热更)
+        var hubSet = panel.querySelector('#dk-hub-set')
+        if (hubSet) hubSet.onclick = function () {
+          var sid = readCurrentSessionId()
+          if (!sid) { hubHint('未识别到当前 web 会话(稍后再试)'); return }
+          saveHub(sid)
+        }
+        var hubClr = panel.querySelector('#dk-hub-clear')
+        if (hubClr) hubClr.onclick = function () { saveHub('') }
+      }
+      function hubStatusText() {
+        if (state.hubSid) return '已设: 会话 ' + state.hubSid.slice(0, 8) + '… ← 各群群事件(入群申请/新成员/被拉群)汇总注入这里'
+        return '未设置: 群事件只在原群内提醒'
+      }
+      function hubHint(t) {
+        state.hubMsg = t || ''
+        var el = panel && panel.querySelector('#dk-hub-hint')
+        if (el) el.textContent = state.hubMsg
+      }
+      function loadHubState() {
+        fetch(READ + (state.ns ? '?' + outNsQ() : '')).then(function (r) { return r.json() }).then(function (d) {
+          if (!d || !d.value) return
+          var ga = d.value.groupAdmin || {}
+          state.hubSid = ga.hubSessionId || ''
+          state.hubRev = d.revision
+          var st = panel && panel.querySelector('#dk-hub-status')
+          if (st) st.textContent = hubStatusText()
+          var clr = panel && panel.querySelector('#dk-hub-clear')
+          if (clr) clr.disabled = !state.hubSid
+        }).catch(function () {})
+      }
+      function saveHub(sid) {
+        state.hubBusy = 'hub'; hubHint('保存中…')
+        var doSave = function () {
+          var trySave = function (cur, rev) {
+            var patch = Object.assign({}, cur || {})
+            var ga = Object.assign({}, (cur && cur.groupAdmin) || {}, { hubSessionId: sid || '' })
+            patch.groupAdmin = ga
+            return fetch(UPDATE, {
+              method: 'POST', headers: { 'content-type': 'application/json' },
+              body: JSON.stringify({ ns: state.ns || undefined, patch: patch, expectedRevision: rev }),
+            }).then(function (r) { return r.json().catch(function () { return null }) }).then(function (d2) {
+              state.hubBusy = ''
+              if (d2 && d2.value) {
+                var ga2 = d2.value.groupAdmin || {}
+                state.hubSid = ga2.hubSessionId || ''
+                state.hubRev = d2.revision
+                hubHint(sid ? '✓ 已设为本会话为群组管理器(live 生效): 各群群事件将注入此会话' : '✓ 已取消群组管理器')
+                var st = panel && panel.querySelector('#dk-hub-status')
+                if (st) st.textContent = hubStatusText()
+                var clr = panel && panel.querySelector('#dk-hub-clear')
+                if (clr) clr.disabled = !state.hubSid
+              } else {
+                hubHint('保存失败: ' + ((d2 && d2.error) || '未知错误') + (d2 && String(d2.error || '').indexOf('changed since') >= 0 ? '(冲突, 请重试)' : ''))
+              }
+            }).catch(function () { state.hubBusy = ''; hubHint('保存异常') })
+          }
+          // 先读最新 revision 再存(避免陈旧冲突)
+          fetch(READ + (state.ns ? '?' + outNsQ() : '')).then(function (r) { return r.json() }).then(function (d) {
+            if (d && d.value) trySave(d.value, d.revision)
+            else { state.hubBusy = ''; hubHint('保存失败: 无法读取当前设置') }
+          }).catch(function () { state.hubBusy = ''; hubHint('保存异常: 读取失败') })
+        }
+        // 预校验(防呆): 群事件按 hubSessionId 反查本 bot 的 QQ 会话——纯 web(未绑群/私聊)的会话注不进去
+        if (!sid) { doSave(); return }
+        api('session-lookup', 'sessionId=' + encodeURIComponent(sid)).then(function (d) {
+          var hits = (d && d.ok && Array.isArray(d.hits)) ? d.hits : []
+          if (!hits.length) {
+            state.hubBusy = ''
+            hubHint('⚠️ 当前会话未绑定任何 QQ 群/私聊: 群事件注入不进去。请先切到与 bot 的某个群/私聊会话(顶栏「当前会话」会显示命中)再点设置')
+            return
+          }
+          doSave()
+        }).catch(function () { doSave() })
+      }
       function sendNow() {
         var t = (state.sendText || '').trim()
         if (!t) { state.msg = '先输入内容'; paintBody(); return }
@@ -2170,10 +2324,12 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           return '<option value="' + esc(c.id) + '"' + (c.id === state.sendTo ? ' selected' : '') + '>' + esc(label) + '</option>'
         }).join('')
         var tabs = '<div class="dk-tab">'
+          + '<button data-t="roster" class="' + (state.tab === 'roster' ? 'on' : '') + '">📇 群组管理</button>'
           + '<button data-t="chat" class="' + (state.tab === 'chat' ? 'on' : '') + '">💬 聊天</button>'
           + '<button data-t="join" class="' + (state.tab === 'join' ? 'on' : '') + '">📥 入群审批<span class="dk-join-badge" style="display:none;background:#ff4d4f;color:#fff;border-radius:8px;font-size:11px;padding:0 5px;margin-left:4px">0</span></button>'
           + '<button data-t="mute" class="' + (state.tab === 'mute' ? 'on' : '') + '">🔇 禁言</button>'
           + '<button data-t="out" class="' + (state.tab === 'out' ? 'on' : '') + '">⚙️ 出站</button>'
+          + '<button data-t="bp" class="' + (state.tab === 'bp' ? 'on' : '') + '">🎮 互动事件</button>'
           + '</div>'
         var body = tabs
         var status = state.msg ? '<div class="dk-msg" style="color:#2f9e44;margin:4px 0">' + esc(state.msg) + '</div>' : ''
@@ -2242,6 +2398,29 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           body += '<div class="dk-list" id="dk-member-list"></div>'
           body += '<div style="font-weight:700;font-size:13px;margin:8px 0 4px">② 正在禁言中</div>'
           body += '<div class="dk-list" id="dk-mute-list"></div>'
+        } else if (state.tab === 'roster') {
+          body += '<div class="dk-row" style="font-weight:700;font-size:13px;margin:2px 0">📇 会话台账:机器人聊过的对象</div>'
+          body += '<div class="dk-row"><span class="dk-msg" style="flex:1;line-height:1.5">👤 = 私聊过的人(有 c2c 会话,可直接发消息) · 👥 = 群(群成员≠私聊对象: 群里见过≠能私聊,只能群内@)</span></div>'
+          body += '<div style="border:1px solid #e2d9ff;border-radius:8px;padding:6px 8px;margin:2px 0 6px;background:#faf8ff">'
+            + '<div class="dk-row" style="margin:0"><b style="font-size:13px">🎯 群组管理器(M2)</b>'
+            + '<span class="dk-msg" style="flex:1" id="dk-hub-status">' + hubStatusText() + '</span>'
+            + '<button class="dk-btn ok" id="dk-hub-set"' + (state.hubBusy ? ' disabled' : '') + ' title="把当前 web 会话设为群组管理器: 各群群事件(入群申请/新成员加入/被拉群)将汇总注入此会话">📌 设为本会话</button>'
+            + '<button class="dk-btn" id="dk-hub-clear"' + (state.hubSid ? '' : ' disabled') + '>取消</button></div>'
+            + '<div class="dk-msg" id="dk-hub-hint" style="color:#2f9e44"></div></div>'
+          body += '<div class="dk-row">范围: '
+            + '<label style="display:inline-flex;align-items:center;gap:4px;cursor:pointer;font-size:12px"><input type="radio" name="dk-rscope" value="all"' + (state.rosterScope === 'all' ? ' checked' : '') + '> 全部</label>'
+            + '<label style="display:inline-flex;align-items:center;gap:4px;cursor:pointer;font-size:12px"><input type="radio" name="dk-rscope" value="c2c"' + (state.rosterScope === 'c2c' ? ' checked' : '') + '> 👤 私聊过的人</label>'
+            + '<label style="display:inline-flex;align-items:center;gap:4px;cursor:pointer;font-size:12px"><input type="radio" name="dk-rscope" value="group"' + (state.rosterScope === 'group' ? ' checked' : '') + '> 👥 群</label>'
+            + '<span style="flex:1"></span>'
+            + '<button class="dk-btn" id="dk-roster-refresh" title="重新拉取群注册表+聊天台账">🔄 刷新</button></div>'
+          body += '<div class="dk-row" style="margin:2px 0 4px">'
+            + '<input class="qqs-txt" id="dk-roster-q" placeholder="🔍 搜昵称/群名/ID…" value="' + esc(state.rosterQ || '') + '" style="flex:1;box-sizing:border-box;font-size:12px;padding:4px 8px">'
+            + '<span class="dk-msg" id="dk-roster-stat" style="white-space:nowrap"></span></div>'
+          body += '<div class="dk-row" style="margin:0 0 4px">'
+            + '<button class="dk-btn" id="dk-roster-all">全选(当前范围)</button>'
+            + '<button class="dk-btn" id="dk-roster-clear">清空</button>'
+            + '<span class="dk-msg" style="flex:1;text-align:right">勾选集合用途待开发(后续: 群发/批量操作目标)</span></div>'
+          body += '<div class="dk-list" id="dk-roster-list"></div>'
         } else if (state.tab === 'out') {
           var om = state.outMode || 'adaptive'
           if (om === 'nothink') body += '<div class="dk-msg" style="color:#c23131;margin:2px 0">⚠️ 当前为「完全不思考」(设置页开启): QQ 入站不唤醒 AI。发 /outmode adaptive 可唤醒。</div>'
@@ -2252,6 +2431,62 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           body += '<div class="dk-msg" style="line-height:1.6">适配主动=和QQ有关的会话回复都发到QQ: 刚收到真人消息时前5条带引用回你(能看到回的是哪句), 第6条起自动转独立新消息, 连发不被QQ吞; 定时/后台等没有新真人消息的主动推送也走独立消息。'
           body += '被动=始终以「回复你那条」发出, 连发约4~5条后会被QQ吞掉。完全不出站=本机静默, 不向QQ发任何回复(鲸鱼娘可用工具随时切回)。本开关对纯web(没绑QQ)的会话不生效。</div>'
           body += '<span class="dk-msg" id="dk-out-hint" style="color:#2f9e44;margin:4px 0"></span>'
+        } else if (state.tab === 'bp') {
+          body += '<div class="dk-row" style="font-weight:700;font-size:13px;margin:4px 0 2px">🎮 互动事件装配器(/botplay 触发)</div>'
+          body += '<div class="dk-row"><span class="dk-msg" style="flex:1">定义事件与按钮 → 保存即热更 → QQ 里发 <b>/botplay 事件名</b> 发卡。点击按钮走 bot 行为(回文本等)并可选影响 AI。</span></div>'
+          // 事件列表
+          body += '<div class="dk-list" id="dk-bp-list" style="max-height:16vh">'
+          if (!state.bpEvents.length) body += '<div class="dk-empty">还没有事件。点「➕ 新建事件」开始装配。</div>'
+          state.bpEvents.forEach(function (ev, i) {
+            var sel = state.bpSel === i
+            var btnN = (ev.buttons || []).length
+            var rowc = bpRowCount(ev)
+            var overL = rowc.rows > 5
+            body += '<div class="dk-item" style="cursor:pointer;background:' + (sel ? '#f1ecff' : 'transparent') + '" data-bpidx="' + i + '">'
+              + '<span style="flex:1"><b>' + esc(ev.name || '(未命名)') + '</b> <span style="color:#888;font-size:11px">/ ' + esc(ev.id || '?') + ' · ' + btnN + ' 按钮·每行' + rowc.per + ' → ' + rowc.rows + '行' + (overL ? ' <b style="color:#e03131">⚠超限</b>' : '') + ' · ' + (ev.perm && ev.perm.type ? esc(ev.perm.type) : 'all') + ' · ' + (ev.expireSec || 600) + 's</span></span>'
+              + '<button class="dk-btn no" data-bpdel="' + i + '">🗑</button></div>'
+          })
+          body += '</div>'
+          body += '<div class="dk-row"><button class="dk-btn ok" id="dk-bp-new">➕ 新建事件</button>'
+          body += '<button class="dk-btn ok" id="dk-bp-save">💾 保存全部(live 热更)</button>'
+          body += '<span class="dk-msg" id="dk-bp-hint" style="color:#2f9e44"></span></div>'
+          // 编辑器
+          if (state.bpDraft) {
+            var D = state.bpDraft
+            body += '<div style="border-top:1px dashed #e2d9ff;margin-top:8px;padding-top:8px">'
+            body += '<div class="dk-row"><label style="font-size:12px;color:#555;width:56px">事件名</label><input class="qqs-txt" id="dk-bp-name" value="' + esc(D.name) + '" style="flex:1" placeholder="如: 签到"></div>'
+            body += '<div class="dk-row"><label style="font-size:12px;color:#555;width:56px">id</label><input class="qqs-txt" id="dk-bp-id" value="' + esc(D.id) + '" style="flex:1" placeholder="英文/数字/_- (触发用)"></div>'
+            body += '<div class="dk-row"><label style="font-size:12px;color:#555;width:56px">权限</label>'
+              + '<select class="qqs-sel" id="dk-bp-perm">' + ['all','triggerer','owner','users'].map(function (p) { return '<option value="' + p + '"' + (D.perm && D.perm.type === p ? ' selected' : '') + '>' + ({ all: '所有人', triggerer: '仅触发者本人(推荐)', owner: '主人白名单', users: '指定openid' }[p]) + '</option>' }).join('') + '</select>'
+              + (D.perm && D.perm.type === 'users'
+                ? '<input class="qqs-txt" id="dk-bp-users" value="' + esc(((D.perm.userIds) || []).join(', ')) + '" placeholder="指定 openid(逗号分隔)" style="flex:1;min-width:160px">'
+                : '')
+              + '<label style="font-size:12px;color:#555">有效期(s)</label><input class="qqs-txt" id="dk-bp-expire" type="number" min="30" value="' + (D.expireSec || 600) + '" style="width:70px">'
+              + '<label style="font-size:12px;color:#555">总次数(0不限)</label><input class="qqs-txt" id="dk-bp-max" type="number" min="0" value="' + (D.maxClicks || 0) + '" style="width:60px">'
+              + '<label style="font-size:12px;color:#555">每行按钮</label><input class="qqs-txt" id="dk-bp-perrow" type="number" min="1" max="5" value="' + (D.buttonsPerRow || 1) + '" style="width:50px" title="每行几个按钮(1~5); QQ 键盘≤5行×每行≤5, 行数=按钮数÷每行"></div>'
+            var rowc2 = bpRowCount(D)
+            body += '<div style="font-weight:700;font-size:12px;margin:6px 0 2px;color:#4a3a9f">按钮 <span id="dk-bp-layout" style="font-weight:400;color:' + (rowc2.rows > 5 ? '#e03131' : '#2f9e44') + '">共 ' + rowc2.n + ' 个 · 每行 ' + rowc2.per + ' 个 → ' + rowc2.rows + ' 行' + (rowc2.rows > 5 ? '(超 QQ 上限 5 行, 发卡会报错!)' : '(≤5 行 ✅)') + '</span></div>'
+            ;(D.buttons || []).forEach(function (b, bi) {
+              var bt = (b.botAction && b.botAction.type) || 'reply_text'
+              var md = (b.llmEffect && b.llmEffect.mode) || 'no_append'
+              var ctx = (b.llmEffect && b.llmEffect.contextText) || ''
+              // 视觉隔离: 每加一个按钮, 与上一个之间加一条虚线 + 按钮序号, 一眼分清几组配置
+              body += '<div style="font-size:11px;color:#8b7cc7;margin:' + (bi > 0 ? '6px 0 0' : '2px 0 0') + '">── 按钮 ' + (bi + 1) + '</div>'
+              body += '<div class="dk-item" style="border:1px solid #f0ecff;border-radius:8px;margin:1px 0;padding:4px 6px">'
+                + '<input class="qqs-txt" data-bplabel="' + bi + '" value="' + esc(b.label) + '" placeholder="按钮文字" style="flex:1;min-width:90px">'
+                + '<select class="qqs-sel" data-bpact="' + bi + '">' + ['reply_text','jump_url','callback','command'].map(function (t) { return '<option value="' + t + '"' + (bt === t ? ' selected' : '') + '>' + ({ reply_text: '回文本', jump_url: '跳链接', callback: '仅结算', command: '执行命令' }[t]) + '</option>' }).join('') + '</select>'
+                + '<select class="qqs-sel" data-bpmode="' + bi + '">' + ['no_append','append_silent','append_wake'].map(function (m) { return '<option value="' + m + '"' + (md === m ? ' selected' : '') + '>' + ({ no_append: '不影响AI', append_silent: '记录不唤醒', append_wake: '记录并唤醒AI' }[m]) + '</option>' }).join('') + '</select>'
+                + '<button class="dk-btn no" data-bpdelbtn="' + bi + '">✕</button></div>'
+                // 动作参数行: 按类型给出对应输入(jump_url → 链接 URL; command → 命令名; 其余 → 回复文本)
+                + (bt === 'jump_url'
+                  ? '<input class="qqs-txt" data-bpurl="' + bi + '" value="' + esc((b.botAction && b.botAction.url) || '') + '" placeholder="🔗 链接地址, 如 https://www.baidu.com(QQ 点按钮直接跳转)" style="width:calc(100% - 8px);box-sizing:border-box;margin:0 0 4px 4px">'
+                  : '<input class="qqs-txt" data-bpacttext="' + bi + '" value="' + esc((b.botAction && b.botAction.text) || '') + '" placeholder="' + ({ reply_text: '点按钮后 bot 回复的内容', command: '执行的命令名(如 bot-status, 不带/)', callback: '(仅结算, 无需文本)' }[bt] || '') + '" style="width:calc(100% - 8px);box-sizing:border-box;margin:0 0 4px 4px">')
+                + '<input class="qqs-txt" data-bpctx="' + bi + '" value="' + esc(ctx) + '" placeholder="(记录/唤醒AI时)对AI说的话, 支持 {name} 事件名 {label} 按钮名; 空=默认" style="width:calc(100% - 8px);box-sizing:border-box;margin:0 0 2px 4px">'
+            })
+            body += '<div class="dk-row"><button class="dk-btn" id="dk-bp-addbtn">➕ 加按钮</button>'
+              + '<span class="dk-msg" id="dk-bp-addmsg">每行 ' + rowc2.per + ' 个 × 最多 5 行 = 上限 ' + (rowc2.per * 5) + ' 个(QQ 键盘: ≤5行 × 每行≤5)</span></div>'
+            body += '</div>'
+          }
         }
         body += status
         body += '<div class="dk-row" style="border-top:1px solid #f0ecff;padding-top:8px;margin-top:8px"><span class="dk-msg">登记群(官方无群列表,手动粘贴):</span>'
@@ -2265,6 +2500,7 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         if (state.tab === 'chat') renderChatList()
         if (state.tab === 'join') renderJoinList()
         if (state.tab === 'mute') { renderMemberList(); renderMuteList() }
+        if (state.tab === 'roster') { renderRosterList(); bindRosterEvents(); loadHubState() }
         // 首次进入聊天 tab 自动拉最新一页
         if (state.tab === 'chat' && !state.chatItems.length && !state.chatBusy) loadChat(true)
         setTimeout(layoutPanel, 0)
@@ -2276,6 +2512,7 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
             state.tab = btn.getAttribute('data-t'); state.msg = ''
             if (state.tab === 'join') loadJoins(); else if (state.tab === 'mute') loadMutes()
             else if (state.tab === 'out') loadOutMode()
+            else if (state.tab === 'bp') loadBotplay()
             else if (state.tab === 'chat') { state.chatItems = []; state.chatErr = ''; }
             paintBody()
           }
@@ -2393,6 +2630,190 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         }
         var bd = panel.querySelector('#dk-bind')
         if (bd) bd.onclick = function () { state.bindGid = (panel.querySelector('#dk-bindgid') || {}).value || ''; state.bindName = (panel.querySelector('#dk-bindname') || {}).value || ''; doBind() }
+        // ── 🎮 互动事件装配器: 列表选择/删除/新建/保存/编辑器字段 ──
+        var bpList = panel.querySelector('#dk-bp-list')
+        if (bpList) bpList.querySelectorAll('[data-bpidx]').forEach(function (it) {
+          it.onclick = function () {
+            var idx = Number(it.getAttribute('data-bpidx'))
+            state.bpSel = idx
+            state.bpDraft = JSON.parse(JSON.stringify(state.bpEvents[idx] || {}))
+            paintBody()
+          }
+        })
+        bpList && bpList.querySelectorAll('[data-bpdel]').forEach(function (b) {
+          b.onclick = function (e) {
+            e.stopPropagation()
+            var idx = Number(b.getAttribute('data-bpdel'))
+            state.bpEvents.splice(idx, 1)
+            if (state.bpSel === idx) { state.bpSel = null; state.bpDraft = null }
+            else if (state.bpSel !== null && state.bpSel > idx) state.bpSel -= 1
+            paintBody()
+          }
+        })
+        var bpNew = panel.querySelector('#dk-bp-new')
+        if (bpNew) bpNew.onclick = function () {
+          state.bpSel = null
+          state.bpDraft = { id: '', name: '', maxClicks: 0, expireSec: 600, buttonsPerRow: 1, perm: { type: 'all', userIds: [] }, buttons: [{ id: 'b1', label: '按钮', botAction: { type: 'reply_text', text: '' }, llmEffect: { mode: 'no_append', contextText: '' } }] }
+          paintBody()
+        }
+        // 编辑器字段(名称/id/有效期/总次数/权限)
+        var bpName = panel.querySelector('#dk-bp-name')
+        if (bpName) bpName.oninput = function (e) { state.bpDraft.name = e.target.value }
+        var bpId = panel.querySelector('#dk-bp-id')
+        if (bpId) bpId.oninput = function (e) { state.bpDraft.id = e.target.value.trim() }
+        var bpPerm = panel.querySelector('#dk-bp-perm')
+        if (bpPerm) bpPerm.onchange = function (e) {
+          state.bpDraft.perm = state.bpDraft.perm || {}
+          state.bpDraft.perm.type = e.target.value
+          paintBody() // users 档要显示 openid 输入框
+        }
+        var bpUsers = panel.querySelector('#dk-bp-users')
+        if (bpUsers) bpUsers.oninput = function (e) {
+          state.bpDraft.perm = state.bpDraft.perm || {}
+          state.bpDraft.perm.userIds = String(e.target.value || '').split(/[,，\s]+/).map(function (s) { return s.trim() }).filter(Boolean)
+        }
+        var bpExpire = panel.querySelector('#dk-bp-expire')
+        if (bpExpire) bpExpire.oninput = function (e) { state.bpDraft.expireSec = Math.max(30, Number(e.target.value) || 600) }
+        var bpMax = panel.querySelector('#dk-bp-max')
+        if (bpMax) bpMax.oninput = function (e) { state.bpDraft.maxClicks = Math.max(0, Number(e.target.value) || 0) }
+        var bpPerRow = panel.querySelector('#dk-bp-perrow')
+        if (bpPerRow) bpPerRow.oninput = function (e) { state.bpDraft.buttonsPerRow = Math.max(1, Math.min(5, Math.round(Number(e.target.value)) || 1)); bpLayoutHint() }
+        // 按钮行编辑(label/botAction.type/llmEffect.mode/删除/回复文本/对AI说的话)
+        var bpBtns = panel.querySelectorAll('[data-bplabel]')
+        bpBtns.forEach(function (inp) {
+          var bi = Number(inp.getAttribute('data-bplabel'))
+          inp.oninput = function (e) {
+            state.bpDraft.buttons[bi].label = e.target.value
+            if (!state.bpDraft.buttons[bi].id) state.bpDraft.buttons[bi].id = 'b' + (bi + 1)
+          }
+        })
+        var bpActs = panel.querySelectorAll('[data-bpact]')
+        bpActs.forEach(function (sel) {
+          var bi = Number(sel.getAttribute('data-bpact'))
+          sel.onchange = function (e) {
+            state.bpDraft.buttons[bi].botAction = state.bpDraft.buttons[bi].botAction || {}
+            state.bpDraft.buttons[bi].botAction.type = e.target.value
+          }
+        })
+        var bpModes = panel.querySelectorAll('[data-bpmode]')
+        bpModes.forEach(function (sel) {
+          var bi = Number(sel.getAttribute('data-bpmode'))
+          sel.onchange = function (e) {
+            state.bpDraft.buttons[bi].llmEffect = state.bpDraft.buttons[bi].llmEffect || {}
+            state.bpDraft.buttons[bi].llmEffect.mode = e.target.value
+          }
+        })
+        var bpTexts = panel.querySelectorAll('[data-bpacttext]')
+        bpTexts.forEach(function (inp) {
+          var bi = Number(inp.getAttribute('data-bpacttext'))
+          inp.oninput = function (e) {
+            state.bpDraft.buttons[bi].botAction = state.bpDraft.buttons[bi].botAction || {}
+            state.bpDraft.buttons[bi].botAction.text = e.target.value
+          }
+        })
+        // 跳链接按钮的 URL 输入
+        var bpUrls = panel.querySelectorAll('[data-bpurl]')
+        bpUrls.forEach(function (inp) {
+          var bi = Number(inp.getAttribute('data-bpurl'))
+          inp.oninput = function (e) {
+            state.bpDraft.buttons[bi].botAction = state.bpDraft.buttons[bi].botAction || {}
+            state.bpDraft.buttons[bi].botAction.url = e.target.value
+          }
+        })
+        var bpCtxs = panel.querySelectorAll('[data-bpctx]')
+        bpCtxs.forEach(function (inp) {
+          var bi = Number(inp.getAttribute('data-bpctx'))
+          inp.oninput = function (e) {
+            state.bpDraft.buttons[bi].llmEffect = state.bpDraft.buttons[bi].llmEffect || {}
+            state.bpDraft.buttons[bi].llmEffect.contextText = e.target.value
+          }
+        })
+        var bpDelBtn = panel.querySelectorAll('[data-bpdelbtn]')
+        bpDelBtn.forEach(function (b) {
+          b.onclick = function () {
+            state.bpDraft.buttons.splice(Number(b.getAttribute('data-bpdelbtn')), 1)
+            paintBody()
+          }
+        })
+        var bpAddBtn = panel.querySelector('#dk-bp-addbtn')
+        if (bpAddBtn) bpAddBtn.onclick = function () {
+          var cap = Math.max(1, Math.min(5, Math.round(Number(state.bpDraft.buttonsPerRow)) || 1)) * 5
+          if (state.bpDraft.buttons.length >= cap) return
+          state.bpDraft.buttons.push({ id: 'b' + (state.bpDraft.buttons.length + 1), label: '按钮', botAction: { type: 'reply_text', text: '' }, llmEffect: { mode: 'no_append', contextText: '' } })
+          paintBody()
+        }
+        var bpSave = panel.querySelector('#dk-bp-save')
+        if (bpSave) bpSave.onclick = saveBotplay
+      }
+      // QQ 键盘布局限制(官方 API): 键盘最多 5 行 × 每行最多 5 个按钮 → 行数=ceil(按钮数/每行数)≤5 才合法
+      function bpRowCount(ev) {
+        var per = Math.max(1, Math.min(5, Math.round(Number(ev.buttonsPerRow)) || 1))
+        var n = (ev.buttons || []).length
+        return { n: n, per: per, rows: Math.ceil(n / per) }
+      }
+      // 编辑器内实时刷新布局提示(改「每行按钮」时调用, 不重建 DOM 保输入焦点)
+      function bpLayoutHint() {
+        if (!state.bpDraft || !panel) return
+        var el = panel.querySelector('#dk-bp-layout')
+        if (!el) return
+        var c = bpRowCount(state.bpDraft)
+        var over = c.rows > 5
+        el.textContent = '共 ' + c.n + ' 个 · 每行 ' + c.per + ' 个 → ' + c.rows + ' 行' + (over ? '(超 QQ 上限 5 行, 发卡会报错!)' : '(≤5 行 ✅)')
+        el.style.color = over ? '#e03131' : '#2f9e44'
+      }
+      // 🎮 互动事件装配器: 读/存(全量 patch 只带 botplayEvents; settings.update 部分合并 + revision 乐观锁)
+      function loadBotplay() {
+        if (state.tab !== 'bp') return
+        fetch(READ + (state.ns ? '?' + outNsQ() : '')).then(function (r) { return r.json() }).then(function (d) {
+          if (d && d.value) {
+            state.bpEvents = Array.isArray(d.value.botplayEvents) ? JSON.parse(JSON.stringify(d.value.botplayEvents)) : []
+            if (!state.bpDraft && state.bpEvents.length) { state.bpSel = 0; state.bpDraft = JSON.parse(JSON.stringify(state.bpEvents[0])) }
+            else if (!state.bpEvents.length) { state.bpSel = null; state.bpDraft = null }
+            paintBody()
+          }
+        }).catch(function () {})
+      }
+      function saveBotplay() {
+        var hint = panel.querySelector('#dk-bp-hint')
+        var ok = function (v) { if (hint) hint.textContent = v }
+        // 草稿回写进列表(存在编辑中草稿时)
+        if (state.bpDraft) {
+          var draft = state.bpDraft
+          if (!draft.id || !/^[A-Za-z0-9_-]+$/.test(draft.id)) { ok('⚠️ id 必填且只能 字母/数字/_/-'); return }
+          if (!draft.name || !draft.name.trim()) { ok('⚠️ 事件名必填'); return }
+          if (!Array.isArray(draft.buttons) || !draft.buttons.length) { ok('⚠️ 至少 1 个按钮'); return }
+          var dupId = false
+          state.bpEvents.forEach(function (ev, i) { if (ev.id === draft.id && i !== state.bpSel) dupId = true })
+          if (dupId) { ok('⚠️ 事件 id 重复: ' + draft.id); return }
+          var draftRow = bpRowCount(draft)
+          if (draftRow.rows > 5) { ok('⚠️ 「' + draft.name + '」按钮布局超限: ' + draftRow.n + ' 个按钮 × 每行 ' + draftRow.per + ' 个 = ' + draftRow.rows + ' 行(QQ 键盘最多 5 行)'); return }
+          if (state.bpSel !== null && state.bpEvents[state.bpSel]) state.bpEvents[state.bpSel] = JSON.parse(JSON.stringify(draft))
+          else { state.bpEvents.push(JSON.parse(JSON.stringify(draft))); state.bpSel = state.bpEvents.length - 1 }
+        }
+        var badEv = null
+        state.bpEvents.forEach(function (ev) { var c = bpRowCount(ev); if (c.rows > 5 && !badEv) badEv = { name: ev.name, per: c.per, rows: c.rows } })
+        if (badEv) { ok('⚠️ 事件「' + badEv.name + '」每行 ' + badEv.per + ' 个 → ' + badEv.rows + ' 行, 超 QQ 5 行上限, 未保存'); return }
+        if (hint) hint.textContent = '保存中…'
+        var trySave = function (curVal, curRev) {
+          var patch = Object.assign({}, curVal || {}, { botplayEvents: state.bpEvents })
+          return fetch(UPDATE, {
+            method: 'POST', headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({ ns: state.ns || undefined, patch: patch, expectedRevision: curRev }),
+          }).then(function (r) { return r.json().catch(function () { return null }) }).then(function (d) {
+            if (d && d.value) {
+              state.bpEvents = Array.isArray(d.value.botplayEvents) ? d.value.botplayEvents : []
+              var h2 = panel.querySelector('#dk-bp-hint'); if (h2) h2.textContent = '✅ 已保存(共 ' + state.bpEvents.length + ' 个事件, live 热更已生效)' 
+            } else {
+              var conflicted = !!(d && d.error && String(d.error).indexOf('changed since it was read') >= 0)
+              if (conflicted) { fetch(READ + (state.ns ? '?' + outNsQ() : '')).then(function (r) { return r.json() }).then(function (dd) { if (dd && dd.value) trySave(dd.value, dd.revision) }).catch(function () {}) }
+              else { var h3 = panel.querySelector('#dk-bp-hint'); if (h3) h3.textContent = '保存失败: ' + ((d && d.error) || '未知错误') }
+            }
+          }).catch(function () { var h4 = panel.querySelector('#dk-bp-hint'); if (h4) h4.textContent = '保存异常' })
+        }
+        fetch(READ + (state.ns ? '?' + outNsQ() : '')).then(function (r) { return r.json() }).then(function (d0) {
+          if (d0 && d0.value) trySave(d0.value, d0.revision)
+          else { var h5 = panel.querySelector('#dk-bp-hint'); if (h5) h5.textContent = '保存失败: 无法读取当前设置' }
+        }).catch(function () { var h6 = panel.querySelector('#dk-bp-hint'); if (h6) h6.textContent = '保存失败: 读取异常' })
       }
       // ── 💬 聊天视图: 数据拉取 / QQ 风格气泡渲染 / 顶部滚动分页 ──
       function chatPeerReady() {

package/dist/channel-tools.d.ts

@@ -10,5 +10,5 @@ export declare const name = "qqbot-channel-tools";
 export declare const inject: string[];
 export declare function setChannelBridge(b: QQChannel | undefined): void;
 /** 装载本插件时把 qqChannel 一并注入(由 dsh-qqbot setup 提供) */
-export declare function apply(ctx: Context): void;
+export declare function apply(ctx: Context): Promise<void>;
 //# sourceMappingURL=channel-tools.d.ts.map

package/dist/channel-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel-tools.d.ts","sourceRoot":"","sources":["../src/channel-tools.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AA+BlE,6DAA6D;AAC7D,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,eAAO,MAAM,IAAI,wBAAwB,CAAC;AAC1C,eAAO,MAAM,MAAM,UAAY,CAAC;AAShC,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,CAI/D;AAqED,mDAAmD;AACnD,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAmxBxC"}
+{"version":3,"file":"channel-tools.d.ts","sourceRoot":"","sources":["../src/channel-tools.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAqDlE,6DAA6D;AAC7D,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,cAAc,CAAC;IACxB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,eAAO,MAAM,IAAI,wBAAwB,CAAC;AAC1C,eAAO,MAAM,MAAM,UAAY,CAAC;AAShC,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,CAI/D;AAqED,mDAAmD;AACnD,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAu4BvD"}