dsh-plugin-om 0.0.63 → 0.0.65
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 +19 -15
- 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 +2 -2
- package/dist/client/eval-model-register.d.ts.map +1 -1
- package/dist/client/index.d.ts +1 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/locales.d.ts +5 -15
- package/dist/client/locales.d.ts.map +1 -1
- package/dist/client/om-config-controller.d.ts +1 -6
- package/dist/client/om-config-controller.d.ts.map +1 -1
- package/dist/client.js +91 -538
- package/dist/client.js.map +1 -1
- package/dist/config.d.ts +0 -4
- 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 +1 -243
- package/dist/skill/compaction-eval/SKILL.md +2 -1
- package/dist/skill/compaction-eval/scripts/compress.mjs +0 -7
- package/dist/skill/compaction-eval/scripts/view.mjs +56 -65
- package/package.json +49 -46
- 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 -84
- package/dist/recompress.d.ts.map +0 -1
package/dist/config.d.ts
CHANGED
|
@@ -14,8 +14,6 @@ export type PluginConfig = {
|
|
|
14
14
|
compressMaxTokens: number | undefined;
|
|
15
15
|
/** 遇 429 限流后下一次摘要请求前的等待毫秒数(全局冷却期)。 */
|
|
16
16
|
rateLimitWaitMs: number;
|
|
17
|
-
/** 换模型重压缩命令的进程级并发上限(≥ 1),超出的排队等待。 */
|
|
18
|
-
recompressConcurrency: number;
|
|
19
17
|
/** 观察触发后延迟执行的等待完整消息条数(新增完整消息数达到该值才执行压缩;0 表示触发当轮立即执行)。 */
|
|
20
18
|
tailMessageCount: number;
|
|
21
19
|
/** 工具循环 getHistory 输出是否携带 reasoning 参考条目(true 时不携带,压缩指令也省略其说明行)。 */
|
|
@@ -49,7 +47,6 @@ export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
|
|
|
49
47
|
reflectThresholdTokens: Schema<number, number, "volatile-defined">;
|
|
50
48
|
compressMaxTokens: Schema<number, number, "volatile">;
|
|
51
49
|
rateLimitWaitMs: Schema<number, number, "volatile-defined">;
|
|
52
|
-
recompressConcurrency: Schema<number, number, "volatile-defined">;
|
|
53
50
|
tailMessageCount: Schema<number, number, "volatile-defined">;
|
|
54
51
|
compressSkipReasoning: Schema<boolean, boolean, "volatile-defined">;
|
|
55
52
|
progressReminderEnabled: Schema<boolean, boolean, "volatile-defined">;
|
|
@@ -67,7 +64,6 @@ export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
|
|
|
67
64
|
reflectThresholdTokens: Schema<number, number, "volatile-defined">;
|
|
68
65
|
compressMaxTokens: Schema<number, number, "volatile">;
|
|
69
66
|
rateLimitWaitMs: Schema<number, number, "volatile-defined">;
|
|
70
|
-
recompressConcurrency: Schema<number, number, "volatile-defined">;
|
|
71
67
|
tailMessageCount: Schema<number, number, "volatile-defined">;
|
|
72
68
|
compressSkipReasoning: Schema<boolean, boolean, "volatile-defined">;
|
|
73
69
|
progressReminderEnabled: 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,sEAAsE;IACtE,sBAAsB,EAAE,MAAM,CAAC;IAC/B,2DAA2D;IAC3D,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,sCAAsC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,
|
|
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,sEAAsE;IACtE,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,gBAAgB;IAChB,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,wDAAwD;IACxD,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,CAiBhD,CAAC;AASH,uDAAuD;AACvD,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAmCL,CAAC;AAgBf,4CAA4C;AAC5C,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAEtE;AAyDD,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,YAAY,CAAC,CAuBnE"}
|
package/dist/index.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const name = "dsh-plugin-om";
|
|
|
5
5
|
export { Config };
|
|
6
6
|
/**
|
|
7
7
|
* 插件必需的服务依赖:压缩请求(llm)与上下文压力计量(tokenMeter)。
|
|
8
|
-
* tools /
|
|
8
|
+
* tools / sessions 等为可选能力,缺失时对应功能自动停用。
|
|
9
9
|
*/
|
|
10
10
|
export declare const inject: string[];
|
|
11
11
|
/** 插件激活入口:解析配置、注册工具、接线 pre-step 自动压缩与提醒补发。 */
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AAYpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,6BAA6B;AAC7B,eAAO,MAAM,IAAI,kBAAkB,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB;;;GAGG;AACH,eAAO,MAAM,MAAM,UAAwB,CAAC;AAE5C,8CAA8C;AAC9C,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CA8I1D"}
|
package/dist/index.mjs
CHANGED
|
@@ -8253,10 +8253,6 @@ function formatCompactCount(value) {
|
|
|
8253
8253
|
if (value >= 1e3) return `${trim(value / 1e3)}k`;
|
|
8254
8254
|
return String(value);
|
|
8255
8255
|
}
|
|
8256
|
-
/** 毫秒耗时格式化为一位小数的秒数,如 63.1s。 */
|
|
8257
|
-
function formatSeconds(durationMs) {
|
|
8258
|
-
return `${(durationMs / 1e3).toFixed(1)}s`;
|
|
8259
|
-
}
|
|
8260
8256
|
//#endregion
|
|
8261
8257
|
//#region src/compaction-log.ts
|
|
8262
8258
|
/** 诊断子会话的 descriptor provider(宿主子代理列表识别用)。 */
|
|
@@ -11056,7 +11052,6 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
11056
11052
|
reflectThresholdTokens: 8e4,
|
|
11057
11053
|
compressMaxTokens: void 0,
|
|
11058
11054
|
rateLimitWaitMs: 6e4,
|
|
11059
|
-
recompressConcurrency: 2,
|
|
11060
11055
|
tailMessageCount: 20,
|
|
11061
11056
|
compressSkipReasoning: true,
|
|
11062
11057
|
progressReminderEnabled: true,
|
|
@@ -11080,7 +11075,6 @@ const Config = Schema.object({
|
|
|
11080
11075
|
reflectThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.reflectThresholdTokens).volatile(),
|
|
11081
11076
|
compressMaxTokens: Schema.number().step(1).volatile(),
|
|
11082
11077
|
rateLimitWaitMs: Schema.number().step(1).default(DEFAULT_CONFIG.rateLimitWaitMs).volatile(),
|
|
11083
|
-
recompressConcurrency: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.recompressConcurrency).volatile(),
|
|
11084
11078
|
tailMessageCount: Schema.number().step(1).default(DEFAULT_CONFIG.tailMessageCount).volatile(),
|
|
11085
11079
|
compressSkipReasoning: Schema.boolean().default(DEFAULT_CONFIG.compressSkipReasoning).volatile(),
|
|
11086
11080
|
progressReminderEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderEnabled).volatile(),
|
|
@@ -11114,11 +11108,6 @@ const NUMBER_KEYS = [
|
|
|
11114
11108
|
["reflectThresholdTokens", true],
|
|
11115
11109
|
["compressMaxTokens", true],
|
|
11116
11110
|
["rateLimitWaitMs", true],
|
|
11117
|
-
[
|
|
11118
|
-
"recompressConcurrency",
|
|
11119
|
-
true,
|
|
11120
|
-
1
|
|
11121
|
-
],
|
|
11122
11111
|
["tailMessageCount", true],
|
|
11123
11112
|
[
|
|
11124
11113
|
"progressReminderIdleSteps",
|
|
@@ -11699,233 +11688,6 @@ function buildRecallTool(options) {
|
|
|
11699
11688
|
};
|
|
11700
11689
|
}
|
|
11701
11690
|
//#endregion
|
|
11702
|
-
//#region src/recompress-gate.ts
|
|
11703
|
-
/** 当前持有许可的数量。 */
|
|
11704
|
-
let active = 0;
|
|
11705
|
-
/** 排队中的请求(先进先出)。 */
|
|
11706
|
-
const queue = [];
|
|
11707
|
-
/** 按各自上限唤醒队首请求,直到许可用尽。 */
|
|
11708
|
-
function drain() {
|
|
11709
|
-
while (queue.length > 0) {
|
|
11710
|
-
const head = queue[0];
|
|
11711
|
-
if (head === void 0 || active >= Math.max(1, head.limit())) return;
|
|
11712
|
-
queue.shift();
|
|
11713
|
-
head.grant();
|
|
11714
|
-
}
|
|
11715
|
-
}
|
|
11716
|
-
/** 获取一个重压缩许可,返回幂等的 release;signal 中止时拒绝。 */
|
|
11717
|
-
function acquireRecompressSlot(limit, signal) {
|
|
11718
|
-
return new Promise((resolve, reject) => {
|
|
11719
|
-
if (signal?.aborted === true) {
|
|
11720
|
-
reject(signal.reason instanceof Error ? signal.reason : /* @__PURE__ */ new Error("aborted"));
|
|
11721
|
-
return;
|
|
11722
|
-
}
|
|
11723
|
-
const grant = () => {
|
|
11724
|
-
signal?.removeEventListener("abort", onAbort);
|
|
11725
|
-
active++;
|
|
11726
|
-
let released = false;
|
|
11727
|
-
resolve(() => {
|
|
11728
|
-
if (released) return;
|
|
11729
|
-
released = true;
|
|
11730
|
-
active--;
|
|
11731
|
-
drain();
|
|
11732
|
-
});
|
|
11733
|
-
};
|
|
11734
|
-
const waiter = {
|
|
11735
|
-
limit,
|
|
11736
|
-
grant
|
|
11737
|
-
};
|
|
11738
|
-
const onAbort = () => {
|
|
11739
|
-
const index = queue.indexOf(waiter);
|
|
11740
|
-
if (index >= 0) queue.splice(index, 1);
|
|
11741
|
-
reject(signal?.reason instanceof Error ? signal.reason : /* @__PURE__ */ new Error("aborted"));
|
|
11742
|
-
};
|
|
11743
|
-
signal?.addEventListener("abort", onAbort, { once: true });
|
|
11744
|
-
queue.push(waiter);
|
|
11745
|
-
drain();
|
|
11746
|
-
});
|
|
11747
|
-
}
|
|
11748
|
-
//#endregion
|
|
11749
|
-
//#region src/recompress.ts
|
|
11750
|
-
/** 命令行用法提示。 */
|
|
11751
|
-
const USAGE = "用法:/om-recompress <compactionId> <provider> <model> [思考等级]";
|
|
11752
|
-
/** 解析命令行:compactionId provider model [reasoningEffort],空白分隔。 */
|
|
11753
|
-
function parseRecompressInput(rawInput) {
|
|
11754
|
-
const parts = rawInput.trim().split(/\s+/).filter((part) => part !== "");
|
|
11755
|
-
const [compactionId, provider, model, reasoningEffort] = parts;
|
|
11756
|
-
if (compactionId === void 0 || provider === void 0 || model === void 0 || parts.length > 4) return {
|
|
11757
|
-
ok: false,
|
|
11758
|
-
error: USAGE
|
|
11759
|
-
};
|
|
11760
|
-
return {
|
|
11761
|
-
ok: true,
|
|
11762
|
-
request: {
|
|
11763
|
-
compactionId,
|
|
11764
|
-
provider,
|
|
11765
|
-
model,
|
|
11766
|
-
...reasoningEffort === void 0 ? {} : { reasoningEffort }
|
|
11767
|
-
}
|
|
11768
|
-
};
|
|
11769
|
-
}
|
|
11770
|
-
/** 按 compactionId 收集 start/summary/end 载荷。 */
|
|
11771
|
-
function findLifecycle(session, compactionId) {
|
|
11772
|
-
const lifecycle = {
|
|
11773
|
-
phase: void 0,
|
|
11774
|
-
summary: void 0,
|
|
11775
|
-
end: void 0
|
|
11776
|
-
};
|
|
11777
|
-
for (const event of session.snapshotEvents()) if (event.type === "compaction/start") {
|
|
11778
|
-
const data = event.data;
|
|
11779
|
-
if (String(data.compactionId) === compactionId) lifecycle.phase = data.phase;
|
|
11780
|
-
} else if (event.type === "compaction/summary") {
|
|
11781
|
-
const data = event.data;
|
|
11782
|
-
if (String(data.compactionId) === compactionId) lifecycle.summary = data;
|
|
11783
|
-
} else if (event.type === "compaction/end") {
|
|
11784
|
-
const data = event.data;
|
|
11785
|
-
if (String(data.compactionId) === compactionId) lifecycle.end = data;
|
|
11786
|
-
}
|
|
11787
|
-
return lifecycle;
|
|
11788
|
-
}
|
|
11789
|
-
/** 重建被压缩内容的视图:反思用被归档块的归档视图,观察用原消息;不可重建时返回错误。 */
|
|
11790
|
-
function rebuildView(session, phase, shadowedSeqs, skipReasoning) {
|
|
11791
|
-
if (phase === "reflect") return buildArchiveView(shadowedSeqs.flatMap((seq) => {
|
|
11792
|
-
const text = historyTextOf(session.snapshotEvents()[seq]);
|
|
11793
|
-
return text === void 0 ? [] : [{
|
|
11794
|
-
text,
|
|
11795
|
-
seq
|
|
11796
|
-
}];
|
|
11797
|
-
})).view;
|
|
11798
|
-
return buildObserveView(session, shadowedSeqs, { skipReasoning });
|
|
11799
|
-
}
|
|
11800
|
-
/** 按 compactionId 重建一次已成功压缩的输入视图;不可重放时返回错误文本。 */
|
|
11801
|
-
function compactionView(session, compactionId, skipReasoning) {
|
|
11802
|
-
const lifecycle = findLifecycle(session, compactionId);
|
|
11803
|
-
if (lifecycle.phase === void 0 && lifecycle.summary === void 0) return { error: `未找到压缩 ${compactionId}` };
|
|
11804
|
-
const summary = lifecycle.summary;
|
|
11805
|
-
if (summary === void 0 || lifecycle.end === void 0 || lifecycle.end.error !== void 0) return { error: `压缩 ${compactionId} 未成功完成,无法重压缩` };
|
|
11806
|
-
const shadowedSeqs = (summary.shadowedSeqs ?? []).map(Number);
|
|
11807
|
-
if (shadowedSeqs.length === 0) return { error: `压缩 ${compactionId} 缺少 shadowedSeqs,无法重放` };
|
|
11808
|
-
const firstEvent = session.snapshotEvents()[shadowedSeqs[0] ?? -1];
|
|
11809
|
-
const phase = lifecycle.phase ?? (historyTextOf(firstEvent) === void 0 ? "observe" : "reflect");
|
|
11810
|
-
const view = rebuildView(session, phase, shadowedSeqs, skipReasoning);
|
|
11811
|
-
if (typeof view === "string") return { error: view };
|
|
11812
|
-
const { minIndex, maxIndex } = view;
|
|
11813
|
-
if (minIndex === void 0 || maxIndex === void 0) return { error: `压缩 ${compactionId} 的原内容无可定位条目` };
|
|
11814
|
-
const originalChars = summary.shadowedCharCount ?? (phase === "observe" ? seqsCharCount(session, shadowedSeqs) : viewCharCount(view));
|
|
11815
|
-
return {
|
|
11816
|
-
phase,
|
|
11817
|
-
view: {
|
|
11818
|
-
...view,
|
|
11819
|
-
minIndex,
|
|
11820
|
-
maxIndex
|
|
11821
|
-
},
|
|
11822
|
-
originalChars
|
|
11823
|
-
};
|
|
11824
|
-
}
|
|
11825
|
-
/**
|
|
11826
|
-
* 对已成功的 compaction 用目标模型重压缩一次。校验失败、压缩循环失败均以
|
|
11827
|
-
* { ok: false } 返回,不抛错;会话本身不被修改(见文件头说明)。
|
|
11828
|
-
*/
|
|
11829
|
-
async function recompress(ctx, agent, config, request, signal) {
|
|
11830
|
-
const session = agent.session;
|
|
11831
|
-
if (!isMainSession(session)) return {
|
|
11832
|
-
ok: false,
|
|
11833
|
-
error: "重压缩仅支持主会话"
|
|
11834
|
-
};
|
|
11835
|
-
const replay = compactionView(session, request.compactionId, config.compressSkipReasoning);
|
|
11836
|
-
if ("error" in replay) return {
|
|
11837
|
-
ok: false,
|
|
11838
|
-
error: replay.error
|
|
11839
|
-
};
|
|
11840
|
-
const { phase, view, originalChars } = replay;
|
|
11841
|
-
if (signal?.aborted === true) return {
|
|
11842
|
-
ok: false,
|
|
11843
|
-
error: COMPACTION_ABORTED_ERROR
|
|
11844
|
-
};
|
|
11845
|
-
const target = {
|
|
11846
|
-
provider: request.provider,
|
|
11847
|
-
model: request.model
|
|
11848
|
-
};
|
|
11849
|
-
makeLogger(ctx, config.debug).step(`重压缩:${request.compactionId}(${phase})→ ${target.provider}/${target.model}${request.reasoningEffort === void 0 ? "" : ` · ${request.reasoningEffort}`}`);
|
|
11850
|
-
const outcome = await runCompressionLoop(ctx, session, {
|
|
11851
|
-
view,
|
|
11852
|
-
originalChars,
|
|
11853
|
-
phase,
|
|
11854
|
-
taskText: buildCompressionTaskText(phase, view.minIndex, view.maxIndex, view.segments),
|
|
11855
|
-
target,
|
|
11856
|
-
maxTokens: config.compressMaxTokens,
|
|
11857
|
-
rateLimitWaitMs: config.rateLimitWaitMs,
|
|
11858
|
-
skipReasoning: config.compressSkipReasoning,
|
|
11859
|
-
debug: config.debug,
|
|
11860
|
-
retry: true,
|
|
11861
|
-
...request.reasoningEffort === void 0 ? {} : { reasoningEffort: request.reasoningEffort },
|
|
11862
|
-
...signal === void 0 ? {} : { signal }
|
|
11863
|
-
});
|
|
11864
|
-
if (!outcome.ok) return {
|
|
11865
|
-
ok: false,
|
|
11866
|
-
error: outcome.error,
|
|
11867
|
-
...outcome.recordSessionId === void 0 ? {} : { recordSessionId: outcome.recordSessionId }
|
|
11868
|
-
};
|
|
11869
|
-
return {
|
|
11870
|
-
ok: true,
|
|
11871
|
-
text: outcome.text,
|
|
11872
|
-
phase,
|
|
11873
|
-
rounds: outcome.rounds,
|
|
11874
|
-
originalChars,
|
|
11875
|
-
newChars: outcome.text.length,
|
|
11876
|
-
durationMs: outcome.stats.durationMs,
|
|
11877
|
-
...outcome.recordSessionId === void 0 ? {} : { recordSessionId: outcome.recordSessionId }
|
|
11878
|
-
};
|
|
11879
|
-
}
|
|
11880
|
-
/** 重压缩命令名(压缩卡片按钮经宿主命令通道调用)。 */
|
|
11881
|
-
const RECOMPRESS_COMMAND_NAME = "om-recompress";
|
|
11882
|
-
/** 渲染命令结果文本:成功为「字符 原始消息 → 产物,耗时,模型(等级)」,失败给出原因。 */
|
|
11883
|
-
function describeResult(request, result) {
|
|
11884
|
-
const label = `${request.provider}/${request.model}(${request.reasoningEffort ?? "默认"})`;
|
|
11885
|
-
if (!result.ok) return `重压缩失败 ${label}:${result.error}`;
|
|
11886
|
-
return `重压缩完成 字符 ${formatCompactCount(result.originalChars)} → ${formatCompactCount(result.newChars)},${formatSeconds(result.durationMs)},${label}`;
|
|
11887
|
-
}
|
|
11888
|
-
/** 构造 /om-recompress 命令定义;配置按调用时刻读取。 */
|
|
11889
|
-
function buildRecompressCommand(ctx, getConfig) {
|
|
11890
|
-
return {
|
|
11891
|
-
name: RECOMPRESS_COMMAND_NAME,
|
|
11892
|
-
description: "由压缩卡片调用:用另一模型重新压缩一次已完成的压缩",
|
|
11893
|
-
input: { hint: "<compactionId> <provider> <model> [思考等级]" },
|
|
11894
|
-
handler: async ({ agent, rawInput, signal }) => {
|
|
11895
|
-
const parsed = parseRecompressInput(rawInput);
|
|
11896
|
-
if (!parsed.ok) return {
|
|
11897
|
-
kind: "error",
|
|
11898
|
-
text: parsed.error
|
|
11899
|
-
};
|
|
11900
|
-
let release;
|
|
11901
|
-
try {
|
|
11902
|
-
release = await acquireRecompressSlot(() => getConfig().recompressConcurrency, signal);
|
|
11903
|
-
} catch {
|
|
11904
|
-
return {
|
|
11905
|
-
kind: "error",
|
|
11906
|
-
text: describeResult(parsed.request, {
|
|
11907
|
-
ok: false,
|
|
11908
|
-
error: COMPACTION_ABORTED_ERROR
|
|
11909
|
-
})
|
|
11910
|
-
};
|
|
11911
|
-
}
|
|
11912
|
-
try {
|
|
11913
|
-
const result = await recompress(ctx, agent, getConfig(), parsed.request, signal);
|
|
11914
|
-
const text = describeResult(parsed.request, result);
|
|
11915
|
-
return result.ok ? {
|
|
11916
|
-
kind: "success",
|
|
11917
|
-
text
|
|
11918
|
-
} : {
|
|
11919
|
-
kind: "error",
|
|
11920
|
-
text
|
|
11921
|
-
};
|
|
11922
|
-
} finally {
|
|
11923
|
-
release();
|
|
11924
|
-
}
|
|
11925
|
-
}
|
|
11926
|
-
};
|
|
11927
|
-
}
|
|
11928
|
-
//#endregion
|
|
11929
11691
|
//#region src/system-reminder.ts
|
|
11930
11692
|
/**
|
|
11931
11693
|
* system-reminder:以 <system-reminder> 用户消息向主会话注入进度提醒,不进系统提示词。
|
|
@@ -12165,7 +11927,7 @@ function registerThinkingBinding(ctx, logger) {
|
|
|
12165
11927
|
const name = "dsh-plugin-om";
|
|
12166
11928
|
/**
|
|
12167
11929
|
* 插件必需的服务依赖:压缩请求(llm)与上下文压力计量(tokenMeter)。
|
|
12168
|
-
* tools /
|
|
11930
|
+
* tools / sessions 等为可选能力,缺失时对应功能自动停用。
|
|
12169
11931
|
*/
|
|
12170
11932
|
const inject = ["llm", "tokenMeter"];
|
|
12171
11933
|
/** 插件激活入口:解析配置、注册工具、接线 pre-step 自动压缩与提醒补发。 */
|
|
@@ -12176,7 +11938,6 @@ function apply(ctx, config) {
|
|
|
12176
11938
|
const warnModel = (message) => ctx.logger.warn(`dsh-plugin-om: ${message}`);
|
|
12177
11939
|
const logModel = (message) => logger.info(message);
|
|
12178
11940
|
if (ctx.get("tools") === void 0) logger.warn("tools 服务未挂载,recall 暂不可用");
|
|
12179
|
-
if (ctx.get("commands") === void 0) logger.warn("commands 服务未挂载,重压缩命令暂不可用");
|
|
12180
11941
|
ctx.inject(["tools"], (inner) => {
|
|
12181
11942
|
let disposeRecall;
|
|
12182
11943
|
/** 当前已注册 recall 对应的语义增强开关与模型目录。 */
|
|
@@ -12213,9 +11974,6 @@ function apply(ctx, config) {
|
|
|
12213
11974
|
disposeRecall = void 0;
|
|
12214
11975
|
}, "dsh-plugin-om: recall tool");
|
|
12215
11976
|
});
|
|
12216
|
-
ctx.inject(["commands"], (inner) => {
|
|
12217
|
-
inner.effect(() => inner.commands.register(buildRecompressCommand(ctx, () => currentConfig(config))), "dsh-plugin-om: recompress command");
|
|
12218
|
-
});
|
|
12219
11977
|
ctx.inject(["sessions"], (inner) => registerThinkingBinding(inner, logger));
|
|
12220
11978
|
ctx.on("session/disposed", (session) => disposePrecompression(session.id));
|
|
12221
11979
|
ctx.effect(() => () => disposeAllPrecompressions(), "dsh-plugin-om: precompression registry");
|
|
@@ -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 失败时新开一个重做,不在原会话续发。
|
|
@@ -15487,7 +15487,6 @@ 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
15492
|
progressReminderEnabled: true,
|
|
@@ -15510,7 +15509,6 @@ Schema.object({
|
|
|
15510
15509
|
reflectThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.reflectThresholdTokens).volatile(),
|
|
15511
15510
|
compressMaxTokens: Schema.number().step(1).volatile(),
|
|
15512
15511
|
rateLimitWaitMs: Schema.number().step(1).default(DEFAULT_CONFIG.rateLimitWaitMs).volatile(),
|
|
15513
|
-
recompressConcurrency: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.recompressConcurrency).volatile(),
|
|
15514
15512
|
tailMessageCount: Schema.number().step(1).default(DEFAULT_CONFIG.tailMessageCount).volatile(),
|
|
15515
15513
|
compressSkipReasoning: Schema.boolean().default(DEFAULT_CONFIG.compressSkipReasoning).volatile(),
|
|
15516
15514
|
progressReminderEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderEnabled).volatile(),
|
|
@@ -15530,11 +15528,6 @@ const NUMBER_KEYS = [
|
|
|
15530
15528
|
["reflectThresholdTokens", true],
|
|
15531
15529
|
["compressMaxTokens", true],
|
|
15532
15530
|
["rateLimitWaitMs", true],
|
|
15533
|
-
[
|
|
15534
|
-
"recompressConcurrency",
|
|
15535
|
-
true,
|
|
15536
|
-
1
|
|
15537
|
-
],
|
|
15538
15531
|
["tailMessageCount", true],
|
|
15539
15532
|
[
|
|
15540
15533
|
"progressReminderIdleSteps",
|
|
@@ -8117,7 +8117,6 @@ 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
8122
|
progressReminderEnabled: true,
|
|
@@ -8140,7 +8139,6 @@ Schema.object({
|
|
|
8140
8139
|
reflectThresholdTokens: Schema.number().step(1).default(DEFAULT_CONFIG.reflectThresholdTokens).volatile(),
|
|
8141
8140
|
compressMaxTokens: Schema.number().step(1).volatile(),
|
|
8142
8141
|
rateLimitWaitMs: Schema.number().step(1).default(DEFAULT_CONFIG.rateLimitWaitMs).volatile(),
|
|
8143
|
-
recompressConcurrency: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.recompressConcurrency).volatile(),
|
|
8144
8142
|
tailMessageCount: Schema.number().step(1).default(DEFAULT_CONFIG.tailMessageCount).volatile(),
|
|
8145
8143
|
compressSkipReasoning: Schema.boolean().default(DEFAULT_CONFIG.compressSkipReasoning).volatile(),
|
|
8146
8144
|
progressReminderEnabled: Schema.boolean().default(DEFAULT_CONFIG.progressReminderEnabled).volatile(),
|
|
@@ -8160,11 +8158,6 @@ const NUMBER_KEYS = [
|
|
|
8160
8158
|
["reflectThresholdTokens", true],
|
|
8161
8159
|
["compressMaxTokens", true],
|
|
8162
8160
|
["rateLimitWaitMs", true],
|
|
8163
|
-
[
|
|
8164
|
-
"recompressConcurrency",
|
|
8165
|
-
true,
|
|
8166
|
-
1
|
|
8167
|
-
],
|
|
8168
8161
|
["tailMessageCount", true],
|
|
8169
8162
|
[
|
|
8170
8163
|
"progressReminderIdleSteps",
|
|
@@ -8227,63 +8220,6 @@ function resolveConfig(raw) {
|
|
|
8227
8220
|
return Object.freeze(config);
|
|
8228
8221
|
}
|
|
8229
8222
|
//#endregion
|
|
8230
|
-
//#region src/recompress.ts
|
|
8231
|
-
/** 按 compactionId 收集 start/summary/end 载荷。 */
|
|
8232
|
-
function findLifecycle(session, compactionId) {
|
|
8233
|
-
const lifecycle = {
|
|
8234
|
-
phase: void 0,
|
|
8235
|
-
summary: void 0,
|
|
8236
|
-
end: void 0
|
|
8237
|
-
};
|
|
8238
|
-
for (const event of session.snapshotEvents()) if (event.type === "compaction/start") {
|
|
8239
|
-
const data = event.data;
|
|
8240
|
-
if (String(data.compactionId) === compactionId) lifecycle.phase = data.phase;
|
|
8241
|
-
} else if (event.type === "compaction/summary") {
|
|
8242
|
-
const data = event.data;
|
|
8243
|
-
if (String(data.compactionId) === compactionId) lifecycle.summary = data;
|
|
8244
|
-
} else if (event.type === "compaction/end") {
|
|
8245
|
-
const data = event.data;
|
|
8246
|
-
if (String(data.compactionId) === compactionId) lifecycle.end = data;
|
|
8247
|
-
}
|
|
8248
|
-
return lifecycle;
|
|
8249
|
-
}
|
|
8250
|
-
/** 重建被压缩内容的视图:反思用被归档块的归档视图,观察用原消息;不可重建时返回错误。 */
|
|
8251
|
-
function rebuildView(session, phase, shadowedSeqs, skipReasoning) {
|
|
8252
|
-
if (phase === "reflect") return buildArchiveView(shadowedSeqs.flatMap((seq) => {
|
|
8253
|
-
const text = historyTextOf(session.snapshotEvents()[seq]);
|
|
8254
|
-
return text === void 0 ? [] : [{
|
|
8255
|
-
text,
|
|
8256
|
-
seq
|
|
8257
|
-
}];
|
|
8258
|
-
})).view;
|
|
8259
|
-
return buildObserveView(session, shadowedSeqs, { skipReasoning });
|
|
8260
|
-
}
|
|
8261
|
-
/** 按 compactionId 重建一次已成功压缩的输入视图;不可重放时返回错误文本。 */
|
|
8262
|
-
function compactionView(session, compactionId, skipReasoning) {
|
|
8263
|
-
const lifecycle = findLifecycle(session, compactionId);
|
|
8264
|
-
if (lifecycle.phase === void 0 && lifecycle.summary === void 0) return { error: `未找到压缩 ${compactionId}` };
|
|
8265
|
-
const summary = lifecycle.summary;
|
|
8266
|
-
if (summary === void 0 || lifecycle.end === void 0 || lifecycle.end.error !== void 0) return { error: `压缩 ${compactionId} 未成功完成,无法重压缩` };
|
|
8267
|
-
const shadowedSeqs = (summary.shadowedSeqs ?? []).map(Number);
|
|
8268
|
-
if (shadowedSeqs.length === 0) return { error: `压缩 ${compactionId} 缺少 shadowedSeqs,无法重放` };
|
|
8269
|
-
const firstEvent = session.snapshotEvents()[shadowedSeqs[0] ?? -1];
|
|
8270
|
-
const phase = lifecycle.phase ?? (historyTextOf(firstEvent) === void 0 ? "observe" : "reflect");
|
|
8271
|
-
const view = rebuildView(session, phase, shadowedSeqs, skipReasoning);
|
|
8272
|
-
if (typeof view === "string") return { error: view };
|
|
8273
|
-
const { minIndex, maxIndex } = view;
|
|
8274
|
-
if (minIndex === void 0 || maxIndex === void 0) return { error: `压缩 ${compactionId} 的原内容无可定位条目` };
|
|
8275
|
-
const originalChars = summary.shadowedCharCount ?? (phase === "observe" ? seqsCharCount(session, shadowedSeqs) : viewCharCount(view));
|
|
8276
|
-
return {
|
|
8277
|
-
phase,
|
|
8278
|
-
view: {
|
|
8279
|
-
...view,
|
|
8280
|
-
minIndex,
|
|
8281
|
-
maxIndex
|
|
8282
|
-
},
|
|
8283
|
-
originalChars
|
|
8284
|
-
};
|
|
8285
|
-
}
|
|
8286
|
-
//#endregion
|
|
8287
8223
|
//#region .agents/skills/compaction-eval/scripts/paths.ts
|
|
8288
8224
|
/**
|
|
8289
8225
|
* compaction-eval 的文件位置:评估根目录,以及按会话、阶段、区间命名的视图文件、重压缩目录与评估目录。
|
|
@@ -16083,6 +16019,61 @@ function toSession(events, lastSeq) {
|
|
|
16083
16019
|
* 缺省写入系统临时目录下的 om-compaction-eval/view-<会话 id 前 8 位>-<阶段>-<A>-<B>.json。
|
|
16084
16020
|
* 导出 listCompactions / rangeView / buildViewFile 与 ViewFile / CompactionBrief 类型。
|
|
16085
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
|
+
}
|
|
16086
16077
|
/** 列出会话已有压缩:阶段、区间、成败与模型。 */
|
|
16087
16078
|
function listCompactions(session) {
|
|
16088
16079
|
const byId = /* @__PURE__ */ new Map();
|
|
@@ -16209,4 +16200,4 @@ function main() {
|
|
|
16209
16200
|
}
|
|
16210
16201
|
if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) main();
|
|
16211
16202
|
//#endregion
|
|
16212
|
-
export { buildViewFile, listCompactions, rangeView };
|
|
16203
|
+
export { buildViewFile, compactionView, listCompactions, rangeView };
|