fix(codex): bound hook-expanded prompts · openclaw/openclaw@3f166b1

Recent Commits to openclaw:main

vincentkoc · 2026-06-21 · via Recent Commits to openclaw:main

File tree

extensions/codex/src/app-server

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,22 @@ describe("projectContextEngineAssemblyForCodex", () => {`
`279`	`279`	`expect(fitted).not.toContain("hook context");`
`280`	`280`	`});`
`281`	`281`
	`282`	`+it("keeps the original input when a hook appends context without a projection", () => {`
	`283`	`+const prompt = "current prompt survives";`
	`284`	+const hookAppend = `\n\nhook context ${"h".repeat(800)}`;
	`285`	`+const maxChars = 420;`
	`286`	`+`
	`287`	`+const fitted = fitCodexProjectedContextForTurnStart({`
	`288`	+promptText: `${prompt}${hookAppend}`,
	`289`	`+preservedRange: { start: 0, end: prompt.length },`
	`290`	`+ maxChars,`
	`291`	`+});`
	`292`	`+`
	`293`	`+expect(fitted.length).toBeLessThanOrEqual(maxChars);`
	`294`	`+expect(fitted).toContain(prompt);`
	`295`	`+expect(fitted).not.toContain("hook context");`
	`296`	`+});`
	`297`	`+`
`282`	`298`	`it("bounds output for a large request under the default Codex turn limit", () => {`
`283`	`299`	`const maxChars = CODEX_TURN_START_TEXT_INPUT_MAX_CHARS;`
`284`	`300`	`// A large assembled header prefix already over the cap forces the`

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ export function fitCodexProjectedContextForTurnStart(params: {`
`122`	`122`	`promptText: string;`
`123`	`123`	`contextRange?: CodexProjectedContextRange;`
`124`	`124`	`requestRange?: CodexProjectedContextRange;`
	`125`	`+preservedRange?: CodexProjectedContextRange;`
`125`	`126`	`maxChars?: number;`
`126`	`127`	`}): string {`
`127`	`128`	`const maxChars =`
`@@ -133,7 +134,19 @@ export function fitCodexProjectedContextForTurnStart(params: {`
`133`	`134`	`}`
`134`	`135`	`const range = normalizeProjectedContextRange(params.contextRange, params.promptText.length);`
`135`	`136`	`if (!range) {`
`136`		`-return params.promptText;`
	`137`	`+const preservedRange = normalizeProjectedContextRange(`
	`138`	`+params.preservedRange,`
	`139`	`+params.promptText.length,`
	`140`	`+);`
	`141`	`+if (!preservedRange) {`
	`142`	`+return params.promptText;`
	`143`	`+}`
	`144`	`+const preservedText = params.promptText.slice(preservedRange.start, preservedRange.end);`
	`145`	`+if (preservedText.length >= maxChars) {`
	`146`	`+return truncateOlderContext(preservedText, maxChars);`
	`147`	`+}`
	`148`	`+const beforeRange = params.promptText.slice(0, preservedRange.start);`
	`149`	+return `${truncateOlderContext(beforeRange, maxChars - preservedText.length)}${preservedText}`;
`137`	`150`	`}`
`138`	`151`
`139`	`152`	`const beforeContext = params.promptText.slice(0, range.start);`

Original file line number	Diff line number	Diff line change
`@@ -540,6 +540,33 @@ describe("runCodexAppServerAttempt context-engine lifecycle", () => {`
`540`	`540`	`await run;`
`541`	`541`	`});`
`542`	`542`
	`543`	`+it("bounds hook-appended prompts without an active context engine", async () => {`
	`544`	`+initializeGlobalHookRunner(`
	`545`	`+createMockPluginRegistry([`
	`546`	`+{`
	`547`	`+hookName: "before_prompt_build",`
	`548`	+handler: async () => ({ appendContext: `hook context ${"h".repeat(1_100_000)}` }),
	`549`	`+},`
	`550`	`+]),`
	`551`	`+);`
	`552`	`+const sessionFile = path.join(tempDir, "session.jsonl");`
	`553`	`+const workspaceDir = path.join(tempDir, "workspace");`
	`554`	`+const harness = createStartedThreadHarness();`
	`555`	`+const params = createParams(sessionFile, workspaceDir);`
	`556`	`+params.prompt = "current prompt survives";`
	`557`	`+`
	`558`	`+const run = runCodexAppServerAttempt(params);`
	`559`	`+await harness.waitForMethod("turn/start");`
	`560`	`+`
	`561`	`+const inputText = getRequestInputText(harness);`
	`562`	`+expect(inputText.length).toBeLessThanOrEqual(CODEX_TURN_START_TEXT_INPUT_MAX_CHARS);`
	`563`	`+expect(inputText).toContain("current prompt survives");`
	`564`	`+expect(inputText).not.toContain("hook context");`
	`565`	`+`
	`566`	`+await harness.completeTurn();`
	`567`	`+await run;`
	`568`	`+});`
	`569`	`+`
`543`	`570`	`it("uses configured compaction reserve when sizing Codex context-engine projections", async () => {`
`544`	`571`	`const sessionFile = path.join(tempDir, "session.jsonl");`
`545`	`572`	`const workspaceDir = path.join(tempDir, "workspace");`

Original file line number	Diff line number	Diff line change
`@@ -1028,6 +1028,26 @@ export async function runCodexAppServerAttempt(`
`1028`	`1028`	`? { beforeAgentStartResult: params.beforeAgentStartResult }`
`1029`	`1029`	`: {}),`
`1030`	`1030`	`});`
	`1031`	`+const resolveShiftedPromptInputRange = (`
	`1032`	`+prompt: string,`
	`1033`	`+promptInputRange: { start: number; end: number } \| undefined,`
	`1034`	`+turnPromptText: string,`
	`1035`	`+): CodexProjectedContextRange \| undefined => {`
	`1036`	`+if (`
	`1037`	`+!promptInputRange \|\|`
	`1038`	`+promptInputRange.start < 0 \|\|`
	`1039`	`+promptInputRange.end < promptInputRange.start \|\|`
	`1040`	`+promptInputRange.end > prompt.length \|\|`
	`1041`	`+!turnPromptText.endsWith(prompt)`
	`1042`	`+) {`
	`1043`	`+return undefined;`
	`1044`	`+}`
	`1045`	`+const turnPromptOffset = turnPromptText.length - prompt.length;`
	`1046`	`+return {`
	`1047`	`+start: turnPromptOffset + promptInputRange.start,`
	`1048`	`+end: turnPromptOffset + promptInputRange.end,`
	`1049`	`+};`
	`1050`	`+};`
`1031`	`1051`	`const resolveShiftedPromptContextRange = (`
`1032`	`1052`	`prompt: string,`
`1033`	`1053`	`promptInputRange: { start: number; end: number } \| undefined,`
`@@ -1095,10 +1115,16 @@ export async function runCodexAppServerAttempt(`
`1095`	`1115`	`promptBuild.promptInputRange,`
`1096`	`1116`	`turnPromptText,`
`1097`	`1117`	`);`
	`1118`	`+const preservedRange = resolveShiftedPromptInputRange(`
	`1119`	`+promptBuild.prompt,`
	`1120`	`+promptBuild.promptInputRange,`
	`1121`	`+turnPromptText,`
	`1122`	`+);`
`1098`	`1123`	`return fitCodexProjectedContextForTurnStart({`
`1099`	`1124`	`promptText: turnPromptText,`
`1100`	`1125`	`contextRange: projectedRanges?.contextRange,`
`1101`	`1126`	`requestRange: projectedRanges?.requestRange,`
	`1127`	`+ preservedRange,`
`1102`	`1128`	`});`
`1103`	`1129`	`};`
`1104`	`1130`	`let codexTurnPromptText = decorateCodexTurnPromptText(promptBuild);`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main

File tree