dsh-dungeon-master 0.5.2 → 0.7.0
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/CHANGELOG.md +24 -2
- package/CHANGELOG_EN.md +24 -2
- package/README.md +203 -198
- package/README_EN.md +203 -198
- package/cordis.patch.yml +32 -32
- package/cordis.yml +112 -112
- package/dist/commands/dnd.d.ts.map +1 -1
- package/dist/commands/dnd.js +4 -3
- package/dist/commands/dnd.js.map +1 -1
- package/dist/config.d.ts +2 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +2 -0
- package/dist/config.js.map +1 -1
- package/dist/dnd/battle-image.d.ts +11 -4
- package/dist/dnd/battle-image.d.ts.map +1 -1
- package/dist/dnd/battle-image.js +86 -7
- package/dist/dnd/battle-image.js.map +1 -1
- package/dist/dnd/battlefield.d.ts +39 -3
- package/dist/dnd/battlefield.d.ts.map +1 -1
- package/dist/dnd/battlefield.js +378 -88
- package/dist/dnd/battlefield.js.map +1 -1
- package/dist/dnd/campaign.d.ts +192 -16
- package/dist/dnd/campaign.d.ts.map +1 -1
- package/dist/dnd/campaign.js +645 -92
- package/dist/dnd/campaign.js.map +1 -1
- package/dist/dnd/combat-agent.d.ts +53 -5
- package/dist/dnd/combat-agent.d.ts.map +1 -1
- package/dist/dnd/combat-agent.js +612 -62
- package/dist/dnd/combat-agent.js.map +1 -1
- package/dist/dnd/combat-context.d.ts +74 -2
- package/dist/dnd/combat-context.d.ts.map +1 -1
- package/dist/dnd/combat-context.js +62 -21
- package/dist/dnd/combat-context.js.map +1 -1
- package/dist/dnd/conditions.d.ts +217 -0
- package/dist/dnd/conditions.d.ts.map +1 -0
- package/dist/dnd/conditions.js +1216 -0
- package/dist/dnd/conditions.js.map +1 -0
- package/dist/dnd/custom-effects.d.ts +121 -0
- package/dist/dnd/custom-effects.d.ts.map +1 -0
- package/dist/dnd/custom-effects.js +446 -0
- package/dist/dnd/custom-effects.js.map +1 -0
- package/dist/dnd/dice.d.ts +5 -1
- package/dist/dnd/dice.d.ts.map +1 -1
- package/dist/dnd/dice.js +4 -3
- package/dist/dnd/dice.js.map +1 -1
- package/dist/dnd/dnd-service.d.ts +8 -6
- package/dist/dnd/dnd-service.d.ts.map +1 -1
- package/dist/dnd/dnd-service.js +43 -7
- package/dist/dnd/dnd-service.js.map +1 -1
- package/dist/dnd/dnd-tools.d.ts.map +1 -1
- package/dist/dnd/dnd-tools.js +2 -0
- package/dist/dnd/dnd-tools.js.map +1 -1
- package/dist/dnd/formula.d.ts +40 -0
- package/dist/dnd/formula.d.ts.map +1 -0
- package/dist/dnd/formula.js +219 -0
- package/dist/dnd/formula.js.map +1 -0
- package/dist/dnd/map-view.d.ts +3 -1
- package/dist/dnd/map-view.d.ts.map +1 -1
- package/dist/dnd/map-view.js +33 -10
- package/dist/dnd/map-view.js.map +1 -1
- package/dist/dnd/movement.d.ts +3 -3
- package/dist/dnd/movement.d.ts.map +1 -1
- package/dist/dnd/movement.js +14 -8
- package/dist/dnd/movement.js.map +1 -1
- package/dist/dnd/pending-attack.d.ts +23 -13
- package/dist/dnd/pending-attack.d.ts.map +1 -1
- package/dist/dnd/pending-attack.js +198 -27
- package/dist/dnd/pending-attack.js.map +1 -1
- package/dist/dnd/save-effect.d.ts +12 -0
- package/dist/dnd/save-effect.d.ts.map +1 -1
- package/dist/dnd/save-effect.js +72 -8
- package/dist/dnd/save-effect.js.map +1 -1
- package/dist/dnd/spell-links.d.ts +32 -11
- package/dist/dnd/spell-links.d.ts.map +1 -1
- package/dist/dnd/spell-links.js +105 -20
- package/dist/dnd/spell-links.js.map +1 -1
- package/dist/dnd/srd-lookup.d.ts.map +1 -1
- package/dist/dnd/srd-lookup.js +23 -0
- package/dist/dnd/srd-lookup.js.map +1 -1
- package/dist/dnd/terrain.d.ts +8 -2
- package/dist/dnd/terrain.d.ts.map +1 -1
- package/dist/dnd/terrain.js +13 -8
- package/dist/dnd/terrain.js.map +1 -1
- package/dist/dnd/tool-scope.d.ts.map +1 -1
- package/dist/dnd/tool-scope.js +1 -1
- package/dist/dnd/tool-scope.js.map +1 -1
- package/dist/dnd/tool-views.js +4 -4
- package/dist/dnd/tool-views.js.map +1 -1
- package/dist/dnd/tools/character.d.ts.map +1 -1
- package/dist/dnd/tools/character.js +223 -21
- package/dist/dnd/tools/character.js.map +1 -1
- package/dist/dnd/tools/combat.d.ts.map +1 -1
- package/dist/dnd/tools/combat.js +222 -32
- package/dist/dnd/tools/combat.js.map +1 -1
- package/dist/dnd/tools/dice.d.ts.map +1 -1
- package/dist/dnd/tools/dice.js +406 -53
- package/dist/dnd/tools/dice.js.map +1 -1
- package/dist/dnd/tools/explore.d.ts.map +1 -1
- package/dist/dnd/tools/explore.js +3 -2
- package/dist/dnd/tools/explore.js.map +1 -1
- package/dist/dnd/tools/rules.d.ts +3 -0
- package/dist/dnd/tools/rules.d.ts.map +1 -0
- package/dist/dnd/tools/rules.js +190 -0
- package/dist/dnd/tools/rules.js.map +1 -0
- package/dist/dnd/tools/saves.d.ts.map +1 -1
- package/dist/dnd/tools/saves.js +23 -6
- package/dist/dnd/tools/saves.js.map +1 -1
- package/dist/dnd/tools/shared.d.ts +8 -2
- package/dist/dnd/tools/shared.d.ts.map +1 -1
- package/dist/dnd/tools/shared.js +239 -39
- package/dist/dnd/tools/shared.js.map +1 -1
- package/dist/dnd/turn-buttons.d.ts +4 -0
- package/dist/dnd/turn-buttons.d.ts.map +1 -1
- package/dist/dnd/turn-buttons.js +49 -25
- package/dist/dnd/turn-buttons.js.map +1 -1
- package/dist/dnd/zones.d.ts +123 -0
- package/dist/dnd/zones.d.ts.map +1 -0
- package/dist/dnd/zones.js +545 -0
- package/dist/dnd/zones.js.map +1 -0
- package/dist/features/button-utils.d.ts +2 -1
- package/dist/features/button-utils.d.ts.map +1 -1
- package/dist/features/button-utils.js.map +1 -1
- package/dist/features/note-judge.d.ts +24 -7
- package/dist/features/note-judge.d.ts.map +1 -1
- package/dist/features/note-judge.js +112 -24
- package/dist/features/note-judge.js.map +1 -1
- package/dist/features/reply-judge.d.ts.map +1 -1
- package/dist/features/reply-judge.js +22 -4
- package/dist/features/reply-judge.js.map +1 -1
- package/dist/gateway/bootstrap.d.ts.map +1 -1
- package/dist/gateway/bootstrap.js +28 -1
- package/dist/gateway/bootstrap.js.map +1 -1
- package/dist/gateway/middleware-setup.d.ts +3 -1
- package/dist/gateway/middleware-setup.d.ts.map +1 -1
- package/dist/gateway/middleware-setup.js +24 -5
- package/dist/gateway/middleware-setup.js.map +1 -1
- package/dist/middleware/reply-decider.d.ts +8 -1
- package/dist/middleware/reply-decider.d.ts.map +1 -1
- package/dist/middleware/reply-decider.js +22 -8
- package/dist/middleware/reply-decider.js.map +1 -1
- package/dist/middleware/serial-merge.d.ts +7 -3
- package/dist/middleware/serial-merge.d.ts.map +1 -1
- package/dist/middleware/serial-merge.js +125 -9
- package/dist/middleware/serial-merge.js.map +1 -1
- package/dist/model/status-watch.d.ts +4 -0
- package/dist/model/status-watch.d.ts.map +1 -1
- package/dist/model/status-watch.js +6 -2
- package/dist/model/status-watch.js.map +1 -1
- package/dist/session/index.d.ts +1 -1
- package/dist/session/index.d.ts.map +1 -1
- package/dist/session/index.js.map +1 -1
- package/dist/session/session-manager.d.ts +21 -5
- package/dist/session/session-manager.d.ts.map +1 -1
- package/dist/session/session-manager.js +141 -18
- package/dist/session/session-manager.js.map +1 -1
- package/dist/session/types.d.ts +8 -0
- package/dist/session/types.d.ts.map +1 -1
- package/dist/setup/bind-routes.d.ts.map +1 -1
- package/dist/setup/bind-routes.js +2 -1
- package/dist/setup/bind-routes.js.map +1 -1
- package/dist/transport/agent-turn.d.ts +7 -3
- package/dist/transport/agent-turn.d.ts.map +1 -1
- package/dist/transport/agent-turn.js +20 -2
- package/dist/transport/agent-turn.js.map +1 -1
- package/dist/transport/events.d.ts +6 -1
- package/dist/transport/events.d.ts.map +1 -1
- package/dist/transport/events.js +1 -0
- package/dist/transport/events.js.map +1 -1
- package/dist/transport/inbound.d.ts +6 -0
- package/dist/transport/inbound.d.ts.map +1 -1
- package/dist/transport/inbound.js +66 -13
- package/dist/transport/inbound.js.map +1 -1
- package/dist/transport/outbound-buffer.d.ts +6 -0
- package/dist/transport/outbound-buffer.d.ts.map +1 -1
- package/dist/transport/outbound-buffer.js +13 -0
- package/dist/transport/outbound-buffer.js.map +1 -1
- package/dist/transport/outbound.d.ts.map +1 -1
- package/dist/transport/outbound.js +95 -21
- package/dist/transport/outbound.js.map +1 -1
- package/dist/transport/turn-steer.d.ts +70 -0
- package/dist/transport/turn-steer.d.ts.map +1 -0
- package/dist/transport/turn-steer.js +206 -0
- package/dist/transport/turn-steer.js.map +1 -0
- package/lib/client.js +10 -0
- package/lib/client.js.map +1 -1
- package/package.json +143 -137
- package/skills/dnd-module-authoring/SKILL.md +91 -0
- package/skills/dnd-module-authoring/guide.md +76 -47
- package/skills/dnd-rule-extension/SKILL.md +126 -0
- package/skills/qqbot-sticker-maker/SKILL.md +87 -0
- package/skills/qqbot-sticker-maker/references/character-specs.md +94 -0
- package/skills/qqbot-sticker-maker/references/meme-adaptation-notes.md +46 -0
- package/skills/qqbot-sticker-maker/resources/zipzippipe/sources.json +105 -0
- package/skills/qqbot-sticker-maker/scripts/sticker-cli.cjs +1158 -0
- package/skills/qqbot-sticker-maker/scripts/sticker-export.cjs +147 -0
|
@@ -21,9 +21,11 @@ import { type SenderLabeler } from '../features/message-format.ts';
|
|
|
21
21
|
*/
|
|
22
22
|
export declare function mergeWithSenders(buffered: MiddlewareContext[], label: SenderLabeler): MiddlewareContext;
|
|
23
23
|
/** 这条群消息是不是在回应待结算攻击的反应询问 */
|
|
24
|
-
export declare function pendingReactionReply(message: MiddlewareContext['message'], manager: Pick<SessionManager, 'sessionKey' | 'dndService'
|
|
24
|
+
export declare function pendingReactionReply(message: MiddlewareContext['message'], manager: Pick<SessionManager, 'sessionKey' | 'dndService'>, commit?: boolean): {
|
|
25
25
|
note: string;
|
|
26
26
|
} | undefined;
|
|
27
|
+
/** 短时间窗口内允许自动打断当前思考(steer)的入站消息:私聊连发 + 群聊显式 @bot(隐式冒泡/欲望接话不打断) */
|
|
28
|
+
export declare function canAutoSteer(ctx: MiddlewareContext): boolean;
|
|
27
29
|
/** 引用解析走了 msg_elements 时,从 ref store 补回被引用消息的发送者(原文和附件仍用 msg_elements 的) */
|
|
28
30
|
export declare function quoteSenderFill(store: RefIndexStore, selfSent?: SelfSentIndex): Middleware;
|
|
29
31
|
export declare function setupMiddlewares(bot: QQBot, config: ImQQBotConfig, manager: SessionManager, logger: Logger, llm?: JudgeLlm, selfSent?: SelfSentIndex): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-setup.d.ts","sourceRoot":"","sources":["../../src/gateway/middleware-setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAe9E,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAiB,MAAM,+BAA+B,CAAC;AAC9F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAM/E,OAAO,EAA0B,KAAK,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAInF,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAIpG;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,aAAa,GAAG,iBAAiB,CAiBvG;AAED,4BAA4B;AAC5B,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,EACrC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"middleware-setup.d.ts","sourceRoot":"","sources":["../../src/gateway/middleware-setup.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,KAAK,EAAE,MAAM,+BAA+B,CAAC;AAe9E,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAiB,MAAM,+BAA+B,CAAC;AAC9F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AAEzD,OAAO,EAAkB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAM/E,OAAO,EAA0B,KAAK,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAInF,OAAO,EAAmC,KAAK,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAIpG;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,iBAAiB,EAAE,EAAE,KAAK,EAAE,aAAa,GAAG,iBAAiB,CAiBvG;AAED,4BAA4B;AAC5B,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,iBAAiB,CAAC,SAAS,CAAC,EACrC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,YAAY,CAAC,EAC1D,MAAM,UAAQ,GACb;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAc9B;AAED,kEAAkE;AAClE,wBAAgB,YAAY,CAAC,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAM5D;AAED,4EAA4E;AAC5E,wBAAgB,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,EAAE,aAAa,GAAG,UAAU,CA0B1F;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,KAAK,EACV,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,QAAQ,EACd,QAAQ,CAAC,EAAE,aAAa,GACvB,IAAI,CAuJN"}
|
|
@@ -12,7 +12,7 @@ import { getHistoryStore, historyGroupKey } from "../features/history-store.js";
|
|
|
12
12
|
import { appendGroupMessage } from "../features/group-memory.js";
|
|
13
13
|
import { makeSenderLabeler, MENTION_MARK } from "../features/message-format.js";
|
|
14
14
|
import { getSenderAliases } from "../features/sender-alias.js";
|
|
15
|
-
import { classifyReactionReply, reactionReplyNote } from "../dnd/pending-attack.js";
|
|
15
|
+
import { classifyReactionReply, recordReactionReply, reactionReplyNote } from "../dnd/pending-attack.js";
|
|
16
16
|
/**
|
|
17
17
|
* 排队消息合并:SDK 默认把几条内容直接拼起来、全算在第一条的发送者头上,
|
|
18
18
|
* 群里几个人连着 @ 时,别人的话会被当成第一个人说的(跑团里就成了替别人宣告行动)。
|
|
@@ -44,7 +44,7 @@ export function mergeWithSenders(buffered, label) {
|
|
|
44
44
|
return first;
|
|
45
45
|
}
|
|
46
46
|
/** 这条群消息是不是在回应待结算攻击的反应询问 */
|
|
47
|
-
export function pendingReactionReply(message, manager) {
|
|
47
|
+
export function pendingReactionReply(message, manager, commit = false) {
|
|
48
48
|
const groupId = message.groupOpenid;
|
|
49
49
|
if (message.kind !== 'group' || groupId === undefined)
|
|
50
50
|
return undefined;
|
|
@@ -52,7 +52,24 @@ export function pendingReactionReply(message, manager) {
|
|
|
52
52
|
if (campaign?.initiative?.pending === undefined && campaign?.initiative?.movement === undefined)
|
|
53
53
|
return undefined;
|
|
54
54
|
const reply = classifyReactionReply(campaign, message.senderId, String(message.content ?? ''));
|
|
55
|
-
|
|
55
|
+
if (reply === undefined)
|
|
56
|
+
return undefined;
|
|
57
|
+
if (commit && message.messageId) {
|
|
58
|
+
return manager.dndService.store.update(manager.sessionKey('group', groupId), (c) => {
|
|
59
|
+
const decision = recordReactionReply(c, message.senderId, reply, message.messageId);
|
|
60
|
+
return { note: reactionReplyNote(c, decision) };
|
|
61
|
+
}, '玩家反应答复', { recordHistory: reply.kind !== 'question' });
|
|
62
|
+
}
|
|
63
|
+
return { note: reactionReplyNote(campaign, reply) };
|
|
64
|
+
}
|
|
65
|
+
/** 短时间窗口内允许自动打断当前思考(steer)的入站消息:私聊连发 + 群聊显式 @bot(隐式冒泡/欲望接话不打断) */
|
|
66
|
+
export function canAutoSteer(ctx) {
|
|
67
|
+
if (ctx.message.kind === 'c2c')
|
|
68
|
+
return true;
|
|
69
|
+
if (ctx.message.kind === 'group') {
|
|
70
|
+
return ctx.state.mention?.wasMentioned === true;
|
|
71
|
+
}
|
|
72
|
+
return false;
|
|
56
73
|
}
|
|
57
74
|
/** 引用解析走了 msg_elements 时,从 ref store 补回被引用消息的发送者(原文和附件仍用 msg_elements 的) */
|
|
58
75
|
export function quoteSenderFill(store, selfSent) {
|
|
@@ -175,7 +192,7 @@ export function setupMiddlewares(bot, config, manager, logger, llm, selfSent) {
|
|
|
175
192
|
// 6.5. 待结算期间给反应回应打标记:模型据此不把它当成新的回合行动
|
|
176
193
|
// 放在清洗之后、合并之前,几个人的话合并成一条时每行还带着自己的标记
|
|
177
194
|
bot.use(async (ctx, next) => {
|
|
178
|
-
const reply = pendingReactionReply(ctx.message, manager);
|
|
195
|
+
const reply = pendingReactionReply(ctx.message, manager, true);
|
|
179
196
|
if (reply !== undefined) {
|
|
180
197
|
const msg = ctx.message;
|
|
181
198
|
msg.content = `${String(msg.content ?? '')}\n${reply.note}`;
|
|
@@ -194,10 +211,12 @@ export function setupMiddlewares(bot, config, manager, logger, llm, selfSent) {
|
|
|
194
211
|
bot.use(slash.middleware);
|
|
195
212
|
// 8.5. 待答问题截获(在 concurrencyGuard 之前,答案消息不排队直接作答)
|
|
196
213
|
bot.use(questionAnswer(manager));
|
|
197
|
-
// 9. 并发串行 + 消息合并(同 peer 排队,避免 session
|
|
214
|
+
// 9. 并发串行 + 消息合并(同 peer 排队,避免 session 冲突;短时显式 @bot / 私聊连发自动 steer 打断当前思考)
|
|
198
215
|
bot.use(serialMerge({
|
|
199
216
|
maxQueue: config.maxQueue,
|
|
200
217
|
maxProcessingMs: config.processingTimeoutMs,
|
|
218
|
+
steerWindowMs: () => config.steerWindowMs ?? 10_000,
|
|
219
|
+
canSteer: canAutoSteer,
|
|
201
220
|
onMerge: (buffered) => {
|
|
202
221
|
const peer = buffered[0].message.groupOpenid ?? buffered[0].message.senderId;
|
|
203
222
|
return mergeWithSenders(buffered, makeSenderLabeler((id) => getSenderAliases().aliasFor(config.appId, peer, id)));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-setup.js","sourceRoot":"","sources":["../../src/gateway/middleware-setup.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AAKvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAsB,MAAM,2BAA2B,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAkB,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAiB,MAAM,4BAA4B,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAsB,MAAM,+BAA+B,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"middleware-setup.js","sourceRoot":"","sources":["../../src/gateway/middleware-setup.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,17 @@ import type { MiddlewareContext } from '@tencent-connect/qqbot-nodejs';
|
|
|
16
16
|
import type { ImQQBotConfig } from '../config.ts';
|
|
17
17
|
import type { SessionManager } from '../session/index.ts';
|
|
18
18
|
import type { Logger } from '../types.ts';
|
|
19
|
-
import type { JudgeQueue, ReplyJudge } from '../features/reply-judge.ts';
|
|
19
|
+
import type { JudgeLine, JudgeQueue, ReplyJudge } from '../features/reply-judge.ts';
|
|
20
20
|
export interface JudgeDeps {
|
|
21
21
|
judge: Pick<ReplyJudge, 'score'>;
|
|
22
22
|
queue: JudgeQueue;
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* 给模型看的群聊上下文:群记忆里截到当前消息为止,再按时间插进 bot 自己说过的话。
|
|
26
|
+
* `includeCurrent = false` 时只取当前消息之前的背景(供笔记相关性打分复用,避免和当前消息重复)。
|
|
27
|
+
*/
|
|
28
|
+
export declare function collectJudgeLines(config: ImQQBotConfig, groupId: string, messageId?: string, options?: {
|
|
29
|
+
includeCurrent?: boolean;
|
|
30
|
+
}): JudgeLine[];
|
|
24
31
|
export declare function replyDecider(config: ImQQBotConfig, manager: SessionManager, logger: Logger, judgeDeps?: JudgeDeps): (ctx: MiddlewareContext, next: () => Promise<void>) => Promise<void>;
|
|
25
32
|
//# sourceMappingURL=reply-decider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-decider.d.ts","sourceRoot":"","sources":["../../src/middleware/reply-decider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAS1C,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"reply-decider.d.ts","sourceRoot":"","sources":["../../src/middleware/reply-decider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAS1C,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAUpF,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACjC,KAAK,EAAE,UAAU,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAE,GACrC,SAAS,EAAE,CA8Bb;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,SAAS,IAElG,KAAK,iBAAiB,EAAE,MAAM,MAAM,OAAO,CAAC,IAAI,CAAC,KAAG,OAAO,CAAC,IAAI,CAAC,CA8GhF"}
|
|
@@ -1,16 +1,30 @@
|
|
|
1
1
|
import { classifyMessage, getEngagementTracker, isJudgeCandidate, scoreReplyDesire, } from "../features/reply-desire.js";
|
|
2
2
|
import { readRecentGroupMessages } from "../features/group-memory.js";
|
|
3
|
-
/**
|
|
4
|
-
|
|
5
|
-
|
|
3
|
+
/**
|
|
4
|
+
* 给模型看的群聊上下文:群记忆里截到当前消息为止,再按时间插进 bot 自己说过的话。
|
|
5
|
+
* `includeCurrent = false` 时只取当前消息之前的背景(供笔记相关性打分复用,避免和当前消息重复)。
|
|
6
|
+
*/
|
|
7
|
+
export function collectJudgeLines(config, groupId, messageId, options) {
|
|
8
|
+
const includeCurrent = options?.includeCurrent ?? true;
|
|
9
|
+
const limit = config.replyDesire?.judge?.contextMessages ?? 8;
|
|
6
10
|
const recent = readRecentGroupMessages(config.appId, groupId, limit + 10);
|
|
7
|
-
const cut = recent.findIndex((e) => e.messageId === messageId);
|
|
8
|
-
const
|
|
9
|
-
const lines = upto.map((e) => {
|
|
11
|
+
const cut = messageId !== undefined ? recent.findIndex((e) => e.messageId === messageId) : -1;
|
|
12
|
+
const toLine = (e) => {
|
|
10
13
|
const { text, stickerId } = classifyMessage(e.content);
|
|
11
14
|
const shown = text !== '' ? text : (stickerId !== undefined || (e.images?.length ?? 0) > 0 ? '[图片]' : '');
|
|
12
15
|
return { sender: e.senderName ?? e.senderId.slice(-6), text: shown, timestamp: e.timestamp };
|
|
13
|
-
}
|
|
16
|
+
};
|
|
17
|
+
if (!includeCurrent) {
|
|
18
|
+
const beforeEntries = cut >= 0 ? recent.slice(0, cut) : recent;
|
|
19
|
+
const cutoffTs = cut >= 0 ? recent[cut].timestamp : Number.POSITIVE_INFINITY;
|
|
20
|
+
const userLines = beforeEntries.map(toLine).filter((line) => line.text !== '');
|
|
21
|
+
const bot = getEngagementTracker().botLines(groupId)
|
|
22
|
+
.filter((line) => line.timestamp <= cutoffTs)
|
|
23
|
+
.map((line) => ({ text: line.text, timestamp: line.timestamp }));
|
|
24
|
+
return [...userLines, ...bot].sort((a, b) => a.timestamp - b.timestamp).slice(-limit);
|
|
25
|
+
}
|
|
26
|
+
const upto = cut >= 0 ? recent.slice(0, cut + 1) : recent;
|
|
27
|
+
const lines = upto.map(toLine).filter((line) => line.text !== '');
|
|
14
28
|
const current = lines[lines.length - 1];
|
|
15
29
|
const bot = getEngagementTracker().botLines(groupId)
|
|
16
30
|
.filter((line) => current === undefined || line.timestamp <= current.timestamp)
|
|
@@ -115,7 +129,7 @@ export function replyDecider(config, manager, logger, judgeDeps) {
|
|
|
115
129
|
model,
|
|
116
130
|
names,
|
|
117
131
|
persona: persona?.prompt ?? config.groupPrompt,
|
|
118
|
-
lines:
|
|
132
|
+
lines: collectJudgeLines(config, groupId, msg.messageId),
|
|
119
133
|
});
|
|
120
134
|
if (desire === undefined || desire < rd.threshold) {
|
|
121
135
|
logger.info(`reply-desire: judge skip group=${groupId} desire=${desire?.toFixed(2) ?? 'n/a'}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-decider.js","sourceRoot":"","sources":["../../src/middleware/reply-decider.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,GAGjB,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AActE
|
|
1
|
+
{"version":3,"file":"reply-decider.js","sourceRoot":"","sources":["../../src/middleware/reply-decider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import type { Middleware, MiddlewareContext } from '@tencent-connect/qqbot-nodejs';
|
|
2
|
-
interface SerialMergeOptions {
|
|
2
|
+
export interface SerialMergeOptions {
|
|
3
3
|
maxQueue: number;
|
|
4
4
|
maxProcessingMs: number;
|
|
5
5
|
onMerge: (buffered: MiddlewareContext[]) => MiddlewareContext;
|
|
6
|
+
/** 短时自动 steer 时间窗(毫秒,支持函数动态读取最新配置;<=0 关闭) */
|
|
7
|
+
steerWindowMs?: number | (() => number);
|
|
8
|
+
/** 判断当前入站消息是否允许触发短时自动 steer(群聊显式 @bot / 私聊连发) */
|
|
9
|
+
canSteer?: (ctx: MiddlewareContext) => boolean;
|
|
6
10
|
}
|
|
7
11
|
/**
|
|
8
12
|
* SDK 1.0.5 的 merge 分支在唤醒 survivor 后就释放锁,survivor 也没有 watchdog。
|
|
9
|
-
* 把同一把锁直接交给下一批,直到它自己的下游链收敛,避免慢工具期间并发 followup
|
|
13
|
+
* 把同一把锁直接交给下一批,直到它自己的下游链收敛,避免慢工具期间并发 followup;
|
|
14
|
+
* 同时支持短时间窗口内的显式 @bot / 私聊补充消息通过 submitChain 有序打断并 steer 当前回合。
|
|
10
15
|
*/
|
|
11
16
|
export declare function serialMerge(options: SerialMergeOptions): Middleware;
|
|
12
|
-
export {};
|
|
13
17
|
//# sourceMappingURL=serial-merge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serial-merge.d.ts","sourceRoot":"","sources":["../../src/middleware/serial-merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"serial-merge.d.ts","sourceRoot":"","sources":["../../src/middleware/serial-merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AA8BnF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,CAAC,QAAQ,EAAE,iBAAiB,EAAE,KAAK,iBAAiB,CAAC;IAC9D,6CAA6C;IAC7C,aAAa,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,MAAM,CAAC,CAAC;IACxC,iDAAiD;IACjD,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,iBAAiB,KAAK,OAAO,CAAC;CAChD;AA4BD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,UAAU,CAoKnE"}
|
|
@@ -1,6 +1,37 @@
|
|
|
1
|
+
import { setTurnSlot } from "../transport/turn-steer.js";
|
|
2
|
+
function createDeferred() {
|
|
3
|
+
let resolve;
|
|
4
|
+
const promise = new Promise((done) => { resolve = done; });
|
|
5
|
+
return { promise, resolve };
|
|
6
|
+
}
|
|
7
|
+
function resolveSteerWindowMs(value) {
|
|
8
|
+
if (typeof value === 'function')
|
|
9
|
+
return value();
|
|
10
|
+
return value ?? 0;
|
|
11
|
+
}
|
|
12
|
+
async function drainSteers(queue) {
|
|
13
|
+
while (true) {
|
|
14
|
+
const chain = queue.submitChain;
|
|
15
|
+
const extras = queue.extraRuns.splice(0);
|
|
16
|
+
await chain;
|
|
17
|
+
if (extras.length > 0)
|
|
18
|
+
await Promise.allSettled(extras);
|
|
19
|
+
if (queue.activeTurn?.isRunning()) {
|
|
20
|
+
await queue.activeTurn.whenIdle().catch(() => { });
|
|
21
|
+
}
|
|
22
|
+
if (queue.submitChain === chain
|
|
23
|
+
&& queue.extraRuns.length === 0
|
|
24
|
+
&& !queue.activeTurn?.isRunning()
|
|
25
|
+
&& queue.inFlightSteers === 0) {
|
|
26
|
+
break;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
queue.closing = true;
|
|
30
|
+
}
|
|
1
31
|
/**
|
|
2
32
|
* SDK 1.0.5 的 merge 分支在唤醒 survivor 后就释放锁,survivor 也没有 watchdog。
|
|
3
|
-
* 把同一把锁直接交给下一批,直到它自己的下游链收敛,避免慢工具期间并发 followup
|
|
33
|
+
* 把同一把锁直接交给下一批,直到它自己的下游链收敛,避免慢工具期间并发 followup;
|
|
34
|
+
* 同时支持短时间窗口内的显式 @bot / 私聊补充消息通过 submitChain 有序打断并 steer 当前回合。
|
|
4
35
|
*/
|
|
5
36
|
export function serialMerge(options) {
|
|
6
37
|
const queues = new Map();
|
|
@@ -36,11 +67,67 @@ export function serialMerge(options) {
|
|
|
36
67
|
const key = `${target.scope}:${target.targetId}`;
|
|
37
68
|
let queue = queues.get(key);
|
|
38
69
|
if (queue === undefined) {
|
|
39
|
-
queue = {
|
|
70
|
+
queue = {
|
|
71
|
+
pending: [],
|
|
72
|
+
windowAnchorAt: Date.now(),
|
|
73
|
+
submitChain: Promise.resolve(),
|
|
74
|
+
inFlightSteers: 0,
|
|
75
|
+
closing: false,
|
|
76
|
+
extraRuns: [],
|
|
77
|
+
};
|
|
40
78
|
queues.set(key, queue);
|
|
41
79
|
}
|
|
42
80
|
else {
|
|
43
|
-
|
|
81
|
+
const windowMs = resolveSteerWindowMs(options.steerWindowMs);
|
|
82
|
+
const steerable = windowMs > 0
|
|
83
|
+
&& !queue.closing
|
|
84
|
+
&& (options.canSteer?.(ctx) ?? false)
|
|
85
|
+
&& Date.now() - queue.windowAnchorAt <= windowMs;
|
|
86
|
+
if (steerable) {
|
|
87
|
+
if (queue.pending.length + queue.inFlightSteers >= options.maxQueue) {
|
|
88
|
+
ctx.log.warn?.(`[concurrency:merge] queue full for ${key}`);
|
|
89
|
+
ctx.stop('concurrency:merge-full');
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
const activeQueue = queue;
|
|
93
|
+
activeQueue.inFlightSteers++;
|
|
94
|
+
const prevSubmit = activeQueue.submitChain;
|
|
95
|
+
const currentSubmit = createDeferred();
|
|
96
|
+
activeQueue.submitChain = currentSubmit.promise;
|
|
97
|
+
try {
|
|
98
|
+
await prevSubmit;
|
|
99
|
+
if (ctx.signal.aborted)
|
|
100
|
+
return;
|
|
101
|
+
if (activeQueue.activeTurn !== undefined && activeQueue.activeTurn.isRunning()) {
|
|
102
|
+
activeQueue.windowAnchorAt = Date.now();
|
|
103
|
+
activeQueue.refreshTimeout?.();
|
|
104
|
+
setTurnSlot(ctx, { role: 'steer', target: activeQueue.activeTurn });
|
|
105
|
+
await next();
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
// 前序消息未进入 agent 回合(如空消息提前返回)或刚巧结束:升级为当前锁内的 owner 执行
|
|
109
|
+
activeQueue.windowAnchorAt = Date.now();
|
|
110
|
+
activeQueue.refreshTimeout?.();
|
|
111
|
+
setTurnSlot(ctx, {
|
|
112
|
+
role: 'owner',
|
|
113
|
+
attach(turn) {
|
|
114
|
+
activeQueue.activeTurn = turn;
|
|
115
|
+
activeQueue.windowAnchorAt = Date.now();
|
|
116
|
+
currentSubmit.resolve();
|
|
117
|
+
},
|
|
118
|
+
});
|
|
119
|
+
const run = next();
|
|
120
|
+
activeQueue.extraRuns.push(run);
|
|
121
|
+
await run;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
activeQueue.inFlightSteers--;
|
|
126
|
+
currentSubmit.resolve();
|
|
127
|
+
}
|
|
128
|
+
return;
|
|
129
|
+
}
|
|
130
|
+
if (queue.pending.length + queue.inFlightSteers >= options.maxQueue) {
|
|
44
131
|
ctx.log.warn?.(`[concurrency:merge] queue full for ${key}`);
|
|
45
132
|
ctx.stop('concurrency:merge-full');
|
|
46
133
|
return;
|
|
@@ -66,10 +153,30 @@ export function serialMerge(options) {
|
|
|
66
153
|
if (!admitted)
|
|
67
154
|
return;
|
|
68
155
|
}
|
|
156
|
+
const activeQueue = queue;
|
|
157
|
+
const ownerSubmit = createDeferred();
|
|
158
|
+
activeQueue.windowAnchorAt = Date.now();
|
|
159
|
+
activeQueue.submitChain = ownerSubmit.promise;
|
|
160
|
+
activeQueue.activeTurn = undefined;
|
|
161
|
+
activeQueue.closing = false;
|
|
162
|
+
activeQueue.extraRuns = [];
|
|
163
|
+
setTurnSlot(ctx, {
|
|
164
|
+
role: 'owner',
|
|
165
|
+
attach(turn) {
|
|
166
|
+
activeQueue.activeTurn = turn;
|
|
167
|
+
activeQueue.windowAnchorAt = Date.now();
|
|
168
|
+
ownerSubmit.resolve();
|
|
169
|
+
},
|
|
170
|
+
});
|
|
69
171
|
let timer;
|
|
70
|
-
|
|
71
|
-
if (
|
|
72
|
-
|
|
172
|
+
const clearTimer = () => {
|
|
173
|
+
if (timer !== undefined) {
|
|
174
|
+
clearTimeout(timer);
|
|
175
|
+
timer = undefined;
|
|
176
|
+
}
|
|
177
|
+
};
|
|
178
|
+
const resetTimer = () => {
|
|
179
|
+
clearTimer();
|
|
73
180
|
if (options.maxProcessingMs > 0) {
|
|
74
181
|
timer = setTimeout(() => {
|
|
75
182
|
ctx.log.warn?.(`[concurrency] aborting ${key} after ${options.maxProcessingMs}ms`);
|
|
@@ -77,13 +184,22 @@ export function serialMerge(options) {
|
|
|
77
184
|
}, options.maxProcessingMs);
|
|
78
185
|
timer.unref?.();
|
|
79
186
|
}
|
|
187
|
+
};
|
|
188
|
+
activeQueue.refreshTimeout = resetTimer;
|
|
189
|
+
try {
|
|
190
|
+
if (ctx.signal.aborted)
|
|
191
|
+
return;
|
|
192
|
+
resetTimer();
|
|
80
193
|
await next();
|
|
81
194
|
}
|
|
82
195
|
finally {
|
|
83
|
-
|
|
84
|
-
|
|
196
|
+
ownerSubmit.resolve();
|
|
197
|
+
await drainSteers(activeQueue);
|
|
198
|
+
clearTimer();
|
|
199
|
+
activeQueue.refreshTimeout = undefined;
|
|
200
|
+
activeQueue.activeTurn = undefined;
|
|
85
201
|
// abort 只是请求取消;等下游完成清理再交接,避免旧回合取消新回合。
|
|
86
|
-
handoff(key,
|
|
202
|
+
handoff(key, activeQueue);
|
|
87
203
|
}
|
|
88
204
|
};
|
|
89
205
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serial-merge.js","sourceRoot":"","sources":["../../src/middleware/serial-merge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"serial-merge.js","sourceRoot":"","sources":["../../src/middleware/serial-merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,6 +64,10 @@ export interface ModelWatchOptions {
|
|
|
64
64
|
recoverThreshold?: number;
|
|
65
65
|
/** 请求探测的时延阈值(毫秒),默认 8000 */
|
|
66
66
|
ttftThresholdMs?: number;
|
|
67
|
+
/** 重启前磁盘里已处于备用故障转移态:为 true 时以备用态起步,主用恢复后能正常触发 switchBack 清掉持久化 failover */
|
|
68
|
+
initialUsingBackup?: boolean;
|
|
69
|
+
/** start() 时是否立即执行首轮异步探测(默认 false) */
|
|
70
|
+
immediate?: boolean;
|
|
67
71
|
/** 执行切换 */
|
|
68
72
|
switchTo: (target: {
|
|
69
73
|
provider: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-watch.d.ts","sourceRoot":"","sources":["../../src/model/status-watch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,MAAM,MAAM,WAAW,GAAG,aAAa,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE5E,MAAM,WAAW,MAAM;IACrB,KAAK,EAAE,WAAW,CAAC;IACnB,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4BAA4B;IAC5B,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC5B,gCAAgC;IAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AASD,yBAAyB;AACzB,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE3D;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAGjE;AAmBD,gDAAgD;AAChD,wBAAsB,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAoCtF;AAED;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,SAAS,EACf,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAChG,OAAO,CAAC,MAAM,CAAC,CA2EjB;AAED,wBAAsB,KAAK,CACzB,IAAI,EAAE,SAAS,EACf,OAAO,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAChG,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED,MAAM,WAAW,iBAAiB;IAChC,yBAAyB;IACzB,OAAO,EAAE,SAAS,CAAC;IACnB,4BAA4B;IAC5B,MAAM,EAAE,SAAS,CAAC;IAClB,mBAAmB;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,uBAAuB;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4BAA4B;IAC5B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW;IACX,QAAQ,EAAE,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzF,UAAU,EAAE,CAAC,MAAM,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3F,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,8BAA8B;IAC9B,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACnF;AAWD;;;;;GAKG;AACH,qBAAa,UAAU;IASF,OAAO,CAAC,QAAQ,CAAC,OAAO;IAR3C,OAAO,CAAC,KAAK,CAA6B;IAC1C,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"status-watch.d.ts","sourceRoot":"","sources":["../../src/model/status-watch.ts"],"names":[],"mappings":"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"}
|
|
@@ -163,7 +163,7 @@ function isSick(state) {
|
|
|
163
163
|
export class ModelWatch {
|
|
164
164
|
options;
|
|
165
165
|
timer;
|
|
166
|
-
usingBackup
|
|
166
|
+
usingBackup;
|
|
167
167
|
primaryHealth = { state: 'unknown', reason: 'init', detail: '尚未探测' };
|
|
168
168
|
backupHealth = { state: 'unknown', reason: 'init', detail: '尚未探测' };
|
|
169
169
|
badPrimary = 0;
|
|
@@ -171,6 +171,7 @@ export class ModelWatch {
|
|
|
171
171
|
badBackup = 0;
|
|
172
172
|
constructor(options) {
|
|
173
173
|
this.options = options;
|
|
174
|
+
this.usingBackup = options.initialUsingBackup === true;
|
|
174
175
|
}
|
|
175
176
|
get state() {
|
|
176
177
|
return { usingBackup: this.usingBackup, primary: this.primaryHealth, backup: this.backupHealth };
|
|
@@ -183,7 +184,10 @@ export class ModelWatch {
|
|
|
183
184
|
this.timer.unref?.();
|
|
184
185
|
const p = this.options.primary;
|
|
185
186
|
const b = this.options.backup;
|
|
186
|
-
this.options.log(`model-watch:
|
|
187
|
+
this.options.log(`model-watch: 已启动(初始=${this.usingBackup ? '备用态' : '主用态'}),每 ${Math.round(interval / 60_000)} 分钟对 ${p.provider}/${p.model} 与 ${b.provider}/${b.model} 各探一次`);
|
|
188
|
+
if (this.options.immediate === true) {
|
|
189
|
+
void this.tick();
|
|
190
|
+
}
|
|
187
191
|
}
|
|
188
192
|
stop() {
|
|
189
193
|
if (this.timer !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-watch.js","sourceRoot":"","sources":["../../src/model/status-watch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"status-watch.js","sourceRoot":"","sources":["../../src/model/status-watch.ts"],"names":[],"mappings":"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"}
|
package/dist/session/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 管理 QQ peer → dsh Agent 的映射和生命周期。
|
|
5
5
|
*/
|
|
6
|
-
export { SessionManager } from './session-manager.ts';
|
|
6
|
+
export { SessionManager, type NoteTurnSummary } from './session-manager.ts';
|
|
7
7
|
export { IdleEvictor } from './idle-evictor.ts';
|
|
8
8
|
export type { AgentSetup, SessionEventLike, DshAgent, DshAgentHandle, DshAgentRegistry, AgentPresetsLike, PresetComposition, PresetEntry, PresetSwitchOutcome, SessionRecord, SessionStatus, TokenUsageStats, } from './types.ts';
|
|
9
9
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EACV,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,iBAAiB,EACjB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,aAAa,EACb,eAAe,GAChB,MAAM,YAAY,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/session/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,cAAc,EAAwB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC"}
|