cartethyia 2.4.5 → 2.5.0

package/src/providers/discovery/probing-service.ts

@@ -1,1001 +1,1022 @@
-import { captureProviderExchange, type ProviderExchangeCapture } from "../../transport/dispatch/attempt-finalize";
-import { globalOrOwnedBy } from "../../persistence/tenant-scope";
-/**
- * Provider probing and model-discovery orchestration.
- *
- * Network probes and `/v1/models` discovery stay separate from the Drizzle
- * catalog repository while sharing the provider catalog contract.
- */
-import { and, eq, inArray, sql } from "drizzle-orm";
-import type { CartethyiaDatabase } from "../../persistence/db-handle";
-import { models, providerAccounts, providers } from "../../persistence/schema";
-import type { CanonicalEvent, CanonicalRequest, WireFamily } from "../../protocol/canonical-model";
-import { WIRE_FAMILIES } from "../../protocol/canonical-model";
-import { isRecord } from "../../protocol/codecs";
-import type { FetchLike } from "../quota/quota-contracts";
-import type { CompatibilityProfile } from "../provider-metadata";
-import {
-  type ByokConnectionTestRequest,
-  type ByokConnectionTestResult,
-  type ProbeAllAccountsResult,
-  type ProbeAllModelsResult,
-  type ProbeModelRequest,
-  type ProbeModelResult,
-} from "./discovery-types";
-import { modelsDevCatalog } from "./models-dev-catalog";
-import { fetchOpenAICompatibleModels } from "./openai-model-discovery";
-import {
-  applyDiscoveredWire,
-  resolveDiscoveredWire,
-  staticEndpointForWire,
-  type DiscoveredModelWire,
-} from "./probe-wire";
-import {
-  buildProbeCanonicalRequest,
-  computeProbeVerdict,
-  extractSample,
-  GROK_407_PROBE_PROMPT,
-  grok407ProbeFailure,
-  hasMeaningfulOutput,
-  loadProbePreferences,
-  recordProbeHealth,
-  resolveProbeAdapter,
-  resolveProbeTarget,
-  selectProbeAccount,
-  wireContextFrom,
-  type ProbeProviderRow,
-} from "./probe-phases";
-import { createProbeFetch } from "../operations/probe-fetch";
-import { authHeaders } from "../adapters/compatible-adapter";
-import {
-  byokAuthHeaderShape,
-  modelDiscoveryBaseUrl,
-  modelListUrl,
-  resolveByokWireProfile,
-  splitEndpointBaseUrl,
-} from "../operations/byok-wire-profile";
-import { resolveCustomCliHeaders } from "../operations/custom-cli-headers";
-import { resolveCredentialForAccount } from "../operations/provider-credential-service";
-import { decryptCredentialToString } from "../../security/crypto";
-import { GatewayError } from "../../protocol/gateway-error";
-import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
-import { computeTokensPerSec } from "../../observability/token-speed";
-import { TelemetryPayloadCapture } from "../../observability/payload-capture";
-import { providerBaseUrl } from "../provider-metadata";
-import { isBundledProviderId, parseProviderId, type ProviderDispatchTarget as AdapterDispatchTarget, type ValidatedOutboundFetch } from "../provider-contracts";
-import type { ModelDefinition } from "../provider-model-definition";
-import type { ProviderRegistry } from "../provider-registry";
-
-/** Max models probed concurrently per batch (outside the sequential warm-up). */
-const PROBE_CONCURRENCY = 5;
-/** Max accounts probed concurrently; batches wait before starting the next ten. */
-const PROBE_ACCOUNT_CONCURRENCY = 10;
-
-export interface ProbeOutboundBinding {
-  readonly fetch: ValidatedOutboundFetch;
-  readonly networkPoolId?: string;
-  readonly release?: () => void;
-}
-
-export type ProbeOutboundResolver = (
-  tenantId: string,
-  providerId?: string,
-) => Promise<ValidatedOutboundFetch | ProbeOutboundBinding> | ValidatedOutboundFetch | ProbeOutboundBinding;
-
-interface ProviderProbingDeps {
-  readonly db: CartethyiaDatabase;
-  readonly telemetryBuffer: TelemetryBatchBuffer | undefined;
-  readonly defaultEndpoints: Record<WireFamily, string>;
-  readonly bundledModelCatalog: ReadonlyMap<string, readonly ModelDefinition[]>;
-  readonly outboundFetchFor: ProbeOutboundResolver;
-  readonly snapshotInvalidator: { invalidate(): unknown };
-  readonly providerRegistry: ProviderRegistry;
-}
-
-/**
- * Adapts a validated outbound fetch to the `FetchLike` shape discovery
- * helpers expect. Only the call signature is consumed downstream.
- */
-function asFetchLike(fetchFn: ValidatedOutboundFetch): FetchLike {
-  const wrapped = (input: RequestInfo | URL, init?: RequestInit): Promise<Response> =>
-    fetchFn(input, init);
-  return Object.assign(wrapped, { preconnect: () => undefined });
-}
-
-function asOutboundBinding(
-  resolved: ValidatedOutboundFetch | ProbeOutboundBinding,
-): ProbeOutboundBinding {
-  return typeof resolved === "function" ? { fetch: resolved } : resolved;
-}
-export class ProviderProbingService {
-  private readonly db: CartethyiaDatabase;
-  private readonly telemetryBuffer: TelemetryBatchBuffer | undefined;
-  private readonly payloadCapture: TelemetryPayloadCapture;
-  private readonly defaultEndpoints: Record<WireFamily, string>;
-  private readonly bundledModelCatalog: ReadonlyMap<string, readonly ModelDefinition[]>;
-  private readonly outboundFetchFor: ProbeOutboundResolver;
-  private readonly snapshotInvalidator: { invalidate(): unknown };
-  private readonly providerRegistry: ProviderRegistry;
-
-  constructor(deps: ProviderProbingDeps) {
-    this.db = deps.db;
-    this.telemetryBuffer = deps.telemetryBuffer;
-    this.payloadCapture = new TelemetryPayloadCapture(this.db);
-    this.defaultEndpoints = deps.defaultEndpoints;
-    this.bundledModelCatalog = deps.bundledModelCatalog;
-    this.outboundFetchFor = deps.outboundFetchFor;
-    this.snapshotInvalidator = deps.snapshotInvalidator;
-    this.providerRegistry = deps.providerRegistry;
-  }
-
-  /**
-   * The provider row columns that decide wire-family/endpoint resolution.
-   * `probeModel` loads this once and reuses it for the contract gate, the
-   * custom-adapter fallback, and the wire context.
-   */
-  private async loadProviderWireRow(providerId: string): Promise<ProbeProviderRow | undefined> {
-    const rows = await this.db
-      .select({
-        baseUrl: providers.baseUrl,
-        wireFamilyDefault: providers.wireFamilyDefault,
-        compatibilityProfile: providers.compatibilityProfile,
-        requiresAccount: providers.requiresAccount,
-      })
-      .from(providers)
-      .where(eq(providers.id, providerId))
-      .limit(1);
-    return rows[0];
-  }
-
-  /**
-   * Static endpoint for one provider + wire family, if the bundled catalog
-   * ships a static definition for it. Used by manual registration (via the
-   * console store) so it resolves the same provider-truth endpoints as probes.
-   */
-  async resolveStaticEndpoint(
-    providerId: string,
-    wireFamily: WireFamily,
-  ): Promise<string | undefined> {
-    return staticEndpointForWire(this.bundledModelCatalog, providerId, wireFamily);
-  }
-
-  /** One-shot connectivity test: resolves a usable account + the real per-provider
-   * adapter, dispatches a minimal canonical request through the model's own wire
-   * family/endpoint (never a hardcoded `/v1/chat/completions`), and records the
-   * outcome into `telemetry_events` via the same writer live traffic uses. */
-  async probeModel(
-    tenantId: string,
-    providerId: string,
-    request: ProbeModelRequest,
-  ): Promise<ProbeModelResult> {
-    const startedAt = Date.now();
-    const modelId = request.modelId;
-    // One provider snapshot per probe: the contract gate, the account gate, the
-    // custom-adapter fallback, and the wire context all read this same row, so a
-    // concurrent edit cannot make two reads disagree.
-    const providerWireRow = await this.loadProviderWireRow(providerId);
-    const requiresAccount = providerWireRow?.requiresAccount ?? true;
-
-    const { wireFamily, serviceKind, endpointPath, sourceSurface, capabilityProfile } = await resolveProbeTarget({
-      db: this.db,
-      bundledModelCatalog: this.bundledModelCatalog,
-      defaultEndpoints: this.defaultEndpoints,
-      providerId,
-      modelId,
-      request,
-      providerWireRow,
-    });
-
-    const account = await selectProbeAccount({
-      db: this.db,
-      tenantId,
-      providerId,
-      requestedAccountId: request.accountId,
-      requiresAccount,
-      allowCoolingAccount:
-        providerId === "grok" && request.prompt === GROK_407_PROBE_PROMPT,
-    });
-    if (!account.ok) {
-      return { ok: false, latencyMs: Date.now() - startedAt, error: account.error };
-    }
-    const accountId = account.accountId;
-
-    const adapter = await resolveProbeAdapter({
-      providerRegistry: this.providerRegistry,
-      providerId,
-      providerWireRow,
-    });
-    if (!adapter) {
-      return {
-        ok: false,
-        latencyMs: Date.now() - startedAt,
-        error: `No adapter registered for provider ${providerId}`,
-      };
-    }
-
-    const { probeReasoning, payloadCaptureEnabled } = await loadProbePreferences({
-      db: this.db,
-      tenantId,
-      wireFamily,
-      request,
-    });
-    const canonicalRequest = buildProbeCanonicalRequest({
-      modelId,
-      request,
-      probeReasoning,
-      sourceSurface,
-    });
-    let capturedRequest = canonicalRequest;
-    const parsedProviderId = parseProviderId(providerId);
-    const candidate: AdapterDispatchTarget = {
-      provider_id: parsedProviderId,
-      model_id: modelId,
-      wire_family: wireFamily,
-      endpoint_path: endpointPath,
-      // The route's real profile, not `{}`. A probe runs the production adapter,
-      // which gates on capabilities — an empty profile made it reject the probe
-      // over capabilities the route actually has (`prompt_caching`, `tools`,
-      // `reasoning`), reporting a healthy provider as broken.
-      capabilities: capabilityProfile,
-    };
-
-    const probeSignal = AbortSignal.timeout(30_000);
-    const events: CanonicalEvent[] = [];
-    /**
-     * Populated when the probe dials. Declared here, not inside the try, so the
-     * model the upstream named is still readable after the block unwinds — the
-     * result is assembled outside it.
-     */
-    let probeCapture: ProviderExchangeCapture | undefined;
-    let ttfbMs: number | undefined;
-    let dispatchError: unknown;
-    /** Hits a `websearch` probe returned; surfaced to the console verbatim. */
-    let searchResults: ProbeModelResult["searchResults"];
-    let networkPoolId: string | undefined;
-    try {
-      // Public providers (`requires_account: false`) probe credential-free;
-      const credential = accountId
-        ? await resolveCredentialForAccount(this.db, providerId, accountId)
-        : { provider_id: parsedProviderId, credential_kind: "none" as const };
-      const outbound = asOutboundBinding(await this.outboundFetchFor(tenantId, providerId));
-      networkPoolId = outbound.networkPoolId;
-      probeCapture = {
-        request: null,
-        response: Promise.resolve(null),
-      };
-      // The same wrapper a real dispatch uses, so the probe reads the model the
-      // upstream named from the raw bytes rather than from a synthesized event.
-      const probeFetch = createProbeFetch(
-        captureProviderExchange(outbound.fetch, probeCapture, false),
-      );
-      try {
-        if (serviceKind === "websearch") {
-          if (typeof adapter.websearch !== "function") {
-            throw new GatewayError(
-              "capability_unsupported",
-              400,
-              `Provider ${providerId} has no web search transport`,
-            );
-          }
-          const searchProbeQuery = request.prompt?.trim() || "Cartethyia gateway probe";
-          const response = await adapter.websearch(
-            { model: modelId, query: searchProbeQuery, max_results: 3 },
-            candidate,
-            {
-              credential,
-              deadline: startedAt + 30_000,
-              abort_signal: probeSignal,
-              outbound_fetch: probeFetch,
-            },
-          );
-          if (ttfbMs === undefined) ttfbMs = Date.now() - startedAt;
-          searchResults = response.results.map((hit) => ({
-            title: hit.title,
-            url: hit.url,
-            snippet: hit.snippet,
-          }));
-          if (!response.results || response.results.length === 0) {
-            dispatchError = new GatewayError("platform_unavailable", 502, "web search returned no results");
-          }
-        } else if (serviceKind === "systemone") {
-          if (typeof adapter.systemone !== "function") {
-            throw new GatewayError(
-              "capability_unsupported",
-              400,
-              `Provider ${providerId} has no System One transport`,
-            );
-          }
-          const response = await adapter.systemone(
-            {
-              model: modelId,
-              state: "Customer: I was charged twice for my order this morning.",
-              questions: {
-                probe: {
-                  type: "noul",
-                  instructions: "Is the customer reporting a billing problem?",
-                },
-              },
-            },
-            candidate,
-            {
-              credential,
-              deadline: startedAt + 30_000,
-              abort_signal: probeSignal,
-              outbound_fetch: probeFetch,
-            },
-          );
-          if (ttfbMs === undefined) ttfbMs = Date.now() - startedAt;
-          const raw = await response.text().catch(() => "");
-          if (!response.ok) {
-            dispatchError = new GatewayError(
-              response.status >= 500 ? "platform_unavailable" : "invalid_request",
-              response.status,
-              `System One upstream error: ${raw.slice(0, 240)}`,
-            );
-          } else {
-            let parsed: unknown;
-            try {
-              parsed = raw ? JSON.parse(raw) : null;
-            } catch {
-              dispatchError = new GatewayError("platform_unavailable", 502, "System One returned invalid JSON");
-            }
-            if (parsed !== null && parsed !== undefined) {
-              const answers =
-                typeof parsed === "object" ? (parsed as Record<string, unknown>).answers : undefined;
-              const hasAnswers =
-                answers !== undefined &&
-                answers !== null &&
-                typeof answers === "object" &&
-                Object.keys(answers as Record<string, unknown>).length > 0;
-              if (!hasAnswers) {
-                dispatchError = new GatewayError(
-                  "platform_unavailable",
-                  502,
-                  "System One returned no answers",
-                );
-              }
-            }
-          }
-        } else {
-        const dispatchProbe = async (request: CanonicalRequest): Promise<void> => {
-          capturedRequest = request;
-          for await (const event of adapter.dispatch(request, candidate, {
-            credential,
-            deadline: startedAt + 30_000,
-            abort_signal: probeSignal,
-            outbound_fetch: probeFetch,
-          })) {
-            if (ttfbMs === undefined) ttfbMs = Date.now() - startedAt;
-            events.push(event);
-          }
-        };
-        try {
-          await dispatchProbe(canonicalRequest);
-          if (!hasMeaningfulOutput(events)) throw new Error("probe response content empty");
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          if (!/empty\s+(?:response\s+)?content|response\s+content\s+empty/i.test(message)) {
-            throw error;
-          }
-          // Some reasoning models spend the short probe budget before producing
-          // visible text. Retry with a larger output allowance, and stream when
-          // the first attempt did not — a streamed probe keeps the connection
-          // open while the model reasons instead of waiting for a complete body.
-          // Generic: no provider/model id special case is needed.
-          events.length = 0;
-          ttfbMs = undefined;
-          await dispatchProbe({
-            ...canonicalRequest,
-            stream: true,
-            generation_controls: {
-              ...canonicalRequest.generation_controls,
-              max_tokens: 1024,
-              max_output_tokens: 1024,
-            },
-          });
-        }
-        }
-      } finally {
-        outbound.release?.();
-      }
-    } catch (error) {
-      dispatchError = error;
-    }
-    const featureFailure = grok407ProbeFailure({
-      providerId,
-      prompt: request.prompt,
-      events,
-      dispatchError,
-    });
-    if (featureFailure !== undefined) dispatchError = featureFailure;
-
-    const upstreamStatusCode =
-      dispatchError instanceof GatewayError
-        ? typeof dispatchError.details.upstreamStatus === "number"
-          ? dispatchError.details.upstreamStatus
-          : typeof dispatchError.details.providerStatus === "number"
-            ? dispatchError.details.providerStatus
-            : undefined
-        : undefined;
-    await recordProbeHealth({
-      db: this.db,
-      invalidator: this.snapshotInvalidator,
-      accountId,
-      dispatchError,
-      modelId,
-      upstreamStatusCode,
-    });
-
-    const latencyMs = Date.now() - startedAt;
-    // A native-service probe carries no canonical events: its verdict is the
-    // decision response itself (no dispatch error + answers present), which the
-    // branch above already encoded into `dispatchError`. Web search is a
-    // native service too — routing it through the LLM verdict demanded a
-    // `terminal` event the search transport never emits, so a search that
-    // returned hits was reported as a failure with an empty message.
-    const { ok, errorMessage, usage } =
-      serviceKind === "systemone" || serviceKind === "websearch"
-        ? {
-            ok: dispatchError === undefined,
-            errorMessage:
-              dispatchError === undefined
-                ? undefined
-                : dispatchError instanceof GatewayError
-                  ? `Search provider ${providerId}/${modelId} — ${dispatchError.message} (HTTP ${dispatchError.status})`
-                  : dispatchError instanceof Error
-                    ? `${providerId}/${modelId} — ${dispatchError.message}`
-                    : String(dispatchError),
-            usage: undefined,
-          }
-        : computeProbeVerdict({
-            events,
-            dispatchError,
-            wireFamily,
-          });
-
-    const requestId = crypto.randomUUID();
-
-    // Token speed shared with live traffic (`computeTokensPerSec`): probes
-    // record TTFT+latency only, so they report end-to-end effective speed.
-    const tokensPerSec = computeTokensPerSec({
-      outputTokens: usage?.output_tokens,
-      latencyMs,
-    });
-
-    // Probe telemetry rides the same batch buffer as live traffic. Keep the
-    // probe bodies linked by request_id so the console can inspect the exact
-    // canonical request and provider event stream that produced the result.
-    this.telemetryBuffer?.enqueue({
-      tenantId,
-      requestId,
-      sourceSurface,
-      requestedModel: modelId,
-      endpoint: endpointPath,
-      providerId,
-      ...(accountId ? { accountId } : {}),
-      ...(networkPoolId ? { networkPoolId } : {}),
-      latencyMs,
-      ...(ttfbMs !== undefined ? { ttfbMs } : {}),
-      stream: capturedRequest.stream,
-      status: ok ? "completed" : "failed",
-      ...(ok ? {} : { errorCategory: errorMessage ?? "probe_failed" }),
-      ...(usage ? { usage } : {}),
-      ...(tokensPerSec !== undefined ? { tokensPerSec } : {}),
-    });
-    if (this.telemetryBuffer && payloadCaptureEnabled) {
-      await this.payloadCapture
-        .capture({
-          tenantId,
-          requestId,
-          requestBody: capturedRequest,
-          responseBody: events,
-          scope: "tenant",
-          tenantOptIn: true,
-        })
-        .catch(() => undefined);
-    }
-
-    const sample = extractSample(events);
-    const reportedModel = await probeCapture?.reportedModel?.catch(() => undefined);
-    return {
-      ...(accountId ? { accountId } : {}),
-      ok,
-      latencyMs,
-      ...(ttfbMs !== undefined ? { ttfbMs } : {}),
-      ...(upstreamStatusCode === undefined ? {} : { statusCode: upstreamStatusCode }),
-      ...(sample ? { sample } : {}),
-      ...(reportedModel === undefined ? {} : { reportedModel }),
-      ...(searchResults !== undefined && searchResults.length > 0 ? { searchResults } : {}),
-      ...(errorMessage ? { error: errorMessage } : {}),
-    };
-  }
-
-  /**
-   * Ad-hoc connectivity test for a not-yet-persisted BYOK provider.
-   *
-   * Dispatches a real `GET <base>/models` through the same SSRF-validated
-   * outbound fetch live traffic uses, stamping the credential with the auth
-   * header the chosen wire family actually reads (`x-api-key` for Messages,
-   * `Authorization: Bearer` otherwise) plus that wire's CLI identity headers.
-   * Reachability is the contract: any HTTP response proves the operator's base
-   * URL, credential, and egress path work — a 4xx is reported with its status
-   * rather than disguised as a transport failure.
-   */
-  async testByokConnection(
-    tenantId: string,
-    request: ByokConnectionTestRequest,
-  ): Promise<ByokConnectionTestResult> {
-    const startedAt = Date.now();
-    const requestedWire = request.wireFamily;
-    const wireFamily: WireFamily = (WIRE_FAMILIES as readonly string[]).includes(requestedWire)
-      ? (requestedWire as WireFamily)
-      : "chat";
-    // An operator who pasted a full endpoint (`…/anthropic/v1/messages`) gets it
-    // stripped before the model list is derived, and told so. Probing the
-    // corrected root is what makes the result actionable: the alternative is a
-    // bare 404 against a path the gateway built from their own typo.
-    const submitted = splitEndpointBaseUrl(request.baseUrl);
-    const warning =
-      submitted.stripped === ""
-        ? undefined
-        : `Base URL pointed at the endpoint "${submitted.stripped}". Cartethyia derives the model list from the root, so it tested "${submitted.baseUrl}" instead. Save that root as the Base URL.`;
-    const url = modelListUrl(request.baseUrl);
-    const outbound = asOutboundBinding(await this.outboundFetchFor(tenantId));
-    const probeFetch = createProbeFetch(outbound.fetch);
-    try {
-      const headers: Record<string, string> = {
-        accept: "application/json",
-        ...authHeaders(
-          byokAuthHeaderShape([wireFamily]),
-          new TextEncoder().encode(request.apiKey),
-          request.apiKey.trim().length > 0 ? "api_key" : "none",
-        ),
-        ...(request.cliIdentity === false ? {} : resolveCustomCliHeaders(wireFamily)),
-        ...(request.extraHeaders ?? {}),
-      };
-      const response = await probeFetch(url, {
-        method: "GET",
-        headers,
-        signal: AbortSignal.timeout(15_000),
-      });
-      const latencyMs = Date.now() - startedAt;
-      if (!response.ok) {
-        return {
-          ok: false,
-          latencyMs,
-          statusCode: response.status,
-          error: `Upstream rejected the connection test with HTTP ${response.status}`,
-          ...(warning === undefined ? {} : { warning }),
-        };
-      }
-      // A body is nice to have but not required: some gateways answer `/models`
-      // with an empty envelope. Read it defensively so a non-JSON body cannot
-      // turn a successful reachability check into a failure.
-      let modelCount: number | undefined;
-      try {
-        const payload = (await response.json()) as unknown;
-        const entries = Array.isArray(payload)
-          ? payload
-          : isRecord(payload) && Array.isArray(payload["data"])
-            ? payload["data"]
-            : isRecord(payload) && Array.isArray(payload["models"])
-              ? payload["models"]
-              : undefined;
-        if (entries) modelCount = entries.length;
-      } catch {
-        // Non-JSON success body: reachability already proven by the 2xx.
-      }
-      return {
-        ok: true,
-        latencyMs,
-        statusCode: response.status,
-        ...(modelCount === undefined ? {} : { modelCount }),
-        ...(warning === undefined ? {} : { warning }),
-      };
-    } catch (error) {
-      return {
-        ok: false,
-        latencyMs: Date.now() - startedAt,
-        error: error instanceof Error ? error.message : "Connection test failed",
-        ...(warning === undefined ? {} : { warning }),
-      };
-    } finally {
-      outbound.release?.();
-    }
-  }
-
-  async syncModels(tenantId: string, providerId: string): Promise<{ synced: number }> {
-    const outbound = asOutboundBinding(await this.outboundFetchFor(tenantId, providerId));
-    try {
-      const discoveryFetch = asFetchLike(outbound.fetch);
-      const resolver = await this.providerRegistry.resolveModelDiscovery(providerId);
-      if (resolver) {
-        // An account is used when one is usable, and the fetch is attempted
-        // either way. Gating on a credential only made the common case
-        // unreachable: most providers list their models without auth, and the
-        // ones that do not answer 401 themselves, which names the actual
-        // problem where a local 409 named a missing account the operator may
-        // not even need.
-        const account = await this.usableAccount(tenantId, providerId);
-        const secret = account?.secret;
-        const providerRow = await this.loadProviderWireRow(providerId);
-        const effectiveBaseUrl = providerRow?.baseUrl ?? providerBaseUrl(providerId) ?? "";
-        let discovered: readonly ModelDefinition[] | null;
-        try {
-          discovered = await resolver({
-            baseUrl: effectiveBaseUrl,
-            credential: secret ?? "",
-            ...(discoveryFetch ? { fetcher: discoveryFetch } : {}),
-            ...(account?.authState === undefined ? {} : { authState: account.authState }),
-          });
-        } catch (error) {
-          throw new GatewayError(
-            "transport_unavailable",
-            502,
-            `Model discovery failed for ${providerId}: ${error instanceof Error ? error.message : "unknown error"}`,
-            {},
-            "upstream",
-          );
-        }
-        if (!discovered) {
-          throw new GatewayError(
-            "transport_unavailable",
-            502,
-            `Model discovery failed for ${providerId}: endpoint returned no usable models`,
-            {},
-            "upstream",
-          );
-        }
-        const ctx = wireContextFrom(providerRow);
-        return this.persistDiscoveredModels(
-          providerId,
-          discovered,
-          (modelId) => resolveDiscoveredWire(modelId, ctx, undefined, this.defaultEndpoints),
-          ctx.endpointPathsByWireFamily,
-          effectiveBaseUrl,
-        );
-      }
-
-      const providerRow = await this.loadProviderWireRow(providerId);
-      if (providerRow?.baseUrl) {
-        const secret = await this.usableAccountSecret(tenantId, providerId);
-        if (secret) {
-          // An Anthropic-compatible root reads `x-api-key`, not bearer auth,
-          // and a bare host needs its `/v1` segment before `/models` joins on.
-          // Both are derived from the same wire profile dispatch uses, so
-          // auto-fetch behaves identically for either flavor of custom provider.
-          const wireProfile = resolveByokWireProfile(
-            providerRow.wireFamilyDefault,
-            providerRow.compatibilityProfile as CompatibilityProfile | null,
-          );
-          const modelsBaseUrl = modelDiscoveryBaseUrl(providerRow.baseUrl);
-          let discovered: readonly ModelDefinition[] | null;
-          try {
-            discovered = await fetchOpenAICompatibleModels({
-              baseUrl: modelsBaseUrl,
-              providerId,
-              headers: {
-                ...authHeaders(
-                  wireProfile.authHeaderShape,
-                  new TextEncoder().encode(secret),
-                  "api_key",
-                ),
-              },
-              ...(discoveryFetch ? { fetcher: discoveryFetch as typeof fetch } : {}),
-            });
-          } catch (error) {
-            throw new GatewayError(
-              "transport_unavailable",
-              502,
-              `Model discovery failed for ${providerId}: ${error instanceof Error ? error.message : "unknown error"}`,
-              {},
-              "upstream",
-            );
-          }
-          if (discovered && discovered.length > 0) {
-            const ctx = wireContextFrom(providerRow);
-            return this.persistDiscoveredModels(
-              providerId,
-              discovered,
-              (modelId) => resolveDiscoveredWire(modelId, ctx, undefined, this.defaultEndpoints),
-              ctx.endpointPathsByWireFamily,
-              providerRow.baseUrl ?? undefined,
-              // The generic `/models` fetch guesses a wire from the model id;
-              // the row's own profile is what the adapter will enforce, so it
-              // decides which guess is admissible.
-              wireProfile.supportedWireFamilies,
-            );
-          }
-        }
-      }
-
-      // Two reasons a sync reaches here with nothing dialed, and the operator
-      // needs to be told which one. Returning `{synced: 0}` for both made an
-      // unsupported provider indistinguishable from a successful fetch that
-      // found nothing — the console showed a green "0 synced" for a provider
-      // it can never sync.
-      const bundled = isBundledProviderId(providerId);
-      if (!bundled) {
-        // A custom provider has a row and a base URL but no usable credential.
-        // The fix is an account, and saying "no listing endpoint" would send the
-        // operator looking for a capability the provider may well have.
-        throw new GatewayError(
-          "invalid_request",
-          400,
-          `Add an account for ${providerId} first — model listing needs a credential.`,
-          {},
-          "cartethyia",
-        );
-      }
-      if (!(await this.usableAccountSecret(tenantId, providerId))) {
-        // A bundled provider with an account would have gone through the
-        // resolver branch above, so reaching here means none is registered.
-        // Add one first, then fetch.
-        throw new GatewayError(
-          "invalid_request",
-          400,
-          `Add an account for ${providerId} before fetching its models.`,
-          {},
-          "cartethyia",
-        );
-      }
-      // A credential exists and the provider still has no listing path: the
-      // catalog is the compiled one, and new models arrive with an update.
-      throw new GatewayError(
-        "capability_unsupported",
-        400,
-        `${providerId} publishes no model-listing endpoint. Its catalog ships with Cartethyia; new models appear with an update.`,
-        {},
-        "cartethyia",
-      );
-    } finally {
-      outbound.release?.();
-    }
-  }
-
-  private async persistDiscoveredModels(
-    providerId: string,
-    discoveredModels: readonly (string | ModelDefinition)[],
-    resolve: (modelId: string) => DiscoveredModelWire,
-    endpointOverrides?: Partial<Record<WireFamily, string>>,
-    baseUrl?: string,
-    supportedWireFamilies?: readonly WireFamily[],
-  ): Promise<{ synced: number }> {
-    // Static definitions are the injected bundled catalog; the probing service
-    // and the console store are both handed the same startup-built map.
-    const staticDefinitions: readonly ModelDefinition[] =
-      this.bundledModelCatalog.get(providerId) ?? [];
-    const staticEndpoints: Partial<Record<WireFamily, string>> = {};
-    for (const definition of staticDefinitions) {
-      staticEndpoints[definition.wireFamily] ??= definition.endpointPath;
-    }
-    // Fetch only adds genuinely new models: an id the builtin catalog
-    // already owns stays exactly one (builtin) row instead of gaining a
-    // discovered shadow that confuses pickers and deletes.
-    const builtinIds = new Set(staticDefinitions.map((definition) => definition.modelId));
-    // `(modelId, endpointPath)` is the row identity, so a corrected wire family
-    // lands on a *new* row and would leave the old one behind as a dead route.
-    // Collect this run's pairs and drop the provider's superseded discovered
-    // rows for the same ids afterwards.
-    const resolvedPairs: Array<{ modelId: string; endpointPath: string }> = [];
-    const rows: Array<typeof models.$inferInsert> = [];
-    // `(modelId, endpointPath)` is the row identity and the upsert's conflict
-    // target, so a listing that repeats a pair (the bespoke discoveries return
-    // raw upstream ids) would make a multi-row `ON CONFLICT DO UPDATE` fail with
-    // "cannot affect row a second time". Keep the first row per pair, as the
-    // builtin seeder does, so one statement can carry a whole chunk.
-    const seenPairs = new Set<string>();
-    for (const item of discoveredModels) {
-      const modelId = typeof item === "string" ? item : item.modelId;
-      if (builtinIds.has(modelId)) continue;
-      const resolved = resolve(modelId);
-      const discDef = typeof item === "string" ? undefined : item;
-      const { wireFamily, endpointPath } = applyDiscoveredWire({
-        resolvedWireFamily: resolved.wireFamily,
-        resolvedEndpointPath: resolved.endpointPath,
-        ...(discDef !== undefined
-          ? { discoveredWireFamily: discDef.wireFamily, discoveredEndpointPath: discDef.endpointPath }
-          : {}),
-        staticEndpoints,
-        ...(endpointOverrides !== undefined ? { endpointOverrides } : {}),
-        ...(supportedWireFamilies !== undefined ? { supportedWireFamilies } : {}),
-        ...(baseUrl !== undefined ? { baseUrl } : {}),
-      });
-      resolvedPairs.push({ modelId, endpointPath });
-      const pairKey = `${modelId}\u0000${endpointPath}`;
-      if (seenPairs.has(pairKey)) continue;
-      seenPairs.add(pairKey);
-      const knownDefinition = staticDefinitions.find((definition) => definition.modelId === modelId);
-      const sourceUpdatedAt = new Date();
-      const metadata = {
-        contextLimit: knownDefinition?.contextLimit ?? discDef?.contextLimit ?? null,
-        outputLimit: knownDefinition?.outputLimit ?? discDef?.outputLimit ?? null,
-        modalities: knownDefinition?.modalities ?? discDef?.modalities ?? null,
-        reasoning: knownDefinition?.reasoning ?? discDef?.reasoning ?? false,
-        toolCall: knownDefinition?.toolCall ?? discDef?.toolCall ?? false,
-        cost: modelsDevCatalog.costFor(providerId, modelId),
-      };
-      rows.push({
-        providerId,
-        modelId,
-        wireFamily,
-        // A discovery module that classifies an id as a non-chat service (the
-        // System One decision API) states it on its own definition; otherwise the
-        // static catalog's classification wins, and an unclassified id is `llm`.
-        serviceKind: discDef?.serviceKind ?? knownDefinition?.serviceKind ?? "llm",
-        endpointPath,
-        ...metadata,
-        // A discovery module that marks its rows as a free tier gets its own
-        // source, because the model list groups on it: a free-tier row is not
-        // an ordinary fetched one, and collapsing both into `discovered` lost
-        // that distinction at the only point where it is still known.
-        source: discDef?.freeTier === true ? "auto_free" : "discovered",
-        sourceUpdatedAt,
-        enabled: true,
-      });
-    }
-    // One statement per chunk (500, the account-health batch step) instead of
-    // one round-trip per row. `excluded.*` reads the proposed row, so the update
-    // set is the same columns the per-row upsert wrote.
-    for (let offset = 0; offset < rows.length; offset += 500) {
-      await this.db
-        .insert(models)
-        .values(rows.slice(offset, offset + 500))
-        .onConflictDoUpdate({
-          target: [models.providerId, models.modelId, models.endpointPath],
-          set: {
-            serviceKind: sql`excluded.service_kind`,
-            contextLimit: sql`excluded.context_limit`,
-            outputLimit: sql`excluded.output_limit`,
-            modalities: sql`excluded.modalities`,
-            reasoning: sql`excluded.reasoning`,
-            toolCall: sql`excluded.tool_call`,
-            cost: sql`excluded.cost`,
-            // The proposed row's own source, not a constant: a free-tier
-            // discovery and an ordinary one write the same upsert, and pinning
-            // this to `discovered` would relabel every free-tier row on the
-            // next sync.
-            source: sql`excluded.source`,
-            sourceUpdatedAt: sql`excluded.source_updated_at`,
-          },
-        });
-    }
-    const synced = rows.length;
-    // Drop this provider's discovered rows for the synced ids that are no
-    // longer part of the resolved set — the stale `(model, endpoint)` pair left
-    // behind when a corrected wire family moved a model to a new path. Rows the
-    // operator added by hand (`manual`) and ids outside this run are untouched.
-    // `auto_free` is included: it is written by this same sync, so leaving it
-    // out would make a free-tier row the one kind of synced row that never gets
-    // pruned when its id moves.
-    if (resolvedPairs.length > 0) {
-      const pairs = resolvedPairs.map(
-        (pair) => sql`(${pair.modelId}, ${pair.endpointPath})`,
-      );
-      const ids = resolvedPairs.map((pair) => pair.modelId);
-      await this.db
-        .delete(models)
-        .where(
-          and(
-            eq(models.providerId, providerId),
-            inArray(models.source, ["discovered", "auto_free"]),
-            sql`${models.modelId} IN (${sql.join(
-              ids.map((id) => sql`${id}`),
-              sql`, `,
-            )})`,
-            sql`(${models.modelId}, ${models.endpointPath}) NOT IN (${sql.join(pairs, sql`, `)})`,
-          ),
-        );
-    }
-    return { synced };
-  }
-
-  private async usableAccountSecret(
-    tenantId: string,
-    providerId: string,
-  ): Promise<string | undefined> {
-    return (await this.usableAccount(tenantId, providerId))?.secret;
-  }
-
-  /**
-   * The account a credential-scoped discovery will use, with its non-secret
-   * auth configuration. Selection is unchanged — first usable row, preferring a
-   * tenant-owned one — so discovery and dispatch agree on which account answered.
-   */
-  private async usableAccount(
-    tenantId: string,
-    providerId: string,
-  ): Promise<{ readonly secret: string; readonly authState?: Readonly<Record<string, unknown>> } | undefined> {
-    const rows = await this.db
-      .select()
-      .from(providerAccounts)
-      .where(
-        and(
-          eq(providerAccounts.providerId, providerId),
-          globalOrOwnedBy(providerAccounts.tenantId, tenantId),
-        ),
-      );
-    const now = Date.now();
-    const usable = rows
-      .filter(
-        (row) =>
-          row.status !== "disabled" &&
-          (row.cooldownUntil === null || row.cooldownUntil.getTime() <= now),
-      )
-      .sort((left, right) => Number(right.tenantId !== null) - Number(left.tenantId !== null))[0];
-    if (!usable?.credentialCiphertext) return undefined;
-    const authState = isRecord(usable.authState) ? usable.authState as Readonly<Record<string, unknown>> : undefined;
-    return {
-      secret: decryptCredentialToString(usable.credentialCiphertext),
-      ...(authState === undefined ? {} : { authState }),
-    };
-  }
-
-  /**
-   * Batched provider-wide probe: the first request runs sequentially (it warms
-   * OAuth token caches and connection pools for the provider), the rest run
-   * with `Promise.allSettled` bounded to `PROBE_CONCURRENCY`. Each request
-   * carries its model route and service kind so native services never fall
-   * through to an LLM probe.
-   */
-  async probeAllModels(
-    tenantId: string,
-    providerId: string,
-    requests: readonly ProbeModelRequest[],
-  ): Promise<ProbeAllModelsResult> {
-    const results: Array<ProbeAllModelsResult["results"][number]> = [];
-    const [firstRequest, ...restRequests] = requests;
-    if (firstRequest === undefined) return { providerId, results };
-
-    const runOne = async (probeRequest: ProbeModelRequest): Promise<void> => {
-      const outcome = await this.probeModel(tenantId, providerId, probeRequest);
-      results.push({
-        modelId: probeRequest.modelId,
-        ok: outcome.ok,
-        latencyMs: outcome.latencyMs,
-        ...(outcome.error ? { error: outcome.error } : {}),
-      });
-    };
-
-    await runOne(firstRequest);
-    for (let offset = 0; offset < restRequests.length; offset += PROBE_CONCURRENCY) {
-      const batch = restRequests.slice(offset, offset + PROBE_CONCURRENCY);
-      await Promise.allSettled(batch.map((request) => runOne(request)));
-    }
-    return { providerId, results };
-  }
-  async probeAllAccounts(
-    tenantId: string,
-    providerId: string,
-    request: ProbeModelRequest,
-  ): Promise<ProbeAllAccountsResult> {
-    const accounts = await this.db
-      .select({ id: providerAccounts.id })
-      .from(providerAccounts)
-      .where(
-        and(
-          eq(providerAccounts.providerId, providerId),
-          globalOrOwnedBy(providerAccounts.tenantId, tenantId),
-        ),
-      );
-    const results: ProbeAllAccountsResult["results"][number][] = [];
-    for (let offset = 0; offset < accounts.length; offset += PROBE_ACCOUNT_CONCURRENCY) {
-      const batch = accounts.slice(offset, offset + PROBE_ACCOUNT_CONCURRENCY);
-      const batchResults = await Promise.all(
-        batch.map(async (account) => {
-          const result = await this.probeModel(tenantId, providerId, {
-            ...request,
-            accountId: account.id,
-          });
-          // No health write here: this used to regex the model's own answer text
-          // for "202" and degrade the account on a match. A probe that genuinely
-          // fails already reports through `recordAccountFailure`, which classifies
-          // the real status; matching answer text is not a health signal.
-          return { ...result, accountId: account.id };
-        }),
-      );
-      results.push(...batchResults);
-    }
-    return { providerId, modelId: request.modelId, results };
-  }
-}
+import { captureProviderExchange, type ProviderExchangeCapture } from "../../transport/dispatch/attempt-finalize";
+import { globalOrOwnedBy } from "../../persistence/tenant-scope";
+/**
+ * Provider probing and model-discovery orchestration.
+ *
+ * Network probes and `/v1/models` discovery stay separate from the Drizzle
+ * catalog repository while sharing the provider catalog contract.
+ */
+import { and, eq, inArray, sql } from "drizzle-orm";
+import type { CartethyiaDatabase } from "../../persistence/db-handle";
+import { models, providerAccounts, providers } from "../../persistence/schema";
+import type { CanonicalEvent, CanonicalRequest, WireFamily } from "../../protocol/canonical-model";
+import { WIRE_FAMILIES } from "../../protocol/canonical-model";
+import { isRecord } from "../../protocol/codecs";
+import type { FetchLike } from "../quota/quota-contracts";
+import type { CompatibilityProfile } from "../provider-metadata";
+import {
+  type ByokConnectionTestRequest,
+  type ByokConnectionTestResult,
+  type ProbeAllAccountsResult,
+  type ProbeAllModelsResult,
+  type ProbeModelRequest,
+  type ProbeModelResult,
+} from "./discovery-types";
+import { modelsDevCatalog } from "./models-dev-catalog";
+import { fetchOpenAICompatibleModels } from "./openai-model-discovery";
+import {
+  applyDiscoveredWire,
+  resolveDiscoveredWire,
+  staticEndpointForWire,
+  type DiscoveredModelWire,
+} from "./probe-wire";
+import {
+  buildProbeCanonicalRequest,
+  computeProbeVerdict,
+  extractSample,
+  GROK_407_PROBE_PROMPT,
+  grok407ProbeFailure,
+  hasMeaningfulOutput,
+  loadProbePreferences,
+  recordProbeHealth,
+  resolveProbeAdapter,
+  resolveProbeTarget,
+  selectProbeAccount,
+  wireContextFrom,
+  type ProbeProviderRow,
+} from "./probe-phases";
+import { createProbeFetch } from "../operations/probe-fetch";
+import { authHeaders } from "../adapters/compatible-adapter";
+import {
+  byokAuthHeaderShape,
+  modelDiscoveryBaseUrl,
+  modelListUrl,
+  resolveByokWireProfile,
+  splitEndpointBaseUrl,
+} from "../operations/byok-wire-profile";
+import { resolveCustomCliHeaders } from "../operations/custom-cli-headers";
+import { resolveCredentialForAccount } from "../operations/provider-credential-service";
+import { decryptCredentialToString } from "../../security/crypto";
+import { GatewayError } from "../../protocol/gateway-error";
+import type { TelemetryBatchBuffer } from "../../observability/telemetry-buffer";
+import { computeTokensPerSec } from "../../observability/token-speed";
+import { TelemetryPayloadCapture } from "../../observability/payload-capture";
+import { providerBaseUrl } from "../provider-metadata";
+import { isBundledProviderId, parseProviderId, type ProviderDispatchTarget as AdapterDispatchTarget, type ValidatedOutboundFetch } from "../provider-contracts";
+import type { ValidatedOutboundHttp2Bidi } from "../provider-contracts";
+import type { ModelDefinition } from "../provider-model-definition";
+import type { ProviderRegistry } from "../provider-registry";
+
+/** Max models probed concurrently per batch (outside the sequential warm-up). */
+const PROBE_CONCURRENCY = 5;
+/** Max accounts probed concurrently; batches wait before starting the next ten. */
+const PROBE_ACCOUNT_CONCURRENCY = 10;
+
+export interface ProbeOutboundBinding {
+  readonly fetch: ValidatedOutboundFetch;
+  /**
+   * Validated bidirectional HTTP/2 egress for the same pool/tenant. A provider
+   * whose only transport is a bidi stream (Cursor's Connect-RPC Run) has no
+   * `fetch` path to fall back to, so a probe without this binding reports a
+   * healthy account as broken.
+   */
+  readonly http2Bidi?: ValidatedOutboundHttp2Bidi;
+  readonly networkPoolId?: string;
+  readonly release?: () => void;
+}
+
+export type ProbeOutboundResolver = (
+  tenantId: string,
+  providerId?: string,
+) => Promise<ValidatedOutboundFetch | ProbeOutboundBinding> | ValidatedOutboundFetch | ProbeOutboundBinding;
+
+interface ProviderProbingDeps {
+  readonly db: CartethyiaDatabase;
+  readonly telemetryBuffer: TelemetryBatchBuffer | undefined;
+  readonly defaultEndpoints: Record<WireFamily, string>;
+  readonly bundledModelCatalog: ReadonlyMap<string, readonly ModelDefinition[]>;
+  readonly outboundFetchFor: ProbeOutboundResolver;
+  readonly snapshotInvalidator: { invalidate(): unknown };
+  readonly providerRegistry: ProviderRegistry;
+}
+
+/**
+ * Adapts a validated outbound fetch to the `FetchLike` shape discovery
+ * helpers expect. Only the call signature is consumed downstream.
+ */
+function asFetchLike(fetchFn: ValidatedOutboundFetch): FetchLike {
+  const wrapped = (input: RequestInfo | URL, init?: RequestInit): Promise<Response> =>
+    fetchFn(input, init);
+  return Object.assign(wrapped, { preconnect: () => undefined });
+}
+
+function asOutboundBinding(
+  resolved: ValidatedOutboundFetch | ProbeOutboundBinding,
+): ProbeOutboundBinding {
+  return typeof resolved === "function" ? { fetch: resolved } : resolved;
+}
+export class ProviderProbingService {
+  private readonly db: CartethyiaDatabase;
+  private readonly telemetryBuffer: TelemetryBatchBuffer | undefined;
+  private readonly payloadCapture: TelemetryPayloadCapture;
+  private readonly defaultEndpoints: Record<WireFamily, string>;
+  private readonly bundledModelCatalog: ReadonlyMap<string, readonly ModelDefinition[]>;
+  private readonly outboundFetchFor: ProbeOutboundResolver;
+  private readonly snapshotInvalidator: { invalidate(): unknown };
+  private readonly providerRegistry: ProviderRegistry;
+
+  constructor(deps: ProviderProbingDeps) {
+    this.db = deps.db;
+    this.telemetryBuffer = deps.telemetryBuffer;
+    this.payloadCapture = new TelemetryPayloadCapture(this.db);
+    this.defaultEndpoints = deps.defaultEndpoints;
+    this.bundledModelCatalog = deps.bundledModelCatalog;
+    this.outboundFetchFor = deps.outboundFetchFor;
+    this.snapshotInvalidator = deps.snapshotInvalidator;
+    this.providerRegistry = deps.providerRegistry;
+  }
+
+  /**
+   * The provider row columns that decide wire-family/endpoint resolution.
+   * `probeModel` loads this once and reuses it for the contract gate, the
+   * custom-adapter fallback, and the wire context.
+   */
+  private async loadProviderWireRow(providerId: string): Promise<ProbeProviderRow | undefined> {
+    const rows = await this.db
+      .select({
+        baseUrl: providers.baseUrl,
+        wireFamilyDefault: providers.wireFamilyDefault,
+        compatibilityProfile: providers.compatibilityProfile,
+        requiresAccount: providers.requiresAccount,
+      })
+      .from(providers)
+      .where(eq(providers.id, providerId))
+      .limit(1);
+    return rows[0];
+  }
+
+  /**
+   * Static endpoint for one provider + wire family, if the bundled catalog
+   * ships a static definition for it. Used by manual registration (via the
+   * console store) so it resolves the same provider-truth endpoints as probes.
+   */
+  async resolveStaticEndpoint(
+    providerId: string,
+    wireFamily: WireFamily,
+  ): Promise<string | undefined> {
+    return staticEndpointForWire(this.bundledModelCatalog, providerId, wireFamily);
+  }
+
+  /** One-shot connectivity test: resolves a usable account + the real per-provider
+   * adapter, dispatches a minimal canonical request through the model's own wire
+   * family/endpoint (never a hardcoded `/v1/chat/completions`), and records the
+   * outcome into `telemetry_events` via the same writer live traffic uses. */
+  async probeModel(
+    tenantId: string,
+    providerId: string,
+    request: ProbeModelRequest,
+  ): Promise<ProbeModelResult> {
+    const startedAt = Date.now();
+    const modelId = request.modelId;
+    // One provider snapshot per probe: the contract gate, the account gate, the
+    // custom-adapter fallback, and the wire context all read this same row, so a
+    // concurrent edit cannot make two reads disagree.
+    const providerWireRow = await this.loadProviderWireRow(providerId);
+    const requiresAccount = providerWireRow?.requiresAccount ?? true;
+
+    const { wireFamily, serviceKind, endpointPath, sourceSurface, capabilityProfile } = await resolveProbeTarget({
+      db: this.db,
+      bundledModelCatalog: this.bundledModelCatalog,
+      defaultEndpoints: this.defaultEndpoints,
+      providerId,
+      modelId,
+      request,
+      providerWireRow,
+    });
+
+    const account = await selectProbeAccount({
+      db: this.db,
+      tenantId,
+      providerId,
+      requestedAccountId: request.accountId,
+      requiresAccount,
+      allowCoolingAccount:
+        providerId === "grok" && request.prompt === GROK_407_PROBE_PROMPT,
+    });
+    if (!account.ok) {
+      return { ok: false, latencyMs: Date.now() - startedAt, error: account.error };
+    }
+    const accountId = account.accountId;
+
+    const adapter = await resolveProbeAdapter({
+      providerRegistry: this.providerRegistry,
+      providerId,
+      providerWireRow,
+    });
+    if (!adapter) {
+      return {
+        ok: false,
+        latencyMs: Date.now() - startedAt,
+        error: `No adapter registered for provider ${providerId}`,
+      };
+    }
+
+    const { probeReasoning, payloadCaptureEnabled } = await loadProbePreferences({
+      db: this.db,
+      tenantId,
+      wireFamily,
+      request,
+    });
+    const canonicalRequest = buildProbeCanonicalRequest({
+      modelId,
+      request,
+      probeReasoning,
+      sourceSurface,
+    });
+    let capturedRequest = canonicalRequest;
+    const parsedProviderId = parseProviderId(providerId);
+    const candidate: AdapterDispatchTarget = {
+      provider_id: parsedProviderId,
+      model_id: modelId,
+      wire_family: wireFamily,
+      endpoint_path: endpointPath,
+      // The route's real profile, not `{}`. A probe runs the production adapter,
+      // which gates on capabilities — an empty profile made it reject the probe
+      // over capabilities the route actually has (`prompt_caching`, `tools`,
+      // `reasoning`), reporting a healthy provider as broken.
+      capabilities: capabilityProfile,
+    };
+
+    const probeSignal = AbortSignal.timeout(30_000);
+    const events: CanonicalEvent[] = [];
+    /**
+     * Populated when the probe dials. Declared here, not inside the try, so the
+     * model the upstream named is still readable after the block unwinds — the
+     * result is assembled outside it.
+     */
+    let probeCapture: ProviderExchangeCapture | undefined;
+    let ttfbMs: number | undefined;
+    let dispatchError: unknown;
+    /** Hits a `websearch` probe returned; surfaced to the console verbatim. */
+    let searchResults: ProbeModelResult["searchResults"];
+    let networkPoolId: string | undefined;
+    try {
+      // Public providers (`requires_account: false`) probe credential-free;
+      const credential = accountId
+        ? await resolveCredentialForAccount(this.db, providerId, accountId)
+        : { provider_id: parsedProviderId, credential_kind: "none" as const };
+      const outbound = asOutboundBinding(await this.outboundFetchFor(tenantId, providerId));
+      networkPoolId = outbound.networkPoolId;
+      probeCapture = {
+        request: null,
+        response: Promise.resolve(null),
+      };
+      // The same wrapper a real dispatch uses, so the probe reads the model the
+      // upstream named from the raw bytes rather than from a synthesized event.
+      const probeFetch = createProbeFetch(
+        captureProviderExchange(outbound.fetch, probeCapture, false),
+      );
+      try {
+        if (serviceKind === "websearch") {
+          if (typeof adapter.websearch !== "function") {
+            throw new GatewayError(
+              "capability_unsupported",
+              400,
+              `Provider ${providerId} has no web search transport`,
+            );
+          }
+          const searchProbeQuery = request.prompt?.trim() || "Cartethyia gateway probe";
+          const response = await adapter.websearch(
+            { model: modelId, query: searchProbeQuery, max_results: 3 },
+            candidate,
+            {
+              credential,
+              deadline: startedAt + 30_000,
+              abort_signal: probeSignal,
+              outbound_fetch: probeFetch,
+            },
+          );
+          if (ttfbMs === undefined) ttfbMs = Date.now() - startedAt;
+          searchResults = response.results.map((hit) => ({
+            title: hit.title,
+            url: hit.url,
+            snippet: hit.snippet,
+          }));
+          if (!response.results || response.results.length === 0) {
+            dispatchError = new GatewayError("platform_unavailable", 502, "web search returned no results");
+          }
+        } else if (serviceKind === "systemone") {
+          if (typeof adapter.systemone !== "function") {
+            throw new GatewayError(
+              "capability_unsupported",
+              400,
+              `Provider ${providerId} has no System One transport`,
+            );
+          }
+          const response = await adapter.systemone(
+            {
+              model: modelId,
+              state: "Customer: I was charged twice for my order this morning.",
+              questions: {
+                probe: {
+                  type: "noul",
+                  instructions: "Is the customer reporting a billing problem?",
+                },
+              },
+            },
+            candidate,
+            {
+              credential,
+              deadline: startedAt + 30_000,
+              abort_signal: probeSignal,
+              outbound_fetch: probeFetch,
+            },
+          );
+          if (ttfbMs === undefined) ttfbMs = Date.now() - startedAt;
+          const raw = await response.text().catch(() => "");
+          if (!response.ok) {
+            dispatchError = new GatewayError(
+              response.status >= 500 ? "platform_unavailable" : "invalid_request",
+              response.status,
+              `System One upstream error: ${raw.slice(0, 240)}`,
+            );
+          } else {
+            let parsed: unknown;
+            try {
+              parsed = raw ? JSON.parse(raw) : null;
+            } catch {
+              dispatchError = new GatewayError("platform_unavailable", 502, "System One returned invalid JSON");
+            }
+            if (parsed !== null && parsed !== undefined) {
+              const answers =
+                typeof parsed === "object" ? (parsed as Record<string, unknown>).answers : undefined;
+              const hasAnswers =
+                answers !== undefined &&
+                answers !== null &&
+                typeof answers === "object" &&
+                Object.keys(answers as Record<string, unknown>).length > 0;
+              if (!hasAnswers) {
+                dispatchError = new GatewayError(
+                  "platform_unavailable",
+                  502,
+                  "System One returned no answers",
+                );
+              }
+            }
+          }
+        } else {
+        const dispatchProbe = async (request: CanonicalRequest): Promise<void> => {
+          capturedRequest = request;
+          for await (const event of adapter.dispatch(request, candidate, {
+            credential,
+            deadline: startedAt + 30_000,
+            abort_signal: probeSignal,
+            outbound_fetch: probeFetch,
+            // A bidi-only provider (Cursor's Connect-RPC Run) has no `fetch`
+            // transport at all: without the HTTP/2 binding the probe fails with
+            // "requires validated HTTP/2 egress" while live dispatch — which
+            // always supplies it — succeeds.
+            ...(outbound.http2Bidi === undefined ? {} : { outbound_http2: outbound.http2Bidi }),
+          })) {
+            if (ttfbMs === undefined) ttfbMs = Date.now() - startedAt;
+            events.push(event);
+          }
+        };
+        try {
+          await dispatchProbe(canonicalRequest);
+          if (!hasMeaningfulOutput(events)) throw new Error("probe response content empty");
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          if (!/empty\s+(?:response\s+)?content|response\s+content\s+empty/i.test(message)) {
+            throw error;
+          }
+          // Some reasoning models spend the short probe budget before producing
+          // visible text. Retry with a larger output allowance, and stream when
+          // the first attempt did not — a streamed probe keeps the connection
+          // open while the model reasons instead of waiting for a complete body.
+          // Generic: no provider/model id special case is needed.
+          events.length = 0;
+          ttfbMs = undefined;
+          await dispatchProbe({
+            ...canonicalRequest,
+            stream: true,
+            generation_controls: {
+              ...canonicalRequest.generation_controls,
+              max_tokens: 1024,
+              max_output_tokens: 1024,
+            },
+          });
+        }
+        }
+      } finally {
+        outbound.release?.();
+      }
+    } catch (error) {
+      dispatchError = error;
+    }
+    const featureFailure = grok407ProbeFailure({
+      providerId,
+      prompt: request.prompt,
+      events,
+      dispatchError,
+    });
+    if (featureFailure !== undefined) dispatchError = featureFailure;
+
+    const upstreamStatusCode =
+      dispatchError instanceof GatewayError
+        ? typeof dispatchError.details.upstreamStatus === "number"
+          ? dispatchError.details.upstreamStatus
+          : typeof dispatchError.details.providerStatus === "number"
+            ? dispatchError.details.providerStatus
+            : undefined
+        : undefined;
+    await recordProbeHealth({
+      db: this.db,
+      invalidator: this.snapshotInvalidator,
+      accountId,
+      dispatchError,
+      modelId,
+      upstreamStatusCode,
+    });
+
+    const latencyMs = Date.now() - startedAt;
+    // A native-service probe carries no canonical events: its verdict is the
+    // decision response itself (no dispatch error + answers present), which the
+    // branch above already encoded into `dispatchError`. Web search is a
+    // native service too — routing it through the LLM verdict demanded a
+    // `terminal` event the search transport never emits, so a search that
+    // returned hits was reported as a failure with an empty message.
+    const { ok, errorMessage, usage } =
+      serviceKind === "systemone" || serviceKind === "websearch"
+        ? {
+            ok: dispatchError === undefined,
+            errorMessage:
+              dispatchError === undefined
+                ? undefined
+                : dispatchError instanceof GatewayError
+                  ? `Search provider ${providerId}/${modelId} — ${dispatchError.message} (HTTP ${dispatchError.status})`
+                  : dispatchError instanceof Error
+                    ? `${providerId}/${modelId} — ${dispatchError.message}`
+                    : String(dispatchError),
+            usage: undefined,
+          }
+        : computeProbeVerdict({
+            events,
+            dispatchError,
+            wireFamily,
+          });
+
+    const requestId = crypto.randomUUID();
+
+    // Token speed shared with live traffic (`computeTokensPerSec`): probes
+    // record TTFT+latency only, so they report end-to-end effective speed.
+    const tokensPerSec = computeTokensPerSec({
+      outputTokens: usage?.output_tokens,
+      latencyMs,
+    });
+
+    // Probe telemetry rides the same batch buffer as live traffic. Keep the
+    // probe bodies linked by request_id so the console can inspect the exact
+    // canonical request and provider event stream that produced the result.
+    this.telemetryBuffer?.enqueue({
+      tenantId,
+      requestId,
+      sourceSurface,
+      requestedModel: modelId,
+      endpoint: endpointPath,
+      providerId,
+      ...(accountId ? { accountId } : {}),
+      ...(networkPoolId ? { networkPoolId } : {}),
+      latencyMs,
+      ...(ttfbMs !== undefined ? { ttfbMs } : {}),
+      stream: capturedRequest.stream,
+      status: ok ? "completed" : "failed",
+      ...(ok ? {} : { errorCategory: errorMessage ?? "probe_failed" }),
+      ...(usage ? { usage } : {}),
+      ...(tokensPerSec !== undefined ? { tokensPerSec } : {}),
+    });
+    if (this.telemetryBuffer && payloadCaptureEnabled) {
+      await this.payloadCapture
+        .capture({
+          tenantId,
+          requestId,
+          requestBody: capturedRequest,
+          responseBody: events,
+          scope: "tenant",
+          tenantOptIn: true,
+        })
+        .catch(() => undefined);
+    }
+
+    const sample = extractSample(events);
+    const reportedModel = await probeCapture?.reportedModel?.catch(() => undefined);
+    return {
+      ...(accountId ? { accountId } : {}),
+      ok,
+      latencyMs,
+      ...(ttfbMs !== undefined ? { ttfbMs } : {}),
+      ...(upstreamStatusCode === undefined ? {} : { statusCode: upstreamStatusCode }),
+      ...(sample ? { sample } : {}),
+      ...(reportedModel === undefined ? {} : { reportedModel }),
+      ...(searchResults !== undefined && searchResults.length > 0 ? { searchResults } : {}),
+      ...(errorMessage ? { error: errorMessage } : {}),
+    };
+  }
+
+  /**
+   * Ad-hoc connectivity test for a not-yet-persisted BYOK provider.
+   *
+   * Dispatches a real `GET <base>/models` through the same SSRF-validated
+   * outbound fetch live traffic uses, stamping the credential with the auth
+   * header the chosen wire family actually reads (`x-api-key` for Messages,
+   * `Authorization: Bearer` otherwise) plus that wire's CLI identity headers.
+   * Reachability is the contract: any HTTP response proves the operator's base
+   * URL, credential, and egress path work — a 4xx is reported with its status
+   * rather than disguised as a transport failure.
+   */
+  async testByokConnection(
+    tenantId: string,
+    request: ByokConnectionTestRequest,
+  ): Promise<ByokConnectionTestResult> {
+    const startedAt = Date.now();
+    const requestedWire = request.wireFamily;
+    const wireFamily: WireFamily = (WIRE_FAMILIES as readonly string[]).includes(requestedWire)
+      ? (requestedWire as WireFamily)
+      : "chat";
+    // An operator who pasted a full endpoint (`…/anthropic/v1/messages`) gets it
+    // stripped before the model list is derived, and told so. Probing the
+    // corrected root is what makes the result actionable: the alternative is a
+    // bare 404 against a path the gateway built from their own typo.
+    const submitted = splitEndpointBaseUrl(request.baseUrl);
+    const warning =
+      submitted.stripped === ""
+        ? undefined
+        : `Base URL pointed at the endpoint "${submitted.stripped}". Cartethyia derives the model list from the root, so it tested "${submitted.baseUrl}" instead. Save that root as the Base URL.`;
+    const url = modelListUrl(request.baseUrl);
+    const outbound = asOutboundBinding(await this.outboundFetchFor(tenantId));
+    const probeFetch = createProbeFetch(outbound.fetch);
+    try {
+      const headers: Record<string, string> = {
+        accept: "application/json",
+        ...authHeaders(
+          byokAuthHeaderShape([wireFamily]),
+          new TextEncoder().encode(request.apiKey),
+          request.apiKey.trim().length > 0 ? "api_key" : "none",
+        ),
+        ...(request.cliIdentity === false ? {} : resolveCustomCliHeaders(wireFamily)),
+        ...(request.extraHeaders ?? {}),
+      };
+      const response = await probeFetch(url, {
+        method: "GET",
+        headers,
+        signal: AbortSignal.timeout(15_000),
+      });
+      const latencyMs = Date.now() - startedAt;
+      if (!response.ok) {
+        return {
+          ok: false,
+          latencyMs,
+          statusCode: response.status,
+          error: `Upstream rejected the connection test with HTTP ${response.status}`,
+          ...(warning === undefined ? {} : { warning }),
+        };
+      }
+      // A body is nice to have but not required: some gateways answer `/models`
+      // with an empty envelope. Read it defensively so a non-JSON body cannot
+      // turn a successful reachability check into a failure.
+      let modelCount: number | undefined;
+      try {
+        const payload = (await response.json()) as unknown;
+        const entries = Array.isArray(payload)
+          ? payload
+          : isRecord(payload) && Array.isArray(payload["data"])
+            ? payload["data"]
+            : isRecord(payload) && Array.isArray(payload["models"])
+              ? payload["models"]
+              : undefined;
+        if (entries) modelCount = entries.length;
+      } catch {
+        // Non-JSON success body: reachability already proven by the 2xx.
+      }
+      return {
+        ok: true,
+        latencyMs,
+        statusCode: response.status,
+        ...(modelCount === undefined ? {} : { modelCount }),
+        ...(warning === undefined ? {} : { warning }),
+      };
+    } catch (error) {
+      return {
+        ok: false,
+        latencyMs: Date.now() - startedAt,
+        error: error instanceof Error ? error.message : "Connection test failed",
+        ...(warning === undefined ? {} : { warning }),
+      };
+    } finally {
+      outbound.release?.();
+    }
+  }
+
+  async syncModels(tenantId: string, providerId: string): Promise<{ synced: number }> {
+    const outbound = asOutboundBinding(await this.outboundFetchFor(tenantId, providerId));
+    try {
+      const discoveryFetch = asFetchLike(outbound.fetch);
+      const resolver = await this.providerRegistry.resolveModelDiscovery(providerId);
+      if (resolver) {
+        // An account is used when one is usable, and the fetch is attempted
+        // either way. Gating on a credential only made the common case
+        // unreachable: most providers list their models without auth, and the
+        // ones that do not answer 401 themselves, which names the actual
+        // problem where a local 409 named a missing account the operator may
+        // not even need.
+        const account = await this.usableAccount(tenantId, providerId);
+        const secret = account?.secret;
+        const providerRow = await this.loadProviderWireRow(providerId);
+        const effectiveBaseUrl = providerRow?.baseUrl ?? providerBaseUrl(providerId) ?? "";
+        let discovered: readonly ModelDefinition[] | null;
+        try {
+          discovered = await resolver({
+            baseUrl: effectiveBaseUrl,
+            credential: secret ?? "",
+            ...(discoveryFetch ? { fetcher: discoveryFetch } : {}),
+            ...(account?.authState === undefined ? {} : { authState: account.authState }),
+          });
+        } catch (error) {
+          throw new GatewayError(
+            "transport_unavailable",
+            502,
+            `Model discovery failed for ${providerId}: ${error instanceof Error ? error.message : "unknown error"}`,
+            {},
+            "upstream",
+          );
+        }
+        if (!discovered) {
+          throw new GatewayError(
+            "transport_unavailable",
+            502,
+            `Model discovery failed for ${providerId}: endpoint returned no usable models`,
+            {},
+            "upstream",
+          );
+        }
+        const ctx = wireContextFrom(providerRow);
+        return this.persistDiscoveredModels(
+          providerId,
+          discovered,
+          (modelId) => resolveDiscoveredWire(modelId, ctx, undefined, this.defaultEndpoints),
+          ctx.endpointPathsByWireFamily,
+          effectiveBaseUrl,
+        );
+      }
+
+      const providerRow = await this.loadProviderWireRow(providerId);
+      if (providerRow?.baseUrl) {
+        const secret = await this.usableAccountSecret(tenantId, providerId);
+        if (secret) {
+          // An Anthropic-compatible root reads `x-api-key`, not bearer auth,
+          // and a bare host needs its `/v1` segment before `/models` joins on.
+          // Both are derived from the same wire profile dispatch uses, so
+          // auto-fetch behaves identically for either flavor of custom provider.
+          const wireProfile = resolveByokWireProfile(
+            providerRow.wireFamilyDefault,
+            providerRow.compatibilityProfile as CompatibilityProfile | null,
+          );
+          const modelsBaseUrl = modelDiscoveryBaseUrl(providerRow.baseUrl);
+          let discovered: readonly ModelDefinition[] | null;
+          try {
+            discovered = await fetchOpenAICompatibleModels({
+              baseUrl: modelsBaseUrl,
+              providerId,
+              headers: {
+                ...authHeaders(
+                  wireProfile.authHeaderShape,
+                  new TextEncoder().encode(secret),
+                  "api_key",
+                ),
+              },
+              ...(discoveryFetch ? { fetcher: discoveryFetch as typeof fetch } : {}),
+            });
+          } catch (error) {
+            throw new GatewayError(
+              "transport_unavailable",
+              502,
+              `Model discovery failed for ${providerId}: ${error instanceof Error ? error.message : "unknown error"}`,
+              {},
+              "upstream",
+            );
+          }
+          if (discovered && discovered.length > 0) {
+            const ctx = wireContextFrom(providerRow);
+            return this.persistDiscoveredModels(
+              providerId,
+              discovered,
+              (modelId) => resolveDiscoveredWire(modelId, ctx, undefined, this.defaultEndpoints),
+              ctx.endpointPathsByWireFamily,
+              providerRow.baseUrl ?? undefined,
+              // The generic `/models` fetch guesses a wire from the model id;
+              // the row's own profile is what the adapter will enforce, so it
+              // decides which guess is admissible.
+              wireProfile.supportedWireFamilies,
+            );
+          }
+        }
+      }
+
+      // Two reasons a sync reaches here with nothing dialed, and the operator
+      // needs to be told which one. Returning `{synced: 0}` for both made an
+      // unsupported provider indistinguishable from a successful fetch that
+      // found nothing — the console showed a green "0 synced" for a provider
+      // it can never sync.
+      const bundled = isBundledProviderId(providerId);
+      if (!bundled) {
+        // A custom provider has a row and a base URL but no usable credential.
+        // The fix is an account, and saying "no listing endpoint" would send the
+        // operator looking for a capability the provider may well have.
+        throw new GatewayError(
+          "invalid_request",
+          400,
+          `Add an account for ${providerId} first — model listing needs a credential.`,
+          {},
+          "cartethyia",
+        );
+      }
+      if (!(await this.usableAccountSecret(tenantId, providerId))) {
+        // A bundled provider with an account would have gone through the
+        // resolver branch above, so reaching here means none is registered.
+        // Add one first, then fetch.
+        throw new GatewayError(
+          "invalid_request",
+          400,
+          `Add an account for ${providerId} before fetching its models.`,
+          {},
+          "cartethyia",
+        );
+      }
+      // A credential exists and the provider still has no listing path: the
+      // catalog is the compiled one, and new models arrive with an update.
+      throw new GatewayError(
+        "capability_unsupported",
+        400,
+        `${providerId} publishes no model-listing endpoint. Its catalog ships with Cartethyia; new models appear with an update.`,
+        {},
+        "cartethyia",
+      );
+    } finally {
+      outbound.release?.();
+    }
+  }
+
+  private async persistDiscoveredModels(
+    providerId: string,
+    discoveredModels: readonly (string | ModelDefinition)[],
+    resolve: (modelId: string) => DiscoveredModelWire,
+    endpointOverrides?: Partial<Record<WireFamily, string>>,
+    baseUrl?: string,
+    supportedWireFamilies?: readonly WireFamily[],
+  ): Promise<{ synced: number }> {
+    // Static definitions are the injected bundled catalog; the probing service
+    // and the console store are both handed the same startup-built map.
+    const staticDefinitions: readonly ModelDefinition[] =
+      this.bundledModelCatalog.get(providerId) ?? [];
+    const staticEndpoints: Partial<Record<WireFamily, string>> = {};
+    for (const definition of staticDefinitions) {
+      staticEndpoints[definition.wireFamily] ??= definition.endpointPath;
+    }
+    // Fetch only adds genuinely new models: an id the builtin catalog
+    // already owns stays exactly one (builtin) row instead of gaining a
+    // discovered shadow that confuses pickers and deletes.
+    const builtinIds = new Set(staticDefinitions.map((definition) => definition.modelId));
+    // `(modelId, endpointPath)` is the row identity, so a corrected wire family
+    // lands on a *new* row and would leave the old one behind as a dead route.
+    // Collect this run's pairs and drop the provider's superseded discovered
+    // rows for the same ids afterwards.
+    const resolvedPairs: Array<{ modelId: string; endpointPath: string }> = [];
+    const rows: Array<typeof models.$inferInsert> = [];
+    // `(modelId, endpointPath)` is the row identity and the upsert's conflict
+    // target, so a listing that repeats a pair (the bespoke discoveries return
+    // raw upstream ids) would make a multi-row `ON CONFLICT DO UPDATE` fail with
+    // "cannot affect row a second time". Keep the first row per pair, as the
+    // builtin seeder does, so one statement can carry a whole chunk.
+    const seenPairs = new Set<string>();
+    for (const item of discoveredModels) {
+      const modelId = typeof item === "string" ? item : item.modelId;
+      if (builtinIds.has(modelId)) continue;
+      const resolved = resolve(modelId);
+      const discDef = typeof item === "string" ? undefined : item;
+      const { wireFamily, endpointPath } = applyDiscoveredWire({
+        resolvedWireFamily: resolved.wireFamily,
+        resolvedEndpointPath: resolved.endpointPath,
+        ...(discDef !== undefined
+          ? { discoveredWireFamily: discDef.wireFamily, discoveredEndpointPath: discDef.endpointPath }
+          : {}),
+        staticEndpoints,
+        ...(endpointOverrides !== undefined ? { endpointOverrides } : {}),
+        ...(supportedWireFamilies !== undefined ? { supportedWireFamilies } : {}),
+        ...(baseUrl !== undefined ? { baseUrl } : {}),
+      });
+      resolvedPairs.push({ modelId, endpointPath });
+      const pairKey = `${modelId}\u0000${endpointPath}`;
+      if (seenPairs.has(pairKey)) continue;
+      seenPairs.add(pairKey);
+      const knownDefinition = staticDefinitions.find((definition) => definition.modelId === modelId);
+      const sourceUpdatedAt = new Date();
+      const metadata = {
+        contextLimit: knownDefinition?.contextLimit ?? discDef?.contextLimit ?? null,
+        outputLimit: knownDefinition?.outputLimit ?? discDef?.outputLimit ?? null,
+        modalities: knownDefinition?.modalities ?? discDef?.modalities ?? null,
+        reasoning: knownDefinition?.reasoning ?? discDef?.reasoning ?? false,
+        toolCall: knownDefinition?.toolCall ?? discDef?.toolCall ?? false,
+        cost: modelsDevCatalog.costFor(providerId, modelId),
+        // Discovery builds its rows from the same static catalog, so a fetched
+        // row carries the same answer a seeded one does. Null when neither
+        // source marked it, which reads as "unknown" rather than "free".
+        proOnly: (discDef?.proOnly ?? knownDefinition?.proOnly ?? null),
+        // Same shape for the tier the provider states itself (Qoder `is_free`).
+        freeTier: (discDef?.freeTier ?? knownDefinition?.freeTier ?? null),
+      };
+      rows.push({
+        providerId,
+        modelId,
+        wireFamily,
+        // A discovery module that classifies an id as a non-chat service (the
+        // System One decision API) states it on its own definition; otherwise the
+        // static catalog's classification wins, and an unclassified id is `llm`.
+        serviceKind: discDef?.serviceKind ?? knownDefinition?.serviceKind ?? "llm",
+        endpointPath,
+        ...metadata,
+        // A discovery module that marks its rows as a free tier gets its own
+        // source, because the model list groups on it: a free-tier row is not
+        // an ordinary fetched one, and collapsing both into `discovered` lost
+        // that distinction at the only point where it is still known.
+        source: discDef?.freeTier === true ? "auto_free" : "discovered",
+        sourceUpdatedAt,
+        enabled: true,
+      });
+    }
+    // One statement per chunk (500, the account-health batch step) instead of
+    // one round-trip per row. `excluded.*` reads the proposed row, so the update
+    // set is the same columns the per-row upsert wrote.
+    for (let offset = 0; offset < rows.length; offset += 500) {
+      await this.db
+        .insert(models)
+        .values(rows.slice(offset, offset + 500))
+        .onConflictDoUpdate({
+          target: [models.providerId, models.modelId, models.endpointPath],
+          set: {
+            serviceKind: sql`excluded.service_kind`,
+            contextLimit: sql`excluded.context_limit`,
+            outputLimit: sql`excluded.output_limit`,
+            modalities: sql`excluded.modalities`,
+            reasoning: sql`excluded.reasoning`,
+            toolCall: sql`excluded.tool_call`,
+            cost: sql`excluded.cost`,
+            proOnly: sql`excluded.pro_only`,
+            freeTier: sql`excluded.free_tier`,
+            // The proposed row's own source, not a constant: a free-tier
+            // discovery and an ordinary one write the same upsert, and pinning
+            // this to `discovered` would relabel every free-tier row on the
+            // next sync.
+            source: sql`excluded.source`,
+            sourceUpdatedAt: sql`excluded.source_updated_at`,
+          },
+        });
+    }
+    const synced = rows.length;
+    // Drop this provider's discovered rows for the synced ids that are no
+    // longer part of the resolved set — the stale `(model, endpoint)` pair left
+    // behind when a corrected wire family moved a model to a new path. Rows the
+    // operator added by hand (`manual`) and ids outside this run are untouched.
+    // `auto_free` is included: it is written by this same sync, so leaving it
+    // out would make a free-tier row the one kind of synced row that never gets
+    // pruned when its id moves.
+    if (resolvedPairs.length > 0) {
+      const pairs = resolvedPairs.map(
+        (pair) => sql`(${pair.modelId}, ${pair.endpointPath})`,
+      );
+      const ids = resolvedPairs.map((pair) => pair.modelId);
+      await this.db
+        .delete(models)
+        .where(
+          and(
+            eq(models.providerId, providerId),
+            inArray(models.source, ["discovered", "auto_free"]),
+            sql`${models.modelId} IN (${sql.join(
+              ids.map((id) => sql`${id}`),
+              sql`, `,
+            )})`,
+            sql`(${models.modelId}, ${models.endpointPath}) NOT IN (${sql.join(pairs, sql`, `)})`,
+          ),
+        );
+    }
+    return { synced };
+  }
+
+  private async usableAccountSecret(
+    tenantId: string,
+    providerId: string,
+  ): Promise<string | undefined> {
+    return (await this.usableAccount(tenantId, providerId))?.secret;
+  }
+
+  /**
+   * The account a credential-scoped discovery will use, with its non-secret
+   * auth configuration. Selection is unchanged — first usable row, preferring a
+   * tenant-owned one — so discovery and dispatch agree on which account answered.
+   */
+  private async usableAccount(
+    tenantId: string,
+    providerId: string,
+  ): Promise<{ readonly secret: string; readonly authState?: Readonly<Record<string, unknown>> } | undefined> {
+    const rows = await this.db
+      .select()
+      .from(providerAccounts)
+      .where(
+        and(
+          eq(providerAccounts.providerId, providerId),
+          globalOrOwnedBy(providerAccounts.tenantId, tenantId),
+        ),
+      );
+    const now = Date.now();
+    const usable = rows
+      .filter(
+        (row) =>
+          row.status !== "disabled" &&
+          (row.cooldownUntil === null || row.cooldownUntil.getTime() <= now),
+      )
+      .sort((left, right) => Number(right.tenantId !== null) - Number(left.tenantId !== null))[0];
+    if (!usable?.credentialCiphertext) return undefined;
+    const authState = isRecord(usable.authState) ? usable.authState as Readonly<Record<string, unknown>> : undefined;
+    return {
+      secret: decryptCredentialToString(usable.credentialCiphertext),
+      ...(authState === undefined ? {} : { authState }),
+    };
+  }
+
+  /**
+   * Batched provider-wide probe: the first request runs sequentially (it warms
+   * OAuth token caches and connection pools for the provider), the rest run
+   * with `Promise.allSettled` bounded to `PROBE_CONCURRENCY`. Each request
+   * carries its model route and service kind so native services never fall
+   * through to an LLM probe.
+   */
+  async probeAllModels(
+    tenantId: string,
+    providerId: string,
+    requests: readonly ProbeModelRequest[],
+  ): Promise<ProbeAllModelsResult> {
+    const results: Array<ProbeAllModelsResult["results"][number]> = [];
+    const [firstRequest, ...restRequests] = requests;
+    if (firstRequest === undefined) return { providerId, results };
+
+    const runOne = async (probeRequest: ProbeModelRequest): Promise<void> => {
+      const outcome = await this.probeModel(tenantId, providerId, probeRequest);
+      results.push({
+        modelId: probeRequest.modelId,
+        ok: outcome.ok,
+        latencyMs: outcome.latencyMs,
+        ...(outcome.error ? { error: outcome.error } : {}),
+      });
+    };
+
+    await runOne(firstRequest);
+    for (let offset = 0; offset < restRequests.length; offset += PROBE_CONCURRENCY) {
+      const batch = restRequests.slice(offset, offset + PROBE_CONCURRENCY);
+      await Promise.allSettled(batch.map((request) => runOne(request)));
+    }
+    return { providerId, results };
+  }
+  async probeAllAccounts(
+    tenantId: string,
+    providerId: string,
+    request: ProbeModelRequest,
+  ): Promise<ProbeAllAccountsResult> {
+    const accounts = await this.db
+      .select({ id: providerAccounts.id })
+      .from(providerAccounts)
+      .where(
+        and(
+          eq(providerAccounts.providerId, providerId),
+          globalOrOwnedBy(providerAccounts.tenantId, tenantId),
+        ),
+      );
+    const results: ProbeAllAccountsResult["results"][number][] = [];
+    for (let offset = 0; offset < accounts.length; offset += PROBE_ACCOUNT_CONCURRENCY) {
+      const batch = accounts.slice(offset, offset + PROBE_ACCOUNT_CONCURRENCY);
+      const batchResults = await Promise.all(
+        batch.map(async (account) => {
+          const result = await this.probeModel(tenantId, providerId, {
+            ...request,
+            accountId: account.id,
+          });
+          // No health write here: this used to regex the model's own answer text
+          // for "202" and degrade the account on a match. A probe that genuinely
+          // fails already reports through `recordAccountFailure`, which classifies
+          // the real status; matching answer text is not a health signal.
+          return { ...result, accountId: account.id };
+        }),
+      );
+      results.push(...batchResults);
+    }
+    return { providerId, modelId: request.modelId, results };
+  }
+}