dsh-plugin-om 0.0.51 → 0.0.52

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.
Files changed (40) hide show
  1. package/README.md +9 -3
  2. package/dist/client/OmCompactionCard.d.ts +4 -1
  3. package/dist/client/OmCompactionCard.d.ts.map +1 -1
  4. package/dist/client/OmRecompressMenu.d.ts +13 -0
  5. package/dist/client/OmRecompressMenu.d.ts.map +1 -0
  6. package/dist/client/definition.d.ts +2 -0
  7. package/dist/client/definition.d.ts.map +1 -1
  8. package/dist/client/index.d.ts.map +1 -1
  9. package/dist/client/locales.d.ts +11 -0
  10. package/dist/client/locales.d.ts.map +1 -1
  11. package/dist/client/recompress-inject.d.ts +9 -0
  12. package/dist/client/recompress-inject.d.ts.map +1 -0
  13. package/dist/client/recompress-run.d.ts +73 -0
  14. package/dist/client/recompress-run.d.ts.map +1 -0
  15. package/dist/client.js +396 -43
  16. package/dist/client.js.map +1 -1
  17. package/dist/compaction-log.d.ts +28 -4
  18. package/dist/compaction-log.d.ts.map +1 -1
  19. package/dist/compress-loop.d.ts +6 -0
  20. package/dist/compress-loop.d.ts.map +1 -1
  21. package/dist/compress.d.ts +7 -3
  22. package/dist/compress.d.ts.map +1 -1
  23. package/dist/constants.d.ts +1 -1
  24. package/dist/constants.d.ts.map +1 -1
  25. package/dist/format.d.ts +6 -0
  26. package/dist/format.d.ts.map +1 -0
  27. package/dist/index.d.ts.map +1 -1
  28. package/dist/index.mjs +290 -57
  29. package/dist/recall.d.ts.map +1 -1
  30. package/dist/recompress.d.ts +66 -0
  31. package/dist/recompress.d.ts.map +1 -0
  32. package/dist/system-reminder.d.ts +4 -13
  33. package/dist/system-reminder.d.ts.map +1 -1
  34. package/dist/types.d.ts +1 -3
  35. package/dist/types.d.ts.map +1 -1
  36. package/dist/utils.d.ts +3 -1
  37. package/dist/utils.d.ts.map +1 -1
  38. package/package.json +4 -1
  39. package/dist/client/format.d.ts +0 -6
  40. package/dist/client/format.d.ts.map +0 -1
@@ -1,6 +1,6 @@
1
1
  import { type ReasoningEffortId } from '@deepseek-ai/dsh-llm';
2
2
  import type { PluginLogger } from './logger.ts';
3
- import type { Agent, Context, PluginConfig, Session } from './types.ts';
3
+ import type { Agent, Context, PluginConfig, Session, SessionEvent } from './types.ts';
4
4
  import { type RoutedTarget } from './utils.ts';
5
5
  /**
6
6
  * 压缩 pass 结果:failed=false 表示无需中断(成功、跳过或非最终的局部失败);
@@ -33,6 +33,12 @@ export declare function clearCompressionModelInfoCache(): void;
33
33
  * 每个 pre-step 重复查询。
34
34
  */
35
35
  export declare function resolveCompressionEffort(ctx: Context, session: Session, config: Readonly<PluginConfig>, target: RoutedTarget, logger: PluginLogger): Promise<ReasoningEffortId | undefined>;
36
+ /**
37
+ * 判定消息是否为本插件的压缩日志消息并提取日志文本(按 source 标记判断,兼容旧宿主
38
+ * checkpoint 标记 'compact')。仅当消息文本含 <history> 开标签时视为压缩日志,返回整段
39
+ * 文本;其余返回 undefined。
40
+ */
41
+ export declare function historyTextOf(event: SessionEvent | undefined): string | undefined;
36
42
  /**
37
43
  * 判定表层节点 seq 之后的切点是否 tool-call/result 配对平衡:按表层顺序折叠未闭合的
38
44
  * 工具调用数,处理到 seq 后计数为 0 即平衡(防止把 tool-call 与其结果切到两侧)。
@@ -63,8 +69,6 @@ export declare function historySection(session: Session): {
63
69
  }>;
64
70
  boundarySeq: number | undefined;
65
71
  };
66
- /** 表层是否存在合法 <history> 压缩日志块。 */
67
- export declare function hasHistoryBlock(session: Session): boolean;
68
72
  /**
69
73
  * 查找当前活跃的观察压缩待定标记:按日志顺序取最后一条 om/observe-pending 信封事件,
70
74
  * 其后须无引用它的 om/observe-invalidate(已失效),且其后的压缩边界 seq 不大于标记
@@ -1 +1 @@
1
- {"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"compress.d.ts","sourceRoot":"","sources":["../src/compress.ts"],"names":[],"mappings":"AAuCA,OAAO,EAAqB,KAAK,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAgBjF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EACV,KAAK,EAIL,OAAO,EACP,YAAY,EACZ,OAAO,EACP,YAAY,EAEb,MAAM,YAAY,CAAC;AACpB,OAAO,EAAgB,KAAK,YAAY,EAAqC,MAAM,YAAY,CAAC;AAEhG;;;;GAIG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,MAAM,EAAE,KAAK,CAAA;CAAE,GACjB;IAAE,MAAM,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEpF,+DAA+D;AAC/D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,OAAO,EAAE,OAAO,GACf,YAAY,GAAG,SAAS,CAK1B;AAKD,uDAAuD;AACvD,wBAAgB,8BAA8B,IAAI,IAAI,CAErD;AAED;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,OAAO,EACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,YAAY,GACnB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAyBxC;AAsCD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CASjF;AAcD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAY1E;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,GACtB;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAoCpE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG;IAChD,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC7C,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAUA;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,mBAAmB,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAoB1D;AA2ID;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,MAAM,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,WAAW,EACpB,eAAe,CAAC,EAAE,iBAAiB,GAClC,OAAO,CAAC,kBAAkB,CAAC,CA0H7B;AAwED;;;;;;;;;GASG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,WAAW,EACpB,eAAe,CAAC,EAAE,iBAAiB,GAClC,OAAO,CAAC,kBAAkB,CAAC,CA+N7B;AAED;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,QAAQ,CAAC,YAAY,CAAC,EAC9B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,kBAAkB,CAAC,CAyB7B"}
@@ -27,7 +27,7 @@ export declare const HISTORY_TAG = "history";
27
27
  /** 压缩日志块开标签的 tip 属性(对 AI 的提醒:本块是历史压缩产物,不要复述)。 */
