@zaofan/dsh-qqbot 1.5.28 → 1.5.31

package/README_EN.md

@@ -30,9 +30,9 @@ The little ball at the corner of the settings panel opens a whole control deck:
 **🖥️ No config-file surgery** — reply pacing, sticker gates, scheduled wake-ups, outbound mode and per-bot personas are all in the panel; saving applies live (only adding/removing bots needs a restart). There is even a ✏️ persona editor to tweak her "personality file" right in the browser.
 
 **📦 Clean & lean** — drive image sending / recall from plain text (`[MEDIA:image|path]` / `[RECALL]`); the repo contains no bot credentials or private data.
-
-**📱 No PC needed — she runs 24/7 on your phone**
-Pair her with the community [dsh-mobile-apk](https://github.com/kelai141/dsh-mobile-apk) (an **Android shell APK for dsh**: WebView UI + a bundled Termux runtime snapshot, unzip-and-run) and you get a QQ bot that stays online from your pocket — no dedicated computer to keep running. (Android usually has no ONNX runtime, so remember to tick **“Program fallback (no small model)”** in Settings — see the Android section below.)
+
+**📱 No PC needed — she runs 24/7 on your phone**
+Pair her with the community [dsh-mobile-apk](https://github.com/kelai141/dsh-mobile-apk) (an **Android shell APK for dsh**: WebView UI + a bundled Termux runtime snapshot, unzip-and-run) and you get a QQ bot that stays online from your pocket — no dedicated computer to keep running. (Android usually has no ONNX runtime, so remember to tick **“Program fallback (no small model)”** in Settings — see the Android section below.)
 
 ### 📸 Showcase
 
@@ -149,26 +149,26 @@ npm install --legacy-peer-deps     # install-time resolution only; runtime behav
 
 > Tracked: once upstream #37 is fixed and version lines converge, this section can be removed.
 
-### 📱 Deploy on Android — the pocket 24/7 setup
-
-[dsh-mobile-apk](https://github.com/kelai141/dsh-mobile-apk) is a community-built **Android shell APK for dsh**
-(WebView UI + a bundled Termux runtime snapshot — unzip and run). Install dsh there, then install this plugin
-into that dsh exactly as documented above, and you end up with a QQ bot that runs **24/7 from your phone**,
-with no PC left on.
-
-```
-Download APK:  https://github.com/kelai141/dsh-mobile-apk/releases
-(pick arm64 / x86_64 to match your phone's CPU)
-```
-
-> ⚠️ **Two switches you must turn on for Android** (otherwise she silently stops replying):
->
-> 1. **Settings → Smart reply → tick “Program fallback (no small model)”**
->    Phones usually have no ONNX runtime, so the real embedding model fails to load. With the fallback on,
->    scoring switches to **character n-gram lexical similarity** (zero dependencies, zero tokens) and works.
-> 2. **System settings → Battery → allow background activity / add to the power-saving whitelist**
->    Otherwise the OS kills the Termux process once the screen is off and the bot goes offline.
-
+### 📱 Deploy on Android — the pocket 24/7 setup
+
+[dsh-mobile-apk](https://github.com/kelai141/dsh-mobile-apk) is a community-built **Android shell APK for dsh**
+(WebView UI + a bundled Termux runtime snapshot — unzip and run). Install dsh there, then install this plugin
+into that dsh exactly as documented above, and you end up with a QQ bot that runs **24/7 from your phone**,
+with no PC left on.
+
+```
+Download APK:  https://github.com/kelai141/dsh-mobile-apk/releases
+(pick arm64 / x86_64 to match your phone's CPU)
+```
+
+> ⚠️ **Two switches you must turn on for Android** (otherwise she silently stops replying):
+>
+> 1. **Settings → Smart reply → tick “Program fallback (no small model)”**
+>    Phones usually have no ONNX runtime, so the real embedding model fails to load. With the fallback on,
+>    scoring switches to **character n-gram lexical similarity** (zero dependencies, zero tokens) and works.
+> 2. **System settings → Battery → allow background activity / add to the power-saving whitelist**
+>    Otherwise the OS kills the Termux process once the screen is off and the bot goes offline.
+
 ### First launch & binding
 
 Start `dsh web`. If credentials are missing, the **QR flow** starts automatically: a QR code is printed in the
@@ -366,7 +366,7 @@ Then run `/tools-reload` (or ask the AI to call the `tools_reload` tool). Comman
 **For AI agents — you can write these yourself (no feature request needed):**
 - Card bodies are **plain markdown you write** (`#`, bold, `![alt](url)`, fenced code). This plugin has **no template engine — the model is the engine**. Cards with buttons go through a botplay event or the dock card editor (button callbacks must be registered host-side).
 - Extensions live in the **account data directory** (`.qqbot-extensions/`), never inside the plugin package → **upgrading or reinstalling the plugin never overwrites them**.
-- `run(args, env)` receives `env = { cwd, manager, sender, replyTarget, exec }`. `sender` + `replyTarget` is the very same sender the built-in `send_media` tool uses, so a tool can **post markdown cards / images / voice / files by itself**: "fetch an API → build markdown → send" closes the loop inside one tool.
+- `run(args, env)` receives `env = { cwd, manager, sender, replyTarget, exec, ctx, logger }`. `sender` + `replyTarget` is the very same sender the built-in `send_media` tool uses, so a tool can **post markdown cards / images / voice / files by itself**: "fetch an API → build markdown → send" closes the loop inside one tool. `ctx` is the **host plugin context** (same origin as the built-in tools, available since 1.5.30), so an extension can call host services on its own — e.g. `ctx.compaction.compactNow(agent, exec.signal, id)` to compact the session, or `ctx.get('service')` to probe an optional one; `logger` comes with it. ⚠️ Same privilege level as built-in tools — only for extensions **you wrote yourself** in your own data root.
 - Tools reply `{ ok, msg }` (fed back to you as the tool result); commands return plain text.
 - Hot reload: `/tools-reload` (or call `tools_reload`) picks up **new** tools; **editing a tool under the same name is skipped by the registry → rename it or restart the host**; commands always need a restart.
 - Limitation: extensions **cannot register button callbacks** — those require a botplay event or the dock card editor. Extension-only flows are "card + user replies a number", with the AI acting as the state machine.

package/client/qqbot-settings.js

@@ -2641,7 +2641,10 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
       }
       function groupSelName() {
         var g = null; state.groups.forEach(function (x) { if (x.gid === state.gid) g = x })
-        return g ? g.name || state.gid.slice(0, 10) : '(未选群)'
+        if (g) return g.name || state.gid.slice(0, 10)
+        // 2026-10-01: gid 有值但没在台账里(群未登记/刚切实例还没拉到列表)时, 别硬显示"(未选群)"
+        //   —— 那会让人以为没选中目标; 退化成 gid 前段更好定位
+        return state.gid ? state.gid.slice(0, 10) : '(未选群)'
       }
       function c2cSelName() {
         if (state.sendName) return state.sendName
@@ -3970,6 +3973,20 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           if (state.tab !== 'chat' || !state.chatMore || state.chatBusy) return
           if (cbox.scrollTop <= 4) loadChat(false) // 顶部 → 加载更早
         }
+        // 2026-10-01 主人要求：「滚轮向下滚一次就刷新一下」——**不管有没有滚动成功**
+        //   （已经停在底部也刷：方便随时确认有没有新消息，比每个来回点 🔄 刷新省事）。
+        //   向上滚不拦（交给上面的"到顶部加载更早"，两个功能不打架）。
+        //   ⚠️ 一次滚轮会连发多个 wheel 事件 → 按 400ms 时间窗合并成一次，避免刷爆；
+        //   ⚠️ 加载中(busy)直接跳过，别打断正在进行的请求。
+        if (cbox) cbox.onwheel = function (e) {
+          if (state.tab !== 'chat') return
+          if (e && e.deltaY <= 0) return
+          var now = Date.now()
+          if (now - (state.chatWheelAt || 0) < 400) return
+          state.chatWheelAt = now
+          if (state.chatBusy) return
+          loadChatNewer()   // ★ 增量: 只把新消息接在下面, 不重绘不闪不跳位置
+        }
         var cinput = panel.querySelector('#dk-chat-input')
         if (cinput) {
           cinput.oninput = function (e) {
@@ -4310,6 +4327,11 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           state.chatMore = d.hasMore === true
           state.chatErr = ''
           state.chatOldest = state.chatItems.length ? state.chatItems[0].seq : 0
+          // 2026-10-01: 记住"已加载到的**最新事件 seq**" —— 滚轮增量刷新(loadChatNewer)的起点。
+          //   ⚠️ 不能拿 d.tailSeq(= sess.seq = 下一个可用 seq): 正扫是 afterSeq+1 起, 记大会**漏一条/取不到**。
+          var _maxSeq = 0
+          state.chatItems.forEach(function (x) { var n = Number(x.seq); if (n > _maxSeq) _maxSeq = n })
+          state.chatNewest = _maxSeq
           renderChatList(mode === 'more' ? keep : null)
         }).catch(function () {
           state.chatBusy = ''
@@ -4357,26 +4379,21 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         try { dd = curDataDir() || '' } catch (e) { dd = '' }
         return '/api/qqbot-settings/sticker-img?id=' + encodeURIComponent(idm[1]) + (dd ? '&dataDir=' + encodeURIComponent(dd) : '')
       }
-      function renderChatList(keepScrollOffset) {
-        var box = document.getElementById('dk-chat-box')
-        if (!box) return
+      // 2026-10-01: 状态行单独成函数 —— 增量追加新消息后只更新这行, 不重绘整个列表
+      function updateChatStatus() {
         var st = document.getElementById('dk-chat-status')
-        if (st) {
-          if (state.chatBusy === 'send') st.textContent = '发送中…'
-          else if (chatFlash) st.textContent = chatFlash
-          else if (state.chatBusy) st.textContent = state.chatBusy === 'chat' ? '加载中…' : '加载更早…'
-          else if (state.chatErr) st.textContent = state.chatErr
-          else if (!state.chatItems.length) st.textContent = '暂无记录 —— 机器人和该目标聊过后会显示在这里'
-          else st.textContent = '共 ' + state.chatItems.length + ' 条 · ' + chatPeerName() + (state.chatMore ? ' · 上滑加载更早' : ' · 已到最早')
-        }
-        if (!state.chatItems.length) {
-          var emptyTxt = state.chatErr || (!chatPeerReady() ? '先选一个群/私聊目标' : '还没有聊天记录(该目标暂无活跃会话)')
-          box.innerHTML = '<div class="dk-empty" style="padding:26px 0">' + esc(emptyTxt) + '</div>'
-          return
-        }
-        var html = ''
-        if (state.chatMore) html += '<div class="dk-chat-top">↑ 上滑加载更早消息</div>'
-        html += state.chatItems.map(function (it) {
+        if (!st) return
+        if (state.chatBusy === 'send') st.textContent = '发送中…'
+        else if (chatFlash) st.textContent = chatFlash
+        else if (state.chatBusy === 'new') st.textContent = '检查新消息…'
+        else if (state.chatBusy) st.textContent = state.chatBusy === 'chat' ? '加载中…' : '加载更早…'
+        else if (state.chatErr) st.textContent = state.chatErr
+        else if (!state.chatItems.length) st.textContent = '暂无记录 —— 机器人和该目标聊过后会显示在这里'
+        else st.textContent = '共 ' + state.chatItems.length + ' 条 · ' + chatPeerName() + (state.chatMore ? ' · 上滑加载更早' : ' · 已到最早')
+      }
+      // 2026-10-01: 单条气泡 HTML 抽成函数 —— renderChatList 与"增量追加"共用同一套渲染
+      function chatRowHTML(it) {
+        {
           var isOut = it.dir === 'out'
           var who = isOut ? '我' : (it.sender || (state.sendScope === 'c2c' ? c2cSelName() : '群友'))
           var ava = isOut ? '🐳' : chatAvaOf(who)
@@ -4407,11 +4424,13 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
             + '<div class="dk-cbubble">' + imgs + txt + '</div>'
             + '</div>'
             + '</div>'
-        }).join('')
-        html += '<div class="dk-chat-bottom">—— 会话尾部 · ' + esc(chatPeerName()) + ' ——</div>'
-        box.innerHTML = html
+        }
+      }
+      // 2026-10-01: 图片交互绑定抽成函数(增量追加的新节点也要绑; 属性赋值 → 幂等)
+      function bindChatImgs(root) {
+        if (!root) return
         // 图片: 单击/右键 → 灯箱放大(右键不再弹浏览器菜单, 避免误触发 onerror 变加载失败)
-        box.querySelectorAll('img.dk-img').forEach(function (img) {
+        root.querySelectorAll('img.dk-img').forEach(function (img) {
           var lbOf = function () { return img.getAttribute('data-lb') || img.src }
           img.onclick = function (e) { e.preventDefault(); e.stopPropagation(); openLightbox(lbOf()) }
           img.oncontextmenu = function (e) { e.preventDefault(); e.stopPropagation(); openLightbox(lbOf()) }
@@ -4429,14 +4448,108 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
             img.outerHTML = '<span style="color:#888">[图加载失败]</span>'
           }
         })
+      }
+      function renderChatList(keepScrollOffset) {
+        var box = document.getElementById('dk-chat-box')
+        if (!box) return
+        updateChatStatus()
+        if (!state.chatItems.length) {
+          var emptyTxt = state.chatErr || (!chatPeerReady() ? '先选一个群/私聊目标' : '还没有聊天记录(该目标暂无活跃会话)')
+          box.innerHTML = '<div class="dk-empty" style="padding:26px 0">' + esc(emptyTxt) + '</div>'
+          return
+        }
+        var html = ''
+        if (state.chatMore) html += '<div class="dk-chat-top">↑ 上滑加载更早消息</div>'
+        html += state.chatItems.map(chatRowHTML).join('')
+        html += '<div class="dk-chat-bottom">—— 会话尾部 · ' + esc(chatPeerName()) + ' ——</div>'
+        box.innerHTML = html
+        bindChatImgs(box)
         // 滚动: 刷新/切目标 → 滚到底; 上滚加载更早 → 保持视口
-        if (keepScrollOffset == null) box.scrollTop = box.scrollHeight
+        if (keepScrollOffset == null) {
+          box.scrollTop = box.scrollHeight
+          // 2026-10-01 主人实测「打开 dock 显示的不是最新消息」：
+          //   气泡里的图是 loading="lazy"，刚渲染时高度还没撑开 → 首次贴底其实只贴到"半截"，
+          //   等图加载完内容变高，视口就停在中间了。这里随后再补贴几次；
+          //   用户一旦手动滚（wheel）立刻停手，不跟他抢滚动条。
+          var stickCancel = false
+          try { box.addEventListener('wheel', function () { stickCancel = true }, { once: true, passive: true }) } catch (e) { /* 老浏览器忽略 */ }
+          var stickBottom = function () { if (!stickCancel) box.scrollTop = box.scrollHeight }
+          setTimeout(stickBottom, 80)
+          setTimeout(stickBottom, 240)
+          setTimeout(stickBottom, 600)
+          setTimeout(stickBottom, 1200)
+        }
         else box.scrollTop = box.scrollHeight - keepScrollOffset
       }
+      // 2026-10-01 主人要求：滚轮向下 → **增量**追加新消息
+      //   · 只 append 新气泡（不 box.innerHTML 重绘 → **不闪**）
+      //   · **不动 scrollTop**（不跳位置；想看最新的自己继续滑）
+      function appendChatRows(list) {
+        var box = document.getElementById('dk-chat-box')
+        if (!box || !Array.isArray(list) || !list.length) return
+        var html = list.map(chatRowHTML).join('')
+        var tail = box.querySelector('.dk-chat-bottom')
+        if (tail) tail.insertAdjacentHTML('beforebegin', html)
+        else box.insertAdjacentHTML('beforeend', html)
+        bindChatImgs(box)
+      }
+      // 滚轮触发的"取更新的消息"：afterSeq = 当前已加载的最新位置
+      function loadChatNewer() {
+        if (!state.ns || !chatPeerReady() || state.chatBusy) return
+        var after = Number(state.chatNewest || 0)
+        if (!(after > 0)) { loadChat(true); return }   // 还没加载过 → 走整页首屏
+        state.chatBusy = 'new'
+        updateChatStatus()
+        var peerId = state.sendScope === 'c2c' ? state.sendTo : state.gid
+        var q = 'ns=' + encodeURIComponent(state.ns) + '&scope=' + state.sendScope
+          + '&peerId=' + encodeURIComponent(peerId) + '&afterSeq=' + after + '&limit=100'
+        api('chat/history', q).then(function (d) {
+          state.chatBusy = ''
+          if (!d || !d.ok) { updateChatStatus(); return }
+          var list = (Array.isArray(d.items) ? d.items : []).filter(function (it) {
+            return it && ((typeof it.text === 'string' && it.text) || (Array.isArray(it.images) && it.images.length))
+          })
+          // 去重键含 seq+方向+正文前缀 —— 群历史打包块里多条共用同一 seq, 只按 seq 去重会误删
+          var keyOf = function (x) { return String(x.seq) + '|' + String(x.dir) + '|' + String(x.text || '').slice(0, 24) }
+          var have = {}
+          state.chatItems.forEach(function (x) { have[keyOf(x)] = 1 })
+          // ⚠️ 2026-10-01 主人实测「向下滚后最新消息后面冒出历史消息」：
+          //   群打包块([历史]…[/历史])会被拆成多条挂在**同一个新 seq** 上, 内容却是**更早**的消息;
+          //   不过滤就会被当新事件整块接到列表尾部。只收"时间不早于列表尾部那条"的条目。
+          var _tailT = state.chatItems.length ? (Number(state.chatItems[state.chatItems.length - 1].time) || 0) : 0
+          var fresh = list.filter(function (x) {
+            return !have[keyOf(x)] && (Number(x.time) || 0) >= _tailT
+          })
+          if (fresh.length) {
+            state.chatItems = state.chatItems.concat(fresh)
+            appendChatRows(fresh)          // ★ 增量追加: 不重绘、不闪、不跳位置
+          }
+          // 已加载位置 = 列表里最大的事件 seq（同 ①：不能用 tailSeq）
+          state.chatItems.forEach(function (x) { var n = Number(x.seq); if (n > state.chatNewest) state.chatNewest = n })
+          updateChatStatus()
+        }).catch(function () { state.chatBusy = ''; updateChatStatus() })
+      }
       // 聊天文本渲染(2026-09-13 引用消息功能): 把引用块渲染成"引用样式"气泡(左边框+灰底), 其余正文照常。
       //   2026-09-15 标记改短([引]…[/引][当前]) —— **新旧都认**, 否则老会话里的英文标记会显示成裸文本。
       function chatRenderText(t) {
-        var src = String(t || '').replace(/\[(?:当前|Current message)\]\s*/g, '')
+        var src = String(t || '')
+          .replace(/\[(?:当前|Current message)\]\s*/gi, '')
+          // 2026-10-01: 历史块标记(新旧)一律剥掉 —— 后端已把历史段拆成独立气泡, 这里兜底老会话/异常残留
+          .replace(/\[(?:\/?历史|\/?(?:Chat history begins|Chat history ends))\]/gi, '')
+          // 后端把引用块折叠成 `[引用]` → 渲染成灰色提示文字, 别显示成裸方括号(也不该被当发送者)
+          .replace(/\[引用\]/g, '↩ 引用上文')
+          // 媒体标记残留兜底(后端已抽成缩略图/播放器): **只显文件名, 不把本机绝对路径暴露在气泡里**
+          .replace(/\[(图片|附件|文件|语音|视频|音频|Image|Video|Voice|File|Attachment):\s*([^\]]*)\]/gi, function (all, tag, inner) {
+            var s = String(inner || '').trim()
+            if (!s) return ''
+            var tg = String(tag).toLowerCase()
+            var icon = (tg === '图片' || tg === 'image') ? '🖼'
+              : (tg === '视频' || tg === 'video') ? '🎬'
+                : (tg === '语音' || tg === '音频' || tg === 'voice') ? '🎵' : '📎'
+            if (/^https?:/i.test(s)) return icon + ' 媒体'
+            var nm = s.replace(/[?#].*$/, '').split(/[\\/]/).pop() || s
+            return icon + ' ' + nm
+          })
         var re = /\[(?:引|Quoted message begins)\]([\s\S]*?)\[\/(?:引|Quoted message ends)\]/g
         var parts = []
         var m, last = 0
@@ -4454,6 +4567,9 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
       function chatAvaOf(who) {
         var s = String(who || '').trim()
         if (!s) return '?'
+        // 脏数据兜底(2026-10-01): 万一 sender 还是块标记/方括号壳, 别把 "[" 当头像字
+        s = s.replace(/^[\[［(（【]+|[\]］)）】]+$/g, '').trim()
+        if (!s || /^(?:历|历史|当前|引|引用|(?:Chat history|Quoted message|Current message)(?:\s+begins|\s+ends)?)$/i.test(s)) return '❔'
         try { return Array.from(s)[0] } catch (e) { return s[0] || '?' }
       }
       function setChatStatus(msg) {