fix(agents): initialize context engines before CLI compaction

This commit is contained in:
Andy Ye
2026-05-08 11:12:01 -07:00
committed by Peter Steinberger
parent 8fdbac62f9
commit f9ecbef08f
2 changed files with 60 additions and 0 deletions

View File

@@ -174,4 +174,59 @@ describe("runCliTurnCompactionLifecycle", () => {
expect(updatedEntry?.cliSessionIds?.["claude-cli"]).toBeUndefined();
expect(updatedEntry?.claudeCliSessionId).toBeUndefined();
});
it("initializes built-in context engines before resolving CLI compaction engine", async () => {
const sessionKey = "agent:main:cli";
const sessionId = "session-cli-init";
const sessionFile = path.join(tmpDir, "session-init.jsonl");
await writeSessionFile({ sessionFile, sessionId });
const sessionEntry: SessionEntry = {
sessionId,
updatedAt: Date.now(),
sessionFile,
contextTokens: 1_000,
totalTokens: 100,
totalTokensFresh: true,
};
const calls: string[] = [];
setCliCompactionTestDeps({
ensureContextEnginesInitialized: () => {
calls.push("ensure");
},
resolveContextEngine: async () => {
calls.push("resolve");
return buildContextEngine({ compactCalls: [] });
},
createPreparedEmbeddedPiSettingsManager: async () => ({
getCompactionReserveTokens: () => 200,
getCompactionKeepRecentTokens: () => 0,
applyOverrides: () => {},
}),
shouldPreemptivelyCompactBeforePrompt: () => ({
route: "fits",
shouldCompact: false,
estimatedPromptTokens: 100,
promptBudgetBeforeReserve: 800,
overflowTokens: 0,
toolResultReducibleChars: 0,
effectiveReserveTokens: 200,
}),
resolveLiveToolResultMaxChars: () => 20_000,
});
await runCliTurnCompactionLifecycle({
cfg: {} as OpenClawConfig,
sessionId,
sessionKey,
sessionEntry,
sessionAgentId: "main",
workspaceDir: tmpDir,
agentDir: tmpDir,
provider: "claude-cli",
model: "opus",
});
expect(calls).toEqual(["ensure", "resolve"]);
});
});

View File

@@ -3,6 +3,7 @@ import { SessionManager } from "@mariozechner/pi-coding-agent";
import type { SessionEntry } from "../../config/sessions/types.js";
import type { AgentCompactionMode } from "../../config/types.agent-defaults.js";
import type { OpenClawConfig } from "../../config/types.openclaw.js";
import { ensureContextEnginesInitialized as ensureContextEnginesInitializedImpl } from "../../context-engine/init.js";
import { resolveContextEngine as resolveContextEngineImpl } from "../../context-engine/registry.js";
import type { ContextEngine } from "../../context-engine/types.js";
import { createSubsystemLogger } from "../../logging/subsystem.js";
@@ -32,6 +33,7 @@ type SettingsManagerLike = {
};
type CliCompactionDeps = {
openSessionManager: (sessionFile: string) => SessionManagerLike;
ensureContextEnginesInitialized: () => void;
resolveContextEngine: (cfg: OpenClawConfig) => Promise<ContextEngine>;
createPreparedEmbeddedPiSettingsManager: (params: {
cwd: string;
@@ -54,6 +56,7 @@ const log = createSubsystemLogger("agents/cli-compaction");
const cliCompactionDeps: CliCompactionDeps = {
openSessionManager: (sessionFile: string) => SessionManager.open(sessionFile),
ensureContextEnginesInitialized: ensureContextEnginesInitializedImpl,
resolveContextEngine: resolveContextEngineImpl,
createPreparedEmbeddedPiSettingsManager: createPreparedEmbeddedPiSettingsManagerImpl,
applyPiAutoCompactionGuard: applyPiAutoCompactionGuardImpl,
@@ -70,6 +73,7 @@ export function setCliCompactionTestDeps(overrides: Partial<typeof cliCompaction
export function resetCliCompactionTestDeps(): void {
Object.assign(cliCompactionDeps, {
openSessionManager: (sessionFile: string) => SessionManager.open(sessionFile),
ensureContextEnginesInitialized: ensureContextEnginesInitializedImpl,
resolveContextEngine: resolveContextEngineImpl,
createPreparedEmbeddedPiSettingsManager: createPreparedEmbeddedPiSettingsManagerImpl,
applyPiAutoCompactionGuard: applyPiAutoCompactionGuardImpl,
@@ -201,6 +205,7 @@ export async function runCliTurnCompactionLifecycle(params: {
return params.sessionEntry;
}
cliCompactionDeps.ensureContextEnginesInitialized();
const contextEngine = await cliCompactionDeps.resolveContextEngine(params.cfg);
const sessionManager = cliCompactionDeps.openSessionManager(sessionFile);
const settingsManager = await cliCompactionDeps.createPreparedEmbeddedPiSettingsManager({