dsh-plugin-om 0.0.62 → 0.0.64
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 +38 -24
- package/cordis.patch.yml +2 -0
- package/dist/client/OmCompactionCard.d.ts +1 -4
- package/dist/client/OmCompactionCard.d.ts.map +1 -1
- package/dist/client/definition.d.ts +1 -1
- package/dist/client/eval-model-panel.d.ts +17 -2
- package/dist/client/eval-model-panel.d.ts.map +1 -1
- package/dist/client/eval-model-register.d.ts +5 -2
- package/dist/client/eval-model-register.d.ts.map +1 -1
- package/dist/client/index.d.ts +2 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/locales.d.ts +6 -18
- package/dist/client/locales.d.ts.map +1 -1
- package/dist/client/om-config-controller.d.ts +3 -7
- package/dist/client/om-config-controller.d.ts.map +1 -1
- package/dist/client.js +115 -550
- package/dist/client.js.map +1 -1
- package/dist/compaction-eval/index.d.ts +8 -0
- package/dist/compaction-eval/index.d.ts.map +1 -0
- package/dist/compaction-eval/index.mjs +206 -0
- package/dist/compaction-eval-command.d.ts +6 -3
- package/dist/compaction-eval-command.d.ts.map +1 -1
- package/dist/compress.d.ts +1 -1
- package/dist/compress.d.ts.map +1 -1
- package/dist/config.d.ts +3 -11
- package/dist/config.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +38 -549
- package/dist/skill/compaction-eval/SKILL.md +2 -1
- package/dist/skill/compaction-eval/scripts/compress.mjs +21 -21
- package/dist/skill/compaction-eval/scripts/view.mjs +77 -79
- package/dist/system-reminder.d.ts +2 -2
- package/dist/system-reminder.d.ts.map +1 -1
- package/dist/utils-D-cEbiTF.mjs +89 -0
- package/locale/compaction-eval/en.json +6 -0
- package/locale/compaction-eval/zh.json +6 -0
- package/locale/en.json +6 -0
- package/locale/zh.json +6 -0
- package/package.json +12 -1
- package/dist/client/OmRecompressMenu.d.ts +0 -11
- package/dist/client/OmRecompressMenu.d.ts.map +0 -1
- package/dist/client/recompress-inject.d.ts +0 -9
- package/dist/client/recompress-inject.d.ts.map +0 -1
- package/dist/client/recompress-run.d.ts +0 -94
- package/dist/client/recompress-run.d.ts.map +0 -1
- package/dist/recompress-gate.d.ts +0 -11
- package/dist/recompress-gate.d.ts.map +0 -1
- package/dist/recompress.d.ts +0 -82
- package/dist/recompress.d.ts.map +0 -1
|
@@ -22,7 +22,8 @@ disable-model-invocation: true
|
|
|
22
22
|
## 约定
|
|
23
23
|
|
|
24
24
|
- 输入为本地会话 id 或 DSH 导出的 zip,未指明时向用户确认。zip 导出时需包含 subagents。
|
|
25
|
-
-
|
|
25
|
+
- 生成重压缩前用 `ask_user_question` 确认评估阶段、区间和每个变体。变体至少确认模型与 effort,按需确认系统提示词、任务流程和 tools;effort 可缺省,缺省时用模型默认值。用户已明确的项不重复询问。
|
|
26
|
+
- 默认变体直接使用标准压缩程序 `scripts/compress.mjs`。需要改变系统提示词、任务流程或 tools 时,以标准程序为参考,在临时目录编写专用压缩程序,不改插件核心代码。专用程序须复用 DSH profile,生成 `prepare` 可识别的 `om-compaction-log-*` 日志,并写入该区间的重压缩目录。
|
|
26
27
|
- 盲评完成前不读 `_blind_key.json`,subagent 提示词中不写模型名。
|
|
27
28
|
- 所有文件写系统临时目录 `om-compaction-eval/`(Git Bash 即 `/tmp/om-compaction-eval/`):view.json、重压缩目录、评估目录与自写临时脚本都在该目录下,不写工作区。重评同一区间前先删除旧评估目录。
|
|
28
29
|
- subagent 有并发上限,评审多时分批启动;subagent 失败时新开一个重做,不在原会话续发。
|
|
@@ -15478,8 +15478,8 @@ function sharedModelDir() {
|
|
|
15478
15478
|
//#region src/config.ts
|
|
15479
15479
|
/**
|
|
15480
15480
|
* 插件配置:宿主 Config 严格校验、volatile 引用读取与兼容 YAML 的宽松合并。
|
|
15481
|
-
* 导出 Config / PluginConfig / DEFAULT_CONFIG / currentConfig / resolveConfig
|
|
15482
|
-
*
|
|
15481
|
+
* 导出 Config / PluginConfig / DEFAULT_CONFIG / currentConfig / resolveConfig。
|
|
15482
|
+
* 宽松解析时未知键忽略、非法值回退默认值。
|
|
15483
15483
|
*/
|
|
15484
15484
|
/** 默认配置(冻结对象,resolveConfig 合并的基底;debug 缺省值在解析时按 NODE_ENV 判定)。 */
|
|
15485
15485
|
const DEFAULT_CONFIG = Object.freeze({
|
|
@@ -15487,10 +15487,8 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
15487
15487
|
reflectThresholdTokens: 8e4,
|
|
15488
15488
|
compressMaxTokens: void 0,
|
|
15489
15489
|
rateLimitWaitMs: 6e4,
|
|
15490
|
-
recompressConcurrency: 2,
|
|
15491
15490
|
tailMessageCount: 20,
|
|
15492
15491
|
compressSkipReasoning: true,
|
|
15493
|
-
omEnabled: true,
|
|
15494
15492
|
progressReminderEnabled: true,
|
|
15495
15493
|
progressReminderIdleEnabled: false,
|
|
15496
15494
|
progressReminderIdleSteps: 4,
|
|
@@ -15502,20 +15500,22 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
15502
15500
|
compressModel: void 0,
|
|
15503
15501
|
compressReasoningEffort: void 0
|
|
15504
15502
|
});
|
|
15503
|
+
/** debug 开关 schema:缺省按 NODE_ENV !== 'production' 判定。 */
|
|
15504
|
+
function debugSchema() {
|
|
15505
|
+
return Schema.boolean().default(process.env.NODE_ENV !== "production").volatile();
|
|
15506
|
+
}
|
|
15505
15507
|
Schema.object({
|
|
15506
15508
|
observeThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.observeThresholdTokens).volatile(),
|
|
15507
15509
|
reflectThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.reflectThresholdTokens).volatile(),
|
|
15508
15510
|
compressMaxTokens: Schema.number().step(1).volatile(),
|
|
15509
15511
|
rateLimitWaitMs: Schema.number().step(1).default(DEFAULT_CONFIG.rateLimitWaitMs).volatile(),
|
|
15510
|
-
recompressConcurrency: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.recompressConcurrency).volatile(),
|
|
15511
15512
|
tailMessageCount: Schema.number().step(1).default(DEFAULT_CONFIG.tailMessageCount).volatile(),
|
|
15512
15513
|
compressSkipReasoning: Schema.boolean().default(DEFAULT_CONFIG.compressSkipReasoning).volatile(),
|
|
15513
|
-
omEnabled: Schema.boolean().default(DEFAULT_CONFIG.omEnabled).volatile(),
|
|
15514
15514
|
progressReminderEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderEnabled).volatile(),
|
|
15515
15515
|
progressReminderIdleEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderIdleEnabled).volatile(),
|
|
15516
15516
|
progressReminderIdleSteps: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.progressReminderIdleSteps).volatile(),
|
|
15517
15517
|
progressReminderIdleToolCalls: Schema.number().step(1).min(0).default(DEFAULT_CONFIG.progressReminderIdleToolCalls).volatile(),
|
|
15518
|
-
debug:
|
|
15518
|
+
debug: debugSchema(),
|
|
15519
15519
|
semanticRecallEnabled: Schema.boolean().default(DEFAULT_CONFIG.semanticRecallEnabled).volatile(),
|
|
15520
15520
|
modelDir: Schema.string().default(DEFAULT_CONFIG.modelDir).volatile(),
|
|
15521
15521
|
compressProvider: Schema.string().volatile(),
|
|
@@ -15528,11 +15528,6 @@ const NUMBER_KEYS = [
|
|
|
15528
15528
|
["reflectThresholdTokens", true],
|
|
15529
15529
|
["compressMaxTokens", true],
|
|
15530
15530
|
["rateLimitWaitMs", true],
|
|
15531
|
-
[
|
|
15532
|
-
"recompressConcurrency",
|
|
15533
|
-
true,
|
|
15534
|
-
1
|
|
15535
|
-
],
|
|
15536
15531
|
["tailMessageCount", true],
|
|
15537
15532
|
[
|
|
15538
15533
|
"progressReminderIdleSteps",
|
|
@@ -15545,6 +15540,13 @@ const NUMBER_KEYS = [
|
|
|
15545
15540
|
0
|
|
15546
15541
|
]
|
|
15547
15542
|
];
|
|
15543
|
+
/** 校验数值:有限数,integer 时须为整数,且不小于 min;不合法返回 undefined。 */
|
|
15544
|
+
function resolveNumber(raw, integer, min) {
|
|
15545
|
+
if (typeof raw !== "number" || !Number.isFinite(raw)) return void 0;
|
|
15546
|
+
if (integer && !Number.isInteger(raw)) return void 0;
|
|
15547
|
+
if (min !== void 0 && raw < min) return void 0;
|
|
15548
|
+
return raw;
|
|
15549
|
+
}
|
|
15548
15550
|
/** 归一化原始配置输入:缺省 / null / 空串 / 非对象视为空对象。 */
|
|
15549
15551
|
function normalizeConfigInput(raw) {
|
|
15550
15552
|
if (raw === void 0 || raw === null) return {};
|
|
@@ -15559,6 +15561,10 @@ function resolveBoolean(raw, defaultValue) {
|
|
|
15559
15561
|
if (typeof raw === "boolean") return raw;
|
|
15560
15562
|
return defaultValue;
|
|
15561
15563
|
}
|
|
15564
|
+
/** 解析 debug 开关:非 boolean 回退 NODE_ENV !== 'production'。 */
|
|
15565
|
+
function resolveDebug(raw) {
|
|
15566
|
+
return resolveBoolean(raw, process.env.NODE_ENV !== "production");
|
|
15567
|
+
}
|
|
15562
15568
|
/** 解析字符串配置值:非空字符串才生效,缺省 / null / 空白串 / 非字符串回退 undefined。 */
|
|
15563
15569
|
function resolveOptionalString(raw) {
|
|
15564
15570
|
if (typeof raw === "string" && raw.trim() !== "") return raw;
|
|
@@ -15568,19 +15574,13 @@ function resolveConfig(raw) {
|
|
|
15568
15574
|
const input = normalizeConfigInput(raw);
|
|
15569
15575
|
const config = { ...DEFAULT_CONFIG };
|
|
15570
15576
|
for (const [key, integer, min] of NUMBER_KEYS) {
|
|
15571
|
-
const value = input[key];
|
|
15572
|
-
if (value
|
|
15573
|
-
if (typeof value === "string" && value.trim() === "") continue;
|
|
15574
|
-
if (typeof value !== "number" || !Number.isFinite(value)) continue;
|
|
15575
|
-
if (integer && !Number.isInteger(value)) continue;
|
|
15576
|
-
if (min !== void 0 && value < min) continue;
|
|
15577
|
-
config[key] = value;
|
|
15577
|
+
const value = resolveNumber(input[key], integer, min);
|
|
15578
|
+
if (value !== void 0) config[key] = value;
|
|
15578
15579
|
}
|
|
15579
15580
|
config.compressSkipReasoning = resolveBoolean(input.compressSkipReasoning, true);
|
|
15580
|
-
config.omEnabled = resolveBoolean(input.omEnabled, true);
|
|
15581
15581
|
config.progressReminderEnabled = resolveBoolean(input.progressReminderEnabled, true);
|
|
15582
15582
|
config.progressReminderIdleEnabled = resolveBoolean(input.progressReminderIdleEnabled, DEFAULT_CONFIG.progressReminderIdleEnabled);
|
|
15583
|
-
config.debug =
|
|
15583
|
+
config.debug = resolveDebug(input.debug);
|
|
15584
15584
|
config.semanticRecallEnabled = resolveBoolean(input.semanticRecallEnabled, true);
|
|
15585
15585
|
const modelDir = input.modelDir;
|
|
15586
15586
|
if (typeof modelDir === "string" && modelDir.trim() !== "") config.modelDir = modelDir;
|
|
@@ -8108,8 +8108,8 @@ function sharedModelDir() {
|
|
|
8108
8108
|
//#region src/config.ts
|
|
8109
8109
|
/**
|
|
8110
8110
|
* 插件配置:宿主 Config 严格校验、volatile 引用读取与兼容 YAML 的宽松合并。
|
|
8111
|
-
* 导出 Config / PluginConfig / DEFAULT_CONFIG / currentConfig / resolveConfig
|
|
8112
|
-
*
|
|
8111
|
+
* 导出 Config / PluginConfig / DEFAULT_CONFIG / currentConfig / resolveConfig。
|
|
8112
|
+
* 宽松解析时未知键忽略、非法值回退默认值。
|
|
8113
8113
|
*/
|
|
8114
8114
|
/** 默认配置(冻结对象,resolveConfig 合并的基底;debug 缺省值在解析时按 NODE_ENV 判定)。 */
|
|
8115
8115
|
const DEFAULT_CONFIG = Object.freeze({
|
|
@@ -8117,10 +8117,8 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
8117
8117
|
reflectThresholdTokens: 8e4,
|
|
8118
8118
|
compressMaxTokens: void 0,
|
|
8119
8119
|
rateLimitWaitMs: 6e4,
|
|
8120
|
-
recompressConcurrency: 2,
|
|
8121
8120
|
tailMessageCount: 20,
|
|
8122
8121
|
compressSkipReasoning: true,
|
|
8123
|
-
omEnabled: true,
|
|
8124
8122
|
progressReminderEnabled: true,
|
|
8125
8123
|
progressReminderIdleEnabled: false,
|
|
8126
8124
|
progressReminderIdleSteps: 4,
|
|
@@ -8132,20 +8130,22 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
8132
8130
|
compressModel: void 0,
|
|
8133
8131
|
compressReasoningEffort: void 0
|
|
8134
8132
|
});
|
|
8133
|
+
/** debug 开关 schema:缺省按 NODE_ENV !== 'production' 判定。 */
|
|
8134
|
+
function debugSchema() {
|
|
8135
|
+
return Schema.boolean().default(process.env.NODE_ENV !== "production").volatile();
|
|
8136
|
+
}
|
|
8135
8137
|
Schema.object({
|
|
8136
8138
|
observeThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.observeThresholdTokens).volatile(),
|
|
8137
8139
|
reflectThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.reflectThresholdTokens).volatile(),
|
|
8138
8140
|
compressMaxTokens: Schema.number().step(1).volatile(),
|
|
8139
8141
|
rateLimitWaitMs: Schema.number().step(1).default(DEFAULT_CONFIG.rateLimitWaitMs).volatile(),
|
|
8140
|
-
recompressConcurrency: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.recompressConcurrency).volatile(),
|
|
8141
8142
|
tailMessageCount: Schema.number().step(1).default(DEFAULT_CONFIG.tailMessageCount).volatile(),
|
|
8142
8143
|
compressSkipReasoning: Schema.boolean().default(DEFAULT_CONFIG.compressSkipReasoning).volatile(),
|
|
8143
|
-
omEnabled: Schema.boolean().default(DEFAULT_CONFIG.omEnabled).volatile(),
|
|
8144
8144
|
progressReminderEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderEnabled).volatile(),
|
|
8145
8145
|
progressReminderIdleEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderIdleEnabled).volatile(),
|
|
8146
8146
|
progressReminderIdleSteps: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.progressReminderIdleSteps).volatile(),
|
|
8147
8147
|
progressReminderIdleToolCalls: Schema.number().step(1).min(0).default(DEFAULT_CONFIG.progressReminderIdleToolCalls).volatile(),
|
|
8148
|
-
debug:
|
|
8148
|
+
debug: debugSchema(),
|
|
8149
8149
|
semanticRecallEnabled: Schema.boolean().default(DEFAULT_CONFIG.semanticRecallEnabled).volatile(),
|
|
8150
8150
|
modelDir: Schema.string().default(DEFAULT_CONFIG.modelDir).volatile(),
|
|
8151
8151
|
compressProvider: Schema.string().volatile(),
|
|
@@ -8158,11 +8158,6 @@ const NUMBER_KEYS = [
|
|
|
8158
8158
|
["reflectThresholdTokens", true],
|
|
8159
8159
|
["compressMaxTokens", true],
|
|
8160
8160
|
["rateLimitWaitMs", true],
|
|
8161
|
-
[
|
|
8162
|
-
"recompressConcurrency",
|
|
8163
|
-
true,
|
|
8164
|
-
1
|
|
8165
|
-
],
|
|
8166
8161
|
["tailMessageCount", true],
|
|
8167
8162
|
[
|
|
8168
8163
|
"progressReminderIdleSteps",
|
|
@@ -8175,6 +8170,13 @@ const NUMBER_KEYS = [
|
|
|
8175
8170
|
0
|
|
8176
8171
|
]
|
|
8177
8172
|
];
|
|
8173
|
+
/** 校验数值:有限数,integer 时须为整数,且不小于 min;不合法返回 undefined。 */
|
|
8174
|
+
function resolveNumber(raw, integer, min) {
|
|
8175
|
+
if (typeof raw !== "number" || !Number.isFinite(raw)) return void 0;
|
|
8176
|
+
if (integer && !Number.isInteger(raw)) return void 0;
|
|
8177
|
+
if (min !== void 0 && raw < min) return void 0;
|
|
8178
|
+
return raw;
|
|
8179
|
+
}
|
|
8178
8180
|
/** 归一化原始配置输入:缺省 / null / 空串 / 非对象视为空对象。 */
|
|
8179
8181
|
function normalizeConfigInput(raw) {
|
|
8180
8182
|
if (raw === void 0 || raw === null) return {};
|
|
@@ -8189,6 +8191,10 @@ function resolveBoolean(raw, defaultValue) {
|
|
|
8189
8191
|
if (typeof raw === "boolean") return raw;
|
|
8190
8192
|
return defaultValue;
|
|
8191
8193
|
}
|
|
8194
|
+
/** 解析 debug 开关:非 boolean 回退 NODE_ENV !== 'production'。 */
|
|
8195
|
+
function resolveDebug(raw) {
|
|
8196
|
+
return resolveBoolean(raw, process.env.NODE_ENV !== "production");
|
|
8197
|
+
}
|
|
8192
8198
|
/** 解析字符串配置值:非空字符串才生效,缺省 / null / 空白串 / 非字符串回退 undefined。 */
|
|
8193
8199
|
function resolveOptionalString(raw) {
|
|
8194
8200
|
if (typeof raw === "string" && raw.trim() !== "") return raw;
|
|
@@ -8198,19 +8204,13 @@ function resolveConfig(raw) {
|
|
|
8198
8204
|
const input = normalizeConfigInput(raw);
|
|
8199
8205
|
const config = { ...DEFAULT_CONFIG };
|
|
8200
8206
|
for (const [key, integer, min] of NUMBER_KEYS) {
|
|
8201
|
-
const value = input[key];
|
|
8202
|
-
if (value
|
|
8203
|
-
if (typeof value === "string" && value.trim() === "") continue;
|
|
8204
|
-
if (typeof value !== "number" || !Number.isFinite(value)) continue;
|
|
8205
|
-
if (integer && !Number.isInteger(value)) continue;
|
|
8206
|
-
if (min !== void 0 && value < min) continue;
|
|
8207
|
-
config[key] = value;
|
|
8207
|
+
const value = resolveNumber(input[key], integer, min);
|
|
8208
|
+
if (value !== void 0) config[key] = value;
|
|
8208
8209
|
}
|
|
8209
8210
|
config.compressSkipReasoning = resolveBoolean(input.compressSkipReasoning, true);
|
|
8210
|
-
config.omEnabled = resolveBoolean(input.omEnabled, true);
|
|
8211
8211
|
config.progressReminderEnabled = resolveBoolean(input.progressReminderEnabled, true);
|
|
8212
8212
|
config.progressReminderIdleEnabled = resolveBoolean(input.progressReminderIdleEnabled, DEFAULT_CONFIG.progressReminderIdleEnabled);
|
|
8213
|
-
config.debug =
|
|
8213
|
+
config.debug = resolveDebug(input.debug);
|
|
8214
8214
|
config.semanticRecallEnabled = resolveBoolean(input.semanticRecallEnabled, true);
|
|
8215
8215
|
const modelDir = input.modelDir;
|
|
8216
8216
|
if (typeof modelDir === "string" && modelDir.trim() !== "") config.modelDir = modelDir;
|
|
@@ -8220,63 +8220,6 @@ function resolveConfig(raw) {
|
|
|
8220
8220
|
return Object.freeze(config);
|
|
8221
8221
|
}
|
|
8222
8222
|
//#endregion
|
|
8223
|
-
//#region src/recompress.ts
|
|
8224
|
-
/** 按 compactionId 收集 start/summary/end 载荷。 */
|
|
8225
|
-
function findLifecycle(session, compactionId) {
|
|
8226
|
-
const lifecycle = {
|
|
8227
|
-
phase: void 0,
|
|
8228
|
-
summary: void 0,
|
|
8229
|
-
end: void 0
|
|
8230
|
-
};
|
|
8231
|
-
for (const event of session.snapshotEvents()) if (event.type === "compaction/start") {
|
|
8232
|
-
const data = event.data;
|
|
8233
|
-
if (String(data.compactionId) === compactionId) lifecycle.phase = data.phase;
|
|
8234
|
-
} else if (event.type === "compaction/summary") {
|
|
8235
|
-
const data = event.data;
|
|
8236
|
-
if (String(data.compactionId) === compactionId) lifecycle.summary = data;
|
|
8237
|
-
} else if (event.type === "compaction/end") {
|
|
8238
|
-
const data = event.data;
|
|
8239
|
-
if (String(data.compactionId) === compactionId) lifecycle.end = data;
|
|
8240
|
-
}
|
|
8241
|
-
return lifecycle;
|
|
8242
|
-
}
|
|
8243
|
-
/** 重建被压缩内容的视图:反思用被归档块的归档视图,观察用原消息;不可重建时返回错误。 */
|
|
8244
|
-
function rebuildView(session, phase, shadowedSeqs, skipReasoning) {
|
|
8245
|
-
if (phase === "reflect") return buildArchiveView(shadowedSeqs.flatMap((seq) => {
|
|
8246
|
-
const text = historyTextOf(session.snapshotEvents()[seq]);
|
|
8247
|
-
return text === void 0 ? [] : [{
|
|
8248
|
-
text,
|
|
8249
|
-
seq
|
|
8250
|
-
}];
|
|
8251
|
-
})).view;
|
|
8252
|
-
return buildObserveView(session, shadowedSeqs, { skipReasoning });
|
|
8253
|
-
}
|
|
8254
|
-
/** 按 compactionId 重建一次已成功压缩的输入视图;不可重放时返回错误文本。 */
|
|
8255
|
-
function compactionView(session, compactionId, skipReasoning) {
|
|
8256
|
-
const lifecycle = findLifecycle(session, compactionId);
|
|
8257
|
-
if (lifecycle.phase === void 0 && lifecycle.summary === void 0) return { error: `未找到压缩 ${compactionId}` };
|
|
8258
|
-
const summary = lifecycle.summary;
|
|
8259
|
-
if (summary === void 0 || lifecycle.end === void 0 || lifecycle.end.error !== void 0) return { error: `压缩 ${compactionId} 未成功完成,无法重压缩` };
|
|
8260
|
-
const shadowedSeqs = (summary.shadowedSeqs ?? []).map(Number);
|
|
8261
|
-
if (shadowedSeqs.length === 0) return { error: `压缩 ${compactionId} 缺少 shadowedSeqs,无法重放` };
|
|
8262
|
-
const firstEvent = session.snapshotEvents()[shadowedSeqs[0] ?? -1];
|
|
8263
|
-
const phase = lifecycle.phase ?? (historyTextOf(firstEvent) === void 0 ? "observe" : "reflect");
|
|
8264
|
-
const view = rebuildView(session, phase, shadowedSeqs, skipReasoning);
|
|
8265
|
-
if (typeof view === "string") return { error: view };
|
|
8266
|
-
const { minIndex, maxIndex } = view;
|
|
8267
|
-
if (minIndex === void 0 || maxIndex === void 0) return { error: `压缩 ${compactionId} 的原内容无可定位条目` };
|
|
8268
|
-
const originalChars = summary.shadowedCharCount ?? (phase === "observe" ? seqsCharCount(session, shadowedSeqs) : viewCharCount(view));
|
|
8269
|
-
return {
|
|
8270
|
-
phase,
|
|
8271
|
-
view: {
|
|
8272
|
-
...view,
|
|
8273
|
-
minIndex,
|
|
8274
|
-
maxIndex
|
|
8275
|
-
},
|
|
8276
|
-
originalChars
|
|
8277
|
-
};
|
|
8278
|
-
}
|
|
8279
|
-
//#endregion
|
|
8280
8223
|
//#region .agents/skills/compaction-eval/scripts/paths.ts
|
|
8281
8224
|
/**
|
|
8282
8225
|
* compaction-eval 的文件位置:评估根目录,以及按会话、阶段、区间命名的视图文件、重压缩目录与评估目录。
|
|
@@ -16076,6 +16019,61 @@ function toSession(events, lastSeq) {
|
|
|
16076
16019
|
* 缺省写入系统临时目录下的 om-compaction-eval/view-<会话 id 前 8 位>-<阶段>-<A>-<B>.json。
|
|
16077
16020
|
* 导出 listCompactions / rangeView / buildViewFile 与 ViewFile / CompactionBrief 类型。
|
|
16078
16021
|
*/
|
|
16022
|
+
/** 按 compactionId 收集 start、summary 和 end 载荷。 */
|
|
16023
|
+
function findLifecycle(session, compactionId) {
|
|
16024
|
+
const lifecycle = {
|
|
16025
|
+
phase: void 0,
|
|
16026
|
+
summary: void 0,
|
|
16027
|
+
end: void 0
|
|
16028
|
+
};
|
|
16029
|
+
for (const event of session.snapshotEvents()) if (event.type === "compaction/start") {
|
|
16030
|
+
const data = event.data;
|
|
16031
|
+
if (String(data.compactionId) === compactionId) lifecycle.phase = data.phase;
|
|
16032
|
+
} else if (event.type === "compaction/summary") {
|
|
16033
|
+
const data = event.data;
|
|
16034
|
+
if (String(data.compactionId) === compactionId) lifecycle.summary = data;
|
|
16035
|
+
} else if (event.type === "compaction/end") {
|
|
16036
|
+
const data = event.data;
|
|
16037
|
+
if (String(data.compactionId) === compactionId) lifecycle.end = data;
|
|
16038
|
+
}
|
|
16039
|
+
return lifecycle;
|
|
16040
|
+
}
|
|
16041
|
+
/** 重建被压缩内容的视图:反思用归档块,观察用原消息。 */
|
|
16042
|
+
function rebuildView(session, phase, shadowedSeqs, skipReasoning) {
|
|
16043
|
+
if (phase === "reflect") return buildArchiveView(shadowedSeqs.flatMap((seq) => {
|
|
16044
|
+
const text = historyTextOf(session.snapshotEvents()[seq]);
|
|
16045
|
+
return text === void 0 ? [] : [{
|
|
16046
|
+
text,
|
|
16047
|
+
seq
|
|
16048
|
+
}];
|
|
16049
|
+
})).view;
|
|
16050
|
+
return buildObserveView(session, shadowedSeqs, { skipReasoning });
|
|
16051
|
+
}
|
|
16052
|
+
/** 按 compactionId 重建一次已成功压缩的输入视图。 */
|
|
16053
|
+
function compactionView(session, compactionId, skipReasoning) {
|
|
16054
|
+
const lifecycle = findLifecycle(session, compactionId);
|
|
16055
|
+
if (lifecycle.phase === void 0 && lifecycle.summary === void 0) return { error: `未找到压缩 ${compactionId}` };
|
|
16056
|
+
const summary = lifecycle.summary;
|
|
16057
|
+
if (summary === void 0 || lifecycle.end === void 0 || lifecycle.end.error !== void 0) return { error: `压缩 ${compactionId} 未成功完成,无法重建视图` };
|
|
16058
|
+
const shadowedSeqs = (summary.shadowedSeqs ?? []).map(Number);
|
|
16059
|
+
if (shadowedSeqs.length === 0) return { error: `压缩 ${compactionId} 缺少 shadowedSeqs,无法重放` };
|
|
16060
|
+
const firstEvent = session.snapshotEvents()[shadowedSeqs[0] ?? -1];
|
|
16061
|
+
const phase = lifecycle.phase ?? (historyTextOf(firstEvent) === void 0 ? "observe" : "reflect");
|
|
16062
|
+
const view = rebuildView(session, phase, shadowedSeqs, skipReasoning);
|
|
16063
|
+
if (typeof view === "string") return { error: view };
|
|
16064
|
+
const { minIndex, maxIndex } = view;
|
|
16065
|
+
if (minIndex === void 0 || maxIndex === void 0) return { error: `压缩 ${compactionId} 的原内容无可定位条目` };
|
|
16066
|
+
const originalChars = summary.shadowedCharCount ?? (phase === "observe" ? seqsCharCount(session, shadowedSeqs) : viewCharCount(view));
|
|
16067
|
+
return {
|
|
16068
|
+
phase,
|
|
16069
|
+
view: {
|
|
16070
|
+
...view,
|
|
16071
|
+
minIndex,
|
|
16072
|
+
maxIndex
|
|
16073
|
+
},
|
|
16074
|
+
originalChars
|
|
16075
|
+
};
|
|
16076
|
+
}
|
|
16079
16077
|
/** 列出会话已有压缩:阶段、区间、成败与模型。 */
|
|
16080
16078
|
function listCompactions(session) {
|
|
16081
16079
|
const byId = /* @__PURE__ */ new Map();
|
|
@@ -16202,4 +16200,4 @@ function main() {
|
|
|
16202
16200
|
}
|
|
16203
16201
|
if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) main();
|
|
16204
16202
|
//#endregion
|
|
16205
|
-
export { buildViewFile, listCompactions, rangeView };
|
|
16203
|
+
export { buildViewFile, compactionView, listCompactions, rangeView };
|
|
@@ -16,8 +16,8 @@ export type SystemReminder = {
|
|
|
16
16
|
export declare const PROGRESS_REMINDER: SystemReminder;
|
|
17
17
|
/** 构造一条新的提醒消息。 */
|
|
18
18
|
export declare function systemReminderMessage(reminder: SystemReminder): UserMessage;
|
|
19
|
-
/** 按配置返回应注入的提醒:
|
|
20
|
-
export declare function activeSystemReminders(config: Pick<PluginConfig, '
|
|
19
|
+
/** 按配置返回应注入的提醒:progressReminderEnabled 开启时为进度提醒。 */
|
|
20
|
+
export declare function activeSystemReminders(config: Pick<PluginConfig, 'progressReminderEnabled'>): SystemReminder[];
|
|
21
21
|
/** 活动重发判定:开关、静默窗口内已结束 step 数下限、工具调用数须超过的值。 */
|
|
22
22
|
export type ProgressIdleOptions = {
|
|
23
23
|
readonly enabled: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system-reminder.d.ts","sourceRoot":"","sources":["../src/system-reminder.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,OAAO,EAAgB,WAAW,EAAE,MAAM,YAAY,CAAC;AAErE,yEAAyE;AACzE,eAAO,MAAM,6BAA6B,kCAAkC,CAAC;AAE7E,sBAAsB;AACtB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;CAC/B,CAAC;AAEF,kDAAkD;AAClD,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AAOF,YAAY;AACZ,eAAO,MAAM,iBAAiB,EAAE,cAS/B,CAAC;AAEF,kBAAkB;AAClB,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,GAAG,WAAW,CAK3E;AAED,
|
|
1
|
+
{"version":3,"file":"system-reminder.d.ts","sourceRoot":"","sources":["../src/system-reminder.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,OAAO,EAAgB,WAAW,EAAE,MAAM,YAAY,CAAC;AAErE,yEAAyE;AACzE,eAAO,MAAM,6BAA6B,kCAAkC,CAAC;AAE7E,sBAAsB;AACtB,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;CAC/B,CAAC;AAEF,kDAAkD;AAClD,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,IAAI,EAAE,OAAO,6BAA6B,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB,CAAC;AAOF,YAAY;AACZ,eAAO,MAAM,iBAAiB,EAAE,cAS/B,CAAC;AAEF,kBAAkB;AAClB,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,cAAc,GAAG,WAAW,CAK3E;AAED,oDAAoD;AACpD,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,yBAAyB,CAAC,GACpD,cAAc,EAAE,CAElB;AAED,8CAA8C;AAC9C,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,yBAAyB;AACzB,eAAO,MAAM,qBAAqB,EAAE,mBAIlC,CAAC;AAEH,mBAAmB;AACnB,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,IAAI,CACV,YAAY,EACZ,6BAA6B,GAAG,2BAA2B,GAAG,+BAA+B,CAC9F,GACA,mBAAmB,CAMrB;AAuDD;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,SAAS,EAAE,SAAS,cAAc,EAAE,EACpC,IAAI,GAAE,mBAA2C,GAChD,WAAW,EAAE,CAwBf"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
//#region src/utils.ts
|
|
2
|
+
/** 判断值是否为普通对象(非 null、非数组)。 */
|
|
3
|
+
function isRecord(value) {
|
|
4
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
5
|
+
}
|
|
6
|
+
/** 生成 uuid:优先 crypto.randomUUID,回退为时间戳+随机串拼接。 */
|
|
7
|
+
function uuid() {
|
|
8
|
+
const cryptoObj = globalThis.crypto;
|
|
9
|
+
if (cryptoObj && typeof cryptoObj.randomUUID === "function") return cryptoObj.randomUUID();
|
|
10
|
+
return `${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 12)}`;
|
|
11
|
+
}
|
|
12
|
+
/** 提取 content 数组中的纯文本块(type === 'text' 的 block.text 拼接)。 */
|
|
13
|
+
function blocksToText(blocks) {
|
|
14
|
+
if (!Array.isArray(blocks)) return "";
|
|
15
|
+
const out = [];
|
|
16
|
+
for (const block of blocks) if (isRecord(block) && block.type === "text" && typeof block.text === "string") out.push(block.text);
|
|
17
|
+
return out.join("");
|
|
18
|
+
}
|
|
19
|
+
/** 消息内容的字符数:递归计入 text 块与 tool-result 内嵌文本。 */
|
|
20
|
+
function textCharCount(message) {
|
|
21
|
+
if (!message || !Array.isArray(message.content)) return 0;
|
|
22
|
+
let total = 0;
|
|
23
|
+
for (const block of message.content) if (block.type === "text") total += block.text.length;
|
|
24
|
+
else if (block.type === "tool-result") total += blocksToText(block.content).length;
|
|
25
|
+
return total;
|
|
26
|
+
}
|
|
27
|
+
/** 一组表层事件 seq 派生消息的字符数之和(OM 卡片「原始字符」口径)。 */
|
|
28
|
+
function seqsCharCount(session, seqs) {
|
|
29
|
+
const events = session.snapshotEvents();
|
|
30
|
+
return seqs.reduce((total, seq) => {
|
|
31
|
+
const event = events[seq];
|
|
32
|
+
return total + textCharCount(event ? session.deriveEventMessage(event) : null);
|
|
33
|
+
}, 0);
|
|
34
|
+
}
|
|
35
|
+
/** 面向 recall 的完整消息呈现:text 原样;tool-call 展开(参数=代码);tool-result 取文本。 */
|
|
36
|
+
function renderMessageText(message) {
|
|
37
|
+
if (!message || !Array.isArray(message.content)) return "";
|
|
38
|
+
const parts = [];
|
|
39
|
+
for (const block of message.content) if (block.type === "text") parts.push(block.text);
|
|
40
|
+
else if (block.type === "tool-call") parts.push(`[tool-call ${block.name} id=${String(block.id)}]
|
|
41
|
+
${toolArgsJson(block.arguments)}`);
|
|
42
|
+
else if (block.type === "tool-result") parts.push(blocksToText(block.content));
|
|
43
|
+
return parts.join("\n");
|
|
44
|
+
}
|
|
45
|
+
/** 安全 JSON 序列化:序列化失败时退回 String 呈现。 */
|
|
46
|
+
function safeJson(value) {
|
|
47
|
+
try {
|
|
48
|
+
return JSON.stringify(value, null, 2);
|
|
49
|
+
} catch {
|
|
50
|
+
return String(value);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
/**
|
|
54
|
+
* 工具调用参数的 JSON 文本(CDATA 内保持只有一层 JSON 转义):
|
|
55
|
+
* 字符串参数是模型产出的原始 JSON 串,原样返回(本身即合法 JSON,不再二次序列化);
|
|
56
|
+
* 其余结构 JSON.stringify 序列化一次。
|
|
57
|
+
*/
|
|
58
|
+
function toolArgsJson(args) {
|
|
59
|
+
if (typeof args === "string") return args;
|
|
60
|
+
return safeJson(args);
|
|
61
|
+
}
|
|
62
|
+
/**
|
|
63
|
+
* 向元素追加 CDATA 正文:正文统一以 CDATA 包裹(逐字原样,不做实体转义)。
|
|
64
|
+
* 正文含 ]]> 时拆为相邻多个 CDATA 段,拼接后逐字还原原文,对读取方透明。
|
|
65
|
+
*/
|
|
66
|
+
function appendCdataText(doc, el, text) {
|
|
67
|
+
const parts = text.split("]]>");
|
|
68
|
+
for (let i = 0; i < parts.length; i += 1) if (i === 0) el.appendChild(doc.createCDATASection(parts[0] ?? ""));
|
|
69
|
+
else {
|
|
70
|
+
el.appendChild(doc.createCDATASection("]]"));
|
|
71
|
+
el.appendChild(doc.createCDATASection(`>${parts[i] ?? ""}`));
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
/** 主会话判定:subagent 会话 header.origin === 'subagent'。 */
|
|
75
|
+
function isMainSession(session) {
|
|
76
|
+
return session.header?.origin !== "subagent";
|
|
77
|
+
}
|
|
78
|
+
/** 解析会话路由目标(provider/model),未路由时返回 undefined。 */
|
|
79
|
+
function routedTarget(session) {
|
|
80
|
+
try {
|
|
81
|
+
const config = session.requestHeader()?.config;
|
|
82
|
+
if (config?.provider && config.model) return {
|
|
83
|
+
provider: config.provider,
|
|
84
|
+
model: config.model
|
|
85
|
+
};
|
|
86
|
+
} catch {}
|
|
87
|
+
}
|
|
88
|
+
//#endregion
|
|
89
|
+
export { renderMessageText as a, toolArgsJson as c, isRecord as i, uuid as l, blocksToText as n, routedTarget as o, isMainSession as r, seqsCharCount as s, appendCdataText as t };
|
package/locale/en.json
ADDED
package/locale/zh.json
ADDED
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-plugin-om",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.64",
|
|
4
4
|
"type": "module",
|
|
5
|
+
"description": "Observational Memory style context compaction and verbatim recall for DSH",
|
|
5
6
|
"main": "./dist/index.mjs",
|
|
6
7
|
"module": "./dist/index.mjs",
|
|
7
8
|
"types": "./dist/index.d.ts",
|
|
@@ -19,14 +20,21 @@
|
|
|
19
20
|
"types": "./dist/index.d.ts",
|
|
20
21
|
"import": "./dist/index.mjs"
|
|
21
22
|
},
|
|
23
|
+
"./compaction-eval": {
|
|
24
|
+
"types": "./dist/compaction-eval/index.d.ts",
|
|
25
|
+
"import": "./dist/compaction-eval/index.mjs"
|
|
26
|
+
},
|
|
22
27
|
"./client": {
|
|
23
28
|
"types": "./dist/client/index.d.ts",
|
|
24
29
|
"default": "./dist/client.js"
|
|
25
30
|
},
|
|
31
|
+
"./locale/*.json": "./locale/*.json",
|
|
32
|
+
"./compaction-eval/locale/*.json": "./locale/compaction-eval/*.json",
|
|
26
33
|
"./package.json": "./package.json"
|
|
27
34
|
},
|
|
28
35
|
"files": [
|
|
29
36
|
"dist",
|
|
37
|
+
"locale",
|
|
30
38
|
"models",
|
|
31
39
|
"!models/*/onnx/*.onnx",
|
|
32
40
|
"cordis.patch.yml",
|
|
@@ -56,6 +64,9 @@
|
|
|
56
64
|
"dev": "node scripts/build-skill.mjs --allow-missing-scripts && tsdown --watch",
|
|
57
65
|
"build": "tsdown && node scripts/build-skill.mjs && tsc -p tsconfig.build.json",
|
|
58
66
|
"download:model": "node scripts/download-model.mjs",
|
|
67
|
+
"serena": "uv run --script scripts/serena-cli.py",
|
|
68
|
+
"serena:setup": "uv run --script scripts/serena-cli.py --version 1>&2",
|
|
69
|
+
"prepare": "pnpm run serena:setup",
|
|
59
70
|
"check": "pnpm run typecheck && pnpm run lint && pnpm run test && pnpm run build",
|
|
60
71
|
"release": "pnpm check && npm version patch && node scripts/release-archive.mjs && git push && git push --tags",
|
|
61
72
|
"typecheck": "tsc --noEmit",
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import type { TranslateNS } from '@deepseek-ai/dsh-client-ui-slots';
|
|
2
|
-
import type { RecompressChoice, RecompressInjected } from './recompress-run.ts';
|
|
3
|
-
/** 菜单属性:重压缩能力(目录与加载)、文案座与批量选中回调;提交期间按钮保持可用以支持并行。 */
|
|
4
|
-
export interface OmRecompressMenuProps {
|
|
5
|
-
readonly source: Pick<RecompressInjected, 'directory' | 'load'>;
|
|
6
|
-
readonly t: TranslateNS<'om-compaction'>;
|
|
7
|
-
readonly onPick: (choices: readonly RecompressChoice[]) => void;
|
|
8
|
-
}
|
|
9
|
-
/** 触发按钮与模型多选浮层。 */
|
|
10
|
-
export declare function OmRecompressMenu({ source, t, onPick }: OmRecompressMenuProps): import("react").JSX.Element;
|
|
11
|
-
//# sourceMappingURL=OmRecompressMenu.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"OmRecompressMenu.d.ts","sourceRoot":"","sources":["../../src/client/OmRecompressMenu.tsx"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAYpE,OAAO,KAAK,EAEV,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAG7B,oDAAoD;AACpD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,WAAW,GAAG,MAAM,CAAC,CAAC;IAChE,QAAQ,CAAC,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,CAAC;IACzC,QAAQ,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,KAAK,IAAI,CAAC;CACjE;AA6CD,mBAAmB;AACnB,wBAAgB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,qBAAqB,+BAkQ5E"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* 把宿主会话模型目录与命令通道装配成压缩卡片的重压缩能力。
|
|
3
|
-
* 导出 recompressFor。
|
|
4
|
-
*/
|
|
5
|
-
import type { Context } from '@deepseek-ai/cordis';
|
|
6
|
-
import type { RecompressInjected } from './recompress-run.ts';
|
|
7
|
-
/** 构造某会话的重压缩能力:目录与 /model 弹窗共用,提交走 command.execute。 */
|
|
8
|
-
export declare function recompressFor(ctx: Context, directories: NonNullable<Context['modelDirectories']>, sessionId: string): RecompressInjected;
|
|
9
|
-
//# sourceMappingURL=recompress-inject.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"recompress-inject.d.ts","sourceRoot":"","sources":["../../src/client/recompress-inject.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAMnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAG9D,uDAAuD;AACvD,wBAAgB,aAAa,CAC3B,GAAG,EAAE,OAAO,EACZ,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,EACrD,SAAS,EAAE,MAAM,GAChB,kBAAkB,CAoBpB"}
|