28
28
  export declare const HISTORY_TIP = "\u5F53\u524D\u5757\u662F\u5386\u53F2\u6D88\u606F\u7684\u538B\u7F29\u4EA7\u7269\uFF0C\u4E0D\u8981\u590D\u8FF0";
29
29
  /**
30
- * 「完整消息」定义(压缩提示词与主会话 system-reminder 共用)。
30
+ * 「完整消息」定义(压缩提示词、recall 工具描述与 <history> 块顶注释共用)。
31
31
  * 完整消息是摘要日志与 recall 共用的定位单位;首条 index 为 0,按会话顺序递增、全局稳定。
32
32
  */
33
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`\u6216`\u5177\u6709result\u7684toolcall`\uFF1B\u9996\u6761 index \u4E3A 0\uFF0C\u6309\u4F1A\u8BDD\u987A\u5E8F\u9012\u589E\u3002";
@@ -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,sPAC8B,CAAC;AAEvE,+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,CAY5E;AAED,mFAAmF;AACnF,eAAO,MAAM,eAAe,UAAU,CAAC;AAEvC;;;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"}
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,sPAC8B,CAAC;AAEvE,+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;;;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"}
@@ -0,0 +1,6 @@
1
+ /**
2
+ * 紧凑数字格式化(压缩卡片、重压缩记录与压缩日志共用)。零依赖,服务端与浏览器均可引用。导出 formatCompactCount。
3
+ * <1k 原样;≥1k 用 k;≥1w(万)用 w;≥1M 用 M;保留 1 位小数并去掉末尾 .0。
4
+ */
5
+ export declare function formatCompactCount(value: number): string;
6
+ //# sourceMappingURL=format.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CASxD"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AAKpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,6BAA6B;AAC7B,eAAO,MAAM,IAAI,kBAAkB,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,wDAAwD;AACxD,eAAO,MAAM,MAAM,UAA6C,CAAC;AAEjE,8CAA8C;AAC9C,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CAmG1D"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAeA,OAAO,EAAE,MAAM,EAAiB,MAAM,aAAa,CAAC;AAMpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,6BAA6B;AAC7B,eAAO,MAAM,IAAI,kBAAkB,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,CAAC;AAElB,wDAAwD;AACxD,eAAO,MAAM,MAAM,UAA6C,CAAC;AAEjE,8CAA8C;AAC9C,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CA2G1D"}
package/dist/index.mjs CHANGED
@@ -1,5 +1,5 @@
1
1
  import { CompactionId } from "@deepseek-ai/dsh-compaction";
2
- import { BlockAssembler, createToolResultMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
2
+ import { BlockAssembler, createAssistantMessage, createToolResultMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
3
3
  import { scopeOf } from "@deepseek-ai/dsh-scope";
4
4
  import { SessionId, SessionSeq } from "@deepseek-ai/dsh-session";
5
5
  import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
@@ -15,6 +15,22 @@ import { AttachmentId } from "@deepseek-ai/dsh-attachment";
15
15
  //#region \0rolldown/runtime.js
16
16
  var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
17
17
  //#endregion
18
+ //#region src/format.ts
19
+ /**
20
+ * 紧凑数字格式化(压缩卡片、重压缩记录与压缩日志共用)。零依赖,服务端与浏览器均可引用。导出 formatCompactCount。
21
+ * <1k 原样;≥1k 用 k;≥1w(万)用 w;≥1M 用 M;保留 1 位小数并去掉末尾 .0。
22
+ */
23
+ function formatCompactCount(value) {
24
+ const trim = (n) => {
25
+ const text = String(Math.round(n * 10) / 10);
26
+ return text.endsWith(".0") ? text.slice(0, -2) : text;
27
+ };
28
+ if (value >= 1e6) return `${trim(value / 1e6)}M`;
29
+ if (value >= 1e4) return `${trim(value / 1e4)}w`;
30
+ if (value >= 1e3) return `${trim(value / 1e3)}k`;
31
+ return String(value);
32
+ }
33
+ //#endregion
18
34
  //#region src/constants.ts
19
35
  /** 插件标识:日志前缀与历史日志的 source.plugin 取值。 */
20
36
  const PLUGIN_LABEL = "dsh-plugin-om";
@@ -36,7 +52,7 @@ const HISTORY_TAG = "history";
36
52
  /** 压缩日志块开标签的 tip 属性(对 AI 的提醒:本块是历史压缩产物,不要复述)。 */
37
53
  const HISTORY_TIP = "当前块是历史消息的压缩产物,不要复述";
38
54
  /**
39
- * 「完整消息」定义(压缩提示词与主会话 system-reminder 共用)。
55
+ * 「完整消息」定义(压缩提示词、recall 工具描述与 <history> 块顶注释共用)。
40
56
  * 完整消息是摘要日志与 recall 共用的定位单位;首条 index 为 0,按会话顺序递增、全局稳定。
41
57
  */
42
58
  const COMPLETE_MESSAGE_DEFINITION = "`完整消息`指一条`用户消息`、`模型输出文本`或`具有result的toolcall`;首条 index 为 0,按会话顺序递增。";
@@ -46,7 +62,11 @@ const COMPLETE_MESSAGE_DEFINITION = "`完整消息`指一条`用户消息`、`
46
62
  * <skill_content> / <ask-user-question> 的条目说明仅在块内存在对应条目时追加。
