Files
OmniRoute/open-sse/handlers/chatCore/thinkingSignatureRecovery.ts
Praveen K Palaniswamy 65e81158ab fix(ollama): route models by advertised capability (#11088)
Landed with the design call resolved per the owner's pick — **option 1**: the synced store is now endpoint-agnostic (persistDiscoveredModels and managedModelImport no longer drop non-chat models at write time), and chat selectability moved to read time (auto-pool expansion in autoStrategy applies filterChatSelectableModels; the models-route projection already had its chatOnly filter). Your discovery test now passes end-to-end (3/3): /api/show capabilities persist per connection and image/embedding requests route through the advertising host.

Reconciliation notes: conflicted areas merged onto the current tip (adobe discovery import, requestedModel preflight signature, resolvedProvider fast-path coexists with the synced-route override — explicit resolution wins); carried base-red drains (#10055 memoization, #11071 test variants) dropped as already-landed; the managed-model-import exclusion test was propagated to the new contract (image/video models persist; the read filter still hides them from chat pickers — pinned by a new assertion). Full battery: 205/206 focused (the one red is a confirmed periodic-timer timing flake on the loaded devbox — 20/20 isolated), autoCombo vitest 30/30, combo suites 46/46, gates + typecheck clean.

Thank you @yourspraveen — the capability probe + routing design was right; it just needed the store contract opened up. Fixes #11087.
2026-08-23 11:45:01 -03:00

100 lines
2.6 KiB
TypeScript

import {
executeWithAnthropicThinkingSignatureRecovery,
isAnthropicThinkingSignatureError,
} from "./passthroughHelpers.ts";
type ProviderExecution = {
response: Response;
url?: string;
headers?: Headers | Record<string, string>;
transformedBody?: unknown;
};
type ParsedError = {
statusCode: number;
message: string;
retryAfterMs: number | null;
responseBody: unknown;
errorCode?: unknown;
errorType?: unknown;
};
export type ThinkingSignatureRecoveryResult = {
attempted: boolean;
succeeded: boolean;
execution: ProviderExecution | null;
error: ParsedError | null;
recoveryBody: unknown | null;
};
/**
* Retry exactly once after Anthropic's explicit thinking-signature validation
* error. The caller keeps all connection/provider resilience state untouched
* until this request-scoped recovery has finished.
*/
export async function recoverAnthropicThinkingSignature(args: {
provider?: string | null;
statusCode: number;
message: string;
body: unknown;
execute: (body: unknown) => Promise<ProviderExecution>;
parseError: (response: Response) => Promise<ParsedError>;
}): Promise<ThinkingSignatureRecoveryResult> {
if (
!isAnthropicThinkingSignatureError({
provider: args.provider,
status: args.statusCode,
message: args.message,
})
) {
return {
attempted: false,
succeeded: false,
execution: null,
error: null,
recoveryBody: null,
};
}
const firstFailure = {
response: new Response(null, { status: args.statusCode }),
status: args.statusCode,
message: args.message,
};
const recovery = await executeWithAnthropicThinkingSignatureRecovery({
provider: args.provider,
body: args.body,
execute: async (requestBody) => {
if (requestBody === args.body) return firstFailure;
return args.execute(requestBody);
},
getError: async (result) => {
if (result === firstFailure) {
return { status: firstFailure.status, message: firstFailure.message };
}
if (result.response.ok) return null;
const details = await args.parseError(result.response.clone());
return { status: details.statusCode, message: details.message };
},
});
if (!recovery.retried) {
return {
attempted: false,
succeeded: false,
execution: null,
error: null,
recoveryBody: null,
};
}
const execution = recovery.result as ProviderExecution;
return {
attempted: true,
succeeded: execution.response.ok,
execution,
error: execution.response.ok ? null : await args.parseError(execution.response),
recoveryBody: recovery.recoveryBody,
};
}