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

推荐订阅源

Martin Fowler
Martin Fowler
WordPress大学
WordPress大学
月光博客
月光博客
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
大猫的无限游戏
大猫的无限游戏
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
博客园 - 聂微东
Apple Machine Learning Research
Apple Machine Learning Research
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
雷峰网
雷峰网
小众软件
小众软件
酷 壳 – CoolShell
酷 壳 – CoolShell
博客园 - 叶小钗
美团技术团队
宝玉的分享
宝玉的分享
Hugging Face - Blog
Hugging Face - Blog
阮一峰的网络日志
阮一峰的网络日志
A
About on SuperTechFans
Jina AI
Jina AI
D
Docker
Last Week in AI
Last Week in AI
MongoDB | Blog
MongoDB | Blog
Stack Overflow Blog
Stack Overflow Blog
Microsoft Azure Blog
Microsoft Azure Blog

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(providers): strip cache-boundary marker from non-Anth...
masatohoshin · 2026-06-23 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -1,6 +1,7 @@

11

// Google shared provider tests cover response conversion and finish reasons.

22

import { FinishReason, type GenerateContentResponse } from "@google/genai";

33

import { describe, expect, it } from "vitest";

4+

import { SYSTEM_PROMPT_CACHE_BOUNDARY } from "../../agents/system-prompt-cache-boundary.js";

45

import type { AssistantMessage, Model } from "../types.js";

56

import { AssistantMessageEventStream } from "../utils/event-stream.js";

67

import {

@@ -146,4 +147,14 @@ describe("buildGoogleGenerateContentParams", () => {

146147
147148

expect(params.config?.stopSequences).toEqual(["STOP"]);

148149

});

150+
151+

it("strips the internal cache boundary marker from systemInstruction", () => {

152+

const params = buildGoogleGenerateContentParams(model, {

153+

systemPrompt: `Stable${SYSTEM_PROMPT_CACHE_BOUNDARY}Dynamic`,

154+

messages: [{ role: "user", content: "hello", timestamp: 0 }],

155+

});

156+
157+

expect(params.config?.systemInstruction).toBe("Stable\nDynamic");

158+

expect(JSON.stringify(params)).not.toContain("OPENCLAW_CACHE_BOUNDARY");

159+

});

149160

});

Original file line numberDiff line numberDiff line change

@@ -12,6 +12,7 @@ import {

1212

type Part,

1313

type ThinkingConfig,

1414

} from "@google/genai";

15+

import { stripSystemPromptCacheBoundary } from "../../agents/system-prompt-cache-boundary.js";

1516

import { calculateCost, clampThinkingLevel } from "../model-utils.js";

1617

