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
|
@@ -16,7 +16,13 @@ import type { QuestionChannel } from '../features/question-channel.ts';
|
|
|
16
16
|
import type { ApprovalChannel } from '../features/approval-channel.ts';
|
|
17
17
|
import type { PersonaStore } from '../features/persona-store.ts';
|
|
18
18
|
import type { PersonaSwitch, SwitchPersonaOutcome } from '../features/persona-switch.ts';
|
|
19
|
+
import { TurnSteerTracker } from '../transport/turn-steer.ts';
|
|
19
20
|
import type { SessionEventLike, DshAgent, DshAgentRegistry, PresetEntry, PresetSwitchOutcome, SessionRecord, SessionStatus, TokenUsageStats, CompactOutcome } from './types.ts';
|
|
21
|
+
/** 轮次结束时由出站路由器传回的本轮实际产出,供笔记相关性打分参考 */
|
|
22
|
+
export interface NoteTurnSummary {
|
|
23
|
+
reply?: string;
|
|
24
|
+
toolsUsed?: readonly string[];
|
|
25
|
+
}
|
|
20
26
|
/** windowMs 内给这个会话发过消息的人 */
|
|
21
27
|
/** 宿主生成的 runtime-context 快照也是 user/message 事件,统计和导出时要和真正的用户消息分开 */
|
|
22
28
|
export declare function isRuntimeContextEvent(event: SessionEventLike): boolean;
|
|
@@ -25,8 +31,8 @@ export declare function isRuntimeContextEvent(event: SessionEventLike): boolean;
|
|
|
25
31
|
* 普通追加消息不改变它。
|
|
26
32
|
*/
|
|
27
33
|
export declare function promptEpoch(record: Pick<SessionRecord, 'agent'>): string;
|
|
28
|
-
/** 这个 agent 所在会话的团况快照文字;不是 QQ
|
|
29
|
-
export declare function dndStateText(agent: DshAgent | undefined, findRecord: (agent: DshAgent) => SessionRecord | undefined, dnd: Pick<DndService, 'stateSnapshot'> | undefined, logger: Logger): string;
|
|
34
|
+
/** 这个 agent 所在会话的团况快照文字;不是 QQ 会话、战斗子代理(改由回合前增量注入)、没开团或读取失败都返回空串 */
|
|
35
|
+
export declare function dndStateText(agent: DshAgent | undefined, findRecord: (agent: DshAgent) => SessionRecord | undefined, dnd: (Pick<DndService, 'stateSnapshot'> & Partial<Pick<DndService, 'combatStateSnapshot'>>) | undefined, logger: Logger, isCombatChild?: (agent: DshAgent) => boolean): string;
|
|
30
36
|
export declare function recentSenderIds(record: SessionRecord, windowMs: number, now?: number): string[];
|
|
31
37
|
export declare class SessionManager {
|
|
32
38
|
private sessions;
|
|
@@ -76,6 +82,8 @@ export declare class SessionManager {
|
|
|
76
82
|
dndToolScope?: DndToolScope;
|
|
77
83
|
/** 一段对话内锁住的 system prompt 文字(表情清单、本群笔记目录),见 PromptLatch */
|
|
78
84
|
private readonly promptLatch;
|
|
85
|
+
/** 短时入站自动 steer 阶段跟踪器(与出站事件、流式帧同步) */
|
|
86
|
+
readonly turnSteer: TurnSteerTracker;
|
|
79
87
|
/** 由 bootstrap 注入的跑团按钮(/dnd start 发签到);按钮关闭时为空 */
|
|
80
88
|
dndButtons?: DndTurnButtons;
|
|
81
89
|
personaStore?: PersonaStore;
|
|
@@ -174,6 +182,7 @@ export declare class SessionManager {
|
|
|
174
182
|
switchAllSessions(route: ModelRoute): Promise<number>;
|
|
175
183
|
/** 清掉全局故障转移,所有会话回到配置默认路由 */
|
|
176
184
|
clearFailoverRoute(): Promise<number>;
|
|
185
|
+
getFailoverRoute(): ModelRoute | undefined;
|
|
177
186
|
listAvailableModels(): Promise<ModelEntry[]>;
|
|
178
187
|
listProviders(): string[];
|
|
179
188
|
getSessionRecord(scope: ChatScope, peerId: string): SessionRecord | undefined;
|
|
@@ -183,14 +192,14 @@ export declare class SessionManager {
|
|
|
183
192
|
/** 入站图片本地表情库精确匹配(失败/未启用时返回 undefined,不阻塞消息) */
|
|
184
193
|
matchSticker(path: string): StickerMatchResult | undefined;
|
|
185
194
|
/** 按当前消息检索笔记(共享 + 本会话私有),返回要注入的提示块(未启用/无相关结果/出错时返回空串) */
|
|
186
|
-
notesHint(query: string, scope: ChatScope, peerId: string): Promise<string>;
|
|
195
|
+
notesHint(query: string, scope: ChatScope, peerId: string, messageId?: string, preservePending?: boolean): Promise<string>;
|
|
187
196
|
/** 这段笔记是否被静音(相关性打分长期偏低)。笔记文件在静音之后改过就解除:旧分数评的不是现在的内容 */
|
|
188
197
|
private noteMuted;
|
|
189
198
|
/**
|
|
190
199
|
* 一轮结束时结算这轮注入的笔记:正常结束才记账并排队打分,异常结束的丢掉。
|
|
191
200
|
* 打分异步进行,不等结果。
|
|
192
201
|
*/
|
|
193
|
-
settleNoteInjection(record: SessionRecord, ok: boolean): void;
|
|
202
|
+
settleNoteInjection(record: SessionRecord, ok: boolean, turn?: NoteTurnSummary): void;
|
|
194
203
|
/** 原生读图:把本地图片提交为 attachment,返回可直接放进 user message 的 ImageBlock */
|
|
195
204
|
createImageBlock(path: string): Promise<ImageBlock | undefined>;
|
|
196
205
|
/** 当前 provider/model 是否声明 image 输入(旧会话切模型前不能硬塞 ImageBlock) */
|
|
@@ -221,7 +230,7 @@ export declare class SessionManager {
|
|
|
221
230
|
sessionKey(scope: ChatScope, peerId: string): string;
|
|
222
231
|
private deriveSessionId;
|
|
223
232
|
private currentSessionId;
|
|
224
|
-
/** 该 peer
|
|
233
|
+
/** 该 peer 当前主会话(或下一次 getOrCreate 将使用)的 sessionId;不随临时战斗子代理漂移,保证群历史游标连续 */
|
|
225
234
|
sessionIdFor(scope: ChatScope, peerId: string): string;
|
|
226
235
|
private composePreset;
|
|
227
236
|
/** 记一个发过消息的人(合并消息里除触发者以外的发送者) */
|
|
@@ -236,6 +245,13 @@ export declare class SessionManager {
|
|
|
236
245
|
findByAgent(agent: DshAgent): SessionRecord | undefined;
|
|
237
246
|
switchPersona(peerId: string, personaId: string, scope?: ChatScope): Promise<SwitchPersonaOutcome>;
|
|
238
247
|
private performPersonaSwitch;
|
|
248
|
+
/**
|
|
249
|
+
* 解析指定会话当前实际生效的 provider/model 路由(含 Web/命令切换、model/selection、最近请求头及配置解析链)。
|
|
250
|
+
* reasoningEffort 仅在最近请求头与该路由一致且显式非空时透传,否则置为 null,避免战斗子代理回退复用主会话模型时强行塞入不兼容的推理档位导致 400。
|
|
251
|
+
*/
|
|
252
|
+
getEffectiveSessionRoute(record: SessionRecord): (ModelRoute & {
|
|
253
|
+
reasoningEffort?: string | null;
|
|
254
|
+
}) | undefined;
|
|
239
255
|
private personaModelRoute;
|
|
240
256
|
/** 在目标人格自己的历史之后追加,成功写入会话后才记接收版本;下一条新消息在它之后。 */
|
|
241
257
|
private receivePersonaHandoff;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session/session-manager.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAqE,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC7H,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"session-manager.d.ts","sourceRoot":"","sources":["../../src/session/session-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,8 @@ import { IdleEvictor } from "./idle-evictor.js";
|
|
|
21
21
|
import { chatKeyOf, formatNotesHint, selectNotesForInjection } from "../notes/notes-store.js";
|
|
22
22
|
import { formatHandoffHint, latestCompactionSummary } from "../features/session-handoff.js";
|
|
23
23
|
import { collectHandoffInput, generatePersonaHandoff } from "../features/persona-handoff.js";
|
|
24
|
+
import { collectJudgeLines } from "../middleware/reply-decider.js";
|
|
25
|
+
import { sanitizePseudoToolText } from "../media/pseudo-sticker-call.js";
|
|
24
26
|
import { createPersonaHandoffMessage, isPersonaHandoffSource } from "../shared/message-source.js";
|
|
25
27
|
import { PromptLatch } from "../features/prompt-latch.js";
|
|
26
28
|
import { resolveTmpDir } from "../media/tmp-dir.js";
|
|
@@ -30,6 +32,7 @@ import { statSync } from 'node:fs';
|
|
|
30
32
|
import { formatScheduleMigrationHint, readScheduleMigrations, retireMigratedSchedules, scheduleStorageHome, } from "./schedule-migration.js";
|
|
31
33
|
import { GROUP_MESSAGE_FORMAT_PROMPT } from "../features/message-format.js";
|
|
32
34
|
import { compactThreshold, decideAutoCompact, deferCeiling, lastTurnUsedTools, shouldIdleCompact } from "../features/compact-policy.js";
|
|
35
|
+
import { TurnSteerTracker } from "../transport/turn-steer.js";
|
|
33
36
|
/** ManualCompactionError 各 code 的友好提示 */
|
|
34
37
|
const COMPACTION_ERROR_HINTS = {
|
|
35
38
|
busy: '压缩服务忙,请稍后重试',
|
|
@@ -43,6 +46,79 @@ const COMPACTION_ERROR_HINTS = {
|
|
|
43
46
|
const HANDOFF_WAIT_MS = 60_000;
|
|
44
47
|
/** 登记了注入却迟迟没等到轮次结束时,多久之后作废 */
|
|
45
48
|
const NOTE_INJECTION_TTL_MS = 30 * 60_000;
|
|
49
|
+
function cleanUserEventText(raw) {
|
|
50
|
+
const currentIdx = raw.lastIndexOf('[Current message]');
|
|
51
|
+
const body = currentIdx >= 0 ? raw.slice(currentIdx + '[Current message]'.length) : raw;
|
|
52
|
+
const noteTail = '要看更多用 qqbot_notes_search。)';
|
|
53
|
+
const afterNotes = body.includes(noteTail) ? body.slice(body.lastIndexOf(noteTail) + noteTail.length) : body;
|
|
54
|
+
return afterNotes
|
|
55
|
+
.split('\n')
|
|
56
|
+
.filter((line) => {
|
|
57
|
+
const t = line.trim();
|
|
58
|
+
return t !== ''
|
|
59
|
+
&& !t.startsWith('- Image:')
|
|
60
|
+
&& !t.startsWith('- Video:')
|
|
61
|
+
&& !t.startsWith('- File:')
|
|
62
|
+
&& !t.startsWith('- Voice:')
|
|
63
|
+
&& !t.startsWith('[图片已原生附上')
|
|
64
|
+
&& !t.startsWith('[图片未原生注入')
|
|
65
|
+
&& !t.startsWith('[本地表情库]')
|
|
66
|
+
&& !t.startsWith('[转发聊天记录里的图片]');
|
|
67
|
+
})
|
|
68
|
+
.join(' ')
|
|
69
|
+
.trim();
|
|
70
|
+
}
|
|
71
|
+
/** 私聊没有群记忆文件,从会话历史里取本轮之前的最近几句对话作为打分背景 */
|
|
72
|
+
function recentSessionLines(agent, limit) {
|
|
73
|
+
try {
|
|
74
|
+
const events = agent?.session?.snapshotEvents?.() ?? agent?.session?.events ?? [];
|
|
75
|
+
if (events.length === 0 || limit <= 0)
|
|
76
|
+
return [];
|
|
77
|
+
const readMsg = (event) => {
|
|
78
|
+
const data = (event.data ?? event);
|
|
79
|
+
const message = data.message ?? data;
|
|
80
|
+
const source = message.source ?? data.source;
|
|
81
|
+
const text = message.content?.filter((b) => b.type === 'text').map((b) => b.text ?? '').join('\n').trim() ?? '';
|
|
82
|
+
return { kind: source?.kind, text };
|
|
83
|
+
};
|
|
84
|
+
let cut = events.length;
|
|
85
|
+
for (let i = events.length - 1; i >= 0; i--) {
|
|
86
|
+
const ev = events[i];
|
|
87
|
+
if (ev.type !== 'user/message')
|
|
88
|
+
continue;
|
|
89
|
+
const { kind } = readMsg(ev);
|
|
90
|
+
if (kind === undefined || kind === 'user') {
|
|
91
|
+
cut = i;
|
|
92
|
+
break;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
const lines = [];
|
|
96
|
+
for (let i = cut - 1; i >= 0 && lines.length < limit; i--) {
|
|
97
|
+
const ev = events[i];
|
|
98
|
+
if (ev.type !== 'user/message' && ev.type !== 'assistant/message')
|
|
99
|
+
continue;
|
|
100
|
+
const { kind, text } = readMsg(ev);
|
|
101
|
+
if (!text)
|
|
102
|
+
continue;
|
|
103
|
+
if (ev.type === 'user/message') {
|
|
104
|
+
if (kind !== undefined && kind !== 'user')
|
|
105
|
+
continue;
|
|
106
|
+
const cleaned = cleanUserEventText(text);
|
|
107
|
+
if (cleaned)
|
|
108
|
+
lines.unshift({ sender: '对方', text: cleaned, timestamp: 0 });
|
|
109
|
+
}
|
|
110
|
+
else {
|
|
111
|
+
const cleaned = sanitizePseudoToolText(text).trim();
|
|
112
|
+
if (cleaned && !cleaned.startsWith('💭'))
|
|
113
|
+
lines.unshift({ text: cleaned, timestamp: 0 });
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return lines;
|
|
117
|
+
}
|
|
118
|
+
catch {
|
|
119
|
+
return [];
|
|
120
|
+
}
|
|
121
|
+
}
|
|
46
122
|
/** 排在宿主自己的 runtime context(最大 210)后面 */
|
|
47
123
|
const DND_STATE_CONTEXT_ORDER = 1000;
|
|
48
124
|
const STICKER_ADDITIONS_CONTEXT_ORDER = 1010;
|
|
@@ -69,10 +145,12 @@ export function promptEpoch(record) {
|
|
|
69
145
|
const session = record.agent.session;
|
|
70
146
|
return `${session.id}:${session.surface?.contentGeneration ?? 0}`;
|
|
71
147
|
}
|
|
72
|
-
/** 这个 agent 所在会话的团况快照文字;不是 QQ
|
|
73
|
-
export function dndStateText(agent, findRecord, dnd, logger) {
|
|
148
|
+
/** 这个 agent 所在会话的团况快照文字;不是 QQ 会话、战斗子代理(改由回合前增量注入)、没开团或读取失败都返回空串 */
|
|
149
|
+
export function dndStateText(agent, findRecord, dnd, logger, isCombatChild) {
|
|
74
150
|
if (agent === undefined || dnd === undefined)
|
|
75
151
|
return '';
|
|
152
|
+
if (isCombatChild?.(agent))
|
|
153
|
+
return '';
|
|
76
154
|
const record = findRecord(agent);
|
|
77
155
|
if (record === undefined)
|
|
78
156
|
return '';
|
|
@@ -135,6 +213,8 @@ export class SessionManager {
|
|
|
135
213
|
dndToolScope;
|
|
136
214
|
/** 一段对话内锁住的 system prompt 文字(表情清单、本群笔记目录),见 PromptLatch */
|
|
137
215
|
promptLatch = new PromptLatch();
|
|
216
|
+
/** 短时入站自动 steer 阶段跟踪器(与出站事件、流式帧同步) */
|
|
217
|
+
turnSteer = new TurnSteerTracker();
|
|
138
218
|
/** 由 bootstrap 注入的跑团按钮(/dnd start 发签到);按钮关闭时为空 */
|
|
139
219
|
dndButtons;
|
|
140
220
|
personaStore;
|
|
@@ -364,7 +444,7 @@ export class SessionManager {
|
|
|
364
444
|
order: DND_STATE_CONTEXT_ORDER,
|
|
365
445
|
required: true,
|
|
366
446
|
interpolate: false,
|
|
367
|
-
text: (context) => dndStateText(context.agent, (agent) => this.findByAgent(agent), this.dndService, this.logger),
|
|
447
|
+
text: (context) => dndStateText(context.agent, (agent) => this.findByAgent(agent), this.dndService, this.logger, (agent) => Boolean(this.combatAgents?.isCombatAgent(agent))),
|
|
368
448
|
});
|
|
369
449
|
scope.systemPrompt.context({
|
|
370
450
|
name: 'qqbot:sticker-additions',
|
|
@@ -372,6 +452,8 @@ export class SessionManager {
|
|
|
372
452
|
required: true,
|
|
373
453
|
interpolate: false,
|
|
374
454
|
text: (context) => {
|
|
455
|
+
if (context.agent !== undefined && this.combatAgents?.isCombatAgent(context.agent))
|
|
456
|
+
return '';
|
|
375
457
|
const record = context.agent === undefined ? undefined : this.findByAgent(context.agent);
|
|
376
458
|
const catalog = record === undefined ? undefined : this.promptLatch.peek(`${record.sessionKey}|${STICKER_CATALOG_SECTION}`);
|
|
377
459
|
return catalog === undefined ? '' : this.stickerStore?.catalogAdditions(catalog) ?? '';
|
|
@@ -623,6 +705,9 @@ export class SessionManager {
|
|
|
623
705
|
this.logger.info(`clearFailoverRoute: ${had ? '已清除' : '本来就没有'},${records.length} 个会话回到各自的默认路由`);
|
|
624
706
|
return records.length;
|
|
625
707
|
}
|
|
708
|
+
getFailoverRoute() {
|
|
709
|
+
return this.modelResolver.getFailover();
|
|
710
|
+
}
|
|
626
711
|
async listAvailableModels() {
|
|
627
712
|
return this.modelResolver.listModels();
|
|
628
713
|
}
|
|
@@ -644,7 +729,8 @@ export class SessionManager {
|
|
|
644
729
|
if (main !== undefined)
|
|
645
730
|
main.lastActivity = Date.now();
|
|
646
731
|
const target = await this.routeDndRecord(record);
|
|
647
|
-
|
|
732
|
+
const decorated = this.combatAgents?.decorateFollowupMessage(target, message) ?? message;
|
|
733
|
+
target.agent.followup(decorated);
|
|
648
734
|
await target.agent.whenIdle();
|
|
649
735
|
}
|
|
650
736
|
/** 入站图片本地表情库精确匹配(失败/未启用时返回 undefined,不阻塞消息) */
|
|
@@ -657,7 +743,7 @@ export class SessionManager {
|
|
|
657
743
|
}
|
|
658
744
|
}
|
|
659
745
|
/** 按当前消息检索笔记(共享 + 本会话私有),返回要注入的提示块(未启用/无相关结果/出错时返回空串) */
|
|
660
|
-
async notesHint(query, scope, peerId) {
|
|
746
|
+
async notesHint(query, scope, peerId, messageId, preservePending = false) {
|
|
661
747
|
if (this.config.dnd?.combatAgent?.enabled && this.dndService?.active(this.sessionKey(scope, peerId))?.campaign.initiative)
|
|
662
748
|
return '';
|
|
663
749
|
const notes = this.config.notes;
|
|
@@ -672,10 +758,14 @@ export class SessionManager {
|
|
|
672
758
|
// 这里只登记:消息还在组装,模型未必收得到。等这一轮正常结束再记账、打分(见 settleNoteInjection)
|
|
673
759
|
const key = this.sessionKey(scope, peerId);
|
|
674
760
|
if (selected.length === 0) {
|
|
675
|
-
|
|
761
|
+
if (!preservePending)
|
|
762
|
+
this.pendingNoteInjections.delete(key);
|
|
676
763
|
}
|
|
677
764
|
else {
|
|
678
765
|
const perHit = Math.max(80, Math.floor(notes.injectMaxChars / selected.length));
|
|
766
|
+
const contextLines = scope === 'group'
|
|
767
|
+
? collectJudgeLines(this.config, peerId, messageId, { includeCurrent: false })
|
|
768
|
+
: undefined;
|
|
679
769
|
this.pendingNoteInjections.set(key, {
|
|
680
770
|
query,
|
|
681
771
|
at: Date.now(),
|
|
@@ -683,6 +773,7 @@ export class SessionManager {
|
|
|
683
773
|
hits: selected,
|
|
684
774
|
// 打分要看模型实际看到的那段,和 formatNotesHint 的截断保持一致
|
|
685
775
|
snippets: selected.map((hit) => hit.text.replace(/\s+/g, ' ').trim().slice(0, perHit)),
|
|
776
|
+
...(contextLines !== undefined && contextLines.length > 0 ? { contextLines } : {}),
|
|
686
777
|
});
|
|
687
778
|
}
|
|
688
779
|
return formatNotesHint(hits, {
|
|
@@ -725,7 +816,7 @@ export class SessionManager {
|
|
|
725
816
|
* 一轮结束时结算这轮注入的笔记:正常结束才记账并排队打分,异常结束的丢掉。
|
|
726
817
|
* 打分异步进行,不等结果。
|
|
727
818
|
*/
|
|
728
|
-
settleNoteInjection(record, ok) {
|
|
819
|
+
settleNoteInjection(record, ok, turn) {
|
|
729
820
|
const pending = this.pendingNoteInjections.get(record.sessionKey);
|
|
730
821
|
if (pending === undefined)
|
|
731
822
|
return;
|
|
@@ -750,12 +841,18 @@ export class SessionManager {
|
|
|
750
841
|
const model = replyJudge?.model || route?.model || this.config.model;
|
|
751
842
|
if (!provider || !model)
|
|
752
843
|
return;
|
|
844
|
+
const contextLimit = replyJudge?.contextMessages ?? 6;
|
|
845
|
+
const contextLines = pending.contextLines
|
|
846
|
+
?? (record.scope === 'c2c' ? recentSessionLines(record.agent, contextLimit) : undefined);
|
|
753
847
|
const policy = { minSamples: judge.minSamples, muteBelow: judge.muteBelow };
|
|
754
848
|
void this.noteJudge.enqueue({
|
|
755
849
|
provider,
|
|
756
850
|
model,
|
|
757
851
|
reasoningEffort: replyJudge?.reasoningEffort ?? '',
|
|
758
852
|
query: pending.query,
|
|
853
|
+
...(contextLines !== undefined && contextLines.length > 0 ? { contextLines } : {}),
|
|
854
|
+
...(turn?.reply ? { reply: turn.reply } : {}),
|
|
855
|
+
...(turn?.toolsUsed !== undefined && turn.toolsUsed.length > 0 ? { toolsUsed: turn.toolsUsed } : {}),
|
|
759
856
|
notes: pending.hits.map((hit, i) => ({ file: hit.file, heading: hit.heading, text: pending.snippets[i] ?? '' })),
|
|
760
857
|
}).then((scores) => {
|
|
761
858
|
if (scores === undefined)
|
|
@@ -966,10 +1063,10 @@ export class SessionManager {
|
|
|
966
1063
|
currentSessionId(sessionKey) {
|
|
967
1064
|
return this.modelResolver.getSessionId(sessionKey) ?? this.deriveSessionId(sessionKey);
|
|
968
1065
|
}
|
|
969
|
-
/** 该 peer
|
|
1066
|
+
/** 该 peer 当前主会话(或下一次 getOrCreate 将使用)的 sessionId;不随临时战斗子代理漂移,保证群历史游标连续 */
|
|
970
1067
|
sessionIdFor(scope, peerId) {
|
|
971
|
-
const
|
|
972
|
-
return
|
|
1068
|
+
const key = this.sessionKey(scope, peerId);
|
|
1069
|
+
return this.sessions.get(key)?.sessionId ?? this.currentSessionId(key);
|
|
973
1070
|
}
|
|
974
1071
|
async composePreset(presetId) {
|
|
975
1072
|
const presets = this.getPresetsService();
|
|
@@ -1101,7 +1198,8 @@ export class SessionManager {
|
|
|
1101
1198
|
}
|
|
1102
1199
|
const record = {
|
|
1103
1200
|
sessionKey: key,
|
|
1104
|
-
|
|
1201
|
+
// 恢复失败时可能已换建会话,接收账本和出站查询必须跟随实际 agent。
|
|
1202
|
+
sessionId: agent.session.id,
|
|
1105
1203
|
agent,
|
|
1106
1204
|
handle: handle ?? { agent, dispose: async () => { } },
|
|
1107
1205
|
replyTarget,
|
|
@@ -1244,6 +1342,23 @@ export class SessionManager {
|
|
|
1244
1342
|
await this.remove(scope, peerId, store.sessionFor(peerId, personaId, scope) ?? randomUUID());
|
|
1245
1343
|
return incomplete ? 'handoff-incomplete' : 'ok';
|
|
1246
1344
|
}
|
|
1345
|
+
/**
|
|
1346
|
+
* 解析指定会话当前实际生效的 provider/model 路由(含 Web/命令切换、model/selection、最近请求头及配置解析链)。
|
|
1347
|
+
* reasoningEffort 仅在最近请求头与该路由一致且显式非空时透传,否则置为 null,避免战斗子代理回退复用主会话模型时强行塞入不兼容的推理档位导致 400。
|
|
1348
|
+
*/
|
|
1349
|
+
getEffectiveSessionRoute(record) {
|
|
1350
|
+
const route = this.personaModelRoute(record);
|
|
1351
|
+
if (!route?.provider || !route.model)
|
|
1352
|
+
return undefined;
|
|
1353
|
+
const headerCfg = record.agent.session.requestHeader?.()?.config;
|
|
1354
|
+
const effort = headerCfg?.provider === route.provider
|
|
1355
|
+
&& headerCfg?.model === route.model
|
|
1356
|
+
&& typeof headerCfg.reasoningEffort === 'string'
|
|
1357
|
+
&& headerCfg.reasoningEffort.trim()
|
|
1358
|
+
? headerCfg.reasoningEffort.trim()
|
|
1359
|
+
: null;
|
|
1360
|
+
return { provider: route.provider, model: route.model, reasoningEffort: effort };
|
|
1361
|
+
}
|
|
1247
1362
|
personaModelRoute(record) {
|
|
1248
1363
|
const controller = this.ctx?.get('sessionController');
|
|
1249
1364
|
const selected = controller?.agents?.selectionFor?.(record.agent)?.current ?? this.modelSelections?.get(record.agent)?.current;
|
|
@@ -1273,9 +1388,14 @@ export class SessionManager {
|
|
|
1273
1388
|
const events = session.snapshotEvents?.() ?? session.events ?? [];
|
|
1274
1389
|
const receipt = store.handoffs.read(record.sessionKey).received[persona];
|
|
1275
1390
|
// 旧版曾在真正持久化前记接收;加载后没有交接事件时要补送,不能只信账本。
|
|
1276
|
-
|
|
1391
|
+
// 收件箱的 inserted 是持久化输入;宿主在消费它时先建立 system head,
|
|
1392
|
+
// 不能在空 surface 上直接 append user/message。
|
|
1393
|
+
const deliveredMessages = events.flatMap((event) => {
|
|
1277
1394
|
const data = (event.data ?? event.message ?? event);
|
|
1278
|
-
return event.type === '
|
|
1395
|
+
return event.type === 'agent/inbox/spliced' ? data.inserted ?? [] : event.type === 'user/message' ? [data] : [];
|
|
1396
|
+
});
|
|
1397
|
+
const hasDurableDelivery = deliveredMessages.some((data) => {
|
|
1398
|
+
return isPersonaHandoffSource(data.source) && data.content?.some((block) => {
|
|
1279
1399
|
const text = block.text ?? '';
|
|
1280
1400
|
return receipt !== undefined && (receipt.version === 0 || text.includes(`版本 ${receipt.version};`))
|
|
1281
1401
|
&& (receipt.attemptId === undefined || text.includes(receipt.attemptId));
|
|
@@ -1284,15 +1404,14 @@ export class SessionManager {
|
|
|
1284
1404
|
const delivery = store.handoffs.delivery(record.sessionKey, persona, record.sessionId, !hasDurableDelivery);
|
|
1285
1405
|
if (!delivery)
|
|
1286
1406
|
return;
|
|
1287
|
-
if (!
|
|
1288
|
-
throw new Error('
|
|
1407
|
+
if (!record.agent.send)
|
|
1408
|
+
throw new Error('当前宿主不支持交接持久化收件箱');
|
|
1289
1409
|
// 会话已写入、接收账本尚未写入时崩溃:从正文识别已送达记录,避免再次追加。
|
|
1290
|
-
const alreadyWritten =
|
|
1291
|
-
const data = (event.data ?? event.message ?? event);
|
|
1410
|
+
const alreadyWritten = deliveredMessages.some((data) => {
|
|
1292
1411
|
return isPersonaHandoffSource(data.source) && data.content?.some((block) => block.text === delivery.text);
|
|
1293
1412
|
});
|
|
1294
1413
|
if (!alreadyWritten)
|
|
1295
|
-
|
|
1414
|
+
record.agent.send(createPersonaHandoffMessage(delivery.text), 'next-step', false);
|
|
1296
1415
|
store.handoffs.acknowledge(record.sessionKey, persona, record.sessionId, delivery.version, delivery.attemptId);
|
|
1297
1416
|
}
|
|
1298
1417
|
/**
|
|
@@ -1445,8 +1564,12 @@ export class SessionManager {
|
|
|
1445
1564
|
maybeAutoCompact(record) {
|
|
1446
1565
|
if (this.personaTransitions?.has(record.sessionKey))
|
|
1447
1566
|
return;
|
|
1567
|
+
if (this.sessions !== undefined && this.sessions.get(record.sessionKey) !== record)
|
|
1568
|
+
return;
|
|
1448
1569
|
if (this.combatAgents?.current(record.sessionKey) !== undefined)
|
|
1449
1570
|
return;
|
|
1571
|
+
if (this.combatAgents?.isCombatAgent(record.agent))
|
|
1572
|
+
return;
|
|
1450
1573
|
if ((this.config.autoCompactTokens ?? 0) <= 0 || record.compacting)
|
|
1451
1574
|
return;
|
|
1452
1575
|
if (record.contextTokens === undefined || record.agent.status !== 'idle')
|