refactor(agents): remove unused compaction reserve helper · openclaw/openclaw@9e3db6b
vincentkoc
·
2026-06-17
·
via Recent Commits to openclaw:main
| Original file line number | Diff line number | Diff line change |
|---|
@@ -362,8 +362,8 @@ OpenClaw also enforces a safety floor for embedded runs:
|
362 | 362 | |
363 | 363 | Why: leave enough headroom for multi-turn "housekeeping" (like memory writes) before compaction becomes unavoidable. |
364 | 364 | |
365 | | -Implementation: `ensureAgentCompactionReserveTokens()` in `src/agents/agent-settings.ts` |
366 | | -(called from `src/agents/embedded-agent-runner.ts`). |
| 365 | +Implementation: `applyAgentCompactionSettingsFromConfig()` in `src/agents/agent-settings.ts` |
| 366 | +(called from embedded-runner turn and compaction setup paths). |
367 | 367 | |
368 | 368 | --- |
369 | 369 | |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -20,30 +20,6 @@ type AgentSettingsManagerLike = {
|
20 | 20 | setCompactionEnabled?: (enabled: boolean) => void; |
21 | 21 | }; |
22 | 22 | |
23 | | -/** |
24 | | - * Ensures the compaction reserve tokens are at least the specified minimum. |
25 | | - * Note: This function is not context-aware and uses an uncapped floor. |
26 | | - * If called for small-context models without threading `contextTokenBudget`, |
27 | | - * it may re-introduce context overflow issues. |
28 | | - */ |
29 | | -export function ensureAgentCompactionReserveTokens(params: { |
30 | | -settingsManager: AgentSettingsManagerLike; |
31 | | -minReserveTokens?: number; |
32 | | -}): { didOverride: boolean; reserveTokens: number } { |
33 | | -const minReserveTokens = params.minReserveTokens ?? DEFAULT_AGENT_COMPACTION_RESERVE_TOKENS_FLOOR; |
34 | | -const current = params.settingsManager.getCompactionReserveTokens(); |
35 | | - |
36 | | -if (current >= minReserveTokens) { |
37 | | -return { didOverride: false, reserveTokens: current }; |
38 | | -} |
39 | | - |
40 | | -params.settingsManager.applyOverrides({ |
41 | | -compaction: { reserveTokens: minReserveTokens }, |
42 | | -}); |
43 | | - |
44 | | -return { didOverride: true, reserveTokens: minReserveTokens }; |
45 | | -} |
46 | | - |
47 | 23 | /** Resolves the configured reserve-token floor for agent compaction. */ |
48 | 24 | export function resolveCompactionReserveTokensFloor(cfg?: OpenClawConfig): number { |
49 | 25 | const raw = cfg?.agents?.defaults?.compaction?.reserveTokensFloor; |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -528,7 +528,6 @@ export async function loadCompactHooksHarness(): Promise<{
|
528 | 528 | vi.doMock("../agent-settings.js", () => ({ |
529 | 529 | applyAgentAutoCompactionGuard: vi.fn(() => ({ supported: true, disabled: false })), |
530 | 530 | applyAgentCompactionSettingsFromConfig: applyAgentCompactionSettingsFromConfigMock, |
531 | | -ensureAgentCompactionReserveTokens: vi.fn(), |
532 | 531 | isSilentOverflowProneModel: vi.fn(() => false), |
533 | 532 | resolveCompactionReserveTokensFloor: vi.fn(() => 0), |
534 | 533 | })); |
|
| Original file line number | Diff line number | Diff line change |
|---|
@@ -10,10 +10,7 @@ import contextPruningExtension from "../agent-hooks/context-pruning.js";
|
10 | 10 | import { setContextPruningRuntime } from "../agent-hooks/context-pruning/runtime.js"; |
11 | 11 | import { computeEffectiveSettings } from "../agent-hooks/context-pruning/settings.js"; |
12 | 12 | import { makeToolPrunablePredicate } from "../agent-hooks/context-pruning/tools.js"; |
13 | | -import { |
14 | | -ensureAgentCompactionReserveTokens, |
15 | | -resolveEffectiveCompactionMode, |
16 | | -} from "../agent-settings.js"; |
| 13 | +import { resolveEffectiveCompactionMode } from "../agent-settings.js"; |
17 | 14 | import { |
18 | 15 | finalizeToolTerminalPresentation, |
19 | 16 | peekAdjustedParamsForToolCall, |
@@ -209,5 +206,3 @@ export function buildEmbeddedExtensionFactories(params: {
|
209 | 206 | factories.push(buildAgentToolResultMiddlewareFactory(params.sessionManager, params.runId)); |
210 | 207 | return factories; |
211 | 208 | } |
212 | | - |
213 | | -export { ensureAgentCompactionReserveTokens }; |
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。