vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 17:50:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(codex): sanitize context-engine assemble warnings (#70809) (thanks @jalehman)

Browse Source 
Co-authored-by: Josh Lehman <josh@martian.engineering>
This commit is contained in:
Peter Steinberger
2026-04-24 05:13:21 +01:00
parent c7ee5d8ecf
commit 1a002b021f
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/codex/src/app-server/run-attempt.context-engine.test.ts
View File

@@ -4,6 +4,7 @@ import path from "node:path";
import type { AgentMessage } from "@mariozechner/pi-agent-core";
import { SessionManager } from "@mariozechner/pi-coding-agent";
import type { EmbeddedRunAttemptParams } from "openclaw/plugin-sdk/agent-harness";
import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import type { ContextEngine } from "../../../../src/context-engine/types.js";
import type { CodexServerNotification } from "./protocol.js";
@@ -365,6 +366,41 @@ describe("runCodexAppServerAttempt context-engine lifecycle", () => {
);
});
it("logs assemble failures as a formatted message instead of the raw error object", async () => {
const sessionFile = path.join(tempDir, "session.jsonl");
const workspaceDir = path.join(tempDir, "workspace");
const rawError = new Error("Authorization: Bearer sk-abcdefghijklmnopqrstuv");
const contextEngine = createContextEngine({
assemble: vi.fn(async () => {
throw rawError;
}),
bootstrap: undefined,
});
const warn = vi.spyOn(embeddedAgentLog, "warn").mockImplementation(() => undefined);
const harness = createStartedThreadHarness();
const params = createParams(sessionFile, workspaceDir);
params.contextEngine = contextEngine;
const run = runCodexAppServerAttempt(params);
await harness.waitForMethod("turn/start");
await harness.completeTurn();
await run;
expect(warn).toHaveBeenCalledWith(
"context engine assemble failed; using Codex baseline prompt",
{
error: expect.any(String),
},
);
const warning = warn.mock.calls.find(
([message]) => message === "context engine assemble failed; using Codex baseline prompt",
);
expect(warning?.[1]).not.toEqual({ error: rawError });
expect(String((warning?.[1] as { error?: unknown } | undefined)?.error)).not.toContain(
"sk-abcdefghijklmnopqrstuv",
);
});
it("falls back to ingestBatch and skips turn maintenance on prompt failure", async () => {
const sessionFile = path.join(tempDir, "session.jsonl");
const workspaceDir = path.join(tempDir, "workspace");

2
extensions/codex/src/app-server/run-attempt.ts
View File

@@ -217,7 +217,7 @@ export async function runCodexAppServerAttempt(
prePromptMessageCount = projection.prePromptMessageCount;
} catch (assembleErr) {
embeddedAgentLog.warn("context engine assemble failed; using Codex baseline prompt", {
error: assembleErr,
error: formatErrorMessage(assembleErr),
});
}
}