ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-12 21:53:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(compaction): drop context-engine fallback on codex ownership skip (#114155) (#115666)

Browse Source 
Co-authored-by: HOYALIM <HOYALIM@users.noreply.github.com>
This commit is contained in:
Peter Steinberger
2026-07-29 07:11:21 -04:00
committed by GitHub
parent 8bcbc3178b
commit bc3a4c6757
2 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/command/cli-compaction.test.ts
+8 -17
View File
@@ -882,7 +882,7 @@ describe("runCliTurnCompactionLifecycle", () => {
expect(recordCliCompactionInStore).not.toHaveBeenCalled();
});
it("falls back to context-engine compaction when Codex owns automatic compaction", async () => {
it("skips context-engine fallback when Codex owns automatic compaction", async () => {
const sessionKey = "agent:main:codex-native-auto-compaction";
const sessionId = "session-codex-native-auto-compaction";
const sessionFile = path.join(tmpDir, "session-codex-native-auto-compaction.jsonl");
@@ -954,20 +954,12 @@ describe("runCliTurnCompactionLifecycle", () => {
model: "gpt-5.5",
});
// Codex owns automatic compaction; the ownership skip must not fall back to
// context-engine compaction (OAuth-only sessions have no direct API key).
expect(compactAgentHarnessSession).toHaveBeenCalledTimes(1);
expect(compactCalls).toHaveLength(1);
expect(compactCalls[0]?.sessionId).toBe(sessionId);
expect(compactCalls[0]?.sessionKey).toBe(sessionKey);
expect(compactCalls[0]?.currentTokenCount).toBe(950);
expect(maintenance).toHaveBeenCalledTimes(1);
expect(recordCliCompactionInStore).toHaveBeenCalledWith(
expect.objectContaining({
provider: "codex",
sessionKey,
tokensAfter: 100,
}),
);
expect(result?.compactionCount).toBe(1);
expect(compactCalls).toHaveLength(0);
expect(recordCliCompactionInStore).not.toHaveBeenCalled();
expect(result).toBe(sessionEntry);
const lockedEntry: SessionEntry = { ...sessionEntry, modelSelectionLocked: true };
sessionStore[sessionKey] = lockedEntry;
@@ -986,9 +978,8 @@ describe("runCliTurnCompactionLifecycle", () => {
});
expect(compactAgentHarnessSession).toHaveBeenCalledTimes(2);
expect(compactCalls).toHaveLength(1);
expect(maintenance).toHaveBeenCalledTimes(1);
expect(recordCliCompactionInStore).toHaveBeenCalledTimes(1);
expect(compactCalls).toHaveLength(0);
expect(recordCliCompactionInStore).not.toHaveBeenCalled();
const lockedNativeCall = compactAgentHarnessSession.mock.calls[1]?.[0];
expect(lockedNativeCall).toMatchObject({
agentHarnessId: "codex",
src/agents/command/cli-compaction.ts
+7 -8
View File
@@ -569,14 +569,13 @@ async function compactNativeHarnessCliTranscript(params: {
return { compacted: false };
}
if (isIntentionalNativeAutoCompactionSkip(result)) {
if (params.sessionEntry.modelSelectionLocked === true) {
return { compacted: false };
}
return {
compacted: false,
fallbackToContextEngine: true,
failureReason: CODEX_APP_SERVER_OWNS_AUTO_COMPACTION_REASON,
};
// Codex owns automatic thread compaction (codex-rs runs it inline during
// turns); falling back to context-engine compaction here fought that
// ownership and failed OAuth-only sessions with "No API key found".
log.info(
`CLI native harness compaction skipped for ${params.provider}/${params.model}: ${CODEX_APP_SERVER_OWNS_AUTO_COMPACTION_REASON}`,
);
return { compacted: false };
}
const recoverableBindingFailure = isRecoverableNativeHarnessBindingFailure(result);
const fallbackToContextEngine =