fix: share signed thinking replay policy · openclaw/openc...

Recent Commits to openclaw:main

steipete · 2026-05-24 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ import { STREAM_ERROR_FALLBACK_TEXT } from "../stream-message-shared.js";`
`35`	`35`	`import { sanitizeToolCallIdsForCloudCodeAssist } from "../tool-call-id.js";`
`36`	`36`	`import type { TranscriptPolicy } from "../transcript-policy.js";`
`37`	`37`	`import {`
	`38`	`+providerRequiresSignedThinking,`
`38`	`39`	`resolveTranscriptPolicy,`
`39`	`40`	`shouldAllowProviderOwnedThinkingReplay,`
`40`	`41`	`} from "../transcript-policy.js";`
`@@ -658,12 +659,6 @@ function isSameModelSnapshot(a: ModelSnapshotEntry, b: ModelSnapshotEntry): bool`
`658`	`659`	`);`
`659`	`660`	`}`
`660`	`661`
`661`		`-const SIGNED_THINKING_PROVIDERS = new Set(["anthropic", "amazon-bedrock", "anthropic-vertex"]);`
`662`		`-`
`663`		`-function providerRequiresSignedThinking(provider?: string \| null): boolean {`
`664`		`-return SIGNED_THINKING_PROVIDERS.has(provider ?? "");`
`665`		`-}`
`666`		`-`
`667`	`662`	`/**`
`668`	`663`	`* Applies the generic replay-history cleanup pipeline before provider-owned`
`669`	`664`	`* replay hooks run.`
`@@ -697,12 +692,11 @@ export async function sanitizeSessionHistory(params: {`
`697`	`692`	`});`
`698`	`693`	`const withInterSessionMarkers = annotateInterSessionUserMessages(params.messages);`
`699`	`694`	`const signedThinkingProvider = providerRequiresSignedThinking(params.provider);`
`700`		`-const allowProviderOwnedThinkingReplay =`
`701`		`-shouldAllowProviderOwnedThinkingReplay({`
`702`		`-modelApi: params.modelApi,`
`703`		`- policy,`
`704`		`-}) \|\|`
`705`		`-(signedThinkingProvider && !policy.dropThinkingBlocks);`
	`695`	`+const allowProviderOwnedThinkingReplay = shouldAllowProviderOwnedThinkingReplay({`
	`696`	`+modelApi: params.modelApi,`
	`697`	`+provider: params.provider,`
	`698`	`+ policy,`
	`699`	`+});`
`706`	`700`	`const isOpenAIResponsesApi =`
`707`	`701`	`params.modelApi === "openai-responses" \|\|`
`708`	`702`	`params.modelApi === "openai-codex-responses" \|\|`

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,46 @@ describe("sanitizeReplayToolCallIdsForStream", () => {`
`130`	`130`	`});`
`131`	`131`	`});`
`132`	`132`
	`133`	`+it("preserves signed-thinking replay ids when requested by provider policy", () => {`
	`134`	`+const rawId = "call_1";`
	`135`	`+const out = sanitizeReplayToolCallIdsForStream({`
	`136`	`+messages: [`
	`137`	`+{`
	`138`	`+role: "assistant",`
	`139`	`+content: [`
	`140`	`+{ type: "thinking", thinking: "internal", thinkingSignature: "sig_1" },`
	`141`	`+{ type: "toolUse", id: rawId, name: "read", input: { path: "." } },`
	`142`	`+],`
	`143`	`+} as never,`
	`144`	`+{`
	`145`	`+role: "toolResult",`
	`146`	`+toolCallId: rawId,`
	`147`	`+toolUseId: rawId,`
	`148`	`+toolName: "read",`
	`149`	`+content: [{ type: "text", text: "ok" }],`
	`150`	`+isError: false,`
	`151`	`+} as never,`
	`152`	`+],`
	`153`	`+mode: "strict",`
	`154`	`+preserveReplaySafeThinkingToolCallIds: true,`
	`155`	`+repairToolUseResultPairing: true,`
	`156`	`+});`
	`157`	`+`
	`158`	`+expect(out.map((message) => message.role)).toEqual(["assistant", "toolResult"]);`
	`159`	`+expect(requireAssistantMessage(out[0]).content[1]).toMatchObject({`
	`160`	`+type: "toolUse",`
	`161`	`+id: "call_1",`
	`162`	`+name: "read",`
	`163`	`+});`
	`164`	`+expect(toolResultSummary(out[1])).toEqual({`
	`165`	`+role: "toolResult",`
	`166`	`+toolCallId: "call_1",`
	`167`	`+toolUseId: "call_1",`
	`168`	`+toolName: "read",`
	`169`	`+isError: false,`
	`170`	`+});`
	`171`	`+});`
	`172`	`+`
`133`	`173`	`it("synthesizes missing tool results after strict id sanitization", () => {`
`134`	`174`	`const rawId = "call_function_av7cbkigmk7x1";`
`135`	`175`	`const out = sanitizeReplayToolCallIdsForStream({`

Original file line number	Diff line number	Diff line change
`@@ -919,6 +919,7 @@ export function wrapStreamFnSanitizeMalformedToolCalls(`
`919`	`919`	`TranscriptPolicy,`
`920`	`920`	`"validateGeminiTurns" \| "validateAnthropicTurns" \| "preserveSignatures" \| "dropThinkingBlocks"`
`921`	`921`	`>,`
	`922`	`+provider?: string \| null,`
`922`	`923`	`): StreamFn {`
`923`	`924`	`return (model, context, options) => {`
`924`	`925`	`const ctx = context as unknown as { messages?: unknown };`
`@@ -928,6 +929,7 @@ export function wrapStreamFnSanitizeMalformedToolCalls(`
`928`	`929`	`}`
`929`	`930`	`const allowProviderOwnedThinkingReplay = shouldAllowProviderOwnedThinkingReplay({`
`930`	`931`	`modelApi: (model as { api?: unknown })?.api as string \| null \| undefined,`
	`932`	`+ provider,`
`931`	`933`	`policy: {`
`932`	`934`	`validateAnthropicTurns: transcriptPolicy?.validateAnthropicTurns === true,`
`933`	`935`	`preserveSignatures: transcriptPolicy?.preserveSignatures === true,`

Original file line number	Diff line number	Diff line change
`@@ -2855,6 +2855,7 @@ export async function runEmbeddedAttempt(`
`2855`	`2855`	`preserveNativeAnthropicToolUseIds: transcriptPolicy.preserveNativeAnthropicToolUseIds,`
`2856`	`2856`	`preserveReplaySafeThinkingToolCallIds: shouldAllowProviderOwnedThinkingReplay({`
`2857`	`2857`	`modelApi: (model as { api?: unknown })?.api as string \| null \| undefined,`
	`2858`	`+provider: params.provider,`
`2858`	`2859`	`policy: transcriptPolicy,`
`2859`	`2860`	`}),`
`2860`	`2861`	`repairToolUseResultPairing: transcriptPolicy.repairToolUseResultPairing,`
`@@ -2911,6 +2912,7 @@ export async function runEmbeddedAttempt(`
`2911`	`2912`	`activeSession.agent.streamFn,`
`2912`	`2913`	`allowedToolNames,`
`2913`	`2914`	`transcriptPolicy,`
	`2915`	`+params.provider,`
`2914`	`2916`	`);`
`2915`	`2917`	`activeSession.agent.streamFn = wrapStreamFnTrimToolCallNames(`
`2916`	`2918`	`activeSession.agent.streamFn,`

Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,24 @@ describe("resolveTranscriptPolicy", () => {`
`617`	`617`	`).toBe(true);`
`618`	`618`	`});`
`619`	`619`
	`620`	`+it.each(["anthropic", "amazon-bedrock"] as const)(`
	`621`	`+"allows provider-owned thinking replay for signed-thinking %s recovery policies",`
	`622`	`+(provider) => {`
	`623`	`+expect(`
	`624`	`+shouldAllowProviderOwnedThinkingReplay({`
	`625`	`+ provider,`
	`626`	`+modelApi:`
	`627`	`+provider === "amazon-bedrock" ? "bedrock-converse-stream" : "anthropic-messages",`
	`628`	`+policy: {`
	`629`	`+validateAnthropicTurns: true,`
	`630`	`+preserveSignatures: false,`
	`631`	`+dropThinkingBlocks: false,`
	`632`	`+},`
	`633`	`+}),`
	`634`	`+).toBe(true);`
	`635`	`+},`
	`636`	`+);`
	`637`	`+`
`620`	`638`	`it("does not allow immutable provider-owned thinking replay for github-copilot claude models", () => {`
`621`	`639`	`const policy = resolveTranscriptPolicy({`
`622`	`640`	`provider: "github-copilot",`

Original file line number	Diff line number	Diff line change
`@@ -32,17 +32,26 @@ export type TranscriptPolicy = {`
`32`	`32`	`allowSyntheticToolResults: boolean;`
`33`	`33`	`};`
`34`	`34`
	`35`	`+const SIGNED_THINKING_PROVIDERS = new Set(["anthropic", "amazon-bedrock", "anthropic-vertex"]);`
	`36`	`+`
	`37`	`+export function providerRequiresSignedThinking(provider?: string \| null): boolean {`
	`38`	`+return SIGNED_THINKING_PROVIDERS.has(normalizeProviderId(provider ?? ""));`
	`39`	`+}`
	`40`	`+`
`35`	`41`	`export function shouldAllowProviderOwnedThinkingReplay(params: {`
`36`	`42`	`modelApi?: string \| null;`
	`43`	`+provider?: string \| null;`
`37`	`44`	`policy: Pick<`
`38`	`45`	`TranscriptPolicy,`
`39`	`46`	`"validateAnthropicTurns" \| "preserveSignatures" \| "dropThinkingBlocks"`
`40`	`47`	`>;`
`41`	`48`	`}): boolean {`
	`49`	`+const hasProviderOwnedSignedThinking =`
	`50`	`+params.policy.preserveSignatures \|\| providerRequiresSignedThinking(params.provider);`
`42`	`51`	`return (`
`43`	`52`	`isAnthropicApi(params.modelApi) &&`
`44`	`53`	`params.policy.validateAnthropicTurns &&`
`45`		`-params.policy.preserveSignatures &&`
	`54`	`+hasProviderOwnedSignedThinking &&`
`46`	`55`	`!params.policy.dropThinkingBlocks`
`47`	`56`	`);`
`48`	`57`	`}`

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

推荐订阅源

Recent Commits to openclaw:main