@zaofan/dsh-qqbot 1.5.1 → 1.5.4

package/README_EN.md

@@ -4,8 +4,8 @@ An **enhanced fork** of the QQ Bot IM plugin for [deepseek-harness](https://gith
 
 📦 Repo: [gcry13067381632-jpg/dsh-qqbot](https://github.com/gcry13067381632-jpg/dsh-qqbot) (forked from [tencent-connect/dsh-qqbot](https://github.com/tencent-connect/dsh-qqbot))
 
-> ⭐ **If it works well for you, please star the repo** — it is the only visible signal that someone is using it, and it keeps the project going.
-
+> ⭐ **If it works well for you, please star the repo** — it is the only visible signal that someone is using it, and it keeps the project going.
+
 [中文文档](./README.md) | English
 
 ## 🐋 This fork (enhanced edition)
@@ -290,7 +290,7 @@ Please install the local small model used by the dsh qqbot plugin on this machin
 Every inbound message carries a **short message number** (e.g. `#0913a` — month/day + rolling id):
 
 ```
-[做早饭 (E9020753…) #0913a] take a look at this
+[Alice (12AB34…) #0913a] take a look at this
 ```
 
 - To quote a message, the AI writes `[rf:0913a]` in its reply body → the reply is sent as a **quote bubble** (the other side sees "she quoted this message"). The tag itself is never displayed.
@@ -410,10 +410,10 @@ export QQBOT_APPID="xxx" QQBOT_SECRET="xxx"
 npx @deepseek-ai/dsh web --patch /path/to/dsh-qqbot/cordis.dev.yml
 ```
 
-## Support
-
-If this plugin saved you some tokens — or made your QQ bot feel alive — a **⭐ Star** is the most concrete way to say thanks. Bugs and feature requests: [Issues](https://github.com/gcry13067381632-jpg/dsh-qqbot/issues).
-
+## Support
+
+If this plugin saved you some tokens — or made your QQ bot feel alive — a **⭐ Star** is the most concrete way to say thanks. Bugs and feature requests: [Issues](https://github.com/gcry13067381632-jpg/dsh-qqbot/issues).
+
 ## License
 
 [MIT](./LICENSE)

package/client/qqbot-settings.js

@@ -2125,7 +2125,9 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         var q = state.ns ? '?' + outNsQ() : ''
         Promise.all([
           fetch('/api/qqbot-settings/affinity' + q).then(function (r) { return r.json() }).catch(function () { return {} }),
-          fetch('/api/qqbot-settings/attitude' + q).then(function (r) { return r.json() }).catch(function () { return {} })
+          // all=1&limit=50: 这张表是"按 key 左连接好感度", 只要 top N 的话排在 N 后面的人永远显示 "—"
+          // (2026-09-15 主人问"小明不是有好感度吗, 怎么显示 0" —— 他 a=0.064 排第 9, 被 top8 截掉)。
+          fetch('/api/qqbot-settings/attitude' + q + (q ? '&' : '?') + 'all=1&limit=50').then(function (r) { return r.json() }).catch(function () { return {} })
         ]).then(function (rs) {
           var aff = (rs[0] && rs[0].items) || []
           var att = (rs[1] && rs[1].items) || []
@@ -2257,11 +2259,21 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
           valueGate: gateEl ? gateEl.value : 'log',
           valueMinScore: minEl ? (parseFloat(minEl.value) || 0.5) : 0.5,
         }
+        var apNext = null   // 附件唤醒新值(账号级): 保存成功后立刻写回本地缓存, 不等接口回读
         if (hint) hint.textContent = '保存中…'
         fetch(READ + (state.ns ? '?' + outNsQ() : '')).then(function (r) { return r.json() }).then(function (d) {
           var cur = (d && d.value) || {}
           var lm = Object.assign({}, cur.localModel || {})
           if (dirEl) lm.modelDir = String(dirEl.value || '').trim()      // 账号级
+          // 附件唤醒开关（账号级，2026-09-15）：勾了 = 该类附件无视分数直接唤醒
+          {
+            var apEls = panel ? panel.querySelectorAll('.dk-lm-ap') : []
+            if (apEls.length) {
+              lm.attachmentPassthrough = {}
+              apEls.forEach(function (el) { lm.attachmentPassthrough[el.getAttribute('data-kind')] = !!el.checked })
+              apNext = lm.attachmentPassthrough
+            }
+          }
           lm.overrides = Object.assign({}, (lm.overrides || {}))
           lm.overrides[ovKey] = ovNext                                    // 会话级
           var patch = Object.assign({}, cur, { localModel: lm })
@@ -2277,6 +2289,7 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
             lm2.overrides = Object.assign({}, (lm2.overrides || {}))
             lm2.overrides[ovKey] = ovNext
             if (dirEl) lm2.modelDir = String(dirEl.value || '').trim()
+            if (apNext) lm2.attachmentPassthrough = apNext   // 附件唤醒(账号级): 保存后立刻回填, 否则重绘又跳回默认勾选
             state.lmCfg = lm2
             paintBody()
             setTimeout(function () { loadLocalModel() }, 2000)
@@ -3559,6 +3572,24 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
               + '<span style="font-size:12px;color:#666">门槛:</span>'
               + '<input class="qqs-inp" id="dk-lm-min" type="number" step="0.01" min="0" max="1" style="width:78px" value="' + minV + '">'
               + '</div>'
+            // 🎬 附件唤醒开关（2026-09-15 主人定）：按类型决定"是否**无视分数**直接唤醒"
+            //   勾上 = 该类附件不管分多低都唤醒；没勾 = 交给评分决定（没文字没分 → 不唤醒）
+            {
+              // ⚠️ 2026-09-15 修(主人反馈"关掉图片唤醒, 保存后又跳回勾选"):
+              //   根因=这里只读 status 接口(lm)的字段, 而该接口的 bot.cfg 解析不到实例配置(实测一律
+              //   fallback: valueGate=log / 无 attachmentPassthrough) → 永远按默认渲染 → 看着像没保存。
+              //   实际 settings 里早就是 image:false(读接口 ?ns= 已证实)。所以**以 lmCfg(直读配置)为准**,
+              //   status 只兜底 —— 与 09-13 修 valueGate 同一个教训: 前端别依赖需要重启才对的 host 字段。
+              var apCfg = ((lmCfg && lmCfg.attachmentPassthrough) || lm.attachmentPassthrough || {})
+              var apDef = { image: true, video: false, voice: false, file: false }
+              body += '<div class="dk-row" style="gap:12px;flex-wrap:wrap;align-items:center;margin:4px 0 2px">'
+                + '<span style="font-size:12px;color:#666" title="勾上的类型：不管分数都唤醒她；没勾的按评分判（没文字就没分 → 不唤醒）">附件唤醒:</span>'
+                + [['image', '🖼 图片'], ['video', '🎬 视频'], ['voice', '🎤 语音'], ['file', '📎 文件']].map(function (k) {
+                    var on = apCfg[k[0]] === undefined ? apDef[k[0]] : apCfg[k[0]] === true
+                    return '<label style="display:inline-flex;align-items:center;gap:4px;font-size:12px;cursor:pointer"><input type="checkbox" class="dk-lm-ap" data-kind="' + k[0] + '"' + (on ? ' checked' : '') + '> ' + k[1] + '</label>'
+                  }).join('')
+                + '</div>'
+            }
             body += '<span class="dk-msg" id="dk-lm-hint" style="color:#2f9e44;margin:2px 0"></span>'
             // 📊 最近评分(观察期): 让主人直接看到"她是怎么被叫醒的"
             // 2026-09-13 二次修: 列表抽成 scoreListHtml + 独立 div, 由 refreshScoreList 做**局部刷新**
@@ -4266,11 +4297,11 @@ var QQS_CSS = ".qqs-btn{font:inherit;color:#333;background:linear-gradient(180de
         if (keepScrollOffset == null) box.scrollTop = box.scrollHeight
         else box.scrollTop = box.scrollHeight - keepScrollOffset
       }
-      // 聊天文本渲染(2026-09-13 引用消息功能): 把 [Quoted message begins]…[Quoted message ends] 块
-      // 渲染成"引用样式"气泡(左边框+灰底), 其余正文照常显示。没有引用块则整段照常。
+      // 聊天文本渲染(2026-09-13 引用消息功能): 把引用块渲染成"引用样式"气泡(左边框+灰底), 其余正文照常。
+      //   2026-09-15 标记改短([引]…[/引][当前]) —— **新旧都认**, 否则老会话里的英文标记会显示成裸文本。
       function chatRenderText(t) {
-        var src = String(t || '')
-        var re = /\[Quoted message begins\]([\s\S]*?)\[Quoted message ends\]/g
+        var src = String(t || '').replace(/\[(?:当前|Current message)\]\s*/g, '')
+        var re = /\[(?:引|Quoted message begins)\]([\s\S]*?)\[\/(?:引|Quoted message ends)\]/g
         var parts = []
         var m, last = 0
         while ((m = re.exec(src)) !== null) {

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;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AA2ElE,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;AAkFD,mDAAmD;AACnD,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAk1DvD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAwCvC"}
+{"version":3,"file":"channel-tools.d.ts","sourceRoot":"","sources":["../src/channel-tools.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AA2ElE,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;AAkFD,mDAAmD;AACnD,wBAAsB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAk3DvD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,mBAAmB,CACvC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,EAAE,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAwCvC"}

package/dist/channel-tools.js

@@ -2194,8 +2194,47 @@ export async function apply(ctx) {
             || process.cwd();
         const defs = await loadExtensionTools(extRoot, (ctx.logger ?? console));
         extDiag(`apply extRoot=${extRoot} defs=${defs.length} qqCh=${!!qqCh} bridge=${!!bridgeCh}`);
+        // ── 同名扩展工具「热替换」(2026-09-15 主人踩坑后加) ──────────────────────
+        //  症状: 改**已有**扩展工具的逻辑 → tools_reload 报"完成"，但跑的还是旧实现
+        //        （dsh 的 registry 对重名直接抛 'already registered'，这里只能 catch 跳过）。
+        //  根因: 上一版只"新增"，没有回收入口。而 `ctx.tools.register()` 其实**返回 disposer**
+        //        （dsh-tools 的 `register(definition): () => void`）→ 先 dispose 旧的再注册新的即可。
+        //  ⚠️ disposer 不能存在模块变量里: 热刷是用 `?hot=<ts>` 重新 import 本模块的，
+        //     新模块的模块级 Map 是空的、认不出上次注册的东西 → 必须存在 **globalThis 上的
+        //     WeakMap(ctx)** 才跨模块实例可见（也顺带不污染 ctx 对象）。
+        //  安全边界: 只 dispose"我们自己注册过、且名字对得上"的工具；别人注册的同名工具照旧走
+        //     原来的 catch 跳过分支（行为不变）。
+        const disposeStore = (() => {
+            const g = globalThis;
+            const KEY = Symbol.for('im-qqbot.extToolDisposers');
+            let store = g[KEY];
+            if (!store) {
+                store = new WeakMap();
+                g[KEY] = store;
+            }
+            return store;
+        })();
+        const myDisposers = (() => {
+            const k = ctx;
+            let m = disposeStore.get(k);
+            if (!m) {
+                m = new Map();
+                disposeStore.set(k, m);
+            }
+            return m;
+        })();
         for (const def of defs) {
             try {
+                // 同一个 ctx 再来一遍（热刷）= 更新已有工具：先摘掉我们自己上次注册的那份
+                const prev = myDisposers.get(def.name);
+                if (prev) {
+                    try {
+                        prev();
+                    }
+                    catch { /* 旧句柄已失效，忽略 */ }
+                    myDisposers.delete(def.name);
+                    extDiag(`热替换: 先注销旧 ${def.name}`);
+                }
                 const tool = defineTool({
                     name: def.name,
                     description: def.description + ' (用户扩展工具)',
@@ -2227,7 +2266,10 @@ export async function apply(ctx) {
                         }
                     },
                 });
-                ctx.tools.register(tool);
+                const dispose = ctx.tools.register(tool);
+                // 收下 disposer —— 下次(热刷/重装配)靠它做同名替换，不然只能重启宿主
+                if (typeof dispose === 'function')
+                    myDisposers.set(def.name, dispose);
                 ctx.logger?.info?.(`[channel-tools] 已注册扩展工具: ${def.name}`);
                 diag(`扩展工具注册成功: ${def.name}`);
                 extDiag(`注册成功: ${def.name}`);