dsh-plugin-om 0.0.44 → 0.0.46

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.
@@ -2,12 +2,27 @@
2
2
  * 压缩视图:把被压缩区间投影为统一的条目序列(ViewEntry)。
3
3
  * 观察视图由完整消息原文构建(buildObserveView),反思视图由已有 <history> 块内条目构建
4
4
  * (buildReflectView);getHistory 查看、compressHistory 区间校验与最终 <history> 块构建
5
- * 共用同一套条目。导出 ViewEntry / CompressionView / BuildViewOptions / buildObserveView /
5
+ * 共用同一套条目。导出 AskUserQuestionView / ViewEntry / CompressionView / BuildViewOptions / buildObserveView /
6
6
  * buildReflectView / renderEntriesXml / entryToElement / appendCdataText / historyInner /
7
7
  * toolCallNameOf / skillNameOf。
8
8
  */
9
9
  import type { Document, Element } from '@xmldom/xmldom';
10
10
  import type { CompleteMessage, Session } from './types.ts';
11
+ /** 合法原始 ask 的逐题数据,选项仅用于观察视图。 */
12
+ export type AskUserQuestionView = {
13
+ /** 按调用参数题序排列的问答。 */
14
+ questions: {
15
+ /** 原始问题文本。 */
16
+ question: string;
17
+ /** 选项文本和说明。 */
18
+ options: {
19
+ label: string;
20
+ description?: string;
21
+ }[];
22
+ /** 已配对的回答,空答记为未回答。 */
23
+ answer: string;
24
+ }[];
25
+ };
11
26
  /**
12
27
  * 视图条目:压缩区间内一条可定位的内容单位。
13
28
  * - user / sys 条目不可压缩(compressHistory 覆盖时报错),构建最终块时原样保留
@@ -28,9 +43,9 @@ export type ViewEntry = {
28
43
  notes?: string[];
29
44
  /** sys 条目的 source.kind。 */
30
45
  sysKind?: string;
31
- /** 观察视图 toolcall 条目的工具名(skill / ask_user_question 判定用;结构化渲染为 tool-name 属性)。 */
46
+ /** skill 条目的工具名(skill 判定用)或普通 toolcall 的工具名。 */
32
47
  toolName?: string;
33
- /** skill 条目的 skill 名(toolName 为 skill 时存在;反思视图取自 name 属性,缺失为空串)。 */
48
+ /** skill 条目的名称(工具参数或手动加载的消息来源提供;反思视图取自 name 属性)。 */
34
49
  skillName?: string;
35
50
  /** toolcall 条目的调用 id(结构化渲染为 callId 属性)。 */
36
51
  callId?: string;
@@ -38,6 +53,8 @@ export type ViewEntry = {
38
53
  toolArgs?: string;
39
54
  /** toolcall 条目的工具返回文本(缺失或为空时不输出 <tool-result> 子元素)。 */
40
55
  toolResult?: string;
56
+ /** 合法原始 ask 的数据;已有 history 条目不设置。 */
57
+ ask?: AskUserQuestionView;
41
58
  /** 所属压缩块 seq(反思视图;块整体展开以此分组)。 */
42
59
  blockSeq?: number;
43
60
  };
@@ -67,8 +84,8 @@ export type BuildViewOptions = {
67
84
  };
68
85
  /**
69
86
  * 观察视图:被压缩区间(表层 seq 集合)内的完整消息投影为条目——
70
- * user → 原文(图片等非文本块为注释)、sys → 空条目、assistant/toolcall → 原文渲染,
71
- * reasoning 作为参考条目置于其所属 assistant 条目之前(每条 assistant 消息输出一次;
87
+ * user → 原文(图片等非文本块为注释)、sys → 空条目(手动加载的 skill 为 skill 条目)、
88
+ * assistant/toolcall → 原文渲染,reasoning 作为参考条目置于其所属 assistant 条目之前(每条 assistant 消息输出一次;
72
89
  * skipReasoning 时省略)。
73
90
  * 要求区间为区间内完整消息的首尾 index。
74
91
  */
