Files
OmniRoute/open-sse/services/conolAuth.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

56 lines
1.6 KiB
TypeScript

export const CONOL_SESSION_COOKIE_NAME = "__Secure-better-auth.session_token";
export interface ConolCredentialInput {
apiKey?: unknown;
accessToken?: unknown;
cookie?: unknown;
providerSpecificData?: unknown;
}
function readString(value: unknown): string {
return typeof value === "string" ? value.trim() : "";
}
function readStoredValue(value: unknown): string {
const raw = readString(value);
if (!raw || !raw.startsWith("{")) return raw;
try {
const parsed = JSON.parse(raw) as Record<string, unknown>;
return (
readString(parsed.cookie) ||
readString(parsed[CONOL_SESSION_COOKIE_NAME]) ||
readString(parsed.sessionToken)
);
} catch {
return raw;
}
}
export function normalizeConolCookie(rawValue: string): string {
const raw = readStoredValue(rawValue).replace(/^Cookie:\s*/i, "").trim();
if (!raw) return "";
if (raw.includes("=")) return raw;
return `${CONOL_SESSION_COOKIE_NAME}=${raw}`;
}
export function resolveConolCredentials(credentials?: ConolCredentialInput): {
cookie: string;
} {
const providerData =
credentials?.providerSpecificData &&
typeof credentials.providerSpecificData === "object" &&
!Array.isArray(credentials.providerSpecificData)
? (credentials.providerSpecificData as Record<string, unknown>)
: {};
const raw =
readStoredValue(providerData.cookie) ||
readStoredValue(providerData[CONOL_SESSION_COOKIE_NAME]) ||
readStoredValue(providerData.sessionToken) ||
readStoredValue(credentials?.cookie) ||
readStoredValue(credentials?.apiKey) ||
readStoredValue(credentials?.accessToken);
return { cookie: normalizeConolCookie(raw) };
}