惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

T
Tailwind CSS Blog
博客园 - 【当耐特】
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
博客园 - Franky
小众软件
小众软件
酷 壳 – CoolShell
酷 壳 – CoolShell
博客园 - 三生石上(FineUI控件)
B
Blog
有赞技术团队
有赞技术团队
J
Java Code Geeks
云风的 BLOG
云风的 BLOG
Recent Announcements
Recent Announcements
Jina AI
Jina AI
Vercel News
Vercel News
博客园 - 叶小钗
Hugging Face - Blog
Hugging Face - Blog
H
Hackread – Cybersecurity News, Data Breaches, AI and More
F
Fortinet All Blogs
The Cloudflare Blog
V
V2EX
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
博客园_首页
腾讯CDC

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(harness): protect reset and prompt bounds · openclaw/...
vincentkoc · 2026-06-21 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -255,6 +255,30 @@ describe("projectContextEngineAssemblyForCodex", () => {

255255

expect(fitted).toContain("[truncated ");

256256

});

257257
258+

it("keeps the current request when a hook appends oversized context", () => {

259+

const before = "OpenClaw assembled context for this turn:\n<conversation_context>\n";

260+

const context = `recent context ${"c".repeat(200)}`;

261+

const request = "\n</conversation_context>\n\nCurrent user request:\nkeep this request";

262+

const hookAppend = `\n\nhook context ${"h".repeat(800)}`;

263+

const promptText = `${before}${context}${request}${hookAppend}`;

264+

const maxChars = 420;

265+
266+

const fitted = fitCodexProjectedContextForTurnStart({

267+

promptText,

268+

contextRange: { start: before.length, end: before.length + context.length },

269+

requestRange: {

270+

start: before.length + context.length,

271+

end: before.length + context.length + request.length,

272+

},

273+

maxChars,

274+

});

275+
276+

expect(fitted.length).toBeLessThanOrEqual(maxChars);

277+

expect(fitted).toContain("recent context");

278+

expect(fitted).toContain("Current user request:\nkeep this request");

279+

expect(fitted).not.toContain("hook context");

280+

});

281+
258282

