Files
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

59 lines
2.0 KiB
TypeScript

export type ChatGptWebCodexSecrets = {
cookie?: string;
storageState?: Record<string, unknown>;
runtimeKey?: string;
};
const VERSION = 2;
function normalizedCookie(value: string): string {
return value.trim().replace(/^cookie\s*:\s*/i, "");
}
export function encodeChatGptWebCodexSecrets(secrets: ChatGptWebCodexSecrets): string {
const cookie = secrets.cookie ? normalizedCookie(secrets.cookie) : "";
const storageState = secrets.storageState;
if (!cookie && (!storageState || typeof storageState !== "object")) {
throw new Error("ChatGPT Cookie or verified browser storage state is required");
}
return JSON.stringify({
version: VERSION,
...(storageState ? { storageState } : { cookie }),
...(secrets.runtimeKey?.trim() ? { runtimeKey: secrets.runtimeKey.trim() } : {}),
});
}
export function decodeChatGptWebCodexSecrets(value: string): ChatGptWebCodexSecrets {
const trimmed = value.trim();
if (!trimmed) throw new Error("ChatGPT Web (Codex) credentials are missing");
try {
const parsed = JSON.parse(trimmed) as Record<string, unknown>;
if (
parsed.version === VERSION &&
parsed.storageState &&
typeof parsed.storageState === "object"
) {
return {
storageState: parsed.storageState as Record<string, unknown>,
...(typeof parsed.runtimeKey === "string" && parsed.runtimeKey.trim()
? { runtimeKey: parsed.runtimeKey.trim() }
: {}),
};
}
if ((parsed.version === VERSION || parsed.version === 1) && typeof parsed.cookie === "string") {
const cookie = normalizedCookie(parsed.cookie);
if (!cookie) throw new Error("ChatGPT Cookie is missing");
return {
cookie,
...(typeof parsed.runtimeKey === "string" && parsed.runtimeKey.trim()
? { runtimeKey: parsed.runtimeKey.trim() }
: {}),
};
}
} catch (error) {
if (error instanceof SyntaxError) return { cookie: normalizedCookie(trimmed) };
throw error;
}
return { cookie: normalizedCookie(trimmed) };
}