🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
feat(gateway): add per-connection model controls (#18642)
Tobias Wochinger1d4f7563f754
diff --git a/ai-gateway/src/http.rs b/ai-gateway/src/http.rsindex 1582536360..55b53610bb 100644--- a/ai-gateway/src/http.rs+++ b/ai-gateway/src/http.rs@@ -402,6 +402,7 @@ impl InferenceHttpError {R::InvalidCredential | R::Authentication => "authentication",R::InvalidRequest => "invalid_request",R::Forbidden => "forbidden",+ R::ModelNotAllowed => "model_not_allowed",R::NoRoute => "no_route",R::Timeout => "timeout",R::Unavailable => "unavailable",@@ -444,6 +445,12 @@ impl InferenceHttpError {"permission_error","permission_denied",),+ Self::Resolution(R::ModelNotAllowed) => (+ StatusCode::FORBIDDEN,+ "Model is not allowed for this provider connection",+ "permission_error",+ "model_not_allowed",+ ),Self::Resolution(R::NoRoute) => (StatusCode::NOT_FOUND,"No eligible provider connection",diff --git a/ai-gateway/src/http/tests.rs b/ai-gateway/src/http/tests.rsindex b205f75f2e..2af78d842e 100644--- a/ai-gateway/src/http/tests.rs+++ b/ai-gateway/src/http/tests.rs@@ -1532,6 +1532,51 @@ async fn anthropic_credential_conflicts_and_failures_use_the_native_error_enveloassert_eq!(provider.calls(), 0);}+#[tokio::test]+async fn model_policy_rejections_use_provider_native_permission_errors() {+ let web = FakeServer::start(|_| async {+ Response::builder()+ .status(StatusCode::FORBIDDEN)+ .header("langfuse-gateway-error-code", "model_not_allowed")+ .body(Body::from("private-web-body"))+ .unwrap()+ })+ .await;+ let provider = FakeServer::start(|_| async { Response::new(Body::empty()) }).await;+ let gateway = Gateway::start(Some(inference(&web, &provider))).await;++ let openai = gateway+ .post()+ .bearer_auth("gateway-key")+ .body(r#"{"model":"Production key:gpt-4.1"}"#)+ .send()+ .await+ .unwrap();+ assert_eq!(openai.status(), StatusCode::FORBIDDEN);+ let openai_body: serde_json::Value =+ serde_json::from_str(&openai.text().await.unwrap()).unwrap();+ assert_eq!(openai_body["error"]["type"], "permission_error");+ assert_eq!(openai_body["error"]["code"], "model_not_allowed");++ let anthropic = reqwest::Client::new()+ .post(format!("{}/anthropic/v1/messages", gateway.url))+ .header("x-api-key", "gateway-key")+ .body(r#"{"model":"Production key:claude-sonnet-4-5"}"#)+ .send()+ .await+ .unwrap();+ assert_eq!(anthropic.status(), StatusCode::FORBIDDEN);+ let anthropic_body: serde_json::Value =+ serde_json::from_str(&anthropic.text().await.unwrap()).unwrap();+ assert_eq!(anthropic_body["error"]["type"], "permission_error");+ assert_eq!(+ anthropic_body["error"]["message"],+ "Model is not allowed for this provider connection"+ );+ assert_eq!(web.calls(), 2);+ assert_eq!(provider.calls(), 0);+}+#[tokio::test]async fn anthropic_capacity_rejections_use_the_native_envelope() {let provider = FakeServer::start(|_| async { Response::new(Body::empty()) }).await;diff --git a/ai-gateway/src/resolution/mod.rs b/ai-gateway/src/resolution/mod.rsindex fd58217ce5..a9eab072f7 100644--- a/ai-gateway/src/resolution/mod.rs+++ b/ai-gateway/src/resolution/mod.rs@@ -20,6 +20,7 @@ use std::{const RESOLVE_PATH: &str = "/api/internal/ai-gateway/v1/resolve";const MODELS_PATH: &str = "/api/internal/ai-gateway/v1/models";const REQUEST_ID_HEADER: &str = "langfuse-gateway-request-id";+const ERROR_CODE_HEADER: &str = "langfuse-gateway-error-code";// Web sits behind load balancers that drop idle connections after 60s by default// (AWS ALB). Evicting pooled connections first keeps the resolver from sending on a// socket the balancer is closing, which would fail without a retry.@@ -256,6 +257,13 @@ async fn read_response(200 => {}400 => return Err(ResolutionError::InvalidRequest),401 => return Err(ResolutionError::Authentication),+ 403 if response+ .headers()+ .get(ERROR_CODE_HEADER)+ .is_some_and(|value| value == "model_not_allowed") =>+ {+ return Err(ResolutionError::ModelNotAllowed);+ }403 => return Err(ResolutionError::Forbidden),404 => return Err(ResolutionError::NoRoute),429 | 500..=599 => return Err(ResolutionError::Unavailable),@@ -293,6 +301,7 @@ pub enum ResolutionError {InvalidRequest,Authentication,Forbidden,+ ModelNotAllowed,NoRoute,Unavailable,Timeout,@@ -309,6 +318,7 @@ impl fmt::Display for ResolutionError {Self::InvalidRequest => "invalid gateway request",Self::Authentication => "gateway authentication failed",Self::Forbidden => "gateway access forbidden",+ Self::ModelNotAllowed => "model is not allowed",Self::NoRoute => "no eligible connection",Self::Unavailable => "resolution unavailable",Self::Timeout => "resolution deadline exceeded",diff --git a/ai-gateway/src/resolution/tests.rs b/ai-gateway/src/resolution/tests.rsindex 4949754b0a..f457b504d0 100644--- a/ai-gateway/src/resolution/tests.rs+++ b/ai-gateway/src/resolution/tests.rs@@ -279,6 +279,33 @@ async fn denied_and_failed_resolutions_are_classified_without_retries_or_body_le}}+#[tokio::test]+async fn model_policy_rejections_are_distinct_from_other_forbidden_responses() {+ let web = FakeWeb::start(|_| async {+ Response::builder()+ .status(StatusCode::FORBIDDEN)+ .header("langfuse-gateway-error-code", "model_not_allowed")+ .body(Body::from("private-upstream-error"))+ .unwrap()+ })+ .await;++ let error = web+ .control_plane()+ .resolve_at(+ GATEWAY_KEY,+ ApiFormat::OpenAiResponses,+ "primary:gpt-4.1",+ NOW_TIME,+ REQUEST_ID,+ )+ .await+ .unwrap_err();++ assert!(matches!(error, ResolutionError::ModelNotAllowed));+ assert!(!format!("{error:?} {error}").contains("private-upstream-error"));+}+#[tokio::test]async fn never_follows_redirects_with_credentials() {let destination =diff --git a/packages/shared/prisma/migrations/20261014132400_update_gateway_connection_model_routing/migration.sql b/packages/shared/prisma/migrations/20261014132400_update_gateway_connection_model_routing/migration.sqlnew file mode 100644index 0000000000..db39c3be21--- /dev/null+++ b/packages/shared/prisma/migrations/20261014132400_update_gateway_connection_model_routing/migration.sql@@ -0,0 +1,13 @@+DROP INDEX "gateway_ai_connections_organization_id_routing_priority_key";++DROP INDEX "gateway_ai_connections_organization_id_status_routing_prior_idx";++ALTER TABLE "gateway_ai_connections"+ADD COLUMN "allowed_models" JSONB,+DROP COLUMN "routing_priority";++CREATE INDEX "gateway_ai_conn_org_created_at_id_idx"+ON "gateway_ai_connections"("organization_id", "created_at", "id");++CREATE INDEX "gateway_ai_conn_org_status_created_at_id_idx"+ON "gateway_ai_connections"("organization_id", "status", "created_at", "id");diff --git a/packages/shared/prisma/schema.prisma b/packages/shared/prisma/schema.prismaindex 2597b1c145..daa5af6e13 100644--- a/packages/shared/prisma/schema.prisma+++ b/packages/shared/prisma/schema.prisma@@ -356,14 +356,14 @@ model GatewayAiConnection {encryptedCredential String @map("encrypted_credentials")displaySecret String @map("display_secret_key")createdById String? @map("created_by_id")- routingPriority Int @map("routing_priority")status GatewayConnectionStatus @default(ENABLED)+ allowedModels Json? @map("allowed_models") @db.JsonBcreatedAt DateTime @default(now()) @map("created_at")updatedAt DateTime @default(now()) @updatedAt @map("updated_at")@@unique([organizationId, name])- @@unique([organizationId, routingPriority])- @@index([organizationId, status, routingPriority])+ @@index([organizationId, createdAt, id], map: "gateway_ai_conn_org_created_at_id_idx")+ @@index([organizationId, status, createdAt, id], map: "gateway_ai_conn_org_status_created_at_id_idx")@@map("gateway_ai_connections")}diff --git a/packages/shared/scripts/seeder/seed-postgres.ts b/packages/shared/scripts/seeder/seed-postgres.tsindex c90f90266e..d91c4005b0 100644--- a/packages/shared/scripts/seeder/seed-postgres.ts+++ b/packages/shared/scripts/seeder/seed-postgres.ts@@ -585,7 +585,6 @@ async function seedAiGateway(params: {encryptedCredential: encrypt("sk-seed-openai-not-valid"),displaySecret: getDisplaySecretKey("sk-seed-openai-not-valid"),createdById: params.userId,- routingPriority: 0,status: "ENABLED",},{@@ -596,7 +595,6 @@ async function seedAiGateway(params: {encryptedCredential: encrypt("sk-ant-seed-not-valid"),displaySecret: getDisplaySecretKey("sk-ant-seed-not-valid"),createdById: params.userId,- routingPriority: 1,status: "ENABLED",},],diff --git a/packages/shared/src/features/rbac/organizationAccessRights.ts b/packages/shared/src/features/rbac/organizationAccessRights.tsindex 1ed313763e..df1b6c1aa1 100644--- a/packages/shared/src/features/rbac/organizationAccessRights.ts+++ b/packages/shared/src/features/rbac/organizationAccessRights.ts@@ -9,6 +9,7 @@ export const organizationScopes = ["organization:delete","organizationLlmApiKeys:read","organizationLlmApiKeys:CUD",+ "gateway:read","gateway:manage","gateway:invoke","organizationMembers:read",@@ -31,6 +32,7 @@ export const organizationRoleAccessRights: Record<Role, OrganizationScope[]> = {"organization:delete","organizationLlmApiKeys:read","organizationLlmApiKeys:CUD",+ "gateway:read","gateway:manage","gateway:invoke","organizationMembers:CUD",@@ -48,6 +50,7 @@ export const organizationRoleAccessRights: Record<Role, OrganizationScope[]> = {"organization:update","organizationLlmApiKeys:read","organizationLlmApiKeys:CUD",+ "gateway:read","gateway:manage","gateway:invoke","organizationMembers:CUD",@@ -57,8 +60,8 @@ export const organizationRoleAccessRights: Record<Role, OrganizationScope[]> = {// used for api keys"projects:read",],- MEMBER: ["gateway:invoke", "organizationMembers:read"],- VIEWER: [],+ MEMBER: ["gateway:read", "gateway:invoke", "organizationMembers:read"],+ VIEWER: ["gateway:read"],NONE: [],};diff --git a/web/src/__e2e__/ai-gateway.gatewaye2e.ts b/web/src/__e2e__/ai-gateway.gatewaye2e.tsindex df7af2c53e..2a7ef7233d 100644--- a/web/src/__e2e__/ai-gateway.gatewaye2e.ts+++ b/web/src/__e2e__/ai-gateway.gatewaye2e.ts@@ -173,14 +173,13 @@ describe("AI gateway live end-to-end", () => {const connections = await prisma.gatewayAiConnection.findMany({where: { organizationId: ORGANIZATION_ID },- orderBy: { routingPriority: "asc" },+ orderBy: [{ createdAt: "asc" }, { id: "asc" }],select: {id: true,provider: true,status: true,encryptedCredential: true,displaySecret: true,- routingPriority: true,updatedAt: true,},});@@ -194,11 +193,6 @@ describe("AI gateway live end-to-end", () => {}),);- let nextRoutingPriority =- Math.max(- -1,- ...connections.map(({ routingPriority }) => routingPriority),- ) + 1;for (const provider of ENABLED_PROVIDERS) {const credential = PROVIDER_CREDENTIALS[provider];const existingConnection = connections.find(@@ -224,11 +218,9 @@ describe("AI gateway live end-to-end", () => {provider,encryptedCredential: encrypt(credential),displaySecret: getDisplaySecretKey(credential),- routingPriority: nextRoutingPriority,status: GatewayConnectionStatus.ENABLED,},});- nextRoutingPriority += 1;createdConnectionIds.add(connection.id);connectionIdsByProvider.set(provider, connection.id);continue;diff --git a/web/src/__tests__/organization-settings-pages.clienttest.tsx b/web/src/__tests__/organization-settings-pages.clienttest.tsxindex 1bc4d15bec..719b5cc909 100644--- a/web/src/__tests__/organization-settings-pages.clienttest.tsx+++ b/web/src/__tests__/organization-settings-pages.clienttest.tsx@@ -7,6 +7,7 @@ import { useHasOrganizationAccess } from "@/src/features/rbac";import { useIsCloudBillingAvailable } from "@/src/ee/features/billing";import { useV4UpgradeUiFlag } from "@/src/features/v4-migration/useV4UpgradeUiEnabled";import { useOrganizationSettingsPages } from "@/src/features/organizations/OrganizationSettingsPage";+import { env } from "@/src/env.mjs";vi.mock("@/src/components/PagedSettingsContainer", () => ({PagedSettingsContainer: () => null,@@ -186,23 +187,56 @@ describe("useOrganizationSettingsPages", () => {).toBe(true);});- it("hides all AI Gateway settings without gateway management access", () => {+ it("shows only AI Gateway models with read access", () => {+ vi.mocked(useHasOrganizationAccess).mockImplementation(+ ({ scope }) => scope === "gateway:read",+ );+ vi.mocked(useIsFeatureEnabled).mockReturnValue(true);+const { result } = renderHook(() => useOrganizationSettingsPages());expect(useHasOrganizationAccess).toHaveBeenCalledWith({organizationId: "org-1",scope: "gateway:manage",});+ expect(useHasOrganizationAccess).toHaveBeenCalledWith({+ organizationId: "org-1",+ scope: "gateway:read",+ });expect(result.current.filter((page) => page.slug.startsWith("ai-gateway"))- .every((page) => page.show === false),- ).toBe(true);+ .filter((page) => page.show)+ .map((page) => page.slug),+ ).toEqual(["ai-gateway-models"]);+ });++ it("hides AI Gateway models for read-only access to the demo organization", () => {+ vi.mocked(useQueryProjectOrOrganization).mockReturnValue({+ organization: { ...organization, id: "demo-org" },+ project: null,+ } as unknown as ReturnType<typeof useQueryProjectOrOrganization>);+ vi.mocked(useHasOrganizationAccess).mockImplementation(+ ({ scope }) => scope === "gateway:read",+ );+ vi.mocked(useIsFeatureEnabled).mockReturnValue(true);+ const originalDemoOrgId = env.NEXT_PUBLIC_DEMO_ORG_ID;+ Object.assign(env, { NEXT_PUBLIC_DEMO_ORG_ID: "demo-org" });++ try {+ const { result } = renderHook(() => useOrganizationSettingsPages());++ expect(+ result.current.find((page) => page.slug === "ai-gateway-models")?.show,+ ).toBe(false);+ } finally {+ Object.assign(env, { NEXT_PUBLIC_DEMO_ORG_ID: originalDemoOrgId });+ }});it("hides all AI Gateway settings when the internal flag is disabled", () => {vi.mocked(useHasOrganizationAccess).mockImplementation(- ({ scope }) => scope === "gateway:manage",+ ({ scope }) => scope === "gateway:manage" || scope === "gateway:read",);const { result } = renderHook(() => useOrganizationSettingsPages());@@ -215,7 +249,7 @@ describe("useOrganizationSettingsPages", () => {it("shows all AI Gateway settings when the internal flag and gateway management access are enabled", () => {vi.mocked(useHasOrganizationAccess).mockImplementation(- ({ scope }) => scope === "gateway:manage",+ ({ scope }) => scope === "gateway:manage" || scope === "gateway:read",);vi.mocked(useIsFeatureEnabled).mockReturnValue(true);diff --git a/web/src/__tests__/server/ai-gateway-control-plane.servertest.ts b/web/src/__tests__/server/ai-gateway-control-plane.servertest.tsindex f7359bcb6b..609144edcc 100644--- a/web/src/__tests__/server/ai-gateway-control-plane.servertest.ts+++ b/web/src/__tests__/server/ai-gateway-control-plane.servertest.ts@@ -181,6 +181,46 @@ async function prepare(role: Role = Role.OWNER) {};}+async function createCallerForOrganizationRole(+ setup: Awaited<ReturnType<typeof prepare>>,+ role: Role,+) {+ const suffix = randomUUID();+ const user = await prisma.user.create({+ data: {+ email: `gateway-role-${suffix}@example.test`,+ name: `Gateway ${role.toLowerCase()}`,+ },+ });+ await prisma.organizationMembership.create({+ data: { orgId: setup.org.id, userId: user.id, role },+ });+ cleanupUsers.push(user.id);++ const session: Session = {+ ...setup.session,+ user: {+ ...setup.session.user,+ id: user.id,+ name: user.name,+ organizations: setup.session.user.organizations.map((organization) =>+ organization.id === setup.org.id+ ? {+ ...organization,+ role,+ projects: organization.projects.map((project) => ({+ ...project,+ role,+ })),+ }+ : organization,+ ),+ },+ };+ const ctx = createInnerTRPCContext({ session, headers: {} });+ return appRouter.createCaller({ ...ctx, prisma });+}+describe("AI gateway control plane", () => {it.each([{@@ -244,6 +284,178 @@ describe("AI gateway control plane", () => {).rejects.toThrow("active project in the organization");});+ it.each([Role.MEMBER, Role.VIEWER])(+ "allows %s to read models without granting gateway management",+ async (role) => {+ const { caller, org } = await prepare(role);++ await expect(+ caller.aiGateway.listModelConnections({ orgId: org.id }),+ ).resolves.toEqual([]);+ await expect(+ caller.aiGateway.refreshModels({ orgId: org.id }),+ ).resolves.toEqual([]);+ await expect(+ caller.aiGateway.listConnections({ orgId: org.id }),+ ).rejects.toMatchObject({ code: "FORBIDDEN" });+ await expect(+ caller.aiGateway.getConfig({ orgId: org.id }),+ ).rejects.toMatchObject({ code: "FORBIDDEN" });+ },+ );++ it.each([+ { adminRole: Role.OWNER, readRole: Role.MEMBER },+ { adminRole: Role.ADMIN, readRole: Role.VIEWER },+ ])(+ "returns the full model catalog to $adminRole and filters disabled models for $readRole",+ async ({ adminRole, readRole }) => {+ const setup = await prepare(adminRole);+ const connection = await setup.caller.aiGateway.createConnection({+ orgId: setup.org.id,+ name: "OpenAI",+ provider: "OPENAI",+ credential: "sk-test-openai",+ });+ await setup.caller.aiGateway.updateConnectionModels({+ orgId: setup.org.id,+ id: connection.id,+ allowedModels: ["enabled-model"],+ expectedUpdatedAt: connection.updatedAt,+ });+ const readCaller = await createCallerForOrganizationRole(setup, readRole);+ const fetchSpy = vi.spyOn(globalThis, "fetch").mockResolvedValue(+ Response.json({+ data: [+ { id: "disabled-model", created: 10 },+ { id: "enabled-model", created: 20 },+ ],+ }),+ );++ try {+ await expect(+ setup.caller.aiGateway.refreshModels({ orgId: setup.org.id }),+ ).resolves.toEqual([+ {+ connectionId: connection.id,+ success: true,+ models: ["disabled-model", "enabled-model"],+ },+ ]);+ await new GatewayModelCatalogService(prisma).clearModelCache(+ setup.org.id,+ connection.id,+ );+ fetchSpy.mockClear();+ await expect(+ readCaller.aiGateway.refreshModels({ orgId: setup.org.id }),+ ).resolves.toEqual([+ {+ connectionId: connection.id,+ success: true,+ models: ["enabled-model"],+ },+ ]);+ expect(fetchSpy).not.toHaveBeenCalled();+ } finally {+ fetchSpy.mockRestore();+ }+ },+ );++ it("blocks an auto-granted demo organization VIEWER from gateway catalog metadata", async () => {+ const setup = await prepare();+ const connection = await setup.caller.aiGateway.createConnection({+ orgId: setup.org.id,+ name: "Shared OpenAI",+ provider: "OPENAI",+ credential: "sk-shared-openai",+ });+ await setup.caller.aiGateway.updateConnectionModels({+ orgId: setup.org.id,+ id: connection.id,+ allowedModels: ["enabled-model"],+ expectedUpdatedAt: connection.updatedAt,+ });+ const viewerCaller = await createCallerForOrganizationRole(+ setup,+ Role.VIEWER,+ );+ const originalDemoOrgId = env.NEXT_PUBLIC_DEMO_ORG_ID;+ Object.assign(env, { NEXT_PUBLIC_DEMO_ORG_ID: setup.org.id });++ try {+ await expect(+ setup.caller.aiGateway.listModelConnections({+ orgId: setup.org.id,+ }),+ ).resolves.toEqual([+ {+ id: connection.id,+ name: "Shared OpenAI",+ provider: "OPENAI",+ allowedModels: ["enabled-model"],+ },+ ]);+ await expect(+ viewerCaller.aiGateway.listModelConnections({ orgId: setup.org.id }),+ ).rejects.toMatchObject({ code: "FORBIDDEN" });+ } finally {+ Object.assign(env, {+ NEXT_PUBLIC_DEMO_ORG_ID: originalDemoOrgId,+ });+ }+ });++ it("blocks an auto-granted demo organization VIEWER from model refresh side effects", async () => {+ const setup = await prepare();+ const connection = await setup.caller.aiGateway.createConnection({+ orgId: setup.org.id,+ name: "Shared OpenAI",+ provider: "OPENAI",+ credential: "sk-shared-openai",+ });+ const viewerCaller = await createCallerForOrganizationRole(+ setup,+ Role.VIEWER,+ );+ const originalDemoOrgId = env.NEXT_PUBLIC_DEMO_ORG_ID;+ Object.assign(env, { NEXT_PUBLIC_DEMO_ORG_ID: setup.org.id });+ const fetchSpy = vi+ .spyOn(globalThis, "fetch")+ .mockResolvedValue(new Response(null, { status: 401 }));++ try {+ const refreshOutcome = await viewerCaller.aiGateway+ .refreshModels({ orgId: setup.org.id })+ .then(+ () => "fulfilled" as const,+ () => "rejected" as const,+ );+ const storedConnection =+ await prisma.gatewayAiConnection.findUniqueOrThrow({+ where: { id: connection.id },+ select: { status: true },+ });++ expect({+ refreshOutcome,+ providerCalls: fetchSpy.mock.calls.length,+ connectionStatus: storedConnection.status,+ }).toEqual({+ refreshOutcome: "rejected",+ providerCalls: 0,+ connectionStatus: "ENABLED",+ });+ } finally {+ fetchSpy.mockRestore();+ Object.assign(env, {+ NEXT_PUBLIC_DEMO_ORG_ID: originalDemoOrgId,+ });+ }+ });+it("stores provider credentials encrypted and never returns them", async () => {const { caller, org } = await prepare();const credential = "sk-test-gateway-redaction";@@ -269,6 +481,16 @@ describe("AI gateway control plane", () => {const listed = await caller.aiGateway.listConnections({ orgId: org.id });expect(listed.data[0]).not.toHaveProperty("encryptedCredential");expect(JSON.stringify(listed)).not.toContain(credential);+ await expect(+ caller.aiGateway.listModelConnections({ orgId: org.id }),+ ).resolves.toEqual([+ {+ id: created.id,+ name: "OpenAI primary",+ provider: "OPENAI",+ allowedModels: null,+ },+ ]);const stored = await prisma.gatewayAiConnection.findUniqueOrThrow({where: { id: created.id },@@ -682,6 +904,145 @@ describe("AI gateway control plane", () => {).rejects.toMatchObject({ status: 404 });});+ it("persists connection model allowlists and enforces them for resolve and models", async () => {+ configureGatewayJwtSigning();+ const { caller, org, project } = await prepare();+ await caller.aiGateway.updateConfig({+ orgId: org.id,+ defaultIngestionProjectId: project.id,+ ingestionMode: "FULL",+ });+ const connection = await caller.aiGateway.createConnection({+ orgId: org.id,+ name: "OpenAI",+ provider: "OPENAI",+ credential: "sk-test-openai",+ });+ const gatewayKey = await caller.aiGateway.createApiKey({+ orgId: org.id,+ metadata: {},+ });+ const fastHashedSecretKey = createShaHash(gatewayKey.secretKey, env.SALT);++ await expect(+ authenticateRequest({+ fastHashedSecretKey,+ apiFormat: "openai.responses",+ model: "OpenAI:gpt-4o",+ }),+ ).resolves.toMatchObject({+ connection: { id: connection.id, provider_model: "gpt-4o" },+ });++ await caller.aiGateway.updateConnectionModels({+ orgId: org.id,+ id: connection.id,+ allowedModels: ["gpt-4o-mini"],+ expectedUpdatedAt: connection.updatedAt,+ });++ await expect(+ authenticateRequest({+ fastHashedSecretKey,+ apiFormat: "openai.responses",+ model: "OpenAI:gpt-4o",+ }),+ ).rejects.toMatchObject({+ status: 403,+ code: "model_not_allowed",+ });+ await expect(+ authenticateRequest({+ fastHashedSecretKey,+ apiFormat: "openai.responses",+ model: "gpt-4o",+ }),+ ).rejects.toMatchObject({+ status: 403,+ code: "model_not_allowed",+ });+ await expect(+ authenticateRequest({+ fastHashedSecretKey,+ apiFormat: "openai.responses",+ model: "OpenAI:gpt-4o-mini",+ }),+ ).resolves.toMatchObject({+ connection: { id: connection.id, provider_model: "gpt-4o-mini" },+ });++ const context = await new GatewayApiKeyAuthenticator(+ prisma,+ ).authenticateModelsRequest({+ fastHashedSecretKey,+ apiFormat: "openai.responses",+ });+ const fetcher = vi.fn<typeof fetch>().mockResolvedValue(+ Response.json({+ data: [+ { id: "gpt-4o", created: 10 },+ { id: "gpt-4o-mini", created: 20 },+ ],+ }),+ );+ await expect(+ new GatewayModelsService(prisma, fetcher, null).list({+ context,+ apiFormat: "openai.responses",+ }),+ ).resolves.toMatchObject({+ data: [{ id: "OpenAI:gpt-4o-mini" }],+ });++ const listed = await caller.aiGateway.listConnections({ orgId: org.id });+ expect(listed.data[0]?.allowedModels).toEqual(["gpt-4o-mini"]);+ await caller.aiGateway.updateConnectionModels({+ orgId: org.id,+ id: connection.id,+ allowedModels: null,+ expectedUpdatedAt: listed.data[0]!.updatedAt,+ });+ const allowAll = await caller.aiGateway.getConnection({+ orgId: org.id,+ id: connection.id,+ });+ expect(allowAll.allowedModels).toBeNull();+ });++ it("rejects stale concurrent model allowlist updates", async () => {+ const { caller, org } = await prepare();+ const connection = await caller.aiGateway.createConnection({+ orgId: org.id,+ name: "OpenAI",+ provider: "OPENAI",+ credential: "sk-test-openai",+ });++ await caller.aiGateway.updateConnectionModels({+ orgId: org.id,+ id: connection.id,+ allowedModels: ["gpt-4o"],+ expectedUpdatedAt: connection.updatedAt,+ });+ await expect(+ caller.aiGateway.updateConnectionModels({+ orgId: org.id,+ id: connection.id,+ allowedModels: ["gpt-4o-mini"],+ expectedUpdatedAt: connection.updatedAt,+ }),+ ).rejects.toThrow(+ "Model access changed while this page was open. Reload and try again.",+ );++ await expect(+ caller.aiGateway.getConnection({+ orgId: org.id,+ id: connection.id,+ }),+ ).resolves.toMatchObject({ allowedModels: ["gpt-4o"] });+ });+it("requires connection names to be unique within an organization", async () => {const { caller, org } = await prepare();await expect(@@ -820,7 +1181,40 @@ describe("AI gateway control plane", () => {).toBe(1);});- it("keeps routing priorities contiguous through reorders and deletes", async () => {+ it("keeps disabled connections disabled after model discovery auth failures", async () => {+ const { caller, org } = await prepare();+ const connection = await caller.aiGateway.createConnection({+ orgId: org.id,+ name: "Anthropic",+ provider: "ANTHROPIC",+ credential: "sk-ant-test",+ });+ await caller.aiGateway.updateConnection({+ orgId: org.id,+ id: connection.id,+ status: "DISABLED",+ });+ const unauthorizedFetch = vi+ .fn<typeof fetch>()+ .mockResolvedValue(new Response(null, { status: 401 }));++ await new GatewayModelCatalogService(+ prisma,+ unauthorizedFetch,+ ).refreshModels({+ organizationId: org.id,+ connectionId: connection.id,+ });++ await expect(+ prisma.gatewayAiConnection.findUnique({+ where: { id: connection.id },+ select: { status: true },+ }),+ ).resolves.toEqual({ status: "DISABLED" });+ });++ it("orders connections by creation time", async () => {const { caller, org } = await prepare();const created = [];for (const name of ["first", "second", "third"]) {@@ -833,71 +1227,34 @@ describe("AI gateway control plane", () => {}),);}- const priorities = async () =>- (- await prisma.gatewayAiConnection.findMany({- where: { organizationId: org.id },- select: { name: true, routingPriority: true },- orderBy: { routingPriority: "asc" },- })- ).map(({ name, routingPriority }) => [name, routingPriority]);-- expect(await priorities()).toEqual([- ["first", 0],- ["second", 1],- ["third", 2],- ]);-- // Reversing every row would violate the unique (organization_id,- // routing_priority) index if the writes were applied in place.- await caller.aiGateway.reorderConnections({- orgId: org.id,- connectionIds: [...created].reverse().map(({ id }) => id),- });- expect(await priorities()).toEqual([- ["third", 0],- ["second", 1],- ["first", 2],+ await Promise.all([+ prisma.gatewayAiConnection.update({+ where: { id: created[0].id },+ data: { createdAt: new Date("2026-10-03T00:00:00.000Z") },+ }),+ prisma.gatewayAiConnection.update({+ where: { id: created[1].id },+ data: { createdAt: new Date("2026-10-01T00:00:00.000Z") },+ }),+ prisma.gatewayAiConnection.update({+ where: { id: created[2].id },+ data: { createdAt: new Date("2026-10-02T00:00:00.000Z") },+ }),]);- // Two reorders racing on one organization must serialize rather than- // deadlock on rows locked in opposite orders.- await expect(- Promise.all([- caller.aiGateway.reorderConnections({- orgId: org.id,- connectionIds: created.map(({ id }) => id),- }),- caller.aiGateway.reorderConnections({+ const listNames = async () =>+ (+ await caller.aiGateway.listConnections({orgId: org.id,- connectionIds: [...created].reverse().map(({ id }) => id),- }),- ]),- ).resolves.toHaveLength(2);- expect((await priorities()).map(([, priority]) => priority)).toEqual([- 0, 1, 2,- ]);+ })+ ).data.map(({ name }) => name);+ await expect(listNames()).resolves.toEqual(["second", "third", "first"]);- // Deleting from the middle must close the gap it leaves behind.await caller.aiGateway.deleteConnection({orgId: org.id,id: created[1].id,});- expect((await priorities()).map(([, priority]) => priority)).toEqual([- 0, 1,- ]);-- await expect(- caller.aiGateway.reorderConnections({- orgId: org.id,- connectionIds: [created[0].id],- }),- ).rejects.toThrow(- "Reorder must contain every organization gateway connection exactly once",- );- expect((await priorities()).map(([, priority]) => priority)).toEqual([- 0, 1,- ]);+ await expect(listNames()).resolves.toEqual(["third", "first"]);});it("serves repeat resolves from cache and drops it when a connection changes", async () => {@@ -1252,12 +1609,14 @@ describe("AI gateway control plane", () => {});const fetcher = vi.fn<typeof fetch>()- .mockResolvedValueOnce(new Response(null, { status: 500 }))- .mockResolvedValue(- Response.json({- data: [{ id: "available-model", created: 10 }],- }),- );+ .mockImplementation(async (_, init) => {+ const authorization = new Headers(init?.headers).get("authorization");+ return authorization === "Bearer sk-openai"+ ? new Response(null, { status: 500 })+ : Response.json({+ data: [{ id: "available-model", created: 10 }],+ });+ });const context = await new GatewayApiKeyAuthenticator(prisma,diff --git a/web/src/__tests__/server/unit/gatewayModelSlug.servertest.ts b/web/src/__tests__/server/unit/gatewayModelSlug.servertest.tsdeleted file mode 100644index 6973e94660..0000000000--- a/web/src/__tests__/server/unit/gatewayModelSlug.servertest.ts+++ /dev/null@@ -1,86 +0,0 @@-import { describe, expect, it } from "vitest";--import { resolveGatewayModelRoute } from "@/src/features/ai-gateway/fns/gatewayModelSlug";--const connections = [- { id: "openai-primary", name: "OpenAI primary", provider: "OPENAI" },- { id: "anthropic", name: "Anthropic", provider: "ANTHROPIC" },- { id: "openai-secondary", name: "OpenAI secondary", provider: "OPENAI" },-] as const;--describe("resolveGatewayModelRoute", () => {- it.each([- {- model: "OpenAI secondary:gpt-4o",- connectionId: "openai-secondary",- providerModel: "gpt-4o",- },- {- model: "OpenAI secondary:model:with:colon",- connectionId: "openai-secondary",- providerModel: "model:with:colon",- },- {- model: "gpt-6-sol",- connectionId: "openai-primary",- providerModel: "gpt-6-sol",- },- {- model: "ft:gpt-4o-mini-2024-07-18:acme::abc123",- connectionId: "openai-primary",- providerModel: "ft:gpt-4o-mini-2024-07-18:acme::abc123",- },- {- model: "claude-sonnet-4-5",- connectionId: "anthropic",- providerModel: "claude-sonnet-4-5",- },- ])(- "routes $model to $connectionId",- ({ model, connectionId, providerModel }) => {- const route = resolveGatewayModelRoute(model, connections);-- expect(route).not.toBeNull();- expect(route?.connection?.id).toBe(connectionId);- expect(route?.providerModel).toBe(providerModel);- },- );-- it.each(["gpt", "claude", "random-model", ":model", "OpenAI primary:"])(- "rejects unsupported model %s",- (model) => {- expect(resolveGatewayModelRoute(model, connections)).toBeNull();- },- );-- it("returns a valid unresolved route for a missing connection", () => {- expect(resolveGatewayModelRoute("Unknown:gpt-4o", connections)).toEqual({- connection: null,- providerModel: "gpt-4o",- });- expect(- resolveGatewayModelRoute("claude-sonnet-4-5", connections.slice(0, 1)),- ).toEqual({- connection: null,- providerModel: "claude-sonnet-4-5",- });- });-- it("prefers an explicit ft connection over the OpenAI fine-tune fallback", () => {- const ftConnection = {- id: "ft-connection",- name: "ft",- provider: "ANTHROPIC",- } as const;-- expect(- resolveGatewayModelRoute("ft:claude-sonnet-4-5", [- ...connections,- ftConnection,- ]),- ).toEqual({- connection: ftConnection,- providerModel: "claude-sonnet-4-5",- });- });-});diff --git a/web/src/__tests__/server/unit/gatewayResolveCache.servertest.ts b/web/src/__tests__/server/unit/gatewayResolveCache.servertest.tsindex fd3f0b49b6..52222bf74b 100644--- a/web/src/__tests__/server/unit/gatewayResolveCache.servertest.ts+++ b/web/src/__tests__/server/unit/gatewayResolveCache.servertest.ts@@ -22,6 +22,35 @@ const context: CachedResolveContext = {connections: [],};+function createStatefulRedis(): Redis {+ const values = new Map<string, string>();+ const sets = new Map<string, Set<string>>();+ return {+ get: vi.fn((key: string) => Promise.resolve(values.get(key) ?? null)),+ set: vi.fn((key: string, value: string) => {+ values.set(key, value);+ return Promise.resolve("OK");+ }),+ sadd: vi.fn((key: string, value: string) => {+ const entries = sets.get(key) ?? new Set<string>();+ entries.add(value);+ sets.set(key, entries);+ return Promise.resolve(1);+ }),+ smembers: vi.fn((key: string) =>+ Promise.resolve([...(sets.get(key) ?? new Set<string>())]),+ ),+ expire: vi.fn().mockResolvedValue(1),+ del: vi.fn((...keys: string[]) => {+ keys.forEach((key) => {+ values.delete(key);+ sets.delete(key);+ });+ return Promise.resolve(keys.length);+ }),+ } as unknown as Redis;+}+describe("GatewayResolveCache", () => {afterEach(() => {vi.useRealTimers();@@ -31,6 +60,7 @@ describe("GatewayResolveCache", () => {vi.useFakeTimers();vi.setSystemTime(new Date("2026-10-09T15:00:00.000Z"));const redis = {+ get: vi.fn().mockResolvedValue(null),set: vi.fn().mockResolvedValue("OK"),sadd: vi.fn().mockResolvedValue(1),expire: vi.fn().mockResolvedValue(1),@@ -56,6 +86,7 @@ describe("GatewayResolveCache", () => {vi.useFakeTimers();vi.setSystemTime(new Date("2026-10-09T15:00:00.000Z"));const redis = {+ get: vi.fn().mockResolvedValue(null),set: vi.fn(),sadd: vi.fn(),expire: vi.fn(),@@ -72,4 +103,40 @@ describe("GatewayResolveCache", () => {expect(redis.sadd).not.toHaveBeenCalled();expect(redis.expire).not.toHaveBeenCalled();});++ it("invalidates cached contexts for an organization", async () => {+ const cache = new GatewayResolveCache(createStatefulRedis());++ await cache.set({+ fastHashedSecretKey: "hashed-key",+ apiFormat: "openai.responses",+ context,+ });+ await cache.invalidateOrganization(context.organizationId);++ await expect(+ cache.get({+ fastHashedSecretKey: "hashed-key",+ apiFormat: "openai.responses",+ }),+ ).resolves.toBeNull();+ });++ it("invalidates cached contexts for an API key", async () => {+ const cache = new GatewayResolveCache(createStatefulRedis());++ await cache.set({+ fastHashedSecretKey: "hashed-key",+ apiFormat: "openai.responses",+ context,+ });+ await cache.invalidateApiKey("hashed-key");++ await expect(+ cache.get({+ fastHashedSecretKey: "hashed-key",+ apiFormat: "openai.responses",+ }),+ ).resolves.toBeNull();+ });});diff --git a/web/src/components/design-system/IconButton/IconButton.stories.tsx b/web/src/components/design-system/IconButton/IconButton.stories.tsxindex f323ae6018..86a8b2b5a6 100644--- a/web/src/components/design-system/IconButton/IconButton.stories.tsx+++ b/web/src/components/design-system/IconButton/IconButton.stories.tsx@@ -1,4 +1,4 @@-import { Copy } from "lucide-react";+import { Copy, Trash2 } from "lucide-react";import { expect, fn, userEvent, within } from "storybook/test";import preview from "../../../../.storybook/preview";@@ -17,6 +17,14 @@ const meta = preview.meta({export const Default = meta.story({});+export const OutlinedDestructive = meta.story({+ args: {+ icon: Trash2,+ label: "Delete",+ variant: "outlineDestructive",+ },+});+export const TestClick = meta.story({name: "(Test) Click",play: async ({ canvasElement }) => {diff --git a/web/src/components/design-system/IconButton/IconButton.tsx b/web/src/components/design-system/IconButton/IconButton.tsxindex 44dc9b7d97..a2007e76c0 100644--- a/web/src/components/design-system/IconButton/IconButton.tsx+++ b/web/src/components/design-system/IconButton/IconButton.tsx@@ -11,9 +11,13 @@ const buttonVariants = cva(ghost: "hover:bg-accent hover:text-accent-foreground",outline:"border border-input bg-background hover:bg-accent hover:text-accent-foreground",+ outlineDestructive:+ "border border-input bg-background hover:bg-accent hover:text-accent-foreground",subtle: "hover:bg-border aria-expanded:bg-border",toolbar:"text-muted-foreground hover:bg-accent hover:text-foreground aria-pressed:text-primary rounded-sm",+ destructive:+ "bg-destructive text-destructive-foreground hover:bg-destructive/90",},size: {xs: "size-4 rounded-sm",@@ -51,7 +55,13 @@ type IconButtonProps = NativeButtonProps & {label: string;ref?: Ref<HTMLButtonElement>;size?: "xs" | "sm" | "md";- variant?: "ghost" | "outline" | "subtle" | "toolbar";+ variant?:+ | "ghost"+ | "outline"+ | "outlineDestructive"+ | "subtle"+ | "toolbar"+ | "destructive";};export function IconButton({@@ -75,6 +85,8 @@ export function IconButton({className={cn(iconVariants({ size }),variant === "toolbar" && "icon-sm text-current",+ variant === "destructive" && "text-current",+ variant === "outlineDestructive" && "text-destructive",)}aria-hidden/>diff --git a/web/src/components/design-system/SelectInput/SelectInput.tsx b/web/src/components/design-system/SelectInput/SelectInput.tsxindex f57d23ba1c..8a721e0fbf 100644--- a/web/src/components/design-system/SelectInput/SelectInput.tsx+++ b/web/src/components/design-system/SelectInput/SelectInput.tsx@@ -11,6 +11,7 @@ import { Badge } from "../Badge/Badge";import { stopScrollPropagation } from "@/src/hooks/stopScrollPropagation";import { InputControl } from "../internal/InputControl/InputControl";import { InputDropdown } from "../internal/InputDropdown/InputDropdown";+import { cn } from "@/src/utils/tailwind";type SelectInputNode<V extends string> = React.ComponentProps<typeof SelectDropdown<V>@@ -31,6 +32,7 @@ type SelectInputProps<V extends string> = Pick<placeholder: string;search?: { placeholder: string };error?: boolean;+ muted?: boolean;};function isSelectGroup<V extends string>(@@ -48,6 +50,7 @@ function SelectInputInner<V extends string>(emptyMessage = "No options available.",search,error,+ muted,...triggerProps}: SelectInputProps<V>,ref: React.ForwardedRef<HTMLButtonElement>,@@ -77,7 +80,10 @@ function SelectInputInner<V extends string>({...triggerProps}><span- className="min-w-0 flex-1 truncate text-left"+ className={cn(+ "min-w-0 flex-1 truncate text-left",+ muted && "text-muted-foreground",+ )}title={selectedOption?.label}>{selectedOption?.label ?? placeholder}@@ -179,7 +185,10 @@ function SelectInputInner<V extends string>(<InputControl contentLayout="spread" error={error}><button {...getTriggerProps()}><span- className="min-w-0 flex-1 truncate text-left"+ className={cn(+ "min-w-0 flex-1 truncate text-left",+ muted && "text-muted-foreground",+ )}title={selectedLabel}>{selectedLabel ?? placeholder}diff --git a/web/src/components/design-system/table/columns/createTextTableColumn.tsx b/web/src/components/design-system/table/columns/createTextTableColumn.tsxindex f4e730299b..48fa13ce3a 100644--- a/web/src/components/design-system/table/columns/createTextTableColumn.tsx+++ b/web/src/components/design-system/table/columns/createTextTableColumn.tsx@@ -187,22 +187,24 @@ function CopyableText({ value }: { value: string }) {<TextWithActionvalue={value}action={- <IconButton- icon={isCopied ? Check : Copy}- label={isCopied ? "Copied" : "Copy to clipboard"}- size="xs"- title="Copy to clipboard"- onClick={async (event) => {- const button = event.currentTarget;- try {- await copy(value);- } catch {- // Clipboard failures are intentionally silent.- } finally {- button.focus();- }- }}- />+ <span className="inline-flex translate-y-px">+ <IconButton+ icon={isCopied ? Check : Copy}+ label={isCopied ? "Copied" : "Copy to clipboard"}+ size="xs"+ title="Copy to clipboard"+ onClick={async (event) => {+ const button = event.currentTarget;+ try {+ await copy(value);+ } catch {+ // Clipboard failures are intentionally silent.+ } finally {+ button.focus();+ }+ }}+ />+ </span>}/>);diff --git a/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.stories.tsx b/web/src/components/table/OverviewSelectionBar/OverviewSelectionBar.stories.tsxsimilarity index 92%rename from web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.stories.tsxrename to web/src/components/table/OverviewSelectionBar/OverviewSelectionBar.stories.tsxindex 59d10a44d3..5ccefebf42 100644--- a/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.stories.tsx+++ b/web/src/components/table/OverviewSelectionBar/OverviewSelectionBar.stories.tsx@@ -1,7 +1,7 @@import { fn } from "storybook/test";import { Trash2 } from "lucide-react";-import preview from "../../../../../../.storybook/preview";+import preview from "../../../../.storybook/preview";import { Button } from "@/src/components/ui/button";import { OverviewSelectionBar } from "./OverviewSelectionBar";diff --git a/web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.tsx b/web/src/components/table/OverviewSelectionBar/OverviewSelectionBar.tsxsimilarity index 100%rename from web/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar.tsxrename to web/src/components/table/OverviewSelectionBar/OverviewSelectionBar.tsxdiff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/GatewayConnectionModelsPage.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/GatewayConnectionModelsPage.tsxnew file mode 100644index 0000000000..4f0191c02b--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/GatewayConnectionModelsPage.tsx@@ -0,0 +1,148 @@+import { ArrowLeft, RefreshCw, Trash2 } from "lucide-react";++import { Alert } from "@/src/components/design-system/Alert/Alert";+import { ConfirmationDialogController } from "@/src/components/design-system/ConfirmationDialogController/ConfirmationDialogController";+import { IconButton } from "@/src/components/design-system/IconButton/IconButton";+import { TextLink } from "@/src/components/design-system/TextLink/TextLink";+import { ConnectionModelsLoadError } from "@/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsLoadError";+import { ConnectionModelsSkeleton } from "@/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsSkeleton";+import { GatewayConnectionModelsTable } from "@/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable";+import { useGatewayConnectionModels } from "@/src/features/ai-gateway/components/GatewayConnectionModelsPage/hooks/useGatewayConnectionModels";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";+import { toGatewayAllowedModelsSet } from "@/src/features/ai-gateway/fns/toGatewayAllowedModelsSet";+import { updateGatewayAllowedModels } from "@/src/features/ai-gateway/fns/updateGatewayAllowedModels";+import type { GatewayConnection } from "@/src/features/ai-gateway/types/gatewayProvider";++export type GatewayConnectionModelsPageProps = {+ organizationId: string;+ connectionId: string;+ isDeleting: boolean;+ onDelete: (connection: GatewayConnection) => Promise<void>;+};++export function GatewayConnectionModelsPage({+ organizationId,+ connectionId,+ isDeleting,+ onDelete,+}: GatewayConnectionModelsPageProps) {+ const {+ connectionQuery,+ modelsQuery,+ isRetrying,+ isSaving,+ retryDiscovery,+ retryQueries,+ saveAllowedModels,+ } = useGatewayConnectionModels({+ organizationId,+ connectionId,+ });++ if (connectionQuery.isPending || modelsQuery.isPending) {+ return <ConnectionModelsSkeleton />;+ }+ if (connectionQuery.isError || modelsQuery.isError) {+ return (+ <ConnectionModelsLoadError+ organizationId={organizationId}+ retry={retryQueries}+ />+ );+ }++ const connection = connectionQuery.data;+ const result = modelsQuery.data;+ const models = result.success ? result.models : [];+ const allowedModelsSet = toGatewayAllowedModelsSet(connection.allowedModels);+ const enabledCount = models.filter((model) =>+ isGatewayModelAllowed(allowedModelsSet, model),+ ).length;++ const setModelsEnabled = (+ targetModels: string[],+ enabled: boolean,+ onSuccess?: () => void,+ ) => {+ saveAllowedModels(+ updateGatewayAllowedModels({+ allowedModels: connection.allowedModels,+ availableModels: models,+ targetModels,+ enabled,+ }),+ onSuccess,+ );+ };+ const enableAll = () => saveAllowedModels(null);+ const disableAll = () => saveAllowedModels([]);+ const deleteConnection = () => onDelete(connection);++ return (+ <div className="flex h-full min-h-0 flex-col gap-4">+ <ConfirmationDialogController+ title="Delete provider credential"+ text={`Delete “${connection.name}”? Requests will immediately stop using it.`}+ confirmLabel="Delete credential"+ variant="destructive"+ loading={isDeleting}+ onConfirm={deleteConnection}+ >+ {({ openDialog }) => (+ <>+ <TextLink+ path={`/organization/${encodeURIComponent(organizationId)}/settings/ai-gateway-providers`}+ value="Provider credentials"+ icon={ArrowLeft}+ />+ <div className="flex items-center justify-between gap-4">+ <h2 className="text-lg font-bold">{connection.name}</h2>+ <div className="flex -translate-y-px items-center gap-2">+ <IconButton+ icon={RefreshCw}+ label="Refresh provider models"+ variant="outline"+ disabled={isRetrying || isDeleting}+ onClick={retryDiscovery}+ />+ <IconButton+ icon={Trash2}+ label="Delete provider credential"+ variant="outlineDestructive"+ disabled={isDeleting}+ onClick={openDialog}+ />+ </div>+ </div>+ </>+ )}+ </ConfirmationDialogController>+ <div>+ <p className="text-muted-foreground text-sm">+ Only enabled models can be requested through this credential.{" "}+ {enabledCount} of {models.length} enabled.+ </p>+ </div>+ {result.success ? (+ <GatewayConnectionModelsTable+ models={models}+ allowedModels={connection.allowedModels}+ isSaving={isSaving}+ onEnableAll={enableAll}+ onDisableAll={disableAll}+ onSetEnabled={setModelsEnabled}+ />+ ) : (+ <div className="flex flex-col gap-2">+ <Alert variant="destructive">+ <Alert.Title>Models could not be loaded</Alert.Title>+ <Alert.Description>+ The provider returned a model discovery error. Refresh the+ provider before changing model access.+ </Alert.Description>+ </Alert>+ </div>+ )}+ </div>+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsLoadError.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsLoadError.tsxnew file mode 100644index 0000000000..fd785d7ec5--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsLoadError.tsx@@ -0,0 +1,34 @@+import { ArrowLeft } from "lucide-react";++import { Alert } from "@/src/components/design-system/Alert/Alert";+import { Button } from "@/src/components/design-system/Button/Button";+import { TextLink } from "@/src/components/design-system/TextLink/TextLink";++export type ConnectionModelsLoadErrorProps = {+ organizationId: string;+ retry: () => void;+};++export function ConnectionModelsLoadError({+ organizationId,+ retry,+}: ConnectionModelsLoadErrorProps) {+ return (+ <div className="flex flex-col gap-4">+ <TextLink+ path={`/organization/${encodeURIComponent(organizationId)}/settings/ai-gateway-providers`}+ value="Provider credentials"+ icon={ArrowLeft}+ />+ <Alert variant="destructive">+ <Alert.Title>Provider models could not be loaded</Alert.Title>+ <Alert.Description>+ Retry to manage model access for this credential.+ </Alert.Description>+ </Alert>+ <div>+ <Button text="Retry" variant="secondary" onClick={retry} />+ </div>+ </div>+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsSkeleton.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsSkeleton.tsxnew file mode 100644index 0000000000..cc9125beaf--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/ConnectionModelsSkeleton.tsx@@ -0,0 +1,11 @@+import { Skeleton } from "@/src/components/ui/skeleton";++export function ConnectionModelsSkeleton() {+ return (+ <div className="flex flex-col gap-4">+ <Skeleton className="h-5 w-36" />+ <Skeleton className="h-7 w-52" />+ <Skeleton className="h-64 w-full" />+ </div>+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable.stories.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable.stories.tsxnew file mode 100644index 0000000000..3f518d14c7--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable.stories.tsx@@ -0,0 +1,38 @@+import { fn } from "storybook/test";++import preview from "@/.storybook/preview";+import { GatewayConnectionModelsTable } from "./GatewayConnectionModelsTable";++const meta = preview.meta({ component: GatewayConnectionModelsTable });++const actions = {+ isSaving: false,+ onEnableAll: fn(),+ onDisableAll: fn(),+ onSetEnabled: fn(),+};++export const Default = meta.story({+ args: {+ ...actions,+ models: ["claude-haiku-4-5", "claude-sonnet-4-5", "gpt-4o", "gpt-4o-mini"],+ allowedModels: ["claude-sonnet-4-5", "gpt-4o"],+ },+});++export const Empty = meta.story({+ args: {+ ...actions,+ models: [],+ allowedModels: null,+ },+});++export const Saving = meta.story({+ args: {+ ...actions,+ isSaving: true,+ models: ["gpt-4o", "gpt-4o-mini"],+ allowedModels: ["gpt-4o"],+ },+});diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable.tsxnew file mode 100644index 0000000000..11a20725be--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/GatewayConnectionModelsTable.tsx@@ -0,0 +1,208 @@+import { useCallback, useMemo, useState } from "react";+import type { OrderByState } from "@langfuse/shared";+import type { OnChangeFn, PaginationState } from "@tanstack/react-table";++import { DataTable } from "@/src/components/table/data-table";+import type { CustomHeights } from "@/src/components/table/data-table-row-height-switch";+import { createTableSelectionStore } from "@/src/components/table/table-selection-store";+import type { LangfuseColumnDef } from "@/src/components/table/types";+import { TableSelectionManager } from "@/src/features/table";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";+import { toGatewayAllowedModelsSet } from "@/src/features/ai-gateway/fns/toGatewayAllowedModelsSet";+import { GatewayConnectionModelsSelectionBar } from "./components/GatewayConnectionModelsSelectionBar";+import { GatewayConnectionModelsToolbar } from "./components/GatewayConnectionModelsToolbar";+import { ModelEnabledSwitch } from "./components/ModelEnabledSwitch";+import type { GatewayConnectionModelRow } from "./types/gatewayConnectionModelRow";++const PAGE_SIZE_OPTIONS = [10, 20, 30, 40, 50];+const DEFAULT_PAGE_SIZE = 50;+const ROW_HEIGHTS = {+ s: "h-12",+ m: "h-24",+ l: "h-64",+} satisfies CustomHeights;++export type GatewayConnectionModelsTableProps = {+ models: string[];+ allowedModels: string[] | null;+ isSaving: boolean;+ onEnableAll: () => void;+ onDisableAll: () => void;+ onSetEnabled: (+ models: string[],+ enabled: boolean,+ onSuccess?: () => void,+ ) => void;+};++export function GatewayConnectionModelsTable({+ models,+ allowedModels,+ isSaving,+ onEnableAll,+ onDisableAll,+ onSetEnabled,+}: GatewayConnectionModelsTableProps) {+ const [search, setSearch] = useState("");+ const [pagination, setPagination] = useState<PaginationState>({+ pageIndex: 0,+ pageSize: DEFAULT_PAGE_SIZE,+ });+ const [orderBy, setOrderBy] = useState<OrderByState>({+ column: "name",+ order: "ASC",+ });+ const [selectionStore] = useState(() => createTableSelectionStore());+ const { selectActionColumn } =+ TableSelectionManager<GatewayConnectionModelRow>({+ projectId: "",+ tableName: "gateway-connection-models",+ setSelectedRows: selectionStore.getState().actions.setRowSelection,+ setSelectAll: selectionStore.getState().actions.setSelectAll,+ selectionStore,+ });+ const toggleModel = useCallback(+ (model: string, enabled: boolean) => onSetEnabled([model], enabled),+ [onSetEnabled],+ );+ const columns = useMemo<LangfuseColumnDef<GatewayConnectionModelRow>[]>(+ () => [+ {+ ...selectActionColumn,+ size: 32,+ minSize: 32,+ maxSize: 32,+ enableResizing: false,+ },+ {+ accessorKey: "id",+ id: "name",+ header: "Model",+ size: 240,+ minSize: 180,+ isFlexWidth: true,+ enableSorting: true,+ cell: ({ row }) => (+ <span className="block truncate" title={row.original.id}>+ {row.original.id}+ </span>+ ),+ },+ {+ accessorKey: "enabled",+ id: "status",+ header: "Enabled",+ enableSorting: true,+ size: 90,+ minSize: 90,+ maxSize: 90,+ enableResizing: false,+ cell: ({ row }) => (+ <ModelEnabledSwitch+ model={row.original.id}+ enabled={row.original.enabled}+ disabled={isSaving}+ onToggle={toggleModel}+ />+ ),+ },+ ],+ [isSaving, selectActionColumn, toggleModel],+ );+ const normalizedSearch = search.trim().toLowerCase();+ const allowedModelsSet = useMemo(+ () => toGatewayAllowedModelsSet(allowedModels),+ [allowedModels],+ );+ const filteredModels = models+ .filter((model) => model.toLowerCase().includes(normalizedSearch))+ .map((id) => ({+ id,+ enabled: isGatewayModelAllowed(allowedModelsSet, id),+ }));+ const sortedModels = filteredModels.toSorted((left, right) => {+ const comparison =+ orderBy?.column === "status"+ ? Number(left.enabled) - Number(right.enabled)+ : left.id.localeCompare(right.id);+ return orderBy?.order === "DESC" ? -comparison : comparison;+ });+ const filteredModelIds = filteredModels.map((model) => model.id);+ const lastPageIndex = Math.max(+ 0,+ Math.ceil(sortedModels.length / pagination.pageSize) - 1,+ );+ const visiblePageIndex = Math.min(pagination.pageIndex, lastPageIndex);+ const rows = sortedModels.slice(+ visiblePageIndex * pagination.pageSize,+ (visiblePageIndex + 1) * pagination.pageSize,+ );+ const pageModelIds = rows.map((model) => model.id);++ const handleSearchChange = (value: string) => {+ setSearch(value);+ setPagination((current) => ({ ...current, pageIndex: 0 }));+ selectionStore.getState().actions.clearSelection();+ };+ const handlePaginationChange: OnChangeFn<PaginationState> = (updater) => {+ const currentState = {+ ...pagination,+ pageIndex: visiblePageIndex,+ };+ const nextState =+ typeof updater === "function" ? updater(currentState) : updater;+ setPagination(nextState);+ };+ const handleOrderByChange = (nextOrderBy: OrderByState) => {+ setOrderBy(nextOrderBy);+ setPagination((current) => ({ ...current, pageIndex: 0 }));+ };++ return (+ <>+ <div className="flex min-h-0 flex-1 flex-col">+ <GatewayConnectionModelsToolbar+ columns={columns}+ filteredModelIds={filteredModelIds}+ isSaving={isSaving}+ pageIndex={visiblePageIndex}+ pageModelIds={pageModelIds}+ pageSize={pagination.pageSize}+ search={search}+ selectionStore={selectionStore}+ onEnableAll={onEnableAll}+ onDisableAll={onDisableAll}+ onSearchChange={handleSearchChange}+ />+ <div className="min-h-0 flex-1 overflow-hidden rounded-md border">+ <DataTable+ tableName="gateway-connection-models"+ columns={columns}+ data={{ isLoading: false, isError: false, data: rows }}+ pagination={{+ totalCount: sortedModels.length,+ state: {+ pageIndex: visiblePageIndex,+ pageSize: pagination.pageSize,+ },+ onChange: handlePaginationChange,+ options: PAGE_SIZE_OPTIONS,+ }}+ selectionStore={selectionStore}+ rowHeight="s"+ customRowHeights={ROW_HEIGHTS}+ orderBy={orderBy}+ setOrderBy={handleOrderByChange}+ noResultsMessage="No models match the current search."+ />+ </div>+ </div>+ <GatewayConnectionModelsSelectionBar+ filteredModelIds={filteredModelIds}+ isSaving={isSaving}+ selectionStore={selectionStore}+ onSetEnabled={onSetEnabled}+ />+ </>+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/GatewayConnectionModelsSelectionBar.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/GatewayConnectionModelsSelectionBar.tsxnew file mode 100644index 0000000000..83614f0c1d--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/GatewayConnectionModelsSelectionBar.tsx@@ -0,0 +1,65 @@+import { Pause, Play } from "lucide-react";+import { useStore } from "zustand";++import { OverviewSelectionBar } from "@/src/components/table/OverviewSelectionBar/OverviewSelectionBar";+import type { TableSelectionStore } from "@/src/components/table/table-selection-store";+import { Button } from "@/src/components/ui/button";++export type GatewayConnectionModelsSelectionBarProps = {+ filteredModelIds: string[];+ isSaving: boolean;+ selectionStore: TableSelectionStore;+ onSetEnabled: (+ models: string[],+ enabled: boolean,+ onSuccess?: () => void,+ ) => void;+};++export function GatewayConnectionModelsSelectionBar({+ filteredModelIds,+ isSaving,+ selectionStore,+ onSetEnabled,+}: GatewayConnectionModelsSelectionBarProps) {+ const rowSelection = useStore(selectionStore, (state) => state.rowSelection);+ const selectAll = useStore(selectionStore, (state) => state.selectAll);+ const selectionActions = selectionStore.getState().actions;+ const selectedIds = Object.keys(rowSelection).filter(+ (id) => rowSelection[id],+ );+ const selectedModels = selectAll ? filteredModelIds : selectedIds;++ const enableSelected = () =>+ onSetEnabled(selectedModels, true, selectionActions.clearSelection);+ const disableSelected = () =>+ onSetEnabled(selectedModels, false, selectionActions.clearSelection);++ return (+ <OverviewSelectionBar+ selectedCount={selectedModels.length}+ onClear={selectionActions.clearSelection}+ >+ <Button+ type="button"+ variant="outline"+ size="sm"+ disabled={isSaving}+ onClick={enableSelected}+ >+ <Play className="icon-base text-icon-foreground mr-2" />+ Enable+ </Button>+ <Button+ type="button"+ variant="outline"+ size="sm"+ disabled={isSaving}+ onClick={disableSelected}+ >+ <Pause className="icon-base text-icon-foreground mr-2" />+ Disable+ </Button>+ </OverviewSelectionBar>+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/GatewayConnectionModelsToolbar.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/GatewayConnectionModelsToolbar.tsxnew file mode 100644index 0000000000..ee00f28dc6--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/GatewayConnectionModelsToolbar.tsx@@ -0,0 +1,83 @@+import { useStore } from "zustand";++import { Button } from "@/src/components/ui/button";+import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";+import type { TableSelectionStore } from "@/src/components/table/table-selection-store";+import type { LangfuseColumnDef } from "@/src/components/table/types";+import type { GatewayConnectionModelRow } from "../types/gatewayConnectionModelRow";++export type GatewayConnectionModelsToolbarProps = {+ columns: LangfuseColumnDef<GatewayConnectionModelRow>[];+ filteredModelIds: string[];+ isSaving: boolean;+ pageIndex: number;+ pageModelIds: string[];+ pageSize: number;+ search: string;+ selectionStore: TableSelectionStore;+ onEnableAll: () => void;+ onDisableAll: () => void;+ onSearchChange: (value: string) => void;+};++export function GatewayConnectionModelsToolbar({+ columns,+ filteredModelIds,+ isSaving,+ pageIndex,+ pageModelIds,+ pageSize,+ search,+ selectionStore,+ onEnableAll,+ onDisableAll,+ onSearchChange,+}: GatewayConnectionModelsToolbarProps) {+ const rowSelection = useStore(selectionStore, (state) => state.rowSelection);+ const selectAll = useStore(selectionStore, (state) => state.selectAll);+ const actions = selectionStore.getState().actions;+ const selectedPageRowIds = pageModelIds.filter((id) => rowSelection[id]);++ return (+ <DataTableToolbar+ tableName="gateway-connection-models"+ columns={columns}+ className="px-0"+ searchConfig={{+ metadataSearchFields: ["Model"],+ updateQuery: onSearchChange,+ currentQuery: search,+ tableAllowsFullTextSearch: false,+ }}+ actionButtons={+ <>+ <Button+ type="button"+ variant="secondary"+ disabled={isSaving}+ onClick={onEnableAll}+ >+ Enable all+ </Button>+ <Button+ type="button"+ variant="secondary"+ disabled={isSaving}+ onClick={onDisableAll}+ >+ Disable all+ </Button>+ </>+ }+ multiSelect={{+ selectAll,+ setSelectAll: actions.setSelectAll,+ selectedRowIds: selectedPageRowIds,+ setRowSelection: actions.setRowSelection,+ pageSize,+ pageIndex,+ totalCount: filteredModelIds.length,+ }}+ />+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/ModelEnabledSwitch.tsx b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/ModelEnabledSwitch.tsxnew file mode 100644index 0000000000..dcd10a46f7--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/components/ModelEnabledSwitch.tsx@@ -0,0 +1,29 @@+import { Switch } from "@/src/components/design-system/Switch/Switch";++export type ModelEnabledSwitchProps = {+ model: string;+ enabled: boolean;+ disabled: boolean;+ onToggle: (model: string, enabled: boolean) => void;+};++export function ModelEnabledSwitch({+ model,+ enabled,+ disabled,+ onToggle,+}: ModelEnabledSwitchProps) {+ const handleCheckedChange = (checked: boolean) => onToggle(model, checked);++ return (+ <div onClick={(event) => event.stopPropagation()}>+ <Switch+ color="green"+ checked={enabled}+ disabled={disabled}+ aria-label={`${enabled ? "Disable" : "Enable"} ${model}`}+ onCheckedChange={handleCheckedChange}+ />+ </div>+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/types/gatewayConnectionModelRow.ts b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/types/gatewayConnectionModelRow.tsnew file mode 100644index 0000000000..3de20805d2--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/components/GatewayConnectionModelsTable/types/gatewayConnectionModelRow.ts@@ -0,0 +1,4 @@+export type GatewayConnectionModelRow = {+ id: string;+ enabled: boolean;+};diff --git a/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/hooks/useGatewayConnectionModels.ts b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/hooks/useGatewayConnectionModels.tsnew file mode 100644index 0000000000..ec82d3fe09--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayConnectionModelsPage/hooks/useGatewayConnectionModels.ts@@ -0,0 +1,64 @@+import { api } from "@/src/utils/api";++export function useGatewayConnectionModels({+ organizationId,+ connectionId,+}: {+ organizationId: string;+ connectionId: string;+}) {+ const utils = api.useUtils();+ const input = { orgId: organizationId, id: connectionId };+ const connectionQuery = api.aiGateway.getConnection.useQuery(input);+ const modelsQuery = api.aiGateway.getConnectionModels.useQuery(input);+ const updateModels = api.aiGateway.updateConnectionModels.useMutation({+ onSuccess: async (connection) => {+ utils.aiGateway.getConnection.setData(input, connection);+ await Promise.all([+ utils.aiGateway.listConnections.invalidate({ orgId: organizationId }),+ utils.aiGateway.refreshModels.invalidate({ orgId: organizationId }),+ ]);+ },+ onSettled: async (_connection, error) => {+ if (error) await connectionQuery.refetch();+ },+ });+ const retryModels = api.aiGateway.retryConnection.useMutation({+ onSuccess: async () => {+ await Promise.all([+ connectionQuery.refetch(),+ modelsQuery.refetch(),+ utils.aiGateway.listConnections.invalidate({ orgId: organizationId }),+ utils.aiGateway.refreshModels.invalidate({ orgId: organizationId }),+ ]);+ },+ });++ const retryQueries = () =>+ Promise.all([connectionQuery.refetch(), modelsQuery.refetch()]);+ const retryDiscovery = () => retryModels.mutate(input);+ const saveAllowedModels = (+ allowedModels: string[] | null,+ onSuccess?: () => void,+ ) => {+ if (!connectionQuery.data) return;+ updateModels.mutate(+ {+ ...input,+ allowedModels,+ expectedUpdatedAt: connectionQuery.data.updatedAt,+ },+ { onSuccess },+ );+ };++ return {+ connectionQuery,+ modelsQuery,+ isRetrying: retryModels.isPending,+ isSaving: updateModels.isPending,+ retryDiscovery,+ retryQueries,+ saveAllowedModels,+ };+}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsxindex 997910c486..0eadfee2e2 100644--- a/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/GatewayModelsPage.tsx@@ -2,30 +2,27 @@ import Header from "@/src/components/layouts/header";import { Alert } from "@/src/components/design-system/Alert/Alert";import { Button } from "@/src/components/ui/button";import { Skeleton } from "@/src/components/ui/skeleton";-import { ConnectedGatewayModelsTable } from "@/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable";-import { api, reportNonTrpcError } from "@/src/utils/api";-import { aggregateModels } from "./aggregateModels";+import { ConnectedGatewayModelsTable } from "@/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable";+import { useHasOrganizationAccess } from "@/src/features/rbac";+import { api } from "@/src/utils/api";+import { aggregateModels } from "./fns/aggregateModels";export function GatewayModelsPage({organizationId,}: {organizationId: string;}) {- const utils = api.useUtils();- const connectionsQuery = api.aiGateway.listConnections.useInfiniteQuery(- { orgId: organizationId, limit: 100 },- { getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined },- );+ const canManageGateway = useHasOrganizationAccess({+ organizationId,+ scope: "gateway:manage",+ });+ const connectionsQuery = api.aiGateway.listModelConnections.useQuery({+ orgId: organizationId,+ });const modelsQuery = api.aiGateway.refreshModels.useQuery({ orgId: organizationId },{ enabled: connectionsQuery.isSuccess },);- const syncModelsMutation = api.aiGateway.syncModels.useMutation({- onSuccess: (data) => {- utils.aiGateway.refreshModels.setData({ orgId: organizationId }, data);- },- });-if (connectionsQuery.isPending) {return <ModelsSkeleton />;}@@ -34,35 +31,22 @@ export function GatewayModelsPage({return <ModelsLoadError retry={() => connectionsQuery.refetch()} />;}- const connections =- connectionsQuery.data?.pages.flatMap((page) => page.data) ?? [];+ const connections = connectionsQuery.data ?? [];const results = modelsQuery.data ?? null;const rows = results ? aggregateModels(results, connections) : [];const failedResults = results?.filter((result) => !result.success) ?? [];- const sync = () =>- syncModelsMutation- .mutateAsync({ orgId: organizationId })- .then(() => undefined)- .catch((error) => reportNonTrpcError(error, "ai-gateway-models"));-return (<ConnectedGatewayModelsTablemodels={rows}+ organizationId={organizationId}+ canManageGateway={canManageGateway}failedProviderCount={failedResults.length}providerCount={results?.length ?? connections.length}hasProviders={connections.length > 0}hasSynced={results !== null}- isLoading={- modelsQuery.isPending ||- modelsQuery.isFetching ||- syncModelsMutation.isPending- }- syncError={modelsQuery.isError || syncModelsMutation.isError}- onSync={sync}- hasMoreProviders={Boolean(connectionsQuery.hasNextPage)}- isLoadingMoreProviders={connectionsQuery.isFetchingNextPage}- onLoadMoreProviders={() => connectionsQuery.fetchNextPage()}+ isLoading={modelsQuery.isPending || modelsQuery.isFetching}+ syncError={modelsQuery.isError}/>);}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable.stories.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable.stories.tsxnew file mode 100644index 0000000000..8ae161b2f7--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable.stories.tsx@@ -0,0 +1,40 @@+import preview from "@/.storybook/preview";+import { ConnectedGatewayModelsTable } from "./ConnectedGatewayModelsTable";++const meta = preview.meta({ component: ConnectedGatewayModelsTable });++export const Default = meta.story({+ args: {+ models: [+ {+ id: "OpenAI production:gpt-5-mini",+ connectionId: "openai-production",+ connectionName: "OpenAI production",+ provider: "OPENAI",+ apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],+ },+ {+ id: "Anthropic production:claude-sonnet-4-5",+ connectionId: "anthropic-production",+ connectionName: "Anthropic production",+ provider: "ANTHROPIC",+ apiFormats: ["Anthropic Messages"],+ },+ {+ id: "OpenAI production:shared-model",+ connectionId: "openai-production",+ connectionName: "OpenAI production",+ provider: "OPENAI",+ apiFormats: ["OpenAI Chat Completions"],+ },+ ],+ organizationId: "org-story",+ canManageGateway: true,+ failedProviderCount: 0,+ providerCount: 2,+ hasProviders: true,+ hasSynced: true,+ isLoading: false,+ syncError: false,+ },+});diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable.tsxnew file mode 100644index 0000000000..c64fc6c27f--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/ConnectedGatewayModelsTable.tsx@@ -0,0 +1,185 @@+import { useMemo, useState } from "react";++import Header from "@/src/components/layouts/header";+import { Alert } from "@/src/components/design-system/Alert/Alert";+import type { PaginationBarProps } from "@/src/components/design-system/PaginationBar/PaginationBar";+import { SearchInput } from "@/src/components/design-system/SearchInput/SearchInput";+import { SelectInput } from "@/src/components/design-system/SelectInput/SelectInput";+import { providerLabels } from "@/src/features/ai-gateway/constants/providerLabels";+import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";+import {+ filterGatewayModels,+ type GatewayModelRow,+} from "./fns/filterGatewayModels";+import { GatewayModelsTable } from "./components/GatewayModelsTable/GatewayModelsTable";++const ALL_PROVIDERS = "all";++export function ConnectedGatewayModelsTable({+ models,+ organizationId,+ canManageGateway,+ failedProviderCount,+ providerCount,+ hasProviders,+ hasSynced,+ isLoading,+ syncError,+}: {+ models: GatewayModelRow[];+ organizationId: string;+ canManageGateway: boolean;+ failedProviderCount: number;+ providerCount: number;+ hasProviders: boolean;+ hasSynced: boolean;+ isLoading: boolean;+ syncError: boolean;+}) {+ const [searchQuery, setSearchQuery] = useState("");+ const [provider, setProvider] = useState<GatewayProvider | "all">(+ ALL_PROVIDERS,+ );+ const [paginationState, setPaginationState] = useState({+ pageIndex: 0,+ pageSize: 50,+ });+ const providerOptions = useMemo<+ Array<{ value: GatewayProvider | "all"; label: string }>+ >(+ () => [+ { value: ALL_PROVIDERS, label: "All providers" },+ ...uniqueSorted(models.map((model) => model.provider)).map((value) => ({+ value,+ label: providerLabels[value],+ })),+ ],+ [models],+ );+ const filteredModels = useMemo(+ () => filterGatewayModels(models, searchQuery, provider),+ [models, provider, searchQuery],+ );+ const lastAvailablePageIndex = Math.max(+ 0,+ Math.ceil(filteredModels.length / paginationState.pageSize) - 1,+ );+ const currentPageIndex = Math.min(+ paginationState.pageIndex,+ lastAvailablePageIndex,+ );+ const pagination: PaginationBarProps = {+ mode: "offset",+ totalCount: filteredModels.length,+ state: { ...paginationState, pageIndex: currentPageIndex },+ onChange: setPaginationState,+ };+ const emptyMessage = getEmptyMessage({+ hasProviders,+ hasSynced,+ hasActiveFilters:+ searchQuery.trim().length > 0 || provider !== ALL_PROVIDERS,+ });++ return (+ <div className="flex h-full min-h-0 flex-col gap-4">+ <Header title="Gateway models" />+ <p className="text-muted-foreground text-sm">+ These models are enabled and available to use through the AI Gateway.+ </p>++ {failedProviderCount > 0 ? (+ <Alert variant="warning">+ <Alert.Title>Some providers could not be reached</Alert.Title>+ <Alert.Description>+ Showing models from successful providers. {failedProviderCount} of{" "}+ {providerCount} credentials failed to sync.+ </Alert.Description>+ </Alert>+ ) : null}++ {syncError ? (+ <Alert variant="destructive">+ <Alert.Title>Model sync failed</Alert.Title>+ <Alert.Description>+ No provider results were returned.+ </Alert.Description>+ </Alert>+ ) : null}++ <div className="flex min-h-0 flex-1 flex-col gap-2">+ <div className="flex items-center gap-2">+ <div className="w-80 max-w-full">+ <SearchInput+ value={searchQuery}+ onChange={(value) => {+ setSearchQuery(value);+ setPaginationState((state) => ({ ...state, pageIndex: 0 }));+ }}+ onSubmit={(value) => {+ setSearchQuery(value);+ setPaginationState((state) => ({ ...state, pageIndex: 0 }));+ }}+ placeholder="Search models"+ />+ </div>+ <div className="w-44">+ <SelectInput+ aria-label="Filter by provider"+ value={provider}+ options={providerOptions}+ muted={provider === ALL_PROVIDERS}+ onValueChange={(value) => {+ setProvider(value);+ setPaginationState((state) => ({ ...state, pageIndex: 0 }));+ }}+ placeholder="All providers"+ />+ </div>+ </div>+ <div className="flex min-h-0 flex-1 flex-col overflow-hidden rounded-md border-x border-b">+ <GatewayModelsTable+ organizationId={organizationId}+ canManageGateway={canManageGateway}+ data={+ isLoading+ ? { status: "loading" }+ : {+ status: "success",+ data: filteredModels.slice(+ currentPageIndex * paginationState.pageSize,+ (currentPageIndex + 1) * paginationState.pageSize,+ ),+ }+ }+ noResultsMessage={emptyMessage}+ pagination={pagination}+ />+ </div>+ </div>+ </div>+ );+}++function uniqueSorted<T extends string>(values: T[]) {+ return [...new Set(values)].toSorted((left, right) =>+ left.localeCompare(right),+ );+}++function getEmptyMessage({+ hasProviders,+ hasSynced,+ hasActiveFilters,+}: {+ hasProviders: boolean;+ hasSynced: boolean;+ hasActiveFilters: boolean;+}) {+ if (hasActiveFilters)+ return "No models match the current search and filters.";+ if (!hasProviders)+ return "Add a provider credential before discovering models.";+ if (hasSynced) return "No models were returned by the configured providers.";+ return "Models will appear here after provider discovery completes.";+}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.stories.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/components/GatewayModelsTable/GatewayModelsTable.stories.tsxsimilarity index 53%rename from web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.stories.tsxrename to web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/components/GatewayModelsTable/GatewayModelsTable.stories.tsxindex 74d889c1a4..0d9d18daa4 100644--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.stories.tsx+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/components/GatewayModelsTable/GatewayModelsTable.stories.tsx@@ -7,10 +7,12 @@ const meta = preview.meta({ component: GatewayModelsTable });const actions = {noResultsMessage: "No models were returned by the configured providers.",+ organizationId: "org-story",+ canManageGateway: true,pagination: {- mode: "cursor" as const,- state: { pageIndex: 0, pageSize: 10 },- hasNextPage: true,+ mode: "offset" as const,+ state: { pageIndex: 0, pageSize: 50 },+ totalCount: 2,onChange: fn(),},};@@ -22,30 +24,17 @@ export const Default = meta.story({status: "success",data: [{- id: "gpt-5-mini",- availableVia: [- {- connectionId: "primary",- connectionName: "Primary",- provider: "OPENAI",- },- {- connectionId: "fallback",- connectionName: "Fallback",- provider: "OPENAI",- },- ],+ id: "Primary:gpt-5-mini",+ connectionId: "primary",+ connectionName: "Primary",+ provider: "OPENAI",apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],},{- id: "claude-sonnet-4-5",- availableVia: [- {- connectionId: "anthropic",- connectionName: "Anthropic production",- provider: "ANTHROPIC",- },- ],+ id: "Anthropic production:claude-sonnet-4-5",+ connectionId: "anthropic",+ connectionName: "Anthropic production",+ provider: "ANTHROPIC",apiFormats: ["Anthropic Messages"],},],@@ -60,7 +49,7 @@ export const Loading = meta.story({export const Empty = meta.story({args: {...actions,- pagination: { ...actions.pagination, hasNextPage: false },+ pagination: { ...actions.pagination, totalCount: 0 },data: { status: "success", data: [] },},});diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/components/GatewayModelsTable/GatewayModelsTable.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/components/GatewayModelsTable/GatewayModelsTable.tsxnew file mode 100644index 0000000000..32cf739cfc--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/components/GatewayModelsTable/GatewayModelsTable.tsx@@ -0,0 +1,138 @@+import { SiAnthropic, SiOpenai } from "react-icons/si";+import Link from "next/link";+import { useMemo } from "react";++import { BadgeShell } from "@/src/components/design-system/Badge/Badge";+import {+ Table,+ type TableProps,+} from "@/src/components/design-system/table/Table";+import {+ PaginationBar,+ type PaginationBarProps,+} from "@/src/components/design-system/PaginationBar/PaginationBar";+import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";+import { providerLabels } from "@/src/features/ai-gateway/constants/providerLabels";+import type { ApiFormat } from "@/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels";+import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";+import { buildGatewayModelsUrl } from "@/src/features/ai-gateway/fns/gatewayUrls/buildGatewayModelsUrl";+import type { LangfuseColumnDef } from "@/src/components/table/types";+import type { GatewayModelRow } from "../../fns/filterGatewayModels";++const TABLE_NAME = "gateway-models";++export function GatewayModelsTable({+ organizationId,+ canManageGateway,+ data,+ noResultsMessage,+ pagination,+}: {+ organizationId: string;+ canManageGateway: boolean;+ data: TableProps<GatewayModelRow>["data"];+ noResultsMessage: string;+ pagination: PaginationBarProps;+}) {+ const columns = useMemo(+ () => createGatewayModelsColumns({ organizationId, canManageGateway }),+ [canManageGateway, organizationId],+ );++ return (+ <>+ <Table+ tableName={TABLE_NAME}+ columns={columns}+ data={data}+ noResultsMessage={noResultsMessage}+ />+ <PaginationBar {...pagination} />+ </>+ );+}++function createGatewayModelsColumns({+ organizationId,+ canManageGateway,+}: {+ organizationId: string;+ canManageGateway: boolean;+}): LangfuseColumnDef<GatewayModelRow>[] {+ return [+ createTextTableColumn<GatewayModelRow>({+ accessorKey: "id",+ header: "Model",+ size: 360,+ trailingAction: { type: "copy-to-clipboard" },+ }),+ {+ accessorKey: "connectionName",+ header: "Provider",+ size: 280,+ cell: ({ row }) => (+ <ProviderBadge+ model={row.original}+ organizationId={organizationId}+ canManageGateway={canManageGateway}+ />+ ),+ },+ {+ accessorKey: "apiFormats",+ header: "Routes",+ size: 280,+ cell: ({ row }) =>+ row.original.apiFormats+ .map((format) => apiFormatLabels[format])+ .join(", "),+ },+ ];+}++function ProviderBadge({+ model,+ organizationId,+ canManageGateway,+}: {+ model: GatewayModelRow;+ organizationId: string;+ canManageGateway: boolean;+}) {+ const ProviderIcon = providerIcons[model.provider];+ const content = (+ <>+ <ProviderIcon aria-hidden className="icon-sm shrink-0" />+ <span className="truncate py-0.5" title={model.connectionName}>+ {model.connectionName}+ </span>+ </>+ );+ const ariaLabel = `${model.connectionName}, ${providerLabels[model.provider]}`;++ return canManageGateway ? (+ <BadgeShell asChild color="filled">+ <Link+ href={buildGatewayModelsUrl(organizationId, model.connectionId)}+ aria-label={`Show models for ${ariaLabel}`}+ >+ {content}+ </Link>+ </BadgeShell>+ ) : (+ <BadgeShell color="filled" aria-label={ariaLabel}>+ {content}+ </BadgeShell>+ );+}++const providerIcons = {+ OPENAI: SiOpenai,+ ANTHROPIC: SiAnthropic,+} satisfies Record<GatewayProvider, typeof SiOpenai>;++const apiFormatLabels = {+ "Anthropic Messages": "Messages",+ "OpenAI Chat Completions": "Completions",+ "OpenAI Responses": "Responses",+} satisfies Record<ApiFormat, string>;diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/fns/filterGatewayModels.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/fns/filterGatewayModels.clienttest.tsnew file mode 100644index 0000000000..095d2d640e--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/fns/filterGatewayModels.clienttest.ts@@ -0,0 +1,39 @@+// @vitest-environment node++import { describe, expect, it } from "vitest";++import {+ filterGatewayModels,+ type GatewayModelRow,+} from "./filterGatewayModels";++const models: GatewayModelRow[] = [+ {+ id: "Primary:model-small",+ connectionId: "connection-primary",+ connectionName: "Primary",+ provider: "OPENAI",+ apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],+ },+ {+ id: "Secondary:model-large",+ connectionId: "connection-secondary",+ connectionName: "Secondary",+ provider: "ANTHROPIC",+ apiFormats: ["Anthropic Messages"],+ },+];++describe("filterGatewayModels", () => {+ it("searches model names case-insensitively", () => {+ expect(+ filterGatewayModels(models, "SMALL", "all").map((model) => model.id),+ ).toEqual(["Primary:model-small"]);+ });++ it("filters models by provider", () => {+ expect(+ filterGatewayModels(models, "", "ANTHROPIC").map((model) => model.id),+ ).toEqual(["Secondary:model-large"]);+ });+});diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/fns/filterGatewayModels.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/fns/filterGatewayModels.tsnew file mode 100644index 0000000000..6b2bf2ee61--- /dev/null+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/components/ConnectedGatewayModelsTable/fns/filterGatewayModels.ts@@ -0,0 +1,19 @@+import type { aggregateModels } from "@/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels";+import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";++export type GatewayModelRow = ReturnType<typeof aggregateModels>[number];++export function filterGatewayModels(+ models: GatewayModelRow[],+ searchQuery: string,+ provider: GatewayProvider | "all",+) {+ const normalizedSearch = searchQuery.trim().toLowerCase();++ return models.filter(+ (model) =>+ (normalizedSearch.length === 0 ||+ model.id.toLowerCase().includes(normalizedSearch)) &&+ (provider === "all" || model.provider === provider),+ );+}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable.tsxdeleted file mode 100644index b0e1dec780..0000000000--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/ConnectedGatewayModelsTable.tsx+++ /dev/null@@ -1,303 +0,0 @@-import { useEffect, useMemo, useState } from "react";-import { RefreshCw } from "lucide-react";--import Header from "@/src/components/layouts/header";-import { Alert } from "@/src/components/design-system/Alert/Alert";-import type { PaginationBarProps } from "@/src/components/design-system/PaginationBar/PaginationBar";-import { Button } from "@/src/components/ui/button";-import {- DataTableControls,- DataTableControlsProvider,-} from "@/src/components/table/data-table-controls";-import { DataTableToolbar } from "@/src/components/table/data-table-toolbar";-import { SearchableTableFilterLayout } from "@/src/components/table/resizable-filter-layout";-import { useSidebarFilterState } from "@/src/features/filters";-import { gatewayModelsFilterConfig } from "@/src/features/ai-gateway/constants/modelsFilterConfig";-import { GATEWAY_MODELS_FIELD_REGISTRY } from "@/src/features/ai-gateway/constants/modelsSearchRegistry";-import {- TableSearchBar,- toObservedOptions,- withFieldOptions,-} from "@/src/features/search-bar";-import {- filterGatewayModels,- type GatewayModelRow,-} from "./fns/filterGatewayModels";-import { getGatewayModelConnectionSearchOptions } from "./fns/getGatewayModelConnectionSearchOptions";-import { GatewayModelsTable, gatewayModelsColumns } from "./GatewayModelsTable";--const TABLE_NAME = gatewayModelsFilterConfig.tableName;--export function ConnectedGatewayModelsTable({- models,- failedProviderCount,- providerCount,- hasProviders,- hasSynced,- isLoading,- syncError,- onSync,- hasMoreProviders,- isLoadingMoreProviders,- onLoadMoreProviders,-}: {- models: GatewayModelRow[];- failedProviderCount: number;- providerCount: number;- hasProviders: boolean;- hasSynced: boolean;- isLoading: boolean;- syncError: boolean;- onSync: () => void | Promise<void>;- hasMoreProviders: boolean;- isLoadingMoreProviders: boolean;- onLoadMoreProviders: () => unknown;-}) {- const [searchQuery, setSearchQuery] = useState("");- const [pageIndex, setPageIndex] = useState(0);- const [pendingPage, setPendingPage] = useState<{- index: number;- filterKey: string;- } | null>(null);- const pageSize = 10;- const filterOptions = useMemo(- () => ({- connection: [- ...new Map(- models- .flatMap((model) => model.availableVia)- .map((connection) => [connection.connectionId, connection]),- ).values(),- ]- .toSorted((left, right) =>- left.connectionName.localeCompare(right.connectionName),- )- .map((connection) => ({- value: connection.connectionId,- displayValue: connection.connectionName,- })),- provider: uniqueSorted(- models.flatMap((model) =>- model.availableVia.map((connection) => connection.provider),- ),- ),- apiFormat: uniqueSorted(models.flatMap((model) => model.apiFormats)),- }),- [models],- );- const queryFilter = useSidebarFilterState(- gatewayModelsFilterConfig,- filterOptions,- {- stateLocation: "url",- },- );- const retainedConnectionIds = useMemo(- () =>- queryFilter.filterState.flatMap((filter) =>- filter.column === "connection" && filter.type === "arrayOptions"- ? filter.value- : [],- ),- [queryFilter.filterState],- );- const connectionSearchOptions = useMemo(- () =>- getGatewayModelConnectionSearchOptions(- filterOptions.connection,- retainedConnectionIds,- ),- [filterOptions.connection, retainedConnectionIds],- );- const searchRegistry = useMemo(- () =>- withFieldOptions(- GATEWAY_MODELS_FIELD_REGISTRY,- "connection",- connectionSearchOptions.registryOptions,- ),- [connectionSearchOptions.registryOptions],- );- const observedOptions = useMemo(- () =>- toObservedOptions(- {- ...filterOptions,- connection: connectionSearchOptions.observedValues,- },- isLoading,- ),- [connectionSearchOptions.observedValues, filterOptions, isLoading],- );- const filteredModels = useMemo(- () => filterGatewayModels(models, searchQuery, queryFilter.filterState),- [models, queryFilter.filterState, searchQuery],- );- const filterKey = JSON.stringify([searchQuery, queryFilter.filterState]);- useEffect(() => {- if (pendingPage && pendingPage.filterKey !== filterKey) {- setPendingPage(null);- }- }, [filterKey, pendingPage]);- const lastAvailablePageIndex = Math.max(- 0,- Math.ceil(filteredModels.length / pageSize) - 1,- );- const currentPageIndex =- pendingPage?.filterKey === filterKey &&- pendingPage.index * pageSize < filteredModels.length- ? pendingPage.index- : Math.min(pageIndex, lastAvailablePageIndex);- const pagination: PaginationBarProps = {- mode: "cursor",- state: { pageIndex: currentPageIndex, pageSize },- hasNextPage:- (currentPageIndex + 1) * pageSize < filteredModels.length ||- hasMoreProviders,- isLoadingNextPage: isLoadingMoreProviders,- onChange: ({ pageIndex: nextPageIndex }) => {- if (nextPageIndex * pageSize < filteredModels.length) {- setPendingPage(null);- setPageIndex(nextPageIndex);- return;- }- if (!hasMoreProviders || isLoadingMoreProviders) return;- setPageIndex(currentPageIndex);- setPendingPage({ index: nextPageIndex, filterKey });- onLoadMoreProviders();- },- };- const emptyMessage = getEmptyMessage({- hasProviders,- hasSynced,- hasActiveFilters:- searchQuery.trim().length > 0 || queryFilter.filterState.length > 0,- });-- return (- <div className="flex h-full min-h-0 flex-col gap-4">- <Header- title="Gateway models"- actionButtons={- <Button variant="secondary" loading={isLoading} onClick={onSync}>- <RefreshCw className="icon-base mr-1.5" />- {hasSynced ? "Retry sync" : "Sync models"}- </Button>- }- />- <p className="text-muted-foreground text-sm">- Models are discovered from enabled provider credentials and cached for- up to five minutes.- </p>-- {failedProviderCount > 0 ? (- <Alert variant="warning">- <Alert.Title>Some providers could not be reached</Alert.Title>- <Alert.Description>- Showing models from successful providers. {failedProviderCount} of{" "}- {providerCount} credentials failed to sync.- </Alert.Description>- </Alert>- ) : null}-- {syncError ? (- <Alert variant="destructive">- <Alert.Title>Model sync failed</Alert.Title>- <Alert.Description>- No provider results were returned. Retry the sync.- </Alert.Description>- </Alert>- ) : null}-- <DataTableControlsProvider tableName={TABLE_NAME}>- <div className="flex min-h-0 w-full flex-1 flex-col overflow-hidden rounded-md border">- <div className="flex min-h-0 flex-1 flex-col overflow-hidden">- <SearchableTableFilterLayout- search={- <TableSearchBar- key={queryFilter.draftResetKey}- tableName={TABLE_NAME}- registry={searchRegistry}- filterState={queryFilter.searchBarFilterState}- setFilterState={(filters) =>- queryFilter.setFilterState(- filters.map((filter) =>- filter.column === "connection" &&- filter.type === "arrayOptions"- ? {- ...filter,- value: filter.value.map(- (value) =>- connectionSearchOptions.connectionIdByDisplayValue.get(- value,- ) ?? value,- ),- }- : filter,- ),- )- }- observed={observedOptions}- isV4={false}- search={{- query: searchQuery,- setQuery: (query) => setSearchQuery(query ?? ""),- }}- />- }- toolbar={- <DataTableToolbar- tableName={TABLE_NAME}- columns={gatewayModelsColumns}- filterState={queryFilter.filterState}- />- }- >- <DataTableControls queryFilter={queryFilter} />- <div className="flex min-h-0 flex-1 flex-col overflow-hidden">- <GatewayModelsTable- data={- isLoading- ? { status: "loading" }- : {- status: "success",- data: filteredModels.slice(- currentPageIndex * pageSize,- (currentPageIndex + 1) * pageSize,- ),- }- }- noResultsMessage={emptyMessage}- pagination={pagination}- />- </div>- </SearchableTableFilterLayout>- </div>- </div>- </DataTableControlsProvider>- </div>- );-}--function uniqueSorted(values: string[]) {- return [...new Set(values)].toSorted((left, right) =>- left.localeCompare(right),- );-}--function getEmptyMessage({- hasProviders,- hasSynced,- hasActiveFilters,-}: {- hasProviders: boolean;- hasSynced: boolean;- hasActiveFilters: boolean;-}) {- if (hasActiveFilters)- return "No models match the current search and filters.";- if (!hasProviders)- return "Add a provider credential before discovering models.";- if (hasSynced) return "No models were returned by the configured providers.";- return "Sync models to discover what is currently available.";-}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.tsx b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.tsxdeleted file mode 100644index 26b9122224..0000000000--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/GatewayModelsTable.tsx+++ /dev/null@@ -1,83 +0,0 @@-import { SiAnthropic, SiOpenai } from "react-icons/si";--import {- Table,- type TableProps,-} from "@/src/components/design-system/table/Table";-import {- PaginationBar,- type PaginationBarProps,-} from "@/src/components/design-system/PaginationBar/PaginationBar";-import { createBadgeListTableColumn } from "@/src/components/design-system/table/columns/createBadgeListTableColumn";-import { createTextTableColumn } from "@/src/components/design-system/table/columns/createTextTableColumn";-import { providerLabels } from "@/src/features/ai-gateway/constants/providerLabels";-import { gatewayModelsFilterConfig } from "@/src/features/ai-gateway/constants/modelsFilterConfig";-import type { ApiFormat } from "@/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels";-import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";-import type { LangfuseColumnDef } from "@/src/components/table/types";-import type { GatewayModelRow } from "./fns/filterGatewayModels";--export const gatewayModelsColumns: LangfuseColumnDef<GatewayModelRow>[] = [- createTextTableColumn<GatewayModelRow>({- accessorKey: "id",- header: "Model",- size: 200,- }),- createBadgeListTableColumn<- GatewayModelRow,- GatewayModelRow["availableVia"][number]- >({- accessorKey: "availableVia",- header: "Available via",- size: 360,- getBadge: (connection) => ({- key: connection.connectionId,- value: connection.connectionName,- variant: "secondary",- icon: providerIcons[connection.provider],- ariaLabel: `${connection.connectionName}, ${providerLabels[connection.provider]}`,- }),- }),- createBadgeListTableColumn<GatewayModelRow, ApiFormat>({- accessorKey: "apiFormats",- header: "API formats",- size: 280,- getBadge: (format) => ({- value: apiFormatLabels[format],- variant: "secondary",- }),- }),-];--export function GatewayModelsTable({- data,- noResultsMessage,- pagination,-}: {- data: TableProps<GatewayModelRow>["data"];- noResultsMessage: string;- pagination: PaginationBarProps;-}) {- return (- <>- <Table- tableName={gatewayModelsFilterConfig.tableName}- columns={gatewayModelsColumns}- data={data}- noResultsMessage={noResultsMessage}- />- <PaginationBar {...pagination} />- </>- );-}--const providerIcons = {- OPENAI: SiOpenai,- ANTHROPIC: SiAnthropic,-} satisfies Record<GatewayProvider, typeof SiOpenai>;--const apiFormatLabels = {- "Anthropic Messages": "Messages",- "OpenAI Chat Completions": "Completions",- "OpenAI Responses": "Responses",-} satisfies Record<ApiFormat, string>;diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.clienttest.tsdeleted file mode 100644index ef3bba9449..0000000000--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.clienttest.ts+++ /dev/null@@ -1,105 +0,0 @@-// @vitest-environment node--import { describe, expect, it } from "vitest";-import { GATEWAY_MODELS_FIELD_REGISTRY } from "@/src/features/ai-gateway/constants/modelsSearchRegistry";-import { planCommit, runSearchBarInvariants } from "@/src/features/search-bar";--import {- filterGatewayModels,- type GatewayModelRow,-} from "./filterGatewayModels";--const models: GatewayModelRow[] = [- {- id: "model-small",- availableVia: [- {- connectionId: "connection-primary",- connectionName: "Primary",- provider: "OPENAI",- },- ],- apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],- },- {- id: "model-large",- availableVia: [- {- connectionId: "connection-secondary",- connectionName: "Secondary",- provider: "ANTHROPIC",- },- ],- apiFormats: ["Anthropic Messages"],- },-];--function search(query: string) {- const result = planCommit(query, undefined, GATEWAY_MODELS_FIELD_REGISTRY);- if (result.status !== "committed") {- throw new Error(`Query did not commit: ${query}`);- }- return filterGatewayModels(- models,- result.searchQuery ?? "",- result.filters,- ).map((model) => model.id);-}--describe("gateway model grammar", () => {- it("keeps model-name substring search separate from provider filters", () => {- expect(search("SMALL provider:OPENAI")).toEqual(["model-small"]);- expect(search("Primary provider:OPENAI")).toEqual([]);- });-- it("preserves API-format any-of, all-of and none-of semantics", () => {- expect(- search('apiFormat:("Anthropic Messages" OR "OpenAI Responses")'),- ).toEqual(["model-small", "model-large"]);- expect(- search('apiFormat:("OpenAI Responses" AND "OpenAI Chat Completions")'),- ).toEqual(["model-small"]);- expect(search('-apiFormat:"OpenAI Responses"')).toEqual(["model-large"]);- });-- it("preserves existing case-insensitive custom sidebar filters", () => {- expect(- filterGatewayModels(models, "", [- {- column: "apiFormat",- type: "string",- operator: "contains",- value: "responses",- },- ]).map((model) => model.id),- ).toEqual(["model-small"]);- });-- it("rejects fields and operators the model catalog cannot apply", () => {- for (const query of [- "latency:>1",- "metadata.region:eu",- "provider:>OPENAI",- "has:provider",- "-has:provider",- ]) {- expect(- planCommit(query, undefined, GATEWAY_MODELS_FIELD_REGISTRY).status,- query,- ).not.toBe("committed");- }- });-- it("keeps validation and lowering aligned with the sidebar registry", () => {- expect(- runSearchBarInvariants({- name: "gateway model catalog",- registry: GATEWAY_MODELS_FIELD_REGISTRY,- fieldValues: ["OPENAI", "ANTHROPIC", "OpenAI Responses"],- freeTextValues: ["model small"],- extraKeys: ["metadata.region", "scores.quality"],- scoreContexts: [],- }),- ).toEqual([]);- });-});diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.tsdeleted file mode 100644index dfae49f9e9..0000000000--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/filterGatewayModels.ts+++ /dev/null@@ -1,59 +0,0 @@-import type { FilterState } from "@langfuse/shared";-import type { aggregateModels } from "@/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels";--export type GatewayModelRow = ReturnType<typeof aggregateModels>[number];--function getModelFilterValues(model: GatewayModelRow, column: string) {- switch (column) {- case "connection":- return model.availableVia.map((connection) => connection.connectionId);- case "provider":- return model.availableVia.map((connection) => connection.provider);- case "apiFormat":- return model.apiFormats;- default:- return [];- }-}--export function filterGatewayModels(- models: GatewayModelRow[],- searchQuery: string,- filters: FilterState,-) {- const normalizedSearch = searchQuery.trim().toLowerCase();-- return models.filter((model) => {- if (- normalizedSearch.length > 0 &&- !model.id.toLowerCase().includes(normalizedSearch)- ) {- return false;- }-- return filters.every((filter) => {- const values = getModelFilterValues(model, filter.column);-- if (filter.type === "string") {- const needle = filter.value.toLowerCase();- const contains = values.some((value) =>- value.toLowerCase().includes(needle),- );- return filter.operator === "does not contain" ? !contains : contains;- }-- if (filter.type !== "arrayOptions" && filter.type !== "stringOptions") {- return true;- }-- const selected = filter.value;- if (filter.operator === "none of") {- return selected.every((value) => !values.includes(value));- }- if (filter.operator === "all of") {- return selected.every((value) => values.includes(value));- }- return selected.some((value) => values.includes(value));- });- });-}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.clienttest.tsdeleted file mode 100644index a7a4b0a59e..0000000000--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.clienttest.ts+++ /dev/null@@ -1,108 +0,0 @@-import { describe, expect, it } from "vitest";-import { GATEWAY_MODELS_FIELD_REGISTRY } from "@/src/features/ai-gateway/constants/modelsSearchRegistry";-import {- filterStateToQueryText,- planCommit,- withFieldOptions,-} from "@/src/features/search-bar";-import { getGatewayModelConnectionSearchOptions } from "./getGatewayModelConnectionSearchOptions";--describe("getGatewayModelConnectionSearchOptions", () => {- it("keeps duplicate credential names tied to their connection IDs", () => {- const result = getGatewayModelConnectionSearchOptions(- [- { value: "connection-a", displayValue: "Production" },- { value: "connection-b", displayValue: "Production" },- ],- [],- );-- expect(result.observedValues).toEqual([- "Production (connection-a)",- "Production (connection-b)",- ]);- expect(- result.connectionIdByDisplayValue.get("Production (connection-a)"),- ).toBe("connection-a");- expect(- result.connectionIdByDisplayValue.get("Production (connection-b)"),- ).toBe("connection-b");-- const registry = withFieldOptions(- GATEWAY_MODELS_FIELD_REGISTRY,- "connection",- result.registryOptions,- );- const query = filterStateToQueryText(- [- {- column: "connection",- type: "arrayOptions",- operator: "any of",- value: ["connection-a"],- },- ],- {},- registry,- ).text;- const commit = planCommit(`${query} provider:OPENAI`, undefined, registry);-- expect(query).toBe('connection:"Production (connection-a)"');- expect(commit).toMatchObject({- status: "committed",- filters: [- {- column: "connection",- value: ["Production (connection-a)"],- },- { column: "provider", value: ["OPENAI"] },- ],- });- if (commit.status !== "committed") return;- const connectionFilter = commit.filters.find(- (filter) => filter.column === "connection",- );- expect(connectionFilter?.type).toBe("arrayOptions");- if (connectionFilter?.type !== "arrayOptions") return;- expect(- result.connectionIdByDisplayValue.get(connectionFilter.value[0]!),- ).toBe("connection-a");- });-- it("keeps unavailable connection IDs valid", () => {- const result = getGatewayModelConnectionSearchOptions(- [{ value: "connection-a", displayValue: "Production" }],- ["connection-missing"],- );-- expect(result.registryOptions).toContainEqual({- value: "connection-missing",- displayValue: "connection-missing",- });- expect(result.connectionIdByDisplayValue.get("connection-missing")).toBe(- "connection-missing",- );-- const registry = withFieldOptions(- GATEWAY_MODELS_FIELD_REGISTRY,- "connection",- result.registryOptions,- );- const query = filterStateToQueryText(- [- {- column: "connection",- type: "arrayOptions",- operator: "any of",- value: ["connection-missing"],- },- ],- {},- registry,- ).text;-- expect(- planCommit(`${query} provider:OPENAI`, undefined, registry).status,- ).toBe("committed");- });-});diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.tsdeleted file mode 100644index 1c87617743..0000000000--- a/web/src/features/ai-gateway/components/GatewayModelsPage/components/GatewayModelsTable/fns/getGatewayModelConnectionSearchOptions.ts+++ /dev/null@@ -1,39 +0,0 @@-type ConnectionOption = {- value: string;- displayValue: string;-};--export function getGatewayModelConnectionSearchOptions(- connectionOptions: ConnectionOption[],- retainedConnectionIds: string[],-) {- const nameCounts = new Map<string, number>();- for (const { displayValue } of connectionOptions) {- nameCounts.set(displayValue, (nameCounts.get(displayValue) ?? 0) + 1);- }-- const labeledOptions = connectionOptions.map(({ value, displayValue }) => ({- value,- displayValue:- nameCounts.get(displayValue) === 1- ? displayValue- : `${displayValue} (${value})`,- }));- const availableIds = new Set(connectionOptions.map(({ value }) => value));- const fallbackOptions = retainedConnectionIds- .filter((value) => !availableIds.has(value))- .map((value) => ({ value, displayValue: value }));- const registryOptions = [- ...connectionOptions.map(({ value }) => ({ value, displayValue: value })),- ...labeledOptions,- ...fallbackOptions,- ];-- return {- registryOptions,- observedValues: labeledOptions.map(({ displayValue }) => displayValue),- connectionIdByDisplayValue: new Map(- registryOptions.map(({ value, displayValue }) => [displayValue, value]),- ),- };-}diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.clienttest.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels.clienttest.tssimilarity index 50%rename from web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.clienttest.tsrename to web/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels.clienttest.tsindex 6e8f55d593..c39576df68 100644--- a/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.clienttest.ts+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels.clienttest.ts@@ -5,16 +5,18 @@ type Connection = Parameters<typeof aggregateModels>[1][number];type Result = Parameters<typeof aggregateModels>[0][number];describe("aggregateModels", () => {- it("keeps existing model positions when another connection page loads", () => {+ it("returns one qualified row for each allowed connection and model pair", () => {const first = {id: "first",name: "First",provider: "OPENAI",+ allowedModels: null,} as Connection;const second = {id: "second",name: "Second",provider: "ANTHROPIC",+ allowedModels: ["shared-model"],} as Connection;const results = [{@@ -29,27 +31,44 @@ describe("aggregateModels", () => {},] as Result[];- expect(aggregateModels(results, [first]).map((model) => model.id)).toEqual([- "First:b-model",- "First:shared-model",- "First:z-model",- ]);- expect(- aggregateModels(results, [first, second]).map((model) => model.id),- ).toEqual([- "First:b-model",- "First:shared-model",- "First:z-model",- "Second:a-model",- "Second:shared-model",+ expect(aggregateModels(results, [first, second])).toEqual([+ {+ connectionId: "first",+ connectionName: "First",+ id: "First:b-model",+ provider: "OPENAI",+ apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],+ },+ {+ connectionId: "first",+ connectionName: "First",+ id: "First:shared-model",+ provider: "OPENAI",+ apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],+ },+ {+ connectionId: "first",+ connectionName: "First",+ id: "First:z-model",+ provider: "OPENAI",+ apiFormats: ["OpenAI Responses", "OpenAI Chat Completions"],+ },+ {+ connectionId: "second",+ connectionName: "Second",+ id: "Second:shared-model",+ provider: "ANTHROPIC",+ apiFormats: ["Anthropic Messages"],+ },]);});- it("does not duplicate badges for connections repeated across pages", () => {+ it("hides disallowed models and ignores repeated connections", () => {const connection = {id: "first",name: "First",provider: "OPENAI",+ allowedModels: [] as string[],} as Connection;const result = {connectionId: "first",@@ -57,14 +76,6 @@ describe("aggregateModels", () => {models: ["model"],} as Result;- expect(- aggregateModels([result], [connection, connection])[0]?.availableVia,- ).toEqual([- {- connectionId: "first",- connectionName: "First",- provider: "OPENAI",- },- ]);+ expect(aggregateModels([result], [connection, connection])).toEqual([]);});});diff --git a/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.ts b/web/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels.tssimilarity index 74%rename from web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.tsrename to web/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels.tsindex fa819278e5..a709987624 100644--- a/web/src/features/ai-gateway/components/GatewayModelsPage/aggregateModels.ts+++ b/web/src/features/ai-gateway/components/GatewayModelsPage/fns/aggregateModels.ts@@ -1,8 +1,10 @@import type { GatewayProvider } from "@/src/features/ai-gateway/types/gatewayProvider";-import { formatGatewayModelSlug } from "@/src/features/ai-gateway/fns/gatewayModelSlug";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";+import { toGatewayAllowedModelsSet } from "@/src/features/ai-gateway/fns/toGatewayAllowedModelsSet";+import { formatGatewayModelSlug } from "@/src/features/ai-gateway/fns/formatGatewayModelSlug";import type { RouterOutputs } from "@/src/utils/api";-type Connection = RouterOutputs["aiGateway"]["listConnections"]["data"][number];+type Connection = RouterOutputs["aiGateway"]["listModelConnections"][number];type RefreshResult = RouterOutputs["aiGateway"]["refreshModels"][number];const providerFormats = {@@ -14,11 +16,9 @@ export type ApiFormat = (typeof providerFormats)[GatewayProvider][number];type ModelRow = {id: string;- availableVia: Array<{- connectionId: string;- connectionName: string;- provider: GatewayProvider;- }>;+ connectionId: string;+ connectionName: string;+ provider: GatewayProvider;apiFormats: ApiFormat[];};@@ -37,17 +37,16 @@ export function aggregateModels(seenConnectionIds.add(connection.id);const result = resultsByConnectionId.get(connection.id);if (!result?.success) continue;+ const allowedModels = toGatewayAllowedModelsSet(connection.allowedModels);for (const modelId of result.models.toSorted((left, right) =>left.localeCompare(right),)) {- const availableVia = {+ if (!isGatewayModelAllowed(allowedModels, modelId)) continue;+ models.push({+ id: formatGatewayModelSlug(connection.name, modelId),connectionId: connection.id,connectionName: connection.name,provider: connection.provider,- };- models.push({- id: formatGatewayModelSlug(connection.name, modelId),- availableVia: [availableVia],apiFormats: [...providerFormats[connection.provider]],});}diff --git a/web/src/features/ai-gateway/components/GatewayProvidersPage/GatewayProvidersPage.tsx b/web/src/features/ai-gateway/components/GatewayProvidersPage/GatewayProvidersPage.tsxindex 8b404f5423..d56922c464 100644--- a/web/src/features/ai-gateway/components/GatewayProvidersPage/GatewayProvidersPage.tsx+++ b/web/src/features/ai-gateway/components/GatewayProvidersPage/GatewayProvidersPage.tsx@@ -1,5 +1,6 @@import { useState } from "react";import { Plus } from "lucide-react";+import { useRouter } from "next/router";import Header from "@/src/components/layouts/header";import { Alert } from "@/src/components/design-system/Alert/Alert";@@ -7,9 +8,12 @@ import { ConfirmationDialogController } from "@/src/components/design-system/Conimport { PaginationBar } from "@/src/components/design-system/PaginationBar/PaginationBar";import { Button } from "@/src/components/ui/button";import { Skeleton } from "@/src/components/ui/skeleton";+import { GatewayConnectionModelsPage } from "@/src/features/ai-gateway/components/GatewayConnectionModelsPage/GatewayConnectionModelsPage";import { ProviderDialogController } from "@/src/features/ai-gateway/components/GatewayProvidersPage/components/ProviderDialogController/ProviderDialogController";import { GatewayProvidersTable } from "@/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable";import { buildGatewayModelsUrl } from "@/src/features/ai-gateway/fns/gatewayUrls/buildGatewayModelsUrl";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";+import { toGatewayAllowedModelsSet } from "@/src/features/ai-gateway/fns/toGatewayAllowedModelsSet";import type { GatewayConnection } from "@/src/features/ai-gateway/types/gatewayProvider";import { api, reportNonTrpcError } from "@/src/utils/api";@@ -18,17 +22,22 @@ export function GatewayProvidersPage({}: {organizationId: string;}) {+ const router = useRouter();+ const connectionId =+ typeof router.query.connectionId === "string"+ ? router.query.connectionId+ : undefined;const connectionsQuery = api.aiGateway.listConnections.useInfiniteQuery({ orgId: organizationId, limit: 50 },- { getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined },+ {+ enabled: !connectionId,+ getNextPageParam: (lastPage) => lastPage.nextCursor ?? undefined,+ },);const modelsQuery = api.aiGateway.refreshModels.useQuery({ orgId: organizationId },- { enabled: connectionsQuery.isSuccess },+ { enabled: !connectionId && connectionsQuery.isSuccess },);- const [retriedModelCounts, setRetriedModelCounts] = useState<- Record<string, number>- >({});const [pageIndex, setPageIndex] = useState(0);const utils = api.useUtils();const retry = api.aiGateway.retryConnection.useMutation();@@ -36,19 +45,18 @@ export function GatewayProvidersPage({const retryConnection = async (connection: GatewayConnection) => {try {- const result = await retry.mutateAsync({+ await retry.mutateAsync({orgId: organizationId,id: connection.id,});- if (result.success) {- setRetriedModelCounts((current) => ({- ...current,- [connection.id]: result.models.length,- }));- }- await utils.aiGateway.listConnections.invalidate({- orgId: organizationId,- });+ await Promise.all([+ utils.aiGateway.listConnections.invalidate({+ orgId: organizationId,+ }),+ utils.aiGateway.refreshModels.invalidate({+ orgId: organizationId,+ }),+ ]);} catch (error) {reportNonTrpcError(error, "ai-gateway-providers");}@@ -60,15 +68,39 @@ export function GatewayProvidersPage({orgId: organizationId,id: connection.id,});- await utils.aiGateway.listConnections.invalidate({- orgId: organizationId,- });+ await Promise.all([+ utils.aiGateway.listConnections.invalidate({+ orgId: organizationId,+ }),+ utils.aiGateway.refreshModels.invalidate({+ orgId: organizationId,+ }),+ ]);+ if (connection.id === connectionId) {+ await router.push(+ `/organization/${encodeURIComponent(organizationId)}/settings/ai-gateway-providers`,+ );+ }} catch (error) {reportNonTrpcError(error, "ai-gateway-providers");throw error;}};+ const selectConnection = (connection: GatewayConnection) =>+ router.push(buildGatewayModelsUrl(organizationId, connection.id));++ if (connectionId) {+ return (+ <GatewayConnectionModelsPage+ organizationId={organizationId}+ connectionId={connectionId}+ isDeleting={remove.isPending}+ onDelete={deleteConnection}+ />+ );+ }+if (connectionsQuery.isPending) {return <ProvidersSkeleton />;}@@ -98,7 +130,13 @@ export function GatewayProvidersPage({const visiblePageIndex = Math.min(pageIndex, Math.max(0, pages.length - 1));const allConnections = pages.flatMap((page) => page.data);const connections = pages[visiblePageIndex]?.data ?? [];- const modelCounts: Record<string, number | "loading"> = modelsQuery.isPending+ const connectionsById = new Map(+ allConnections.map((connection) => [connection.id, connection]),+ );+ const modelCounts: Record<+ string,+ { enabled: number; total: number } | "loading"+ > = modelsQuery.isPending? Object.fromEntries(allConnections.filter((connection) => connection.status === "ENABLED")@@ -107,12 +145,25 @@ export function GatewayProvidersPage({: Object.fromEntries((modelsQuery.data ?? []).filter((result) => result.success)- .map((result) => [result.connectionId, result.models.length]),+ .flatMap((result) => {+ const connection = connectionsById.get(result.connectionId);+ if (!connection) return [];+ const allowedModels = toGatewayAllowedModelsSet(+ connection.allowedModels,+ );+ const enabled = result.models.filter((model) =>+ isGatewayModelAllowed(allowedModels, model),+ ).length;+ return [+ [+ result.connectionId,+ { enabled, total: result.models.length },+ ] as const,+ ];+ }),);- Object.assign(modelCounts, retriedModelCounts);-return (- <div className="flex flex-col gap-4">+ <div className="flex h-full min-h-0 flex-col gap-4"><Headertitle="Provider credentials"actionButtons={@@ -143,13 +194,11 @@ export function GatewayProvidersPage({{({ openDialog: openDeleteDialog }) => (<ProviderDialogController organizationId={organizationId}>{({ openEditDialog }) => (- <div className="flex max-h-[60dvh] flex-col overflow-hidden">+ <div className="flex min-h-0 flex-1 flex-col overflow-hidden"><GatewayProvidersTableconnections={connections}modelCounts={modelCounts}- getModelsUrl={(connection) =>- buildGatewayModelsUrl(organizationId, connection.id)- }+ onSelect={selectConnection}onRetry={retryConnection}retryDisabled={retry.isPendingdiff --git a/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.stories.tsx b/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.stories.tsxindex 392cdf8e18..593bffaf3b 100644--- a/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.stories.tsx+++ b/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.stories.tsx@@ -17,7 +17,7 @@ const connections = [status: "ENABLED",organizationId: "org-1",createdById: "user-1",- routingPriority: 0,+ allowedModels: null,createdAt: new Date("2026-09-07T12:00:00.000Z"),updatedAt: new Date("2026-09-07T12:00:00.000Z"),},@@ -29,7 +29,7 @@ const connections = [status: "ERROR",organizationId: "org-1",createdById: "user-1",- routingPriority: 1,+ allowedModels: null,createdAt: new Date("2026-09-07T12:00:00.000Z"),updatedAt: new Date("2026-09-07T12:00:00.000Z"),},@@ -45,32 +45,34 @@ const manyConnections = Array.from({ length: 30 }, (_, index) => ({status: statuses[index % statuses.length]!,organizationId: "org-1",createdById: "user-1",- routingPriority: index,+ allowedModels: null,createdAt: new Date(Date.UTC(2026, 8, 30 - index)),updatedAt: new Date("2026-09-30T12:00:00.000Z"),})) satisfies ComponentProps<typeof GatewayProvidersTable>["connections"];const manyModelCounts = Object.fromEntries(- manyConnections.map((connection, index) => [connection.id, index * 7 + 1]),+ manyConnections.map((connection, index) => [+ connection.id,+ { enabled: index * 7 + 1, total: index * 7 + 1 },+ ]),);const actions = {- getModelsUrl: (connection) =>- `/organization/org-1/settings/ai-gateway-models?connection=${connection.id}`,+ onSelect: (connection) => onCredentialAction(connection.id),onRetry: (connection) => onCredentialAction(connection.id),onEdit: (connection) => onCredentialAction(connection.id),onDelete: (connection) => onCredentialAction(connection.id),} satisfies Pick<ComponentProps<typeof GatewayProvidersTable>,- "getModelsUrl" | "onRetry" | "onEdit" | "onDelete"+ "onSelect" | "onRetry" | "onEdit" | "onDelete">;export const OrderedCredentials = meta.story({args: {connections,modelCounts: {- "connection-openai": 42,- "connection-anthropic": 18,+ "connection-openai": { enabled: 42, total: 42 },+ "connection-anthropic": { enabled: 18, total: 20 },},...actions,},diff --git a/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.tsx b/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.tsxindex 0b1ed89960..b0df6c7220 100644--- a/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.tsx+++ b/web/src/features/ai-gateway/components/GatewayProvidersPage/components/GatewayProvidersTable/GatewayProvidersTable.tsx@@ -1,7 +1,6 @@/* eslint-disable no-nested-ternary */import { useMemo } from "react";-import { Pencil, RefreshCw, Route, Trash2 } from "lucide-react";-import Link from "next/link";+import { ListTree, Pencil, RefreshCw, Route, Trash2 } from "lucide-react";import { SiAnthropic, SiOpenai } from "react-icons/si";import { SettingsTable } from "@/src/components/SettingsTable/SettingsTable";@@ -16,8 +15,8 @@ import type {export type GatewayProvidersTableProps = {connections: GatewayConnection[];- modelCounts: Record<string, number | "loading">;- getModelsUrl: (connection: GatewayConnection) => string;+ modelCounts: Record<string, { enabled: number; total: number } | "loading">;+ onSelect: (connection: GatewayConnection) => void;onRetry: (connection: GatewayConnection) => void;onEdit: (connection: GatewayConnection) => void;onDelete: (connection: GatewayConnection) => void;@@ -35,7 +34,7 @@ const connectionStatus = {export function GatewayProvidersTable({connections,modelCounts,- getModelsUrl,+ onSelect,onRetry,onEdit,onDelete,@@ -74,15 +73,10 @@ export function GatewayProvidersTable({id: "models",header: "Models",size: 180,- cell: ({ row }) => (- <ModelCount- value={modelCounts[row.original.id]}- href={getModelsUrl(row.original)}- />- ),+ cell: ({ row }) => <ModelCount value={modelCounts[row.original.id]} />,},],- [getModelsUrl, modelCounts],+ [modelCounts],);return (@@ -90,6 +84,13 @@ export function GatewayProvidersTable({tableName="gateway-provider-credentials"columns={columns}actions={(connection) => [+ {+ id: "models",+ type: "item",+ title: "Show models",+ icon: ListTree,+ onClick: () => onSelect(connection),+ },{id: "retry",type: "item",@@ -117,6 +118,7 @@ export function GatewayProvidersTable({},]}data={{ status: "success", data: connections }}+ onRowClick={onSelect}noResultsMessage="No provider credentials configured."/>);@@ -124,17 +126,15 @@ export function GatewayProvidersTable({function ModelCount({value,- href,}: {- value: number | "loading" | undefined;- href: string;+ value: { enabled: number; total: number } | "loading" | undefined;}) {if (value === "loading") return <>Loading…</>;if (value === undefined) return <>—</>;return (- <Link className="text-primary hover:underline" href={href}>- {value} {value === 1 ? "model" : "models"} available- </Link>+ <>+ {value.enabled} of {value.total} enabled+ </>);}diff --git a/web/src/features/ai-gateway/constants/modelsFilterConfig.ts b/web/src/features/ai-gateway/constants/modelsFilterConfig.tsdeleted file mode 100644index bf0139f5c5..0000000000--- a/web/src/features/ai-gateway/constants/modelsFilterConfig.ts+++ /dev/null@@ -1,45 +0,0 @@-import type { ColumnDefinition } from "@langfuse/shared";-import type { FilterConfig } from "@/src/features/filters";-import { providerLabels } from "./providerLabels";--const filterColumns: ColumnDefinition[] = [- {- name: "Provider credentials",- id: "connection",- type: "arrayOptions",- internal: "connection",- options: [],- },- {- name: "Provider",- id: "provider",- type: "arrayOptions",- internal: "provider",- options: Object.entries(providerLabels).map(([value, displayValue]) => ({- value,- displayValue,- })),- },- {- name: "API format",- id: "apiFormat",- type: "arrayOptions",- internal: "apiFormat",- options: [],- },-];--export const gatewayModelsFilterConfig: FilterConfig = {- tableName: "gateway-models",- columnDefinitions: filterColumns,- defaultExpanded: ["connection", "provider", "apiFormat"],- facets: [- {- type: "categorical",- column: "connection",- label: "Provider credentials",- },- { type: "categorical", column: "provider", label: "Provider" },- { type: "categorical", column: "apiFormat", label: "API format" },- ],-};diff --git a/web/src/features/ai-gateway/constants/modelsSearchRegistry.ts b/web/src/features/ai-gateway/constants/modelsSearchRegistry.tsdeleted file mode 100644index bbc752259d..0000000000--- a/web/src/features/ai-gateway/constants/modelsSearchRegistry.ts+++ /dev/null@@ -1,24 +0,0 @@-import { fieldRegistryFromColumns } from "@/src/features/search-bar";-import { gatewayModelsFilterConfig } from "./modelsFilterConfig";--const facetColumns = new Set(- gatewayModelsFilterConfig.facets.map((facet) => facet.column),-);--export const GATEWAY_MODELS_FIELD_REGISTRY = fieldRegistryFromColumns(- gatewayModelsFilterConfig.columnDefinitions.filter((column) =>- facetColumns.has(column.id),- ),- {- id: "gatewayModels",- allowFreeText: true,- filterStateErrors: (filters) =>- filters.some((filter) => filter.type === "null")- ? [- "Gateway models do not support presence filters. Select a provider or API format instead.",- ]- : [],- freeTextScopeLabel: "model names",- searchExamples: ["provider:OPENAI", 'apiFormat:"Anthropic Messages"'],- },-);diff --git a/web/src/features/ai-gateway/fns/canReadGatewayModels.ts b/web/src/features/ai-gateway/fns/canReadGatewayModels.tsnew file mode 100644index 0000000000..30794b59f1--- /dev/null+++ b/web/src/features/ai-gateway/fns/canReadGatewayModels.ts@@ -0,0 +1,16 @@+export function canReadGatewayModels({+ organizationId,+ demoOrganizationId,+ canReadGateway,+ canManageGateway,+}: {+ organizationId: string;+ demoOrganizationId?: string;+ canReadGateway: boolean;+ canManageGateway: boolean;+}) {+ return (+ canReadGateway &&+ (organizationId !== demoOrganizationId || canManageGateway)+ );+}diff --git a/web/src/features/ai-gateway/fns/formatGatewayModelSlug.ts b/web/src/features/ai-gateway/fns/formatGatewayModelSlug.tsnew file mode 100644index 0000000000..7a84d30c13--- /dev/null+++ b/web/src/features/ai-gateway/fns/formatGatewayModelSlug.ts@@ -0,0 +1,6 @@+export function formatGatewayModelSlug(+ connectionName: string,+ providerModel: string,+) {+ return `${connectionName}:${providerModel}`;+}diff --git a/web/src/features/ai-gateway/fns/gatewayModelSlug.ts b/web/src/features/ai-gateway/fns/gatewayModelSlug.tsdeleted file mode 100644index 74ac65a482..0000000000--- a/web/src/features/ai-gateway/fns/gatewayModelSlug.ts+++ /dev/null@@ -1,75 +0,0 @@-export function formatGatewayModelSlug(- connectionName: string,- providerModel: string,-) {- return `${connectionName}:${providerModel}`;-}--export function resolveGatewayModelRoute<- Connection extends GatewayRouteConnection,->(- model: string,- connections: readonly Connection[],-): { connection: Connection | null; providerModel: string } | null {- const modelSlug = parseGatewayModelSlug(model);- const explicitConnection = modelSlug- ? (connections.find(- (connection) => connection.name === modelSlug.connectionName,- ) ?? null)- : null;- if (modelSlug && explicitConnection) {- return {- connection: explicitConnection,- providerModel: modelSlug.providerModel,- };- }-- if (model.startsWith("ft:")) {- return {- connection:- connections.find((connection) => connection.provider === "OPENAI") ??- null,- providerModel: model,- };- }-- if (modelSlug) {- return {- connection: null,- providerModel: modelSlug.providerModel,- };- }-- if (model.includes(":")) return null;-- let provider: "OPENAI" | "ANTHROPIC" | null = null;- if (model.startsWith("gpt-")) provider = "OPENAI";- if (model.startsWith("claude-")) provider = "ANTHROPIC";- if (!provider) return null;-- return {- connection:- connections.find((connection) => connection.provider === provider) ??- null,- providerModel: model,- };-}--function parseGatewayModelSlug(model: string) {- const separatorIndex = model.indexOf(":");- if (separatorIndex <= 0) {- return null;- }- const providerModel = model.slice(separatorIndex + 1);- if (!providerModel.trim()) return null;-- return {- connectionName: model.slice(0, separatorIndex),- providerModel,- };-}--type GatewayRouteConnection = {- name: string;- provider: string;-};diff --git a/web/src/features/ai-gateway/fns/gatewayUrls/buildGatewayModelsUrl.ts b/web/src/features/ai-gateway/fns/gatewayUrls/buildGatewayModelsUrl.tsindex 9837e949c6..ff0a9801be 100644--- a/web/src/features/ai-gateway/fns/gatewayUrls/buildGatewayModelsUrl.ts+++ b/web/src/features/ai-gateway/fns/gatewayUrls/buildGatewayModelsUrl.ts@@ -1,19 +1,8 @@-import { encodeFiltersGeneric } from "@langfuse/shared";-export function buildGatewayModelsUrl(organizationId: string,connectionId: string,) {- const params = new URLSearchParams({- filter: encodeFiltersGeneric([- {- column: "connection",- type: "arrayOptions",- operator: "any of",- value: [connectionId],- },- ]),- });+ const params = new URLSearchParams({ connectionId });- return `/organization/${encodeURIComponent(organizationId)}/settings/ai-gateway-models?${params.toString()}`;+ return `/organization/${encodeURIComponent(organizationId)}/settings/ai-gateway-providers?${params.toString()}`;}diff --git a/web/src/features/ai-gateway/fns/isGatewayModelAllowed.ts b/web/src/features/ai-gateway/fns/isGatewayModelAllowed.tsnew file mode 100644index 0000000000..cc954ecffa--- /dev/null+++ b/web/src/features/ai-gateway/fns/isGatewayModelAllowed.ts@@ -0,0 +1,9 @@+export function isGatewayModelAllowed(+ allowedModels: Set<string> | readonly string[] | null,+ model: string,+) {+ if (allowedModels === null) return true;+ return allowedModels instanceof Set+ ? allowedModels.has(model)+ : allowedModels.includes(model);+}diff --git a/web/src/features/ai-gateway/fns/parseGatewayAllowedModels.ts b/web/src/features/ai-gateway/fns/parseGatewayAllowedModels.tsnew file mode 100644index 0000000000..0b2bce896d--- /dev/null+++ b/web/src/features/ai-gateway/fns/parseGatewayAllowedModels.ts@@ -0,0 +1,7 @@+import { z } from "zod/v4";++const gatewayAllowedModelsSchema = z.array(z.string().min(1)).nullable();++export function parseGatewayAllowedModels(value: unknown) {+ return gatewayAllowedModelsSchema.parse(value);+}diff --git a/web/src/features/ai-gateway/fns/toGatewayAllowedModelsSet.ts b/web/src/features/ai-gateway/fns/toGatewayAllowedModelsSet.tsnew file mode 100644index 0000000000..8359633ef9--- /dev/null+++ b/web/src/features/ai-gateway/fns/toGatewayAllowedModelsSet.ts@@ -0,0 +1,6 @@+import { parseGatewayAllowedModels } from "@/src/features/ai-gateway/fns/parseGatewayAllowedModels";++export function toGatewayAllowedModelsSet(value: unknown) {+ const allowedModels = parseGatewayAllowedModels(value);+ return allowedModels === null ? null : new Set(allowedModels);+}diff --git a/web/src/features/ai-gateway/fns/updateGatewayAllowedModels.clienttest.ts b/web/src/features/ai-gateway/fns/updateGatewayAllowedModels.clienttest.tsnew file mode 100644index 0000000000..9578ce23e3--- /dev/null+++ b/web/src/features/ai-gateway/fns/updateGatewayAllowedModels.clienttest.ts@@ -0,0 +1,40 @@+import { describe, expect, it } from "vitest";++import { updateGatewayAllowedModels } from "@/src/features/ai-gateway/fns/updateGatewayAllowedModels";++const models = ["gpt-4o", "gpt-4o-mini", "o3"];++describe("updateGatewayAllowedModels", () => {+ it("materializes the remaining catalog when models are disabled from allow-all", () => {+ expect(+ updateGatewayAllowedModels({+ allowedModels: null,+ availableModels: models,+ targetModels: ["gpt-4o", "o3"],+ enabled: false,+ }),+ ).toEqual(["gpt-4o-mini"]);+ });++ it("keeps row edits explicit when every catalog model is enabled", () => {+ expect(+ updateGatewayAllowedModels({+ allowedModels: ["gpt-4o"],+ availableModels: models,+ targetModels: ["gpt-4o-mini", "o3"],+ enabled: true,+ }),+ ).toEqual(models);+ });++ it("preserves allowed models outside the current provider catalog", () => {+ expect(+ updateGatewayAllowedModels({+ allowedModels: ["legacy-model", "gpt-4o"],+ availableModels: models,+ targetModels: ["gpt-4o"],+ enabled: false,+ }),+ ).toEqual(["legacy-model"]);+ });+});diff --git a/web/src/features/ai-gateway/fns/updateGatewayAllowedModels.ts b/web/src/features/ai-gateway/fns/updateGatewayAllowedModels.tsnew file mode 100644index 0000000000..cb77faae67--- /dev/null+++ b/web/src/features/ai-gateway/fns/updateGatewayAllowedModels.ts@@ -0,0 +1,22 @@+export function updateGatewayAllowedModels({+ allowedModels,+ availableModels,+ targetModels,+ enabled,+}: {+ allowedModels: string[] | null;+ availableModels: string[];+ targetModels: string[];+ enabled: boolean;+}) {+ const nextAllowedModels = new Set(+ allowedModels === null ? availableModels : allowedModels,+ );++ for (const model of targetModels) {+ if (enabled) nextAllowedModels.add(model);+ else nextAllowedModels.delete(model);+ }++ return [...nextAllowedModels];+}diff --git a/web/src/features/ai-gateway/server/auth/gatewayApiKeyAuthenticator.ts b/web/src/features/ai-gateway/server/auth/gatewayApiKeyAuthenticator.tsindex a9d61bf8f7..48aa006e11 100644--- a/web/src/features/ai-gateway/server/auth/gatewayApiKeyAuthenticator.ts+++ b/web/src/features/ai-gateway/server/auth/gatewayApiKeyAuthenticator.ts@@ -13,7 +13,9 @@ import {gatewayProviders,providerSupportsApiFormat,} from "@/src/features/ai-gateway/server/provider/registry";-import { resolveGatewayModelRoute } from "@/src/features/ai-gateway/fns/gatewayModelSlug";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";+import { parseGatewayAllowedModels } from "@/src/features/ai-gateway/fns/parseGatewayAllowedModels";+import { GatewayModelRoutingService } from "@/src/features/ai-gateway/server/routing/gatewayModelRoutingService";import {type CachedResolveContext,GATEWAY_RESOLVE_KEY_NON_EXISTENT,@@ -36,6 +38,7 @@ type GatewayApiKeyAuthenticatorConfig = {export class GatewayApiKeyAuthenticator {private readonly repository: GatewayResolveRepository;private readonly cache: GatewayResolveCache;+ private readonly modelRoutingService = new GatewayModelRoutingService();constructor(private readonly prisma: PrismaClient,@@ -51,10 +54,26 @@ export class GatewayApiKeyAuthenticator {model: string;}): Promise<GatewayApiKeyAuthContext> {const context = await this.authenticateKey(params);- const route = resolveGatewayModelRoute(params.model, context.connections);+ const route = this.modelRoutingService.resolve(+ params.model,+ context.connections,+ );if (!route) {throw new GatewayControlPlaneError("Invalid gateway model", 400);}+ if (+ route.connection &&+ !isGatewayModelAllowed(+ route.connection.allowedModels,+ route.providerModel,+ )+ ) {+ throw new GatewayControlPlaneError(+ "Model is not allowed for this provider connection",+ 403,+ "model_not_allowed",+ );+ }return {...context,@@ -135,7 +154,10 @@ export class GatewayApiKeyAuthenticator {? (gatewayConfig?.defaultIngestionProjectId ?? null): null,ingestionMode: gatewayConfig?.ingestionMode ?? null,- connections: organization.gatewayAiConnections,+ connections: organization.gatewayAiConnections.map((connection) => ({+ ...connection,+ allowedModels: parseGatewayAllowedModels(connection.allowedModels),+ })),};if (env.API_AUTH_MIGRATION === "enforce") {diff --git a/web/src/features/ai-gateway/server/auth/gatewayRequestSignatureVerifier.ts b/web/src/features/ai-gateway/server/auth/gatewayRequestSignatureVerifier.tsindex 6637e47ffb..c1f764ca90 100644--- a/web/src/features/ai-gateway/server/auth/gatewayRequestSignatureVerifier.ts+++ b/web/src/features/ai-gateway/server/auth/gatewayRequestSignatureVerifier.ts@@ -8,20 +8,21 @@ import { env } from "@/src/env.mjs";import { verifyHmacSha256 } from "@/src/server/utils/hmac";import { createShaHash } from "@langfuse/shared/src/server/auth/apiKeys";-import { resolveGatewayModelRoute } from "@/src/features/ai-gateway/fns/gatewayModelSlug";import { GatewayApiFormatSchema, type GatewayApiFormat } from "../provider";import { GatewayControlPlaneError } from "@/src/features/ai-gateway/server/gatewayControlPlaneError";+import { GatewayModelRoutingService } from "@/src/features/ai-gateway/server/routing/gatewayModelRoutingService";const RESOLVE_METHOD = "POST";const MODELS_METHOD = "GET";const SIGNATURE_DOMAIN = "gateway-web-v1";const SIGNATURE_MAX_AGE_SECONDS = 5 * 60;+const modelRoutingService = new GatewayModelRoutingService();const resolveBodySchema = z.object({apiFormat: GatewayApiFormatSchema,model: z.string()- .refine((model) => resolveGatewayModelRoute(model, []) !== null),+ .refine((model) => modelRoutingService.resolve(model, []) !== null),}).strict();const modelsQuerySchema = zdiff --git a/web/src/features/ai-gateway/server/gatewayControlPlaneError.ts b/web/src/features/ai-gateway/server/gatewayControlPlaneError.tsindex f488f39374..9aa19357aa 100644--- a/web/src/features/ai-gateway/server/gatewayControlPlaneError.ts+++ b/web/src/features/ai-gateway/server/gatewayControlPlaneError.ts@@ -2,6 +2,7 @@ export class GatewayControlPlaneError extends Error {constructor(message: string,readonly status: 400 | 401 | 403 | 404 | 503,+ readonly code?: "model_not_allowed",) {super(message);}diff --git a/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.servertest.ts b/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.servertest.tsindex e711c466bf..03c8d7f52e 100644--- a/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.servertest.ts+++ b/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.servertest.ts@@ -4,7 +4,7 @@ import type { PrismaClient } from "@langfuse/shared/src/db";import { GatewayModelCatalogService } from "../models/gatewayModelCatalogService";import { GatewayProviderRepository } from "./gatewayProviderRepository";-function connection(id: string, routingPriority: number) {+function connection(id: string) {return {id,organizationId: "org-1",@@ -12,8 +12,8 @@ function connection(id: string, routingPriority: number) {provider: "OPENAI" as const,displaySecret: "sk-...",createdById: null,- routingPriority,status: "ENABLED" as const,+ allowedModels: null,createdAt: new Date(0),updatedAt: new Date(0),};@@ -24,9 +24,9 @@ describe("GatewayProviderRepository pagination", () => {const connectionFindMany = vi.fn().mockResolvedValue([- connection("connection-1", 0),- connection("connection-2", 1),- connection("connection-3", 2),+ connection("connection-1"),+ connection("connection-2"),+ connection("connection-3"),]);const repository = new GatewayProviderRepository({gatewayAiConnection: { findMany: connectionFindMany },@@ -43,7 +43,7 @@ describe("GatewayProviderRepository pagination", () => {});expect(connectionFindMany).toHaveBeenCalledWith(expect.objectContaining({- orderBy: [{ routingPriority: "asc" }, { id: "asc" }],+ orderBy: [{ createdAt: "asc" }, { id: "asc" }],take: 3,}),);diff --git a/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.ts b/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.tsindex 436b32ca48..b694f08d98 100644--- a/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.ts+++ b/web/src/features/ai-gateway/server/provider/connection/gatewayProviderRepository.ts@@ -1,11 +1,11 @@-import type {- GatewayConnectionStatus,- GatewayProvider,+import {Prisma,- PrismaClient,+ type GatewayConnectionStatus,+ type GatewayProvider,+ type PrismaClient,} from "@langfuse/shared/src/db";-type DatabaseClient = PrismaClient | Prisma.TransactionClient;+import { parseGatewayAllowedModels } from "@/src/features/ai-gateway/fns/parseGatewayAllowedModels";const safeConnectionSelect = {id: true,@@ -14,12 +14,23 @@ const safeConnectionSelect = {provider: true,displaySecret: true,createdById: true,- routingPriority: true,status: true,+ allowedModels: true,createdAt: true,updatedAt: true,} satisfies Prisma.GatewayAiConnectionSelect;+type SafeConnectionRow = Prisma.GatewayAiConnectionGetPayload<{+ select: typeof safeConnectionSelect;+}>;++function toSafeConnection<T extends SafeConnectionRow>(connection: T) {+ return {+ ...connection,+ allowedModels: parseGatewayAllowedModels(connection.allowedModels),+ };+}+export class GatewayProviderRepository {constructor(private readonly prisma: PrismaClient) {}@@ -35,7 +46,7 @@ export class GatewayProviderRepository {status: params.status,},select: safeConnectionSelect,- orderBy: [{ routingPriority: "asc" }, { id: "asc" }],+ orderBy: [{ createdAt: "asc" }, { id: "asc" }],take: params.limit + 1,...(params.cursor? { cursor: { id: params.cursor }, skip: 1 }@@ -44,29 +55,34 @@ export class GatewayProviderRepository {const hasMore = rows.length > params.limit;const data = hasMore ? rows.slice(0, params.limit) : rows;return {- data,+ data: data.map(toSafeConnection),nextCursor: hasMore ? (data.at(-1)?.id ?? null) : null,};}- getSafeConnection(params: { organizationId: string; id: string }) {- return this.prisma.gatewayAiConnection.findFirst({+ async getSafeConnection(params: { organizationId: string; id: string }) {+ const connection = await this.prisma.gatewayAiConnection.findFirst({where: params,select: safeConnectionSelect,});+ return connection ? toSafeConnection(connection) : null;}- getConnectionWithCredential(params: { organizationId: string; id: string }) {- return this.prisma.gatewayAiConnection.findFirst({+ async getConnectionWithCredential(params: {+ organizationId: string;+ id: string;+ }) {+ const connection = await this.prisma.gatewayAiConnection.findFirst({where: params,select: {...safeConnectionSelect,encryptedCredential: true,},});+ return connection ? toSafeConnection(connection) : null;}- createConnection(params: {+ async createConnection(params: {organizationId: string;name: string;provider: GatewayProvider;@@ -75,23 +91,14 @@ export class GatewayProviderRepository {createdById: string | null;status: GatewayConnectionStatus;}) {- return this.prisma.$transaction(async (tx) => {- await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${params.organizationId}))`;- const aggregate = await tx.gatewayAiConnection.aggregate({- where: { organizationId: params.organizationId },- _max: { routingPriority: true },- });- return tx.gatewayAiConnection.create({- data: {- ...params,- routingPriority: (aggregate._max.routingPriority ?? -1) + 1,- },- select: safeConnectionSelect,- });+ const connection = await this.prisma.gatewayAiConnection.create({+ data: params,+ select: safeConnectionSelect,});+ return toSafeConnection(connection);}- updateConnection(params: {+ async updateConnection(params: {organizationId: string;id: string;name?: string;@@ -100,103 +107,56 @@ export class GatewayProviderRepository {status?: GatewayConnectionStatus;}) {const { organizationId, id, ...data } = params;- return this.prisma.gatewayAiConnection.update({+ const connection = await this.prisma.gatewayAiConnection.update({where: { id, organizationId },data,select: safeConnectionSelect,});+ return toSafeConnection(connection);}- /**- * Deletes a connection and closes the gap it leaves in the routing order in- * one transaction. Splitting the two lets a concurrent delete compact- * against rows that no longer exist, which abandons the gap.- */- deleteConnection(params: { organizationId: string; id: string }) {- return this.prisma.$transaction(async (tx) => {- await this.lockOrganization(tx, params.organizationId);- const deleted = await tx.gatewayAiConnection.delete({- where: { id: params.id, organizationId: params.organizationId },- select: safeConnectionSelect,- });- const remaining = await tx.gatewayAiConnection.findMany({- where: { organizationId: params.organizationId },- select: { id: true },- orderBy: [{ routingPriority: "asc" }, { id: "asc" }],- });- await this.writePriorities(tx, {+ async updateAllowedModels(params: {+ organizationId: string;+ id: string;+ allowedModels: string[] | null;+ expectedUpdatedAt: Date;+ }) {+ const result = await this.prisma.gatewayAiConnection.updateMany({+ where: {+ id: params.id,organizationId: params.organizationId,- connectionIds: remaining.map((connection) => connection.id),- });- return deleted;+ updatedAt: params.expectedUpdatedAt,+ },+ data: {+ allowedModels:+ params.allowedModels === null ? Prisma.DbNull : params.allowedModels,+ },});- }-- async reorderConnections(params: {- organizationId: string;- connectionIds: string[];- }): Promise<void> {- await this.prisma.$transaction(async (tx) => {- // Rows are locked in caller-supplied order, so two concurrent reorders- // of one organization deadlock unless they serialize on the same key- // createConnection uses.- await this.lockOrganization(tx, params.organizationId);- await this.writePriorities(tx, params);+ if (result.count === 0) return null;+ return this.getSafeConnection({+ organizationId: params.organizationId,+ id: params.id,});}- private lockOrganization(tx: DatabaseClient, organizationId: string) {- return tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${organizationId}))`;- }-- /**- * Assigns priorities 0..n in list order. Written in two passes through- * negative values because (organization_id, routing_priority) uniqueness is- * enforced by an index, which Postgres cannot defer to commit time.- */- private async writePriorities(- tx: DatabaseClient,- params: { organizationId: string; connectionIds: string[] },- ) {- for (const [index, id] of params.connectionIds.entries()) {- await this.updatePriority(tx, {- organizationId: params.organizationId,- id,- routingPriority: -(index + 1),- });- }- for (const [index, id] of params.connectionIds.entries()) {- await this.updatePriority(tx, {- organizationId: params.organizationId,- id,- routingPriority: index,- });- }+ async deleteConnection(params: { organizationId: string; id: string }) {+ const connection = await this.prisma.gatewayAiConnection.delete({+ where: { id: params.id, organizationId: params.organizationId },+ select: safeConnectionSelect,+ });+ return toSafeConnection(connection);}- updateConnectionStatus(params: {+ async updateConnectionStatus(params: {organizationId: string;id: string;status: GatewayConnectionStatus;}) {- return this.prisma.gatewayAiConnection.update({+ const connection = await this.prisma.gatewayAiConnection.update({where: { id: params.id, organizationId: params.organizationId },data: { status: params.status },select: safeConnectionSelect,});- }-- private updatePriority(- tx: DatabaseClient,- params: {- organizationId: string;- id: string;- routingPriority: number;- },- ) {- return tx.gatewayAiConnection.update({- where: { id: params.id, organizationId: params.organizationId },- data: { routingPriority: params.routingPriority },- });+ return toSafeConnection(connection);}}diff --git a/web/src/features/ai-gateway/server/provider/connection/gatewayProviderService.ts b/web/src/features/ai-gateway/server/provider/connection/gatewayProviderService.tsindex d16a077fc4..1b6fa8ea66 100644--- a/web/src/features/ai-gateway/server/provider/connection/gatewayProviderService.ts+++ b/web/src/features/ai-gateway/server/provider/connection/gatewayProviderService.ts@@ -4,7 +4,11 @@ import {type GatewayProvider,type PrismaClient,} from "@langfuse/shared/src/db";-import { InvalidRequestError, LangfuseNotFoundError } from "@langfuse/shared";+import {+ InvalidRequestError,+ LangfuseConflictError,+ LangfuseNotFoundError,+} from "@langfuse/shared";import { encrypt } from "@langfuse/shared/encryption";import { LLMAdapter, testModelCall } from "@langfuse/shared/src/server";import { getDisplaySecretKey } from "@langfuse/shared/src/server/auth/apiKeys";@@ -38,6 +42,12 @@ export class GatewayProviderService {return this.repository.listConnections(params);}+ async get(params: { organizationId: string; id: string }) {+ const connection = await this.repository.getSafeConnection(params);+ if (!connection) throw new LangfuseNotFoundError("Gateway connection");+ return connection;+ }+async listAll(organizationId: string, status?: GatewayConnectionStatus) {const connections = [];let cursor: string | undefined;@@ -191,41 +201,44 @@ export class GatewayProviderService {return deleted;}- async reorder(params: {+ async updateAllowedModels(params: {organizationId: string;- connectionIds: string[];+ id: string;+ allowedModels: string[] | null;+ expectedUpdatedAt: Date;session: OrgAuthedContext["session"];}) {- const existing = await this.listAll(params.organizationId);- const existingIds = new Set(existing.map((connection) => connection.id));- const requestedIds = new Set(params.connectionIds);- if (- requestedIds.size !== params.connectionIds.length ||- requestedIds.size !== existingIds.size ||- params.connectionIds.some((id) => !existingIds.has(id))- ) {- throw new InvalidRequestError(- "Reorder must contain every organization gateway connection exactly once",- );- }- await this.repository.reorderConnections({+ const existing = await this.get({organizationId: params.organizationId,- connectionIds: params.connectionIds,+ id: params.id,});- const reordered = await this.listAll(params.organizationId);+ const updated = await this.repository.updateAllowedModels({+ organizationId: params.organizationId,+ id: params.id,+ expectedUpdatedAt: params.expectedUpdatedAt,+ allowedModels:+ params.allowedModels === null+ ? null+ : [...new Set(params.allowedModels)],+ });+ if (!updated) {+ throw new LangfuseConflictError(+ "Model access changed while this page was open. Reload and try again.",+ );+ }await invalidateGatewayResolveCacheForOrganization(params.organizationId);await auditLog({session: params.session,resourceType: "gatewayAiConnection",- resourceId: params.organizationId,- action: "reorder",+ resourceId: params.id,+ action: "update",before: existing,- after: reordered,+ after: updated,},this.prisma,);- return reordered;+ return updated;}}diff --git a/web/src/features/ai-gateway/server/provider/models/gatewayModelCatalogService.ts b/web/src/features/ai-gateway/server/provider/models/gatewayModelCatalogService.tsindex dfd37f5373..0e4d7e0f56 100644--- a/web/src/features/ai-gateway/server/provider/models/gatewayModelCatalogService.ts+++ b/web/src/features/ai-gateway/server/provider/models/gatewayModelCatalogService.ts@@ -75,6 +75,42 @@ export class GatewayModelCatalogService {);}+ async listCachedModels(+ organizationId: string,+ ): Promise<ModelRefreshResult[]> {+ const connections = await this.listAllConnections(+ organizationId,+ "ENABLED",+ );+ return Promise.all(+ connections.map(async (connection) => {+ const cachedModels = await this.getCachedModels(+ organizationId,+ connection.id,+ );+ return {+ connectionId: connection.id,+ success: true as const,+ models:+ cachedModels?.map(({ id }) => id) ?? connection.allowedModels ?? [],+ };+ }),+ );+ }++ async listModelConnections(organizationId: string) {+ const connections = await this.listAllConnections(+ organizationId,+ "ENABLED",+ );+ return connections.map(({ id, name, provider, allowedModels }) => ({+ id,+ name,+ provider,+ allowedModels,+ }));+ }+async refreshModels(params: {organizationId: string;connectionId: string;@@ -202,7 +238,7 @@ export class GatewayModelCatalogService {fetcher: this.fetcher,});if (!models.success) {- if (models.error === "unauthorized") {+ if (models.error === "unauthorized" && connection.status === "ENABLED") {await this.repository.updateConnectionStatus({organizationId: params.organizationId,id: connection.id,diff --git a/web/src/features/ai-gateway/server/provider/models/gatewayModelsRepository.ts b/web/src/features/ai-gateway/server/provider/models/gatewayModelsRepository.tsindex aaa89c0ad4..967ae95695 100644--- a/web/src/features/ai-gateway/server/provider/models/gatewayModelsRepository.ts+++ b/web/src/features/ai-gateway/server/provider/models/gatewayModelsRepository.ts@@ -13,8 +13,8 @@ export class GatewayModelsRepository {provider: { in: params.providers },status: "ENABLED",},- orderBy: [{ routingPriority: "asc" }, { id: "asc" }],- select: { id: true, name: true },+ orderBy: [{ createdAt: "asc" }, { id: "asc" }],+ select: { id: true, name: true, allowedModels: true },});}}diff --git a/web/src/features/ai-gateway/server/provider/models/gatewayModelsService.ts b/web/src/features/ai-gateway/server/provider/models/gatewayModelsService.tsindex dc1855b14d..857007c90a 100644--- a/web/src/features/ai-gateway/server/provider/models/gatewayModelsService.ts+++ b/web/src/features/ai-gateway/server/provider/models/gatewayModelsService.ts@@ -3,7 +3,9 @@ import { logger, redis as defaultRedis } from "@langfuse/shared/src/server";import type { Cluster, Redis } from "ioredis";import type { GatewayApiKeyAuthContext } from "@/src/features/ai-gateway/server/auth/gatewayApiKeyAuthenticator";-import { formatGatewayModelSlug } from "@/src/features/ai-gateway/fns/gatewayModelSlug";+import { formatGatewayModelSlug } from "@/src/features/ai-gateway/fns/formatGatewayModelSlug";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";+import { toGatewayAllowedModelsSet } from "@/src/features/ai-gateway/fns/toGatewayAllowedModelsSet";import { GatewayControlPlaneError } from "@/src/features/ai-gateway/server/gatewayControlPlaneError";import {type GatewayApiFormat,@@ -74,14 +76,18 @@ export class GatewayModelsService {return {data: successfulResults- .flatMap(({ connection, catalog }) =>- catalog.success- ? catalog.models.map((model) => ({- ...model,- id: formatGatewayModelSlug(connection.name, model.id),- }))- : [],- )+ .flatMap(({ connection, catalog }) => {+ if (!catalog.success) return [];+ const allowedModels = toGatewayAllowedModelsSet(+ connection.allowedModels,+ );+ return catalog.models+ .filter((model) => isGatewayModelAllowed(allowedModels, model.id))+ .map((model) => ({+ ...model,+ id: formatGatewayModelSlug(connection.name, model.id),+ }));+ }).sort(compareModels),};}diff --git a/web/src/features/ai-gateway/server/provider/registry.servertest.ts b/web/src/features/ai-gateway/server/provider/registry.servertest.tsindex 4de0b08914..f157efe6b5 100644--- a/web/src/features/ai-gateway/server/provider/registry.servertest.ts+++ b/web/src/features/ai-gateway/server/provider/registry.servertest.ts@@ -78,6 +78,7 @@ describe("AI gateway provider registry", () => {organizationId: "org-1",provider: "OPENAI",encryptedCredential: "unused",+ allowedModels: null,}),},} as unknown as PrismaClient;@@ -135,6 +136,7 @@ describe("AI gateway provider registry", () => {provider: "ANTHROPIC",encryptedCredential: encrypt("sk-test"),status: "ENABLED",+ allowedModels: null,}),},} as unknown as PrismaClient;@@ -183,6 +185,7 @@ describe("AI gateway provider registry", () => {provider: "OPENAI",encryptedCredential: encrypt("sk-test"),status: "ENABLED",+ allowedModels: null,}),},} as unknown as PrismaClient;@@ -224,6 +227,7 @@ describe("AI gateway provider registry", () => {provider: "OPENAI",encryptedCredential: encrypt("sk-test"),status: "ENABLED",+ allowedModels: null,}),},} as unknown as PrismaClient;diff --git a/web/src/features/ai-gateway/server/resolve/gatewayResolveApiHandler.ts b/web/src/features/ai-gateway/server/resolve/gatewayResolveApiHandler.tsindex 374b6f6528..1ec9659b27 100644--- a/web/src/features/ai-gateway/server/resolve/gatewayResolveApiHandler.ts+++ b/web/src/features/ai-gateway/server/resolve/gatewayResolveApiHandler.ts@@ -35,6 +35,9 @@ export async function gatewayResolveApiHandler({// The data plane retries a 503, so tell it when to come back rather than// letting it hammer a database that is already struggling.if (error.status === 503) res.setHeader("Retry-After", "1");+ if (error.code) {+ res.setHeader("langfuse-gateway-error-code", error.code);+ }return res.status(error.status).json({ error: error.message });}logger.error("Unexpected error resolving gateway request", error);diff --git a/web/src/features/ai-gateway/server/resolve/gatewayResolveCache.ts b/web/src/features/ai-gateway/server/resolve/gatewayResolveCache.tsindex 1d18b5dfe7..fc97c44e90 100644--- a/web/src/features/ai-gateway/server/resolve/gatewayResolveCache.ts+++ b/web/src/features/ai-gateway/server/resolve/gatewayResolveCache.ts@@ -35,6 +35,7 @@ export const CachedResolveContext = z.object({name: z.string(),provider: z.enum(["OPENAI", "ANTHROPIC"]),encryptedCredential: z.string(),+ allowedModels: z.array(z.string()).nullable(),}),),});@@ -92,6 +93,11 @@ export class GatewayResolveCache {return null;}+ if (parsed.data === GATEWAY_RESOLVE_KEY_NON_EXISTENT) {+ recordIncrement("langfuse.gateway.resolve.cache_hit", 1);+ return parsed.data;+ }+recordIncrement("langfuse.gateway.resolve.cache_hit", 1);return parsed.data;} catch (error) {@@ -150,7 +156,7 @@ export class GatewayResolveCache {/*** Drops every cached resolve context for an organization. Call this after any* change that alters what /resolve would answer: connections, credentials,- * routing priority, connection status, or the gateway config.+ * connection status, model access, or the gateway config.*/async invalidateOrganization(organizationId: string) {if (!this.enabled) return;@@ -172,11 +178,11 @@ export class GatewayResolveCache {if (!this.enabled) return;try {- await Promise.all([- ...gatewayApiFormats.map((apiFormat) =>+ await Promise.all(+ gatewayApiFormats.map((apiFormat) =>this.redis!.del(contextCacheKey(fastHashedSecretKey, apiFormat)),),- ]);+ );} catch (error) {logger.error("Error invalidating gateway resolve cache", error);}diff --git a/web/src/features/ai-gateway/server/resolve/gatewayResolveRepository.ts b/web/src/features/ai-gateway/server/resolve/gatewayResolveRepository.tsindex 31dcdeee8e..ff6443adb0 100644--- a/web/src/features/ai-gateway/server/resolve/gatewayResolveRepository.ts+++ b/web/src/features/ai-gateway/server/resolve/gatewayResolveRepository.ts@@ -41,12 +41,13 @@ export class GatewayResolveRepository {provider: { in: params.providers },status: "ENABLED",},- orderBy: { routingPriority: "asc" },+ orderBy: [{ createdAt: "asc" }, { id: "asc" }],select: {id: true,name: true,provider: true,encryptedCredential: true,+ allowedModels: true,},},},diff --git a/web/src/features/ai-gateway/server/resolve/resolveService.servertest.ts b/web/src/features/ai-gateway/server/resolve/resolveService.servertest.tsindex 322b2644fd..95e49dc9c1 100644--- a/web/src/features/ai-gateway/server/resolve/resolveService.servertest.ts+++ b/web/src/features/ai-gateway/server/resolve/resolveService.servertest.ts@@ -76,6 +76,7 @@ const row = (overrides: {name: "Production OpenAI",provider: "OPENAI",encryptedCredential: "encrypted-credential",+ allowedModels: null,},],},diff --git a/web/src/features/ai-gateway/server/router.ts b/web/src/features/ai-gateway/server/router.tsindex 17633a0e30..7c58d1c5e3 100644--- a/web/src/features/ai-gateway/server/router.ts+++ b/web/src/features/ai-gateway/server/router.ts@@ -1,12 +1,18 @@import { z } from "zod/v4";import type { Session } from "next-auth";-import { throwIfNoOrganizationAccess } from "@/src/features/rbac";+import {+ hasOrganizationAccess,+ throwIfNoOrganizationAccess,+} from "@/src/features/rbac";import {createTRPCRouter,protectedOrganizationProcedure,protectedOrganizationProcedureWithoutTracing,} from "@/src/server/api/trpc";+import { env } from "@/src/env.mjs";+import { canReadGatewayModels } from "@/src/features/ai-gateway/fns/canReadGatewayModels";+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";import { getProductBaseUrl } from "@/src/utils/base-url";import {GatewayConnectionStatus,@@ -38,6 +44,11 @@ const paginatedOrganizationInput = organizationInput.extend({cursor: z.string().optional(),limit: z.number().int().min(1).max(100).default(50),});+const connectionInput = organizationInput.extend({ id: z.string() });+const allowedModelsSchema = z+ .array(z.string().trim().min(1).max(500))+ .max(10_000)+ .nullable();function requireGatewayAdmin(params: { session: Session; orgId: string }) {requireGatewayEnabledForOrganization(params.orgId);@@ -48,6 +59,39 @@ function requireGatewayAdmin(params: { session: Session; orgId: string }) {});}+function requireGatewayRead(params: { session: Session; orgId: string }) {+ requireGatewayEnabledForOrganization(params.orgId);+ const canManageGateway = hasOrganizationAccess({+ session: params.session,+ organizationId: params.orgId,+ scope: "gateway:manage",+ });+ const canReadGateway = hasOrganizationAccess({+ session: params.session,+ organizationId: params.orgId,+ scope: "gateway:read",+ });+ if (+ !canReadGatewayModels({+ organizationId: params.orgId,+ demoOrganizationId: env.NEXT_PUBLIC_DEMO_ORG_ID,+ canReadGateway,+ canManageGateway,+ })+ ) {+ throwIfNoOrganizationAccess({+ session: params.session,+ organizationId: params.orgId,+ scope: "gateway:manage",+ });+ }+ throwIfNoOrganizationAccess({+ session: params.session,+ organizationId: params.orgId,+ scope: "gateway:read",+ });+}+export const aiGatewayRouter = createTRPCRouter({getConfig: protectedOrganizationProcedure.input(organizationInput)@@ -89,6 +133,16 @@ export const aiGatewayRouter = createTRPCRouter({});}),+ getConnection: protectedOrganizationProcedure+ .input(connectionInput)+ .query(async ({ input, ctx }) => {+ requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });+ return new GatewayProviderService(ctx.prisma).get({+ organizationId: input.orgId,+ id: input.id,+ });+ }),+testConnection: protectedOrganizationProcedureWithoutTracing.input(organizationInput.extend({@@ -152,7 +206,7 @@ export const aiGatewayRouter = createTRPCRouter({}),deleteConnection: protectedOrganizationProcedure- .input(organizationInput.extend({ id: z.string() }))+ .input(connectionInput).mutation(async ({ input, ctx }) => {requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });await new GatewayProviderService(ctx.prisma).delete({@@ -163,28 +217,86 @@ export const aiGatewayRouter = createTRPCRouter({return { success: true };}),- reorderConnections: protectedOrganizationProcedure+ updateConnectionModels: protectedOrganizationProcedure.input(- organizationInput.extend({- connectionIds: z.array(z.string()),+ connectionInput.extend({+ allowedModels: allowedModelsSchema,+ expectedUpdatedAt: z.date(),}),).mutation(async ({ input, ctx }) => {requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });- return new GatewayProviderService(ctx.prisma).reorder({+ return new GatewayProviderService(ctx.prisma).updateAllowedModels({organizationId: input.orgId,- connectionIds: input.connectionIds,+ id: input.id,+ allowedModels: input.allowedModels,+ expectedUpdatedAt: input.expectedUpdatedAt,session: ctx.session,});}),+ listModelConnections: protectedOrganizationProcedure+ .input(organizationInput)+ .query(async ({ input, ctx }) => {+ requireGatewayRead({ session: ctx.session, orgId: input.orgId });+ return new GatewayModelCatalogService(ctx.prisma).listModelConnections(+ input.orgId,+ );+ }),+refreshModels: protectedOrganizationProcedure.input(organizationInput).query(async ({ input, ctx }) => {- requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });- return new GatewayModelCatalogService(ctx.prisma).refreshAllModels(+ requireGatewayRead({+ session: ctx.session,+ orgId: input.orgId,+ });+ const canManageGateway = hasOrganizationAccess({+ session: ctx.session,+ organizationId: input.orgId,+ scope: "gateway:manage",+ });+ const catalogService = new GatewayModelCatalogService(ctx.prisma);+ const results = canManageGateway+ ? await catalogService.refreshAllModels(input.orgId)+ : await catalogService.listCachedModels(input.orgId);+ if (canManageGateway) return results;++ const readableConnections = await catalogService.listModelConnections(input.orgId,);+ const allowedModelsByConnectionId = new Map(+ readableConnections.map((connection) => [+ connection.id,+ connection.allowedModels,+ ]),+ );+ return results.map((result) =>+ result.success+ ? {+ ...result,+ models: result.models.filter((model) => {+ const allowedModels = allowedModelsByConnectionId.get(+ result.connectionId,+ );+ return isGatewayModelAllowed(+ allowedModels === undefined ? [] : allowedModels,+ model,+ );+ }),+ }+ : result,+ );+ }),++ getConnectionModels: protectedOrganizationProcedure+ .input(connectionInput)+ .query(async ({ input, ctx }) => {+ requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });+ return new GatewayModelCatalogService(ctx.prisma).refreshModels({+ organizationId: input.orgId,+ connectionId: input.id,+ });}),syncModels: protectedOrganizationProcedure@@ -198,7 +310,7 @@ export const aiGatewayRouter = createTRPCRouter({}),retryConnection: protectedOrganizationProcedure- .input(organizationInput.extend({ id: z.string() }))+ .input(connectionInput).mutation(async ({ input, ctx }) => {requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });return new GatewayModelCatalogService(ctx.prisma).retryConnection({@@ -246,7 +358,7 @@ export const aiGatewayRouter = createTRPCRouter({}),revokeApiKey: protectedOrganizationProcedure- .input(organizationInput.extend({ id: z.string() }))+ .input(connectionInput).mutation(async ({ input, ctx }) => {requireGatewayAdmin({ session: ctx.session, orgId: input.orgId });await new GatewayApiKeyService(ctx.prisma, redis).revoke({diff --git a/web/src/features/ai-gateway/server/routing/gatewayModelRoutingService.servertest.ts b/web/src/features/ai-gateway/server/routing/gatewayModelRoutingService.servertest.tsnew file mode 100644index 0000000000..409562ff98--- /dev/null+++ b/web/src/features/ai-gateway/server/routing/gatewayModelRoutingService.servertest.ts@@ -0,0 +1,175 @@+import { describe, expect, it } from "vitest";++import { GatewayModelRoutingService } from "@/src/features/ai-gateway/server/routing/gatewayModelRoutingService";++const routingService = new GatewayModelRoutingService();++const connections = [+ {+ id: "openai-primary",+ name: "OpenAI primary",+ provider: "OPENAI",+ allowedModels: null,+ },+ {+ id: "anthropic",+ name: "Anthropic",+ provider: "ANTHROPIC",+ allowedModels: null,+ },+ {+ id: "openai-secondary",+ name: "OpenAI secondary",+ provider: "OPENAI",+ allowedModels: null,+ },+] as const;++describe("GatewayModelRoutingService", () => {+ it.each([+ {+ model: "OpenAI secondary:gpt-4o",+ connectionId: "openai-secondary",+ providerModel: "gpt-4o",+ },+ {+ model: "OpenAI secondary:model:with:colon",+ connectionId: "openai-secondary",+ providerModel: "model:with:colon",+ },+ {+ model: "gpt-6-sol",+ connectionId: "openai-primary",+ providerModel: "gpt-6-sol",+ },+ {+ model: "ft:gpt-4o-mini-2024-07-18:acme::abc123",+ connectionId: "openai-primary",+ providerModel: "ft:gpt-4o-mini-2024-07-18:acme::abc123",+ },+ {+ model: "claude-sonnet-4-5",+ connectionId: "anthropic",+ providerModel: "claude-sonnet-4-5",+ },+ ])(+ "routes $model to $connectionId",+ ({ model, connectionId, providerModel }) => {+ const route = routingService.resolve(model, connections);++ expect(route).not.toBeNull();+ expect(route?.connection?.id).toBe(connectionId);+ expect(route?.providerModel).toBe(providerModel);+ },+ );++ it.each(["gpt", "claude", "random-model", ":model", "OpenAI primary:"])(+ "rejects unsupported model %s",+ (model) => {+ expect(routingService.resolve(model, connections)).toBeNull();+ },+ );++ it("returns a valid unresolved route for a missing connection", () => {+ expect(routingService.resolve("Unknown:gpt-4o", connections)).toEqual({+ connection: null,+ providerModel: "gpt-4o",+ });+ expect(+ routingService.resolve("claude-sonnet-4-5", connections.slice(0, 1)),+ ).toEqual({+ connection: null,+ providerModel: "claude-sonnet-4-5",+ });+ });++ it("prefers an explicit ft connection over the OpenAI fine-tune fallback", () => {+ const ftConnection = {+ id: "ft-connection",+ name: "ft",+ provider: "ANTHROPIC",+ allowedModels: null,+ } as const;++ expect(+ routingService.resolve("ft:claude-sonnet-4-5", [+ ...connections,+ ftConnection,+ ]),+ ).toEqual({+ connection: ftConnection,+ providerModel: "claude-sonnet-4-5",+ });+ });++ it("skips connections that do not allow an implicitly routed model", () => {+ const restrictedConnections = [+ {+ id: "openai-restricted",+ name: "OpenAI restricted",+ provider: "OPENAI",+ allowedModels: ["gpt-4o"],+ },+ {+ id: "openai-compatible",+ name: "OpenAI compatible",+ provider: "OPENAI",+ allowedModels: ["gpt-6-sol"],+ },+ ] as const;++ expect(routingService.resolve("gpt-6-sol", restrictedConnections)).toEqual({+ connection: restrictedConnections[1],+ providerModel: "gpt-6-sol",+ });+ });++ it("uses an unrestricted connection for an implicitly routed model", () => {+ const unrestrictedConnection = {+ id: "openai-unrestricted",+ name: "OpenAI unrestricted",+ provider: "OPENAI",+ allowedModels: null,+ } as const;++ expect(+ routingService.resolve("gpt-6-sol", [+ {+ id: "openai-restricted",+ name: "OpenAI restricted",+ provider: "OPENAI",+ allowedModels: [],+ },+ unrestrictedConnection,+ ]),+ ).toEqual({+ connection: unrestrictedConnection,+ providerModel: "gpt-6-sol",+ });+ });++ it.each(["gpt-6-sol", "ft:gpt-4o-mini-2024-07-18:acme::abc123"])(+ "returns the first matching provider for denied implicit model %s",+ (model) => {+ const restrictedConnections = [+ {+ id: "openai-primary",+ name: "OpenAI primary",+ provider: "OPENAI",+ allowedModels: ["gpt-4o"],+ },+ {+ id: "openai-secondary",+ name: "OpenAI secondary",+ provider: "OPENAI",+ allowedModels: [],+ },+ ] as const;++ expect(routingService.resolve(model, restrictedConnections)).toEqual({+ connection: restrictedConnections[0],+ providerModel: model,+ });+ },+ );+});diff --git a/web/src/features/ai-gateway/server/routing/gatewayModelRoutingService.ts b/web/src/features/ai-gateway/server/routing/gatewayModelRoutingService.tsnew file mode 100644index 0000000000..9723189b82--- /dev/null+++ b/web/src/features/ai-gateway/server/routing/gatewayModelRoutingService.ts@@ -0,0 +1,83 @@+import { isGatewayModelAllowed } from "@/src/features/ai-gateway/fns/isGatewayModelAllowed";++export class GatewayModelRoutingService {+ resolve<Connection extends GatewayRouteConnection>(+ model: string,+ connections: readonly Connection[],+ ): { connection: Connection | null; providerModel: string } | null {+ const modelSlug = parseGatewayModelSlug(model);+ const explicitConnection = modelSlug+ ? (connections.find(+ (connection) => connection.name === modelSlug.connectionName,+ ) ?? null)+ : null;+ if (modelSlug && explicitConnection) {+ return {+ connection: explicitConnection,+ providerModel: modelSlug.providerModel,+ };+ }++ if (model.startsWith("ft:")) {+ return {+ connection: findImplicitConnection(model, connections, "OPENAI"),+ providerModel: model,+ };+ }++ if (modelSlug) {+ return {+ connection: null,+ providerModel: modelSlug.providerModel,+ };+ }++ if (model.includes(":")) return null;++ let provider: "OPENAI" | "ANTHROPIC" | null = null;+ if (model.startsWith("gpt-")) provider = "OPENAI";+ if (model.startsWith("claude-")) provider = "ANTHROPIC";+ if (!provider) return null;++ return {+ connection: findImplicitConnection(model, connections, provider),+ providerModel: model,+ };+ }+}++function findImplicitConnection<Connection extends GatewayRouteConnection>(+ model: string,+ connections: readonly Connection[],+ provider: "OPENAI" | "ANTHROPIC",+) {+ let firstProviderConnection: Connection | null = null;+ for (const connection of connections) {+ if (connection.provider !== provider) continue;+ if (!firstProviderConnection) firstProviderConnection = connection;+ if (isGatewayModelAllowed(connection.allowedModels, model)) {+ return connection;+ }+ }+ return firstProviderConnection;+}++function parseGatewayModelSlug(model: string) {+ const separatorIndex = model.indexOf(":");+ if (separatorIndex <= 0) {+ return null;+ }+ const providerModel = model.slice(separatorIndex + 1);+ if (!providerModel.trim()) return null;++ return {+ connectionName: model.slice(0, separatorIndex),+ providerModel,+ };+}++type GatewayRouteConnection = {+ name: string;+ provider: string;+ allowedModels: Set<string> | readonly string[] | null;+};diff --git a/web/src/features/evals/v2/components/Rules/RulesTable/components/RulesOverviewSelectionBar/RulesOverviewSelectionBarView.tsx b/web/src/features/evals/v2/components/Rules/RulesTable/components/RulesOverviewSelectionBar/RulesOverviewSelectionBarView.tsxindex c2b3eebf79..73e4560ac5 100644--- a/web/src/features/evals/v2/components/Rules/RulesTable/components/RulesOverviewSelectionBar/RulesOverviewSelectionBarView.tsx+++ b/web/src/features/evals/v2/components/Rules/RulesTable/components/RulesOverviewSelectionBar/RulesOverviewSelectionBarView.tsx@@ -1,7 +1,7 @@import { Pause, Play, Trash2 } from "lucide-react";+import { OverviewSelectionBar } from "@/src/components/table/OverviewSelectionBar/OverviewSelectionBar";import { Button } from "@/src/components/ui/button";import { ConfirmDialog } from "@/src/components/ui/confirm-dialog";-import { OverviewSelectionBar } from "@/src/features/evals/v2/components/OverviewSelectionBar/OverviewSelectionBar";export function RulesOverviewSelectionBarView({selectedCount,diff --git a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx b/web/src/features/evals/v2/pages/EvaluatorsPage.tsxindex a13aff7807..e5816a4f89 100644--- a/web/src/features/evals/v2/pages/EvaluatorsPage.tsx+++ b/web/src/features/evals/v2/pages/EvaluatorsPage.tsx@@ -34,7 +34,7 @@ import { EvaluatorBulkDeleteDialog } from "../components/Evaluators/EvaluatorBulimport { EvaluatorGalleryDialog } from "../components/EvaluatorGalleryDialog/EvaluatorGalleryDialog";import { EvaluatorStatusBadge } from "../components/Evaluators/EvaluatorStatusBadge/EvaluatorStatusBadge";import { EvaluatorTypeBadge } from "../components/Evaluators/EvaluatorTypeBadge/EvaluatorTypeBadge";-import { OverviewSelectionBar } from "../components/OverviewSelectionBar/OverviewSelectionBar";+import { OverviewSelectionBar } from "@/src/components/table/OverviewSelectionBar/OverviewSelectionBar";import { usePostHogClientCapture } from "@/src/features/posthog-analytics";import {useColumnOrder,diff --git a/web/src/features/organizations/OrganizationSettingsPage.tsx b/web/src/features/organizations/OrganizationSettingsPage.tsxindex a7f1fe8ec0..c496ea1903 100644--- a/web/src/features/organizations/OrganizationSettingsPage.tsx+++ b/web/src/features/organizations/OrganizationSettingsPage.tsx@@ -31,6 +31,7 @@ import {GatewayModelsPage,GatewayProvidersPage,} from "@/src/features/ai-gateway";+import { canReadGatewayModels } from "@/src/features/ai-gateway/fns/canReadGatewayModels";import useSessionStorage from "@/src/components/useSessionStorage";import { api } from "@/src/utils/api";import { ConnectedLLMApiKeySettingsTable } from "@/src/features/public-api/components/LLMApiKeySettingsTable/ConnectedLLMApiKeySettingsTable";@@ -65,6 +66,10 @@ export function useOrganizationSettingsPages(): OrganizationSettingsPage[] {organizationId: organization?.id,scope: "organizationLlmApiKeys:read",});+ const canReadGateway = useHasOrganizationAccess({+ organizationId: organization?.id,+ scope: "gateway:read",+ });const canReadUsage = useHasOrganizationAccess({organizationId: organization?.id,scope: "organizationUsage:read",@@ -92,7 +97,15 @@ export function useOrganizationSettingsPages(): OrganizationSettingsPage[] {showAuditLogs,isLangfuseCloud,showV4Migration,- showAiGateway: canManageGateway && isAiGatewayEnabled,+ showAiGatewayManagement: canManageGateway && isAiGatewayEnabled,+ showAiGatewayModels:+ isAiGatewayEnabled &&+ canReadGatewayModels({+ organizationId: organization.id,+ demoOrganizationId: env.NEXT_PUBLIC_DEMO_ORG_ID,+ canReadGateway,+ canManageGateway,+ }),showOrganizationLlmConnections: canReadOrganizationLlmConnections,showFeaturePreviews:canUpdateOrganization && organization.id !== env.NEXT_PUBLIC_DEMO_ORG_ID,@@ -107,7 +120,8 @@ const getOrganizationSettingsPages = ({showAuditLogs,isLangfuseCloud,showV4Migration,- showAiGateway,+ showAiGatewayManagement,+ showAiGatewayModels,showOrganizationLlmConnections,showFeaturePreviews,}: {@@ -128,7 +142,8 @@ const getOrganizationSettingsPages = ({showAuditLogs: boolean;isLangfuseCloud: boolean;showV4Migration: boolean;- showAiGateway: boolean;+ showAiGatewayManagement: boolean;+ showAiGatewayModels: boolean;showOrganizationLlmConnections: boolean;showFeaturePreviews: boolean;}): OrganizationSettingsPage[] => [@@ -318,7 +333,7 @@ const getOrganizationSettingsPages = ({projects={organization.projects}/>),- show: showAiGateway,+ show: showAiGatewayManagement,},{title: "Provider credentials",@@ -332,7 +347,7 @@ const getOrganizationSettingsPages = ({"anthropic",],content: <GatewayProvidersPage organizationId={organization.id} />,- show: showAiGateway,+ show: showAiGatewayManagement,},{title: "Models",@@ -340,7 +355,7 @@ const getOrganizationSettingsPages = ({section: "AI Gateway",cmdKKeywords: ["gateway", "models", "discovery", "sync"],content: <GatewayModelsPage organizationId={organization.id} />,- show: showAiGateway,+ show: showAiGatewayModels,},{title: "Gateway keys",@@ -348,7 +363,7 @@ const getOrganizationSettingsPages = ({section: "AI Gateway",cmdKKeywords: ["gateway", "api", "keys", "metadata", "credentials"],content: <GatewayApiKeysPage organizationId={organization.id} />,- show: showAiGateway,+ show: showAiGatewayManagement,},];diff --git a/web/src/features/settings/SettingsPage.tsx b/web/src/features/settings/SettingsPage.tsxindex 4f3b14bc1d..9a51e980a6 100644--- a/web/src/features/settings/SettingsPage.tsx+++ b/web/src/features/settings/SettingsPage.tsx@@ -38,7 +38,9 @@ export function SettingsPage({ scope }: SettingsPageProps) {const activeSlug =typeof router.query.page === "string" ? router.query.page : undefined;const fullHeight =- scope === "organization" && activeSlug === "ai-gateway-models";+ scope === "organization" &&+ (activeSlug === "ai-gateway-models" ||+ activeSlug === "ai-gateway-providers");if (scope === "organization" && !organization) {return (