47
63
  */
48
64
  function historyFormatNote(sections = {}) {
49
- const parts = ["<TAG index=\"N\">表示单条完整消息,<TAG start=\"A\" end=\"B\"> 表示多条连续消息,start/end 是首尾完整消息的 index;消息块的内容是用CDATA包裹的纯文本", "<assistant type=\"toolcall\" tool-name=\"T\" callId=\"C\" index=\"N\"> 表示工具调用,内含 <tool-args> 与 <tool-result> 两个CDATA子元素(调用参数与工具返回内容)"];
65
+ const parts = [
66
+ COMPLETE_MESSAGE_DEFINITION,
67
+ "<TAG index=\"N\">表示单条完整消息,<TAG start=\"A\" end=\"B\"> 表示多条连续消息,start/end 是首尾完整消息的 index;消息块的内容是用CDATA包裹的纯文本",
68
+ "<assistant type=\"toolcall\" tool-name=\"T\" callId=\"C\" index=\"N\"> 表示工具调用,内含 <tool-args> 与 <tool-result> 两个CDATA子元素(调用参数与工具返回内容)"
69
+ ];
50
70
  if (sections.user) parts.push("<user_message index=\"N\"> 表示用户消息原文");
51
71
  if (sections.skill) parts.push("<skill_content name=\"S\" index=\"N\"> 表示未压缩的原始 skill");
52
72
  if (sections.askUserQuestion) parts.push("<ask-user-question index=\"N\"> 表示向用户提问,CDATA 内为逐题成对的 q:(提问)与 a:(用户回答)行,未作答的题记为 a:(未回答)");
@@ -122,6 +142,14 @@ function textCharCount(message) {
122
142
  else if (block.type === "tool-result") total += blocksToText(block.content).length;
123
143
  return total;
124
144
  }
145
+ /** 一组表层事件 seq 派生消息的字符数之和(OM 卡片「原始字符」口径)。 */
146
+ function seqsCharCount(session, seqs) {
147
+ const events = session.snapshotEvents();
148
+ return seqs.reduce((total, seq) => {
149
+ const event = events[seq];
150
+ return total + textCharCount(event ? session.deriveEventMessage(event) : null);
151
+ }, 0);
152
+ }
125
153
  /** 面向 recall 的完整消息呈现:text 原样;tool-call 展开(参数=代码);tool-result 取文本。 */
126
154
  function renderMessageText(message) {
127
155
  if (!message || !Array.isArray(message.content)) return "";
@@ -185,9 +213,23 @@ function phaseLabel(phase) {
185
213
  if (phase === "reflect") return "反思";
186
214
  return "压缩";
187
215
  }
188
- /** 压缩会话记录 label:成功为会话记录、失败为失败日志,均含压缩阶段与轮数。 */
189
- function compressionRecordLabel(phase, rounds, success) {
190
- return `OM 压缩${success ? "会话记录" : "失败日志"}(${phaseLabel(phase)} · ${rounds} 轮)`;
216
+ /**
217
+ * 压缩会话记录 label:成功为会话记录、失败为失败日志,均含压缩阶段与轮数;
218
+ * 换模型重压缩传入 retryTarget,label 末尾追加「重压缩 provider/model」以区分。
219
+ */
220
+ function compressionRecordLabel(phase, rounds, success, retryTarget) {
221
+ const retry = retryTarget === void 0 ? "" : ` · 重压缩 ${retryTarget.provider}/${retryTarget.model}`;
222
+ return `OM 压缩${success ? "会话记录" : "失败日志"}(${phaseLabel(phase)} · ${rounds} 轮${retry})`;
223
+ }
224
+ /** 生成模型信息:压缩模型、思考等级、原始消息与压缩产物的字符数(k 单位)。 */
225
+ function compressionInfo(info) {
226
+ const effort = info.reasoningEffort ?? "默认思考等级";
227
+ const result = info.resultChars === void 0 ? "无(压缩失败)" : `${formatCompactCount(info.resultChars)} 字符`;
228
+ return {
229
+ text: `压缩使用模型 ${info.target.provider}/${info.target.model}(${effort}),原始消息 ${formatCompactCount(info.originalChars)} 字符,压缩产物 ${result}`,
230
+ provider: info.target.provider,
231
+ model: info.target.model
232
+ };
191
233
  }
192
234
  /**
193
235
  * 构造一个 seed 事件信封:seq 由调用方按顺序传入,surface 事件附 surfaceOp:'append'。
@@ -212,7 +254,7 @@ function seedEvent(type, seq, time, data, surfaceOp) {
212
254
  * 时间全程单调不减;轮次数组短于 assistant 数时(流错误注入的部分 assistant)回落上一
213
255
  * 轮结束时刻与循环结束时刻。
214
256
  */
215
- function buildCompressionSeed(messages, stats, label) {
257
+ function buildCompressionSeed(messages, stats, label, info) {
216
258
  const seed = [];
217
259
  const push = (type, time, data, surfaceOp) => {
218
260
  seed.push(seedEvent(type, seed.length, time, data, surfaceOp));
@@ -304,6 +346,32 @@ function buildCompressionSeed(messages, stats, label) {
304
346
  }, "append");
305
347
  else push("user/message", at(step === 0 ? stats.startedAt : stepTime), message, "append");
306
348
  closeStep();
349
+ if (info !== void 0) {
350
+ step += 1;
351
+ push("step/start", at(stats.completedAt), {
352
+ turn: 1,
353
+ step
354
+ });
355
+ push("assistant/message", at(stats.completedAt), {
356
+ turn: 1,
357
+ step,
358
+ message: createAssistantMessage({
359
+ content: [{
360
+ type: "text",
361
+ text: info.text
362
+ }],
363
+ source: {
364
+ provider: info.provider,
365
+ model: info.model
366
+ }
367
+ }),
368
+ stream: []
369
+ }, "append");
370
+ push("step/end", at(stats.completedAt), {
371
+ turn: 1,
372
+ step
373
+ });
374
+ }
307
375
  push("turn/end", at(stats.completedAt), {
308
376
  turn: 1,
309
377
  reason: { kind: "completed" }
@@ -314,7 +382,7 @@ function buildCompressionSeed(messages, stats, label) {
314
382
  * 把一次压缩工具循环的完整会话消息组落盘为子会话:以重建时间线的 seed 事件经
315
383
  * ctx.sessions.create 构造子会话(header origin 'subagent'、parentSession 指向主会话、
316
384
  * delegationDepth = 父 + 1、cwd 继承主会话;首事件 one-shot descriptor,provider
317
- * om-compaction-log,label 含压缩阶段与轮数),flush 持久化,在父会话登记
385
+ * om-compaction-log,label 含压缩阶段与轮数;info 存在时尾部追加一条模型文本),flush 持久化,在父会话登记
318
386
  * subagent/catalog,返回子会话 id。成功与失败均调用;落盘自身绝不抛错,任何失败仅
319
387
  * logger.warn 并返回 undefined。
320
388
  */
@@ -322,8 +390,8 @@ async function recordCompressionSession(ctx, parentSession, options) {
322
390
  const logger = makeLogger(ctx, options.debug);
323
391
  try {
324
392
  const header = parentSession.header;
325
- const label = compressionRecordLabel(options.phase, options.stats.rounds.length, options.success);
326
- const seed = buildCompressionSeed(options.messages, options.stats, label);
393
+ const label = compressionRecordLabel(options.phase, options.stats.rounds.length, options.success, options.retryTarget);
394
+ const seed = buildCompressionSeed(options.messages, options.stats, label, options.info);
327
395
  const child = ctx.sessions.create(SessionId(`om-compaction-log-${uuid()}`), {
328
396
  seed,
329
397
  meta: {
@@ -8873,6 +8941,10 @@ const ASK_COMPRESSION_PROMPT = [
8873
8941
  ].join("\n");
8874
8942
  /** 模型输出纯文本(无工具调用)时追加的提醒消息文本。 */
8875
8943
  const COMPRESSION_NUDGE_TEXT = "请通过工具执行压缩:用 getHistory 查看区间条目,用 compressHistory 压缩 assistant 条目,完成后调用 completeCompression。不要输出与工具调用无关的文本。";
8944
+ /** 视图原始消息字符数估算:非 reasoning 条目之和;工具调用条目的 text 已含参数与结果,不重复计入。 */
8945
+ function viewCharCount(view) {
8946
+ return view.entries.reduce((total, entry) => entry.kind === "reasoning" ? total : total + entry.text.length, 0);
8947
+ }
8876
8948
  /** 构造插件自产 user 消息(压缩指令/提醒;source 为插件自有 kind)。 */
8877
8949
  function makePluginUserMessage(text) {
8878
8950
  return createUserMessage({
@@ -8952,12 +9024,19 @@ async function runCompressionLoop(ctx, session, options) {
8952
9024
  rounds: roundStats
8953
9025
  };
8954
9026
  };
8955
- const recordSessionId = async (success, stats) => recordCompressionSession(ctx, session, {
9027
+ const recordSessionId = async (success, stats, resultChars) => recordCompressionSession(ctx, session, {
8956
9028
  phase: options.phase,
8957
9029
  messages,
8958
9030
  stats,
8959
9031
  success,
8960
- debug: options.debug
9032
+ debug: options.debug,
9033
+ info: compressionInfo({
9034
+ target: options.target,
9035
+ originalChars: options.originalChars ?? viewCharCount(options.view),
9036
+ ...options.reasoningEffort === void 0 ? {} : { reasoningEffort: options.reasoningEffort },
9037
+ ...resultChars === void 0 ? {} : { resultChars }
9038
+ }),
9039
+ ...options.retryTarget === void 0 ? {} : { retryTarget: options.retryTarget }
8961
9040
  });
8962
9041
  const failWith = async (error, aborted) => {
8963
9042
  const stats = buildStats();
@@ -9059,7 +9138,7 @@ async function runCompressionLoop(ctx, session, options) {
9059
9138
  if (state.replacementCount === 0 && state.rewriteCount === 0) logger.warn("压缩完成但未执行任何压缩替换(空提交)");
9060
9139
  logger.info(`压缩循环完成(${rounds} 轮,${state.replacementCount} 次压缩替换,${state.rewriteCount} 条提问重写,输出 ${text.length} 字符)`);
9061
9140
  const stats = buildStats();
9062
- const id = await recordSessionId(true, stats);
9141
+ const id = await recordSessionId(true, stats, text.length);
9063
9142
  return {
9064
9143
  ok: true,
9065
9144
  text,
@@ -9193,7 +9272,7 @@ function reportDegrade(session, logger, problem) {
9193
9272
  /**
9194
9273
  * 两级自动压缩(观察/反思)与 compaction 生命周期提交。
9195
9274
  * 导出 estimateTextTokens / isPairBalancedAfter / computeCompressRange / historySection /
9196
- * hasHistoryBlock / findObservePending / reflectPass / observePass / maybeCompress。
9275
+ * historyTextOf / findObservePending / reflectPass / observePass / maybeCompress。
9197
9276
  *
9198
9277
  * - 摘要生成走工具驱动的压缩循环(compress-loop.ts runCompressionLoop):首条 user
9199
9278
  * 消息仅含压缩指令与 start/end 区间,模型经 getHistory / compressHistory /
@@ -9395,11 +9474,6 @@ function historySection(session) {
9395
9474
  boundarySeq
9396
9475
  };
9397
9476
  }
9398
- /** 表层是否存在合法 <history> 压缩日志块。 */
9399
- function hasHistoryBlock(session) {
9400
- for (const seq of session.surface.nodes) if (historyTextOf(session.snapshotEvents()[seq]) !== void 0) return true;
9401
- return false;
9402
- }
9403
9477
  /**
9404
9478
  * 查找当前活跃的观察压缩待定标记:按日志顺序取最后一条 om/observe-pending 信封事件,
9405
9479
  * 其后须无引用它的 om/observe-invalidate(已失效),且其后的压缩边界 seq 不大于标记
@@ -9563,6 +9637,7 @@ async function reflectPass(ctx, agent, config, target, signal, reasoningEffort)
9563
9637
  }
9564
9638
  const summaryResult = await runPassLoop(ctx, session, lifecycle, {
9565
9639
  view,
9640
+ originalChars: shadowedCharCount,
9566
9641
  phase: "reflect",
9567
9642
  taskText: buildCompressionTaskText("reflect", view.minIndex, view.maxIndex),
9568
9643
  target,
@@ -9765,6 +9840,7 @@ async function observePass(ctx, agent, config, waitCount, target, signal, reason
9765
9840
  clearPending();
9766
9841
  return { failed: false };
9767
9842
  }
9843
+ const shadowedCharCount = seqsCharCount(session, replaceSeqs);
9768
9844
  const view = buildObserveView(session, replaceSeqs, { skipReasoning: config.compressSkipReasoning });
9769
9845
  if (view.minIndex === void 0 || view.maxIndex === void 0) {
9770
9846
  logger.step("观察:区间内无可定位条目,清除待定标记视为完成");
@@ -9786,6 +9862,7 @@ async function observePass(ctx, agent, config, waitCount, target, signal, reason
9786
9862
  }
9787
9863
  const summaryResult = await runPassLoop(ctx, session, lifecycle, {
9788
9864
  view,
9865
+ originalChars: shadowedCharCount,
9789
9866
  phase: "observe",
9790
9867
  taskText: buildCompressionTaskText("observe", view.minIndex, view.maxIndex),
9791
9868
  target,
@@ -9815,11 +9892,6 @@ async function observePass(ctx, agent, config, waitCount, target, signal, reason
9815
9892
  }
9816
9893
  return total + tokens;
9817
9894
  }, 0);
9818
- const shadowedCharCount = replaceSeqs.reduce((total, seq) => {
9819
- const event = session.snapshotEvents()[seq];
9820
- const message = event ? session.deriveEventMessage(event) : null;
9821
- return total + (message ? textCharCount(message) : 0);
9822
- }, 0);
9823
9895
  try {
9824
9896
  logger.step("观察提交:追加 compaction/summary(影子价格认领)");
9825
9897
  const summarySeq = appendCompactionSummary(session, {
@@ -10595,9 +10667,9 @@ function parseRecallArgs(raw, semantic = false) {
10595
10667
  return result.data;
10596
10668
  }
10597
10669
  /** 基础工具描述。 */
10598
- const RECALL_DESCRIPTION = "在你需要查看历史消息时调用。此工具按 index 区间精确返回区间内全部完整消息的内容。";
10670
+ const RECALL_DESCRIPTION = `在你需要查看历史消息时调用。${COMPLETE_MESSAGE_DEFINITION}此工具按 index 区间精确返回区间内全部完整消息的内容。`;
10599
10671
  /** 语义增强启用时的工具描述。 */
10600
- const ENHANCED_RECALL_DESCRIPTION = "在你需要查看历史消息时调用。两种用法:1) 给出 start 与 end 或 offset,按 index 区间精确返回区间内全部完整消息的内容;2) 给出 query,按自然语言含义检索最符合的完整消息,默认全量搜索,可用 start/end/offset 限定区间。注意:query 只匹配文本。";
10672
+ const ENHANCED_RECALL_DESCRIPTION = `在你需要查看历史消息时调用。${COMPLETE_MESSAGE_DEFINITION}两种用法:1) 给出 start 与 end 或 offset,按 index 区间精确返回区间内全部完整消息的内容;2) 给出 query,按自然语言含义检索最符合的完整消息,默认全量搜索,可用 start/end/offset 限定区间。注意:query 只匹配文本。`;
10601
10673
  /**
10602
10674
  * 构建 recall 工具定义:按 start/end/offset 定位完整消息区间并渲染原始内容(标 index);
10603
10675
  * 传入 semantic 选项时额外支持 query 语义检索。
@@ -10665,20 +10737,192 @@ function buildRecallTool(options) {
10665
10737
  };
10666
10738
  }
10667
10739
  //#endregion
10740
+ //#region src/recompress.ts
10741
+ /** 命令行用法提示。 */
10742
+ const USAGE = "用法:/om-recompress <compactionId> <provider> <model> [思考等级]";
10743
+ /** 解析命令行:compactionId provider model [reasoningEffort],空白分隔。 */
10744
+ function parseRecompressInput(rawInput) {
10745
+ const parts = rawInput.trim().split(/\s+/).filter((part) => part !== "");
10746
+ const [compactionId, provider, model, reasoningEffort] = parts;
10747
+ if (compactionId === void 0 || provider === void 0 || model === void 0 || parts.length > 4) return {
10748
+ ok: false,
10749
+ error: USAGE
10750
+ };
10751
+ return {
10752
+ ok: true,
10753
+ request: {
10754
+ compactionId,
10755
+ provider,
10756
+ model,
10757
+ ...reasoningEffort === void 0 ? {} : { reasoningEffort }
10758
+ }
10759
+ };
10760
+ }
10761
+ /** 正在重压缩的会话 id(同一会话同时仅一次)。 */
10762
+ const running = /* @__PURE__ */ new Set();
10763
+ /** 按 compactionId 收集 start/summary/end 载荷。 */
10764
+ function findLifecycle(session, compactionId) {
10765
+ const lifecycle = {
10766
+ phase: void 0,
10767
+ summary: void 0,
10768
+ end: void 0
10769
+ };
10770
+ for (const event of session.snapshotEvents()) if (event.type === "compaction/start") {
10771
+ const data = event.data;
10772
+ if (String(data.compactionId) === compactionId) lifecycle.phase = data.phase;
10773
+ } else if (event.type === "compaction/summary") {
10774
+ const data = event.data;
10775
+ if (String(data.compactionId) === compactionId) lifecycle.summary = data;
10776
+ } else if (event.type === "compaction/end") {
10777
+ const data = event.data;
10778
+ if (String(data.compactionId) === compactionId) lifecycle.end = data;
10779
+ }
10780
+ return lifecycle;
10781
+ }
10782
+ /** 重建被压缩内容的视图;不可重建时返回错误。 */
10783
+ function rebuildView(session, phase, shadowedSeqs, skipReasoning) {
10784
+ if (phase === "reflect") return buildReflectView(shadowedSeqs.flatMap((seq) => {
10785
+ const text = historyTextOf(session.snapshotEvents()[seq]);
10786
+ return text === void 0 ? [] : [{
10787
+ text,
10788
+ seq
10789
+ }];
10790
+ }), { skipReasoning });
10791
+ return buildObserveView(session, shadowedSeqs, { skipReasoning });
10792
+ }
10793
+ /**
10794
+ * 对已成功的 compaction 用目标模型重压缩一次。校验失败、压缩循环失败均以
10795
+ * { ok: false } 返回,不抛错;会话本身不被修改(见文件头说明)。
10796
+ */
10797
+ async function recompress(ctx, agent, config, request, signal) {
10798
+ const session = agent.session;
10799
+ if (!isMainSession(session)) return {
10800
+ ok: false,
10801
+ error: "重压缩仅支持主会话"
10802
+ };
10803
+ const lifecycle = findLifecycle(session, request.compactionId);
10804
+ if (lifecycle.phase === void 0 && lifecycle.summary === void 0) return {
10805
+ ok: false,
10806
+ error: `未找到压缩 ${request.compactionId}`
10807
+ };
10808
+ const summary = lifecycle.summary;
10809
+ if (summary === void 0 || lifecycle.end === void 0 || lifecycle.end.error !== void 0) return {
10810
+ ok: false,
10811
+ error: `压缩 ${request.compactionId} 未成功完成,无法重压缩`
10812
+ };
10813
+ const shadowedSeqs = (summary.shadowedSeqs ?? []).map(Number);
10814
+ if (shadowedSeqs.length === 0) return {
10815
+ ok: false,
10816
+ error: `压缩 ${request.compactionId} 缺少 shadowedSeqs,无法重放`
10817
+ };
10818
+ const firstEvent = session.snapshotEvents()[shadowedSeqs[0] ?? -1];
10819
+ const phase = lifecycle.phase ?? (historyTextOf(firstEvent) === void 0 ? "observe" : "reflect");
10820
+ const view = rebuildView(session, phase, shadowedSeqs, config.compressSkipReasoning);
10821
+ if (typeof view === "string") return {
10822
+ ok: false,
10823
+ error: view
10824
+ };
10825
+ if (view.minIndex === void 0 || view.maxIndex === void 0) return {
10826
+ ok: false,
10827
+ error: `压缩 ${request.compactionId} 的原内容无可定位条目`
10828
+ };
10829
+ if (signal?.aborted === true) return {
10830
+ ok: false,
10831
+ error: COMPACTION_ABORTED_ERROR
10832
+ };
10833
+ if (running.has(session.id)) return {
10834
+ ok: false,
10835
+ error: "该会话已有重压缩进行中"
10836
+ };
10837
+ const target = {
10838
+ provider: request.provider,
10839
+ model: request.model
10840
+ };
10841
+ const logger = makeLogger(ctx, config.debug);
10842
+ running.add(session.id);
10843
+ try {
10844
+ logger.step(`重压缩:${request.compactionId}(${phase})→ ${target.provider}/${target.model}${request.reasoningEffort === void 0 ? "" : ` · ${request.reasoningEffort}`}`);
10845
+ const originalChars = summary.shadowedCharCount ?? (phase === "observe" ? seqsCharCount(session, shadowedSeqs) : viewCharCount(view));
10846
+ const outcome = await runCompressionLoop(ctx, session, {
10847
+ view,
10848
+ originalChars,
10849
+ phase,
10850
+ taskText: buildCompressionTaskText(phase, view.minIndex, view.maxIndex),
10851
+ target,
10852
+ maxTokens: config.compressMaxTokens,
10853
+ rateLimitWaitMs: config.rateLimitWaitMs,
10854
+ skipReasoning: config.compressSkipReasoning,
10855
+ debug: config.debug,
10856
+ retryTarget: target,
10857
+ ...request.reasoningEffort === void 0 ? {} : { reasoningEffort: request.reasoningEffort },
10858
+ ...signal === void 0 ? {} : { signal }
10859
+ });
10860
+ if (!outcome.ok) return {
10861
+ ok: false,
10862
+ error: outcome.error,
10863
+ ...outcome.recordSessionId === void 0 ? {} : { recordSessionId: outcome.recordSessionId }
10864
+ };
10865
+ return {
10866
+ ok: true,
10867
+ text: outcome.text,
10868
+ phase,
10869
+ rounds: outcome.rounds,
10870
+ originalChars,
10871
+ newChars: outcome.text.length,
10872
+ durationMs: outcome.stats.durationMs,
10873
+ ...outcome.recordSessionId === void 0 ? {} : { recordSessionId: outcome.recordSessionId }
10874
+ };
10875
+ } finally {
10876
+ running.delete(session.id);
10877
+ }
10878
+ }
10879
+ /** 重压缩命令名(压缩卡片按钮经宿主命令通道调用)。 */
10880
+ const RECOMPRESS_COMMAND_NAME = "om-recompress";
10881
+ /** 毫秒耗时的简短文本。 */
10882
+ function secondsText(durationMs) {
10883
+ return `${(durationMs / 1e3).toFixed(1)}s`;
10884
+ }
10885
+ /** 渲染命令结果文本:成功为「模型(等级),原始消息 → 产物,耗时」,失败给出原因。 */
10886
+ function describeResult(request, result) {
10887
+ const label = `${request.provider}/${request.model}(${request.reasoningEffort ?? "默认"})`;
10888
+ if (!result.ok) return `重压缩失败 ${label}:${result.error}`;
10889
+ return `重压缩完成 ${label},${formatCompactCount(result.originalChars)} → ${formatCompactCount(result.newChars)},${secondsText(result.durationMs)}`;
10890
+ }
10891
+ /** 构造 /om-recompress 命令定义;配置按调用时刻读取。 */
10892
+ function buildRecompressCommand(ctx, getConfig) {
10893
+ return {
10894
+ name: RECOMPRESS_COMMAND_NAME,
10895
+ description: "由压缩卡片调用:用另一模型重新压缩一次已完成的压缩",
10896
+ input: { hint: "<compactionId> <provider> <model> [思考等级]" },
10897
+ handler: async ({ agent, rawInput, signal }) => {
10898
+ const parsed = parseRecompressInput(rawInput);
10899
+ if (!parsed.ok) return {
10900
+ kind: "error",
10901
+ text: parsed.error
10902
+ };
10903
+ const result = await recompress(ctx, agent, getConfig(), parsed.request, signal);
10904
+ const text = describeResult(parsed.request, result);
10905
+ return result.ok ? {
10906
+ kind: "success",
10907
+ text
10908
+ } : {
10909
+ kind: "error",
10910
+ text
10911
+ };
10912
+ }
10913
+ };
10914
+ }
10915
+ //#endregion
10668
10916
  //#region src/system-reminder.ts
10669
10917
  /**
10670
- * system-reminder:以 <system-reminder> 用户消息向主会话注入插件提醒,不进系统提示词。
10671
- * - 进度提醒:表层缺少同 kind 消息时补发,或无记录活动累计至少 4 个已结束 step、超过 10 次工具调用时重发。
10672
- * - 完整消息定义提醒:OM 或 recall 启用时说明 `<history>` 块与 recall 共用的完整消息 index。
10673
- * 每个 step 检查表层;真实用户消息、非空模型 text 与进度提醒重置活动窗口,定义提醒缺失或文本过期时补发。
10674
- * 导出 PROGRESS_REMINDER_SOURCE_KIND / DEFINITION_REMINDER_SOURCE_KIND / 对应 source 类型 /
10675
- * SystemReminder / PROGRESS_REMINDER / DEFINITION_REMINDER / systemReminderMessage /
10676
- * activeSystemReminders / ensureSystemReminders。
10918
+ * system-reminder:以 <system-reminder> 用户消息向主会话注入进度提醒,不进系统提示词。
10919
+ * 进度提醒:表层缺少同 kind 消息时补发,或无记录活动累计至少 4 个已结束 step、超过 10 次工具调用时重发。
10920
+ * 每个 step 检查表层;真实用户消息、非空模型 text 与进度提醒重置活动窗口。
10921
+ * 导出 PROGRESS_REMINDER_SOURCE_KIND / ProgressReminderSource / SystemReminder /
10922
+ * PROGRESS_REMINDER / systemReminderMessage / activeSystemReminders / ensureSystemReminders。
10677
10923
  */
10678
10924
  /** 进度提醒的 producer-owned source kind(区别于压缩日志消息的 plugin:dsh-plugin-om)。 */
10679
10925
  const PROGRESS_REMINDER_SOURCE_KIND = "plugin:dsh-plugin-om:progress";
10680
- /** 完整消息定义提醒的 producer-owned source kind。 */
10681
- const DEFINITION_REMINDER_SOURCE_KIND = "plugin:dsh-plugin-om:definition";
10682
10926
  /** 用 system-reminder 标签包裹提醒正文。 */
10683
10927
  function wrap(lines) {
10684
10928
  return [
@@ -10691,18 +10935,13 @@ function wrap(lines) {
10691
10935
  const PROGRESS_REMINDER = {
10692
10936
  kind: PROGRESS_REMINDER_SOURCE_KIND,
10693
10937
  text: wrap([
10694
- "在工作过程中持续输出文本,记录最近几步的成果:",
10938
+ "在本会话中,你应当持续输出文本,记录最近几步的成果:",
10695
10939
  "- 1-2句话即可,概括为主,不必覆盖所有细节",
10696
10940
  "- 承上启下,突出要点,例如“读 f1,发现 L1 关联了 f2-L2,读 f2”,“m1 完成,按计划开始 m2”",
10697
10941
  "- 记录后继续完成任务,不要等待确认",
10698
10942
  "- 记录仅是中间产物,最终输出需要另行构建"
10699
10943
  ])
10700
10944
  };
10701
- /** 完整消息定义提醒。 */
10702
- const DEFINITION_REMINDER = {
10703
- kind: DEFINITION_REMINDER_SOURCE_KIND,
10704
- text: wrap([COMPLETE_MESSAGE_DEFINITION])
10705
- };
10706
10945
  /** 构造一条新的提醒消息。 */
10707
10946
  function systemReminderMessage(reminder) {
10708
10947
  return createUserMessage({
@@ -10716,16 +10955,9 @@ function systemReminderMessage(reminder) {
10716
10955
  }
10717
10956
  });
10718
10957
  }
10719
- /** 按配置与当前表层是否有 history 块返回应注入的提醒,顺序固定:进度在前,定义在后。 */
10720
- function activeSystemReminders(config, hasHistory) {
10721
- const reminders = [];
10722
- if (config.omEnabled) reminders.push(PROGRESS_REMINDER);
10723
- if (config.recallEnabled || hasHistory) reminders.push(DEFINITION_REMINDER);
10724
- return reminders;
10725
- }
10726
- /** 消息是否为指定提醒的当前文本。 */
10727
- function isCurrent(reminder, source, content) {
10728
- return source.kind === reminder.kind && content.length === 1 && content[0]?.type === "text" && content[0].text === reminder.text;
10958
+ /** 按配置返回应注入的提醒:omEnabled 时为进度提醒。 */
10959
+ function activeSystemReminders(config) {
10960
+ return config.omEnabled ? [PROGRESS_REMINDER] : [];
10729
10961
  }
10730
10962
  /** 进度提醒在表层缺失,或静默窗口达到 4 个已结束 step 且超过 10 次调用时补发。 */
10731
10963
  function progressReminderTrigger(surface, events, messages) {
@@ -10760,7 +10992,7 @@ function progressReminderTrigger(surface, events, messages) {
10760
10992
  }
10761
10993
  /**
10762
10994
  * 按表层与待输入消息补发提醒,追加到末尾且不修改入参。
10763
- * 进度提醒按 kind 去重并检测活动窗口,活动达标时追加立刻记录要求;定义提醒缺失或文本过期时补发。
10995
+ * 进度提醒按 kind 去重并检测活动窗口,活动达标时追加立刻记录要求。
10764
10996
  */
10765
10997
  function ensureSystemReminders(session, messages, reminders) {
10766
10998
  const result = [...messages];
@@ -10770,8 +11002,7 @@ function ensureSystemReminders(session, messages, reminders) {
10770
11002
  const event = events[seq];
10771
11003
  return event === void 0 ? [] : [event];
10772
11004
  });
10773
- const surfaceMessages = surface.flatMap((event) => event.type === "user/message" ? [event.data] : []);
10774
- for (const reminder of reminders) if (reminder.kind === "plugin:dsh-plugin-om:progress") {
11005
+ for (const reminder of reminders) {
10775
11006
  const trigger = progressReminderTrigger(surface, events, result);
10776
11007
  if (trigger === void 0) continue;
10777
11008
  const progress = trigger === "activity" ? {
@@ -10779,7 +11010,7 @@ function ensureSystemReminders(session, messages, reminders) {
10779
11010
  text: reminder.text.replace("\n</system-reminder>", "\n你应当*立刻*输出一条记录\n</system-reminder>")
10780
11011
  } : reminder;
10781
11012
  result.push(systemReminderMessage(progress));
10782
- } else if (![...result, ...surfaceMessages].some((message) => isCurrent(reminder, message.source, message.content))) result.push(systemReminderMessage(reminder));
11013
+ }
10783
11014
  return result;
10784
11015
  }
10785
11016
  //#endregion
@@ -10830,6 +11061,9 @@ function apply(ctx, config) {
10830
11061
  }
10831
11062
  syncTools();
10832
11063
  ctx.on("loader/volatile-update", () => syncTools());
11064
+ ctx.inject(["commands"], (inner) => {
11065
+ inner.effect(() => inner.commands.register(buildRecompressCommand(ctx, () => currentConfig(config))), "dsh-plugin-om: recompress command");
11066
+ });
10833
11067
  ctx.on("agent/pre-step", async ({ agent, signal }, next) => {
10834
11068
  let outcome = { failed: false };
10835
11069
  try {
@@ -10848,8 +11082,7 @@ function apply(ctx, config) {
10848
11082
  return { kind: "reject" };
10849
11083
  }
10850
11084
  const decision = await next();
10851
- const hasHistory = hasHistoryBlock(agent.session);
10852
- const reminders = activeSystemReminders(currentConfig(config), hasHistory);
11085
+ const reminders = activeSystemReminders(currentConfig(config));
10853
11086
  if (decision.kind === "enter" && !signal.aborted && reminders.length > 0 && isMainSession(agent.session)) return {
10854
11087
  ...decision,
10855
11088
  messages: ensureSystemReminders(agent.session, decision.messages, reminders)
@@ -1 +1 @@
1
- {"version":3,"file":"recall.d.ts","sourceRoot":"","sources":["../src/recall.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,YAAY,CAAC;AAGjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;;iBAYzB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,wBAAwB;;;;;;iBAoCjC,CAAC;AAEL,oDAAoD;AACpD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAElE,8DAA8D;AAC9D,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,UAAQ,GAAG,UAAU,CAU1E;AAUD,mBAAmB;AACnB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;IAC1B,oCAAoC;IACpC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,cAAc,CA2E3E"}
1
+ {"version":3,"file":"recall.d.ts","sourceRoot":"","sources":["../src/recall.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAYxB,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,YAAY,CAAC;AAGjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB;;;;iBAYzB,CAAC;AAEL;;;GAGG;AACH,eAAO,MAAM,wBAAwB;;;;;;iBAoCjC,CAAC;AAEL,oDAAoD;AACpD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAElE,8DAA8D;AAC9D,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,UAAQ,GAAG,UAAU,CAU1E;AAQD,mBAAmB;AACnB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;IAC1B,oCAAoC;IACpC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,cAAc,CA2E3E"}