Ayuriel/openclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix header precedence: 3-way merge (dynamic < discovered < configured)

Browse Source
This commit is contained in:
Rudi Cilibrasi 2026-03-20 19:21:37 -07:00 committed by Rudi Cilibrasi
parent 8c78ee09ce
commit 7a11196ccb
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/agents/pi-embedded-runner/model.ts
View File

@ -297,6 +297,25 @@ function preserveDiscoveredTransportMetadata(params: {
const dynamicHeaders = sanitizeModelHeaders(dynamicModel.headers, {
stripSecretRefMarkers: true,
});
// Headers use a 3-way merge: dynamic template < discovered < configured.
// dynamicModel.headers already includes configured overrides from
// applyConfiguredProviderOverrides, so we extract configured headers separately
// and apply them last to ensure they win over stale discovered headers.
const providerHeaders = sanitizeModelHeaders(providerConfig?.headers, {
stripSecretRefMarkers: true,
});
const configuredModelHeaders = sanitizeModelHeaders(configuredModel?.headers, {
stripSecretRefMarkers: true,
});
const mergedHeaders =
dynamicHeaders || discoveredHeaders || providerHeaders || configuredModelHeaders
? {
...dynamicHeaders,
...discoveredHeaders,
...providerHeaders,
...configuredModelHeaders,
}
: undefined;
return {
...dynamicModel,
api: configuredModel?.api ?? providerConfig?.api ?? discoveredModel.api ?? dynamicModel.api,
@ -306,13 +325,7 @@ function preserveDiscoveredTransportMetadata(params: {
maxTokens: configuredModel?.maxTokens ?? discoveredModel.maxTokens ?? dynamicModel.maxTokens,
reasoning: configuredModel?.reasoning ?? discoveredModel.reasoning ?? dynamicModel.reasoning,
cost: discoveredModel.cost ?? dynamicModel.cost,
headers:
discoveredHeaders || dynamicHeaders
? {
...dynamicHeaders,
...discoveredHeaders,
}
: undefined,
headers: mergedHeaders,
};
}