@zaofan/dsh-qqbot 1.5.0 → 1.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/README_EN.md +7 -7
- package/client/qqbot-settings.js +52 -8
- package/dist/channel-tools.d.ts.map +1 -1
- package/dist/channel-tools.js +43 -1
- package/dist/channel-tools.js.map +1 -1
- package/dist/config.d.ts +34 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +17 -1
- package/dist/config.js.map +1 -1
- package/dist/features/agg-score.d.ts +1 -1
- package/dist/features/agg-score.js +1 -1
- package/dist/features/four-source.d.ts +46 -10
- package/dist/features/four-source.d.ts.map +1 -1
- package/dist/features/four-source.js +94 -17
- package/dist/features/four-source.js.map +1 -1
- package/dist/features/local-signals.js +2 -2
- package/dist/features/local-signals.js.map +1 -1
- package/dist/features/people-memo.js +1 -1
- package/dist/features/tendency-samples.d.ts.map +1 -1
- package/dist/features/tendency-samples.js +36 -0
- package/dist/features/tendency-samples.js.map +1 -1
- package/dist/features/value-sample.d.ts +3 -1
- package/dist/features/value-sample.d.ts.map +1 -1
- package/dist/features/value-sample.js +3 -1
- package/dist/features/value-sample.js.map +1 -1
- package/dist/features/value-score.d.ts +27 -0
- package/dist/features/value-score.d.ts.map +1 -1
- package/dist/features/value-score.js +72 -4
- package/dist/features/value-score.js.map +1 -1
- package/dist/gateway/debounce.d.ts.map +1 -1
- package/dist/gateway/debounce.js +28 -6
- package/dist/gateway/debounce.js.map +1 -1
- package/dist/shared/mention-clean.d.ts +13 -0
- package/dist/shared/mention-clean.d.ts.map +1 -1
- package/dist/shared/mention-clean.js +19 -0
- package/dist/shared/mention-clean.js.map +1 -1
- package/dist/transport/inbound.d.ts +10 -0
- package/dist/transport/inbound.d.ts.map +1 -1
- package/dist/transport/inbound.js +129 -51
- package/dist/transport/inbound.js.map +1 -1
- package/dist/transport/markers.d.ts +59 -0
- package/dist/transport/markers.d.ts.map +1 -0
- package/dist/transport/markers.js +97 -0
- package/dist/transport/markers.js.map +1 -0
- package/dist/transport/outbound.d.ts.map +1 -1
- package/dist/transport/outbound.js +3 -1
- package/dist/transport/outbound.js.map +1 -1
- package/docs/USER-GUIDE.md +461 -429
- package/package.json +124 -124
- package/settings-host.js +3095 -3071
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tendency-samples.js","sourceRoot":"","sources":["../../src/features/tendency-samples.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,gBAAgB,GAA4E;IACvG,EAAE,EAAE;QACF,EAAE,EAAE;YACF,iBAAiB;YACjB,kBAAkB;YAClB,kBAAkB;YAClB,iBAAiB;YACjB,kBAAkB;YAClB,iBAAiB;YACjB,kBAAkB;YAClB,gBAAgB;YAChB,kBAAkB;YAClB,kBAAkB;YAClB,iBAAiB;YACjB,kBAAkB;YAClB,iBAAiB;YACjB,iBAAiB;YACjB,iBAAiB;YACjB,iBAAiB;YACjB,kBAAkB;YAClB,kBAAkB;YAClB,iBAAiB;YACjB,oBAAoB;
|
|
1
|
+
{"version":3,"file":"tendency-samples.js","sourceRoot":"","sources":["../../src/features/tendency-samples.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,9 @@ export interface ValueSample {
|
|
|
7
7
|
src?: string;
|
|
8
8
|
}
|
|
9
9
|
/**
|
|
10
|
-
* 内置默认样例(
|
|
10
|
+
* 内置默认样例(56 条: 正 26 / 负 30) —— **新用户开箱即用的那一份**:
|
|
11
|
+
* 当 {dataRoot}/.qqbot/value-samples.jsonl 不存在、或存在但一行都解析不出来时用它兜底,
|
|
12
|
+
* 所以"没写过样例库"的用户也能立刻打分; 一旦用户/AI 写了第一条自己的样例, 就以文件为准。
|
|
11
13
|
* 正样例来自: 今天群里真实 @ 她/质疑她/求助她的消息 + 通用提问求助;
|
|
12
14
|
* 负样例来自: 群里真实短应答/表情/群友互聊 + 通用闲聊。
|
|
13
15
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value-sample.d.ts","sourceRoot":"","sources":["../../src/features/value-sample.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,WAAW;IAC1B,WAAW;IACX,CAAC,EAAE,MAAM,CAAC;IACV,0DAA0D;IAC1D,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACT,iCAAiC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED
|
|
1
|
+
{"version":3,"file":"value-sample.d.ts","sourceRoot":"","sources":["../../src/features/value-sample.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,WAAW;IAC1B,WAAW;IACX,CAAC,EAAE,MAAM,CAAC;IACV,0DAA0D;IAC1D,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACT,iCAAiC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,WAAW,EAyD9C,CAAC;AAEF,+DAA+D;AAC/D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,6BAA6B;AAC7B,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,EAAE,CAiBhE;AAED,qBAAqB;AACrB,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAS/E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,SAAM,GAAG,OAAO,CAKlG"}
|
|
@@ -9,7 +9,9 @@
|
|
|
9
9
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
10
10
|
import { dirname, join } from 'node:path';
|
|
11
11
|
/**
|
|
12
|
-
* 内置默认样例(
|
|
12
|
+
* 内置默认样例(56 条: 正 26 / 负 30) —— **新用户开箱即用的那一份**:
|
|
13
|
+
* 当 {dataRoot}/.qqbot/value-samples.jsonl 不存在、或存在但一行都解析不出来时用它兜底,
|
|
14
|
+
* 所以"没写过样例库"的用户也能立刻打分; 一旦用户/AI 写了第一条自己的样例, 就以文件为准。
|
|
13
15
|
* 正样例来自: 今天群里真实 @ 她/质疑她/求助她的消息 + 通用提问求助;
|
|
14
16
|
* 负样例来自: 群里真实短应答/表情/群友互聊 + 通用闲聊。
|
|
15
17
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value-sample.js","sourceRoot":"","sources":["../../src/features/value-sample.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAW1C
|
|
1
|
+
{"version":3,"file":"value-sample.js","sourceRoot":"","sources":["../../src/features/value-sample.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,31 @@
|
|
|
1
1
|
import type { Logger } from '../types.js';
|
|
2
|
+
/**
|
|
3
|
+
* 打分文本的 mention 归一化(2026-09-15 主人实测后加)。
|
|
4
|
+
*
|
|
5
|
+
* 症状:样例带 `@bot …` 前缀、入站文本带 `<@openid> …` →
|
|
6
|
+
* 两者的**最大共同特征**变成"这条 @ 了她",语义被前缀淹没:
|
|
7
|
+
* 实测「<@xx> 不知道」拿到 **1.00**(近邻全是 `@bot …`:这个bug你修一下 / 继续找 / 大不大),
|
|
8
|
+
* 而它其实只是群里一句"不知道"。
|
|
9
|
+
*
|
|
10
|
+
* 做法:**样例与查询都过这个函数** → 相似度只反映正文;
|
|
11
|
+
* "是否被点名"改由独立特征承担(gate 的 `!mentioned` 放行、加权里的 AGG_MENTION_BOOST、
|
|
12
|
+
* 以及"@了别人"时的 OTHER_MENTION_PENALTY)。
|
|
13
|
+
*/
|
|
14
|
+
export declare function stripMentionForScore(raw: string): string;
|
|
15
|
+
/**
|
|
16
|
+
* 这条消息 **@ 了别人**(不是她)→ 判定分扣一点。
|
|
17
|
+
*
|
|
18
|
+
* ⚠️ 2026-09-15 主人**修正过一次语义**:"不是没人@她的时候降低评分, 是有人@别人的时候降低评分"。
|
|
19
|
+
* 人家第一版做成了"没被 @ 就扣分"——那是错的:**没被 @ 恰恰是她该主动接话的常态**(群里没人点她,她才会自己挑话插),
|
|
20
|
+
* 扣分等于把她变成"等点名才说话"。
|
|
21
|
+
* 真正的信号是"这句话 @ 的是谁":@ 了别人 = 这轮对话的方向是那个人,她基本不该插嘴。
|
|
22
|
+
* (@ 的是她自己时走另一条路:`!mentioned` 的拦截豁免 → 必回。)
|
|
23
|
+
*
|
|
24
|
+
* 为什么用**减法**而不是乘法:门槛附近的高分要更保守(0.90 想越 0.89 的线得真够格),
|
|
25
|
+
* 而本来就很低的分再乘系数没有意义(都是拦)。0.06 ≈ 让"@别人"这条多要 6 分。
|
|
26
|
+
* 只影响判定分(effScore),**不改**模型原始分(日志里 score/scoreAdj 分开记,能复盘)。
|
|
27
|
+
*/
|
|
28
|
+
export declare const OTHER_MENTION_PENALTY = 0.06;
|
|
2
29
|
export interface ScoreNeighbor {
|
|
3
30
|
m: string;
|
|
4
31
|
y: 0 | 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value-score.d.ts","sourceRoot":"","sources":["../../src/features/value-score.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAS1C,MAAM,WAAW,aAAa;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACT,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,WAAW;IAC1B,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,aAAa,EAAE,OAAO,CAAC;IACvB,sBAAsB;IACtB,GAAG,EAAE,aAAa,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,8CAA8C;IAC9C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACtD,gBAAgB;IAChB,KAAK,IAAI,OAAO,CAAC;IACjB,gCAAgC;IAChC,MAAM,IAAI,IAAI,CAAC;CAChB;AAID,iCAAiC;AACjC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"value-score.d.ts","sourceRoot":"","sources":["../../src/features/value-score.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAS1C;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,qBAAqB,OAAO,CAAC;AAG1C,MAAM,WAAW,aAAa;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACT,CAAC,EAAE,MAAM,CAAC;CACX;AAED,MAAM,WAAW,WAAW;IAC1B,4BAA4B;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,wBAAwB;IACxB,KAAK,EAAE,OAAO,CAAC;IACf,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,aAAa,EAAE,OAAO,CAAC;IACvB,sBAAsB;IACtB,GAAG,EAAE,aAAa,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,8CAA8C;IAC9C,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACtD,gBAAgB;IAChB,KAAK,IAAI,OAAO,CAAC;IACjB,gCAAgC;IAChC,MAAM,IAAI,IAAI,CAAC;CAChB;AAID,iCAAiC;AACjC,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,WAAW,CAmFd;AAiBD,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAoBnF"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
* log = 只记录分数(默认, 观察期: 不改变任何行为)
|
|
9
9
|
* block = 低分不唤醒 AI(消息仍 append 进上下文, 不丢)
|
|
10
10
|
*/
|
|
11
|
-
import { appendFileSync, mkdirSync, statSync } from 'node:fs';
|
|
11
|
+
import { appendFileSync, mkdirSync, readFileSync, renameSync, statSync, writeFileSync } from 'node:fs';
|
|
12
12
|
import { dirname, join } from 'node:path';
|
|
13
13
|
import { createLocalEmbedder } from './local-embed.js';
|
|
14
14
|
import { loadValueSamples, valueSamplesPath } from './value-sample.js';
|
|
@@ -16,6 +16,40 @@ import { loadValueSamples, valueSamplesPath } from './value-sample.js';
|
|
|
16
16
|
const K = 5;
|
|
17
17
|
/** 相似度加权指数: 把近邻的相似度差距拉开(实测区分度更好) */
|
|
18
18
|
const WEIGHT_POW = 8;
|
|
19
|
+
/**
|
|
20
|
+
* 打分文本的 mention 归一化(2026-09-15 主人实测后加)。
|
|
21
|
+
*
|
|
22
|
+
* 症状:样例带 `@bot …` 前缀、入站文本带 `<@openid> …` →
|
|
23
|
+
* 两者的**最大共同特征**变成"这条 @ 了她",语义被前缀淹没:
|
|
24
|
+
* 实测「<@xx> 不知道」拿到 **1.00**(近邻全是 `@bot …`:这个bug你修一下 / 继续找 / 大不大),
|
|
25
|
+
* 而它其实只是群里一句"不知道"。
|
|
26
|
+
*
|
|
27
|
+
* 做法:**样例与查询都过这个函数** → 相似度只反映正文;
|
|
28
|
+
* "是否被点名"改由独立特征承担(gate 的 `!mentioned` 放行、加权里的 AGG_MENTION_BOOST、
|
|
29
|
+
* 以及"@了别人"时的 OTHER_MENTION_PENALTY)。
|
|
30
|
+
*/
|
|
31
|
+
export function stripMentionForScore(raw) {
|
|
32
|
+
return String(raw ?? '')
|
|
33
|
+
.replace(/<@[!&]?\d+>/g, ' ') // QQ 原生 <@!1234567890>
|
|
34
|
+
.replace(/<@[0-9A-Za-z_-]{6,}>/g, ' ') // openid 形式 <@49C7A1D43E0018DF6F5E9DAB9C823E28>
|
|
35
|
+
.replace(/@bot\b/gi, ' ') // 预设/样例里手写的 @bot
|
|
36
|
+
.replace(/\s+/g, ' ')
|
|
37
|
+
.trim();
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* 这条消息 **@ 了别人**(不是她)→ 判定分扣一点。
|
|
41
|
+
*
|
|
42
|
+
* ⚠️ 2026-09-15 主人**修正过一次语义**:"不是没人@她的时候降低评分, 是有人@别人的时候降低评分"。
|
|
43
|
+
* 人家第一版做成了"没被 @ 就扣分"——那是错的:**没被 @ 恰恰是她该主动接话的常态**(群里没人点她,她才会自己挑话插),
|
|
44
|
+
* 扣分等于把她变成"等点名才说话"。
|
|
45
|
+
* 真正的信号是"这句话 @ 的是谁":@ 了别人 = 这轮对话的方向是那个人,她基本不该插嘴。
|
|
46
|
+
* (@ 的是她自己时走另一条路:`!mentioned` 的拦截豁免 → 必回。)
|
|
47
|
+
*
|
|
48
|
+
* 为什么用**减法**而不是乘法:门槛附近的高分要更保守(0.90 想越 0.89 的线得真够格),
|
|
49
|
+
* 而本来就很低的分再乘系数没有意义(都是拦)。0.06 ≈ 让"@别人"这条多要 6 分。
|
|
50
|
+
* 只影响判定分(effScore),**不改**模型原始分(日志里 score/scoreAdj 分开记,能复盘)。
|
|
51
|
+
*/
|
|
52
|
+
export const OTHER_MENTION_PENALTY = 0.06;
|
|
19
53
|
const scorers = new Map();
|
|
20
54
|
/** 取值分器(同参数单例复用: 模型与样例向量只算一次) */
|
|
21
55
|
export function createValueScorer(opts) {
|
|
@@ -26,6 +60,8 @@ export function createValueScorer(opts) {
|
|
|
26
60
|
const minScore = typeof opts.minScore === 'number' ? opts.minScore : 0.5;
|
|
27
61
|
const embedder = createLocalEmbedder({ modelDir: opts.modelDir, logger: opts.logger });
|
|
28
62
|
let samples = [];
|
|
63
|
+
/** 样例文本的 mention 归一化版本(与 sampleTexts[i] 对应; 供近邻展示用干净文本) */
|
|
64
|
+
let sampleTexts = [];
|
|
29
65
|
let vecs = [];
|
|
30
66
|
let initing;
|
|
31
67
|
let inited = false;
|
|
@@ -50,7 +86,9 @@ export function createValueScorer(opts) {
|
|
|
50
86
|
samples = loadValueSamples(opts.dataRoot);
|
|
51
87
|
if (samples.length === 0)
|
|
52
88
|
return false;
|
|
53
|
-
|
|
89
|
+
// mention 归一化: 剥掉 `@bot`/`<@openid>` 再嵌入 —— 否则"这条 @ 了她"会淹掉语义(见 stripMentionForScore)
|
|
90
|
+
sampleTexts = samples.map((s) => stripMentionForScore(s.m) || s.m);
|
|
91
|
+
const v = await embedder.embedPassages(sampleTexts);
|
|
54
92
|
if (!v || v.length !== samples.length)
|
|
55
93
|
return false;
|
|
56
94
|
vecs = v;
|
|
@@ -79,7 +117,8 @@ export function createValueScorer(opts) {
|
|
|
79
117
|
ready: () => inited,
|
|
80
118
|
warmup: () => { void init(); },
|
|
81
119
|
async score(text) {
|
|
82
|
-
|
|
120
|
+
// 查询侧也剥 mention —— 与样例侧(init 里的 sampleTexts)保持一致
|
|
121
|
+
const t = stripMentionForScore(String(text || '')) || String(text || '').trim();
|
|
83
122
|
if (!t)
|
|
84
123
|
return undefined;
|
|
85
124
|
if (!(await init()))
|
|
@@ -88,7 +127,7 @@ export function createValueScorer(opts) {
|
|
|
88
127
|
if (!qv)
|
|
89
128
|
return undefined;
|
|
90
129
|
const scored = samples
|
|
91
|
-
.map((s, i) => ({ m: s.m, y: s.y, s: dot(qv, vecs[i] ?? []) }))
|
|
130
|
+
.map((s, i) => ({ m: sampleTexts[i] ?? s.m, y: s.y, s: dot(qv, vecs[i] ?? []) }))
|
|
92
131
|
.sort((a, b) => b.s - a.s);
|
|
93
132
|
const top = scored.slice(0, K);
|
|
94
133
|
let w1 = 0;
|
|
@@ -110,12 +149,41 @@ export function createValueScorer(opts) {
|
|
|
110
149
|
scorers.set(cacheKey, scorer);
|
|
111
150
|
return scorer;
|
|
112
151
|
}
|
|
152
|
+
/**
|
|
153
|
+
* 评分日志的滚动上限(2026-09-14 加)。
|
|
154
|
+
*
|
|
155
|
+
* 起因:主人清点 `.qqbot/` 目录时发现 `value-scores.jsonl` 是**唯一没有上限**的数据文件 ——
|
|
156
|
+
* 它每条群消息都 append 一行,thinking-log / four-source / group-audit 都有滚动,就它没有。
|
|
157
|
+
* 跑久了会无界增长(当天已 810 行 / 361 KB)。
|
|
158
|
+
*
|
|
159
|
+
* 策略与 group-audit 一致:**超过体积阈值才检查**(不是每次都 stat,省 IO),
|
|
160
|
+
* 超了就保留最新 N 行 —— 面板「最近评分」只读尾部,排查也只看最近的,砍旧的零损失。
|
|
161
|
+
*/
|
|
162
|
+
const SCORE_LOG_MAX_BYTES = 2 * 1024 * 1024;
|
|
163
|
+
const SCORE_LOG_KEEP_LINES = 2000;
|
|
164
|
+
const SCORE_LOG_CHECK_EVERY = 100;
|
|
165
|
+
let scoreLogSinceCheck = 0;
|
|
113
166
|
/** 追加一条评分记录(观察期用): {dataRoot}/.qqbot/value-scores.jsonl —— 一行一条, 可直接翻 */
|
|
114
167
|
export function appendScoreLog(dataRoot, rec) {
|
|
115
168
|
try {
|
|
116
169
|
const p = join(dataRoot, '.qqbot', 'value-scores.jsonl');
|
|
117
170
|
mkdirSync(dirname(p), { recursive: true });
|
|
118
171
|
appendFileSync(p, `${JSON.stringify({ ts: Date.now(), ...rec })}\n`, 'utf8');
|
|
172
|
+
// 滚动:每 N 次才 stat 一次;超阈值就保留最新 KEEP 行(原子替换,避免半截文件)
|
|
173
|
+
if (++scoreLogSinceCheck >= SCORE_LOG_CHECK_EVERY) {
|
|
174
|
+
scoreLogSinceCheck = 0;
|
|
175
|
+
try {
|
|
176
|
+
if (statSync(p).size > SCORE_LOG_MAX_BYTES) {
|
|
177
|
+
const lines = readFileSync(p, 'utf8').split('\n').filter((l) => l.trim() !== '');
|
|
178
|
+
if (lines.length > SCORE_LOG_KEEP_LINES) {
|
|
179
|
+
const tmp = `${p}.tmp`;
|
|
180
|
+
writeFileSync(tmp, `${lines.slice(-SCORE_LOG_KEEP_LINES).join('\n')}\n`, 'utf8');
|
|
181
|
+
renameSync(tmp, p);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
catch { /* 滚动失败不影响记录 */ }
|
|
186
|
+
}
|
|
119
187
|
}
|
|
120
188
|
catch { /* 记录失败不影响主流程 */ }
|
|
121
189
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"value-score.js","sourceRoot":"","sources":["../../src/features/value-score.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"value-score.js","sourceRoot":"","sources":["../../src/features/value-score.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debounce.d.ts","sourceRoot":"","sources":["../../src/gateway/debounce.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,EAAE,UAAU,EAAmC,MAAM,+BAA+B,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"debounce.d.ts","sourceRoot":"","sources":["../../src/gateway/debounce.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,OAAO,KAAK,EAAE,UAAU,EAAmC,MAAM,+BAA+B,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAkF1C,wBAAgB,eAAe,CAC7B,KAAK,EAAE,OAAO,GAAG,KAAK,EACtB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAAE,EACzE,KAAK,CAAC,EAAE,OAAO,GACd,OAAO,CAOT;AACD,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,UAAU,CA4WZ"}
|
package/dist/gateway/debounce.js
CHANGED
|
@@ -4,6 +4,14 @@ import { getHistoryStore, historyGroupKey } from '../features/history-store.js';
|
|
|
4
4
|
import { appendFileSync } from 'node:fs';
|
|
5
5
|
import { join } from 'node:path';
|
|
6
6
|
const DEFAULTS = { enabled: true, silenceSec: 3, maxMsgs: 10, mentionDelayed: true };
|
|
7
|
+
/**
|
|
8
|
+
* 「回合忙」最多等多久(ms)—— 超时强制放行。
|
|
9
|
+
*
|
|
10
|
+
* 3 分钟:正常回合(哪怕连着调十几个工具、跑长命令)都够;超过基本可以认定是异常卡死。
|
|
11
|
+
* ⚠️ 这条兜底的意义不在"性能",而在**可用性**:宁可偶尔让两条消息挤进同一个回合,
|
|
12
|
+
* 也不能让一个卡住的回合把整个会话的消息通道永久堵住。
|
|
13
|
+
*/
|
|
14
|
+
const BUSY_MAX_WAIT_MS = 3 * 60_000;
|
|
7
15
|
/** 解析消息服务器时间戳(ISO 字符串或 ms 数字; 解析失败回落"到达时刻"兜底) */
|
|
8
16
|
function msgTs(msg) {
|
|
9
17
|
const raw = msg.timestamp;
|
|
@@ -77,12 +85,26 @@ export function debounceLayer(config, manager, logger, cooldownAt) {
|
|
|
77
85
|
if (recPeer) {
|
|
78
86
|
const busyRec = manager.findByPeer(fKind === 'group' ? 'group' : 'c2c', recPeer);
|
|
79
87
|
if (busyRec?.turnActive) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
w.
|
|
84
|
-
|
|
85
|
-
|
|
88
|
+
// 回合忙:本来"一直等到 turn/end"。2026-09-15 起加**超时兜底** ——
|
|
89
|
+
// 卡死的回合会把该会话的消息通道永久堵住(主人实测"发完语音后消息全不进"),
|
|
90
|
+
// 超过 BUSY_MAX_WAIT_MS 就强制放行(warn 留痕),宁可挤一点也不能哑掉。
|
|
91
|
+
const since = w.busySince ?? (w.busySince = Date.now());
|
|
92
|
+
const waitedMs = Date.now() - since;
|
|
93
|
+
if (waitedMs < BUSY_MAX_WAIT_MS) {
|
|
94
|
+
w.turnDeferred = true; // 本次窗口因回合忙被 defer → 派发时带系统时间提示
|
|
95
|
+
clearTimer(w);
|
|
96
|
+
w.timer = setTimeout(() => void flush(key, w), 800); // 回合中: 800ms 后重查(等到回合结束或超时)
|
|
97
|
+
w.timer.unref?.();
|
|
98
|
+
dbg(`flush 回合忙 defer(等 turn/end, 已等 ${Math.round(waitedMs / 1000)}s) key=${key} n=${pre.length}`);
|
|
99
|
+
return; // 窗口保留, 不派发
|
|
100
|
+
}
|
|
101
|
+
logger.warn(`[debounce] 回合忙等超时(${Math.round(waitedMs / 1000)}s ≥ ${BUSY_MAX_WAIT_MS / 1000}s) → 强制放行 ` +
|
|
102
|
+
`key=${key} n=${pre.length}(该会话的回合疑似卡死,消息不能一直堵着)`);
|
|
103
|
+
w.busySince = undefined; // 放行后复位,下一轮重新计时
|
|
104
|
+
// 不 return —— 落到下面照常走冷却/派发链
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
w.busySince = undefined; // 回合已结束 → 复位计时
|
|
86
108
|
}
|
|
87
109
|
}
|
|
88
110
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debounce.js","sourceRoot":"","sources":["../../src/gateway/debounce.ts"],"names":[],"mappings":"AA6BA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAUjC,MAAM,QAAQ,GAA0B,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;AAkB5G,iDAAiD;AACjD,SAAS,KAAK,CAAC,GAA4B;IACzC,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC;IAC1B,MAAM,CAAC,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;IACxE,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,GAAG,CAAC,CAAU,EAAE,CAAS;IAChC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACpB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpC,CAAC;AAkBD,MAAM,SAAS,GAAe,EAAE,CAAC;AAEjC,MAAM,UAAU,eAAe,CAC7B,KAAsB,EACtB,MAAc,EACd,IAAY,EACZ,IAAyE,EACzE,KAAe;IAEf,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAC;QACxD,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;IAC/B,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AACD,MAAM,UAAU,aAAa,CAC3B,MAAqB,EACrB,OAAuB,EACvB,MAAc,EACd,UAA+B;IAE/B,MAAM,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IAElD;mFAC+E;IAC/E,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,sBAAsB,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,KAAK,GAAG,CAAC;IACjG,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IACvE,SAAS,GAAG,CAAC,IAAY;QACvB,IAAI,CAAC,KAAK;YAAE,OAAO;QACnB,IAAI,CAAC;YACH,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3E,CAAC;QAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,GAAG,GAAG,GAAgB,EAAE;QAC5B,MAAM,CAAC,GAAI,MAAM,CAAC,QAAuC,EAAE,QAAQ,CAAC;QACpE,OAAO,CAAC,IAAI,QAAQ,CAAC;IACvB,CAAC,CAAC;IAEF,SAAS,UAAU,CAAC,CAAiB;QACnC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;YACZ,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YACtB,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;+BAE2B;IAC3B,KAAK,UAAU,KAAK,CAAC,GAAW,EAAE,CAAiB;QACjD,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC;QACtB,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrB,UAAU,CAAC,CAAC,CAAC,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO;QACT,CAAC;QACD,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAClB,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,UAAU,CAAC,CAAC,CAAC,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACpB,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACxC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;QAEjD,mEAAmE;QACnE,yEAAyE;QACzE,wCAAwC;QACxC,CAAC;YACC,MAAM,OAAO,GAAG,KAAK,KAAK,OAAO;gBAC/B,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;gBACrD,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAClC,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;gBACjF,IAAI,OAAO,EAAE,UAAU,EAAE,CAAC;oBACxB,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,+BAA+B;oBACtD,UAAU,CAAC,CAAC,CAAC,CAAC;oBACd,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,2BAA2B;oBAChF,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;oBAClB,GAAG,CAAC,0CAA0C,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;oBACrE,OAAO,CAAC,YAAY;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,KAAK,KAAK,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,kDAAkD;YAClD,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;YAChE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAE,MAAM,CAAC,QAA0C,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;YACzG,IAAI,GAAG,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACxC,MAAM,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;gBAChC,IAAI,QAAQ,GAAG,OAAO,GAAG,IAAI,EAAE,CAAC;oBAC9B,UAAU,CAAC,CAAC,CAAC,CAAC;oBACd,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,GAAG,QAAQ,CAAC,CAAC;oBACzD,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;oBACxD,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;oBAClB,GAAG,CAAC,mBAAmB,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,SAAS,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;oBACjF,OAAO,CAAC,YAAY;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;QACD,UAAU,CAAC,CAAC,CAAC,CAAC;QACd,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;QAC1B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEjC,oCAAoC;QACpC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;QAEpC,0DAA0D;QAC1D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAC5C,GAAG,CAAC,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,kBAAkB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,UAAU,EAAE,CAAC,CAAC;QAE5K,IAAI,CAAC;YACH,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;gBACrB,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;gBAC1E,IAAI,CAAC,GAAG;oBAAE,OAAO;gBACjB,iEAAiE;gBACjE,uCAAuC;gBACvC,wDAAwD;gBACxD,qCAAqC;gBACrC,IAAI,SAAS,GAAmB,EAAE,CAAC;gBACnC,IAAI,CAAC;oBACH,SAAS,GAAG,MAAM,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC;gBACzH,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,IAAI,EAAE,CAAC,sBAAsB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC1F,CAAC;gBACD,GAAG,CAAC,gBAAgB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAWrG,MAAM,MAAM,GAAiB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC/C,SAAS,EAAE,CAAC,CAAC,SAAS;oBACtB,EAAE,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC;oBACpB,OAAO,EAAE,CAAC,CAAC,OAAO;oBAClB,QAAQ,EAAE,CAAC,CAAC,QAAQ;oBACpB,UAAU,EAAE,CAAC,CAAC,UAAU;iBACzB,CAAC,CAAC,CAAC;gBACJ,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;oBACxB,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;oBACzC,8DAA8D;oBAC9D,MAAM,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;oBAClE,IAAI,GAAG,EAAE,CAAC;wBACR,IAAI,CAAC,CAAC,YAAY;4BAAE,GAAG,CAAC,YAAY,GAAG,IAAI,CAAC;wBAC5C,sDAAsD;wBACtD,mEAAmE;wBACnE,uEAAuE;wBACvE,iEAAiE;wBACjE,wEAAwE;wBACxE,IAAI,CAAC,GAAG,CAAC,GAAG;4BAAE,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;oBAChC,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC;4BACV,SAAS,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC,YAAY;4BACjE,gEAAgE;4BAChE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;yBACnF,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;gBACD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;gBAEnC,oCAAoC;gBACpC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBACtC,IAAI,CAAC,GAAG;oBAAE,OAAO;gBAEjB,uDAAuD;gBACvD,6DAA6D;gBAC7D,qCAAqC;gBACrC,MAAM,IAAI,GAAmB,MAAM;qBAChC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,8CAA8C;qBACrE,GAAG,CAAC,CAAC,CAAC,EAAE;oBACP,MAAM,WAAW,GAAG,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC;oBAC9D,OAAO;wBACL,QAAQ,EAAE,CAAC,CAAC,QAAQ,IAAI,EAAE;wBAC1B,UAAU,EAAE,CAAC,CAAC,UAAU;wBACxB,OAAO,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,WAAW,SAAS,CAAC,CAAC,CAAC,WAAW;wBAC/D,SAAS,EAAE,CAAC,CAAC,EAAE;wBACf,SAAS,EAAE,CAAC,CAAC,SAAS;qBACvB,CAAC;gBACJ,CAAC,CAAC,CAAC;gBAEL,wDAAwD;gBACxD,kDAAkD;gBAClD,MAAM,MAAM,GAA4B,GAAG,CAAC,GAAG,IAAI;oBACjD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,GAAG;oBAC/C,SAAS,EAAE,GAAG,CAAC,SAAS;oBACxB,OAAO,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE;oBAC1B,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE;iBAC1C,CAAC;gBACF,gDAAgD;gBAChD,MAAM,KAAK,GAA4B,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;gBAC9F,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;oBACrB,+CAA+C;oBAC/C,KAAK,CAAC,OAAO,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;gBACzC,CAAC;qBAAM,CAAC;oBACN,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;gBAC7B,CAAC;gBACD,GAAG,CAAC,mBAAmB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,EAAE,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,eAAe,UAAU,EAAE,CAAC,CAAC;gBACxO,sDAAsD;gBACtD,wDAAwD;gBACxD,iDAAiD;gBACjD,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBACjC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;oBAChC,KAAK,CAAC,kBAAkB,GAAG;wBACzB,IAAI;wBACJ,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,IAAI,KAAK,SAAS;4BAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;;4BAAM,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;qBACnG,CAAC;gBACJ,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,0BAA0B,GAAG,OAAO,OAAO,CAAC,MAAM,UAAU,SAAS,CAAC,MAAM,mBAAmB,CAAC,CAAC;gBAC9G,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,2CAA2C;gBAC3C,MAAM,SAAS,GAAG,OAAO;qBACtB,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;qBAC5C,MAAM,CAAC,OAAO,CAAC,CAAC;gBACnB,MAAM,OAAO,GAAc,EAAE,CAAC;gBAC9B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;oBACxB,MAAM,CAAC,GAAI,CAAC,CAAC,GAAmC,CAAC,WAAW,CAAC;oBAC7D,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;wBAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3D,CAAC;gBACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC9C,MAAM,IAAI,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,CAAC,GAAG,CAAC;gBACxC,MAAM,MAAM,GAA4B;oBACtC,GAAG,IAAI;oBACP,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;oBAC7B,WAAW,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;iBACtD,CAAC;gBACF,MAAM,CAAC,KAAK,CAAC,wBAAwB,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,MAAM,mBAAmB,CAAC,CAAC;gBACxG,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC,CAAC;YAChG,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC3F,CAAC;IACH,CAAC;IAED,2DAA2D;IAC3D,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;QAClD,mDAAmD;QACnD,kEAAkE;QAClE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,OAAO;YAAE,OAAO,KAAK,CAAC;QAC3D,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC;QAChB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC;QAC7E,MAAM,GAAG,GAAG,GAAG,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,IAAI,GAA4B;YACpC,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,wCAAwC;YACxE,UAAU,EAAE,IAAI,EAAE,UAAU,IAAI,MAAM;YACtC,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;YACnD,OAAO,EAAE,CAAC;SACX,CAAC;QACF,IAAI,CAAC,CAAC,OAAO,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAC/B,qDAAqD;YACrD,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACzB,IAAI,CAAC,CAAC,EAAE,CAAC;gBAAC,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YAAC,CAAC;YAClE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACtB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,KAAK,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9E,UAAU,CAAC,CAAC,CAAC,CAAC;YACd,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAmB,CAAC,EAAE,SAAS,CAAC,CAAC;YAC5E,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;YAClB,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YACrF,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;YACvF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,2BAA2B;QAC3B,KAAK,aAAa,CAAC,IAAa,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,EAAW,CAAC,CAAC;QACzG,MAAM,CAAC,KAAK,CAAC,gDAAgD,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,EAAE,GAAsB,EAAE,IAAyB,EAAiB,EAAE;QAChF,6DAA6D;QAC7D,qEAAqE;QACrE,4DAA4D;QAC5D,MAAM,OAAO,GAAI,MAAoC,CAAC,YAAY,IAAI,UAAU,CAAC;QACjF,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,MAAM,EAAE,GAAG,GAAG,CAAC,OAA6C,CAAC;YAC7D,MAAM,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;YACjD,0DAA0D;YAC1D,IAAI,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO,IAAI,EAAE,CAAC;YAC5C,IAAI,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC9D,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC,uCAAuC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC1G,CAAC;gBACD,OAAO,CAAC,8BAA8B;YACxC,CAAC;YACD,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,CAAC,GAAG,GAAG,EAAE,CAAC;QAChB,IAAI,CAAC,CAAC,CAAC,OAAO;YAAE,OAAO,IAAI,EAAE,CAAC;QAE9B,MAAM,GAAG,GAAG,GAAG,CAAC,OAA6C,CAAC;QAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACpC,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,KAAK;YAAE,OAAO,IAAI,EAAE,CAAC;QAEtD,4CAA4C;QAC5C,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACjD,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,EAAE,CAAC;QAE3C,MAAM,YAAY,GACf,GAAG,CAAC,KAAkD,EAAE,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;QAC1F,iBAAiB;QACjB,IAAI,YAAY,IAAI,CAAC,CAAC,cAAc,KAAK,KAAK;YAAE,OAAO,IAAI,EAAE,CAAC;QAE9D,MAAM,MAAM,GAAG,IAAI,KAAK,OAAO;YAC7B,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,QAAQ,CAAC;YACnC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QACjB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,EAAE,CAAC;QAC3B,MAAM,GAAG,GAAG,GAAG,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QAExC,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAC;QAC7E,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1E,IAAI,SAAS,IAAI,CAAC;YAAE,OAAO,IAAI,EAAE,CAAC,CAAC,mBAAmB;QAEtD,IAAI,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,CAAC,EAAE,CAAC;YACP,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;YACjC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACtB,CAAC;QACD,4CAA4C;QAC5C,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;YAC5B,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,+CAA+C;QAC/C,GAAG,CAAC,cAAc,GAAG,OAAO,SAAS,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,aAAa,EAAE,OAAO,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,YAAY,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QACjN,wCAAwC;QACxC,gCAAgC;QAChC,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,KAAK;gBAAE,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;QACtC,CAAC;QACD,MAAM,OAAO,GAAG,EAAE,IAAI,KAAK,CAAC;QAC5B,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;QACtD,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,QAAQ,OAAO,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClJ,IAAI,OAAO,EAAE,CAAC;YACZ,0CAA0C;YAC1C,UAAU,CAAC,CAAC,CAAC,CAAC;YACd,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAmB,CAAC,EAAE,SAAS,CAAC,CAAC;YAC5E,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC;QACpB,CAAC;QAED,iBAAiB;QACjB,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,EAAE,CAAC;YAChC,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACnB,OAAO;QACT,CAAC;QACD,kEAAkE;IACpE,CAAC,CAAC;AACJ,CAAC"}
|
|
1
|
+
{"version":3,"file":"debounce.js","sourceRoot":"","sources":["../../src/gateway/debounce.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,4 +15,17 @@ export interface MentionLike {
|
|
|
15
15
|
is_bot?: boolean;
|
|
16
16
|
}
|
|
17
17
|
export declare function replaceBotMention(content: string | undefined | null, mentions?: MentionLike[] | null, wasMentioned?: boolean): string;
|
|
18
|
+
/**
|
|
19
|
+
* 这条消息 @ 的是**别人**(不是她)吗?
|
|
20
|
+
*
|
|
21
|
+
* 2026-09-15 主人修正过一次语义:"**不是**没人@她的时候降低评分, 是**有人@别人**的时候降低评分"。
|
|
22
|
+
* · 没被 @ ≠ 不该回话 —— 那恰恰是她该主动挑话插的常态,扣分会把她变成"等点名才说话";
|
|
23
|
+
* · 真正该扣的是"这句 @ 的是别人":那轮对话的方向是那个人,她基本不该插嘴。
|
|
24
|
+
*
|
|
25
|
+
* 为什么用 QQ 的 mentions 元数据而不是正文里的 `@某某` 字样:
|
|
26
|
+
* 正文里 @ 别人的标记形式不固定,而 mentions 是平台给的权威列表。
|
|
27
|
+
* ⚠️ 两个平台细节:① 她被 @ 时(GROUP_AT_MESSAGE_CREATE)QQ 的 mentions **不含 bot 自身**,
|
|
28
|
+
* 所以要先看 wasMentioned;② 没被 @ 时(GROUP_MESSAGE_CREATE)mentions = 这条 @ 的全部人。
|
|
29
|
+
*/
|
|
30
|
+
export declare function mentionsOthers(mentions: MentionLike[] | null | undefined, wasMentioned: boolean): boolean;
|
|
18
31
|
//# sourceMappingURL=mention-clean.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mention-clean.d.ts","sourceRoot":"","sources":["../../src/shared/mention-clean.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAClC,QAAQ,CAAC,EAAE,WAAW,EAAE,GAAG,IAAI,EAC/B,YAAY,CAAC,EAAE,OAAO,GACrB,MAAM,CA4BR"}
|
|
1
|
+
{"version":3,"file":"mention-clean.d.ts","sourceRoot":"","sources":["../../src/shared/mention-clean.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,WAAW,WAAW;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,EAClC,QAAQ,CAAC,EAAE,WAAW,EAAE,GAAG,IAAI,EAC/B,YAAY,CAAC,EAAE,OAAO,GACrB,MAAM,CA4BR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,IAAI,GAAG,SAAS,EAAE,YAAY,EAAE,OAAO,GAAG,OAAO,CAIzG"}
|
|
@@ -39,4 +39,23 @@ export function replaceBotMention(content, mentions, wasMentioned) {
|
|
|
39
39
|
}
|
|
40
40
|
return text;
|
|
41
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* 这条消息 @ 的是**别人**(不是她)吗?
|
|
44
|
+
*
|
|
45
|
+
* 2026-09-15 主人修正过一次语义:"**不是**没人@她的时候降低评分, 是**有人@别人**的时候降低评分"。
|
|
46
|
+
* · 没被 @ ≠ 不该回话 —— 那恰恰是她该主动挑话插的常态,扣分会把她变成"等点名才说话";
|
|
47
|
+
* · 真正该扣的是"这句 @ 的是别人":那轮对话的方向是那个人,她基本不该插嘴。
|
|
48
|
+
*
|
|
49
|
+
* 为什么用 QQ 的 mentions 元数据而不是正文里的 `@某某` 字样:
|
|
50
|
+
* 正文里 @ 别人的标记形式不固定,而 mentions 是平台给的权威列表。
|
|
51
|
+
* ⚠️ 两个平台细节:① 她被 @ 时(GROUP_AT_MESSAGE_CREATE)QQ 的 mentions **不含 bot 自身**,
|
|
52
|
+
* 所以要先看 wasMentioned;② 没被 @ 时(GROUP_MESSAGE_CREATE)mentions = 这条 @ 的全部人。
|
|
53
|
+
*/
|
|
54
|
+
export function mentionsOthers(mentions, wasMentioned) {
|
|
55
|
+
if (wasMentioned)
|
|
56
|
+
return false; // @ 的就是她 → 走"必回"那条路,不扣
|
|
57
|
+
if (!Array.isArray(mentions) || mentions.length === 0)
|
|
58
|
+
return false;
|
|
59
|
+
return mentions.some((m) => m && m.is_you !== true);
|
|
60
|
+
}
|
|
42
61
|
//# sourceMappingURL=mention-clean.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mention-clean.js","sourceRoot":"","sources":["../../src/shared/mention-clean.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAQH,MAAM,UAAU,iBAAiB,CAC/B,OAAkC,EAClC,QAA+B,EAC/B,YAAsB;IAEtB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,0CAA0C;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,EAAE;gBAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,IAAI,GAAG,GAAG,IAAI,CAAC;QACf,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uDAAuD;IACvD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACvD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
1
|
+
{"version":3,"file":"mention-clean.js","sourceRoot":"","sources":["../../src/shared/mention-clean.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAQH,MAAM,UAAU,iBAAiB,CAC/B,OAAkC,EAClC,QAA+B,EAC/B,YAAsB;IAEtB,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IAEvB,0CAA0C;IAC1C,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,EAAE,MAAM,IAAI,CAAC,CAAC,EAAE;gBAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,IAAI,GAAG,GAAG,IAAI,CAAC;QACf,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,CAAC;gBACH,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uDAAuD;IACvD,IAAI,YAAY,EAAE,CAAC;QACjB,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACvD,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IAC1E,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,cAAc,CAAC,QAA0C,EAAE,YAAqB;IAC9F,IAAI,YAAY;QAAE,OAAO,KAAK,CAAC,CAA0B,uBAAuB;IAChF,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACpE,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -5,4 +5,14 @@ import type { Logger } from '../types.js';
|
|
|
5
5
|
* 处理 QQ 入站消息(已经过 SDK 中间件链)
|
|
6
6
|
*/
|
|
7
7
|
export declare function handleInbound(rawMsg: unknown, manager: SessionManager, config: ImQQBotConfig, logger: Logger, state?: Record<string, unknown>): Promise<void>;
|
|
8
|
+
/**
|
|
9
|
+
* Layer 3: 带发送者标签的用户消息
|
|
10
|
+
* 引用消息功能开启时, 每条入站都带**短消息号**(msgRef, 形如 0913a; 群聊挂发送者标签, 私聊独立一行)
|
|
11
|
+
* —— AI 想引用对方时在正文写 [rf:短号](2026-09-13 主人定: 短号省 token, 台账见 msg-index.ts)。
|
|
12
|
+
* 群聊标签的形状(2026-09-15 定稿, 与历史行同口径):
|
|
13
|
+
* 没被 @ → `[昵称 #短号]` ← 不带 openid(省 token; 32 位 id 每行 20+ token)
|
|
14
|
+
* 被 @ 了 → `[昵称 (openid) #短号]` + 正文后 ` (@you)` ← 要回 @ 他/认人才给 id
|
|
15
|
+
* 短号两边都留(引用标记 + id_lookup 反查 openid 的入口, 不能省)。
|
|
16
|
+
*/
|
|
17
|
+
export declare function buildUserMessage(userContent: string, quotePart: string, senderId: string, senderName: string | undefined, isGroup: boolean, wasMentioned: boolean, msgRef: string): string;
|
|
8
18
|
//# sourceMappingURL=inbound.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound.d.ts","sourceRoot":"","sources":["../../src/transport/inbound.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAa,MAAM,EAA8B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"inbound.d.ts","sourceRoot":"","sources":["../../src/transport/inbound.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAa,MAAM,EAA8B,MAAM,aAAa,CAAC;AAiGjF;;GAEG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,OAAO,EACf,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,MAAM,EACd,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC9B,OAAO,CAAC,IAAI,CAAC,CA2pBf;AAkPD;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,MAAM,CAgBR"}
|