@opengeni/api-router 2.6.3-canary.0 → 2.6.4-canary.0

package/dist/{chunk-XTLI3CBH.js → chunk-UOI7KAP3.js}

@@ -3,10 +3,10 @@ import {
   canonicalizeConfiguredModelId as canonicalizeConfiguredModelId2,
   configuredAllowedModels,
   configuredAllowedReasoningEfforts,
-  configuredModels as configuredModels3,
+  configuredModels as configuredModels2,
   resolveFirstPartyMcpToolPolicy as resolveFirstPartyMcpToolPolicy2,
-  withCodexCatalogProvider as withCodexCatalogProvider2,
-  withXaiSubscriptionCatalogProvider as withXaiSubscriptionCatalogProvider3
+  withCodexCatalogProvider,
+  withXaiSubscriptionCatalogProvider as withXaiSubscriptionCatalogProvider2
 } from "@opengeni/config";
 import {
   ClientConfig,
@@ -116,6 +116,8 @@ import {
   requireLiveAgentAttemptAuthorization as requireLiveAgentAttemptAuthorization3,
   requirePermission as requirePermission9,
   releaseManagedAuthRequestActorLease,
+  resolveCatalogSettings,
+  resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings8,
   validateManagedAuthRequestActorLease,
   requireSessionAuthorization as requireSessionAuthorization9,
   SessionAuthorizationDeniedError as SessionAuthorizationDeniedError10,
@@ -2379,6 +2381,7 @@ import {
   requireLiveAgentAttemptAuthorization as requireLiveAgentAttemptAuthorization2,
   requireSessionAuthorization as requireSessionAuthorization2,
   requireSessionAuthorizationListScope,
+  resolveWorkspaceCatalogSettings,
   SessionAuthorizationDeniedError as SessionAuthorizationDeniedError3,
   SessionAuthorizationUnavailableError as SessionAuthorizationUnavailableError2,
   saveWorkspaceMemoryWithSlackPublication,
@@ -19891,7 +19894,7 @@ function buildOpenGeniMcpServer(deps, grant, options = {}) {
       async ({ id, triggerId }) => {
         const task = await requireScheduledTask(deps.db, grant.workspaceId, id);
         if (task.action.kind === "agent_turn") {
-          await validateScheduledTaskTarget({
+          const targetSession = await validateScheduledTaskTarget({
             db: deps.db,
             sessionAuthorization: deps.sessionAuthorization,
             authorizationSurface: "first_party_mcp",
@@ -19903,8 +19906,14 @@ function buildOpenGeniMcpServer(deps, grant, options = {}) {
             agentConfig: task.agentConfig,
             missingTargetStatus: 404
           });
+          const catalogSourceSettings = deps.catalogSourceSettings ?? deps.settings;
+          const catalogSettings = (await resolveWorkspaceCatalogSettings(deps.db, catalogSourceSettings, {
+            accountId: grant.accountId,
+            workspaceId: grant.workspaceId,
+            ...targetSession ? { retainedProductModelId: targetSession.model } : {}
+          })).settings;
           await validateScheduledTaskMachineTarget({
-            settings: deps.settings,
+            settings: catalogSettings,
             db: deps.db,
             grant,
             runMode: task.runMode,
@@ -26078,9 +26087,9 @@ function registerCodexRoutes(app, deps) {
 
 // src/routes/supergrok.ts
 import {
-  configuredModels as configuredModels2,
+  configuredModels,
   environmentsEncryptionKeyBytes as environmentsEncryptionKeyBytes3,
-  withXaiSubscriptionCatalogProvider as withXaiSubscriptionCatalogProvider2
+  withXaiSubscriptionCatalogProvider
 } from "@opengeni/config";
 import {
   WORKSPACE_XAI_PROVIDER_ACCOUNT_AUTHORITY_SNAPSHOT_V1
@@ -26119,22 +26128,21 @@ import * as z10 from "zod/v4";
 
 // src/model-catalog.ts
 import {
-  configuredModels,
-  configuredProviders,
-  withCodexCatalogProvider,
-  withXaiSubscriptionCatalogProvider,
-  withWorkspaceGatewayCatalogProvider
+  OPENROUTER_PROVIDER_ID,
+  WORKSPACE_OPENROUTER_PROVIDER_ID
 } from "@opengeni/config";
 import {
   ClientModel,
-  WorkspaceModelCatalogResponse,
-  evaluateWorkspaceModelPolicy
+  WorkspaceModelCatalogResponse
 } from "@opengeni/contracts";
-var MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS = 5 * 6e4;
+import { resolveWorkspaceModelSelection } from "@opengeni/core";
+import {
+  MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS
+} from "@opengeni/core";
 function projectClientModel(model) {
   const anonymousProvider = model.credentialSource.kind === "deployment" && model.credentialSource.mechanism === "none";
-  const source = model.credentialSource.kind === "connected_subscription" ? model.credentialSource.provider === "xai" ? "supergrok" : "codex" : model.credentialSource.kind === "workspace_connection" ? "workspace_gateway" : anonymousProvider ? void 0 : "opengeni";
-  const publicProvider = anonymousProvider ? { provider: model.providerId, providerLabel: model.providerLabel } : source === "codex" ? { provider: "codex", providerLabel: "Codex" } : source === "supergrok" ? { provider: "supergrok", providerLabel: "SuperGrok" } : source === "workspace_gateway" ? { provider: "workspace-gateway", providerLabel: "Your Gateway" } : { provider: "opengeni", providerLabel: "OpenGeni" };
+  const source = model.providerId === OPENROUTER_PROVIDER_ID || model.providerId === WORKSPACE_OPENROUTER_PROVIDER_ID ? void 0 : model.credentialSource.kind === "connected_subscription" ? model.credentialSource.provider === "xai" ? "supergrok" : "codex" : model.credentialSource.kind === "workspace_connection" ? "workspace_gateway" : anonymousProvider ? void 0 : "opengeni";
+  const publicProvider = anonymousProvider ? { provider: model.providerId, providerLabel: model.providerLabel } : model.providerId === OPENROUTER_PROVIDER_ID ? { provider: "openrouter", providerLabel: "OpenRouter" } : model.providerId === WORKSPACE_OPENROUTER_PROVIDER_ID ? { provider: "workspace-openrouter", providerLabel: "Your OpenRouter" } : source === "codex" ? { provider: "codex", providerLabel: "Codex" } : source === "supergrok" ? { provider: "supergrok", providerLabel: "SuperGrok" } : source === "workspace_gateway" ? { provider: "workspace-gateway", providerLabel: "Your Gateway" } : { provider: "opengeni", providerLabel: "OpenGeni" };
   return ClientModel.parse({
     id: model.id,
     label: model.label,
@@ -26147,217 +26155,19 @@ function projectClientModel(model) {
     aliases: model.aliases,
     executionLimits: model.executionLimits,
     billing: model.billing,
+    cost: model.cost,
     capabilities: model.capabilities,
     ...model.pricing === void 0 ? {} : { pricing: model.pricing },
     definitionVersion: model.definitionVersion
   });
 }
-function modelDefinitionRunnable(model) {
-  return model.capabilities.inputModalities.includes("text") && model.capabilities.outputModalities.includes("text") && model.capabilities.transports.sse.runnable;
-}
-function observedCredentialReadiness(input) {
-  if (!input.observation) {
-    return {
-      status: "not_ready",
-      reason: "prerequisites_missing",
-      basis: input.basis,
-      checkedAt: null
-    };
-  }
-  const checkedAtMs = Date.parse(input.observation.checkedAt);
-  if (!Number.isFinite(checkedAtMs)) {
-    return {
-      status: "error",
-      reason: "resolver_error",
-      basis: input.basis,
-      checkedAt: null
-    };
-  }
-  const checkedAt = new Date(checkedAtMs).toISOString();
-  if (Math.abs(input.nowMs - checkedAtMs) > input.maxAgeMs) {
-    return {
-      status: "not_ready",
-      reason: "observation_stale",
-      basis: input.basis,
-      checkedAt
-    };
-  }
-  if (input.observation.status === "ready") {
-    return { status: "ready", reason: null, basis: input.basis, checkedAt };
-  }
-  if (input.observation.status === "not_ready") {
-    return {
-      status: "not_ready",
-      reason: input.observation.reason === "needs_reauth" ? "needs_reauth" : "prerequisites_missing",
-      basis: input.basis,
-      checkedAt
-    };
-  }
-  return {
-    status: "error",
-    reason: "resolver_error",
-    basis: input.basis,
-    checkedAt
-  };
-}
-function credentialReadinessFor(input) {
-  const source = input.model.credentialSource;
-  if (source.kind === "connected_subscription") {
-    const active = source.provider === "xai" ? input.xaiSubscriptionActive : input.codexSubscriptionActive;
-    return active ? { status: "ready", reason: null, basis: "connection", checkedAt: null } : {
-      status: "not_ready",
-      reason: "needs_reauth",
-      basis: "connection",
-      checkedAt: null
-    };
-  }
-  if (source.kind === "workspace_connection") {
-    return input.workspaceGatewayConnectionActive ? { status: "ready", reason: null, basis: "connection", checkedAt: null } : {
-      status: "not_ready",
-      reason: "needs_reauth",
-      basis: "connection",
-      checkedAt: null
-    };
-  }
-  if (source.kind === "deployment" && source.mechanism === "none") {
-    return { status: "ready", reason: null, basis: "configuration", checkedAt: null };
-  }
-  if (source.kind === "deployment" && source.mechanism === "api_key") {
-    return input.provider?.apiKey ? { status: "ready", reason: null, basis: "configuration", checkedAt: null } : {
-      status: "not_ready",
-      reason: "missing_credential",
-      basis: "configuration",
-      checkedAt: null
-    };
-  }
-  return observedCredentialReadiness({
-    observation: input.observation,
-    basis: "resolver",
-    nowMs: input.nowMs,
-    maxAgeMs: input.maxAgeMs
-  });
-}
-function isXaiGrokModel(model) {
-  return model.providerId === "xai" && model.id.startsWith("xai/grok-");
-}
-function observationTimestamp(observation) {
-  if (!observation || typeof observation.checkedAt !== "string") {
-    return { checkedAt: null, checkedAtMs: null };
-  }
-  const checkedAtMs = Date.parse(observation.checkedAt);
-  if (!Number.isFinite(checkedAtMs)) {
-    return { checkedAt: null, checkedAtMs: null };
-  }
-  return { checkedAt: new Date(checkedAtMs).toISOString(), checkedAtMs };
-}
-function xaiGrokAvailabilityFor(input) {
-  const { checkedAt, checkedAtMs } = observationTimestamp(input.observation);
-  const freshSuccessfulObservation = input.observation?.status === "available" && input.observation.reason === null && checkedAtMs !== null && checkedAtMs <= input.nowMs && input.nowMs - checkedAtMs <= input.maxAgeMs;
-  if (freshSuccessfulObservation) {
-    return {
-      status: "available",
-      selectable: true,
-      reason: null,
-      checkedAt
-    };
-  }
-  return {
-    status: "unavailable",
-    selectable: false,
-    reason: input.observation?.status === "unavailable" ? input.observation.reason ?? "provider_unhealthy" : "provider_unhealthy",
-    checkedAt
-  };
-}
-function availabilityFor(input) {
-  if (!modelDefinitionRunnable(input.model)) {
-    return {
-      status: "unavailable",
-      selectable: false,
-      reason: "unsupported",
-      checkedAt: null
-    };
-  }
-  if (input.credentialReadiness.status !== "ready") {
-    return {
-      status: "unavailable",
-      selectable: false,
-      reason: input.credentialReadiness.reason === "missing_credential" ? "missing_credential" : input.credentialReadiness.reason === "needs_reauth" ? "needs_reauth" : "credential_not_ready",
-      checkedAt: input.credentialReadiness.checkedAt
-    };
-  }
-  if (!input.policyAllowed) {
-    return {
-      status: "unavailable",
-      selectable: false,
-      reason: "policy_blocked",
-      checkedAt: null
-    };
-  }
-  if (isXaiGrokModel(input.model)) {
-    return xaiGrokAvailabilityFor({
-      observation: input.observation,
-      nowMs: input.nowMs,
-      maxAgeMs: input.maxAgeMs
-    });
-  }
-  if (!input.observation) {
-    return { status: "unknown", selectable: true, reason: null, checkedAt: null };
-  }
-  if (input.observation.status === "unavailable") {
-    return {
-      status: "unavailable",
-      selectable: false,
-      reason: input.observation.reason ?? "provider_unhealthy",
-      checkedAt: input.observation.checkedAt
-    };
-  }
-  return {
-    status: input.observation.status,
-    selectable: true,
-    reason: null,
-    checkedAt: input.observation.checkedAt
-  };
-}
 function buildWorkspaceModelCatalog(input) {
-  const codexSettings = input.settings.codexSubscriptionEnabled ? withCodexCatalogProvider(input.settings) : input.settings;
-  const xaiSettings = input.settings.supergrokSubscriptionEnabled ? withXaiSubscriptionCatalogProvider(codexSettings) : codexSettings;
-  const catalogSettings = withWorkspaceGatewayCatalogProvider(xaiSettings);
-  const providers = new Map(
-    configuredProviders(catalogSettings).map((provider) => [provider.id, provider])
-  );
-  const requestedNowMs = input.now?.getTime();
-  const nowMs = typeof requestedNowMs === "number" && Number.isFinite(requestedNowMs) ? requestedNowMs : Date.now();
-  const maxAgeMs = typeof input.credentialReadinessMaxAgeMs === "number" && Number.isFinite(input.credentialReadinessMaxAgeMs) && input.credentialReadinessMaxAgeMs >= 0 ? input.credentialReadinessMaxAgeMs : MODEL_CREDENTIAL_READINESS_OBSERVATION_MAX_AGE_MS;
-  const models = configuredModels(catalogSettings).map((model) => {
-    const provider = providers.get(model.providerId);
-    const policyAllowed = evaluateWorkspaceModelPolicy(input.policy, {
-      providerId: model.providerId,
-      modelId: model.id
-    }).allowed;
-    const credentialReadiness = credentialReadinessFor({
-      model,
-      provider,
-      codexSubscriptionActive: input.codexSubscriptionActive,
-      xaiSubscriptionActive: input.xaiSubscriptionActive === true,
-      workspaceGatewayConnectionActive: input.workspaceGatewayConnectionActive === true,
-      observation: input.credentialReadinessObservations?.[model.definitionVersion],
-      nowMs,
-      maxAgeMs
-    });
-    return {
-      ...projectClientModel(model),
-      credentialReadiness,
-      policyAllowed,
-      availability: availabilityFor({
-        model,
-        credentialReadiness,
-        policyAllowed,
-        observation: input.observations?.[model.definitionVersion],
-        nowMs,
-        maxAgeMs
-      })
-    };
-  });
+  const models = resolveWorkspaceModelSelection(input).map((selection) => ({
+    ...projectClientModel(selection.model),
+    credentialReadiness: selection.credentialReadiness,
+    policyAllowed: selection.policyAllowed,
+    availability: selection.availability
+  }));
   return WorkspaceModelCatalogResponse.parse({ models });
 }
 
@@ -26771,7 +26581,8 @@ function registerSuperGrokRoutes(app, deps) {
     } catch {
       valid = false;
     }
-    const catalog = valid ? configuredModels2(withXaiSubscriptionCatalogProvider2(deps.settings)).filter(
+    const catalogSettings = valid ? (await deps.resolveCatalogSettings()).settings : null;
+    const catalog = catalogSettings ? configuredModels(withXaiSubscriptionCatalogProvider(catalogSettings)).filter(
       (model) => model.credentialSource.kind === "connected_subscription" && model.credentialSource.provider === "xai"
     ).map(projectClientModel) : [];
     return c.json({
@@ -26948,7 +26759,13 @@ function registerSuperGrokRoutes(app, deps) {
 }
 
 // src/routes/connections.ts
-import { createHash as createHash10 } from "crypto";
+import { createHash as createHash10, createHmac as createHmac4 } from "crypto";
+import {
+  WORKSPACE_OPENROUTER_CONNECTION_DOMAIN,
+  WORKSPACE_OPENROUTER_CONNECTION_ROLE,
+  VERCEL_AI_GATEWAY_CONNECTION_DOMAIN,
+  VERCEL_AI_GATEWAY_CONNECTION_ROLE
+} from "@opengeni/config";
 import {
   ATLASSIAN_PROVIDER_DOMAIN as ATLASSIAN_PROVIDER_DOMAIN2,
   AtlassianConnectionMetadata as AtlassianConnectionMetadata3,
@@ -26971,11 +26788,16 @@ import {
   IntegrationClientMetadata,
   ListSlackInstallationBindingsResponse,
   ListConnectionsResponse,
+  OPENROUTER_CREDENTIAL_OPERATION_DIGEST_METADATA_KEY,
+  OPENROUTER_CREDENTIAL_OPERATION_ID_METADATA_KEY,
   OpenGeniSlackBotInstallRequest,
   OpenGeniSlackBotInstallStart,
   OAuthStartRequest,
   OAuthStartResponse as OAuthStartResponse4,
-  UpdateConnectionRequest
+  UpdateConnectionRequest,
+  VERCEL_AI_GATEWAY_CREDENTIAL_OPERATION_DIGEST_METADATA_KEY,
+  VERCEL_AI_GATEWAY_CREDENTIAL_OPERATION_ID_METADATA_KEY,
+  stableJson as stableJson2
 } from "@opengeni/contracts";
 import {
   bindConnectorDocumentDestination as bindConnectorDocumentDestination3,
@@ -27019,11 +26841,17 @@ import {
   persistSlackBotInstallationWithSuccessAudit,
   recordSlackBotInstallCallbackFailure,
   revokeConnection,
+  revokeWorkspaceOpenRouterConnections,
+  revokeWorkspaceVercelAiGatewayConnections,
   revokeConnectionWithSlackBotSuccessAudit,
+  rotateWorkspaceVercelAiGatewayConnection,
+  rotateWorkspaceOpenRouterConnection,
   SlackBotLifecycleSuccessAuditError,
   SlackInstallationBindingConflictError,
   updateConnection as updateConnection5,
-  updateSlackBotDocumentDestination
+  updateSlackBotDocumentDestination,
+  upsertWorkspaceVercelAiGatewayConnection,
+  upsertWorkspaceOpenRouterConnection
 } from "@opengeni/db";
 import { HTTPException as HTTPException25 } from "hono/http-exception";
 
@@ -28183,13 +28011,59 @@ function registerConnectionRoutes(app, deps) {
     assertNotDirectGoogleDriveOAuth(providerDomain, payload.kind, payload.metadata);
     assertNotDirectAtlassianOAuth(providerDomain, payload.kind, payload.metadata);
     assertNotDirectPersonalGitHubOAuth(providerDomain, payload.kind, payload.metadata);
-    const connection = await createConnection5(db, {
+    const credentialEncrypted = encryptCredentialBundle(key, payload.credential);
+    const workspaceProviderKind = workspaceProviderApiKeyConnectionKind({
+      subjectId,
+      providerDomain,
+      kind: payload.kind,
+      metadata: payload.metadata
+    });
+    const connection = workspaceProviderKind ? await (async () => {
+      const provider = workspaceProviderApiKeyConnectionSpec(workspaceProviderKind);
+      if (!payload.operationId) {
+        throw new HTTPException25(400, {
+          message: `connecting ${provider.label} requires an operationId`
+        });
+      }
+      const expiresAt = payload.expiresAt ? new Date(payload.expiresAt) : null;
+      const metadata = workspaceProviderCredentialMetadata(
+        workspaceProviderKind,
+        payload.metadata
+      );
+      const input = {
+        accountId: grant.accountId,
+        workspaceId,
+        operationId: payload.operationId,
+        requestDigest: workspaceProviderCredentialRequestDigest(key, {
+          action: "create",
+          providerDomain,
+          kind: payload.kind,
+          subjectId,
+          credential: payload.credential,
+          grantedScopes: payload.grantedScopes,
+          expiresAt: expiresAt?.toISOString() ?? null,
+          metadata
+        }),
+        credentialEncrypted,
+        grantedScopes: payload.grantedScopes,
+        expiresAt,
+        metadata,
+        updatedBySubjectId: grant.subjectId
+      };
+      const created = workspaceProviderKind === "vercel_gateway" ? await upsertWorkspaceVercelAiGatewayConnection(db, input) : await upsertWorkspaceOpenRouterConnection(db, input);
+      if (!created || created.status === "revoked") {
+        throw new HTTPException25(409, {
+          message: `${provider.label} is already connected; reload before replacing its key`
+        });
+      }
+      return created;
+    })() : await createConnection5(db, {
       accountId: grant.accountId,
       workspaceId,
       subjectId,
       providerDomain,
       kind: payload.kind,
-      credentialEncrypted: encryptCredentialBundle(key, payload.credential),
+      credentialEncrypted,
       grantedScopes: payload.grantedScopes,
       expiresAt: payload.expiresAt ? new Date(payload.expiresAt) : null,
       metadata: payload.metadata,
@@ -28723,6 +28597,18 @@ function registerConnectionRoutes(app, deps) {
         payload.providerDomain ?? existing.providerDomain
       );
       const kind = payload.kind ?? existing.kind;
+      const subjectId2 = payload.subjectId === void 0 ? existing.subjectId : writableSubjectId(payload.subjectId, grant.subjectId);
+      const targetWorkspaceProviderKind = workspaceProviderApiKeyConnectionKind({
+        subjectId: subjectId2,
+        providerDomain,
+        kind,
+        metadata: payload.metadata ?? existing.metadata
+      });
+      if (!workspaceProviderApiKeyConnectionKind(existing) && targetWorkspaceProviderKind) {
+        throw new HTTPException25(422, {
+          message: targetWorkspaceProviderKind === "vercel_gateway" ? "use the Vercel AI Gateway connect flow to create this connection" : "use the OpenRouter connect flow to create this connection"
+        });
+      }
       assertNotDirectPersonalSlackOAuth(providerDomain, kind);
       assertNotDirectGoogleDriveOAuth(providerDomain, kind, payload.metadata ?? existing.metadata);
       assertNotDirectAtlassianOAuth(providerDomain, kind, payload.metadata ?? existing.metadata);
@@ -28744,6 +28630,65 @@ function registerConnectionRoutes(app, deps) {
         });
       }
     }
+    const existingWorkspaceProviderKind = existing ? workspaceProviderApiKeyConnectionKind(existing) : null;
+    if (existing && existingWorkspaceProviderKind) {
+      const provider = workspaceProviderApiKeyConnectionSpec(existingWorkspaceProviderKind);
+      const providerDomain = canonicalProviderDomain(
+        payload.providerDomain ?? existing.providerDomain
+      );
+      const subjectId2 = payload.subjectId === void 0 ? existing.subjectId : writableSubjectId(payload.subjectId, grant.subjectId);
+      const kind = payload.kind ?? existing.kind;
+      if (subjectId2 !== null || providerDomain !== provider.providerDomain || kind !== "api_key" || payload.metadata?.credentialRole !== void 0 && payload.metadata.credentialRole !== provider.credentialRole) {
+        throw new HTTPException25(422, {
+          message: `${provider.label} connection identity cannot be changed`
+        });
+      }
+      if (payload.credential === void 0) {
+        throw new HTTPException25(400, {
+          message: `updating a ${provider.label} connection requires a new credential`
+        });
+      }
+      if (payload.expectedVersion === void 0 || payload.operationId === void 0) {
+        throw new HTTPException25(400, {
+          message: `updating a ${provider.label} connection requires expectedVersion and operationId`
+        });
+      }
+      const key2 = requireEnvironmentEncryption8(settings);
+      const grantedScopes2 = payload.grantedScopes ?? existing.grantedScopes;
+      const expiresAt = payload.expiresAt !== void 0 ? payload.expiresAt ? new Date(payload.expiresAt) : null : existing.expiresAt ? new Date(existing.expiresAt) : null;
+      const metadata = workspaceProviderCredentialMetadata(existingWorkspaceProviderKind, {
+        ...existing.metadata,
+        ...payload.metadata ?? {}
+      });
+      const input = {
+        accountId: grant.accountId,
+        workspaceId,
+        connectionId: existing.id,
+        expectedVersion: payload.expectedVersion,
+        operationId: payload.operationId,
+        requestDigest: workspaceProviderCredentialRequestDigest(key2, {
+          action: "rotate",
+          connectionId: existing.id,
+          expectedVersion: payload.expectedVersion,
+          credential: payload.credential,
+          grantedScopes: grantedScopes2,
+          expiresAt: expiresAt?.toISOString() ?? null,
+          metadata
+        }),
+        credentialEncrypted: encryptCredentialBundle(key2, payload.credential),
+        grantedScopes: grantedScopes2,
+        expiresAt,
+        metadata,
+        updatedBySubjectId: grant.subjectId
+      };
+      const connection2 = existingWorkspaceProviderKind === "vercel_gateway" ? await rotateWorkspaceVercelAiGatewayConnection(db, input) : await rotateWorkspaceOpenRouterConnection(db, input);
+      if (!connection2) {
+        throw new HTTPException25(409, {
+          message: `${provider.label} connection changed; reload before replacing its key`
+        });
+      }
+      return c.json(ConnectionResponse.parse({ connection: connection2 }));
+    }
     const key = payload.credential === void 0 ? null : requireEnvironmentEncryption8(settings);
     const subjectId = payload.subjectId === void 0 ? void 0 : writableSubjectId(payload.subjectId, grant.subjectId);
     const connection = await updateConnection5(db, {
@@ -28785,6 +28730,7 @@ function registerConnectionRoutes(app, deps) {
     }
     const isGoogleDrive = existing.subjectId === grant.subjectId && existing.providerDomain === GOOGLE_DRIVE_PROVIDER_DOMAIN2 && existing.kind === "oauth2" && GoogleDriveConnectionMetadata2.safeParse(existing.metadata).success;
     const isAtlassian = existing.subjectId === grant.subjectId && existing.providerDomain === ATLASSIAN_PROVIDER_DOMAIN2 && existing.kind === "oauth2" && AtlassianConnectionMetadata3.safeParse(existing.metadata).success;
+    const workspaceProviderKind = workspaceProviderApiKeyConnectionKind(existing);
     const disconnectPayload = await c.req.json().catch(() => null);
     const googleDriveDisconnect = isGoogleDrive ? GoogleDriveDisconnectRequest.safeParse(disconnectPayload) : null;
     if (googleDriveDisconnect && !googleDriveDisconnect.success) {
@@ -28804,7 +28750,7 @@ function registerConnectionRoutes(app, deps) {
         message: personalGitHubDisconnect.error.issues[0]?.message ?? "invalid personal GitHub disconnect request"
       });
     }
-    if (existing.status === "revoked" && !isGoogleDrive && !isAtlassian && !isPersonalGitHub) {
+    if (existing.status === "revoked" && !isGoogleDrive && !isAtlassian && !isPersonalGitHub && !workspaceProviderKind) {
       return c.json(ConnectionResponse.parse({ connection: existing }));
     }
     const connection = isGoogleDrive ? await disconnectGoogleDrive(deps, {
@@ -28831,6 +28777,18 @@ function registerConnectionRoutes(app, deps) {
       credentialRole: OPENGENI_SLACK_BOT_CREDENTIAL_ROLE2,
       credentialLabel: OPENGENI_SLACK_BOT_CREDENTIAL_LABEL2,
       slackTeamId: openGeniSlackBotMetadata2(existing.metadata).slackTeamId
+    }) : workspaceProviderKind ? workspaceProviderKind === "vercel_gateway" ? await revokeWorkspaceVercelAiGatewayConnections(db, {
+      accountId: grant.accountId,
+      workspaceId,
+      connectionId,
+      expectedVersion: existing.version,
+      updatedBySubjectId: grant.subjectId
+    }) : await revokeWorkspaceOpenRouterConnections(db, {
+      accountId: grant.accountId,
+      workspaceId,
+      connectionId,
+      expectedVersion: existing.version,
+      updatedBySubjectId: grant.subjectId
     }) : await revokeConnection(
       db,
       workspaceId,
@@ -29152,6 +29110,28 @@ function assertNotReservedPersonalGitHubMetadata(metadata) {
     });
   }
 }
+function workspaceProviderApiKeyConnectionSpec(providerKind) {
+  return providerKind === "vercel_gateway" ? {
+    providerDomain: VERCEL_AI_GATEWAY_CONNECTION_DOMAIN,
+    credentialRole: VERCEL_AI_GATEWAY_CONNECTION_ROLE,
+    label: "Vercel AI Gateway"
+  } : {
+    providerDomain: WORKSPACE_OPENROUTER_CONNECTION_DOMAIN,
+    credentialRole: WORKSPACE_OPENROUTER_CONNECTION_ROLE,
+    label: "OpenRouter"
+  };
+}
+function workspaceProviderApiKeyConnectionKind(input) {
+  if (input.subjectId != null || input.kind !== "api_key") return null;
+  const providerDomain = input.providerDomain.toLowerCase();
+  if (providerDomain === VERCEL_AI_GATEWAY_CONNECTION_DOMAIN && input.metadata?.credentialRole === VERCEL_AI_GATEWAY_CONNECTION_ROLE) {
+    return "vercel_gateway";
+  }
+  if (providerDomain === WORKSPACE_OPENROUTER_CONNECTION_DOMAIN && input.metadata?.credentialRole === WORKSPACE_OPENROUTER_CONNECTION_ROLE) {
+    return "openrouter";
+  }
+  return null;
+}
 function assertNotReservedSlackBotMetadata(metadata) {
   if (hasReservedOpenGeniSlackBotMetadata(metadata)) {
     throw new HTTPException25(422, {
@@ -29197,6 +29177,22 @@ function createConnectionSubjectId(payload, grantSubjectId) {
 function encryptCredentialBundle(key, credential) {
   return encryptEnvironmentValue9(key, JSON.stringify(credential));
 }
+function workspaceProviderCredentialMetadata(providerKind, metadata) {
+  const {
+    [OPENROUTER_CREDENTIAL_OPERATION_ID_METADATA_KEY]: _openRouterOperationId,
+    [OPENROUTER_CREDENTIAL_OPERATION_DIGEST_METADATA_KEY]: _openRouterOperationDigest,
+    [VERCEL_AI_GATEWAY_CREDENTIAL_OPERATION_ID_METADATA_KEY]: _operationId,
+    [VERCEL_AI_GATEWAY_CREDENTIAL_OPERATION_DIGEST_METADATA_KEY]: _operationDigest,
+    ...effectiveMetadata
+  } = metadata ?? {};
+  return {
+    ...effectiveMetadata,
+    credentialRole: workspaceProviderApiKeyConnectionSpec(providerKind).credentialRole
+  };
+}
+function workspaceProviderCredentialRequestDigest(key, value) {
+  return createHmac4("sha256", key).update(stableJson2(value), "utf8").digest("hex");
+}
 function slackBotCredentialBundle(token) {
   const headerName = ["author", "ization"].join("");
   const scheme = ["Bear", "er"].join("");
@@ -33403,7 +33399,7 @@ import { retryWhileMissing as retryWhileMissing4 } from "@opengeni/storage";
 import { HTTPException as HTTPException35 } from "hono/http-exception";
 
 // src/browser-controller-authority.ts
-import { createHmac as createHmac4 } from "crypto";
+import { createHmac as createHmac5 } from "crypto";
 function deriveBrowserControllerAdminToken(scope) {
   return derive(scope.rootSecret, "placement-admin.v1", [
     scope.accountId,
@@ -33484,7 +33480,7 @@ function deriveComputerViewGrantToken(scope) {
 }
 function derive(rootSecret, domain, fields) {
   if (!rootSecret) throw new Error("browser controller authority root is unavailable");
-  const hmac2 = createHmac4("sha256", rootSecret);
+  const hmac2 = createHmac5("sha256", rootSecret);
   hmac2.update("opengeni.browser-controller-authority\0", "utf8");
   writeField(hmac2, domain);
   for (const field of fields) writeField(hmac2, String(field));
@@ -33643,7 +33639,7 @@ async function withInteractionHolderHeartbeat(deps, input, run) {
 }
 
 // src/browser-state-authority.ts
-import { createCipheriv, createDecipheriv, createHash as createHash11, createHmac as createHmac5, randomBytes as randomBytes7 } from "crypto";
+import { createCipheriv, createDecipheriv, createHash as createHash11, createHmac as createHmac6, randomBytes as randomBytes7 } from "crypto";
 import { BROWSER_PROFILE_ARTIFACT_FORMAT } from "@opengeni/contracts";
 var ROOT_KEY_BYTES = 32;
 var DATA_KEY_BYTES = 32;
@@ -33654,7 +33650,7 @@ var SHA256_PATTERN = /^[0-9a-f]{64}$/u;
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu;
 function deriveBrowserStateDataKey(rootKey, scopeInput) {
   const scope = operationScope(scopeInput);
-  return createHmac5("sha256", root(rootKey)).update("opengeni.browser-state.data-key.v1\0", "utf8").update(canonicalJson2(scope), "utf8").digest();
+  return createHmac6("sha256", root(rootKey)).update("opengeni.browser-state.data-key.v1\0", "utf8").update(canonicalJson2(scope), "utf8").digest();
 }
 function browserStateArtifactAad(scopeInput) {
   const scope = baseArtifactScope(scopeInput);
@@ -33739,7 +33735,7 @@ function wrapAad(scope) {
   return Buffer.from(`opengeni.browser-state.data-key-wrap.v1\0${canonicalJson2(scope)}`, "utf8");
 }
 function browserStateWrappingKey(rootKey, scope) {
-  return createHmac5("sha256", root(rootKey)).update("opengeni.browser-state.wrapping-key.v1\0", "utf8").update(canonicalJson2(scope), "utf8").digest();
+  return createHmac6("sha256", root(rootKey)).update("opengeni.browser-state.wrapping-key.v1\0", "utf8").update(canonicalJson2(scope), "utf8").digest();
 }
 function browserStateObjectKeyValue(value, workspaceId) {
   if (typeof value !== "string" || Buffer.byteLength(value) > 2048 || !new RegExp(
@@ -33805,7 +33801,7 @@ function canonicalValue(value) {
 }
 
 // src/browser-auth-broker.ts
-import { createHmac as createHmac6 } from "crypto";
+import { createHmac as createHmac7 } from "crypto";
 var BrowserAuthCredentialError = class extends Error {
   name = "BrowserAuthCredentialError";
 };
@@ -33856,7 +33852,7 @@ function totpCode(secretValue, options = {}) {
   const secret = decodeBase32(uri?.secret ?? secretValue);
   const counter = Buffer.alloc(8);
   counter.writeBigUInt64BE(BigInt(Math.floor(nowMs / (periodSeconds * 1e3))));
-  const digest2 = createHmac6(algorithm, secret).update(counter).digest();
+  const digest2 = createHmac7(algorithm, secret).update(counter).digest();
   const offset = digest2[digest2.length - 1] & 15;
   const binary = (digest2[offset] & 127) << 24 | digest2[offset + 1] << 16 | digest2[offset + 2] << 8 | digest2[offset + 3];
   const code = String(binary % 10 ** digits).padStart(digits, "0");
@@ -34079,7 +34075,7 @@ function safeControlRequestId(value) {
 }
 
 // src/interaction-frame-proxy.ts
-import { createCipheriv as createCipheriv2, createDecipheriv as createDecipheriv2, createHmac as createHmac7, randomBytes as randomBytes8 } from "crypto";
+import { createCipheriv as createCipheriv2, createDecipheriv as createDecipheriv2, createHmac as createHmac8, randomBytes as randomBytes8 } from "crypto";
 import { canonicalPublicOrigin as canonicalPublicOrigin2 } from "@opengeni/config";
 import { WebSocket as UpstreamWebSocket } from "ws";
 var INTERACTION_FRAME_PROXY_PATH = "/v1/interaction/frame-proxy";
@@ -34301,7 +34297,7 @@ function decryptGrant(token, rootSecret) {
 }
 function tokenKey(rootSecret) {
   if (rootSecret.length === 0) throw new Error("proxy authority is empty");
-  return createHmac7("sha256", rootSecret).update(TOKEN_KEY_CONTEXT).digest();
+  return createHmac8("sha256", rootSecret).update(TOKEN_KEY_CONTEXT).digest();
 }
 function validateGrant(value) {
   if (!value || typeof value !== "object") throw new Error("invalid proxy grant");
@@ -40261,14 +40257,6 @@ function registerGitHubRoutes(app, deps) {
       if (candidates.length === 0) {
         return redirectToGitHubInstallation(c, deps, selectionState);
       }
-      if (candidates.length === 1) {
-        return redirectToExactGitHubAuthorization(
-          c,
-          deps,
-          selectionState,
-          candidates[0].installation.installationId
-        );
-      }
       setGitHubStateCookie(c, deps, selectionState);
       return c.html(
         githubInstallationChooserHtml(
@@ -44161,16 +44149,18 @@ import {
   UpdatePrReviewRepositoryBindingRequest
 } from "@opengeni/contracts";
 import {
-  assertWorkspaceModelPolicyAllows,
-  canonicalConfiguredModel,
+  assertWorkspaceModelPolicyAllows as assertWorkspaceModelPolicyAllows2,
+  canonicalConfiguredModel as canonicalConfiguredModel2,
   defaultPrReviewProviderBaseUrl,
   getCapabilityPack as getCapabilityPack2,
+  workspaceCustomModelReference as workspaceCustomModelReference2,
   prReviewWebhookAuthKind,
   normalizePrReviewProviderBaseUrl,
   prReviewPackConnectorId as prReviewPackConnectorId2,
   PR_REVIEW_AUTOMATION_TEMPLATE_ID as PR_REVIEW_AUTOMATION_TEMPLATE_ID2,
   requireAccessGrant as requireAccessGrant23,
-  requirePermission as requirePermission6
+  requirePermission as requirePermission6,
+  resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings3
 } from "@opengeni/core";
 import {
   createPrReviewAppRegistration,
@@ -44183,6 +44173,8 @@ import {
   getPackInstallation as getPackInstallation2,
   listPrReviewAppRegistrations as listPrReviewAppRegistrations2,
   listPrReviewRepositoryBindings as listPrReviewRepositoryBindings2,
+  lockActiveWorkspaceGatewayCustomModelForAdmission as lockActiveWorkspaceGatewayCustomModelForAdmission2,
+  lockActiveWorkspaceOpenRouterCustomModelForAdmission as lockActiveWorkspaceOpenRouterCustomModelForAdmission2,
   nestedPostgresSqlState as nestedPostgresSqlState3,
   recordAuditEvent as recordAuditEvent9,
   updatePrReviewAppRegistration,
@@ -44435,7 +44427,7 @@ import {
   TriggerAutomationManuallyRequest,
   UpdateAutomationSourceRequest,
   UpdateAutomationTriggerRequest,
-  stableJson as stableJson2
+  stableJson as stableJson3
 } from "@opengeni/contracts";
 import {
   AutomationDeliveryConflictError,
@@ -44451,17 +44443,25 @@ import {
   listAutomationRuns,
   listAutomationSources,
   listAutomationTriggers,
+  lockActiveWorkspaceGatewayCustomModelForAdmission,
+  lockActiveWorkspaceOpenRouterCustomModelForAdmission,
   recordAutomationEvent,
   resolveAutomationWebhookEndpoint,
   updateAutomationSource,
-  updateAutomationTrigger
+  updateAutomationTrigger,
+  withWorkspaceGatewayCustomModelReadLock,
+  withWorkspaceOpenRouterCustomModelReadLock
 } from "@opengeni/db";
 import {
   automationRequestDigest,
+  assertWorkspaceModelPolicyAllows,
   buildAutomationAcceptedExecution,
+  canonicalConfiguredModel,
+  workspaceCustomModelReference,
   requireAccessGrant as requireAccessGrant21,
   requireAutomationAdapter,
-  requirePermission as requirePermission4
+  requirePermission as requirePermission4,
+  resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings2
 } from "@opengeni/core";
 import { HTTPException as HTTPException43 } from "hono/http-exception";
 function registerAutomationRoutes(app, deps) {
@@ -44574,13 +44574,32 @@ function registerAutomationRoutes(app, deps) {
     for (const permission of request.sessionTemplate.firstPartyMcpPermissions) {
       requirePermission4(grant, permission);
     }
+    const catalogSettings = (await resolveWorkspaceCatalogSettings2(deps.db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
+    const model = canonicalConfiguredModel(catalogSettings, request.sessionTemplate.model) ?? null;
+    if (model) {
+      await assertWorkspaceModelPolicyAllows(deps.db, catalogSettings, workspaceId, model);
+    }
+    const normalizedRequest = {
+      ...request,
+      sessionTemplate: { ...request.sessionTemplate, model }
+    };
+    const beforeCreateCommit = model ? workspaceCustomModelCommitGuard({
+      settings: catalogSettings,
+      accountId: grant.accountId,
+      workspaceId,
+      modelId: model
+    }) : void 0;
     return c.json(
       await createAutomationTrigger(deps.db, {
         accountId: grant.accountId,
         workspaceId,
         createdBySubjectId: grant.subjectId,
-        request,
-        adapterId: adapter.id
+        request: normalizedRequest,
+        adapterId: adapter.id,
+        ...beforeCreateCommit ? { beforeCreateCommit } : {}
       }),
       201
     );
@@ -44610,12 +44629,40 @@ function registerAutomationRoutes(app, deps) {
         requirePermission4(grant, permission);
       }
     }
+    const catalogSettings = (await resolveWorkspaceCatalogSettings2(deps.db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
+    const normalizedRequest = request.sessionTemplate ? {
+      ...request,
+      sessionTemplate: {
+        ...request.sessionTemplate,
+        model: canonicalConfiguredModel(catalogSettings, request.sessionTemplate.model) ?? null
+      }
+    } : request;
+    if (normalizedRequest.sessionTemplate?.model) {
+      await assertWorkspaceModelPolicyAllows(
+        deps.db,
+        catalogSettings,
+        workspaceId,
+        normalizedRequest.sessionTemplate.model
+      );
+    }
+    const effectiveModel = normalizedRequest.sessionTemplate ? normalizedRequest.sessionTemplate.model : existing.sessionTemplate.model;
+    const materialExecutionChange = request.eventTypes !== void 0 || request.configuration !== void 0 || request.parameters !== void 0 || request.sessionTemplate !== void 0 || request.status === "active" && existing.status !== "active";
+    const beforeUpdateCommit = materialExecutionChange && effectiveModel ? workspaceCustomModelCommitGuard({
+      settings: catalogSettings,
+      accountId: grant.accountId,
+      workspaceId,
+      modelId: effectiveModel
+    }) : void 0;
     try {
       const trigger = await updateAutomationTrigger(deps.db, {
         workspaceId,
         triggerId: c.req.param("triggerId"),
         subjectId: grant.subjectId,
-        request
+        request: normalizedRequest,
+        ...beforeUpdateCommit ? { beforeUpdateCommit } : {}
       });
       if (!trigger)
         throw new HTTPException43(404, {
@@ -44689,7 +44736,7 @@ function registerAutomationRoutes(app, deps) {
       resource: request.resource,
       payload: request.payload
     });
-    const bytes = new TextEncoder().encode(stableJson2(request));
+    const bytes = new TextEncoder().encode(stableJson3(request));
     return c.json(
       await acceptAutomationEvent(deps, source, {
         deliveryKey: request.deliveryId ?? `manual:${automationRequestDigest(source.adapterId, bytes)}`,
@@ -44775,29 +44822,78 @@ async function acceptAutomationEvent(deps, source, input) {
     workspaceId: source.workspaceId,
     sourceId: source.id
   });
-  const matchingAtAcceptance = triggers.filter(
+  const matchingByEvent = triggers.filter(
     (trigger) => adapter.matches({ event: input.normalizedEvent, trigger })
   );
-  if (matchingAtAcceptance.length > AUTOMATION_MAX_MATCHED_TRIGGERS) {
+  if (matchingByEvent.length > AUTOMATION_MAX_MATCHED_TRIGGERS) {
     throw new HTTPException43(422, {
       message: `automation event matches more than ${AUTOMATION_MAX_MATCHED_TRIGGERS} triggers`
     });
   }
-  const stored = await recordAutomationEvent(deps.db, {
+  const stored = matchingByEvent.length === 0 ? await recordAutomationEvent(deps.db, {
     accountId: source.accountId,
     workspaceId: source.workspaceId,
     sourceId: source.id,
     sourceVersion: source.version,
     sourceConfiguration: source.configuration,
-    matchedTriggerRevisions: matchingAtAcceptance.map((trigger) => ({
-      triggerId: trigger.id,
-      revision: trigger.revision
-    })),
+    matchedTriggerRevisions: [],
     deliveryKey: input.deliveryKey,
     requestDigest: input.requestDigest,
     normalizedEvent: input.normalizedEvent,
-    ignoredReason: matchingAtAcceptance.length === 0 ? "no_matching_triggers" : null
-  });
+    ignoredReason: "no_matching_triggers"
+  }) : await withWorkspaceGatewayCustomModelReadLock(
+    deps.db,
+    { accountId: source.accountId, workspaceId: source.workspaceId },
+    async (gatewayLockedDb) => await withWorkspaceOpenRouterCustomModelReadLock(
+      gatewayLockedDb,
+      { accountId: source.accountId, workspaceId: source.workspaceId },
+      async (lockedDb) => {
+        const catalogSourceSettings = deps.catalogSourceSettings ?? deps.settings;
+        const catalogSettings = (await resolveWorkspaceCatalogSettings2(lockedDb, catalogSourceSettings, {
+          accountId: source.accountId,
+          workspaceId: source.workspaceId
+        })).settings;
+        const matchingAtAcceptance = [];
+        for (const trigger of matchingByEvent) {
+          try {
+            const render = adapter.render({
+              event: input.normalizedEvent,
+              trigger,
+              source
+            });
+            const requestedModel = render.sessionTemplate.model ?? catalogSettings.openaiModel;
+            const model = canonicalConfiguredModel(catalogSettings, requestedModel);
+            if (!model) continue;
+            await assertWorkspaceModelPolicyAllows(
+              lockedDb,
+              catalogSettings,
+              source.workspaceId,
+              model
+            );
+            matchingAtAcceptance.push(trigger);
+          } catch (error) {
+            if (isUnprocessableEntity(error)) continue;
+            throw error;
+          }
+        }
+        return await recordAutomationEvent(lockedDb, {
+          accountId: source.accountId,
+          workspaceId: source.workspaceId,
+          sourceId: source.id,
+          sourceVersion: source.version,
+          sourceConfiguration: source.configuration,
+          matchedTriggerRevisions: matchingAtAcceptance.map((trigger) => ({
+            triggerId: trigger.id,
+            revision: trigger.revision
+          })),
+          deliveryKey: input.deliveryKey,
+          requestDigest: input.requestDigest,
+          normalizedEvent: input.normalizedEvent,
+          ignoredReason: matchingAtAcceptance.length === 0 ? "no_executable_triggers" : null
+        });
+      }
+    )
+  );
   const matching = await getAutomationTriggerRevisions(deps.db, {
     workspaceId: source.workspaceId,
     refs: stored.event.matchedTriggerRevisions
@@ -44854,6 +44950,29 @@ async function acceptAutomationEvent(deps, source, input) {
     runIds
   });
 }
+function isUnprocessableEntity(error) {
+  return error instanceof Error && "status" in error && error.status === 422;
+}
+function workspaceCustomModelCommitGuard(input) {
+  const reference = workspaceCustomModelReference(input.settings, input.modelId);
+  if (!reference) return void 0;
+  return async (tx) => {
+    const active = reference.providerKind === "openrouter" ? await lockActiveWorkspaceOpenRouterCustomModelForAdmission(tx, {
+      accountId: input.accountId,
+      workspaceId: input.workspaceId,
+      upstreamModelId: reference.upstreamModelId
+    }) : await lockActiveWorkspaceGatewayCustomModelForAdmission(tx, {
+      accountId: input.accountId,
+      workspaceId: input.workspaceId,
+      upstreamModelId: reference.upstreamModelId
+    });
+    if (!active) {
+      throw new HTTPException43(422, {
+        message: `model is not available: ${input.modelId}`
+      });
+    }
+  };
+}
 async function requireSource(deps, accountId, workspaceId, sourceId) {
   const source = await getAutomationSourceSecret(deps.db, {
     accountId,
@@ -45826,8 +45945,18 @@ function registerPrReviewRoutes(app, deps) {
         throw error;
       }
     }
-    const model = payload.model ? canonicalConfiguredModel(settings, payload.model) ?? null : null;
-    if (model) await assertWorkspaceModelPolicyAllows(db, settings, workspaceId, model);
+    const catalogSettings = (await resolveWorkspaceCatalogSettings3(db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
+    const model = payload.model ? canonicalConfiguredModel2(catalogSettings, payload.model) ?? null : null;
+    if (model) await assertWorkspaceModelPolicyAllows2(db, catalogSettings, workspaceId, model);
+    const beforeCreateCommit = model ? prReviewCustomModelCommitGuard({
+      settings: catalogSettings,
+      accountId: grant.accountId,
+      workspaceId,
+      modelId: model
+    }) : void 0;
     const template = getCapabilityPack2(OPENGENI_PR_REVIEW_PACK_ID2)?.automationTemplates?.find(
       (candidate) => candidate.id === PR_REVIEW_AUTOMATION_TEMPLATE_ID2
     );
@@ -45854,7 +45983,8 @@ function registerPrReviewRoutes(app, deps) {
         adapterId: template.adapterId,
         eventTypes: template.eventTypes,
         configuration: template.configuration,
-        sessionTemplate: template.sessionTemplate
+        sessionTemplate: template.sessionTemplate,
+        ...beforeCreateCommit ? { beforeCreateCommit } : {}
       }),
       "This repository is already bound to the selected PR Review registration"
     );
@@ -45878,8 +46008,22 @@ function registerPrReviewRoutes(app, deps) {
     const grant = await requireAccessGrant23(c, deps, workspaceId, "workspace:admin");
     await requirePrReviewPackActive(db, workspaceId);
     const payload = UpdatePrReviewRepositoryBindingRequest.parse(await c.req.json());
-    const model = payload.model === void 0 ? void 0 : payload.model === null ? null : canonicalConfiguredModel(settings, payload.model) ?? null;
-    if (model) await assertWorkspaceModelPolicyAllows(db, settings, workspaceId, model);
+    const catalogSettings = (await resolveWorkspaceCatalogSettings3(db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
+    const model = payload.model === void 0 ? void 0 : payload.model === null ? null : canonicalConfiguredModel2(catalogSettings, payload.model) ?? null;
+    if (model) await assertWorkspaceModelPolicyAllows2(db, catalogSettings, workspaceId, model);
+    const beforeUpdateCommit = async (tx, context) => {
+      const materialExecutionChange = payload.model !== void 0 || payload.additionalInstructions !== void 0 || context.currentStatus === "disabled" && context.nextStatus === "active";
+      if (!materialExecutionChange || !context.nextModel) return;
+      await prReviewCustomModelCommitGuard({
+        settings: catalogSettings,
+        accountId: grant.accountId,
+        workspaceId,
+        modelId: context.nextModel
+      })?.(tx);
+    };
     const binding = await updatePrReviewRepositoryBinding(db, {
       accountId: grant.accountId,
       workspaceId,
@@ -45887,7 +46031,8 @@ function registerPrReviewRoutes(app, deps) {
       subjectId: grant.subjectId,
       ...model !== void 0 ? { model } : {},
       ...payload.additionalInstructions !== void 0 ? { additionalInstructions: payload.additionalInstructions } : {},
-      ...payload.status !== void 0 ? { status: payload.status } : {}
+      ...payload.status !== void 0 ? { status: payload.status } : {},
+      beforeUpdateCommit
     });
     if (!binding)
       throw new HTTPException45(404, {
@@ -45929,6 +46074,26 @@ function registerPrReviewRoutes(app, deps) {
     return c.body(null, 204);
   });
 }
+function prReviewCustomModelCommitGuard(input) {
+  const reference = workspaceCustomModelReference2(input.settings, input.modelId);
+  if (!reference) return void 0;
+  return async (tx) => {
+    const active = reference.providerKind === "openrouter" ? await lockActiveWorkspaceOpenRouterCustomModelForAdmission2(tx, {
+      accountId: input.accountId,
+      workspaceId: input.workspaceId,
+      upstreamModelId: reference.upstreamModelId
+    }) : await lockActiveWorkspaceGatewayCustomModelForAdmission2(tx, {
+      accountId: input.accountId,
+      workspaceId: input.workspaceId,
+      upstreamModelId: reference.upstreamModelId
+    });
+    if (!active) {
+      throw new HTTPException45(422, {
+        message: `model is not available: ${input.modelId}`
+      });
+    }
+  };
+}
 function assertPrReviewSandboxBackend(deps) {
   if (deps.settings.sandboxBackend === "selfhosted") {
     throw new HTTPException45(409, {
@@ -45986,7 +46151,7 @@ import {
   RegisterCapabilityPackRequest,
   UninstallPackRequest,
   UninstallPackResult,
-  stableJson as stableJson3
+  stableJson as stableJson4
 } from "@opengeni/contracts";
 import {
   adoptPackComponentReferences,
@@ -46161,7 +46326,7 @@ function registerPackRoutes(app, deps) {
       ...preview.variableSetId ? { variableSetId: preview.variableSetId } : {}
     };
     const requestDigest = sha2562(
-      stableJson3({
+      stableJson4({
         packId: pack.id,
         manifestDigest: preview.manifestDigest,
         expectedInstallationVersion: payload.expectedInstallationVersion ?? null,
@@ -46339,7 +46504,7 @@ function registerPackRoutes(app, deps) {
     const pack = await requirePack(db, workspaceId, c.req.param("packId"));
     const payload = UninstallPackRequest.parse(await c.req.json());
     const requestDigest = sha2562(
-      stableJson3({
+      stableJson4({
         packId: pack.id,
         expectedInstallationVersion: payload.expectedInstallationVersion
       })
@@ -46642,7 +46807,7 @@ import {
   PreviewPluginRequest,
   UninstallPluginRequest,
   UninstallPluginResult,
-  stableJson as stableJson4
+  stableJson as stableJson5
 } from "@opengeni/contracts";
 import {
   portableSkillCapabilityId,
@@ -46849,7 +47014,7 @@ function registerPluginRoutes(app, deps, overrides = {}) {
       });
     }
     const requestDigest = sha2563(
-      stableJson4({
+      stableJson5({
         url: payload.url,
         expectedManifestDigest: payload.expectedManifestDigest,
         expectedComponents: [...expected.entries()].sort(),
@@ -46986,14 +47151,14 @@ async function resolvePluginPackage(input) {
       message: error instanceof Error ? error.message : "Plugin manifest is invalid"
     });
   }
-  const manifestDigest = sha2563(stableJson4(manifest));
+  const manifestDigest = sha2563(stableJson5(manifest));
   const components = [];
   for (const component of manifest.components) {
     if (component.kind === "skill") {
       const resolved = await resolveSkillImport(component.url, input.github);
       const capabilityId = portableSkillCapabilityId(resolved.preview);
       const digest3 = sha2563(
-        stableJson4({
+        stableJson5({
           capabilityId,
           sourceCommit: resolved.preview.sourceCommit,
           sourcePath: resolved.preview.sourcePath,
@@ -47142,7 +47307,7 @@ async function resolvePluginPackage(input) {
       continue;
     }
     const server = configuredMcpServer(input.deps.settings.mcpServers, component.serverId);
-    const digest2 = sha2563(stableJson4(safeMcpFacts(server)));
+    const digest2 = sha2563(stableJson5(safeMcpFacts(server)));
     components.push({
       preview: {
         key: component.key,
@@ -47292,7 +47457,7 @@ function safeMcpFacts(server) {
 }
 function integrationDigest(resolved) {
   return sha2563(
-    stableJson4({
+    stableJson5({
       capabilityId: resolved.preview.capabilityId,
       revisionId: resolved.preview.revisionId,
       contentSha256: resolved.preview.contentSha256,
@@ -47961,7 +48126,7 @@ import {
 } from "@opengeni/contracts";
 import { listScheduledTaskRuns as listScheduledTaskRuns2, listScheduledTasks as listScheduledTasks2 } from "@opengeni/db";
 import { HTTPException as HTTPException51 } from "hono/http-exception";
-import { requireAccessGrant as requireAccessGrant29 } from "@opengeni/core";
+import { requireAccessGrant as requireAccessGrant29, resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings4 } from "@opengeni/core";
 import { recordWorkspaceUsage as recordWorkspaceUsage6, requireLimit as requireLimit8 } from "@opengeni/core";
 import {
   captureScheduledTaskRestoreState as captureScheduledTaskRestoreState4,
@@ -47981,7 +48146,7 @@ import {
   validatedScheduledTaskUpdate as validatedScheduledTaskUpdate2
 } from "@opengeni/core";
 function registerScheduledTaskRoutes(app, deps) {
-  const { settings, db, workflowClient, objectStorage } = deps;
+  const { db, workflowClient, objectStorage } = deps;
   app.post("/v1/workspaces/:workspaceId/scheduled-tasks", async (c) => {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant29(c, deps, workspaceId, "scheduled_tasks:manage");
@@ -47993,6 +48158,10 @@ function registerScheduledTaskRoutes(app, deps) {
       });
     }
     const payload = parsedPayload.data;
+    const catalogSettings = (await resolveWorkspaceCatalogSettings4(db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
     await requireLimit8(deps, {
       accountId: grant.accountId,
       workspaceId,
@@ -48000,7 +48169,7 @@ function registerScheduledTaskRoutes(app, deps) {
       quantity: 1
     });
     const task = await createValidatedScheduledTask5({
-      settings,
+      settings: catalogSettings,
       db,
       objectStorage,
       grant,
@@ -48038,8 +48207,12 @@ function registerScheduledTaskRoutes(app, deps) {
       });
     }
     const payload = parsedPayload.data;
+    const catalogSettings = (await resolveWorkspaceCatalogSettings4(db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
     const update = await validatedScheduledTaskUpdate2({
-      settings,
+      settings: catalogSettings,
       db,
       objectStorage,
       grant,
@@ -48069,8 +48242,12 @@ function registerScheduledTaskRoutes(app, deps) {
     const grant = await requireAccessGrant29(c, deps, workspaceId, "scheduled_tasks:manage");
     const existing = await requireScheduledTaskForApi(db, workspaceId, c.req.param("taskId"));
     const previous = await captureScheduledTaskRestoreState4(db, existing);
+    const catalogSettings = (await resolveWorkspaceCatalogSettings4(db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    })).settings;
     const update = await validatedScheduledTaskUpdate2({
-      settings,
+      settings: catalogSettings,
       db,
       objectStorage,
       grant,
@@ -48088,6 +48265,10 @@ function registerScheduledTaskRoutes(app, deps) {
     const grant = await requireAccessGrant29(c, deps, workspaceId, "scheduled_tasks:run");
     const task = await requireScheduledTaskForApi(db, workspaceId, c.req.param("taskId"));
     if (task.action.kind === "agent_turn") {
+      const catalogSettings = (await resolveWorkspaceCatalogSettings4(db, deps.settings, {
+        accountId: grant.accountId,
+        workspaceId
+      })).settings;
       await validateScheduledTaskTarget2({
         db,
         sessionAuthorization: deps.sessionAuthorization,
@@ -48101,20 +48282,23 @@ function registerScheduledTaskRoutes(app, deps) {
         missingTargetStatus: 404
       });
       await validateScheduledTaskMachineTarget2({
-        settings,
+        settings: catalogSettings,
         db,
         grant,
         runMode: task.runMode,
         agentConfig: task.agentConfig,
         requireOnline: true
       });
-      await requireLimit8(deps, {
-        accountId: grant.accountId,
-        workspaceId,
-        action: "agent_run:create",
-        quantity: 1,
-        model: task.agentConfig.model ?? deps.settings.openaiModel
-      });
+      await requireLimit8(
+        { ...deps, settings: catalogSettings },
+        {
+          accountId: grant.accountId,
+          workspaceId,
+          action: "agent_run:create",
+          quantity: 1,
+          model: task.agentConfig.model ?? catalogSettings.openaiModel
+        }
+      );
     }
     const body4 = await c.req.json().catch(() => ({}));
     const { triggerId } = TriggerScheduledTaskRequest.parse(body4 ?? {});
@@ -48181,6 +48365,7 @@ import {
   GatewayRealtimeConnectRequest,
   ClientSessionEvent,
   CompactSessionContextRequest,
+  CreateSessionRequest,
   DeleteSessionQueueItemRequest,
   EditSessionQueueItemRequest,
   EndSessionRealtimeRequest,
@@ -48216,6 +48401,7 @@ import {
   SessionEventSemanticClass as SessionEventSemanticClass2,
   SessionEventType as SessionEventType2,
   SessionMcpServerId,
+  SaveNewSessionDraftRequest,
   compactSessionEventResult as compactSessionEventResult3,
   sessionEventLatestClassToSemanticClass as sessionEventLatestClassToSemanticClass2,
   SaveComposerDraftRequest,
@@ -49096,6 +49282,7 @@ import {
   requirePermission as requirePermission8,
   requireSessionAuthorization as requireSessionAuthorization7,
   requireSessionAuthorizationListScope as requireSessionAuthorizationListScope2,
+  resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings5,
   withResolvedSessionAuthorization,
   SESSION_AUTHORIZATION_DEFAULT_REAUTHORIZE_MS,
   SessionAuthorizationDeniedError as SessionAuthorizationDeniedError7,
@@ -49552,6 +49739,7 @@ function registerSessionRoutes(app, deps) {
     }
     let session;
     try {
+      CreateSessionRequest.parse(payload);
       session = await createSessionForRequest(deps, grant, workspaceId, payload, authorization);
     } catch (error) {
       return sessionCreateErrorResponse(c, error);
@@ -49561,7 +49749,13 @@ function registerSessionRoutes(app, deps) {
   app.get("/v1/workspaces/:workspaceId/new-session-draft", async (c) => {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant30(c, deps, workspaceId, "sessions:read");
-    return c.json(await getActorNewSessionDraft({ settings, db }, grant, workspaceId));
+    const catalog = await resolveWorkspaceCatalogSettings5(db, settings, {
+      accountId: grant.accountId,
+      workspaceId
+    });
+    return c.json(
+      await getActorNewSessionDraft({ settings: catalog.settings, db }, grant, workspaceId)
+    );
   });
   app.put("/v1/workspaces/:workspaceId/new-session-draft", async (c) => {
     const workspaceId = c.req.param("workspaceId");
@@ -49585,9 +49779,14 @@ function registerSessionRoutes(app, deps) {
       );
     }
     try {
+      SaveNewSessionDraftRequest.parse(payload);
+      const catalog = await resolveWorkspaceCatalogSettings5(db, settings, {
+        accountId: grant.accountId,
+        workspaceId
+      });
       return c.json(
         await saveActorNewSessionDraft(
-          { settings, db, objectStorage },
+          { settings: catalog.settings, db, objectStorage },
           grant,
           workspaceId,
           payload,
@@ -51734,24 +51933,29 @@ function registerSessionRoutes(app, deps) {
     const sessionId = c.req.param("sessionId");
     await assertSessionExists(db, workspaceId, sessionId);
     const payload = parseSteerSessionAdmission(await c.req.json().catch(() => null));
-    const result = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
-      text: payload.text,
-      annotations: payload.annotations,
-      modelContext: payload.modelContext ?? null,
-      resources: payload.resources,
-      model: payload.model ?? null,
-      reasoningEffort: payload.reasoningEffort ?? null,
-      latencyMode: payload.latencyMode ?? null,
-      mcpCredentialUpdates: payload.mcpCredentialUpdates ?? [],
-      connectionAuthorities: payload.connectionAuthorities,
-      ...payload.personalResourceAttachment ? { personalResourceAttachment: payload.personalResourceAttachment } : {},
-      authorization,
-      delivery: "steer",
-      origin: "human",
-      ...payload.controlEtag !== void 0 ? { controlEtag: payload.controlEtag } : {},
-      ...payload.expectedDraftRevision !== void 0 ? { expectedDraftRevision: payload.expectedDraftRevision } : {},
-      ...payload.clientEventId ? { clientEventId: payload.clientEventId } : {}
-    });
+    let result;
+    try {
+      result = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
+        text: payload.text,
+        annotations: payload.annotations,
+        modelContext: payload.modelContext ?? null,
+        resources: payload.resources,
+        model: payload.model ?? null,
+        reasoningEffort: payload.reasoningEffort ?? null,
+        latencyMode: payload.latencyMode ?? null,
+        mcpCredentialUpdates: payload.mcpCredentialUpdates ?? [],
+        connectionAuthorities: payload.connectionAuthorities,
+        ...payload.personalResourceAttachment ? { personalResourceAttachment: payload.personalResourceAttachment } : {},
+        authorization,
+        delivery: "steer",
+        origin: "human",
+        ...payload.controlEtag !== void 0 ? { controlEtag: payload.controlEtag } : {},
+        ...payload.expectedDraftRevision !== void 0 ? { expectedDraftRevision: payload.expectedDraftRevision } : {},
+        ...payload.clientEventId ? { clientEventId: payload.clientEventId } : {}
+      });
+    } catch (error) {
+      return commandConflictResponse(c, error);
+    }
     return c.json(result, 202);
   });
   app.post("/v1/workspaces/:workspaceId/sessions/:sessionId/composer-draft/submit", async (c) => {
@@ -51800,23 +52004,28 @@ function registerSessionRoutes(app, deps) {
       }
     }
     if (event.type === "user.message") {
-      const { accepted } = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
-        text: event.payload.text,
-        annotations: event.payload.annotations,
-        modelContext: event.payload.modelContext ?? null,
-        resources: event.payload.resources ?? [],
-        model: event.payload.model ?? null,
-        reasoningEffort: event.payload.reasoningEffort ?? null,
-        latencyMode: event.payload.latencyMode ?? null,
-        mcpCredentialUpdates: event.payload.mcpCredentialUpdates ?? [],
-        connectionAuthorities: event.payload.connectionAuthorities,
-        ...event.payload.personalResourceAttachment ? { personalResourceAttachment: event.payload.personalResourceAttachment } : {},
-        authorization,
-        ...event.payload.controlEtag !== void 0 ? { controlEtag: event.payload.controlEtag } : {},
-        ...event.payload.expectedDraftRevision !== void 0 ? { expectedDraftRevision: event.payload.expectedDraftRevision } : {},
-        ...event.clientEventId ? { clientEventId: event.clientEventId } : {}
-      });
-      return c.json(accepted, 202);
+      let result;
+      try {
+        result = await acceptSessionUserMessage(deps, grant, workspaceId, sessionId, {
+          text: event.payload.text,
+          annotations: event.payload.annotations,
+          modelContext: event.payload.modelContext ?? null,
+          resources: event.payload.resources ?? [],
+          model: event.payload.model ?? null,
+          reasoningEffort: event.payload.reasoningEffort ?? null,
+          latencyMode: event.payload.latencyMode ?? null,
+          mcpCredentialUpdates: event.payload.mcpCredentialUpdates ?? [],
+          connectionAuthorities: event.payload.connectionAuthorities,
+          ...event.payload.personalResourceAttachment ? { personalResourceAttachment: event.payload.personalResourceAttachment } : {},
+          authorization,
+          ...event.payload.controlEtag !== void 0 ? { controlEtag: event.payload.controlEtag } : {},
+          ...event.payload.expectedDraftRevision !== void 0 ? { expectedDraftRevision: event.payload.expectedDraftRevision } : {},
+          ...event.clientEventId ? { clientEventId: event.clientEventId } : {}
+        });
+      } catch (error) {
+        return commandConflictResponse(c, error);
+      }
+      return c.json(result.accepted, 202);
     }
     if (event.type === "user.approvalDecision") {
       const accepted = await acceptSessionApprovalDecision2(db, {
@@ -53674,6 +53883,7 @@ function socialHttpException(error) {
 }
 
 // src/routes/workspaces.ts
+import { createHash as createHash16 } from "crypto";
 import {
   AddWorkspaceMemberRequest,
   CreateWorkspaceRequest,
@@ -53683,16 +53893,25 @@ import {
   ListWorkspaceMembersResponse,
   SetWorkspaceDefaultRigRequest,
   UpdateWorkspaceMemberRequest,
+  CreateWorkspaceGatewayCustomModelRequest,
+  CreateWorkspaceOpenRouterCustomModelRequest,
+  DeleteWorkspaceGatewayCustomModelRequest,
+  DeleteWorkspaceOpenRouterCustomModelRequest,
   UpdateWorkspaceModelPolicyRequest,
   UpdateWorkspaceRequest,
   UpdateWorkspaceSettingsRequest,
   WORKSPACE_CONTROL_ACTOR_MAX_BYTES as WORKSPACE_CONTROL_ACTOR_MAX_BYTES2,
   WorkspaceModelCatalogResponse as WorkspaceModelCatalogResponse2,
+  WorkspaceGatewayCustomModel,
+  WorkspaceGatewayCustomModelsResponse,
+  WorkspaceOpenRouterCustomModel,
+  WorkspaceOpenRouterCustomModelsResponse,
   WorkspaceRealtimeModelCatalogResponse,
   WorkspaceInferenceControlRequest,
   Workspace,
   WorkspaceMember,
-  workspaceControlUtf8Bytes as workspaceControlUtf8Bytes2
+  workspaceControlUtf8Bytes as workspaceControlUtf8Bytes2,
+  stableJson as stableJson6
 } from "@opengeni/contracts";
 import {
   allWorkspacePermissions,
@@ -53708,6 +53927,14 @@ import {
   normalizeWorkspaceMembershipPermissions,
   listWorkspaceControlEvents as listWorkspaceControlEvents2,
   listSharedWorkspacesForAccount,
+  listWorkspaceGatewayCustomModels,
+  listWorkspaceOpenRouterCustomModels,
+  createWorkspaceGatewayCustomModel,
+  createWorkspaceOpenRouterCustomModel,
+  deleteWorkspaceGatewayCustomModel,
+  deleteWorkspaceOpenRouterCustomModel,
+  replayWorkspaceGatewayCustomModelCreate,
+  replayWorkspaceOpenRouterCustomModelCreate,
   listWorkspacesForSubject,
   nestedPostgresSqlState as nestedPostgresSqlState4,
   removeWorkspaceMember,
@@ -53722,7 +53949,12 @@ import {
   workspaceControlRequestLockTimeoutMs as workspaceControlRequestLockTimeoutMs2,
   workspaceXaiSubscriptionActive,
   workspaceVercelAiGatewayConnectionActive,
+  workspaceOpenRouterConnectionActive,
+  WorkspaceGatewayCustomModelHistoryLimitError,
+  WorkspaceOpenRouterCustomModelHistoryLimitError,
   WorkspaceExternalIdentityConflictError,
+  WorkspaceGatewayCustomModelLimitError,
+  WorkspaceOpenRouterCustomModelLimitError,
   WorkspaceLimitExceededError
 } from "@opengeni/db";
 import { boundWorkspaceControlHttpPage } from "@opengeni/events";
@@ -53733,7 +53965,8 @@ import {
   hasPermission as hasPermission19,
   requireAccessContext as requireAccessContext3,
   requireAccessGrant as requireAccessGrant32,
-  requireFreshAccessGrant as requireFreshAccessGrant3
+  requireFreshAccessGrant as requireFreshAccessGrant3,
+  resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings6
 } from "@opengeni/core";
 import { requireLimit as requireLimit9 } from "@opengeni/core";
 import {
@@ -53825,7 +54058,14 @@ import {
   CODEX_REALTIME_MODEL_ID,
   SUPERGROK_REALTIME_MODEL_ID as SUPERGROK_REALTIME_MODEL_ID2,
   canonicalizeConfiguredModelId,
-  configuredStaticUsageLimits as configuredStaticUsageLimits2
+  configuredStaticUsageLimits as configuredStaticUsageLimits2,
+  configuredGatewayUpstreamModelIds,
+  configuredGatewayWorkspaceProductModelIds,
+  configuredModelInputIdentities,
+  configuredOpenRouterUpstreamModelIds,
+  configuredOpenRouterWorkspaceProductModelIds,
+  WORKSPACE_GATEWAY_MODEL_ID_PREFIX,
+  WORKSPACE_OPENROUTER_MODEL_ID_PREFIX
 } from "@opengeni/config";
 function canonicalWorkspacePolicyModelIds(settings, modelIds) {
   if (modelIds === null || modelIds === void 0) {
@@ -53833,6 +54073,29 @@ function canonicalWorkspacePolicyModelIds(settings, modelIds) {
   }
   return [...new Set(modelIds.map((modelId) => canonicalizeConfiguredModelId(settings, modelId)))];
 }
+function projectWorkspaceGatewayCustomModel(model) {
+  return WorkspaceGatewayCustomModel.parse({
+    id: model.id,
+    upstreamModelId: model.upstreamModelId,
+    label: model.label,
+    version: model.version,
+    createdAt: model.createdAt.toISOString(),
+    updatedAt: model.updatedAt.toISOString()
+  });
+}
+function projectWorkspaceOpenRouterCustomModel(model) {
+  return WorkspaceOpenRouterCustomModel.parse({
+    id: model.id,
+    upstreamModelId: model.upstreamModelId,
+    label: model.label,
+    version: model.version,
+    createdAt: model.createdAt.toISOString(),
+    updatedAt: model.updatedAt.toISOString()
+  });
+}
+function workspaceCustomModelRequestHash(value) {
+  return createHash16("sha256").update(stableJson6(value), "utf8").digest("hex");
+}
 function workspaceMembersResponse(members) {
   return ListWorkspaceMembersResponse.parse({
     members: members.map((member) => ({
@@ -53906,7 +54169,9 @@ function registerWorkspaceRoutes(app, deps) {
         externalId: payload.externalId,
         name: payload.name,
         slug: payload.slug ?? null,
-        ...payload.agentInstructions !== void 0 ? { agentInstructions: normalizeAgentInstructions(payload.agentInstructions) } : {},
+        ...payload.agentInstructions !== void 0 ? {
+          agentInstructions: normalizeAgentInstructions(payload.agentInstructions)
+        } : {},
         maxWorkspacesPerAccount: workspaceLimit(deps)
       });
       const response = EnsureWorkspaceResponse.parse(result);
@@ -54012,29 +54277,304 @@ function registerWorkspaceRoutes(app, deps) {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:read");
     const [
+      resolvedCatalog,
       policy,
       codexSubscriptionActive,
       xaiSubscriptionActive,
-      workspaceGatewayConnectionActive
+      workspaceGatewayConnectionActive,
+      workspaceGatewayCustomModels,
+      openRouterConnectionActive,
+      workspaceOpenRouterCustomModels
     ] = await Promise.all([
+      deps.resolveCatalogSettings(),
       getWorkspaceModelPolicy(deps.db, workspaceId),
       workspaceCodexSubscriptionActive(deps.db, deps.settings, workspaceId),
       workspaceXaiSubscriptionActive(deps.db, deps.settings, workspaceId, grant.subjectId),
-      workspaceVercelAiGatewayConnectionActive(deps.db, workspaceId)
+      workspaceVercelAiGatewayConnectionActive(deps.db, workspaceId),
+      listWorkspaceGatewayCustomModels(deps.db, {
+        accountId: grant.accountId,
+        workspaceId
+      }),
+      workspaceOpenRouterConnectionActive(deps.db, workspaceId),
+      listWorkspaceOpenRouterCustomModels(deps.db, {
+        accountId: grant.accountId,
+        workspaceId
+      })
     ]);
     c.header("cache-control", "private, no-store");
     return c.json(
       WorkspaceModelCatalogResponse2.parse(
         buildWorkspaceModelCatalog({
-          settings: deps.settings,
+          settings: resolvedCatalog.settings,
           policy,
           codexSubscriptionActive,
           xaiSubscriptionActive,
-          workspaceGatewayConnectionActive
+          workspaceGatewayConnectionActive,
+          workspaceGatewayCustomModels,
+          workspaceOpenRouterConnectionActive: openRouterConnectionActive,
+          workspaceOpenRouterCustomModels
         })
       )
     );
   });
+  app.get("/v1/workspaces/:workspaceId/gateway-custom-models", async (c) => {
+    const workspaceId = c.req.param("workspaceId");
+    const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:read");
+    const models = await listWorkspaceGatewayCustomModels(deps.db, {
+      accountId: grant.accountId,
+      workspaceId
+    });
+    c.header("cache-control", "private, no-store");
+    return c.json(
+      WorkspaceGatewayCustomModelsResponse.parse({
+        models: models.map(projectWorkspaceGatewayCustomModel)
+      })
+    );
+  });
+  app.post("/v1/workspaces/:workspaceId/gateway-custom-models", async (c) => {
+    const workspaceId = c.req.param("workspaceId");
+    const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:admin");
+    const parsed = CreateWorkspaceGatewayCustomModelRequest.safeParse(
+      await c.req.json().catch(() => null)
+    );
+    if (!parsed.success) {
+      throw new HTTPException55(422, { message: "invalid Gateway custom model" });
+    }
+    const requestHash = workspaceCustomModelRequestHash({
+      action: "create",
+      upstreamModelId: parsed.data.upstreamModelId,
+      label: parsed.data.label ?? null
+    });
+    const replay = await replayWorkspaceGatewayCustomModelCreate(deps.db, {
+      accountId: grant.accountId,
+      workspaceId,
+      operationId: parsed.data.operationId,
+      requestHash
+    });
+    if (replay.outcome === "conflict") {
+      throw new HTTPException55(409, {
+        message: "Gateway custom model operation conflicts with current state"
+      });
+    }
+    if (replay.outcome === "success") {
+      return c.json(projectWorkspaceGatewayCustomModel(replay.model), 201);
+    }
+    const catalog = await deps.resolveCatalogSettings();
+    if (configuredGatewayUpstreamModelIds(catalog.settings).includes(parsed.data.upstreamModelId)) {
+      throw new HTTPException55(422, {
+        message: "Gateway model is already included in the deployment catalog"
+      });
+    }
+    const customProductId = `${WORKSPACE_GATEWAY_MODEL_ID_PREFIX}${parsed.data.upstreamModelId}`;
+    const deploymentProductIds = /* @__PURE__ */ new Set([
+      ...configuredModelInputIdentities(catalog.settings),
+      ...configuredGatewayWorkspaceProductModelIds(catalog.settings)
+    ]);
+    if (deploymentProductIds.has(customProductId)) {
+      throw new HTTPException55(422, {
+        message: "Gateway model product id conflicts with the deployment catalog"
+      });
+    }
+    try {
+      const model = await createWorkspaceGatewayCustomModel(deps.db, {
+        accountId: grant.accountId,
+        workspaceId,
+        upstreamModelId: parsed.data.upstreamModelId,
+        label: parsed.data.label ?? null,
+        operationId: parsed.data.operationId,
+        requestHash,
+        createdBySubjectId: grant.subjectId
+      });
+      if (!model || model.retiredAt) {
+        throw new HTTPException55(409, {
+          message: "Gateway custom model operation conflicts with current state"
+        });
+      }
+      return c.json(projectWorkspaceGatewayCustomModel(model), 201);
+    } catch (error) {
+      if (error instanceof WorkspaceGatewayCustomModelLimitError || error instanceof WorkspaceGatewayCustomModelHistoryLimitError) {
+        throw new HTTPException55(422, { message: error.message });
+      }
+      if (nestedPostgresSqlState4(error) === "23505") {
+        throw new HTTPException55(422, {
+          message: "Gateway custom model already exists"
+        });
+      }
+      throw error;
+    }
+  });
+  app.delete("/v1/workspaces/:workspaceId/gateway-custom-models/:customModelId", async (c) => {
+    const workspaceId = c.req.param("workspaceId");
+    const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:admin");
+    const customModelId = c.req.param("customModelId");
+    if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu.test(
+      customModelId
+    )) {
+      throw new HTTPException55(422, {
+        message: "invalid Gateway custom model id"
+      });
+    }
+    const parsed = DeleteWorkspaceGatewayCustomModelRequest.safeParse(
+      await c.req.json().catch(() => null)
+    );
+    if (!parsed.success) {
+      throw new HTTPException55(422, {
+        message: "invalid Gateway custom model deletion"
+      });
+    }
+    const removed = await deleteWorkspaceGatewayCustomModel(deps.db, {
+      accountId: grant.accountId,
+      workspaceId,
+      customModelId,
+      expectedVersion: parsed.data.expectedVersion,
+      operationId: parsed.data.operationId,
+      requestHash: workspaceCustomModelRequestHash({
+        action: "delete",
+        customModelId,
+        expectedVersion: parsed.data.expectedVersion
+      })
+    });
+    if (removed.outcome === "not_found") {
+      throw new HTTPException55(404, {
+        message: "Gateway custom model not found"
+      });
+    }
+    if (removed.outcome === "conflict") {
+      throw new HTTPException55(409, {
+        message: "Gateway custom model changed; reload and retry"
+      });
+    }
+    return c.body(null, 204);
+  });
+  app.get("/v1/workspaces/:workspaceId/openrouter-custom-models", async (c) => {
+    const workspaceId = c.req.param("workspaceId");
+    const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:read");
+    const models = await listWorkspaceOpenRouterCustomModels(deps.db, {
+      accountId: grant.accountId,
+      workspaceId
+    });
+    c.header("cache-control", "private, no-store");
+    return c.json(
+      WorkspaceOpenRouterCustomModelsResponse.parse({
+        models: models.map(projectWorkspaceOpenRouterCustomModel)
+      })
+    );
+  });
+  app.post("/v1/workspaces/:workspaceId/openrouter-custom-models", async (c) => {
+    const workspaceId = c.req.param("workspaceId");
+    const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:admin");
+    const parsed = CreateWorkspaceOpenRouterCustomModelRequest.safeParse(
+      await c.req.json().catch(() => null)
+    );
+    if (!parsed.success) {
+      throw new HTTPException55(422, { message: "invalid OpenRouter custom model" });
+    }
+    const requestHash = workspaceCustomModelRequestHash({
+      action: "create",
+      upstreamModelId: parsed.data.upstreamModelId,
+      label: parsed.data.label ?? null
+    });
+    const replay = await replayWorkspaceOpenRouterCustomModelCreate(deps.db, {
+      accountId: grant.accountId,
+      workspaceId,
+      operationId: parsed.data.operationId,
+      requestHash
+    });
+    if (replay.outcome === "conflict") {
+      throw new HTTPException55(409, {
+        message: "OpenRouter custom model operation conflicts with current state"
+      });
+    }
+    if (replay.outcome === "success") {
+      return c.json(projectWorkspaceOpenRouterCustomModel(replay.model), 201);
+    }
+    const catalog = await deps.resolveCatalogSettings();
+    if (configuredOpenRouterUpstreamModelIds(catalog.settings).includes(parsed.data.upstreamModelId)) {
+      throw new HTTPException55(422, {
+        message: "OpenRouter model is already included in the deployment catalog"
+      });
+    }
+    const customProductId = `${WORKSPACE_OPENROUTER_MODEL_ID_PREFIX}${parsed.data.upstreamModelId}`;
+    const deploymentProductIds = /* @__PURE__ */ new Set([
+      ...configuredModelInputIdentities(catalog.settings),
+      ...configuredOpenRouterWorkspaceProductModelIds(catalog.settings)
+    ]);
+    if (deploymentProductIds.has(customProductId)) {
+      throw new HTTPException55(422, {
+        message: "OpenRouter model product id conflicts with the deployment catalog"
+      });
+    }
+    try {
+      const model = await createWorkspaceOpenRouterCustomModel(deps.db, {
+        accountId: grant.accountId,
+        workspaceId,
+        upstreamModelId: parsed.data.upstreamModelId,
+        label: parsed.data.label ?? null,
+        operationId: parsed.data.operationId,
+        requestHash,
+        createdBySubjectId: grant.subjectId
+      });
+      if (!model || model.retiredAt) {
+        throw new HTTPException55(409, {
+          message: "OpenRouter custom model operation conflicts with current state"
+        });
+      }
+      return c.json(projectWorkspaceOpenRouterCustomModel(model), 201);
+    } catch (error) {
+      if (error instanceof WorkspaceOpenRouterCustomModelLimitError || error instanceof WorkspaceOpenRouterCustomModelHistoryLimitError) {
+        throw new HTTPException55(422, { message: error.message });
+      }
+      if (nestedPostgresSqlState4(error) === "23505") {
+        throw new HTTPException55(422, {
+          message: "OpenRouter custom model already exists"
+        });
+      }
+      throw error;
+    }
+  });
+  app.delete("/v1/workspaces/:workspaceId/openrouter-custom-models/:customModelId", async (c) => {
+    const workspaceId = c.req.param("workspaceId");
+    const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:admin");
+    const customModelId = c.req.param("customModelId");
+    if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/iu.test(
+      customModelId
+    )) {
+      throw new HTTPException55(422, {
+        message: "invalid OpenRouter custom model id"
+      });
+    }
+    const parsed = DeleteWorkspaceOpenRouterCustomModelRequest.safeParse(
+      await c.req.json().catch(() => null)
+    );
+    if (!parsed.success) {
+      throw new HTTPException55(422, {
+        message: "invalid OpenRouter custom model deletion"
+      });
+    }
+    const removed = await deleteWorkspaceOpenRouterCustomModel(deps.db, {
+      accountId: grant.accountId,
+      workspaceId,
+      customModelId,
+      expectedVersion: parsed.data.expectedVersion,
+      operationId: parsed.data.operationId,
+      requestHash: workspaceCustomModelRequestHash({
+        action: "delete",
+        customModelId,
+        expectedVersion: parsed.data.expectedVersion
+      })
+    });
+    if (removed.outcome === "not_found") {
+      throw new HTTPException55(404, {
+        message: "OpenRouter custom model not found"
+      });
+    }
+    if (removed.outcome === "conflict") {
+      throw new HTTPException55(409, {
+        message: "OpenRouter custom model changed; reload and retry"
+      });
+    }
+    return c.body(null, 204);
+  });
   app.get("/v1/workspaces/:workspaceId/realtime-model-catalog", async (c) => {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:read");
@@ -54100,11 +54640,15 @@ function registerWorkspaceRoutes(app, deps) {
     const workspaceId = c.req.param("workspaceId");
     const grant = await requireAccessGrant32(c, deps, workspaceId, "workspace:admin");
     const payload = UpdateWorkspaceModelPolicyRequest.parse(await c.req.json());
+    const catalog = await resolveWorkspaceCatalogSettings6(deps.db, deps.settings, {
+      accountId: grant.accountId,
+      workspaceId
+    });
     const policy = await upsertWorkspaceModelPolicy(deps.db, {
       accountId: grant.accountId,
       workspaceId,
       allowedProviders: payload.allowedProviders ?? null,
-      allowedModels: canonicalWorkspacePolicyModelIds(deps.settings, payload.allowedModels)
+      allowedModels: canonicalWorkspacePolicyModelIds(catalog.settings, payload.allowedModels)
     });
     return c.json(policy);
   });
@@ -55288,7 +55832,7 @@ function registerCompanyProfileRoutes(app, deps) {
 }
 
 // src/routes/company-brain.ts
-import { createHash as createHash17 } from "crypto";
+import { createHash as createHash18 } from "crypto";
 import {
   COMPANY_BRAIN_INSPECTOR_CURSOR_MAX_CHARS,
   COMPANY_BRAIN_INSPECTOR_DEFAULT_LIMIT,
@@ -55565,7 +56109,7 @@ function serializeCompanyBrainOkf(value) {
 }
 
 // src/workspace-state-projection.ts
-import { createHash as createHash16 } from "crypto";
+import { createHash as createHash17 } from "crypto";
 import {
   KnowledgeMemoryKind,
   KnowledgeMemoryStatus,
@@ -55579,7 +56123,7 @@ import {
   WorkspaceStateResponse
 } from "@opengeni/contracts";
 function hashIdentities(values) {
-  return createHash16("sha256").update(values.join("\n"), "utf8").digest("hex");
+  return createHash17("sha256").update(values.join("\n"), "utf8").digest("hex");
 }
 function policyTargetKey(value) {
   return `${value.kind}:${value.scope}:${value.roleKey ?? ""}`;
@@ -55922,7 +56466,7 @@ var inspectorQuery = z18.object({
   message: "attemptId cannot be combined with cursor"
 });
 function receiptCursorScope(workspaceId, subjectId) {
-  return createHash17("sha256").update("opengeni:company-brain-context-receipts:v1\0").update(workspaceId).update("\0").update(subjectId).digest("hex");
+  return createHash18("sha256").update("opengeni:company-brain-context-receipts:v1\0").update(workspaceId).update("\0").update(subjectId).digest("hex");
 }
 function encodeReceiptCursor(workspaceId, subjectId, cursor) {
   return Buffer.from(
@@ -56294,7 +56838,7 @@ import { getDocumentInventory as getDocumentInventory2 } from "@opengeni/documen
 import { HTTPException as HTTPException61 } from "hono/http-exception";
 
 // src/workspace-state-export.ts
-import { createHash as createHash18 } from "crypto";
+import { createHash as createHash19 } from "crypto";
 import {
   WORKSPACE_STATE_EXPORT_SCHEMA_VERSION,
   WorkspaceStateExportResponse
@@ -56325,7 +56869,7 @@ function createWorkspaceStateExport(state) {
     kind: "opengeni.workspace_state.sanitized_export",
     schemaVersion: WORKSPACE_STATE_EXPORT_SCHEMA_VERSION,
     generatedAt: state.generatedAt,
-    stateSha256: createHash18("sha256").update(canonicalState, "utf8").digest("hex"),
+    stateSha256: createHash19("sha256").update(canonicalState, "utf8").digest("hex"),
     omissions: WORKSPACE_STATE_EXPORT_OMISSIONS,
     state
   });
@@ -56425,7 +56969,7 @@ function registerWorkspaceStateRoutes(app, deps) {
 }
 
 // src/routes/workspace-artifacts.ts
-import { createHash as createHash19 } from "crypto";
+import { createHash as createHash20 } from "crypto";
 import {
   CreateWorkspaceArtifactRequest,
   PublishWorkspaceArtifactVersionRequest,
@@ -56495,7 +57039,7 @@ function errorResponse(context, error) {
 }
 function contentMetadata(workspaceId, html) {
   const bytes = encoder3.encode(html);
-  const sha2564 = createHash19("sha256").update(bytes).digest("hex");
+  const sha2564 = createHash20("sha256").update(bytes).digest("hex");
   return {
     bytes,
     contentSha256: sha2564,
@@ -56521,7 +57065,7 @@ function prepareHtml(deps, workspaceId, html) {
 }
 function provenance(subjectId, idempotencyKey) {
   return {
-    operationKey: `subject:${createHash19("sha256").update(`${subjectId}:${idempotencyKey}`).digest("hex")}`,
+    operationKey: `subject:${createHash20("sha256").update(`${subjectId}:${idempotencyKey}`).digest("hex")}`,
     actorSubjectId: subjectId,
     sourceSessionId: null,
     sourceTurnId: null,
@@ -56614,7 +57158,7 @@ function registerWorkspaceArtifactRoutes(app, deps) {
         async () => deps.objectStorage.getObjectBytes(ref.contentKey)
       );
       if (!object10) throw new HTTPException62(503, { message: "Artifact content is unavailable" });
-      const actualHash = createHash19("sha256").update(object10.bytes).digest("hex");
+      const actualHash = createHash20("sha256").update(object10.bytes).digest("hex");
       if (actualHash !== ref.version.contentSha256) {
         throw new HTTPException62(503, { message: "Artifact content failed integrity verification" });
       }
@@ -57181,7 +57725,7 @@ import { requireAccessGrant as requireAccessGrant43, TranscriptionServiceError a
 import { getWorkspace as getWorkspace5 } from "@opengeni/db";
 
 // src/routes/transcription-recordings.ts
-import { createHash as createHash20 } from "crypto";
+import { createHash as createHash21 } from "crypto";
 import {
   CreateTranscriptionRecordingRequest,
   FinalizeTranscriptionRecordingRequest,
@@ -58004,7 +58548,7 @@ function valueAsUuid(value) {
   if (/^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(value)) {
     return value;
   }
-  const hex2 = createHash20("sha256").update(value).digest("hex").slice(0, 32);
+  const hex2 = createHash21("sha256").update(value).digest("hex").slice(0, 32);
   return `${hex2.slice(0, 8)}-${hex2.slice(8, 12)}-4${hex2.slice(13, 16)}-a${hex2.slice(17, 20)}-${hex2.slice(20, 32)}`;
 }
 function nonnegativeInteger(value) {
@@ -58068,7 +58612,7 @@ async function readBoundedBody(request, maxBytes) {
   return body4;
 }
 function sha256Hex3(bytes) {
-  return createHash20("sha256").update(bytes).digest("hex");
+  return createHash21("sha256").update(bytes).digest("hex");
 }
 
 // src/routes/transcriptions.ts
@@ -61541,7 +62085,7 @@ async function exactAvailable(providers, providerId, context) {
 }
 
 // src/integrations/slack-interactions.ts
-import { createHash as createHash22, createHmac as createHmac8, timingSafeEqual as timingSafeEqual3 } from "crypto";
+import { createHash as createHash23, createHmac as createHmac9, timingSafeEqual as timingSafeEqual3 } from "crypto";
 import {
   approvalIdentifier,
   ApproveSlackUserLinkAccessRequest,
@@ -61647,7 +62191,8 @@ import {
   hasPermission as hasPermission24,
   requireAccessContext as requireAccessContext4,
   requireAccessGrant as requireAccessGrant45,
-  requireSessionAuthorizationListScope as requireSessionAuthorizationListScope3
+  requireSessionAuthorizationListScope as requireSessionAuthorizationListScope3,
+  resolveWorkspaceCatalogSettings as resolveWorkspaceCatalogSettings7
 } from "@opengeni/core";
 import { publishDurableSessionEvents as publishDurableSessionEvents4 } from "@opengeni/events";
 import { HTTPException as HTTPException74 } from "hono/http-exception";
@@ -62018,7 +62563,7 @@ function record5(value) {
 }
 
 // src/slack-reaction-files.ts
-import { createHash as createHash21 } from "crypto";
+import { createHash as createHash22 } from "crypto";
 import { completeFileUpload as completeFileUpload5, prepareGeneratedWorkspaceFile as prepareGeneratedWorkspaceFile2 } from "@opengeni/db";
 import { retryWhileMissing as retryWhileMissing7 } from "@opengeni/storage";
 var IMPORT_IDENTITY_VERSION = "slack-reaction-image-v1";
@@ -62035,7 +62580,7 @@ async function importSlackReactionImage(dependencies, source, image, ordinal) {
   if (image.bytes.byteLength < 1 || image.bytes.byteLength > 4 * 1024 * 1024) {
     throw new Error("Slack reaction image size is invalid");
   }
-  const sha2564 = createHash21("sha256").update(image.bytes).digest("hex");
+  const sha2564 = createHash22("sha256").update(image.bytes).digest("hex");
   const identity = slackReactionImageIdentity(source, image.fileId);
   const fileId = deterministicUuid(`${identity}:file`);
   const uploadId = deterministicUuid(`${identity}:upload`);
@@ -62129,7 +62674,7 @@ function assertStoredSlackImage(head, image, sha2564) {
   }
 }
 function deterministicUuid(seed) {
-  const bytes = createHash21("sha256").update(seed, "utf8").digest().subarray(0, 16);
+  const bytes = createHash22("sha256").update(seed, "utf8").digest().subarray(0, 16);
   bytes[6] = (bytes[6] ?? 0) & 15 | 80;
   bytes[8] = (bytes[8] ?? 0) & 63 | 128;
   const hex2 = bytes.toString("hex");
@@ -62229,7 +62774,7 @@ function verifySlackRequestSignature(input, signingSecret, nowMs = Date.now()) {
   if (!Number.isSafeInteger(timestamp)) return false;
   const nowSeconds = Math.floor(nowMs / 1e3);
   if (Math.abs(nowSeconds - timestamp) > SLACK_SIGNATURE_REPLAY_WINDOW_SECONDS) return false;
-  const expected = `v0=${createHmac8("sha256", signingSecret).update(`v0:${input.timestamp}:${input.rawBody}`).digest("hex")}`;
+  const expected = `v0=${createHmac9("sha256", signingSecret).update(`v0:${input.timestamp}:${input.rawBody}`).digest("hex")}`;
   const actualBytes = Buffer.from(input.signature, "utf8");
   const expectedBytes = Buffer.from(expected, "utf8");
   return actualBytes.length === expectedBytes.length && timingSafeEqual3(actualBytes, expectedBytes);
@@ -62288,7 +62833,7 @@ function slackReactionInboxEntry(payload, bot, settings) {
   if (!settings.enabled || !event || event.type !== "reaction_added" || item?.type !== "message" || !teamId || !eventId || !userId || userId === bot.botUserId || !reaction || reaction !== settings.emoji || !channelId || !workspaceSlackReactionChannelAllowed(settings, channelId) || !timestamp) {
     return null;
   }
-  const stableReactionIdentity = createHash22("sha256").update([teamId, userId, channelId, timestamp, reaction].join("\n")).digest("hex");
+  const stableReactionIdentity = createHash23("sha256").update([teamId, userId, channelId, timestamp, reaction].join("\n")).digest("hex");
   return {
     providerEventId: eventId,
     providerMessageId: `reaction:${stableReactionIdentity}`,
@@ -62478,7 +63023,7 @@ function registerSlackInteractionRoutes(app, deps) {
       const prepared = await prepareSlackUserLinkAccessRequest(deps.db, {
         accountId: installation.accountId,
         workspaceId,
-        tokenDigest: createHash22("sha256").update(payload.linkToken).digest("hex"),
+        tokenDigest: createHash23("sha256").update(payload.linkToken).digest("hex"),
         connectionId: link.connectionId,
         slackTeamId: link.slackTeamId,
         slackUserId: link.slackUserId,
@@ -62685,7 +63230,7 @@ function registerSlackInteractionRoutes(app, deps) {
       const prepared = await prepareSlackUserLinkAccessRequest(deps.db, {
         accountId: grant.accountId,
         workspaceId,
-        tokenDigest: createHash22("sha256").update(linkToken).digest("hex"),
+        tokenDigest: createHash23("sha256").update(linkToken).digest("hex"),
         connectionId: link.connectionId,
         slackTeamId: link.slackTeamId,
         slackUserId: link.slackUserId,
@@ -62845,6 +63390,17 @@ function registerSlackInteractionRoutes(app, deps) {
     );
   });
 }
+async function withCatalogSettings(deps, grant) {
+  const catalogSourceSettings = deps.catalogSourceSettings ?? deps.settings;
+  return {
+    ...deps,
+    catalogSourceSettings,
+    settings: (await resolveWorkspaceCatalogSettings7(deps.db, catalogSourceSettings, {
+      accountId: grant.accountId,
+      workspaceId: grant.workspaceId
+    })).settings
+  };
+}
 async function publishSlackAppHome(deps, installation, refresh, renewLease) {
   const link = await getSlackBotUserLink(
     deps.db,
@@ -63642,17 +64198,22 @@ async function processSlackInboxEntry(deps, entry2) {
       preparedAttachments,
       preparedModelContext
     );
-    session = await createSessionForRequest2(deps, grant, interaction.workspaceId, {
-      requestedSessionId: interaction.sessionReservationId,
-      initialMessage: prepared.entry.text,
-      ...prepared.modelContext ? { modelContext: prepared.modelContext } : {},
-      instructions: SLACK_SESSION_INSTRUCTIONS,
-      firstPartyMcpTools: slackTaskFirstPartyMcpTools(deps.settings),
-      resources: preparedAttachments.resources,
-      ...preferredModel ? { model: preferredModel } : {},
-      idempotencyKey: `slack:${entry2.connectionId}:${entry2.providerEventId}`,
-      clientEventId: `slack:${entry2.providerEventId}`
-    });
+    session = await createSessionForRequest2(
+      await withCatalogSettings(deps, grant),
+      grant,
+      interaction.workspaceId,
+      {
+        requestedSessionId: interaction.sessionReservationId,
+        initialMessage: prepared.entry.text,
+        ...prepared.modelContext ? { modelContext: prepared.modelContext } : {},
+        instructions: SLACK_SESSION_INSTRUCTIONS,
+        firstPartyMcpTools: slackTaskFirstPartyMcpTools(deps.settings),
+        resources: preparedAttachments.resources,
+        ...preferredModel ? { model: preferredModel } : {},
+        idempotencyKey: `slack:${entry2.connectionId}:${entry2.providerEventId}`,
+        clientEventId: `slack:${entry2.providerEventId}`
+      }
+    );
   } catch (error) {
     if (error instanceof HTTPException74) {
       await client.postMessage({
@@ -64069,21 +64630,26 @@ async function processSlackReactionInboxEntry(deps, entry2) {
   const preparedEntry = slackReactionPreparedEntry(entry2, context, preparedTask);
   let session;
   try {
-    session = await createSessionForRequest2(deps, grant, interaction.workspaceId, {
-      requestedSessionId: interaction.sessionReservationId,
-      initialMessage: preparedEntry.text,
-      instructions: SLACK_SESSION_INSTRUCTIONS,
-      // The exact reacted message and bounded containing thread are already in
-      // the prompt; do not expose general Slack history tools for this trigger.
-      firstPartyMcpTools: resolveFirstPartyMcpToolPolicy(deps.settings).default,
-      resources: preparedTask.resources,
-      ...preferredModel ? { model: preferredModel } : {},
-      // Every reaction entry converging on this route must use the same create
-      // key. This closes the same-owner multi-event race while the owner check
-      // above prevents a different subject from winning creation authority.
-      idempotencyKey: `slack-interaction:${interaction.id}`,
-      clientEventId: `slack:${entry2.providerEventId}`
-    });
+    session = await createSessionForRequest2(
+      await withCatalogSettings(deps, grant),
+      grant,
+      interaction.workspaceId,
+      {
+        requestedSessionId: interaction.sessionReservationId,
+        initialMessage: preparedEntry.text,
+        instructions: SLACK_SESSION_INSTRUCTIONS,
+        // The exact reacted message and bounded containing thread are already in
+        // the prompt; do not expose general Slack history tools for this trigger.
+        firstPartyMcpTools: resolveFirstPartyMcpToolPolicy(deps.settings).default,
+        resources: preparedTask.resources,
+        ...preferredModel ? { model: preferredModel } : {},
+        // Every reaction entry converging on this route must use the same create
+        // key. This closes the same-owner multi-event race while the owner check
+        // above prevents a different subject from winning creation authority.
+        idempotencyKey: `slack-interaction:${interaction.id}`,
+        clientEventId: `slack:${entry2.providerEventId}`
+      }
+    );
     await acceptSlackReactionTask(deps, grant, session.id, preparedEntry, preparedTask.resources);
   } catch (error) {
     if (error instanceof HTTPException74) {
@@ -64368,11 +64934,17 @@ async function acceptSlackReactionTask(deps, grant, sessionId, entry2, resources
     }
     return;
   }
-  await acceptSessionUserMessage2(deps, grant, grant.workspaceId, sessionId, {
-    text: entry2.text,
-    resources,
-    clientEventId
-  });
+  await acceptSessionUserMessage2(
+    await withCatalogSettings(deps, grant),
+    grant,
+    grant.workspaceId,
+    sessionId,
+    {
+      text: entry2.text,
+      resources,
+      clientEventId
+    }
+  );
 }
 async function continueSlackSession(deps, grant, interaction, entry2, resources = [], options = {}) {
   if (!interaction.sessionId || interaction.visibility === "private" && interaction.owningSubjectId !== grant.subjectId) {
@@ -64444,12 +65016,18 @@ async function continueSlackSession(deps, grant, interaction, entry2, resources
   if (!hasPermission24(grant.permissions, "sessions:control")) {
     throw new SlackInteractionPermanentError("sessions_control_denied");
   }
-  await acceptSessionUserMessage2(deps, grant, interaction.workspaceId, interaction.sessionId, {
-    text: entry2.text,
-    ...options.modelContext ? { modelContext: options.modelContext } : {},
-    resources,
-    clientEventId: `slack:${entry2.providerEventId}`
-  });
+  await acceptSessionUserMessage2(
+    await withCatalogSettings(deps, grant),
+    grant,
+    interaction.workspaceId,
+    interaction.sessionId,
+    {
+      text: entry2.text,
+      ...options.modelContext ? { modelContext: options.modelContext } : {},
+      resources,
+      clientEventId: `slack:${entry2.providerEventId}`
+    }
+  );
 }
 var SLACK_ACTION_ID_BY_KIND = {
   approval_approve: "opengeni.approval.approve",
@@ -65533,7 +66111,7 @@ function normalizedBlockActionInteraction(payload) {
   if (!teamId || !userId || !channelId || !messageTs || !actionTs || !actionId || !SLACK_BLOCK_ACTION_IDS.has(actionId) || !handleId || !/^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(handleId) || !Array.isArray(payload.actions) || payload.actions.length !== 1) {
     throw new HTTPException74(400, { message: "invalid Slack block action" });
   }
-  const identity = createHash22("sha256").update([teamId, userId, channelId, messageTs, actionTs, actionId, handleId].join("\n")).digest("hex");
+  const identity = createHash23("sha256").update([teamId, userId, channelId, messageTs, actionTs, actionId, handleId].join("\n")).digest("hex");
   return {
     providerEventId: `block:${identity}`,
     providerMessageId: `block:${identity}`,
@@ -65760,14 +66338,14 @@ function createSlackUserLinkToken(signingSecret, entry2, nowMs = Date.now()) {
     }),
     "utf8"
   ).toString("base64url");
-  const signature = createHmac8("sha256", signingSecret).update(payload).digest("base64url");
+  const signature = createHmac9("sha256", signingSecret).update(payload).digest("base64url");
   return `${payload}.${signature}`;
 }
 function verifySlackUserLinkToken(signingSecret, token, nowMs = Date.now()) {
   const [payload, signature, extra] = token.split(".");
   if (!payload || !signature || extra || payload.length > 1500 || signature.length > 128)
     return null;
-  const expected = createHmac8("sha256", signingSecret).update(payload).digest("base64url");
+  const expected = createHmac9("sha256", signingSecret).update(payload).digest("base64url");
   const actualBytes = Buffer.from(signature, "utf8");
   const expectedBytes = Buffer.from(expected, "utf8");
   if (actualBytes.length !== expectedBytes.length || !timingSafeEqual3(actualBytes, expectedBytes)) {
@@ -65798,7 +66376,7 @@ function usesPrivateBotDm(interaction, entry2) {
   return isDirectMessageShortcut(entry2) || interaction.visibility === "private" && entry2.triggerKind !== "dm";
 }
 function deterministicUuid2(value) {
-  const bytes = createHash22("sha256").update(value).digest().subarray(0, 16);
+  const bytes = createHash23("sha256").update(value).digest().subarray(0, 16);
   bytes[6] = bytes[6] & 15 | 80;
   bytes[8] = bytes[8] & 63 | 128;
   const hex2 = bytes.toString("hex");
@@ -65933,6 +66511,18 @@ var API_PUBLIC_ERROR_MESSAGE_MAX_BYTES = 512;
 function createApp(deps) {
   return createAppComposition(deps).app;
 }
+async function resolveWorkspaceMcpRouteDeps(routeDeps, grant) {
+  const catalogSourceSettings = routeDeps.catalogSourceSettings ?? routeDeps.settings;
+  const resolvedCatalog = await resolveWorkspaceCatalogSettings8(
+    routeDeps.db,
+    catalogSourceSettings,
+    {
+      accountId: grant.accountId,
+      workspaceId: grant.workspaceId
+    }
+  );
+  return { ...routeDeps, catalogSourceSettings, settings: resolvedCatalog.settings };
+}
 function createAppComposition(deps) {
   configureWorkspaceControlRequestLockTimeoutMs(deps.settings.workspaceControlLockTimeoutMs);
   configureChildLifecycleNotices({ enabled: deps.settings.childLifecycleNoticesEnabled });
@@ -66019,6 +66609,7 @@ function createAppComposition(deps) {
   }) : deps.transcriptionSegmenter;
   const routeDeps = {
     ...deps,
+    resolveCatalogSettings: () => resolveCatalogSettings(deps.db, deps.settings),
     observability,
     githubStateSecret: deps.githubStateSecret ?? deps.settings.githubAppManifestStateSecret ?? crypto.randomUUID(),
     managedAuth,
@@ -66374,8 +66965,10 @@ function createAppComposition(deps) {
   );
   app.get("/v1/config/client", async (c) => {
     c.header("cache-control", "no-store");
-    const codexCatalogSettings = deps.settings.codexSubscriptionEnabled ? withCodexCatalogProvider2(deps.settings) : deps.settings;
-    const catalogSettings = deps.settings.supergrokSubscriptionEnabled ? withXaiSubscriptionCatalogProvider3(codexCatalogSettings) : codexCatalogSettings;
+    const resolvedCatalog = await resolveCatalogSettings(deps.db, deps.settings);
+    const baseCatalogSettings = resolvedCatalog.settings;
+    const codexCatalogSettings = baseCatalogSettings.codexSubscriptionEnabled ? withCodexCatalogProvider(baseCatalogSettings) : baseCatalogSettings;
+    const catalogSettings = baseCatalogSettings.supergrokSubscriptionEnabled ? withXaiSubscriptionCatalogProvider2(codexCatalogSettings) : codexCatalogSettings;
     return c.json(
       ClientConfig.parse({
         deploymentRevision: deps.settings.deploymentRevision,
@@ -66387,7 +66980,7 @@ function createAppComposition(deps) {
         // union of the built-in allow-list and every registry provider's models, in
         // selection order (default model first); project each to the client-safe
         // provider-blind ClientModel shape (execution topology remains server-side).
-        models: configuredModels3(catalogSettings).map(projectClientModel),
+        models: configuredModels2(catalogSettings).map(projectClientModel),
         defaultReasoningEffort: deps.settings.openaiReasoningEffort,
         allowedReasoningEfforts: configuredAllowedReasoningEfforts(deps.settings),
         defaultSandboxBackend: deps.settings.sandboxBackend,
@@ -66484,7 +67077,8 @@ function createAppComposition(deps) {
       const transport = new WebStandardStreamableHTTPServerTransport3({
         enableJsonResponse: true
       });
-      const mcp = buildOpenGeniMcpServer(routeDeps, grant, {
+      const mcpDeps = await resolveWorkspaceMcpRouteDeps(routeDeps, grant);
+      const mcp = buildOpenGeniMcpServer(mcpDeps, grant, {
         requestOrigin: new URL(c.req.url).origin,
         workspaceMemoryEnabled,
         workspaceMemoryPromptMode
@@ -66882,9 +67476,14 @@ function boundedCorrelationId(value) {
 function readinessChecks(deps) {
   const configuredNatsCheck = deps.readinessChecks?.nats;
   return {
-    db: deps.readinessChecks?.db ?? (async () => {
-      await deps.db.execute(dbSql`select 1`);
-    }),
+    db: async () => {
+      if (deps.readinessChecks?.db) {
+        await deps.readinessChecks.db();
+      } else {
+        await deps.db.execute(dbSql`select 1`);
+      }
+      await resolveCatalogSettings(deps.db, deps.settings);
+    },
     nats: async () => {
       requireSessionEventDurableFanoutCapability2(deps.bus);
       if (configuredNatsCheck) {
@@ -67762,6 +68361,7 @@ export {
   API_MAX_REQUEST_BODY_BYTES,
   apiRequestBodyLimitBytes,
   createApp,
+  resolveWorkspaceMcpRouteDeps,
   createAppComposition,
   appendVary,
   workspaceActorContextExempt,
@@ -67780,4 +68380,4 @@ export {
   withDefaultEnabledCapabilityMcpTools,
   workflowIdForSession3 as workflowIdForSession
 };
-//# sourceMappingURL=chunk-XTLI3CBH.js.map
+//# sourceMappingURL=chunk-UOI7KAP3.js.map