import type {

1718

Api,

@@ -500,7 +501,9 @@ export function buildGoogleGenerateContentParams<T extends GoogleApiType>(

500501
501502

const config: GenerateContentConfig = {

502503

...(Object.keys(generationConfig).length > 0 && generationConfig),

503-

...(context.systemPrompt && { systemInstruction: sanitizeSurrogates(context.systemPrompt) }),

504+

...(context.systemPrompt && {

505+

systemInstruction: sanitizeSurrogates(stripSystemPromptCacheBoundary(context.systemPrompt)),

506+

}),

504507

...(context.tools && context.tools.length > 0 && { tools: convertTools(context.tools) }),

505508

};

506509
Original file line numberDiff line numberDiff line change

@@ -1,5 +1,6 @@

11

// Mistral provider tests cover request mapping and stream conversion.

22

import { beforeEach, describe, expect, it, vi } from "vitest";

3+

import { SYSTEM_PROMPT_CACHE_BOUNDARY } from "../../agents/system-prompt-cache-boundary.js";

34

import type { Context, Model } from "../types.js";

45
56

const mistralMockState = vi.hoisted(() => ({

@@ -214,4 +215,24 @@ describe("Mistral provider", () => {

214215

function: { name: "healthy_tool" },

215216

});

216217

});

218+
219+

it("strips the internal cache boundary marker from the system message", async () => {

220+

const stream = streamSimpleMistral(

221+

makeMistralModel(),

222+

{

223+

systemPrompt: `Stable${SYSTEM_PROMPT_CACHE_BOUNDARY}Dynamic`,

224+

messages: [{ role: "user", content: "hello", timestamp: 0 }],

225+

},

226+

{ apiKey: "sk-mistral-provider" },

227+

);

228+
229+

await stream.result();

230+
231+

const payload = mistralMockState.payloads[0] as {

232+

messages: Array<{ role: string; content: string }>;

233+

};

234+

const systemMessage = payload.messages.find((message) => message.role === "system");

235+

expect(systemMessage?.content).toBe("Stable\nDynamic");

236+

expect(JSON.stringify(payload)).not.toContain("OPENCLAW_CACHE_BOUNDARY");

237+

});

217238

});

Original file line numberDiff line numberDiff line change

@@ -7,6 +7,7 @@ import type {

77

ContentChunk,

88

FunctionTool,

99

} from "@mistralai/mistralai/models/components";

10+

import { stripSystemPromptCacheBoundary } from "../../agents/system-prompt-cache-boundary.js";

1011

import { getEnvApiKey } from "../env-api-keys.js";

1112

import { calculateCost, clampThinkingLevel } from "../model-utils.js";

1213

import type {

@@ -309,7 +310,7 @@ function buildChatPayload(

309310

if (context.systemPrompt) {

310311

payload.messages.unshift({

311312

role: "system",

312-

content: sanitizeSurrogates(context.systemPrompt),

313+

content: sanitizeSurrogates(stripSystemPromptCacheBoundary(context.systemPrompt)),

313314

});

314315

}

315316
Original file line numberDiff line numberDiff line change

@@ -1,6 +1,7 @@

11

// ChatGPT Responses provider tests cover stream handling and timeout behavior.

22

import { MAX_TIMER_TIMEOUT_MS } from "@openclaw/normalization-core/number-coercion";

33

import { afterEach, describe, expect, it, vi } from "vitest";

4+

import { SYSTEM_PROMPT_CACHE_BOUNDARY } from "../../agents/system-prompt-cache-boundary.js";

45

import type { Context, Model } from "../types.js";

56

import {

67

extractOpenAICodexAccountId,

@@ -403,6 +404,60 @@ describe("streamOpenAICodexResponses transport", () => {

403404

expect(result.errorMessage).toContain("Request timed out after 5ms");

404405

});

405406
407+

it("strips the internal cache boundary marker from request instructions", async () => {

408+

let capturedPayload: { instructions?: string } | undefined;

409+

const stream = streamOpenAICodexResponses(

410+

model,

411+

{

412+

systemPrompt: `Stable${SYSTEM_PROMPT_CACHE_BOUNDARY}Dynamic`,

413+

messages: [{ role: "user", content: "hi", timestamp: 1 }],

414+

},

415+

{

416+

apiKey: createJwt({

417+

"https://api.openai.com/auth": {

418+

chatgpt_account_id: "acct-1",

419+

},

420+

}),

421+

transport: "sse",

422+

onPayload: (payload) => {

423+

capturedPayload = payload as typeof capturedPayload;

424+

throw new Error("stop after payload");

425+

},

426+

},

427+

);

428+
429+

const result = await stream.result();

430+
431+

expect(result.stopReason).toBe("error");

432+

expect(capturedPayload?.instructions).toBe("Stable\nDynamic");

433+

expect(JSON.stringify(capturedPayload)).not.toContain("OPENCLAW_CACHE_BOUNDARY");

434+

});

435+
436+

it("falls back to the default instructions when no system prompt is set", async () => {

437+

let capturedPayload: { instructions?: string } | undefined;

438+

const stream = streamOpenAICodexResponses(

439+

model,

440+

{ messages: [{ role: "user", content: "hi", timestamp: 1 }] },

441+

{

442+

apiKey: createJwt({

443+

"https://api.openai.com/auth": {

444+

chatgpt_account_id: "acct-1",

445+

},

446+

}),

447+

transport: "sse",

448+

onPayload: (payload) => {

449+

capturedPayload = payload as typeof capturedPayload;

450+

throw new Error("stop after payload");

451+

},

452+

},

453+

);

454+
455+

const result = await stream.result();

456+
457+

expect(result.stopReason).toBe("error");

458+

expect(capturedPayload?.instructions).toBe("You are a helpful assistant.");

459+

});

460+
406461

it("prefers promptCacheKey over sessionId for request cache affinity", async () => {

407462

let payload: unknown;

408463

vi.stubGlobal(

Original file line numberDiff line numberDiff line change

@@ -25,6 +25,7 @@ import {

2525

resolveTimerTimeoutMs,

2626

clampTimerTimeoutMs,

2727

} from "@openclaw/normalization-core/number-coercion";

28+

import { stripSystemPromptCacheBoundary } from "../../agents/system-prompt-cache-boundary.js";

2829

import { getEnvApiKey } from "../env-api-keys.js";

2930

import { clampThinkingLevel } from "../model-utils.js";

3031

import { registerSessionResourceCleanup } from "../session-resources.js";

@@ -488,7 +489,8 @@ function buildRequestBody(

488489

model: model.id,

489490

store: false,

490491

stream: true,

491-

instructions: context.systemPrompt || "You are a helpful assistant.",

492+

instructions:

493+

stripSystemPromptCacheBoundary(context.systemPrompt ?? "") || "You are a helpful assistant.",

492494

input: messages,

493495

text: { verbosity: options?.textVerbosity || "low" },

494496

include: ["reasoning.encrypted_content"],

Original file line numberDiff line numberDiff line change

@@ -1,6 +1,7 @@

11

// OpenAI Responses shared tests cover tool conversion and response item mapping.

22

import type { Tool as OpenAIResponsesTool } from "openai/resources/responses/responses.js";

33

import { describe, expect, it } from "vitest";

4+

import { SYSTEM_PROMPT_CACHE_BOUNDARY } from "../../agents/system-prompt-cache-boundary.js";

45

import type { AssistantMessage, AssistantMessageEvent, Context, Model, Tool } from "../types.js";

56

import { AssistantMessageEventStream } from "../utils/event-stream.js";

67

import {

@@ -262,6 +263,24 @@ describe("convertResponsesMessages", () => {

262263

});

263264

});

264265
266+

it("strips the internal cache boundary marker from the system prompt message", () => {

267+

const input = convertResponsesMessages(

268+

nativeOpenAIModel,

269+

{

270+

systemPrompt: `Stable${SYSTEM_PROMPT_CACHE_BOUNDARY}Dynamic`,

271+

messages: [],

272+

} satisfies Context,

273+

allowedToolCallProviders,

274+

);

275+
276+

expect(input[0]).toMatchObject({

277+

type: "message",

278+

role: "developer",

279+

content: [{ type: "input_text", text: "Stable\nDynamic" }],

280+

});

281+

expect(JSON.stringify(input)).not.toContain("OPENCLAW_CACHE_BOUNDARY");

282+

});

283+
265284

it("omits phase-tagged assistant replay ids without reasoning", () => {

266285

const input = convertResponsesMessages(

267286

nativeOpenAIModel,

Original file line numberDiff line numberDiff line change

@@ -13,6 +13,7 @@ import type {

1313

ResponseReasoningItem,

1414

ResponseStreamEvent,

1515

} from "openai/resources/responses/responses.js";

16+

import { stripSystemPromptCacheBoundary } from "../../agents/system-prompt-cache-boundary.js";

1617

import {

1718

AZURE_RESPONSES_TEXT_CONTENT_PART_TYPE,

1819

OPENAI_RESPONSES_OUTPUT_TEXT_CONTENT_PART_TYPE,

@@ -254,7 +255,12 @@ export function convertResponsesMessages<TApi extends Api>(

254255

messages.push({

255256

type: "message",

256257

role,

257-

content: [{ type: "input_text", text: sanitizeSurrogates(context.systemPrompt) }],

258+

content: [

259+

{

260+

type: "input_text",

261+

text: sanitizeSurrogates(stripSystemPromptCacheBoundary(context.systemPrompt)),

262+

},

263+

],

258264

});

259265

}

260266