@@ -1 +1 @@
1
- {"version":3,"file":"compress-view.d.ts","sourceRoot":"","sources":["../src/compress-view.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAQ,MAAM,gBAAgB,CAAC;AAU9D,OAAO,KAAK,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG3D;;;;;;GAMG;AACH,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY;IACZ,IAAI,EAAE,MAAM,GAAG,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC;IACjD,6CAA6C;IAC7C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,0CAA0C;IAC1C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,kDAAkD;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,2CAA2C;IAC3C,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iCAAiC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,mEAAmE;AACnE,MAAM,MAAM,eAAe,GAAG;IAC5B,uDAAuD;IACvD,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wCAAwC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AA8CF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAaxF;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,eAAe,GAAG,MAAM,GAAG,SAAS,CAmBrF;AAyHD,sDAAsD;AACtD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,+BAA+B;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,GAAE,gBAAqB,GAC7B,eAAe,CAyFjB;AAiBD,0CAA0C;AAC1C,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CASjD;AAoFD;;GAEG;AACH,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+I7C;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,EAC5C,OAAO,GAAE,gBAAqB,GAC7B,eAAe,CAUjB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAwHvE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,MAAM,CAO7D"}
1
+ {"version":3,"file":"compress-view.d.ts","sourceRoot":"","sources":["../src/compress-view.ts"],"names":[],"mappings":"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"}
@@ -39,7 +39,7 @@ export type HistoryNoteSections = {
39
39
  sys?: boolean;
40
40
  /** 块内存在未压缩 skill 条目时追加 <skill_content> 说明。 */
41
41
  skill?: boolean;
42
- /** 块内存在 ask_user_question 条目时追加 <ask-user-question> 说明。 */
42
+ /** 块内存在保留的合法或历史 ask 条目时追加 <ask-user-question> 说明。 */
43
43
  askUserQuestion?: boolean;
44
44
  };
45
45
  /**
@@ -51,8 +51,8 @@ export declare function historyFormatNote(sections?: HistoryNoteSections): strin
51
51
  /** skill 工具名:toolcall 条目的工具名为该值时视为 skill 加载,<history> 块中以 <skill_content> 元素呈现。 */
52
52
  export declare const SKILL_TOOL_NAME = "skill";
53
53
  /**
54
- * ask_user_question 工具名:toolcall 条目的工具名为该值时视为向用户的提问,
55
- * <history> 块中以 <ask-user-question> 元素呈现,压缩时与 skill 一样要求二次确认。
54
+ * 提问工具名:成功且问题与答案完整配对时视为合法 ask,失败调用按普通 toolcall 处理。
55
+ * 合法 ask 直接压缩需二次确认;未直接压缩的原始 ask 重写后以 q/a 形式保留。
56
56
  */
57
57
  export declare const ASK_USER_QUESTION_TOOL_NAME = "ask_user_question";
58
58
  /** 宿主压缩 checkpoint 消息的 source 标记(0.1.7 起为 kind 'compact-checkpoint';旧日志为 plugin 'compact')。 */
@@ -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,sRACqC,CAAC;AAE9E,+BAA+B;AAC/B,MAAM,MAAM,mBAAmB,GAAG;IAChC,yCAAyC;IACzC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,+BAA+B;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,8CAA8C;IAC9C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,2DAA2D;IAC3D,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,GAAE,mBAAwB,GAAG,MAAM,CAc5E;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,sRACqC,CAAC;AAE9E,+BAA+B;AAC/B,MAAM,MAAM,mBAAmB,GAAG;IAChC,yCAAyC;IACzC,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,+BAA+B;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,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,CAc5E;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"}
package/dist/index.d.ts CHANGED
@@ -5,6 +5,6 @@ export declare const name = "dsh-plugin-om";
5
5
  export { Config };
6
6
  /** 插件注入的服务依赖(tools/llm/tokenMeter/sessions),由宿主按序注入。 */
7
7
  export declare const inject: string[];
8
- /** 插件激活入口:解析配置、注册工具、接线 pre-step 自动压缩。 */
8
+ /** 插件激活入口:解析配置、注册工具、接线系统提示与 pre-step 自动压缩。 */
9
9
  export declare function apply(ctx: Context, config?: unknown): void;
10
10
  //# sourceMappingURL=index.d.ts.map
@@ -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,yCAAyC;AACzC,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CA+E1D"}
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;AAMjE,8CAA8C;AAC9C,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,CA4F1D"}