it("bounds output for a large request under the default Codex turn limit", () => {

259283

const maxChars = CODEX_TURN_START_TEXT_INPUT_MAX_CHARS;

260284

// A large assembled header prefix already over the cap forces the

Original file line numberDiff line numberDiff line change

@@ -121,6 +121,7 @@ export function resolveCodexContextEngineProjectionReserveTokens(params: {

121121

export function fitCodexProjectedContextForTurnStart(params: {

122122

promptText: string;

123123

contextRange?: CodexProjectedContextRange;

124+

requestRange?: CodexProjectedContextRange;

124125

maxChars?: number;

125126

}): string {

126127

const maxChars =

@@ -138,6 +139,24 @@ export function fitCodexProjectedContextForTurnStart(params: {

138139

const beforeContext = params.promptText.slice(0, range.start);

139140

const context = params.promptText.slice(range.start, range.end);

140141

const afterContext = params.promptText.slice(range.end);

142+

const requestRange = normalizeProjectedContextRange(

143+

params.requestRange,

144+

params.promptText.length,

145+

);

146+

if (

147+

requestRange &&

148+

requestRange.start >= range.end &&

149+

requestRange.end < params.promptText.length

150+

) {

151+

const request = params.promptText.slice(requestRange.start, requestRange.end);

152+

if (request.length >= maxChars) {

153+

return truncateOlderContext(request, maxChars);

154+

}

155+

const contextBudget = maxChars - request.length;

156+

const fittedContext = truncateOlderContext(context, contextBudget);

157+

const beforeContextBudget = maxChars - fittedContext.length - request.length;

158+

return `${truncateOlderContext(beforeContext, beforeContextBudget)}${fittedContext}${request}`;

159+

}

141160

const contextBudget = maxChars - beforeContext.length - afterContext.length;

142161

if (contextBudget > 0) {

143162

const fittedContext = truncateOlderContext(context, contextBudget);

Original file line numberDiff line numberDiff line change

@@ -1032,7 +1032,12 @@ export async function runCodexAppServerAttempt(

10321032

prompt: string,

10331033

promptInputRange: { start: number; end: number } | undefined,

10341034

turnPromptText: string,

1035-

): CodexProjectedContextRange | undefined => {

1035+

):

1036+

| {

1037+

contextRange: CodexProjectedContextRange;

1038+

requestRange: CodexProjectedContextRange;

1039+

}

1040+

| undefined => {

10361041

const promptTextInputOffset = promptInputRange

10371042

? promptInputRange.end - promptText.length

10381043

: undefined;

@@ -1059,10 +1064,17 @@ export async function runCodexAppServerAttempt(

10591064

return undefined;

10601065

}

10611066

const turnPromptOffset = turnPromptText.length - prompt.length + promptTextOffset;

1062-

return {

1067+

const contextRange = {

10631068

start: turnPromptOffset + promptContextRange.start,

10641069

end: turnPromptOffset + promptContextRange.end,

10651070

};

1071+

return {

1072+

contextRange,

1073+

requestRange: {

1074+

start: contextRange.end,

1075+

end: turnPromptOffset + promptTextOffset + promptText.length,

1076+

},

1077+

};

10661078

};

10671079

let promptBuild = await buildPromptFromCurrentInputs();

10681080

const decorateCodexTurnPromptText = (promptBuild: {

@@ -1078,13 +1090,15 @@ export async function runCodexAppServerAttempt(

10781090

params.bootstrapContextRunKind === "cron",

10791091

},

10801092

);

1093+

const projectedRanges = resolveShiftedPromptContextRange(

1094+

promptBuild.prompt,

1095+

promptBuild.promptInputRange,

1096+

turnPromptText,

1097+

);

10811098

return fitCodexProjectedContextForTurnStart({

10821099

promptText: turnPromptText,

1083-

contextRange: resolveShiftedPromptContextRange(

1084-

promptBuild.prompt,

1085-

promptBuild.promptInputRange,

1086-

turnPromptText,

1087-

),

1100+

contextRange: projectedRanges?.contextRange,

1101+

requestRange: projectedRanges?.requestRange,

10881102

});

10891103

};

10901104

let codexTurnPromptText = decorateCodexTurnPromptText(promptBuild);

Original file line numberDiff line numberDiff line change

@@ -625,6 +625,69 @@ describe("createCopilotAgentHarness", () => {

625625

expect(sessionStore.entries.get("oc-reset-race")?.sdkSessionId).toBe("sdk-sess-replacement");

626626

});

627627
628+

it("does not reuse a reset target while deferred cleanup is pending", async () => {

629+

const cleanup = createDeferred<"aborted" | "completed" | "deadline">();

630+

const abort = vi.fn();

631+

const replacementDeleteSession = vi.fn().mockResolvedValue(undefined);

632+

const duringResetDeleteSession = vi.fn().mockResolvedValue(undefined);

633+

const sessionStore = makeSessionStoreMock();

634+

let attempt = 0;

635+

mocks.runCopilotAttempt.mockImplementation(async (params, deps) => {

636+

attempt += 1;

637+

if (attempt === 1) {

638+

deps.onSessionEstablished?.({

639+

sdkSessionId: "sdk-sess-before-reset",

640+

pooledClient: { key: {} as any, client: {} as any },

641+

sessionConfig: TEST_SESSION_CONFIG,

642+

});

643+

deps.onDeferredCompaction?.({

644+

abort,

645+

cleanup: cleanup.promise,

646+

sdkSessionId: "sdk-sess-before-reset",

647+

});

648+

} else if (attempt === 2) {

649+

deps.onSessionEstablished?.({

650+

sdkSessionId: "sdk-sess-replacement",

651+

pooledClient: {

652+

key: {} as any,

653+

client: { deleteSession: replacementDeleteSession } as any,

654+

},

655+

sessionConfig: TEST_SESSION_CONFIG,

656+

});

657+

} else if (attempt === 3 && !params.initialReplayState?.sdkSessionId) {

658+

deps.onSessionEstablished?.({

659+

sdkSessionId: "sdk-sess-during-reset",

660+

pooledClient: {

661+

key: {} as any,

662+

client: { deleteSession: duringResetDeleteSession } as any,

663+

},

664+

sessionConfig: TEST_SESSION_CONFIG,

665+

});

666+

}

667+

return ATTEMPT_RESULT;

668+

});

669+

const harness = createCopilotAgentHarness({

670+

pool: makePoolMock(),

671+

sessionStore: sessionStore.store,

672+

});

673+

const params = { ...ATTEMPT_PARAMS, sessionId: "oc-reset-reuse" };

674+
675+

await harness.runAttempt(params);

676+

await harness.runAttempt(params);

677+

const reset = harness.reset?.({ sessionId: "oc-reset-reuse" });

678+

await vi.waitFor(() => expect(abort).toHaveBeenCalledOnce());

679+

await harness.runAttempt(params);

680+

cleanup.resolve("aborted");

681+

await reset;

682+
683+

expect(

684+

mocks.runCopilotAttempt.mock.calls[2]?.[0]?.initialReplayState?.sdkSessionId,

685+

).toBeUndefined();

686+

expect(replacementDeleteSession).toHaveBeenCalledWith("sdk-sess-replacement");

687+

expect(duringResetDeleteSession).not.toHaveBeenCalled();

688+

expect(sessionStore.entries.get("oc-reset-reuse")?.sdkSessionId).toBe("sdk-sess-during-reset");

689+

});

690+
628691

describe("session reuse across turns (dogfood finding #4)", () => {

629692

// These tests pin the harness's session-reuse contract: subsequent

630693

// `runAttempt` calls within the same OpenClaw session should pass

Original file line numberDiff line numberDiff line change

@@ -573,12 +573,13 @@ export function createCopilotAgentHarness(

573573

const currentCompactKey = computeSessionCompactKey(params);

574574

const compactionCleanupPending =

575575

openclawSessionId !== undefined && hasPendingDeferredCompactionCleanup(openclawSessionId);

576+

const replayBlocked =

577+

openclawSessionId !== undefined &&

578+

(compactionCleanupPending || resetBlockedStoredSessions.has(openclawSessionId));

576579

const tracked =

577-

openclawSessionId && !compactionCleanupPending

578-

? trackedSessions.get(openclawSessionId)

579-

: undefined;

580+

openclawSessionId && !replayBlocked ? trackedSessions.get(openclawSessionId) : undefined;

580581

const stored = openclawSessionId

581-

? compactionCleanupPending || resetBlockedStoredSessions.has(openclawSessionId)

582+

? replayBlocked

582583

? undefined

583584

: lookupStoredBinding(options?.sessionStore, openclawSessionId)

584585

: undefined;