dsh-plugin-om 0.0.56 → 0.0.57
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 +73 -17
- package/dist/client/OmCompactionCard.d.ts.map +1 -1
- package/dist/client/OmEvalModelPanel.d.ts +22 -0
- package/dist/client/OmEvalModelPanel.d.ts.map +1 -0
- package/dist/client/OmRecompressMenu.d.ts +3 -3
- package/dist/client/OmRecompressMenu.d.ts.map +1 -1
- package/dist/client/compaction-eval-jump.d.ts +20 -0
- package/dist/client/compaction-eval-jump.d.ts.map +1 -0
- package/dist/client/definition.d.ts +2 -2
- package/dist/client/definition.d.ts.map +1 -1
- package/dist/client/eval-model-panel.d.ts +57 -0
- package/dist/client/eval-model-panel.d.ts.map +1 -0
- package/dist/client/eval-model-register.d.ts +10 -0
- package/dist/client/eval-model-register.d.ts.map +1 -0
- package/dist/client/index.d.ts +2 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/locales.d.ts +13 -2
- package/dist/client/locales.d.ts.map +1 -1
- package/dist/client/om-config-controller.d.ts +4 -1
- package/dist/client/om-config-controller.d.ts.map +1 -1
- package/dist/client/recompress-run.d.ts +23 -2
- package/dist/client/recompress-run.d.ts.map +1 -1
- package/dist/client.js +675 -116
- package/dist/client.js.map +1 -1
- package/dist/compaction-eval-command.d.ts +54 -0
- package/dist/compaction-eval-command.d.ts.map +1 -0
- package/dist/compaction-log.d.ts +31 -9
- package/dist/compaction-log.d.ts.map +1 -1
- package/dist/compress-loop.d.ts +21 -10
- package/dist/compress-loop.d.ts.map +1 -1
- package/dist/compress-tools.d.ts +16 -8
- package/dist/compress-tools.d.ts.map +1 -1
- package/dist/compress-view.d.ts +1 -3
- package/dist/compress-view.d.ts.map +1 -1
- package/dist/compress.d.ts +117 -8
- package/dist/compress.d.ts.map +1 -1
- package/dist/config.d.ts +4 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/constants.d.ts +3 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/eval-session-text.d.ts +28 -0
- package/dist/eval-session-text.d.ts.map +1 -0
- package/dist/index.d.ts +4 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +1390 -478
- package/dist/log-index.d.ts +2 -2
- package/dist/log-index.d.ts.map +1 -1
- package/dist/om-event.d.ts +26 -2
- package/dist/om-event.d.ts.map +1 -1
- package/dist/precompress.d.ts +100 -0
- package/dist/precompress.d.ts.map +1 -0
- package/dist/recall-xml.d.ts +2 -1
- package/dist/recall-xml.d.ts.map +1 -1
- package/dist/recompress-gate.d.ts +11 -0
- package/dist/recompress-gate.d.ts.map +1 -0
- package/dist/recompress.d.ts +20 -4
- package/dist/recompress.d.ts.map +1 -1
- package/dist/skill/compaction-eval/SKILL.md +72 -0
- package/dist/skill/compaction-eval/references/facts-prompt.md +42 -0
- package/dist/skill/compaction-eval/references/judge-prompt.md +48 -0
- package/dist/skill/compaction-eval/references/rules.md +56 -0
- package/dist/skill/compaction-eval/scripts/aggregate.mjs +372 -0
- package/dist/skill/compaction-eval/scripts/compress.mjs +15675 -0
- package/dist/skill/compaction-eval/scripts/merge.mjs +287 -0
- package/dist/skill/compaction-eval/scripts/prepare.mjs +1620 -0
- package/dist/skill/compaction-eval/scripts/view.mjs +15983 -0
- package/dist/thinking-binding.d.ts +28 -0
- package/dist/thinking-binding.d.ts.map +1 -0
- package/dist/types.d.ts +9 -6
- package/dist/types.d.ts.map +1 -1
- package/package.json +10 -3
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { CommandDefinition } from '@deepseek-ai/dsh-commands';
|
|
2
|
+
import type { Agent, Context } from './types.ts';
|
|
3
|
+
/** 新会话使用的模型选择;缺 reasoningEffort 表示用模型默认等级。 */
|
|
4
|
+
export interface EvalModel {
|
|
5
|
+
readonly provider: string;
|
|
6
|
+
readonly model: string;
|
|
7
|
+
readonly reasoningEffort?: string;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* 解析命令参数 `provider/model [思考等级]`:以第一个 `/` 切分 provider 与 model,空白分隔等级。
|
|
11
|
+
* @returns 无参数时 model 为 undefined(沿用当前会话);格式错误返回用法说明。
|
|
12
|
+
*/
|
|
13
|
+
export declare function parseEvalModelInput(rawInput: string): {
|
|
14
|
+
ok: true;
|
|
15
|
+
model: EvalModel | undefined;
|
|
16
|
+
} | {
|
|
17
|
+
ok: false;
|
|
18
|
+
error: string;
|
|
19
|
+
};
|
|
20
|
+
/**
|
|
21
|
+
* skill 文档候选绝对路径,按优先级排列:
|
|
22
|
+
* 1. 发布产物 dist/skill/compaction-eval/SKILL.md(脚本为自包含 .mjs);
|
|
23
|
+
* 2. 仓库源码 .agents/skills/compaction-eval/SKILL.md(开发时 dist 未构建)。
|
|
24
|
+
* @param fromUrl - 入口模块 URL,缺省为本模块(打包后即 dist/index.mjs)。
|
|
25
|
+
*/
|
|
26
|
+
export declare function skillDocCandidates(fromUrl?: string | URL): string[];
|
|
27
|
+
/**
|
|
28
|
+
* 第一个存在的 skill 文档路径。
|
|
29
|
+
* @param fromUrl - 入口模块 URL,缺省为本模块。
|
|
30
|
+
* @returns 文档绝对路径;都不存在时 undefined。
|
|
31
|
+
*/
|
|
32
|
+
export declare function skillDocPath(fromUrl?: string | URL): string | undefined;
|
|
33
|
+
/** 启动结果:成功带新会话 id 与命令文本,失败带原因。 */
|
|
34
|
+
export type StartEvalResult = {
|
|
35
|
+
readonly ok: true;
|
|
36
|
+
readonly sessionId: string;
|
|
37
|
+
readonly text: string;
|
|
38
|
+
} | {
|
|
39
|
+
readonly ok: false;
|
|
40
|
+
readonly error: string;
|
|
41
|
+
};
|
|
42
|
+
/**
|
|
43
|
+
* 新建同工作区会话并投递首条消息。
|
|
44
|
+
* 非主会话、会话无 cwd、文档缺失或宿主缺 sessionController 时返回失败且不建会话;
|
|
45
|
+
* 建会话与投递的异常归一为失败原因。
|
|
46
|
+
* @param ctx - 宿主上下文(经 ctx.get 容错读取 sessionController 与 workspaceRegistry)。
|
|
47
|
+
* @param agent - 命令所针对的会话,其 id 与 cwd 决定分析目标与新会话位置。
|
|
48
|
+
* @param signal - 命令取消信号,透传给投递。
|
|
49
|
+
* @param model - 新会话模型;缺省沿用当前会话,当前会话尚未请求过时用宿主默认。
|
|
50
|
+
*/
|
|
51
|
+
export declare function startEvalSession(ctx: Context, agent: Agent, signal: AbortSignal, model?: EvalModel): Promise<StartEvalResult>;
|
|
52
|
+
/** 构造 /om-compaction-eval 命令定义:可选参数指定新会话的模型与思考等级。 */
|
|
53
|
+
export declare function buildCompactionEvalCommand(ctx: Context): CommandDefinition;
|
|
54
|
+
//# sourceMappingURL=compaction-eval-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compaction-eval-command.d.ts","sourceRoot":"","sources":["../src/compaction-eval-command.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAUnE,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGjD,8CAA8C;AAC9C,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;CACnC;AAID;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,GACf;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,SAAS,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAgB3E;AAiBD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,GAAE,MAAM,GAAG,GAAqB,GAAG,MAAM,EAAE,CAKpF;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,GAAE,MAAM,GAAG,GAAqB,GAAG,MAAM,GAAG,SAAS,CAExF;AAED,kCAAkC;AAClC,MAAM,MAAM,eAAe,GACvB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACxE;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,WAAW,EACnB,KAAK,CAAC,EAAE,SAAS,GAChB,OAAO,CAAC,eAAe,CAAC,CA4C1B;AAED,qDAAqD;AACrD,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG,iBAAiB,CAc1E"}
|
package/dist/compaction-log.d.ts
CHANGED
|
@@ -2,13 +2,16 @@
|
|
|
2
2
|
* 压缩会话记录落盘:把工具压缩循环的完整会话消息组以 seed 事件重建为一个 one-shot
|
|
3
3
|
* 诊断子会话(header origin 'subagent' + 首事件 subagent/descriptor),在父会话登记
|
|
4
4
|
* subagent/catalog,使其出现在宿主子智能体列表并随父会话日志导出。成功与失败均落盘
|
|
5
|
-
* (label
|
|
5
|
+
* (label 含完整消息区间与阶段,重压缩与失败另加后缀)。导出 recordCompressionSession / compressionRecordLabel /
|
|
6
6
|
* COMPACTION_LOG_PROVIDER。
|
|
7
7
|
*
|
|
8
8
|
* - 子会话经 ctx.sessions.create(seed) 构造:每个事件携带从循环统计重建的 time
|
|
9
9
|
* (turn 边界取循环起止、第 k 个 assistant 取第 k 轮起止、工具调用与结果与其
|
|
10
10
|
* assistant 同刻),并把逐轮 usage 附加到 assistant/message,使宿主原生 UI 直接
|
|
11
11
|
* 渲染 turn 时长、逐轮 LLM 延迟、消息时钟与 Turn usage 面板
|
|
12
|
+
* - 压缩系统提示词落盘为 system/message(随任务指令 step 开启时先行落盘,宿主 UI
|
|
13
|
+
* 呈现「系统提示词」);任务指令 source 改写为用户来源(宿主呈现为用户消息),
|
|
14
|
+
* 轮间提醒保持插件来源
|
|
12
15
|
* - 循环消息组按宿主 turn/step 生命周期重建;未执行的工具调用补齐失败结果
|
|
13
16
|
* - 失败时的子会话 id 由调用方写入主会话日志与 compaction/end 载荷(compress.ts /
|
|
14
17
|
* index.ts)
|
|
@@ -20,17 +23,30 @@ import type { Context, Session } from './types.ts';
|
|
|
20
23
|
import { type RoutedTarget } from './utils.ts';
|
|
21
24
|
/** 诊断子会话的 descriptor provider(宿主子代理列表识别用)。 */
|
|
22
25
|
export declare const COMPACTION_LOG_PROVIDER = "om-compaction-log";
|
|
26
|
+
/** 完整消息区间(label 用)。 */
|
|
27
|
+
export type RecordRange = {
|
|
28
|
+
/** 起始 index。 */
|
|
29
|
+
min?: number;
|
|
30
|
+
/** 结束 index。 */
|
|
31
|
+
max?: number;
|
|
32
|
+
};
|
|
23
33
|
/**
|
|
24
|
-
* 压缩会话记录 label
|
|
25
|
-
*
|
|
34
|
+
* 压缩会话记录 label:`OM会话(起点-终点)-观察/反思`,区间缺失省略括号段;
|
|
35
|
+
* 重压缩追加 `-重压缩`,失败追加 `-失败`。
|
|
26
36
|
*/
|
|
27
|
-
export declare function compressionRecordLabel(phase: 'observe' | 'reflect' | undefined,
|
|
37
|
+
export declare function compressionRecordLabel(phase: 'observe' | 'reflect' | undefined, range: RecordRange, success: boolean, retry: boolean): string;
|
|
28
38
|
/** 日志尾部的模型信息:展示文本与归因的 provider/model。 */
|
|
29
39
|
export type CompressionInfo = {
|
|
30
40
|
text: string;
|
|
31
41
|
provider: string;
|
|
32
42
|
model: string;
|
|
33
43
|
};
|
|
44
|
+
/** 失败详情:原因、最后一轮 finish 类型与输出 token 数(均可缺省)。 */
|
|
45
|
+
export type CompressionFailureInfo = {
|
|
46
|
+
reason: string;
|
|
47
|
+
finish?: string;
|
|
48
|
+
outputTokens?: number;
|
|
49
|
+
};
|
|
34
50
|
/** 生成模型信息:压缩模型、思考等级、原始消息与压缩产物的字符数(k 单位)。 */
|
|
35
51
|
export declare function compressionInfo(info: {
|
|
36
52
|
target: RoutedTarget;
|
|
@@ -40,28 +56,34 @@ export declare function compressionInfo(info: {
|
|
|
40
56
|
originalChars: number;
|
|
41
57
|
/** 压缩产物字符数;失败时缺省。 */
|
|
42
58
|
resultChars?: number;
|
|
59
|
+
/** 失败详情;仅失败时有意义。 */
|
|
60
|
+
failure?: CompressionFailureInfo;
|
|
43
61
|
}): CompressionInfo;
|
|
44
62
|
/**
|
|
45
63
|
* 把一次压缩工具循环的完整会话消息组落盘为子会话:以重建时间线的 seed 事件经
|
|
46
64
|
* ctx.sessions.create 构造子会话(header origin 'subagent'、parentSession 指向主会话、
|
|
47
65
|
* delegationDepth = 父 + 1、cwd 继承主会话;首事件 one-shot descriptor,provider
|
|
48
|
-
* om-compaction-log,label
|
|
66
|
+
* om-compaction-log,label 含完整消息区间与阶段;info 存在时尾部追加一条模型文本),flush 持久化,在父会话登记
|
|
49
67
|
* subagent/catalog,返回子会话 id。成功与失败均调用;落盘自身绝不抛错,任何失败仅
|
|
50
68
|
* logger.warn 并返回 undefined。
|
|
51
69
|
*/
|
|
52
70
|
export declare function recordCompressionSession(ctx: Context, parentSession: Session, options: {
|
|
53
71
|
/** 压缩 pass(记录 label 用)。 */
|
|
54
72
|
phase: 'observe' | 'reflect' | undefined;
|
|
73
|
+
/** 压缩视图的完整消息区间(label 用);缺省省略区间段。 */
|
|
74
|
+
range?: RecordRange;
|
|
55
75
|
/** 循环全部消息(user 指令/提醒、assistant 含 tool-call、tool-result,原样)。 */
|
|
56
76
|
messages: readonly Message[];
|
|
57
|
-
/**
|
|
77
|
+
/** 循环统计(时间线重建与逐轮 usage 来源)。 */
|
|
58
78
|
stats: CompressionStats;
|
|
59
|
-
/**
|
|
79
|
+
/** 循环实际发送的压缩系统提示词;存在且非空时落盘为 system/message(表层节点 0)。 */
|
|
80
|
+
system?: string;
|
|
81
|
+
/** 是否成功完成(label 追加失败后缀与否)。 */
|
|
60
82
|
success: boolean;
|
|
61
83
|
/** 插件 debug 开关(落盘失败的 warn 是否带步骤细节)。 */
|
|
62
84
|
debug: boolean;
|
|
63
|
-
/**
|
|
64
|
-
|
|
85
|
+
/** 是否重压缩(label 追加重压缩后缀);常规压缩缺省。 */
|
|
86
|
+
retry?: boolean;
|
|
65
87
|
/** 模型信息(compressionInfo),追加为尾部模型文本;缺省不写。 */
|
|
66
88
|
info?: CompressionInfo;
|
|
67
89
|
}): Promise<string | undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction-log.d.ts","sourceRoot":"","sources":["../src/compaction-log.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"compaction-log.d.ts","sourceRoot":"","sources":["../src/compaction-log.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAEV,OAAO,EAIR,MAAM,sBAAsB,CAAC;AAS9B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAiC,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,KAAK,YAAY,EAAQ,MAAM,YAAY,CAAC;AAErD,8CAA8C;AAC9C,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAS3D,uBAAuB;AACvB,MAAM,MAAM,WAAW,GAAG;IACxB,gBAAgB;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,EACxC,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,OAAO,GACb,MAAM,CAIR;AAED,yCAAyC;AACzC,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,+CAA+C;AAC/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAcF,4CAA4C;AAC5C,wBAAgB,eAAe,CAAC,IAAI,EAAE;IACpC,MAAM,EAAE,YAAY,CAAC;IACrB,oBAAoB;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,eAAe;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB;IACpB,OAAO,CAAC,EAAE,sBAAsB,CAAC;CAClC,GAAG,eAAe,CAWlB;AA0MD;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,OAAO,EACZ,aAAa,EAAE,OAAO,EACtB,OAAO,EAAE;IACP,2BAA2B;IAC3B,KAAK,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;IACzC,oCAAoC;IACpC,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,+DAA+D;IAC/D,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IAC7B,+BAA+B;IAC/B,KAAK,EAAE,gBAAgB,CAAC;IACxB,uDAAuD;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,uCAAuC;IACvC,KAAK,EAAE,OAAO,CAAC;IACf,mCAAmC;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,4CAA4C;IAC5C,IAAI,CAAC,EAAE,eAAe,CAAC;CACxB,GACA,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAsD7B"}
|
package/dist/compress-loop.d.ts
CHANGED
|
@@ -2,21 +2,24 @@
|
|
|
2
2
|
* 工具驱动的压缩循环:以新会话方式直连 ctx.llm.stream(),模型通过 getHistory /
|
|
3
3
|
* compressHistory / completeCompression 完成压缩,存在原始合法提问时加入重写工具。
|
|
4
4
|
* 导出 runCompressionLoop / buildCompressionPrompt / buildCompressionTaskText /
|
|
5
|
-
* ASK_COMPRESSION_PROMPT / CompressionLoopOptions / CompressionOutcome / CompressionStats / COMPRESSION_NUDGE_TEXT。
|
|
5
|
+
* REFLECT_COMPRESSION_PROMPT / ASK_COMPRESSION_PROMPT / CompressionLoopOptions / CompressionOutcome / CompressionStats / COMPRESSION_NUDGE_TEXT / TRUNCATION_NUDGE_TEXT。
|
|
6
6
|
*
|
|
7
7
|
* - 首条 user 消息仅含压缩指令与 start/end 区间(buildCompressionTaskText),不含
|
|
8
|
-
* 历史消息内容;共享压缩提示词作为 system
|
|
8
|
+
* 历史消息内容;共享压缩提示词作为 system,反思 pass 追加反思合并约束
|
|
9
9
|
* - 每轮请求携带压缩工具 schemas(purpose='compaction',maxTokens 沿用配置);流经
|
|
10
10
|
* BlockAssembler 组装为 assistant 消息,工具执行结果以 tool-result 消息回填
|
|
11
11
|
* - completeCompression 校验通过后立即停止(同轮后续工具调用不再执行),最终 <history>
|
|
12
12
|
* 块由 CompressionState 构建,全程无需整块校验
|
|
13
|
-
* - 模型输出纯文本(无工具调用)时追加提醒消息继续,连续
|
|
14
|
-
* -
|
|
15
|
-
*
|
|
13
|
+
* - 模型输出纯文本(无工具调用)时追加提醒消息继续,连续 3 轮仍无工具调用判失败
|
|
14
|
+
* - 输出被 max-tokens 截断且无工具调用时单独计数:该轮 assistant 消息仅落盘、不进入后续
|
|
15
|
+
* 请求,追加截断专用提醒,连续 3 轮截断判失败;任一轮有工具调用则两个计数清零
|
|
16
|
+
* - 429 限流走全局限流等待门(gateRateLimit / noteRateLimit);瞬时错误(5xx、网络类)
|
|
17
|
+
* 同样经限流门等待后重试,连续最多重试 3 次,任一轮成功响应后清零;重试轮不计入轮数;
|
|
18
|
+
* 其余请求级错误(含 4xx)直接判失败
|
|
16
19
|
* - signal 中止标记 aborted;token usage 汇总全部轮次;统计循环起止时间戳、总耗时
|
|
17
20
|
* 与逐轮请求统计(CompressionStats),随结果返回并随会话记录落盘
|
|
18
|
-
* -
|
|
19
|
-
*
|
|
21
|
+
* - 成功与失败均把循环消息组落盘为子会话(recordCompressionSession,system 一并落盘
|
|
22
|
+
* 为 system/message),成功记录 sessionId 于日志,失败记录作为诊断子会话 id 向上传播
|
|
20
23
|
*/
|
|
21
24
|
import { type ReasoningEffortId, type TokenUsage } from '@deepseek-ai/dsh-llm';
|
|
22
25
|
import type { CompressionView } from './compress-view.ts';
|
|
@@ -32,10 +35,14 @@ export declare function buildCompressionPrompt(skipReasoning: boolean): string;
|
|
|
32
35
|
* 构建压缩会话首条 user 消息文本(压缩指令 + start/end 区间,不含历史消息内容)。
|
|
33
36
|
*/
|
|
34
37
|
export declare function buildCompressionTaskText(phase: 'observe' | 'reflect', start: number, end: number): string;
|
|
38
|
+
/** 反思合并的额外约束,只在反思 pass 注入。 */
|
|
39
|
+
export declare const REFLECT_COMPRESSION_PROMPT: string;
|
|
35
40
|
/** 原始合法 ask 的处理约束,只在视图含待处理原始提问时注入。 */
|
|
36
41
|
export declare const ASK_COMPRESSION_PROMPT: string;
|
|
37
42
|
/** 模型输出纯文本(无工具调用)时追加的提醒消息文本。 */
|
|
38
43
|
export declare const COMPRESSION_NUDGE_TEXT = "\u8BF7\u901A\u8FC7\u5DE5\u5177\u6267\u884C\u538B\u7F29\uFF1A\u7528 getHistory \u67E5\u770B\u533A\u95F4\u6761\u76EE\uFF0C\u7528 compressHistory \u538B\u7F29 assistant \u6761\u76EE\uFF0C\u5B8C\u6210\u540E\u8C03\u7528 completeCompression\u3002\u4E0D\u8981\u8F93\u51FA\u4E0E\u5DE5\u5177\u8C03\u7528\u65E0\u5173\u7684\u6587\u672C\u3002";
|
|
44
|
+
/** 输出被 max-tokens 截断且无工具调用时追加的提醒消息文本。 */
|
|
45
|
+
export declare const TRUNCATION_NUDGE_TEXT = "\u4E0A\u4E00\u8F6E\u8F93\u51FA\u56E0\u957F\u5EA6\u4E0A\u9650\u88AB\u622A\u65AD\uFF0C\u5176\u4E2D\u7684\u5DE5\u5177\u8C03\u7528\u672A\u88AB\u63A5\u6536\u3002\u8BF7\u7F29\u77ED\u601D\u8003\uFF0C\u76F4\u63A5\u5206\u6279\u8C03\u7528 compressHistory\uFF08\u6BCF\u6B21\u8986\u76D6\u8F83\u5C0F\u533A\u95F4\uFF09\uFF0C\u6700\u540E\u8C03\u7528 completeCompression\u3002";
|
|
39
46
|
/** 逐轮请求统计:轮次(1 起)、该轮起止时间戳与耗时、该轮 token usage。 */
|
|
40
47
|
export type CompressionRoundStat = {
|
|
41
48
|
/** 轮次(1 起)。 */
|
|
@@ -80,8 +87,8 @@ export type CompressionLoopOptions = {
|
|
|
80
87
|
reasoningEffort?: ReasoningEffortId;
|
|
81
88
|
/** 原始消息字符数(与 OM 卡片口径一致);缺省按视图条目估算。 */
|
|
82
89
|
originalChars?: number;
|
|
83
|
-
/**
|
|
84
|
-
|
|
90
|
+
/** 是否重压缩(仅标记会话记录标题);常规压缩缺省。 */
|
|
91
|
+
retry?: boolean;
|
|
85
92
|
/** 取消信号。 */
|
|
86
93
|
signal?: AbortSignal;
|
|
87
94
|
};
|
|
@@ -115,8 +122,12 @@ export type CompressionFailure = {
|
|
|
115
122
|
export type CompressionOutcome = CompressionSuccess | CompressionFailure;
|
|
116
123
|
/** 视图原始消息字符数估算:非 reasoning 条目之和;工具调用条目的 text 已含参数与结果,不重复计入。 */
|
|
117
124
|
export declare function viewCharCount(view: CompressionView): number;
|
|
125
|
+
/** 是否为可重试的瞬时失败:有 status 时按 5xx 判定,否则匹配 5xx 状态码或常见网络类错误文案。 */
|
|
126
|
+
export declare function isTransientFailure(message: string, status?: number): boolean;
|
|
127
|
+
/** skipReasoning=true 时去掉视图中的 reasoning 条目(兑现 getHistory 不输出 reasoning 的契约);否则原样返回。 */
|
|
128
|
+
export declare function withoutReasoning(view: CompressionView, skipReasoning: boolean): CompressionView;
|
|
118
129
|
/**
|
|
119
|
-
* 运行工具驱动的压缩循环:直到模型调用 completeCompression(成功)、连续
|
|
130
|
+
* 运行工具驱动的压缩循环:直到模型调用 completeCompression(成功)、连续 3 轮无
|
|
120
131
|
* 工具调用、请求级错误或 signal 中止(失败)。成功与失败均落盘循环会话记录。
|
|
121
132
|
*/
|
|
122
133
|
export declare function runCompressionLoop(ctx: Context, session: Session, options: CompressionLoopOptions): Promise<CompressionOutcome>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress-loop.d.ts","sourceRoot":"","sources":["../src/compress-loop.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"compress-loop.d.ts","sourceRoot":"","sources":["../src/compress-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/compress-tools.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* 压缩工具状态机:历史查看、区间摘要替换、原始 ask 重写与完成门禁。
|
|
3
3
|
* 导出 CompressionState / ToolCallResult / COMPRESSION_TOOL_SCHEMAS /
|
|
4
4
|
* REWRITE_ASK_TOOL_SCHEMA / SKILL_TOOL_NAME。
|
|
5
|
+
* getHistory 与最终 history 共用当前状态投影:本次替换的区间显示为摘要条目。
|
|
5
6
|
* skill 和合法 ask 直接压缩需二次确认;未直接压缩的原始 ask 必须查看后重写。
|
|
6
7
|
* 最终 history 保留用户、系统与历史条目,原始 ask 仅输出重写后的 q/a。
|
|
7
8
|
*/
|
|
@@ -18,13 +19,13 @@ export type ToolCallResult = {
|
|
|
18
19
|
};
|
|
19
20
|
/** 压缩会话的工具状态:视图 + 替换记录 + 二次确认标记(skill / ask_user_question)+ 完成标记。 */
|
|
20
21
|
export declare class CompressionState {
|
|
21
|
-
private readonly view;
|
|
22
22
|
private readonly replacements;
|
|
23
23
|
private readonly challengedSkills;
|
|
24
24
|
private readonly viewedAsks;
|
|
25
25
|
private readonly undeliveredAsks;
|
|
26
26
|
private readonly rewrittenAsks;
|
|
27
27
|
private _completed;
|
|
28
|
+
private readonly view;
|
|
28
29
|
/**
|
|
29
30
|
* @param view 压缩视图(观察或反思),工具校验与最终块构建的数据源。
|
|
30
31
|
*/
|
|
@@ -47,9 +48,10 @@ export declare class CompressionState {
|
|
|
47
48
|
/** 解析可选数值参数(缺省 undefined;非有限数返回 NaN)。 */
|
|
48
49
|
private optionalNumber;
|
|
49
50
|
/**
|
|
50
|
-
* getHistory:返回 [start..end]
|
|
51
|
-
* start/end 缺省为要求区间首尾;越界或 start > end
|
|
52
|
-
*
|
|
51
|
+
* getHistory:返回 [start..end] 区间内的当前条目(无 <history> 包裹)。
|
|
52
|
+
* start/end 缺省为要求区间首尾;越界或 start > end 返回错误。本次替换的区间显示为
|
|
53
|
+
* 摘要条目,与查询区间相交即整条返回;区间切入已有压缩块(反思视图)时返回该块当前
|
|
54
|
+
* 全部条目,跨块摘要连带展开其覆盖的块。
|
|
53
55
|
*/
|
|
54
56
|
getHistory(args: Record<string, unknown>): ToolCallResult;
|
|
55
57
|
/** 区间的简短描述(单条 index / 区间 start..end)。 */
|
|
@@ -61,8 +63,15 @@ export declare class CompressionState {
|
|
|
61
63
|
* 覆盖被完全包含的旧替换。
|
|
62
64
|
*/
|
|
63
65
|
compressHistory(args: Record<string, unknown>): ToolCallResult;
|
|
66
|
+
/** 完全包含该条目的替换记录;替换区间两两不相交,至多一条。 */
|
|
67
|
+
private replacementFor;
|
|
64
68
|
/** 条目是否已被成功直接压缩完全覆盖。 */
|
|
65
69
|
private coveredBy;
|
|
70
|
+
/**
|
|
71
|
+
* 当前状态投影:按视图顺序,被替换条目由一条摘要条目代替,摘要位于首个被替换条目处。
|
|
72
|
+
* reasoning 带 index 时按自身区间取舍,无 index 时跟随其后第一条非 reasoning 条目。
|
|
73
|
+
*/
|
|
74
|
+
private project;
|
|
66
75
|
/** 重写已查看、尚未压缩覆盖的原始 ask,一次提交全部题。 */
|
|
67
76
|
private rewriteAskUserQuestion;
|
|
68
77
|
/** 尚未直接压缩或重写的原始 ask index。 */
|
|
@@ -70,10 +79,9 @@ export declare class CompressionState {
|
|
|
70
79
|
/** completeCompression:所有原始合法 ask 已压缩或重写后标记完成;result 为最终 <history> 块。 */
|
|
71
80
|
complete(): ToolCallResult;
|
|
72
81
|
/**
|
|
73
|
-
* 构建最终 <history>
|
|
74
|
-
*
|
|
75
|
-
*
|
|
76
|
-
* 块首按最终条目动态生成格式说明注释,开标签携带 tip 属性。
|
|
82
|
+
* 构建最终 <history> 块:取当前状态投影并去掉 reasoning——user 条目原样、被替换区间为
|
|
83
|
+
* <assistant index|start end> 摘要条目、未替换普通与历史条目原样保留,原始 ask 使用
|
|
84
|
+
* 重写后的 q/a。块首按最终条目动态生成格式说明注释,开标签携带 tip 属性。
|
|
77
85
|
*/
|
|
78
86
|
buildFinalBlock(): string;
|
|
79
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress-tools.d.ts","sourceRoot":"","sources":["../src/compress-tools.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"compress-tools.d.ts","sourceRoot":"","sources":["../src/compress-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,KAAK,eAAe,EAAoC,MAAM,oBAAoB,CAAC;AAC5F,OAAO,EAKL,eAAe,EAChB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,CAAC;AAE3B,0CAA0C;AAC1C,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AA0CF,qEAAqE;AACrE,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAqB;IAClD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAqB;IACtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IACrD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA0C;IACxE,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAkB;IAEvC;;OAEG;gBACS,IAAI,EAAE,eAAe;IAIjC,kCAAkC;IAClC,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,kCAAkC;IAClC,IAAI,cAAc,IAAI,OAAO,CAE5B;IAED,gCAAgC;IAChC,IAAI,YAAY,IAAI,MAAM,CAQzB;IAED,mCAAmC;IACnC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc;IAgC1D,4CAA4C;IAC5C,oBAAoB,IAAI,IAAI;IAK5B,yCAAyC;IACzC,OAAO,CAAC,cAAc;IAMtB;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc;IA0DzD,yCAAyC;IACzC,OAAO,CAAC,MAAM,CAAC,SAAS;IAIxB;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc;IAwI9D,mCAAmC;IACnC,OAAO,CAAC,cAAc;IAMtB,wBAAwB;IACxB,OAAO,CAAC,SAAS;IAIjB;;;OAGG;IACH,OAAO,CAAC,OAAO;IAoCf,mCAAmC;IACnC,OAAO,CAAC,sBAAsB;IAwE9B,8BAA8B;IAC9B,OAAO,CAAC,qBAAqB;IAW7B,yEAAyE;IACzE,QAAQ,IAAI,cAAc;IAa1B;;;;OAIG;IACH,eAAe,IAAI,MAAM;CAyB1B;AAED,+BAA+B;AAC/B,eAAO,MAAM,uBAAuB,EAAE,UA+BrC,CAAC;AAEF,gDAAgD;AAChD,eAAO,MAAM,wBAAwB,EAAE,UAAU,EAqChD,CAAC"}
|
package/dist/compress-view.d.ts
CHANGED
|
@@ -43,10 +43,8 @@ export type ViewEntry = {
|
|
|
43
43
|
notes?: string[];
|
|
44
44
|
/** skill 条目的工具名(skill 判定用)或普通 toolcall 的工具名。 */
|
|
45
45
|
toolName?: string;
|
|
46
|
-
/** skill
|
|
46
|
+
/** skill 条目的名称(工具参数或手动加载的消息来源提供;反思视图取自 name 属性)。 */
|
|
47
47
|
skillName?: string;
|
|
48
|
-
/** toolcall 条目的调用 id(结构化渲染为 callId 属性)。 */
|
|
49
|
-
callId?: string;
|
|
50
48
|
/** toolcall 条目的调用参数 JSON 文本(存在时条目渲染为 <assistant type="toolcall"> 结构)。 */
|
|
51
49
|
toolArgs?: string;
|
|
52
50
|
/** toolcall 条目的工具返回文本(缺失或为空时不输出 <tool-result> 子元素)。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress-view.d.ts","sourceRoot":"","sources":["../src/compress-view.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAQ,MAAM,gBAAgB,CAAC;AAW9D,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG3D,gCAAgC;AAChC,MAAM,MAAM,mBAAmB,GAAG;IAChC,oBAAoB;IACpB,SAAS,EAAE;QACT,cAAc;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe;QACf,OAAO,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACnD,sBAAsB;QACtB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY;IACZ,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,WAAW,CAAC;IACzC,6CAA6C;IAC7C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"compress-view.d.ts","sourceRoot":"","sources":["../src/compress-view.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAQ,MAAM,gBAAgB,CAAC;AAW9D,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG3D,gCAAgC;AAChC,MAAM,MAAM,mBAAmB,GAAG;IAChC,oBAAoB;IACpB,SAAS,EAAE;QACT,cAAc;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe;QACf,OAAO,EAAE;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC;QACnD,sBAAsB;QACtB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY;IACZ,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,WAAW,CAAC;IACzC,6CAA6C;IAC7C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,gDAAgD;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,GAAG,CAAC,EAAE,mBAAmB,CAAC;IAC1B,iCAAiC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,eAAe,GAAG;IAC5B,uDAAuD;IACvD,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AA8CF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAaxF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAmBrF;AAyGD,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,gBAAqB,GAC7B,eAAe,CA2FjB;AAiBD,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CASjD;AAoFD;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAkI7C;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,EAC5C,OAAO,GAAE,gBAAqB,GAC7B,eAAe,CAUjB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAqHvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAO7D"}
|
package/dist/compress.d.ts
CHANGED
|
@@ -1,4 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 两级自动压缩(观察/反思)与 compaction 生命周期提交。
|
|
3
|
+
* 导出 estimateTextTokens / isPairBalancedAfter / computeCompressRange / historySection /
|
|
4
|
+
* historyTextOf / findObservePending / prepareObserveCompression / commitObserveCompression /
|
|
5
|
+
* reflectPass / observePass / maybeCompress。
|
|
6
|
+
*
|
|
7
|
+
* - 摘要生成走工具驱动的压缩循环(compress-loop.ts runCompressionLoop):首条 user
|
|
8
|
+
* 消息仅含压缩指令与 start/end 区间,模型经 getHistory / compressHistory /
|
|
9
|
+
* completeCompression 工具完成压缩;最终 <history> 块由插件从视图与替换记录构建,
|
|
10
|
+
* 全程无需整块校验
|
|
11
|
+
* - 反思:全部 <history> 块 token 合计(估算 × 换算系数)≥ reflectThresholdTokens 时,
|
|
12
|
+
* 把全部块条目作为压缩视图重新压缩合并(视图无条目时跳过,如全部为不可解析的历史
|
|
13
|
+
* 遗留块)
|
|
14
|
+
* - 观察(打标记 → 对账 → 到期注入):净压力(换算系数 × 未压缩表层估算,未压缩 =
|
|
15
|
+
* 表层 − 已压缩块 − 系统提示词估算)首次 ≥ observeThresholdTokens 时记录待定标记
|
|
16
|
+
* (触发点 = 当时的最后一条完整消息 index),并立即开始后台预压缩(precompress.ts,
|
|
17
|
+
* 结果写 om/observe-summary 信封、不做替换);每个 pre-step 对账保证活跃标记对应任务
|
|
18
|
+
* 或持久化结果(重启恢复直接采纳信封、不重压缩;失败任务丢弃重启);新增完整消息数 ≥
|
|
19
|
+
* tailMessageCount 时到期,把压缩边界至触发点的全部消息作为压缩视图注入为新 <history>
|
|
20
|
+
* 块(旧块保留),等待期间的新消息成为下一轮未压缩尾部(延迟窗口内压力允许短暂超
|
|
21
|
+
* 阈值);到期未完成时阻塞等待后台任务(turn 取消则放行不注入,任务继续后台);
|
|
22
|
+
* tailMessageCount=0 时触发当轮即到期,阻塞等待注入
|
|
23
|
+
* - 两个阈值都按主模型真实 token 计;换算系数 = 上次请求真实用量基线 ÷ 锚点估算
|
|
24
|
+
* (工具定义估算 + 锚点表层),无真实用量基线或计量失败按 1 计
|
|
25
|
+
* - 待定标记与压缩结果以 log-only om 信封事件(借用 feedback/record,kind 为
|
|
26
|
+
* om/observe-pending / om/observe-invalidate / om/observe-summary,见 om-event.ts)
|
|
27
|
+
* 持久化在会话日志中(重启后从日志恢复);压缩失败保留待定,下个 pre-step 重启任务重试
|
|
28
|
+
* - 两级在 pre-step 串行执行(先反思后观察;观察的压缩主体在后台运行,pre-step 仅在
|
|
29
|
+
* 到期结果未就绪时阻塞等待);仅主会话生效;omEnabled=false 关闭
|
|
30
|
+
* - 压缩目标默认跟随会话路由;compressProvider + compressModel 成对配置时覆盖路由
|
|
31
|
+
* (成对配置下未路由会话也执行压缩);compressReasoningEffort 配置时压缩前经
|
|
32
|
+
* ctx.llm.resolveModelInfo 校验目标模型 reasoning.efforts(按 provider+model 缓存),
|
|
33
|
+
* 未命中 / 无元数据 / 查询失败降级为模型默认并报告 reasoning-effort-unavailable 降级
|
|
34
|
+
* - 压缩边界:最后一个合法 <history> 块之后的消息视为未压缩,其前不重复压缩
|
|
35
|
+
* - 压缩循环最终失败(连续无工具调用 / 请求级错误)时 pass 返回失败结果(携带最后一次
|
|
36
|
+
* 错误),压缩流程向上传播,pre-step 据此拒绝本 step 中断当前 turn;signal 中止标记
|
|
37
|
+
* aborted(不中断);成功与失败均落盘压缩会话记录子会话(失败时其 id 随结果传播为
|
|
38
|
+
* 诊断子会话 id)
|
|
39
|
+
* - 提交走宿主 compaction/* 生命周期事件(start 带 phase → summary → 替换消息 → end),
|
|
40
|
+
* 失败补 end(error,实际报错 + 诊断子会话 sessionId);替换消息 source 标记插件标识供 UI 认领
|
|
41
|
+
* - 挂载失败类问题(systemPrompt/tokenMeter 服务异常)始终 console 到外部进程,并追加
|
|
42
|
+
* log-only om 警告事件(借用 feedback/record,客户端渲染功能降级警告行,每会话同一
|
|
43
|
+
* 问题至多一次);
|
|
44
|
+
* 辅助估算的普通运行时报错仅记日志。降级与报错都不阻塞压缩(tokenMeter 计量失败时
|
|
45
|
+
* 本轮跳过观察,反思换算系数按 1 计)
|
|
46
|
+
*/
|
|
47
|
+
import { CompactionId } from '@deepseek-ai/dsh-compaction';
|
|
1
48
|
import { type ReasoningEffortId } from '@deepseek-ai/dsh-llm';
|
|
49
|
+
import { type CompressionSuccess } from './compress-loop.ts';
|
|
50
|
+
import { type CompressionView } from './compress-view.ts';
|
|
2
51
|
import type { PluginLogger } from './logger.ts';
|
|
3
52
|
import type { Agent, Context, PluginConfig, Session, SessionEvent } from './types.ts';
|
|
4
53
|
import { type RoutedTarget } from './utils.ts';
|
|
@@ -79,6 +128,11 @@ export declare function findObservePending(session: Session): {
|
|
|
79
128
|
seq: number;
|
|
80
129
|
triggerMessageIndex: number;
|
|
81
130
|
} | undefined;
|
|
131
|
+
/** compaction 生命周期共享数据(start/summary/end 以 compactionId 关联)。 */
|
|
132
|
+
type CompactionLifecycle = {
|
|
133
|
+
compactionId: CompactionId;
|
|
134
|
+
turn: number | null;
|
|
135
|
+
};
|
|
82
136
|
/**
|
|
83
137
|
* 反思:全部 <history> 块 token 合计 ≥ reflectThresholdTokens 时,把全部块内条目作为
|
|
84
138
|
* 压缩视图送入工具压缩循环,整个块区段合并替换为一条更紧凑的摘要。视图无条目(全部
|
|
@@ -86,15 +140,69 @@ export declare function findObservePending(session: Session): {
|
|
|
86
140
|
* (error = 最后一次错误)。
|
|
87
141
|
*/
|
|
88
142
|
export declare function reflectPass(ctx: Context, agent: Agent, config: Readonly<PluginConfig>, target: RoutedTarget, signal?: AbortSignal, reasoningEffort?: ReasoningEffortId): Promise<CompressPassResult>;
|
|
143
|
+
/** 观察压缩准备产物:区间、替换 seq 列表、字符统计与压缩视图。 */
|
|
144
|
+
export type ObservePrepared = {
|
|
145
|
+
/** 压缩区间(start/end 为表层 seq,含端点)。 */
|
|
146
|
+
range: {
|
|
147
|
+
start: number;
|
|
148
|
+
end: number;
|
|
149
|
+
shadowedSeqs: number[];
|
|
150
|
+
};
|
|
151
|
+
/** 被替换的表层 seq 列表(= range.shadowedSeqs)。 */
|
|
152
|
+
replaceSeqs: number[];
|
|
153
|
+
/** 替换区间起点(replaceSeqs 首项)。 */
|
|
154
|
+
replaceStart: number;
|
|
155
|
+
/** 被遮蔽区间字符数(压缩循环 originalChars)。 */
|
|
156
|
+
shadowedCharCount: number;
|
|
157
|
+
/** 压缩视图(压缩循环的输入;准备成功后 min/max 必可定位)。 */
|
|
158
|
+
view: CompressionView & {
|
|
159
|
+
minIndex: number;
|
|
160
|
+
maxIndex: number;
|
|
161
|
+
};
|
|
162
|
+
};
|
|
163
|
+
/** 观察压缩准备结果:ok=false 时 reason 说明无可行区间原因(调用方清除待定标记视为完成)。 */
|
|
164
|
+
export type ObservePrepareResult = {
|
|
165
|
+
ok: true;
|
|
166
|
+
prepared: ObservePrepared;
|
|
167
|
+
} | {
|
|
168
|
+
ok: false;
|
|
169
|
+
reason: string;
|
|
170
|
+
};
|
|
89
171
|
/**
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
172
|
+
* 准备观察压缩:计算区间 [压缩边界..触发点]、校验可行性并构建压缩视图。
|
|
173
|
+
* 不写任何事件;供延迟执行与后台预压缩共用。
|
|
174
|
+
*/
|
|
175
|
+
export declare function prepareObserveCompression(session: Session, triggerMessageIndex: number, config: Readonly<PluginConfig>): ObservePrepareResult;
|
|
176
|
+
/** 观察压缩提交选项(目标、模型信息、日志与待定标记清理回调)。 */
|
|
177
|
+
type ObserveCommitOptions = {
|
|
178
|
+
target: RoutedTarget;
|
|
179
|
+
maxTokens: number | undefined;
|
|
180
|
+
reasoningEffort: ReasoningEffortId | undefined;
|
|
181
|
+
triggerNote: string;
|
|
182
|
+
logger: PluginLogger;
|
|
183
|
+
clearPending: () => void;
|
|
184
|
+
};
|
|
185
|
+
/**
|
|
186
|
+
* 提交观察压缩结果:compaction/summary(影子价格认领)→ 替换被压缩区间为 <history>
|
|
187
|
+
* 块(旧块保留)→ compaction/end → 清除待定标记。调用前须已追加 compaction/start
|
|
188
|
+
* (同一开放 turn 内满足宿主括号不变量)。提交失败为局部异常(压缩已成功):记日志、
|
|
189
|
+
* 补 end(error) 后返回不失败结果,不中断 turn;待定标记保留,边界后移后由
|
|
190
|
+
* findObservePending 判定过期。
|
|
191
|
+
*/
|
|
192
|
+
export declare function commitObserveCompression(ctx: Context, session: Session, lifecycle: CompactionLifecycle, prepared: ObservePrepared, summaryResult: CompressionSuccess, opts: ObserveCommitOptions): CompressPassResult;
|
|
193
|
+
/**
|
|
194
|
+
* 观察(打标记 → 对账 → 到期注入):每个 pre-step 串行执行三阶段。
|
|
195
|
+
* 打标记:无活跃待定标记时测净压力 tokens(换算系数 × 未压缩表层估算,未压缩 =
|
|
196
|
+
* 表层 − 已压缩 <history> 块估算合计 − 系统提示词估算),首次 ≥ observeThresholdTokens
|
|
197
|
+
* 写 om/observe-pending(触发点 = 当时的最后一条完整消息 index)。
|
|
198
|
+
* 对账:活跃标记必须对应后台任务或持久化结果——匹配 pendingSeq 的 om/observe-summary
|
|
199
|
+
* 信封直接采纳(重启恢复,不重压缩);无结果且无任务(或任务已失败)时启动后台预压缩
|
|
200
|
+
* (无可行区间则失效标记视为完成);无活跃标记时清理注册表(边界后移使标记过期的运行中
|
|
201
|
+
* 任务被中止)。
|
|
202
|
+
* 到期:新增完整消息数 ≥ tailMessageCount 时注入——已完成结果在同一 pre-step / 同一开放
|
|
203
|
+
* turn 内一次提交(compaction/start → summary → 替换 → end → 失效标记,满足宿主括号
|
|
204
|
+
* 不变量);运行中任务等待其完成(turn 被取消则放行不注入,任务继续后台);失败返回
|
|
205
|
+
* 失败结果(error = 最后一次错误,标记保留,下个 pre-step 重启任务重试)。
|
|
98
206
|
*/
|
|
99
207
|
export declare function observePass(ctx: Context, agent: Agent, config: Readonly<PluginConfig>, waitCount: number, target: RoutedTarget, signal?: AbortSignal, reasoningEffort?: ReasoningEffortId): Promise<CompressPassResult>;
|
|
100
208
|
/**
|
|
@@ -103,4 +211,5 @@ export declare function observePass(ctx: Context, agent: Agent, config: Readonly
|
|
|
103
211
|
* 传播失败结果,由 pre-step 拒绝本 step 中断当前 turn。
|
|
104
212
|
*/
|
|
105
213
|
export declare function maybeCompress(ctx: Context, agent: Agent, config: Readonly<PluginConfig>, signal?: AbortSignal): Promise<CompressPassResult>;
|
|
214
|
+
export {};
|
|
106
215
|
//# sourceMappingURL=compress.d.ts.map
|
package/dist/compress.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"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"}
|
package/dist/config.d.ts
CHANGED
|
@@ -14,6 +14,8 @@ export type PluginConfig = {
|
|
|
14
14
|
compressMaxTokens: number | undefined;
|
|
15
15
|
/** 遇 429 限流后下一次摘要请求前的等待毫秒数(全局冷却期)。 */
|
|
16
16
|
rateLimitWaitMs: number;
|
|
17
|
+
/** 重压缩命令的进程级并发上限(≥ 1),超出的排队等待。 */
|
|
18
|
+
recompressConcurrency: number;
|
|
17
19
|
/** 观察触发后延迟执行的等待完整消息条数(新增完整消息数达到该值才执行压缩;0 表示触发当轮立即执行)。 */
|
|
18
20
|
tailMessageCount: number;
|
|
19
21
|
/** 工具循环 getHistory 输出是否携带 reasoning 参考条目(true 时不携带,压缩指令也省略其说明行)。 */
|
|
@@ -51,6 +53,7 @@ export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
|
|
|
51
53
|
reflectThresholdTokens: Schema<number, number, "volatile-defined">;
|
|
52
54
|
compressMaxTokens: Schema<number, number, "volatile">;
|
|
53
55
|
rateLimitWaitMs: Schema<number, number, "volatile-defined">;
|
|
56
|
+
recompressConcurrency: Schema<number, number, "volatile-defined">;
|
|
54
57
|
tailMessageCount: Schema<number, number, "volatile-defined">;
|
|
55
58
|
compressSkipReasoning: Schema<boolean, boolean, "volatile-defined">;
|
|
56
59
|
omEnabled: Schema<boolean, boolean, "volatile-defined">;
|
|
@@ -70,6 +73,7 @@ export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
|
|
|
70
73
|
reflectThresholdTokens: Schema<number, number, "volatile-defined">;
|
|
71
74
|
compressMaxTokens: Schema<number, number, "volatile">;
|
|
72
75
|
rateLimitWaitMs: Schema<number, number, "volatile-defined">;
|
|
76
|
+
recompressConcurrency: Schema<number, number, "volatile-defined">;
|
|
73
77
|
tailMessageCount: Schema<number, number, "volatile-defined">;
|
|
74
78
|
compressSkipReasoning: Schema<boolean, boolean, "volatile-defined">;
|
|
75
79
|
omEnabled: Schema<boolean, boolean, "volatile-defined">;
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAI9C,kCAAkC;AAClC,MAAM,MAAM,YAAY,GAAG;IACzB,oCAAoC;IACpC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wDAAwD;IACxD,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,sCAAsC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,yDAAyD;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,oEAAoE;IACpE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,uBAAuB;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,qCAAqC;IACrC,uBAAuB,EAAE,OAAO,CAAC;IACjC,0CAA0C;IAC1C,2BAA2B,EAAE,OAAO,CAAC;IACrC,qCAAqC;IACrC,yBAAyB,EAAE,MAAM,CAAC;IAClC,iCAAiC;IACjC,6BAA6B,EAAE,MAAM,CAAC;IACtC,iDAAiD;IACjD,KAAK,EAAE,OAAO,CAAC;IACf,sBAAsB;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,0DAA0D;IAC1D,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,yDAAyD;IACzD,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,yCAAyC;IACzC,uBAAuB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF,iEAAiE;AACjE,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,MAAM,MAAM,0BAA0B,CAAC;AAI9C,kCAAkC;AAClC,MAAM,MAAM,YAAY,GAAG;IACzB,oCAAoC;IACpC,sBAAsB,EAAE,MAAM,CAAC;IAC/B,wDAAwD;IACxD,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,sCAAsC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,kCAAkC;IAClC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,yDAAyD;IACzD,gBAAgB,EAAE,MAAM,CAAC;IACzB,oEAAoE;IACpE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,uBAAuB;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,qCAAqC;IACrC,uBAAuB,EAAE,OAAO,CAAC;IACjC,0CAA0C;IAC1C,2BAA2B,EAAE,OAAO,CAAC;IACrC,qCAAqC;IACrC,yBAAyB,EAAE,MAAM,CAAC;IAClC,iCAAiC;IACjC,6BAA6B,EAAE,MAAM,CAAC;IACtC,iDAAiD;IACjD,KAAK,EAAE,OAAO,CAAC;IACf,sBAAsB;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,0DAA0D;IAC1D,qBAAqB,EAAE,OAAO,CAAC;IAC/B,kBAAkB;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,yDAAyD;IACzD,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,yDAAyD;IACzD,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,yCAAyC;IACzC,uBAAuB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7C,CAAC;AAEF,iEAAiE;AACjE,eAAO,MAAM,cAAc,EAAE,QAAQ,CAAC,YAAY,CAoBhD,CAAC;AAEH,uDAAuD;AACvD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eA4CL,CAAC;AAEf,4CAA4C;AAC5C,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAQtE;AA8CD,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAgCnE"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -30,7 +30,7 @@ export declare const HISTORY_TIP = "\u5F53\u524D\u5757\u662F\u5386\u53F2\u6D88\u
|
|
|
30
30
|
* 「完整消息」定义(压缩提示词、recall 工具描述与 <history> 块顶注释共用)。
|
|
31
31
|
* 完整消息是摘要日志与 recall 共用的定位单位;首条 index 为 0,按会话顺序递增、全局稳定。
|
|
32
32
|
*/
|
|
33
|
-
export declare const COMPLETE_MESSAGE_DEFINITION = "`\u5B8C\u6574\u6D88\u606F`\u6307\u4E00\u6761`\u7528\u6237\u6D88\u606F`\u3001`\u6A21\u578B\u8F93\u51FA\u6587\u672C`\
|
|
33
|
+
export declare const COMPLETE_MESSAGE_DEFINITION = "`\u5B8C\u6574\u6D88\u606F`\u6307\u4E00\u6761`\u7528\u6237\u6D88\u606F`\u3001`\u6A21\u578B\u8F93\u51FA\u6587\u672C`\u3001`\u5177\u6709result\u7684toolcall`\u6216`\u624B\u52A8\u52A0\u8F7D\u7684skill`\uFF1B\u9996\u6761 index \u4E3A 0\uFF0C\u6309\u4F1A\u8BDD\u987A\u5E8F\u9012\u589E\u3002";
|
|
34
34
|
/** 块顶格式说明注释中按块内条目动态追加的分段开关。 */
|
|
35
35
|
export type HistoryNoteSections = {
|
|
36
36
|
/** 块内存在 user 条目时追加 <user_message> 说明。 */
|
|
@@ -48,6 +48,8 @@ export type HistoryNoteSections = {
|
|
|
48
48
|
export declare function historyFormatNote(sections?: HistoryNoteSections): string;
|
|
49
49
|
/** skill 工具名:toolcall 条目的工具名为该值时视为 skill 加载,<history> 块中以 <skill_content> 元素呈现。 */
|
|
50
50
|
export declare const SKILL_TOOL_NAME = "skill";
|
|
51
|
+
/** 手动加载 skill 的系统消息 source kind。 */
|
|
52
|
+
export declare const SKILL_INVOCATION_KIND = "skill-invocation";
|
|
51
53
|
/**
|
|
52
54
|
* 提问工具名:成功且问题与答案完整配对时视为合法 ask,失败调用按普通 toolcall 处理。
|
|
53
55
|
* 合法 ask 直接压缩需二次确认;未直接压缩的原始 ask 重写后以 q/a 形式保留。
|
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,wCAAwC;AACxC,eAAO,MAAM,YAAY,kBAAkB,CAAC;AAE5C;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AAEzD,0DAA0D;AAC1D,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,IAAI,EAAE,OAAO,kBAAkB,CAAC;IACzC,wCAAwC;IACxC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;CACtC,CAAC;AAEF,iDAAiD;AACjD,wBAAgB,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,eAAe,CAErE;AAED,iDAAiD;AACjD,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC,iDAAiD;AACjD,eAAO,MAAM,WAAW,iHAAuB,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,2BAA2B,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,wCAAwC;AACxC,eAAO,MAAM,YAAY,kBAAkB,CAAC;AAE5C;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,yBAAyB,CAAC;AAEzD,0DAA0D;AAC1D,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,IAAI,EAAE,OAAO,kBAAkB,CAAC;IACzC,wCAAwC;IACxC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;CACtC,CAAC;AAEF,iDAAiD;AACjD,wBAAgB,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,GAAG,eAAe,CAErE;AAED,iDAAiD;AACjD,eAAO,MAAM,WAAW,YAAY,CAAC;AAErC,iDAAiD;AACjD,eAAO,MAAM,WAAW,iHAAuB,CAAC;AAEhD;;;GAGG;AACH,eAAO,MAAM,2BAA2B,iSAC2C,CAAC;AAEpF,+BAA+B;AAC/B,MAAM,MAAM,mBAAmB,GAAG;IAChC,yCAAyC;IACzC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,8CAA8C;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,qDAAqD;IACrD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,GAAE,mBAAwB,GAAG,MAAM,CAa5E;AAED,mFAAmF;AACnF,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC,oCAAoC;AACpC,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,2BAA2B,sBAAsB,CAAC;AAE/D,+FAA+F;AAC/F,eAAO,MAAM,yBAAyB,YAAY,CAAC;AAEnD,uCAAuC;AACvC,eAAO,MAAM,uBAAuB,uBAAuB,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,wBAAwB,6DAA0B,CAAC;AAEhE;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,MAAM,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,GACrD,OAAO,CAKT"}
|