@octopi-agent/engine 0.90.11 → 0.97.15
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/dist/config-admin/agent-presets.d.ts +70 -0
- package/dist/config-admin/agent-presets.js +243 -0
- package/dist/config-admin/discover.d.ts +30 -0
- package/dist/config-admin/discover.js +48 -0
- package/dist/config-admin/env.d.ts +22 -0
- package/dist/config-admin/env.js +41 -0
- package/dist/config-admin/index.d.ts +20 -0
- package/dist/config-admin/index.js +15 -0
- package/dist/config-admin/model-presets.d.ts +75 -0
- package/dist/config-admin/model-presets.js +249 -0
- package/dist/config-admin/name-guard.d.ts +14 -0
- package/dist/config-admin/name-guard.js +24 -0
- package/dist/config-admin/patch.d.ts +56 -0
- package/dist/config-admin/patch.js +201 -0
- package/dist/config-admin/port.d.ts +68 -0
- package/dist/config-admin/port.js +21 -0
- package/dist/config-admin/redact.d.ts +39 -0
- package/dist/config-admin/redact.js +42 -0
- package/dist/config-schema/agent.d.ts +43 -1
- package/dist/config-schema/context.d.ts +6 -1
- package/dist/config-schema/context.js +8 -0
- package/dist/config-schema/engine.d.ts +106 -4
- package/dist/config-schema/governance.d.ts +43 -1
- package/dist/config-schema/governance.js +157 -0
- package/dist/config-schema/models.d.ts +5 -2
- package/dist/config-schema/models.js +4 -1
- package/dist/config-schema/observability.d.ts +9 -0
- package/dist/config-schema/observability.js +29 -0
- package/dist/config-schema/run.d.ts +3 -0
- package/dist/config-schema/run.js +14 -0
- package/dist/config.d.ts +29 -4
- package/dist/config.js +15 -4
- package/dist/harness/activation/dispatcher.d.ts +8 -2
- package/dist/harness/activation/dispatcher.js +33 -5
- package/dist/harness/activation/inbox.d.ts +87 -0
- package/dist/harness/activation/inbox.js +169 -0
- package/dist/harness/activation/runtime.d.ts +9 -8
- package/dist/harness/activation/runtime.js +100 -8
- package/dist/harness/activation/types.d.ts +19 -0
- package/dist/harness/activation/types.js +2 -0
- package/dist/harness/agent/builder.d.ts +15 -1
- package/dist/harness/agent/builder.js +31 -10
- package/dist/harness/agent/config-bridge.d.ts +5 -0
- package/dist/harness/agent/config-bridge.js +3 -0
- package/dist/harness/agent/config-integrity.d.ts +72 -0
- package/dist/harness/agent/config-integrity.js +146 -0
- package/dist/harness/agent/wire-agent-builder.js +2 -1
- package/dist/harness/collaboration/autonomous-subsystem/think/executor.js +3 -1
- package/dist/harness/collaboration/delegation/child-run.js +21 -5
- package/dist/harness/collaboration/delegation/notifier.js +4 -3
- package/dist/harness/collaboration/delegation/service.js +2 -3
- package/dist/harness/collaboration/delegation/wiring.js +6 -5
- package/dist/harness/collaboration/orchestration/reflector/llm-reflector.d.ts +1 -1
- package/dist/harness/collaboration/orchestration/reflector/llm-reflector.js +1 -1
- package/dist/harness/context/capabilities/compact/engine.d.ts +30 -0
- package/dist/harness/context/capabilities/compact/engine.js +198 -46
- package/dist/harness/context/capabilities/compact/handover.d.ts +78 -0
- package/dist/harness/context/capabilities/compact/handover.js +107 -0
- package/dist/harness/context/capabilities/compact/index.d.ts +3 -1
- package/dist/harness/context/capabilities/compact/index.js +2 -1
- package/dist/harness/context/capabilities/compact/types.d.ts +30 -1
- package/dist/harness/context/capabilities/summary/executor.js +2 -1
- package/dist/harness/context/capabilities/summary/policies.js +8 -5
- package/dist/harness/context/constitution/default-agents.md +11 -10
- package/dist/harness/context/default-context-engine.d.ts +34 -4
- package/dist/harness/context/default-context-engine.js +194 -49
- package/dist/harness/context/hybrid-compressor.js +6 -0
- package/dist/harness/context/llm-summarizer.d.ts +2 -8
- package/dist/harness/context/llm-summarizer.js +69 -91
- package/dist/harness/context/message-selector.js +4 -3
- package/dist/harness/context/summarize.d.ts +2 -0
- package/dist/harness/context/summarize.js +7 -2
- package/dist/harness/context/truncate-compressor.js +7 -0
- package/dist/harness/context/turn-envelope.d.ts +3 -2
- package/dist/harness/context/turn-envelope.js +3 -2
- package/dist/harness/context/types.d.ts +33 -1
- package/dist/harness/extension/execution-environment/dangerous-commands.d.ts +28 -0
- package/dist/harness/extension/execution-environment/dangerous-commands.js +129 -0
- package/dist/harness/extension/execution-environment/effect-policy.d.ts +127 -8
- package/dist/harness/extension/execution-environment/effect-policy.js +244 -19
- package/dist/harness/extension/execution-environment/index.d.ts +4 -2
- package/dist/harness/extension/execution-environment/index.js +2 -1
- package/dist/harness/extension/execution-environment/kill-switch.d.ts +34 -0
- package/dist/harness/extension/execution-environment/kill-switch.js +46 -0
- package/dist/harness/extension/execution-environment/ops-audit.d.ts +200 -0
- package/dist/harness/extension/execution-environment/ops-audit.js +338 -0
- package/dist/harness/extension/execution-environment/privileged-exec.d.ts +158 -0
- package/dist/harness/extension/execution-environment/privileged-exec.js +418 -0
- package/dist/harness/extension/execution-environment/process-info.d.ts +180 -0
- package/dist/harness/extension/execution-environment/process-info.js +466 -0
- package/dist/harness/extension/execution-environment/process-isolation.d.ts +7 -0
- package/dist/harness/extension/execution-environment/process-isolation.js +9 -0
- package/dist/harness/extension/execution-environment/sandbox.d.ts +109 -0
- package/dist/harness/extension/execution-environment/sandbox.js +228 -21
- package/dist/harness/extension/execution-environment/tool-capabilities.d.ts +1 -1
- package/dist/harness/extension/execution-environment/tool-capabilities.js +6 -0
- package/dist/harness/extension/execution-environment/types.d.ts +19 -0
- package/dist/harness/extension/plugin-ecosystem/channel-types.d.ts +5 -0
- package/dist/harness/extension/plugin-ecosystem/tools/allowlisted-run.js +33 -0
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.d.ts +4 -5
- package/dist/harness/extension/plugin-ecosystem/tools/ask-user.js +5 -15
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.d.ts +3 -0
- package/dist/harness/extension/plugin-ecosystem/tools/builtin.js +53 -2
- package/dist/harness/extension/plugin-ecosystem/tools/index.d.ts +2 -0
- package/dist/harness/extension/plugin-ecosystem/tools/index.js +2 -0
- package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.d.ts +43 -0
- package/dist/harness/extension/plugin-ecosystem/tools/privileged-tool.js +350 -0
- package/dist/harness/extension/plugin-ecosystem/tools/process-tools.d.ts +30 -0
- package/dist/harness/extension/plugin-ecosystem/tools/process-tools.js +137 -0
- package/dist/harness/governance/human-in-the-loop/decision-cache.d.ts +54 -4
- package/dist/harness/governance/human-in-the-loop/decision-cache.js +42 -16
- package/dist/harness/governance/security/temp-path.d.ts +9 -0
- package/dist/harness/governance/security/temp-path.js +13 -2
- package/dist/harness/governance/session-acl/seed-roles.js +14 -0
- package/dist/harness/index.d.ts +2 -0
- package/dist/harness/index.js +2 -0
- package/dist/harness/knowledge/fts.js +1 -2
- package/dist/harness/knowledge/index-store.js +59 -9
- package/dist/harness/memory/sqlite/keyword-search.d.ts +1 -0
- package/dist/harness/memory/sqlite/keyword-search.js +4 -3
- package/dist/harness/observability/observer/hub.js +8 -0
- package/dist/harness/observability/observer/run-snapshot.js +1 -0
- package/dist/harness/observability/observer/types.d.ts +4 -0
- package/dist/harness/run/agent/agent.d.ts +7 -0
- package/dist/harness/run/agent/agent.js +23 -1
- package/dist/harness/run/reliability/fallback-provider.d.ts +117 -5
- package/dist/harness/run/reliability/fallback-provider.js +262 -22
- package/dist/harness/run/reliability/harness-events.d.ts +24 -1
- package/dist/harness/run/reliability/model-error-policy.d.ts +32 -0
- package/dist/harness/run/reliability/model-error-policy.js +42 -0
- package/dist/harness/run/reliability/provider-wrapper.js +29 -2
- package/dist/harness/run/reliability/refusal-guard.d.ts +20 -0
- package/dist/harness/run/reliability/refusal-guard.js +102 -0
- package/dist/harness/run/reliability/run-agent.js +231 -33
- package/dist/harness/run/run-guard/default-run-guard.js +1 -1
- package/dist/harness/run/run-scope.d.ts +31 -0
- package/dist/harness/run/runner.d.ts +116 -2
- package/dist/harness/run/runner.js +547 -41
- package/dist/harness/session/attachments/llm-intent.js +2 -1
- package/dist/harness/session/tasks/render.d.ts +4 -1
- package/dist/harness/session/tasks/render.js +10 -7
- package/dist/harness/shared/events/agent-event-map.d.ts +66 -0
- package/dist/harness/shared/events/agent-event-map.js +5 -0
- package/dist/index.d.ts +3 -3
- package/dist/index.js +2 -2
- package/dist/integration/agent-runtime/channel-message-source.js +19 -1
- package/dist/integration/index.d.ts +2 -0
- package/dist/integration/index.js +1 -0
- package/dist/integration/observability/loop-watchdog.d.ts +56 -0
- package/dist/integration/observability/loop-watchdog.js +177 -0
- package/dist/integration/observability/metrics.d.ts +3 -0
- package/dist/integration/observability/metrics.js +18 -7
- package/dist/integration/providers/anthropic.d.ts +23 -0
- package/dist/integration/providers/anthropic.js +97 -12
- package/dist/integration/providers/fetch-timeout.d.ts +42 -0
- package/dist/integration/providers/fetch-timeout.js +51 -0
- package/dist/integration/providers/openai.d.ts +10 -0
- package/dist/integration/providers/openai.js +58 -11
- package/dist/integration/providers/provider-diagnostics.d.ts +80 -0
- package/dist/integration/providers/provider-diagnostics.js +89 -0
- package/dist/integration/providers/timeout-coherence.d.ts +52 -0
- package/dist/integration/providers/timeout-coherence.js +68 -0
- package/dist/integration/providers/wire-dump.d.ts +62 -0
- package/dist/integration/providers/wire-dump.js +111 -2
- package/dist/integration/storage/jsonl.js +4 -1
- package/dist/subsystems/cognition-steward/conceptualize/handler.js +1 -1
- package/dist/subsystems/memory-steward/backfill/handler.js +1 -1
- package/dist/subsystems/wisdom-steward/formation/handler.js +1 -1
- package/package.json +3 -2
|
@@ -53,8 +53,9 @@ export class DefaultContextEngine {
|
|
|
53
53
|
budgetAllocator: config?.budgetAllocator ?? new DefaultBudgetAllocator(),
|
|
54
54
|
tokenEstimator,
|
|
55
55
|
router: config?.router ?? {},
|
|
56
|
-
protectFirstN: config?.protectFirstN ??
|
|
56
|
+
protectFirstN: config?.protectFirstN ?? 5,
|
|
57
57
|
protectLastN: config?.protectLastN ?? 20,
|
|
58
|
+
summaryBudget: config?.summaryBudget ?? {},
|
|
58
59
|
proactiveCompactRatio: config?.proactiveCompactRatio ?? 0.6,
|
|
59
60
|
proactiveCooldownMs: config?.proactiveCooldownMs ?? 30_000,
|
|
60
61
|
historyAging: resolveToolResultAgingOptions(config?.historyAging),
|
|
@@ -65,7 +66,7 @@ export class DefaultContextEngine {
|
|
|
65
66
|
: 3,
|
|
66
67
|
compactEngine: config?.compactEngine ??
|
|
67
68
|
createCompactEngine({
|
|
68
|
-
defaultProtectHead: config?.protectFirstN ??
|
|
69
|
+
defaultProtectHead: config?.protectFirstN ?? 5,
|
|
69
70
|
defaultProtectTail: config?.protectLastN ?? 20,
|
|
70
71
|
estimator: {
|
|
71
72
|
estimateMessages: (m) => tokenEstimator.estimateMessages(m),
|
|
@@ -90,7 +91,7 @@ export class DefaultContextEngine {
|
|
|
90
91
|
* - compact_then_truncate: 先 LLM 摘要,再截断
|
|
91
92
|
*/
|
|
92
93
|
async assemble(params) {
|
|
93
|
-
const { sessionId, agentId, messages, systemPrompt, tools, contextWindow, compactTargetTokens, signal, tokenEstimator, summarize, emit, loadCompactState, } = params;
|
|
94
|
+
const { sessionId, agentId, messages, systemPrompt, tools, contextWindow, maxOutputTokens, compactTargetTokens, signal, tokenEstimator, summarize, emit, loadCompactState, } = params;
|
|
94
95
|
// E4:引擎内部 compact 状态键 = (sessionId, agentId)
|
|
95
96
|
const stateKey = compactStateKey(sessionId, agentId);
|
|
96
97
|
// F1-B2:老化计划基于**完整历史**(append-only)一次算好、随视图复用——
|
|
@@ -102,10 +103,12 @@ export class DefaultContextEngine {
|
|
|
102
103
|
const windowKnown = contextWindow != null && contextWindow > 0;
|
|
103
104
|
const targetKnown = compactTargetTokens != null && compactTargetTokens > 0;
|
|
104
105
|
const estimator = tokenEstimator ?? this.config.tokenEstimator;
|
|
105
|
-
//
|
|
106
|
+
// 进程重启后从持久层恢复压缩状态(仅当内存态完全没有压缩态时)。
|
|
107
|
+
// 「有计数无摘要」(机械降级轮后)也是压缩态:若只看 previousSummary,降级轮之后
|
|
108
|
+
// 每个 turn 都会重跑恢复、用持久化值覆盖内存里的增长门基数/覆盖终点(F8R-08)。
|
|
106
109
|
if (loadCompactState) {
|
|
107
110
|
const existing = this.states.get(stateKey);
|
|
108
|
-
if (!existing?.previousSummary) {
|
|
111
|
+
if (!existing?.previousSummary && existing?.lastProactiveMessageCount == null) {
|
|
109
112
|
const restored = await loadCompactState(sessionId);
|
|
110
113
|
if (restored?.summary || restored?.lastProactiveMessageCount != null) {
|
|
111
114
|
this.states.set(stateKey, {
|
|
@@ -135,6 +138,8 @@ export class DefaultContextEngine {
|
|
|
135
138
|
emit,
|
|
136
139
|
systemPrompt,
|
|
137
140
|
tools,
|
|
141
|
+
contextWindow,
|
|
142
|
+
maxOutputTokens,
|
|
138
143
|
})
|
|
139
144
|
: { messages };
|
|
140
145
|
const view = proactive.messages !== messages
|
|
@@ -159,7 +164,7 @@ export class DefaultContextEngine {
|
|
|
159
164
|
const tokenBudgetForAlloc = budgetCap;
|
|
160
165
|
const budget = this.config.budgetAllocator.allocate({
|
|
161
166
|
tokenBudget: tokenBudgetForAlloc,
|
|
162
|
-
contextWindow
|
|
167
|
+
contextWindow,
|
|
163
168
|
systemPromptTokens: estimator.estimateText(systemPrompt),
|
|
164
169
|
toolTokens: estimator.estimateTools(tools),
|
|
165
170
|
});
|
|
@@ -175,6 +180,8 @@ export class DefaultContextEngine {
|
|
|
175
180
|
emit,
|
|
176
181
|
systemPrompt,
|
|
177
182
|
tools,
|
|
183
|
+
contextWindow,
|
|
184
|
+
maxOutputTokens,
|
|
178
185
|
});
|
|
179
186
|
const workingMessages = proactive.messages;
|
|
180
187
|
const proactiveDroppedSummary = proactive.droppedSummary;
|
|
@@ -212,6 +219,7 @@ export class DefaultContextEngine {
|
|
|
212
219
|
const previousSummary = state?.previousSummary;
|
|
213
220
|
let compressedOverflow;
|
|
214
221
|
let droppedSummary;
|
|
222
|
+
let overflowFresh = false;
|
|
215
223
|
// 计算溢出部分的压缩目标:head + selectedMiddle + tail 已占的 token
|
|
216
224
|
// selection.estimatedTokens = head + selectedMiddle + tail 的 token 数
|
|
217
225
|
// 压缩后 overflow 应使总 token 在预算内
|
|
@@ -249,7 +257,26 @@ export class DefaultContextEngine {
|
|
|
249
257
|
summarize,
|
|
250
258
|
tokenEstimator: estimator,
|
|
251
259
|
llmPrefix: overflowLlmPrefix,
|
|
260
|
+
// F8 统一契约:预算/折叠区间/窗口/事件与 manual、proactive 同源
|
|
261
|
+
summaryBudget: this.config.summaryBudget,
|
|
262
|
+
foldRange: {
|
|
263
|
+
replacedCount: selection.overflow.length,
|
|
264
|
+
total: workingMessages.length,
|
|
265
|
+
preservedTail: selection.tail.length,
|
|
266
|
+
},
|
|
267
|
+
contextWindow: params.contextWindow,
|
|
268
|
+
maxOutputTokens: params.maxOutputTokens,
|
|
269
|
+
emit: emit
|
|
270
|
+
? (e) => emit({
|
|
271
|
+
type: 'context.compact.summarize_fallback',
|
|
272
|
+
sessionId,
|
|
273
|
+
reason: 'overflow',
|
|
274
|
+
fallback: e.reason,
|
|
275
|
+
cached: e.cached,
|
|
276
|
+
})
|
|
277
|
+
: undefined,
|
|
252
278
|
});
|
|
279
|
+
overflowFresh = compressed.fresh === true;
|
|
253
280
|
compressedOverflow = compressed.result;
|
|
254
281
|
droppedSummary = compressed.droppedSummary;
|
|
255
282
|
break;
|
|
@@ -299,10 +326,13 @@ export class DefaultContextEngine {
|
|
|
299
326
|
cached: false,
|
|
300
327
|
});
|
|
301
328
|
const overflowState = this.states.get(stateKey);
|
|
329
|
+
// fresh 门控(评审 F8-F1):机械降级/失败产出不得冒充新摘要推进 previousSummary
|
|
302
330
|
this.states.set(stateKey, {
|
|
303
331
|
...overflowState,
|
|
304
332
|
// 存摘要正文(而非 dropped 描述),供下次迭代更新
|
|
305
|
-
previousSummary:
|
|
333
|
+
previousSummary: overflowFresh
|
|
334
|
+
? this.extractSummaryText(compressedOverflow) ?? overflowState?.previousSummary
|
|
335
|
+
: overflowState?.previousSummary,
|
|
306
336
|
});
|
|
307
337
|
// 8. 构建 LLM 消息(校准基 = 老化后 LLM 视图估算——尺子必须量实际请求,
|
|
308
338
|
// 不能像旧代码存 raw Message 估算,否则 calibrationRatio 系统性漂移)
|
|
@@ -376,7 +406,7 @@ export class DefaultContextEngine {
|
|
|
376
406
|
* 零 LLM 粘滞重建。
|
|
377
407
|
*
|
|
378
408
|
* 有语义摘要时:head + 摘要 + **摘要覆盖点之后的增量** + tail。
|
|
379
|
-
*
|
|
409
|
+
* 增量(`lastProactiveCoverEnd` 之后、已滑出 tail 的消息)不得被旧摘要顶掉——
|
|
380
410
|
* 否则长 tool turn 会丢当前 run 前半段工作记录。
|
|
381
411
|
*
|
|
382
412
|
* @param targetMiddleTokens - 增量段机械压缩预算
|
|
@@ -387,12 +417,7 @@ export class DefaultContextEngine {
|
|
|
387
417
|
return null;
|
|
388
418
|
}
|
|
389
419
|
if (state?.previousSummary) {
|
|
390
|
-
const summaryMsg =
|
|
391
|
-
role: 'user',
|
|
392
|
-
content: wrapContextSummary(state.previousSummary),
|
|
393
|
-
timestamp: Date.now(),
|
|
394
|
-
metadata: { source: 'contextSummary' },
|
|
395
|
-
};
|
|
420
|
+
const summaryMsg = this.contextSummaryMessage(state.previousSummary, state.lastProactiveCoverEnd);
|
|
396
421
|
// 摘要覆盖到 lastProactiveCoverEnd(tailStart);之后的消息是增量,必须保留
|
|
397
422
|
const coverUpTo = state.lastProactiveCoverEnd ?? 0;
|
|
398
423
|
const sinceIdx = Math.max(coverUpTo, headEnd);
|
|
@@ -522,8 +547,9 @@ export class DefaultContextEngine {
|
|
|
522
547
|
if (sticky) {
|
|
523
548
|
const reducedTokens = estimator.estimateMessages(sticky.messages);
|
|
524
549
|
// 只更新视图 token,**不要**改 lastProactiveMessageCount:
|
|
525
|
-
//
|
|
526
|
-
//
|
|
550
|
+
// 该字段是「上次压缩轮(含机械降级)的全量条数」= 增长门基数 + 压缩态粘滞标记,
|
|
551
|
+
// 仅在真实压缩轮结束时推进(不含复用重建)。若复用重建也改成 messages.length,
|
|
552
|
+
// 每轮 +1 会永远凑不满再压缩阈值。
|
|
527
553
|
this.states.set(stateKey, {
|
|
528
554
|
...state,
|
|
529
555
|
lastProactiveTokens: reducedTokens,
|
|
@@ -579,6 +605,27 @@ export class DefaultContextEngine {
|
|
|
579
605
|
tokenEstimator: estimator,
|
|
580
606
|
requireSummary: true,
|
|
581
607
|
llmPrefix,
|
|
608
|
+
// F8 统一契约:预算/折叠区间与手动路径同源
|
|
609
|
+
summaryBudget: this.config.summaryBudget,
|
|
610
|
+
foldRange: {
|
|
611
|
+
// 视图口径(与 manual 的 tailStart - headEnd 一致):被替换的是 headEnd..tailStart
|
|
612
|
+
// 整段;middle 是 semanticHistory 过滤后的条数,含 turn 元数据时会偏小
|
|
613
|
+
replacedCount: tailStart - headEnd,
|
|
614
|
+
total: messages.length,
|
|
615
|
+
preservedTail: tail.length,
|
|
616
|
+
},
|
|
617
|
+
contextWindow: params.contextWindow,
|
|
618
|
+
maxOutputTokens: params.maxOutputTokens,
|
|
619
|
+
// F22:cache-miss 旁路透传可观测事件
|
|
620
|
+
emit: emit
|
|
621
|
+
? (e) => emit({
|
|
622
|
+
type: 'context.compact.summarize_fallback',
|
|
623
|
+
sessionId,
|
|
624
|
+
reason: 'proactive',
|
|
625
|
+
fallback: e.reason,
|
|
626
|
+
cached: e.cached,
|
|
627
|
+
})
|
|
628
|
+
: undefined,
|
|
582
629
|
});
|
|
583
630
|
}
|
|
584
631
|
catch (err) {
|
|
@@ -596,18 +643,25 @@ export class DefaultContextEngine {
|
|
|
596
643
|
const reduced = [...head, ...compressed.result, ...tail];
|
|
597
644
|
const reducedTokens = estimator.estimateMessages(reduced);
|
|
598
645
|
const actualSummary = this.extractSummaryText(compressed.result) ?? state?.previousSummary;
|
|
646
|
+
// fresh(评审 F8-F1)= 本次产出**新的**语义摘要;false 时 actualSummary 只是旧摘要兜底:
|
|
647
|
+
// 机械降级丢掉的中段不得被记成「已覆盖」(否则 rebuildStickyView 增量起点越过后它们永远
|
|
648
|
+
// 回不到视图——静默失忆):previousSummary 与覆盖终点只在 fresh 时推进(宁可胖不丢)。
|
|
649
|
+
const fresh = compressed.fresh === true;
|
|
599
650
|
this.states.set(stateKey, {
|
|
600
651
|
...state,
|
|
601
|
-
previousSummary: actualSummary,
|
|
652
|
+
previousSummary: fresh ? actualSummary : state?.previousSummary,
|
|
602
653
|
lastEstimatedTokens: reducedTokens,
|
|
603
|
-
//
|
|
654
|
+
// 增长门计数随任何**完成的压缩轮**推进(含机械降级)——它是「自上次压缩新增条数」的
|
|
655
|
+
// 基数与压缩态粘滞标记;若只随 fresh 推进,无摘要会话每轮被判全量新增、复用分支
|
|
656
|
+
// 永远进不去(每 turn 重打 LLM)。「有计数无摘要」是生产状态形状(重启恢复快照
|
|
657
|
+
// 即此形状)。覆盖终点语义不同:只随 fresh 推进(被丢的中段由 sticky 增量兜住)。
|
|
604
658
|
lastProactiveMessageCount: messages.length,
|
|
605
|
-
lastProactiveCoverEnd: tailStart,
|
|
659
|
+
...(fresh ? { lastProactiveCoverEnd: tailStart } : {}),
|
|
606
660
|
lastProactiveTokens: reducedTokens,
|
|
607
661
|
lastProactiveFullTokens: currentTokens,
|
|
608
|
-
//
|
|
609
|
-
//
|
|
610
|
-
lastProactiveLlmAt: Date.now(),
|
|
662
|
+
// 只在 LLM 摘要调用真正发起过时推进冷却时间戳(成功/失败均算发起,防打爆);
|
|
663
|
+
// 复用重建与未发起调用的机械降级不得推进此字段
|
|
664
|
+
lastProactiveLlmAt: compressed.summarizeAttempted ? Date.now() : state?.lastProactiveLlmAt,
|
|
611
665
|
});
|
|
612
666
|
emit?.({
|
|
613
667
|
type: 'context.compact.end',
|
|
@@ -749,6 +803,46 @@ export class DefaultContextEngine {
|
|
|
749
803
|
}
|
|
750
804
|
return out;
|
|
751
805
|
}
|
|
806
|
+
/**
|
|
807
|
+
* 摘要消息构造(装配/度量共用)——禁止在别处手抄此形状,防口径漂移
|
|
808
|
+
*/
|
|
809
|
+
contextSummaryMessage(summary, coveredEnd) {
|
|
810
|
+
// 覆盖边界行(评审 F11):按覆盖点动态渲染,不写进 previousSummary——
|
|
811
|
+
// 写进摘要文本会把过期数字烘死、随失败累积、还会被当 Previous summary 回喂模型。
|
|
812
|
+
const coverage = coveredEnd && coveredEnd > 0
|
|
813
|
+
? `\n\n[Coverage] This handoff covers the conversation up to message ${coveredEnd}; later messages appear verbatim and take precedence.`
|
|
814
|
+
: '';
|
|
815
|
+
return {
|
|
816
|
+
role: 'user',
|
|
817
|
+
content: wrapContextSummary(`${summary}${coverage}`),
|
|
818
|
+
timestamp: Date.now(),
|
|
819
|
+
metadata: { source: 'contextSummary' },
|
|
820
|
+
};
|
|
821
|
+
}
|
|
822
|
+
/**
|
|
823
|
+
* 粘性视图布局 = head + 摘要 + tail(压缩后请求视图的唯一实现,装配与度量共用)
|
|
824
|
+
*
|
|
825
|
+
* @param messages - 全量原始消息
|
|
826
|
+
* @param protectFirstN - 头部保护条数
|
|
827
|
+
* @param protectLastN - 尾部保护条数
|
|
828
|
+
* @param summary - 语义摘要正文
|
|
829
|
+
* @returns 视图消息列表;总长 ≤ 头尾保护无需压缩时返回 null
|
|
830
|
+
*/
|
|
831
|
+
stickyViewMessages(messages, protectFirstN, protectLastN, summary, coveredEnd, extra) {
|
|
832
|
+
if (messages.length <= protectFirstN + protectLastN) {
|
|
833
|
+
return null;
|
|
834
|
+
}
|
|
835
|
+
// 边界对齐(不拆 tool_call/tool_result 对):未对齐的 head/tail 会被严格网关 400
|
|
836
|
+
const { headEnd, tailStart } = this.alignViewSplit(messages, protectFirstN, protectLastN);
|
|
837
|
+
return [
|
|
838
|
+
...messages.slice(0, headEnd),
|
|
839
|
+
this.contextSummaryMessage(summary, coveredEnd),
|
|
840
|
+
// 增量位:覆盖点之后、尾部保护区之前的「摘要没覆盖、tailStart 又前移」区间,
|
|
841
|
+
// 不显式保留会静默消失(评审 F12)。压缩时刻为空(coverEnd == tailStart),度量=装配不受影响
|
|
842
|
+
...(extra ?? []),
|
|
843
|
+
...messages.slice(tailStart),
|
|
844
|
+
];
|
|
845
|
+
}
|
|
752
846
|
/**
|
|
753
847
|
* 结构视图:有 previousSummary 时 head + summary + tail;否则原样
|
|
754
848
|
* 用于 contextWindow 未知时的 assemble / 手动压缩后的回放
|
|
@@ -759,22 +853,17 @@ export class DefaultContextEngine {
|
|
|
759
853
|
if (!summary || messages.length === 0) {
|
|
760
854
|
return { messages };
|
|
761
855
|
}
|
|
762
|
-
|
|
763
|
-
|
|
764
|
-
|
|
856
|
+
// 压缩时刻布局的唯一实现 stickyViewMessages(与 structuralCompact 的度量共用:度量=装配)。
|
|
857
|
+
// 本函数服务「压缩后回放」:覆盖点(lastProactiveCoverEnd)到当前尾部保护区之间是**增量**
|
|
858
|
+
// ——摘要没覆盖它们、tailStart 又随新消息前移,不显式保留会静默消失(评审 F12)。
|
|
859
|
+
// rebuildStickyView 是带增量压缩的异步版布局;这里同步保留增量原文(宁可胖,不可丢)。
|
|
860
|
+
const coverUpTo = state.lastProactiveCoverEnd ?? 0;
|
|
861
|
+
const { headEnd, tailStart: viewTailStart } = this.alignViewSplit(messages, this.config.protectFirstN, this.config.protectLastN);
|
|
862
|
+
const increment = this.semanticHistory(messages.slice(Math.max(coverUpTo, headEnd), viewTailStart));
|
|
863
|
+
const viewMsgs = this.stickyViewMessages(messages, this.config.protectFirstN, this.config.protectLastN, summary, state.lastProactiveCoverEnd, increment);
|
|
864
|
+
if (!viewMsgs) {
|
|
765
865
|
return { messages };
|
|
766
866
|
}
|
|
767
|
-
// 边界对齐(不拆 tool_call/tool_result 对):与 applyProactiveCompact 同款——
|
|
768
|
-
// 未对齐的 head/tail 会被严格网关 400
|
|
769
|
-
const { headEnd, tailStart } = this.alignViewSplit(messages, protectFirstN, protectLastN);
|
|
770
|
-
const head = messages.slice(0, headEnd);
|
|
771
|
-
const tail = messages.slice(tailStart);
|
|
772
|
-
const summaryMsg = {
|
|
773
|
-
role: 'user',
|
|
774
|
-
content: wrapContextSummary(summary),
|
|
775
|
-
timestamp: Date.now(),
|
|
776
|
-
metadata: { source: 'contextSummary' },
|
|
777
|
-
};
|
|
778
867
|
emit?.({
|
|
779
868
|
type: 'context.compact.start',
|
|
780
869
|
sessionId,
|
|
@@ -789,7 +878,7 @@ export class DefaultContextEngine {
|
|
|
789
878
|
cached: true,
|
|
790
879
|
});
|
|
791
880
|
return {
|
|
792
|
-
messages:
|
|
881
|
+
messages: viewMsgs,
|
|
793
882
|
droppedSummary: 'Structural compact view (contextWindow unknown)',
|
|
794
883
|
};
|
|
795
884
|
}
|
|
@@ -798,7 +887,16 @@ export class DefaultContextEngine {
|
|
|
798
887
|
* 算法委托 capabilities/compact;本引擎只维护 E4 状态。
|
|
799
888
|
*/
|
|
800
889
|
async structuralCompact(params) {
|
|
801
|
-
const { sessionId, messages, summarize, estimator
|
|
890
|
+
const { sessionId, messages, summarize, estimator } = params;
|
|
891
|
+
// 同形前缀单源:优先调用方现成 llmPrefix;否则引擎内建。
|
|
892
|
+
// system 字节取自会话托管 system 消息(source==='systemPrompt')——它就是上一轮请求的逐字
|
|
893
|
+
// system;重走 assembler 重建会有字节漂移(打穿缓存)。托管缺失时回落调用方 systemPrompt。
|
|
894
|
+
// aging 计划与 assemble 同式(完整历史一次算好,见 assemble 处注释)——禁止手抄视图。
|
|
895
|
+
const managedSystem = messages.find((m) => m.role === 'system' && m.metadata?.source === 'systemPrompt');
|
|
896
|
+
const systemText = (managedSystem ? getTextContent(managedSystem.content) : '') || params.systemPrompt;
|
|
897
|
+
const agingPlan = computeToolResultAgingPlan(messages, this.config.historyAging);
|
|
898
|
+
const llmPrefix = params.llmPrefix ??
|
|
899
|
+
(systemText ? this.buildLlmMessages(messages, systemText, params.tools ?? [], agingPlan) : undefined);
|
|
802
900
|
const stateKey = params.stateKey ?? sessionId;
|
|
803
901
|
const protectFirstN = this.config.protectFirstN;
|
|
804
902
|
const protectLastN = this.config.protectLastN;
|
|
@@ -826,29 +924,69 @@ export class DefaultContextEngine {
|
|
|
826
924
|
previousSummary: state?.previousSummary,
|
|
827
925
|
summarizeFn: summarize,
|
|
828
926
|
estimator,
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
|
|
927
|
+
// 软目标预算(P1c clamp(2%,2k,8k))交 compactCore 公式;可配置 ratio/min/max 经 summaryBudget
|
|
928
|
+
summaryBudget: this.config.summaryBudget,
|
|
929
|
+
taskSnapshot: params.taskSnapshot,
|
|
930
|
+
// 折叠区间(评审 F7):摘要器须覆盖 middle 区间、不总结原样保留的尾部
|
|
931
|
+
foldRange: {
|
|
932
|
+
replacedCount: tailStart - headEnd,
|
|
933
|
+
total: messages.length,
|
|
934
|
+
preservedTail: messages.length - tailStart,
|
|
935
|
+
},
|
|
936
|
+
contextWindow: params.contextWindow,
|
|
937
|
+
maxOutputTokens: params.maxOutputTokens,
|
|
832
938
|
onSummarizeFail: 'truncate',
|
|
833
939
|
llmPrefix,
|
|
940
|
+
// F8R-06:manual 路 cache-miss 旁路同样可观测(no_prefix/window_guard/window_exhausted)
|
|
941
|
+
emit: params.emit
|
|
942
|
+
? (e) => params.emit({
|
|
943
|
+
type: 'context.compact.summarize_fallback',
|
|
944
|
+
sessionId: params.sessionId,
|
|
945
|
+
fallback: e.reason,
|
|
946
|
+
cached: e.cached,
|
|
947
|
+
})
|
|
948
|
+
: undefined,
|
|
834
949
|
});
|
|
835
|
-
//
|
|
836
|
-
//
|
|
837
|
-
|
|
838
|
-
const
|
|
839
|
-
|
|
950
|
+
// fresh(评审 F1)= 本次产出**新的**语义摘要。false 时 outcome.summary 只是旧摘要兜底:
|
|
951
|
+
// 不得推进覆盖点/覆盖计数(否则被丢弃的中段记成「已覆盖」,rebuildStickyView 的增量起点
|
|
952
|
+
// 越过后它们永远回不到视图),也不得给旧摘要再叠 [Coverage](F11:覆盖行随失败累积)。
|
|
953
|
+
const fresh = outcome.fresh === true &&
|
|
954
|
+
Boolean(outcome.summary) &&
|
|
955
|
+
!this.isMechanicalNotice(outcome.summary);
|
|
956
|
+
if (!fresh) {
|
|
957
|
+
// 失败语义(F9/F10):状态不推进(增长门/冷却不被失败重置),报数不虚降(tokensAfter
|
|
958
|
+
// = tokensBefore),compacted=false + reason 显式上报。宁可胖不丢:中段原文仍在视图
|
|
959
|
+
// (覆盖点未动),等下次成功摘要再折叠。
|
|
960
|
+
return {
|
|
961
|
+
summary: state?.previousSummary,
|
|
962
|
+
compacted: false,
|
|
963
|
+
reason: outcome.reason?.startsWith('summarize_failed')
|
|
964
|
+
? outcome.reason
|
|
965
|
+
: `summarize_failed:${outcome.reason ?? 'no_output'}`,
|
|
966
|
+
tokensBefore,
|
|
967
|
+
tokensAfter: tokensBefore,
|
|
968
|
+
coveredMessageCount: state?.lastProactiveCoverEnd,
|
|
969
|
+
};
|
|
970
|
+
}
|
|
971
|
+
const summary = outcome.summary;
|
|
972
|
+
// [Coverage] 覆盖行不写进 previousSummary(F11:会把过期数字烘进摘要文本、随失败累积、
|
|
973
|
+
// 还会被当 Previous summary 回喂)——由 contextSummaryMessage 在装配/度量时按覆盖点动态
|
|
974
|
+
// 渲染;两处同一渲染器,度量=装配严格同形。
|
|
975
|
+
const viewMsgs = this.stickyViewMessages(messages, protectFirstN, protectLastN, summary, tailStart);
|
|
976
|
+
// fresh 路径 middle 非空必有视图;兜底回 tokensBefore(不虚报)
|
|
977
|
+
const tokensAfter = viewMsgs ? estimator.estimateMessages(viewMsgs) : tokensBefore;
|
|
840
978
|
this.states.set(stateKey, {
|
|
841
979
|
...state,
|
|
842
980
|
previousSummary: summary,
|
|
843
981
|
lastProactiveMessageCount: messages.length,
|
|
844
982
|
lastProactiveCoverEnd: tailStart,
|
|
845
983
|
lastProactiveTokens: tokensAfter,
|
|
846
|
-
lastEstimatedTokens
|
|
984
|
+
// 校准基只写「实际请求」口径(见 assemble 处注释):此处不量请求,故不写 lastEstimatedTokens
|
|
847
985
|
lastProactiveLlmAt: summarize ? Date.now() : state?.lastProactiveLlmAt,
|
|
848
986
|
});
|
|
849
987
|
return {
|
|
850
988
|
summary,
|
|
851
|
-
compacted:
|
|
989
|
+
compacted: true,
|
|
852
990
|
tokensBefore,
|
|
853
991
|
tokensAfter,
|
|
854
992
|
coveredMessageCount: tailStart,
|
|
@@ -871,11 +1009,18 @@ export class DefaultContextEngine {
|
|
|
871
1009
|
estimator,
|
|
872
1010
|
compactTargetTokens: input.compactTargetTokens,
|
|
873
1011
|
llmPrefix: input.llmPrefix,
|
|
1012
|
+
systemPrompt: input.systemPrompt,
|
|
1013
|
+
tools: input.tools,
|
|
1014
|
+
taskSnapshot: input.taskSnapshot,
|
|
1015
|
+
contextWindow: input.contextWindow,
|
|
1016
|
+
maxOutputTokens: input.maxOutputTokens,
|
|
1017
|
+
emit: input.emit,
|
|
874
1018
|
});
|
|
875
1019
|
return {
|
|
876
1020
|
ok: true,
|
|
877
1021
|
compacted: result.compacted,
|
|
878
|
-
|
|
1022
|
+
// 失败语义如实透传(评审 F10):summarize_failed:* 不得被 'structural' 盖成成功
|
|
1023
|
+
reason: result.reason ?? 'structural',
|
|
879
1024
|
tokensBefore: result.tokensBefore,
|
|
880
1025
|
tokensAfter: result.tokensAfter,
|
|
881
1026
|
summary: result.summary,
|
|
@@ -43,6 +43,8 @@ export class HybridCompressor {
|
|
|
43
43
|
return {
|
|
44
44
|
result: [],
|
|
45
45
|
estimatedTokens: 0,
|
|
46
|
+
fresh: false,
|
|
47
|
+
summarizeAttempted: false,
|
|
46
48
|
};
|
|
47
49
|
}
|
|
48
50
|
// 计算当前 token 数
|
|
@@ -53,6 +55,8 @@ export class HybridCompressor {
|
|
|
53
55
|
return {
|
|
54
56
|
result: [...messages],
|
|
55
57
|
estimatedTokens: currentTokens,
|
|
58
|
+
fresh: false,
|
|
59
|
+
summarizeAttempted: false,
|
|
56
60
|
};
|
|
57
61
|
}
|
|
58
62
|
// 机械预处理:仅给机械截断/残差用(F-b:不进摘要输入)
|
|
@@ -64,6 +68,8 @@ export class HybridCompressor {
|
|
|
64
68
|
result: preprocessed,
|
|
65
69
|
estimatedTokens: preprocessedTokens,
|
|
66
70
|
droppedSummary: 'Old tool outputs truncated',
|
|
71
|
+
fresh: false,
|
|
72
|
+
summarizeAttempted: false,
|
|
67
73
|
};
|
|
68
74
|
}
|
|
69
75
|
// 第二级:LLM 摘要 —— 输入为原文(F-b)
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* 摘要策略:
|
|
8
8
|
* 1. 将消息格式化为上下文
|
|
9
9
|
* 2. 调用 LLM 生成结构化摘要
|
|
10
|
-
* 3.
|
|
10
|
+
* 3. 摘要预算(P1c/F8):clamp(2%, 2k, 8k) 软目标写指令 + 4× 保险丝硬顶——与 compact 引擎同语义
|
|
11
11
|
*/
|
|
12
12
|
import type { Message } from '@octopi-agent/core/types.js';
|
|
13
13
|
import type { Compressor, CompressParams, CompressResult } from './types.js';
|
|
@@ -18,6 +18,7 @@ import type { Compressor, CompressParams, CompressResult } from './types.js';
|
|
|
18
18
|
* @returns 账本文本(可为空串)
|
|
19
19
|
*/
|
|
20
20
|
export declare function buildToolCallLedger(messages: Message[]): string;
|
|
21
|
+
/** 模板/指令/合并语义已单源化到 capabilities/compact/handover.ts(F8 模板统一:四段式交接书)。 */
|
|
21
22
|
export declare class LLMSummaryCompressor implements Compressor {
|
|
22
23
|
/**
|
|
23
24
|
* 压缩消息
|
|
@@ -28,13 +29,6 @@ export declare class LLMSummaryCompressor implements Compressor {
|
|
|
28
29
|
* 3. 返回摘要作为压缩结果
|
|
29
30
|
*/
|
|
30
31
|
compress(params: CompressParams): Promise<CompressResult>;
|
|
31
|
-
/**
|
|
32
|
-
* 计算摘要 token 预算
|
|
33
|
-
*
|
|
34
|
-
* 公式:contentTokens × 0.20
|
|
35
|
-
* 上下限:2000 - 12000
|
|
36
|
-
*/
|
|
37
|
-
private calculateSummaryBudget;
|
|
38
32
|
/**
|
|
39
33
|
* 格式化消息为 LLM 可读的上下文
|
|
40
34
|
*
|