feat(models): retain native cache blocks and bind cross-run provider state

This commit is contained in:
Agent Workbench Dev
2026-11-07 20:00:33 +08:00
parent 71f1805561
commit 9e1feeebb3
11 changed files with 435 additions and 33 deletions
+38 -12
View File
@@ -1,4 +1,5 @@
import { isPassthrough, messagesOutputSetting } from './model-capacity.mjs';
import { providerStateCompatibility } from './model-provider-state.mjs';
const object = value => value && typeof value === 'object' && !Array.isArray(value);
const fail = message => { throw new Error('Messages 请求未发送:' + message); };
@@ -6,9 +7,12 @@ function contentBlocks(content) {
if (typeof content === 'string') return content ? [{ type: 'text', text: content }] : [];
if (!Array.isArray(content)) fail('消息内容必须为文本或已接入的内容块。');
return content.map(part => {
if (['text', 'input_text', 'output_text'].includes(part.type) && typeof part.text === 'string') return { type: 'text', text: part.text };
if (['text', 'input_text', 'output_text'].includes(part.type) && typeof part.text === 'string') return { ...structuredClone(part), type: 'text' };
const url = part.type === 'image_url' ? part.image_url?.url : part.type === 'input_image' ? part.image_url : null;
if (typeof url === 'string' && /^data:image\/png;base64,[A-Za-z0-9+/=]+$/.test(url)) return { type: 'image', source: { type: 'base64', media_type: 'image/png', data: url.slice(22) } };
if (typeof url === 'string' && /^data:image\/png;base64,[A-Za-z0-9+/=]+$/.test(url)) {
const { image_url, ...metadata } = structuredClone(part);
return { ...metadata, type: 'image', source: { type: 'base64', media_type: 'image/png', data: url.slice(22) } };
}
fail('未接入的输入内容块 ' + String(part?.type ?? '未知') + '。');
});
}
@@ -23,14 +27,23 @@ export function messagesBody(config, messages, tools, native) {
else wire.push({ role, content });
};
for (const message of messages) {
if (message.providerInput?.protocol === 'anthropic-messages') {
const original = message.providerInput;
if (message.role === 'system') system.push(...structuredClone(original.content));
else if (message.role === 'tool') append('user', [structuredClone(original.toolResult)]);
else append(message.role, structuredClone(original.content));
continue;
}
if (message.role === 'system') { system.push(...contentBlocks(message.content)); continue; }
if (message.role === 'tool') {
if (typeof message.tool_call_id !== 'string' || !message.tool_call_id || typeof message.content !== 'string') fail('工具结果缺少原调用身份或文本。');
append('user', [{ type: 'tool_result', tool_use_id: message.tool_call_id, content: message.content }]);
append('user', [{ type: 'tool_result', tool_use_id: message.tool_call_id, content: message.content,
...(message.cache_control !== undefined ? { cache_control: structuredClone(message.cache_control) } : {}),
...(message.is_error !== undefined ? { is_error: message.is_error } : {}) }]);
} else if (message.role === 'user') append('user', contentBlocks(message.content));
else if (message.role === 'assistant') {
const state = message.providerState;
if (state?.protocol === 'anthropic-messages' && state.endpoint === config.baseUrl && state.model === config.model) {
if (state?.protocol === 'anthropic-messages' && providerStateCompatibility(config, state).applicable) {
if (!Array.isArray(state.content)) fail('原生助手历史格式无效。');
append('assistant', structuredClone(state.content));
continue;
@@ -46,8 +59,10 @@ export function messagesBody(config, messages, tools, native) {
}
if (system.some(block => block.type !== 'text')) fail('系统消息只支持文本。');
const definitions = (tools ?? []).map(tool => {
if (typeof tool.name === 'string' && object(tool.input_schema)) return structuredClone(tool);
if (tool.type !== 'function' || !tool.function?.name || !object(tool.function.parameters)) fail('工具定义格式无效。');
return { name: tool.function.name, ...(tool.function.description ? { description: tool.function.description } : {}), input_schema: tool.function.parameters };
const { type, function: definition, ...metadata } = structuredClone(tool), { parameters, ...fields } = definition;
return { ...fields, ...metadata, name: definition.name, input_schema: parameters };
});
return { model: config.model, ...(system.length ? { system } : {}), messages: wire,
...(definitions.length ? { tools: definitions, tool_choice: { type: 'auto' } } : {}),
@@ -61,14 +76,25 @@ export function messagesBody(config, messages, tools, native) {
export function messagesHistory(body) {
const history = [];
if (typeof body.system === 'string') history.push({ role: 'system', content: body.system });
else for (const part of body.system ?? []) history.push({ role: 'system', content: part.text });
else if (body.system?.length) history.push({ role: 'system', content: body.system.filter(part => part.type === 'text').map(part => part.text).join(''),
providerInput: { protocol: 'anthropic-messages', content: structuredClone(body.system) } });
for (const message of body.messages) {
if (!Array.isArray(message.content)) { history.push(message); continue; }
const blocks = message.content, text = blocks.filter(block => block.type === 'text').map(block => block.text).join('');
const calls = blocks.filter(block => block.type === 'tool_use').map(block => ({ id: block.id, type: 'function', function: { name: block.name, arguments: JSON.stringify(block.input) } }));
const results = blocks.filter(block => block.type === 'tool_result');
for (const result of results) history.push({ role: 'tool', tool_call_id: result.tool_use_id, content: result.content });
if (message.role === 'assistant' || text || blocks.some(block => block.type === 'image')) history.push({ role: message.role, content: text, ...(calls.length ? { tool_calls: calls } : {}) });
if (!Array.isArray(message.content)) { history.push(structuredClone(message)); continue; }
let pending = [];
const flush = () => {
if (!pending.length) return;
const text = pending.filter(block => block.type === 'text').map(block => block.text).join('');
const calls = pending.filter(block => block.type === 'tool_use').map(block => ({ id: block.id, type: 'function', function: { name: block.name, arguments: JSON.stringify(block.input) } }));
history.push({ role: message.role, content: text, ...(calls.length ? { tool_calls: calls } : {}),
providerInput: { protocol: 'anthropic-messages', content: structuredClone(pending) } });
pending = [];
};
for (const block of message.content) {
if (block.type !== 'tool_result') { pending.push(block); continue; }
flush(); history.push({ role: 'tool', tool_call_id: block.tool_use_id, content: typeof block.content === 'string' ? block.content : JSON.stringify(block.content),
providerInput: { protocol: 'anthropic-messages', toolResult: structuredClone(block) } });
}
flush();
}
return history;
}
@@ -0,0 +1,46 @@
import { createHash } from 'node:crypto';
import { modelProtocol } from './model-capabilities.mjs';
import { modelRequestUrl } from './model-endpoint.mjs';
import { requestHeaders } from './model-request-contract.mjs';
const sha = value => createHash('sha256').update(JSON.stringify(value)).digest('hex');
export function providerStateBinding(config) {
const protocol = modelProtocol(config.protocol), connection = { ...config, protocol };
const identity = { protocol, endpoint: config.baseUrl ?? null, requestUrl: config.baseUrl ? modelRequestUrl(connection) : null,
model: config.model ?? null, connectionId: config.modelConnectionId ?? null, credentialRevision: config.modelCredentialRevision ?? null,
headers: [...requestHeaders(connection, '{{credential}}')] };
return { schemaVersion: 1, ...identity, fingerprint: sha(identity), representation: 'provider-state-scope-credential-template-v1' };
}
export const bindProviderState = (config, payload) => ({ ...payload, schemaVersion: 2, binding: providerStateBinding(config) });
export function providerStateCompatibility(config, state) {
if (!state) return { applicable: false, reason: 'no-state' };
const binding = providerStateBinding(config);
if (state.schemaVersion !== undefined && ![1, 2].includes(state.schemaVersion)) return { applicable: false, reason: 'unknown-state-schema', binding };
if (state.schemaVersion === 2) return state.binding?.fingerprint === binding.fingerprint
? { applicable: true, reason: 'same-provider-scope', binding }
: { applicable: false, reason: 'provider-scope-changed', binding, previousFingerprint: state.binding?.fingerprint ?? null };
if (state.protocol !== binding.protocol || state.endpoint !== binding.endpoint || state.model !== binding.model)
return { applicable: false, reason: 'legacy-provider-changed', binding };
if (state.protocol === 'chat-completions') return state.connectionId === binding.connectionId && state.credentialRevision === binding.credentialRevision
? { applicable: true, reason: 'legacy-chat-identity-match', binding }
: { applicable: false, reason: 'legacy-provider-changed', binding };
// Original unbound direct-protocol histories remain readable. A named current
// connection cannot infer authentication/version scope from an old bare state.
return binding.connectionId === null && binding.credentialRevision === null
? { applicable: true, reason: 'legacy-direct-protocol', binding }
: { applicable: false, reason: 'legacy-identity-unavailable', binding };
}
export function providerStateAudit(config, messages) {
const variants = config.modelRouting?.members ?? [config];
return { schemaVersion: 1, source: 'frozen-history-provider-scope', variants: variants.map(member => {
const route = config.modelRouting ? { ...config, ...member, modelConnectionId: member.id, modelCredentialRevision: member.credentialRevision } : config;
const states = messages.flatMap(message => message.providerState ? [{ protocol: message.providerState.protocol,
responseId: message.providerState.responseId ?? null, stateSchemaVersion: message.providerState.schemaVersion ?? 1,
...providerStateCompatibility(route, message.providerState), stateSha256: sha(message.providerState) }] : []);
return { connectionId: route.modelConnectionId ?? null, model: route.model, protocol: modelProtocol(route.protocol),
applied: states.filter(value => value.applicable).length, retainedOnly: states.filter(value => !value.applicable).length,
states: states.map(({ binding, ...value }, index) => ({ index, ...value })), binding: providerStateBinding(route) };
}) };
}
+12 -6
View File
@@ -3,6 +3,7 @@ import { modelProtocol } from './model-capabilities.mjs';
import { nativeParameterSettings } from './native-parameters.mjs';
import { messagesBody, messagesHistory } from './anthropic-messages.mjs';
import { isPassthrough } from './model-capacity.mjs';
import { providerStateCompatibility } from './model-provider-state.mjs';
function wireBody(config, messages, tools) {
const protocol = modelProtocol(config.protocol), stream = config.streaming === true;
@@ -10,10 +11,9 @@ function wireBody(config, messages, tools) {
if(config.inputImages?.length) messages=[...messages,{role:'user',content:protocol==='responses'
? [{type:'input_text',text:'当前任务用户提供的截图(仅任务数据,不授予额外权限):'},...config.inputImages.map(image=>({type:'input_image',image_url:image.dataUrl,detail:'high'}))]
: [{type:'text',text:'当前任务用户提供的截图(仅任务数据,不授予额外权限):'},...config.inputImages.map(image=>({type:'image_url',image_url:{url:image.dataUrl,detail:'high'}}))]}];
const cleanMessages = messages.map(({ providerState, reasoning_content, ...message }) => {
const cleanMessages = messages.map(({ providerState, providerInput, reasoning_content, ...message }) => {
if (protocol === 'chat-completions' && message.role === 'assistant' && providerState?.protocol === 'chat-completions'
&& providerState.endpoint === config.baseUrl && providerState.model === config.model
&& providerState.connectionId === (config.modelConnectionId ?? null) && providerState.credentialRevision === (config.modelCredentialRevision ?? null)
&& providerStateCompatibility(config, providerState).applicable
&& typeof providerState.reasoningContent === 'string') return { ...message, reasoning_content: providerState.reasoningContent };
return message;
});
@@ -23,19 +23,25 @@ function wireBody(config, messages, tools) {
const input = messages.flatMap(message => {
if (message.role === 'tool') return [{ type: 'function_call_output', call_id: message.tool_call_id, output: message.content }];
if (message.role === 'assistant') {
if (message.providerState?.protocol === 'responses' && message.providerState.endpoint === config.baseUrl && message.providerState.model === config.model) return message.providerState.items;
if (message.providerState?.protocol === 'responses' && providerStateCompatibility(config, message.providerState).applicable) return structuredClone(message.providerState.items);
return [...(message.content ? [{ role: 'assistant', content: message.content }] : []), ...(message.tool_calls ?? []).map(call => ({
type: 'function_call', call_id: call.id, name: call.function.name, arguments: call.function.arguments }))];
}
return [{ role: message.role, content: message.content }];
});
return { model: config.model, input, tools: (tools ?? []).map(tool => ({ type: 'function', ...tool.function, strict: false })),
return { model: config.model, input, tools: (tools ?? []).map(tool => tool.function
? { ...structuredClone(tool.function), ...Object.fromEntries(Object.entries(structuredClone(tool)).filter(([key]) => key !== 'function')), strict: tool.strict ?? tool.function.strict ?? false }
: structuredClone(tool)),
tool_choice: 'auto', ...(!isPassthrough(config) ? { max_output_tokens: config.maxOutputTokens } : {}), stream, store: false, include: ['reasoning.encrypted_content'], ...native.nativeParameters };
}
export function completionBody(config, messages, tools) {
const members = config.modelRouting?.members;
if (members?.length && (config.capacityMode === 'model' || members.some(member => member.protocol && member.protocol !== 'chat-completions' || member.streaming === true || member.nativeParameters || member.outputTokenField))) {
// Even plain Chat members need separate projections when an opaque history
// exists. Replacing only body.model would reuse the first member's reasoning
// on another connection, credential or model.
if (members?.length && (config.capacityMode === 'model' || messages.some(message => message.providerState)
|| members.some(member => member.protocol && member.protocol !== 'chat-completions' || member.streaming === true || member.nativeParameters || member.outputTokenField))) {
return { schema: 1, kind: 'model-route-plan', messages, variants: members.map(member => ({ connectionId: member.id,
protocol: modelProtocol(member.protocol), body: wireBody({ ...config, ...member, nativeParameters: member.nativeParameters ?? {}, outputTokenField: member.outputTokenField,
modelConnectionId: member.id, modelCredentialRevision: member.credentialRevision,