dsh-plugin-om 0.0.59 → 0.0.60
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 +34 -19
- package/dist/client/OmConfigCard.d.ts.map +1 -1
- package/dist/client/OmWarningCard.d.ts +1 -2
- package/dist/client/OmWarningCard.d.ts.map +1 -1
- package/dist/client/definition.d.ts +3 -3
- package/dist/client/locales.d.ts +3 -5
- package/dist/client/locales.d.ts.map +1 -1
- package/dist/client/om-config-controller.d.ts +1 -4
- package/dist/client/om-config-controller.d.ts.map +1 -1
- package/dist/client.js +26 -35
- package/dist/client.js.map +1 -1
- package/dist/compress-loop.d.ts +5 -5
- package/dist/compress-loop.d.ts.map +1 -1
- package/dist/compress-tools.d.ts +18 -2
- package/dist/compress-tools.d.ts.map +1 -1
- package/dist/compress-view.d.ts +37 -4
- package/dist/compress-view.d.ts.map +1 -1
- package/dist/compress.d.ts +46 -27
- package/dist/compress.d.ts.map +1 -1
- package/dist/config.d.ts +2 -6
- package/dist/config.d.ts.map +1 -1
- package/dist/constants.d.ts +13 -1
- package/dist/constants.d.ts.map +1 -1
- package/dist/degrade.d.ts.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.mjs +1290 -842
- package/dist/om-event-append.d.ts +5 -0
- package/dist/om-event-append.d.ts.map +1 -0
- package/dist/om-event.d.ts +16 -17
- package/dist/om-event.d.ts.map +1 -1
- package/dist/precompress.d.ts +1 -1
- package/dist/precompress.d.ts.map +1 -1
- package/dist/recall.d.ts +12 -20
- package/dist/recall.d.ts.map +1 -1
- package/dist/recompress.d.ts +1 -1
- package/dist/reflect.d.ts +89 -0
- package/dist/reflect.d.ts.map +1 -0
- package/dist/semantic-recall.d.ts +11 -4
- package/dist/semantic-recall.d.ts.map +1 -1
- package/dist/skill/compaction-eval/scripts/compress.mjs +104 -16
- package/dist/skill/compaction-eval/scripts/view.mjs +317 -104
- package/dist/types.d.ts +13 -12
- package/dist/types.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type OmEventKind, type OmEventPayloadMap } from './om-event.ts';
|
|
2
|
+
import type { Session } from './types.ts';
|
|
3
|
+
/** 追加一条 om 私有事件(ignorable,不进 surface),返回事件 seq。 */
|
|
4
|
+
export declare function appendOmEvent<K extends OmEventKind>(session: Session, kind: K, data: OmEventPayloadMap[K]): number;
|
|
5
|
+
//# sourceMappingURL=om-event-append.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"om-event-append.d.ts","sourceRoot":"","sources":["../src/om-event-append.ts"],"names":[],"mappings":"AAMA,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAC1F,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,CAAC,SAAS,WAAW,EACjD,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,CAAC,EACP,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GACzB,MAAM,CAIR"}
|
package/dist/om-event.d.ts
CHANGED
|
@@ -1,19 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* om
|
|
3
|
-
* 导出
|
|
4
|
-
*
|
|
2
|
+
* om 私有事件的读取通道:插件私有事件以宿主实验性 plugin record 持久化。
|
|
3
|
+
* 导出 OmEventKind / OmEventPayloadMap / OmEvent / OM_RECORD_TYPES /
|
|
4
|
+
* readOmEvent / findOmEvents;写入见 om-event-append.ts。
|
|
5
5
|
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* feedback/record(dsh-command-feedback 声明)是目录内 log-only 审计事件,所有者
|
|
10
|
-
* invariant 声明其无跨事件关系、无运行时不变量、永不进入模型上下文,故选为承载
|
|
11
|
-
* 类型:插件数据以 `om:1:` 前缀 + JSON 信封写入其 text 字段,解码失败按非 om
|
|
12
|
-
* 记录处理(含用户自写的真实反馈记录)。
|
|
6
|
+
* plugin record 是带 ignorable 标记、类型名以 `plugin:` 开头的日志事件:不进
|
|
7
|
+
* surface,宿主读取路径遇到不认识的类型时保留并跳过,会话仍可加载。本文件不引入
|
|
8
|
+
* 宿主运行时模块,客户端 bundle 可直接使用。
|
|
13
9
|
*/
|
|
14
10
|
import type { Session, SessionEvent, TokenUsage } from './types.ts';
|
|
15
|
-
/** om 信封 text 前缀:标识该 feedback/record 记录由本插件写入。 */
|
|
16
|
-
export declare const OM_EVENT_PREFIX = "om:1:";
|
|
17
11
|
/** om 私有事件类别(信封 kind 字段)。 */
|
|
18
12
|
export type OmEventKind =
|
|
19
13
|
/** 功能降级警告(degrade.ts 报告,客户端渲染「功能降级」警告行)。 */
|
|
@@ -24,7 +18,14 @@ export type OmEventKind =
|
|
|
24
18
|
| 'om/observe-invalidate'
|
|
25
19
|
/** 观察预压缩结果(后台压缩任务成功时写入,注入前崩溃可恢复:按 pendingSeq 匹配活跃标记采纳)。 */
|
|
26
20
|
| 'om/observe-summary';
|
|
27
|
-
/**
|
|
21
|
+
/** 各类别对应的 plugin record 类型名(grammar:`plugin:` 后以 `/` 分段)。 */
|
|
22
|
+
export declare const OM_RECORD_TYPES: {
|
|
23
|
+
readonly 'om/warning': "plugin:dsh-plugin-om/warning";
|
|
24
|
+
readonly 'om/observe-pending': "plugin:dsh-plugin-om/observe-pending";
|
|
25
|
+
readonly 'om/observe-invalidate': "plugin:dsh-plugin-om/observe-invalidate";
|
|
26
|
+
readonly 'om/observe-summary': "plugin:dsh-plugin-om/observe-summary";
|
|
27
|
+
};
|
|
28
|
+
/** 各类别记录载荷。 */
|
|
28
29
|
export type OmEventPayloadMap = {
|
|
29
30
|
'om/warning': {
|
|
30
31
|
/** 降级问题标识(会话内去重键,取值见 degrade.ts)。 */
|
|
@@ -72,12 +73,10 @@ export type OmEvent = {
|
|
|
72
73
|
};
|
|
73
74
|
}[OmEventKind];
|
|
74
75
|
/**
|
|
75
|
-
* 解码一条会话事件为 om
|
|
76
|
-
*
|
|
76
|
+
* 解码一条会话事件为 om 私有事件:仅识别带 ignorable 标记且类型名属于本插件的
|
|
77
|
+
* plugin record;类型不符、载荷非对象或字段缺失时返回 undefined。
|
|
77
78
|
*/
|
|
78
79
|
export declare function readOmEvent(event: SessionEvent | undefined | null): OmEvent | undefined;
|
|
79
|
-
/** 追加一条 om 私有事件(借用 feedback/record,log-only,不进 surface),返回事件 seq。 */
|
|
80
|
-
export declare function appendOmEvent<K extends OmEventKind>(session: Session, kind: K, data: OmEventPayloadMap[K]): number;
|
|
81
80
|
/** 读取日志中全部 om 私有事件(按日志顺序)。 */
|
|
82
81
|
export declare function findOmEvents(session: Session): OmEvent[];
|
|
83
82
|
/** 读取日志中指定类别的 om 私有事件(按日志顺序,载荷类型按类别收窄)。 */
|
package/dist/om-event.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"om-event.d.ts","sourceRoot":"","sources":["../src/om-event.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"om-event.d.ts","sourceRoot":"","sources":["../src/om-event.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAEpE,6BAA6B;AAC7B,MAAM,MAAM,WAAW;AACrB,4CAA4C;AAC1C,YAAY;AACd,qCAAqC;GACnC,oBAAoB;AACtB,uCAAuC;GACrC,uBAAuB;AACzB,2DAA2D;GACzD,oBAAoB,CAAC;AAEzB,6DAA6D;AAC7D,eAAO,MAAM,eAAe;;;;;CAKgC,CAAC;AAE7D,eAAe;AACf,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,EAAE;QACZ,qCAAqC;QACrC,OAAO,EAAE,MAAM,CAAC;QAChB,iBAAiB;QACjB,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,oBAAoB,EAAE;QACpB,8BAA8B;QAC9B,mBAAmB,EAAE,MAAM,CAAC;KAC7B,CAAC;IACF,uBAAuB,EAAE;QACvB,sCAAsC;QACtC,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,oBAAoB,EAAE;QACpB,iDAAiD;QACjD,UAAU,EAAE,MAAM,CAAC;QACnB,8BAA8B;QAC9B,MAAM,EAAE,MAAM,CAAC;QACf,0BAA0B;QAC1B,QAAQ,EAAE,MAAM,CAAC;QACjB,uBAAuB;QACvB,KAAK,EAAE,MAAM,CAAC;QACd,0BAA0B;QAC1B,SAAS,EAAE,MAAM,CAAC;QAClB,0BAA0B;QAC1B,WAAW,EAAE,MAAM,CAAC;QACpB,mBAAmB;QACnB,UAAU,EAAE,MAAM,CAAC;QACnB,6BAA6B;QAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,0CAA0C;QAC1C,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,6CAA6C;QAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;CACH,CAAC;AAEF,0CAA0C;AAC1C,MAAM,MAAM,OAAO,GAAG;KACnB,CAAC,IAAI,WAAW,GAAG;QAAE,IAAI,EAAE,CAAC,CAAC;QAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE;CACzE,CAAC,WAAW,CAAC,CAAC;AAUf;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,GAAG,SAAS,CA+DvF;AA6BD,8BAA8B;AAC9B,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;AAC1D,2CAA2C;AAC3C,wBAAgB,YAAY,CAAC,CAAC,SAAS,WAAW,EAChD,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,CAAC,GACN,KAAK,CAAC;IAAE,IAAI,EAAE,CAAC,CAAC;IAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC"}
|
package/dist/precompress.d.ts
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
import type { ReasoningEffortId } from '@deepseek-ai/dsh-llm';
|
|
16
16
|
import { type ObservePrepared } from './compress.ts';
|
|
17
17
|
import { type CompressionSuccess } from './compress-loop.ts';
|
|
18
|
-
import {
|
|
18
|
+
import type { OmEventPayloadMap } from './om-event.ts';
|
|
19
19
|
import type { Context, PluginConfig, Session } from './types.ts';
|
|
20
20
|
import type { RoutedTarget } from './utils.ts';
|
|
21
21
|
/** 任务状态:运行中 / 成功(结果已持久化)/ 失败。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"precompress.d.ts","sourceRoot":"","sources":["../src/precompress.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,KAAK,eAAe,EAA6B,MAAM,eAAe,CAAC;AAChF,OAAO,EAGL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,
|
|
1
|
+
{"version":3,"file":"precompress.d.ts","sourceRoot":"","sources":["../src/precompress.ts"],"names":[],"mappings":"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"}
|
package/dist/recall.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* recall
|
|
3
|
-
* 导出 recallArgsSchema /
|
|
2
|
+
* recall 工具:回看原始会话(含被压缩内容)。
|
|
3
|
+
* 导出 recallArgsSchema / RecallArgs / parseRecallArgs / buildRecallTool。
|
|
4
4
|
* - 区间模式:按完整消息 index 的 start/end/offset 精确返回区间内全部完整消息。
|
|
5
|
-
* -
|
|
5
|
+
* - 检索模式(带 query):语义增强启用时按含义检索,否则按字符串匹配,见 semantic-recall.ts。
|
|
6
6
|
* 输出值为 { text, images }(契约见 recall-output.ts),text 为 XML 条目序列
|
|
7
7
|
* (形态见 recall-xml.ts);recall 自身不设输出上限,超大工具结果由 tool-result-pruner 裁剪。
|
|
8
8
|
*/
|
|
@@ -10,39 +10,31 @@ import { z } from 'zod';
|
|
|
10
10
|
import { type SemanticOptions } from './semantic-recall.ts';
|
|
11
11
|
import type { ToolDefinition } from './types.ts';
|
|
12
12
|
/**
|
|
13
|
-
*
|
|
13
|
+
* recall 参数 schema:带 query 走检索模式(区间可选,用于限定检索范围);
|
|
14
|
+
* 不带 query 时 start 必填,end 与 offset 至少提供一个(同时给出时 end 优先)。
|
|
14
15
|
* 各字段描述经 .describe() 透传到 wire JSON Schema。
|
|
15
16
|
*/
|
|
16
17
|
export declare const recallArgsSchema: z.ZodObject<{
|
|
17
|
-
start: z.ZodNumber;
|
|
18
|
-
end: z.ZodOptional<z.ZodNumber>;
|
|
19
|
-
offset: z.ZodOptional<z.ZodNumber>;
|
|
20
|
-
}, z.core.$strip>;
|
|
21
|
-
/**
|
|
22
|
-
* 语义增强 recall 参数 schema:带 query 走语义模式(区间可选,用于限定检索范围),
|
|
23
|
-
* 不带 query 时与基础 schema 的校验一致。
|
|
24
|
-
*/
|
|
25
|
-
export declare const enhancedRecallArgsSchema: z.ZodObject<{
|
|
26
18
|
query: z.ZodOptional<z.ZodString>;
|
|
27
19
|
top_k: z.ZodOptional<z.ZodNumber>;
|
|
28
20
|
start: z.ZodOptional<z.ZodNumber>;
|
|
29
21
|
end: z.ZodOptional<z.ZodNumber>;
|
|
30
22
|
offset: z.ZodOptional<z.ZodNumber>;
|
|
31
23
|
}, z.core.$strip>;
|
|
32
|
-
/** recall
|
|
33
|
-
export type RecallArgs = z.infer<typeof
|
|
34
|
-
/** 解析并校验 recall
|
|
35
|
-
export declare function parseRecallArgs(raw: unknown
|
|
24
|
+
/** recall 工具调用参数。 */
|
|
25
|
+
export type RecallArgs = z.infer<typeof recallArgsSchema>;
|
|
26
|
+
/** 解析并校验 recall 调用参数:失败时抛出首个校验问题的可读消息。 */
|
|
27
|
+
export declare function parseRecallArgs(raw: unknown): RecallArgs;
|
|
36
28
|
/** recall 构建选项。 */
|
|
37
29
|
export type RecallToolOptions = {
|
|
38
30
|
/** 返回 tool-result-pruner(可选),用于裁剪超大工具结果。 */
|
|
39
31
|
getPruner?: () => unknown;
|
|
40
|
-
/**
|
|
32
|
+
/** 提供时 query 走语义检索(内容为可注入的嵌入依赖,测试传替身),否则走字符串匹配。 */
|
|
41
33
|
semantic?: SemanticOptions;
|
|
42
34
|
};
|
|
43
35
|
/**
|
|
44
|
-
* 构建 recall 工具定义:按 start/end/offset 定位完整消息区间并渲染原始内容(标 index
|
|
45
|
-
*
|
|
36
|
+
* 构建 recall 工具定义:按 start/end/offset 定位完整消息区间并渲染原始内容(标 index),
|
|
37
|
+
* 或按 query 检索(传入 semantic 选项时语义检索,否则字符串匹配)。
|
|
46
38
|
*/
|
|
47
39
|
export declare function buildRecallTool(options?: RecallToolOptions): ToolDefinition;
|
|
48
40
|
//# sourceMappingURL=recall.d.ts.map
|
package/dist/recall.d.ts.map
CHANGED
|
@@ -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;AAYxB,OAAO,
|
|
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,EAAiB,KAAK,eAAe,EAAkB,MAAM,sBAAsB,CAAC;AAC3F,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,YAAY,CAAC;AAGjE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;;;;;;iBAoCzB,CAAC;AAEL,qBAAqB;AACrB,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE1D,0CAA0C;AAC1C,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,UAAU,CAUxD;AAUD,mBAAmB;AACnB,MAAM,MAAM,iBAAiB,GAAG;IAC9B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC;IAC1B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,CAAC;AAEF;;;GAGG;AACH,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,cAAc,CA4E3E"}
|
package/dist/recompress.d.ts
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* RECOMPRESS_COMMAND_NAME。
|
|
6
6
|
*
|
|
7
7
|
* - 视图重放:compaction/summary 载荷的 shadowedSeqs 加 compaction/start 的 phase 足以
|
|
8
|
-
*
|
|
8
|
+
* 重建当时的压缩视图(观察取被遮蔽的原消息,反思取被归档的 <history> 块),二者都只
|
|
9
9
|
* 读日志,与当前表层无关
|
|
10
10
|
* - 不改会话:不写 compaction/* 事件、不替换表层、不动观察待定标记;唯一副作用是压缩
|
|
11
11
|
* 会话记录子会话及其在父会话的 subagent/catalog,标题带「重压缩 provider/model」
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 异步反思:进程内任务注册表、任务主体与归档块选择。
|
|
3
|
+
* 导出 startReflection / peekReflectJob / takeReflectJob / reflectFailedKey /
|
|
4
|
+
* disposeReflection / disposeAllReflections / selectArchiveBlocks / historyBlocksKey
|
|
5
|
+
* 与类型 ReflectJob / ReflectStartOptions。
|
|
6
|
+
*
|
|
7
|
+
* - 同一会话最多一个任务;任务以自有 AbortController 在后台运行压缩循环,不阻塞 pre-step
|
|
8
|
+
* - 任务结果只存内存:提交由完成后的首个 pre-step 在开放 turn 内完成(compress.ts)
|
|
9
|
+
* - 非中止失败记录当时的 history 块集合键;集合不变时不再重试
|
|
10
|
+
* - session/disposed 与插件卸载经 disposeReflection / disposeAllReflections 中止任务
|
|
11
|
+
*/
|
|
12
|
+
import type { ReasoningEffortId } from '@deepseek-ai/dsh-llm';
|
|
13
|
+
import { type CompressionSuccess } from './compress-loop.ts';
|
|
14
|
+
import type { ArchivedSkill, CompressionView } from './compress-view.ts';
|
|
15
|
+
import type { Context, PluginConfig, Session } from './types.ts';
|
|
16
|
+
import type { RoutedTarget } from './utils.ts';
|
|
17
|
+
/** 压缩块:块文本与表层 seq。 */
|
|
18
|
+
export type HistoryBlock = {
|
|
19
|
+
text: string;
|
|
20
|
+
seq: number;
|
|
21
|
+
};
|
|
22
|
+
/** 任务状态:运行中 / 成功(结果待提交)/ 失败。 */
|
|
23
|
+
export type ReflectJobState = 'running' | 'done' | 'failed';
|
|
24
|
+
/** 一个后台反思任务(注册表条目)。 */
|
|
25
|
+
export type ReflectJob = {
|
|
26
|
+
/** 启动时的会话对象(重载后对象不同即过期)。 */
|
|
27
|
+
readonly session: Session;
|
|
28
|
+
/** 触发时全部 history 块的集合键(失败后据此判断是否重试)。 */
|
|
29
|
+
readonly key: string;
|
|
30
|
+
/** 被归档的 history 块(表层顺序)。 */
|
|
31
|
+
readonly archived: readonly HistoryBlock[];
|
|
32
|
+
/** 归档视图。 */
|
|
33
|
+
readonly view: CompressionView;
|
|
34
|
+
/** 从被归档块提取的 skill(同名保留最新)。 */
|
|
35
|
+
readonly skills: readonly ArchivedSkill[];
|
|
36
|
+
/** 被归档块的估算 token(字符/4,影子价格单位)。 */
|
|
37
|
+
readonly estimatedTokens: number;
|
|
38
|
+
/** 被归档块的内文字符数。 */
|
|
39
|
+
readonly shadowedCharCount: number;
|
|
40
|
+
readonly target: RoutedTarget;
|
|
41
|
+
readonly reasoningEffort?: ReasoningEffortId;
|
|
42
|
+
readonly controller: AbortController;
|
|
43
|
+
/** 任务到达终态时 resolve;不 reject。 */
|
|
44
|
+
readonly promise: Promise<void>;
|
|
45
|
+
state: ReflectJobState;
|
|
46
|
+
result?: CompressionSuccess;
|
|
47
|
+
failure?: {
|
|
48
|
+
error: string;
|
|
49
|
+
aborted: boolean;
|
|
50
|
+
diagnosticSessionId?: string;
|
|
51
|
+
};
|
|
52
|
+
};
|
|
53
|
+
/** 启动选项。 */
|
|
54
|
+
export type ReflectStartOptions = {
|
|
55
|
+
ctx: Context;
|
|
56
|
+
session: Session;
|
|
57
|
+
config: Readonly<PluginConfig>;
|
|
58
|
+
target: RoutedTarget;
|
|
59
|
+
reasoningEffort?: ReasoningEffortId;
|
|
60
|
+
key: string;
|
|
61
|
+
archived: readonly HistoryBlock[];
|
|
62
|
+
view: CompressionView;
|
|
63
|
+
skills: readonly ArchivedSkill[];
|
|
64
|
+
estimatedTokens: number;
|
|
65
|
+
shadowedCharCount: number;
|
|
66
|
+
};
|
|
67
|
+
/** history 块集合键:按 seq 拼接。 */
|
|
68
|
+
export declare function historyBlocksKey(blocks: readonly HistoryBlock[]): string;
|
|
69
|
+
/**
|
|
70
|
+
* 选择归档块:从最后一个块往前累加 token,合计不超过 keepBudget 的尾部块保留,
|
|
71
|
+
* 至少保留 1 个;其余全部归档。tokensOf 返回单块 token。
|
|
72
|
+
*/
|
|
73
|
+
export declare function selectArchiveBlocks<T>(blocks: readonly T[], tokensOf: (block: T) => number, keepBudget: number): {
|
|
74
|
+
archived: T[];
|
|
75
|
+
kept: T[];
|
|
76
|
+
};
|
|
77
|
+
/** 查询会话当前任务。 */
|
|
78
|
+
export declare function peekReflectJob(sessionId: string): ReflectJob | undefined;
|
|
79
|
+
/** 取出会话当前任务并从注册表移除(提交或丢弃前调用)。 */
|
|
80
|
+
export declare function takeReflectJob(sessionId: string): ReflectJob | undefined;
|
|
81
|
+
/** 最近一次非中止失败时的 history 块集合键。 */
|
|
82
|
+
export declare function reflectFailedKey(sessionId: string): string | undefined;
|
|
83
|
+
/** 启动后台反思;调用方保证同会话无运行中任务。 */
|
|
84
|
+
export declare function startReflection(options: ReflectStartOptions): ReflectJob;
|
|
85
|
+
/** 中止并移除会话的反思任务,清除失败记录。 */
|
|
86
|
+
export declare function disposeReflection(sessionId: string): void;
|
|
87
|
+
/** 中止并移除全部反思任务(插件卸载)。 */
|
|
88
|
+
export declare function disposeAllReflections(): void;
|
|
89
|
+
//# sourceMappingURL=reflect.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"reflect.d.ts","sourceRoot":"","sources":["../src/reflect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* recall
|
|
3
|
-
*
|
|
2
|
+
* recall 的 query 检索实现:对会话全部完整消息(含被压缩/遮蔽的)检索,返回最匹配的
|
|
3
|
+
* 完整消息与匹配说明。
|
|
4
4
|
* 导出 SemanticOptions / RangeArgs / resolveSemanticRange / tokenize / matchExplanation /
|
|
5
|
-
* SEMANTIC_MODEL_NOT_READY_MESSAGE / semanticSearch。
|
|
6
|
-
*
|
|
5
|
+
* keywordTerms / SEMANTIC_MODEL_NOT_READY_MESSAGE / semanticSearch / keywordSearch。
|
|
6
|
+
* - 语义检索:本地 ONNX 嵌入(cosine 相似度)
|
|
7
|
+
* - 字符串匹配(语义增强关闭时):query 按空白拆词,不区分大小写计命中词数,同分时
|
|
8
|
+
* index 大的优先,零命中不返回
|
|
9
|
+
* 只匹配文本,纯图片消息不进候选池;
|
|
7
10
|
* 区间缺省检索全部、区间不合法回退全量并在输出中告知;输出契约同 recall
|
|
8
11
|
* ({ text, images },条目为 XML 形态见 recall-xml.ts,超大结果由 tool-result-pruner
|
|
9
12
|
* 裁剪);候选池排除本次调用自身的 toolcall 完整消息(其渲染文本含 query 原文,
|
|
@@ -55,4 +58,8 @@ export type SemanticSearchInput = RangeArgs & {
|
|
|
55
58
|
};
|
|
56
59
|
/** 在会话完整消息中做语义检索,返回 TOP-K 命中条目。 */
|
|
57
60
|
export declare function semanticSearch(input: SemanticSearchInput): Promise<RecallOutputValue>;
|
|
61
|
+
/** 字符串匹配的检索词:query 按空白拆分、转小写、去重。 */
|
|
62
|
+
export declare function keywordTerms(query: string): string[];
|
|
63
|
+
/** 在会话完整消息中按字符串匹配检索(语义增强关闭时),返回 TOP-K 命中条目。 */
|
|
64
|
+
export declare function keywordSearch(input: SemanticSearchInput): RecallOutputValue;
|
|
58
65
|
//# sourceMappingURL=semantic-recall.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"semantic-recall.d.ts","sourceRoot":"","sources":["../src/semantic-recall.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"semantic-recall.d.ts","sourceRoot":"","sources":["../src/semantic-recall.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAoB,KAAK,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE/F,OAAO,EAAsB,KAAK,iBAAiB,EAAY,MAAM,oBAAoB,CAAC;AAE1F,OAAO,KAAK,EAAmB,OAAO,EAAE,MAAM,YAAY,CAAC;AAE3D,iCAAiC;AACjC,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACxD,CAAC;AAEF,0BAA0B;AAC1B,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,6DAA6D;AAC7D,MAAM,MAAM,WAAW,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAAC;AAExE;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,WAAW,CAqBhF;AAED,uCAAuC;AACvC,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAMlD;AAED,+CAA+C;AAC/C,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAUnF;AAED,qCAAqC;AACrC,eAAO,MAAM,gCAAgC,6HAAyB,CAAC;AAEvE,sCAAsC;AACtC,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG;IAC5C,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,OAAO,CAAC;IACzB,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC;CACvC,CAAC;AA+BF,mCAAmC;AACnC,wBAAsB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAsB3F;AAED,oCAAoC;AACpC,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CASpD;AAED,+CAA+C;AAC/C,wBAAgB,aAAa,CAAC,KAAK,EAAE,mBAAmB,GAAG,iBAAiB,CAsB3E"}
|
|
@@ -6706,6 +6706,10 @@ function omSource(compactionId) {
|
|
|
6706
6706
|
const HISTORY_TAG = "history";
|
|
6707
6707
|
/** 压缩日志块开标签的 tip 属性(对 AI 的提醒:本块是历史压缩产物,不要复述)。 */
|
|
6708
6708
|
const HISTORY_TIP = "当前块是历史消息的压缩产物,不要复述";
|
|
6709
|
+
/** 归档块标签名:反思把较早的 <history> 块深度压缩为 <archived-history>。 */
|
|
6710
|
+
const ARCHIVED_HISTORY_TAG = "archived-history";
|
|
6711
|
+
/** 归档块开标签的 tip 属性。 */
|
|
6712
|
+
const ARCHIVED_HISTORY_TIP = "此块已被深度压缩,如需原文细节请用 recall 查看";
|
|
6709
6713
|
/**
|
|
6710
6714
|
* 「完整消息」定义(压缩提示词、recall 工具描述与 <history> 块顶注释共用)。
|
|
6711
6715
|
* 完整消息是摘要日志与 recall 共用的定位单位;首条 index 为 0,按会话顺序递增、全局稳定。
|
|
@@ -6727,6 +6731,7 @@ function historyFormatNote(sections = {}) {
|
|
|
6727
6731
|
if (sections.user) parts.push("<user_message index=\"N\"> 表示用户消息原文");
|
|
6728
6732
|
if (sections.skill) parts.push("<skill_content name=\"S\" index=\"N\"> 表示未压缩的原始 skill");
|
|
6729
6733
|
if (sections.askUserQuestion) parts.push("<ask-user-question index=\"N\"> 表示向用户提问,CDATA 内为逐题成对的 q:(提问)与 a:(用户回答)行,未作答的题记为 a:(未回答)");
|
|
6734
|
+
if (sections.keyWord) parts.push("<assistant start=\"A\" end=\"B\" key-word=\"K\"> 的正文是该区间的一句话摘要,K 为供 recall 检索原文的关键词");
|
|
6730
6735
|
return `<!-- ${parts.join(";")} -->`;
|
|
6731
6736
|
}
|
|
6732
6737
|
/**
|
|
@@ -14347,6 +14352,7 @@ function entryToElement(doc, entry) {
|
|
|
14347
14352
|
el.setAttribute("start", String(entry.lo));
|
|
14348
14353
|
el.setAttribute("end", String(entry.hi));
|
|
14349
14354
|
}
|
|
14355
|
+
if (entry.keyWord !== void 0) el.setAttribute("key-word", entry.keyWord);
|
|
14350
14356
|
appendCdataText(doc, el, entry.text);
|
|
14351
14357
|
return el;
|
|
14352
14358
|
}
|
|
@@ -14571,6 +14577,11 @@ var CompressionState = class CompressionState {
|
|
|
14571
14577
|
text: `${CompressionState.spanLabel(lo, hi)} 超出要求的压缩区间 [${minIndex}..${maxIndex}]`,
|
|
14572
14578
|
isError: true
|
|
14573
14579
|
};
|
|
14580
|
+
const archive = this.archiveCheck(lo, hi, content, args.keywords);
|
|
14581
|
+
if (typeof archive === "string") return {
|
|
14582
|
+
text: archive,
|
|
14583
|
+
isError: true
|
|
14584
|
+
};
|
|
14574
14585
|
let insideCount = 0;
|
|
14575
14586
|
for (const entry of this.view.entries) {
|
|
14576
14587
|
if (entry.lo === void 0 || entry.hi === void 0) continue;
|
|
@@ -14626,13 +14637,32 @@ var CompressionState = class CompressionState {
|
|
|
14626
14637
|
this.replacements.push({
|
|
14627
14638
|
lo,
|
|
14628
14639
|
hi,
|
|
14629
|
-
content
|
|
14640
|
+
content,
|
|
14641
|
+
...archive === void 0 ? {} : { keywords: archive }
|
|
14630
14642
|
});
|
|
14631
14643
|
return {
|
|
14632
14644
|
text: `已压缩${CompressionState.spanLabel(lo, hi)}(${insideCount} 条 assistant 条目)`,
|
|
14633
14645
|
isError: false
|
|
14634
14646
|
};
|
|
14635
14647
|
}
|
|
14648
|
+
/**
|
|
14649
|
+
* 归档模式校验:区间须恰为一个归档段,content 为不超过 ARCHIVE_SUMMARY_MAX_CHARS 的单行,
|
|
14650
|
+
* keywords 为 1..ARCHIVE_MAX_KEYWORDS 个非空单行词。非归档模式返回 undefined;
|
|
14651
|
+
* 校验失败返回错误文本,通过返回规整后的关键词。
|
|
14652
|
+
*/
|
|
14653
|
+
archiveCheck(lo, hi, content, keywords) {
|
|
14654
|
+
const segments = this.view.segments;
|
|
14655
|
+
if (segments === void 0) return void 0;
|
|
14656
|
+
if (!segments.some((seg) => seg.lo === lo && seg.hi === hi)) return `${CompressionState.spanLabel(lo, hi)} 不是归档段;区间必须恰为一个段:${segments.map((seg) => `[${seg.lo}..${seg.hi}]`).join("、")}`;
|
|
14657
|
+
if (/[\r\n]/.test(content)) return "content 必须是一句话,不能换行";
|
|
14658
|
+
if (content.length > 300) return `content ${content.length} 字符,超过 300 字符上限,请压成一句话`;
|
|
14659
|
+
if (!Array.isArray(keywords) || keywords.length === 0 || keywords.length > 8 || keywords.some((k) => typeof k !== "string" || k.trim() === "" || /[\r\n]/.test(k))) return `keywords 必须是 1..8 个非空单行关键词`;
|
|
14660
|
+
return keywords.map((k) => String(k).trim());
|
|
14661
|
+
}
|
|
14662
|
+
/** 归档模式下尚未被摘要覆盖的段。 */
|
|
14663
|
+
uncoveredSegments() {
|
|
14664
|
+
return (this.view.segments ?? []).filter((seg) => !this.replacements.some((rep) => rep.lo === seg.lo && rep.hi === seg.hi));
|
|
14665
|
+
}
|
|
14636
14666
|
/** 完全包含该条目的替换记录;替换区间两两不相交,至多一条。 */
|
|
14637
14667
|
replacementFor(entry) {
|
|
14638
14668
|
const { lo, hi } = entry;
|
|
@@ -14676,7 +14706,8 @@ var CompressionState = class CompressionState {
|
|
|
14676
14706
|
kind: "assistant",
|
|
14677
14707
|
lo: rep.lo,
|
|
14678
14708
|
hi: rep.hi,
|
|
14679
|
-
text: rep.content
|
|
14709
|
+
text: rep.content,
|
|
14710
|
+
...rep.keywords === void 0 ? {} : { keyWord: rep.keywords.join(", ") }
|
|
14680
14711
|
},
|
|
14681
14712
|
blocks: [],
|
|
14682
14713
|
replacement: rep
|
|
@@ -14769,6 +14800,11 @@ var CompressionState = class CompressionState {
|
|
|
14769
14800
|
text: `尚未处理原始 ask(index ${pending.join("、")}):请直接压缩,或先查看再调用 rewriteAskUserQuestion 重写后保留`,
|
|
14770
14801
|
isError: true
|
|
14771
14802
|
};
|
|
14803
|
+
const uncovered = this.uncoveredSegments();
|
|
14804
|
+
if (uncovered.length > 0) return {
|
|
14805
|
+
text: `尚有归档段未压缩:${uncovered.map((seg) => `[${seg.lo}..${seg.hi}]`).join("、")}。每个段都要用 compressHistory 压成一句话后再完成`,
|
|
14806
|
+
isError: true
|
|
14807
|
+
};
|
|
14772
14808
|
this._completed = true;
|
|
14773
14809
|
return {
|
|
14774
14810
|
text: this.buildFinalBlock(),
|
|
@@ -14798,8 +14834,10 @@ var CompressionState = class CompressionState {
|
|
|
14798
14834
|
const note = historyFormatNote({
|
|
14799
14835
|
user: entries.some((e) => e.kind === "user"),
|
|
14800
14836
|
skill: entries.some((e) => e.kind === "assistant" && e.toolName === "skill"),
|
|
14801
|
-
askUserQuestion: entries.some(isAskEntry)
|
|
14837
|
+
askUserQuestion: entries.some(isAskEntry),
|
|
14838
|
+
keyWord: entries.some((e) => e.keyWord !== void 0)
|
|
14802
14839
|
});
|
|
14840
|
+
if (this.view.segments !== void 0) return `<${ARCHIVED_HISTORY_TAG} tip="${ARCHIVED_HISTORY_TIP}">\n${note}\n${renderEntriesXml(entries)}\n</${ARCHIVED_HISTORY_TAG}>`;
|
|
14803
14841
|
return `<${HISTORY_TAG} tip="${HISTORY_TIP}">\n${note}\n${renderEntriesXml(entries)}\n</${HISTORY_TAG}>`;
|
|
14804
14842
|
}
|
|
14805
14843
|
};
|
|
@@ -14911,6 +14949,48 @@ const COMPRESSION_TOOL_SCHEMAS = [
|
|
|
14911
14949
|
}
|
|
14912
14950
|
}
|
|
14913
14951
|
];
|
|
14952
|
+
/** 归档模式的工具定义:compressHistory 区间限定为一个归档段并要求 keywords。 */
|
|
14953
|
+
const ARCHIVE_TOOL_SCHEMAS = COMPRESSION_TOOL_SCHEMAS.map((schema) => {
|
|
14954
|
+
if (schema.name === "completeCompression") return {
|
|
14955
|
+
...schema,
|
|
14956
|
+
description: "全部归档段都已压缩后调用,成功时立即结束压缩会话。"
|
|
14957
|
+
};
|
|
14958
|
+
if (schema.name !== "compressHistory") return schema;
|
|
14959
|
+
return {
|
|
14960
|
+
name: "compressHistory",
|
|
14961
|
+
description: `把一个归档段(start..end 恰为首条消息列出的某个段)压成一句话摘要。content 不换行、不超过 300 字符,写清结论、决策与涉及的文件;keywords 为供 recall 检索原文的关键词。返回成功即已生效;修改时用同一区间重新提交。`,
|
|
14962
|
+
parameters: {
|
|
14963
|
+
type: "object",
|
|
14964
|
+
properties: {
|
|
14965
|
+
start: {
|
|
14966
|
+
type: "number",
|
|
14967
|
+
description: "归档段起始完整消息 index"
|
|
14968
|
+
},
|
|
14969
|
+
end: {
|
|
14970
|
+
type: "number",
|
|
14971
|
+
description: "归档段结束完整消息 index"
|
|
14972
|
+
},
|
|
14973
|
+
content: {
|
|
14974
|
+
type: "string",
|
|
14975
|
+
description: "一句话摘要(纯文本,不换行,不要包含 CDATA 包裹)。数字、路径、版本号与错误码从原文逐字照抄,不推测补全。"
|
|
14976
|
+
},
|
|
14977
|
+
keywords: {
|
|
14978
|
+
type: "array",
|
|
14979
|
+
minItems: 1,
|
|
14980
|
+
maxItems: 8,
|
|
14981
|
+
items: { type: "string" },
|
|
14982
|
+
description: "1.." + String(8) + " 个关键词:文件名、函数名、命令、主题词等原文中出现的词"
|
|
14983
|
+
}
|
|
14984
|
+
},
|
|
14985
|
+
required: [
|
|
14986
|
+
"start",
|
|
14987
|
+
"end",
|
|
14988
|
+
"content",
|
|
14989
|
+
"keywords"
|
|
14990
|
+
]
|
|
14991
|
+
}
|
|
14992
|
+
};
|
|
14993
|
+
});
|
|
14914
14994
|
//#endregion
|
|
14915
14995
|
//#region src/rate-limit.ts
|
|
14916
14996
|
/**
|
|
@@ -14974,8 +15054,8 @@ async function gateRateLimit(waitMs, signal) {
|
|
|
14974
15054
|
* REFLECT_COMPRESSION_PROMPT / ASK_COMPRESSION_PROMPT / CompressionLoopOptions / CompressionOutcome / CompressionStats / COMPRESSION_NUDGE_TEXT / TRUNCATION_NUDGE_TEXT / COMPLETION_BLOCKED_TEXT。
|
|
14975
15055
|
*
|
|
14976
15056
|
* - 首条 user 消息为压缩指令与 start/end 区间(buildCompressionTaskText),循环附上
|
|
14977
|
-
* 全区间 getHistory 结果,原始提问随之视为已查看;共享压缩提示词作为 system
|
|
14978
|
-
*
|
|
15057
|
+
* 全区间 getHistory 结果,原始提问随之视为已查看;共享压缩提示词作为 system,归档
|
|
15058
|
+
* 视图追加归档深度压缩约束并改用归档工具定义
|
|
14979
15059
|
* - 每轮请求携带压缩工具 schemas(purpose='compaction',maxTokens 沿用配置);流经
|
|
14980
15060
|
* BlockAssembler 组装为 assistant 消息,工具执行结果以 tool-result 消息回填
|
|
14981
15061
|
* - completeCompression 校验通过后立即停止(同轮后续工具调用不再执行),最终 <history>
|
|
@@ -15029,12 +15109,22 @@ function buildCompressionPrompt(skipReasoning) {
|
|
|
15029
15109
|
/**
|
|
15030
15110
|
* 构建压缩会话首条 user 消息的指令部分(压缩指令 + start/end 区间);区间条目由循环附加。
|
|
15031
15111
|
*/
|
|
15032
|
-
function buildCompressionTaskText(phase, start, end) {
|
|
15033
|
-
if (phase === "reflect")
|
|
15112
|
+
function buildCompressionTaskText(phase, start, end, segments = []) {
|
|
15113
|
+
if (phase === "reflect") {
|
|
15114
|
+
const list = segments.map((seg) => `[${seg.lo}..${seg.hi}]`).join("、");
|
|
15115
|
+
return `归档深度压缩 <history> 块,完整消息区间 [${start}..${end}]:区间条目附在下方。归档段共 ${segments.length} 个:${list}。每个段用一次 compressHistory 压成一句话并给出 keywords,全部完成后调用 completeCompression。`;
|
|
15116
|
+
}
|
|
15034
15117
|
return `压缩完整消息区间 [${start}..${end}]:区间条目附在下方,用 compressHistory 压缩 assistant 条目,完成后调用 completeCompression。`;
|
|
15035
15118
|
}
|
|
15036
|
-
/**
|
|
15037
|
-
const REFLECT_COMPRESSION_PROMPT = [
|
|
15119
|
+
/** 归档深度压缩的额外约束,只在归档视图注入。 */
|
|
15120
|
+
const REFLECT_COMPRESSION_PROMPT = [
|
|
15121
|
+
"【归档深度压缩】",
|
|
15122
|
+
"- 本次产物是归档块,原文可由主模型通过 recall 按 index 找回;此规则优先于上方的粒度要求。",
|
|
15123
|
+
"- 用户消息与已处理的提问原样保留,无需处理。",
|
|
15124
|
+
"- 相邻两条用户消息之间的全部 assistant 条目构成一个归档段,每段压成一句话:写清结论、决策与涉及的文件,不写过程。",
|
|
15125
|
+
"- 一句话不超过 300 字符、不换行;已被段内后续进展取代的信息直接舍弃。",
|
|
15126
|
+
"- keywords 选原文中出现、便于检索的词:文件名、函数名、命令、错误码、主题词。"
|
|
15127
|
+
].join("\n");
|
|
15038
15128
|
/** 原始合法 ask 的处理约束,只在视图含待处理原始提问时注入。 */
|
|
15039
15129
|
const ASK_COMPRESSION_PROMPT = [
|
|
15040
15130
|
"【原始提问处理】",
|
|
@@ -15159,10 +15249,11 @@ async function runCompressionLoop(ctx, session, options) {
|
|
|
15159
15249
|
const logger = makeLogger(ctx, options.debug);
|
|
15160
15250
|
const view = withoutReasoning(options.view, options.skipReasoning);
|
|
15161
15251
|
const state = new CompressionState(view);
|
|
15162
|
-
const
|
|
15252
|
+
const baseTools = view.segments === void 0 ? COMPRESSION_TOOL_SCHEMAS : ARCHIVE_TOOL_SCHEMAS;
|
|
15253
|
+
const tools = state.hasPendingAsks ? [...baseTools, REWRITE_ASK_TOOL_SCHEMA] : baseTools;
|
|
15163
15254
|
const system = [
|
|
15164
15255
|
buildCompressionPrompt(options.skipReasoning),
|
|
15165
|
-
...
|
|
15256
|
+
...view.segments === void 0 ? [] : [REFLECT_COMPRESSION_PROMPT],
|
|
15166
15257
|
...state.hasPendingAsks ? [ASK_COMPRESSION_PROMPT] : []
|
|
15167
15258
|
].join("\n\n");
|
|
15168
15259
|
const messages = [makePluginUserMessage(withInitialHistory(options.taskText, state))];
|
|
@@ -15391,7 +15482,7 @@ function sharedModelDir() {
|
|
|
15391
15482
|
/** 默认配置(冻结对象,resolveConfig 合并的基底;debug 缺省值在解析时按 NODE_ENV 判定)。 */
|
|
15392
15483
|
const DEFAULT_CONFIG = Object.freeze({
|
|
15393
15484
|
observeThresholdTokens: 35e3,
|
|
15394
|
-
reflectThresholdTokens:
|
|
15485
|
+
reflectThresholdTokens: 8e4,
|
|
15395
15486
|
compressMaxTokens: void 0,
|
|
15396
15487
|
rateLimitWaitMs: 6e4,
|
|
15397
15488
|
recompressConcurrency: 2,
|
|
@@ -15403,7 +15494,6 @@ const DEFAULT_CONFIG = Object.freeze({
|
|
|
15403
15494
|
progressReminderIdleSteps: 4,
|
|
15404
15495
|
progressReminderIdleToolCalls: 10,
|
|
15405
15496
|
debug: false,
|
|
15406
|
-
recallEnabled: true,
|
|
15407
15497
|
semanticRecallEnabled: true,
|
|
15408
15498
|
modelDir: sharedModelDir(),
|
|
15409
15499
|
compressProvider: void 0,
|
|
@@ -15424,7 +15514,6 @@ Schema.object({
|
|
|
15424
15514
|
progressReminderIdleSteps: Schema.number().step(1).min(1).default(DEFAULT_CONFIG.progressReminderIdleSteps).volatile(),
|
|
15425
15515
|
progressReminderIdleToolCalls: Schema.number().step(1).min(0).default(DEFAULT_CONFIG.progressReminderIdleToolCalls).volatile(),
|
|
15426
15516
|
debug: Schema.boolean().default(process.env.NODE_ENV !== "production").volatile(),
|
|
15427
|
-
recallEnabled: Schema.boolean().default(DEFAULT_CONFIG.recallEnabled).volatile(),
|
|
15428
15517
|
semanticRecallEnabled: Schema.boolean().default(DEFAULT_CONFIG.semanticRecallEnabled).volatile(),
|
|
15429
15518
|
modelDir: Schema.string().default(DEFAULT_CONFIG.modelDir).volatile(),
|
|
15430
15519
|
compressProvider: Schema.string().volatile(),
|
|
@@ -15490,8 +15579,7 @@ function resolveConfig(raw) {
|
|
|
15490
15579
|
config.progressReminderEnabled = resolveBoolean(input.progressReminderEnabled, true);
|
|
15491
15580
|
config.progressReminderIdleEnabled = resolveBoolean(input.progressReminderIdleEnabled, DEFAULT_CONFIG.progressReminderIdleEnabled);
|
|
15492
15581
|
config.debug = resolveBoolean(input.debug, process.env.NODE_ENV !== "production");
|
|
15493
|
-
config.
|
|
15494
|
-
config.semanticRecallEnabled = config.recallEnabled && resolveBoolean(input.semanticRecallEnabled, true);
|
|
15582
|
+
config.semanticRecallEnabled = resolveBoolean(input.semanticRecallEnabled, true);
|
|
15495
15583
|
const modelDir = input.modelDir;
|
|
15496
15584
|
if (typeof modelDir === "string" && modelDir.trim() !== "") config.modelDir = modelDir;
|
|
15497
15585
|
config.compressProvider = resolveOptionalString(input.compressProvider);
|