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

46 lines
1.6 KiB
TypeScript

import { ChatGptBrowserWorker } from "../../vendor/codex-chatgpt-web/adapters/chatgpt-web/browser-worker.ts";
import { TurnBroker } from "../../vendor/codex-chatgpt-web/adapters/chatgpt-web/turn-broker.ts";
import { chatGptTurnSessions } from "../../vendor/codex-chatgpt-web/adapters/chatgpt-web/turn-execution.ts";
import { connectionRuntimePaths } from "./storageState.ts";
import { stopChatGptWebCodexTunnelRuntime } from "./tunnelClient.ts";
const activeWorkers = new Set<ChatGptBrowserWorker>();
const activeBrokers = new Set<TurnBroker>();
export function trackChatGptWebCodexRuntime(
worker: ChatGptBrowserWorker,
brokerSocketPath: string
): void {
activeWorkers.add(worker);
activeBrokers.add(TurnBroker.forSocket(brokerSocketPath));
}
export function getChatGptWebCodexRuntimeCounts(): {
activeTurns: number;
waitingTurns: number;
browserWorkers: number;
brokers: number;
} {
return {
activeTurns: chatGptTurnSessions.activeCount(),
waitingTurns: chatGptTurnSessions.waitingCount(),
browserWorkers: activeWorkers.size,
brokers: activeBrokers.size,
};
}
export async function stopChatGptWebCodexRuntime(): Promise<void> {
chatGptTurnSessions.clear();
const workers = [...activeWorkers];
const brokers = [...activeBrokers];
activeWorkers.clear();
activeBrokers.clear();
await Promise.allSettled(workers.map((worker) => worker.close()));
await Promise.allSettled(brokers.map((broker) => broker.close()));
await stopChatGptWebCodexTunnelRuntime();
}
export function brokerSocketPathForConnection(connectionId: string): string {
return connectionRuntimePaths(connectionId).brokerSocketPath;
}