@opengeni/config 0.22.5 → 1.0.0-canary.0

package/dist/index.js

@@ -45,6 +45,10 @@ import { createHash } from "crypto";
 import { z } from "zod";
 var envName = /^[A-Za-z_][A-Za-z0-9_]*$/;
 var registryId = /^[A-Za-z0-9_-]+$/;
+var DEFAULT_OPENROUTER_MODEL_ID = "openrouter/nvidia/nemotron-3-super-120b-a12b:free";
+var DEFAULT_MODEL_COST_POLICY_JSON = JSON.stringify({
+  [DEFAULT_OPENROUTER_MODEL_ID]: "free"
+});
 var SANDBOX_ARCHIVE_CAPTURE_MAX_TIMEOUT_MS = 60 * 6e4;
 var SANDBOX_ARCHIVE_CAPTURE_SETTLEMENT_GRACE_MS = 1e4;
 var SANDBOX_SNAPSHOT_MAX_TIMEOUT_MS = SANDBOX_ARCHIVE_CAPTURE_MAX_TIMEOUT_MS - SANDBOX_ARCHIVE_CAPTURE_SETTLEMENT_GRACE_MS;
@@ -177,8 +181,16 @@ var McpServerConnectionRefSchema = z.object({
       seen.add(key);
     }
   }).optional(),
+  authoritySource: z.literal("host").optional(),
   subjectScope: z.enum(["workspace", "subject"]).optional()
 }).strict().superRefine((reference, context) => {
+  if (reference.authoritySource === "host" && !reference.connectionId) {
+    context.addIssue({
+      code: "custom",
+      message: "host authority requires connectionId",
+      path: ["connectionId"]
+    });
+  }
   if (!reference.selectedResources) return;
   if (!reference.connectionId) {
     context.addIssue({
@@ -195,6 +207,7 @@ var McpServerConnectionRefSchema = z.object({
     });
   }
 });
+var DEFAULT_MODAL_IMAGE_REF = "opengenipublicneuacr.azurecr.io/opengeni-desktop@sha256:c3bd17b8841de1bff9bb2777aad422cf8c75de78e2c30f9ac81d0cd6810a1b78";
 var SettingsSchema = z.object({
   serviceName: z.string().default("opengeni"),
   environment: z.string().default("local"),
@@ -251,6 +264,12 @@ var SettingsSchema = z.object({
   analyticsPosthogHost: z.string().url().max(2048).optional(),
   analyticsGa4MeasurementId: z.string().max(32).regex(/^G-[A-Z0-9]+$/u).optional(),
   publicBaseUrl: z.string().url().optional(),
+  // Standards-based OAuth authorization server for external workspace MCP
+  // clients. Opt-in because it creates a new public authentication surface.
+  mcpOauthEnabled: EnvBoolean.default(false),
+  // Forwarded client addresses are ignored by default. Operators may trust an
+  // exact number of proxy hops only when direct access to the API is blocked.
+  mcpOauthTrustedProxyHops: z.coerce.number().int().min(0).max(16).default(0),
   // Browser origin when the web app and API use separate origins in local
   // development. Production normally leaves this unset and uses publicBaseUrl.
   webBaseUrl: z.string().url().optional(),
@@ -384,6 +403,13 @@ var SettingsSchema = z.object({
   // into @opengeni/db once at boot.
   // Env: OPENGENI_CHILD_LIFECYCLE_NOTICES_ENABLED.
   childLifecycleNoticesEnabled: EnvBoolean.default(false),
+  // Explicit host-owned MCP connection authority is a rolling protocol
+  // activation. Keep it off while any API, worker, or browser bundle predates
+  // the authority discriminator; enable it only after the whole fleet runs an
+  // image that understands host refs. Legacy markerless non-UUID refs remain a
+  // separate compatibility lane for already-persisted embedding integrations.
+  // Env: OPENGENI_HOST_MCP_AUTHORITY_SOURCE_ADMISSION_ENABLED.
+  hostMcpAuthoritySourceAdmissionEnabled: EnvBoolean.default(false),
   // Per-channel and per-DM Slack workspace routing. Default ON. A channel does
   // not count a personal workspace as a candidate, so an organization with one
   // shared workspace resolves it as the sole candidate and never asks; the
@@ -511,6 +537,24 @@ var SettingsSchema = z.object({
   // keep subscription model routing while disabling Codex voice input.
   voiceInputCodexExperimentalEnabled: EnvBoolean.default(false),
   modelPricingJson: z.string().default("{}"),
+  // Supported-model membership source. Database mode is resolved by the async
+  // core overlay; getSettings remains synchronous and env-only.
+  modelCatalogSource: z.enum(["code", "database"]).default("code"),
+  // Deployment-owned workspace-facing price policy. This is deliberately
+  // separate from catalog membership and upstream credential ownership.
+  // Shape: { "product/model-id": "free" | "credits" }.
+  modelCostPolicyJson: z.string().default("{}"),
+  // Optional per-product agent guidance. Database mode replaces this with the
+  // singleton document's validated modelNotes map.
+  modelNotesJson: z.string().default("{}"),
+  // Managed OpenRouter credential. The curated model table is injected in
+  // code/catalog-document resolution and never read from host provider JSON.
+  openrouterApiKey: z.string().optional(),
+  // Internal, secret-free catalog overlays populated only by
+  // applyModelCatalogDocument. They intentionally have no OPENGENI_* env
+  // binding so database mode cannot be bypassed with a second source.
+  resolvedGatewayModelsJson: z.string().optional(),
+  resolvedOpenRouterModelsJson: z.string().optional(),
   // Extra (non-built-in) model providers, declared by the host as a JSON
   // provider registry. Each entry carries its own base URL, API key, wire API
   // ("responses" | "chat") and the models it exposes. The models a client may
@@ -552,11 +596,6 @@ var SettingsSchema = z.object({
   // the Codex rollout so an emergency Codex opt-out cannot disable every model.
   // OPENGENI_LAZY_TOOL_SEARCH_ENABLED
   lazyToolSearchEnabled: EnvBoolean.default(true),
-  // credential allocator atomic, workspace-local credential allocation. Default OFF is a
-  // deliberate rolling-deploy fence: migrate + roll every worker first, then
-  // enable. Turning it off restores the legacy sticky selector without a schema
-  // rollback; the additive lease table/cursor columns become inert.
-  codexCredentialLeasingEnabled: EnvBoolean.default(false),
   // Decision-observability fence. When enabled, the worker emits one
   // bounded, metadata-only adaptive-policy replay record alongside the unchanged
   // sticky-sharded decision. It never changes placement/admission/failover.
@@ -956,6 +995,13 @@ var SettingsSchema = z.object({
   // treated exactly like a failed best-effort snapshot. Knob:
   // OPENGENI_SANDBOX_SNAPSHOT_TIMEOUT_MS. Default 60s.
   sandboxSnapshotTimeoutMs: z.coerce.number().int().positive().max(SANDBOX_SNAPSHOT_MAX_TIMEOUT_MS).default(6e4),
+  // A zero-holder drain may need substantially longer than a best-effort
+  // mid-turn/turn-end snapshot for a very large workspace. Keep that provider
+  // budget independent so increasing drain recovery headroom cannot pin an
+  // ordinary turn finalizer for the same duration. Unset preserves the legacy
+  // single-budget behavior. Knob:
+  // OPENGENI_SANDBOX_DRAIN_SNAPSHOT_TIMEOUT_MS.
+  sandboxDrainSnapshotTimeoutMs: z.coerce.number().int().positive().max(SANDBOX_SNAPSHOT_MAX_TIMEOUT_MS).optional(),
   // Begin a controlled snapshot/quiesce/drain/rematerialize transition this far
   // ahead of a finite provider deadline. Modal's 24h creation clock cannot be
   // extended; the logical sandbox outlives it by moving to one successor box.
@@ -1073,6 +1119,15 @@ var SettingsSchema = z.object({
   // Rolling browser login-slot compatibility. Repository/deployment default is
   // deliberately legacy; changing to broker is an operator-authorized rollout.
   managedAuthSessionSetMode: z.enum(["legacy", "dual", "broker"]).default("legacy"),
+  // Query transport is an explicit second-stage rollout. A pre-compatibility
+  // web image understands only fragment bearers, so API replicas must keep
+  // generating fragment links until the compatible web fleet has converged.
+  organizationUserSetupEmailTokenTransport: z.enum(["fragment", "query"]).default("fragment"),
+  // Query-bearing setup links may appear in controller/edge error logs even
+  // when access logs and request tracing are disabled. This explicit operator
+  // confirmation keeps query transport fail closed until that separate sink is
+  // proven sanitized.
+  organizationUserSetupQueryEdgeSanitizationConfirmed: EnvBoolean.default(false),
   resendApiKey: z.string().optional(),
   emailFrom: z.string().default("OpenGeni <auth@mail.opengeni.ai>"),
   stripeSecretKey: z.string().optional(),
@@ -1227,6 +1282,7 @@ function voiceInputDeploymentConfigured(settings) {
 var ModelPricingSchema = z.object({
   inputMicrosPerMillionTokens: z.number().int().nonnegative(),
   cachedInputMicrosPerMillionTokens: z.number().int().nonnegative().optional(),
+  cacheWriteMicrosPerMillionTokens: z.number().int().nonnegative().optional(),
   outputMicrosPerMillionTokens: z.number().int().nonnegative(),
   marginBps: z.number().int().min(0).max(1e5).optional()
 });
@@ -1362,7 +1418,10 @@ var RegistryProviderKind = z.enum([
   "codex-subscription",
   "xai-subscription",
   "vercel-gateway-managed",
-  "vercel-gateway-workspace"
+  "vercel-gateway-workspace",
+  "vercel-gateway-organization",
+  "openrouter-workspace",
+  "openrouter-organization"
 ]);
 var RegistryModelSchema = z.object({
   id: z.string().min(1),
@@ -1475,6 +1534,297 @@ var RegistryProviderSchema = z.object({
     });
   }
 });
+var OPENGENI_GATEWAY_PROVIDER_ID = "opengeni-gateway";
+var WORKSPACE_GATEWAY_PROVIDER_ID = "workspace-gateway";
+var WORKSPACE_GATEWAY_MODEL_ID_PREFIX = "workspace-gateway/";
+var ORGANIZATION_GATEWAY_PROVIDER_ID = "organization-gateway";
+var ORGANIZATION_GATEWAY_MODEL_ID_PREFIX = "organization-gateway/";
+var OPENROUTER_PROVIDER_ID = "openrouter";
+var OPENROUTER_MODEL_ID_PREFIX = "openrouter/";
+var WORKSPACE_OPENROUTER_PROVIDER_ID = "workspace-openrouter";
+var WORKSPACE_OPENROUTER_MODEL_ID_PREFIX = "workspace-openrouter/";
+var ORGANIZATION_OPENROUTER_PROVIDER_ID = "organization-openrouter";
+var ORGANIZATION_OPENROUTER_MODEL_ID_PREFIX = "organization-openrouter/";
+var OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
+var RESERVED_MODEL_PROVIDER_IDS = /* @__PURE__ */ new Set([
+  "openai",
+  "azure",
+  CODEX_PROVIDER_ID,
+  XAI_SUBSCRIPTION_PROVIDER_ID,
+  OPENGENI_GATEWAY_PROVIDER_ID,
+  WORKSPACE_GATEWAY_PROVIDER_ID,
+  ORGANIZATION_GATEWAY_PROVIDER_ID,
+  OPENROUTER_PROVIDER_ID,
+  WORKSPACE_OPENROUTER_PROVIDER_ID,
+  ORGANIZATION_OPENROUTER_PROVIDER_ID
+]);
+var ModelCostClass = z.enum(["free", "credits"]);
+var ConfiguredModelCostClass = z.enum([
+  "free",
+  "credits",
+  "subscription",
+  "workspace",
+  "organization"
+]);
+var ModelNote = z.string().max(500).refine((value) => !/[\r\n|]/u.test(value), {
+  message: "model notes must not contain newlines or the | field separator"
+});
+function parseModelCostPolicyJson(raw) {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    throw new Error(
+      `OPENGENI_MODEL_COST_POLICY_JSON must be valid JSON: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error }
+    );
+  }
+  return z.record(z.string().min(1), ModelCostClass).parse(parsed);
+}
+function parseModelNotesJson(raw) {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    throw new Error(
+      `OPENGENI_MODEL_NOTES_JSON must be valid JSON: ${error instanceof Error ? error.message : String(error)}`,
+      { cause: error }
+    );
+  }
+  return z.record(z.string().min(1), ModelNote).parse(parsed);
+}
+function configuredModelNotes(settings) {
+  return parseModelNotesJson(settings.modelNotesJson);
+}
+var GatewayCatalogModel = z.object({
+  productId: z.string().min(1),
+  workspaceProductId: z.string().min(1).startsWith(WORKSPACE_GATEWAY_MODEL_ID_PREFIX),
+  upstreamModelId: z.string().min(1),
+  label: z.string().min(1),
+  shortLabel: z.string().min(1).max(64).optional(),
+  providers: z.array(z.string().min(1)).min(1),
+  implicitCaching: z.boolean().default(false),
+  vision: z.boolean().default(false),
+  inputFileMediaTypes: z.array(z.string().min(1)).default([]),
+  contextWindowTokens: z.number().int().positive().default(1e6),
+  effectiveContextWindowTokens: z.number().int().positive().default(9e5),
+  autoCompactTokenLimit: z.number().int().positive().default(85e4),
+  pricing: z.union([ModelPricingSchema, ModelPricingScheduleSchema]).optional(),
+  credentialSource: z.never().optional(),
+  billing: z.never().optional(),
+  apiKey: z.never().optional()
+}).strict();
+var OpenRouterCatalogModel = z.object({
+  upstreamModelId: z.string().min(1).endsWith(":free"),
+  label: z.string().min(1),
+  shortLabel: z.string().min(1).max(64).optional(),
+  aliases: z.array(z.string().min(1)).default([]),
+  capabilities: ModelCapabilitiesV1Schema,
+  contextWindowTokens: z.number().int().positive().optional(),
+  effectiveContextWindowTokens: z.number().int().positive().optional(),
+  autoCompactTokenLimit: z.number().int().positive().optional(),
+  toolOutputTruncationTokens: z.number().int().positive().optional(),
+  credentialSource: z.never().optional(),
+  billing: z.never().optional(),
+  pricing: z.never().optional(),
+  apiKey: z.never().optional()
+}).strict();
+var DeploymentRegistryBaseUrl = z.string().url().superRefine((value, context) => {
+  const url = new URL(value);
+  if (url.username || url.password) {
+    context.addIssue({
+      code: "custom",
+      message: "database catalog provider baseUrl must not contain userinfo"
+    });
+  }
+  if (url.search) {
+    context.addIssue({
+      code: "custom",
+      message: "database catalog provider baseUrl must not contain a query"
+    });
+  }
+  if (url.hash) {
+    context.addIssue({
+      code: "custom",
+      message: "database catalog provider baseUrl must not contain a fragment"
+    });
+  }
+});
+var DeploymentRegistryProviderKind = z.enum(["api-key", "anonymous"]);
+var DeploymentRegistryModelSchema = RegistryModelSchema.safeExtend({
+  pricing: z.never().optional()
+}).strict();
+var DeploymentRegistryProviderSchema = RegistryProviderSchema.safeExtend({
+  kind: DeploymentRegistryProviderKind.default("api-key"),
+  baseUrl: DeploymentRegistryBaseUrl,
+  models: z.array(DeploymentRegistryModelSchema).min(1),
+  apiKey: z.never().optional(),
+  apiKeyEnv: z.never().optional(),
+  defaultHeaders: z.never().optional(),
+  defaultQuery: z.never().optional(),
+  publicDefaultHeaderNames: z.never().optional(),
+  publicDefaultQueryNames: z.never().optional()
+}).strict();
+var DeploymentGatewayCatalogModelSchema = GatewayCatalogModel.safeExtend({
+  pricing: z.never().optional()
+}).strict();
+var ModelCatalogDocument = z.object({
+  schemaVersion: z.literal(1),
+  /** Canonical deployment default. Omission preserves the V1 first-built-in
+   * fallback for existing documents; operators should set this explicitly
+   * when cutting over a registry or connected-subscription default. */
+  defaultModel: z.string().min(1).optional(),
+  builtInModels: z.array(z.string().min(1)).min(1),
+  registryProviders: z.array(DeploymentRegistryProviderSchema).default([]),
+  gatewayModels: z.array(DeploymentGatewayCatalogModelSchema).default([]),
+  openrouterModels: z.array(OpenRouterCatalogModel).default([]),
+  modelNotes: z.record(z.string().min(1), ModelNote).default({}),
+  billing: z.never().optional(),
+  enabled: z.never().optional(),
+  apiKey: z.never().optional(),
+  bands: z.never().optional()
+}).strict().superRefine((document, context) => {
+  const productIds = /* @__PURE__ */ new Set();
+  const providerIds = /* @__PURE__ */ new Set();
+  const gatewayUpstreamIds = /* @__PURE__ */ new Set();
+  const add = (id, path) => {
+    if (/[\u000A\u000D|]/u.test(id)) {
+      context.addIssue({
+        code: "custom",
+        path,
+        message: "catalog product ids must not contain newlines or the | field separator"
+      });
+    }
+    if (productIds.has(id)) {
+      context.addIssue({
+        code: "custom",
+        path,
+        message: `duplicate product id ${id}`
+      });
+    }
+    productIds.add(id);
+  };
+  document.builtInModels.forEach((id, index) => add(id, ["builtInModels", index]));
+  document.registryProviders.forEach((provider, providerIndex) => {
+    if (RESERVED_MODEL_PROVIDER_IDS.has(provider.id)) {
+      context.addIssue({
+        code: "custom",
+        path: ["registryProviders", providerIndex, "id"],
+        message: `provider id ${provider.id} is reserved for a reviewed OpenGeni provider`
+      });
+    }
+    if (providerIds.has(provider.id)) {
+      context.addIssue({
+        code: "custom",
+        path: ["registryProviders", providerIndex, "id"],
+        message: `duplicate provider id ${provider.id}`
+      });
+    }
+    providerIds.add(provider.id);
+    provider.models.forEach(
+      (model, modelIndex) => add(model.id, ["registryProviders", providerIndex, "models", modelIndex, "id"])
+    );
+  });
+  document.gatewayModels.forEach((model, index) => {
+    if (gatewayUpstreamIds.has(model.upstreamModelId)) {
+      context.addIssue({
+        code: "custom",
+        path: ["gatewayModels", index, "upstreamModelId"],
+        message: `duplicate Gateway upstream model id ${model.upstreamModelId}`
+      });
+    }
+    gatewayUpstreamIds.add(model.upstreamModelId);
+    add(model.productId, ["gatewayModels", index, "productId"]);
+    add(model.workspaceProductId, ["gatewayModels", index, "workspaceProductId"]);
+  });
+  document.openrouterModels.forEach(
+    (model, index) => add(`${OPENROUTER_MODEL_ID_PREFIX}${model.upstreamModelId}`, [
+      "openrouterModels",
+      index,
+      "upstreamModelId"
+    ])
+  );
+  if (document.defaultModel && /[\u000A\u000D|]/u.test(document.defaultModel)) {
+    context.addIssue({
+      code: "custom",
+      path: ["defaultModel"],
+      message: "catalog default model must not contain newlines or the | field separator"
+    });
+  }
+  if (document.defaultModel && !productIds.has(document.defaultModel) && !document.defaultModel.startsWith(CODEX_MODEL_ID_PREFIX) && !document.defaultModel.startsWith(XAI_SUBSCRIPTION_MODEL_ID_PREFIX)) {
+    context.addIssue({
+      code: "custom",
+      path: ["defaultModel"],
+      message: "catalog default model must reference deployment catalog membership or a connected-subscription product"
+    });
+  }
+  for (const productId of Object.keys(document.modelNotes)) {
+    if (!productIds.has(productId)) {
+      context.addIssue({
+        code: "custom",
+        path: ["modelNotes", productId],
+        message: "model note references a product id outside the deployment catalog"
+      });
+    }
+  }
+});
+function parseModelCatalogDocument(value) {
+  return ModelCatalogDocument.parse(value);
+}
+function deploymentRegistryProvidersWithHostCredentials(settings, providers) {
+  const hostProviders = new Map(
+    parseModelProvidersJson(settings.modelProvidersJson).map((provider) => [provider.id, provider])
+  );
+  return providers.map((provider) => {
+    if (provider.kind !== "api-key") return provider;
+    const host = hostProviders.get(provider.id);
+    if (!host || host.kind !== "api-key") {
+      throw new Error(
+        `database model catalog provider ${provider.id} has no matching host-authorized api-key transport`
+      );
+    }
+    const transportIdentity = (candidate) => ({
+      kind: candidate.kind,
+      baseUrl: candidate.baseUrl,
+      api: candidate.api,
+      wireProfile: candidate.wireProfile
+    });
+    if (canonicalJson(transportIdentity(provider)) !== canonicalJson(transportIdentity(host))) {
+      throw new Error(
+        `database model catalog provider ${provider.id} does not match its host-authorized transport`
+      );
+    }
+    return {
+      ...provider,
+      ...host.defaultHeaders === void 0 ? {} : { defaultHeaders: host.defaultHeaders },
+      ...host.defaultQuery === void 0 ? {} : { defaultQuery: host.defaultQuery },
+      ...host.publicDefaultHeaderNames === void 0 ? {} : { publicDefaultHeaderNames: host.publicDefaultHeaderNames },
+      ...host.publicDefaultQueryNames === void 0 ? {} : { publicDefaultQueryNames: host.publicDefaultQueryNames },
+      ...host.apiKey === void 0 ? {} : { apiKey: host.apiKey },
+      ...host.apiKeyEnv === void 0 ? {} : { apiKeyEnv: host.apiKeyEnv }
+    };
+  });
+}
+function applyModelCatalogDocument(settings, rawDocument) {
+  const document = parseModelCatalogDocument(rawDocument);
+  const defaultModel = document.defaultModel ?? document.builtInModels[0];
+  const resolved = {
+    ...settings,
+    openaiModel: defaultModel,
+    // Keep the complete built-in membership, including the default. The worker
+    // replaces openaiModel with the exact turn model; the run-scoped router
+    // needs one stable built-in id in this allow-list so a bare provider model
+    // is not temporarily claimed by OpenAI/Azure during name re-resolution.
+    openaiAllowedModels: document.builtInModels.join(","),
+    modelProvidersJson: JSON.stringify(
+      deploymentRegistryProvidersWithHostCredentials(settings, document.registryProviders)
+    ),
+    resolvedGatewayModelsJson: JSON.stringify(document.gatewayModels),
+    resolvedOpenRouterModelsJson: JSON.stringify(document.openrouterModels),
+    modelNotesJson: JSON.stringify(document.modelNotes)
+  };
+  return resolved;
+}
 var IntegrationOAuthClientConfigSchema = z.object({
   clientId: z.string().min(1),
   clientSecret: z.string().min(1).optional(),
@@ -1482,11 +1832,10 @@ var IntegrationOAuthClientConfigSchema = z.object({
 });
 var VERCEL_AI_GATEWAY_BASE_URL = "https://ai-gateway.vercel.sh/v1";
 var VERCEL_AI_GATEWAY_AI_SDK_BASE_URL = "https://ai-gateway.vercel.sh/v4/ai";
-var OPENGENI_GATEWAY_PROVIDER_ID = "opengeni-gateway";
-var WORKSPACE_GATEWAY_PROVIDER_ID = "workspace-gateway";
-var WORKSPACE_GATEWAY_MODEL_ID_PREFIX = "workspace-gateway/";
 var VERCEL_AI_GATEWAY_CONNECTION_DOMAIN = "ai-gateway.vercel.sh";
 var VERCEL_AI_GATEWAY_CONNECTION_ROLE = "vercel_ai_gateway";
+var WORKSPACE_OPENROUTER_CONNECTION_DOMAIN = "openrouter.ai";
+var WORKSPACE_OPENROUTER_CONNECTION_ROLE = "openrouter";
 var CODEX_REALTIME_MODEL_ID = "gpt-live-1-boulder-alpha";
 var SUPERGROK_REALTIME_MODEL_ID = "supergrok/grok-voice-think-fast-2.0";
 var OPENGENI_REALTIME_MODEL_ID_PREFIX = "opengeni-gateway/";
@@ -1545,23 +1894,126 @@ var OPENGENI_GATEWAY_MODELS = {
     implicitCaching: true
   }
 };
+var OPENGENI_OPENROUTER_MODELS = [
+  OpenRouterCatalogModel.parse({
+    upstreamModelId: "nvidia/nemotron-3-super-120b-a12b:free",
+    label: "Nemotron 3 Super 120B",
+    shortLabel: "Nemotron 3 Super",
+    aliases: [],
+    capabilities: {
+      reasoning: {
+        upstream: "supported",
+        // OpenRouter advertises the reasoning controls, but the catalogue does
+        // not publish this model's accepted effort vocabulary. Preserve that
+        // upstream fact without exposing an unverified runnable selector.
+        runnable: false,
+        efforts: [],
+        defaultEffort: null,
+        required: false
+      },
+      functionCalling: { upstream: "supported", runnable: true },
+      structuredOutput: { upstream: "supported", runnable: true },
+      hostedTools: {
+        webSearch: { upstream: "unknown", runnable: false },
+        xSearch: { upstream: "unknown", runnable: false },
+        codeExecution: { upstream: "unknown", runnable: false },
+        imageGeneration: { upstream: "unknown", runnable: false }
+      },
+      inputModalities: ["text"],
+      inputFileMediaTypes: [],
+      outputModalities: ["text"],
+      transports: {
+        sse: { upstream: "supported", runnable: true },
+        responsesWebSocket: { upstream: "unknown", runnable: false },
+        realtimeAudio: { upstream: "unsupported", runnable: false }
+      },
+      latencyModes: [{ id: "standard", upstream: "unknown", runnable: true }]
+    },
+    contextWindowTokens: 262144,
+    effectiveContextWindowTokens: 235929,
+    autoCompactTokenLimit: 22e4
+  })
+];
+function defaultGatewayCatalogModels() {
+  return [
+    {
+      ...OPENGENI_GATEWAY_MODELS.deepseek,
+      vision: false,
+      inputFileMediaTypes: [],
+      contextWindowTokens: 1e6,
+      effectiveContextWindowTokens: 9e5,
+      autoCompactTokenLimit: 85e4
+    },
+    {
+      ...OPENGENI_GATEWAY_MODELS.kimi,
+      vision: true,
+      inputFileMediaTypes: ["application/pdf"],
+      contextWindowTokens: 1e6,
+      effectiveContextWindowTokens: 9e5,
+      autoCompactTokenLimit: 85e4
+    }
+  ].map((model) => GatewayCatalogModel.parse(model));
+}
+function configuredGatewayCatalogModels(settings) {
+  if (settings.resolvedGatewayModelsJson === void 0) {
+    return defaultGatewayCatalogModels();
+  }
+  return z.array(GatewayCatalogModel).parse(JSON.parse(settings.resolvedGatewayModelsJson));
+}
+function configuredGatewayUpstreamModelIds(settings) {
+  return configuredGatewayCatalogModels(settings).map((model) => model.upstreamModelId);
+}
+function configuredGatewayWorkspaceProductModelIds(settings) {
+  return configuredGatewayCatalogModels(settings).map((model) => model.workspaceProductId);
+}
+function configuredGatewayOrganizationProductModelIds(settings) {
+  void settings;
+  return [];
+}
+function configuredModelInputIdentities(settings) {
+  return configuredModels(settings).flatMap((model) => [model.id, ...model.aliases]);
+}
+function configuredOpenRouterCatalogModels(settings) {
+  if (settings.resolvedOpenRouterModelsJson === void 0) {
+    return [...OPENGENI_OPENROUTER_MODELS];
+  }
+  return z.array(OpenRouterCatalogModel).parse(JSON.parse(settings.resolvedOpenRouterModelsJson));
+}
+function configuredOpenRouterUpstreamModelIds(settings) {
+  return configuredOpenRouterCatalogModels(settings).map((model) => model.upstreamModelId);
+}
+function workspaceOpenRouterProductId(modelId) {
+  return `${WORKSPACE_OPENROUTER_MODEL_ID_PREFIX}${modelId.startsWith(OPENROUTER_MODEL_ID_PREFIX) ? modelId.slice(OPENROUTER_MODEL_ID_PREFIX.length) : modelId}`;
+}
+function configuredOpenRouterWorkspaceProductModelIds(settings) {
+  return configuredOpenRouterCatalogModels(settings).flatMap(
+    (model) => [model.upstreamModelId, ...model.aliases].map(workspaceOpenRouterProductId)
+  );
+}
+function configuredOpenRouterOrganizationProductModelIds(settings) {
+  void settings;
+  return [];
+}
 var defaultModelPricing = {
   "gpt-5.6-sol": {
     default: {
-      inputMicrosPerMillionTokens: 5e6,
-      cachedInputMicrosPerMillionTokens: 5e5,
-      outputMicrosPerMillionTokens: 3e7,
-      marginBps: 2500
+      // Promotional OpenAI pricing, guaranteed through at least 2026-11-21.
+      inputMicrosPerMillionTokens: 4e6,
+      cachedInputMicrosPerMillionTokens: 4e5,
+      cacheWriteMicrosPerMillionTokens: 5e6,
+      outputMicrosPerMillionTokens: 2e7,
+      marginBps: 500
     },
     inputTokenTiers: [
       {
         // OpenAI: prompts with >272K input tokens use the long-context rate.
         minimumInputTokens: 272001,
         pricing: {
-          inputMicrosPerMillionTokens: 1e7,
-          cachedInputMicrosPerMillionTokens: 1e6,
-          outputMicrosPerMillionTokens: 45e6,
-          marginBps: 2500
+          inputMicrosPerMillionTokens: 8e6,
+          cachedInputMicrosPerMillionTokens: 8e5,
+          cacheWriteMicrosPerMillionTokens: 1e7,
+          outputMicrosPerMillionTokens: 3e7,
+          marginBps: 500
         }
       }
     ]
@@ -1570,8 +2022,9 @@ var defaultModelPricing = {
     default: {
       inputMicrosPerMillionTokens: 2e6,
       cachedInputMicrosPerMillionTokens: 2e5,
+      cacheWriteMicrosPerMillionTokens: 25e5,
       outputMicrosPerMillionTokens: 12e6,
-      marginBps: 2500
+      marginBps: 500
     },
     inputTokenTiers: [
       {
@@ -1579,8 +2032,9 @@ var defaultModelPricing = {
         pricing: {
           inputMicrosPerMillionTokens: 4e6,
           cachedInputMicrosPerMillionTokens: 4e5,
+          cacheWriteMicrosPerMillionTokens: 5e6,
           outputMicrosPerMillionTokens: 18e6,
-          marginBps: 2500
+          marginBps: 500
         }
       }
     ]
@@ -1589,8 +2043,9 @@ var defaultModelPricing = {
     default: {
       inputMicrosPerMillionTokens: 2e5,
       cachedInputMicrosPerMillionTokens: 2e4,
+      cacheWriteMicrosPerMillionTokens: 25e4,
       outputMicrosPerMillionTokens: 12e5,
-      marginBps: 2500
+      marginBps: 500
     },
     inputTokenTiers: [
       {
@@ -1598,8 +2053,9 @@ var defaultModelPricing = {
         pricing: {
           inputMicrosPerMillionTokens: 4e5,
           cachedInputMicrosPerMillionTokens: 4e4,
+          cacheWriteMicrosPerMillionTokens: 5e5,
           outputMicrosPerMillionTokens: 18e5,
-          marginBps: 2500
+          marginBps: 500
         }
       }
     ]
@@ -1614,7 +2070,7 @@ var defaultModelPricing = {
       inputMicrosPerMillionTokens: 14e4,
       cachedInputMicrosPerMillionTokens: 28e3,
       outputMicrosPerMillionTokens: 28e4,
-      marginBps: 2500
+      marginBps: 500
     }
   },
   [OPENGENI_GATEWAY_MODELS.kimi.productId]: {
@@ -1622,7 +2078,7 @@ var defaultModelPricing = {
       inputMicrosPerMillionTokens: 3e6,
       cachedInputMicrosPerMillionTokens: 3e5,
       outputMicrosPerMillionTokens: 15e6,
-      marginBps: 2500
+      marginBps: 500
     }
   },
   // Fireworks AI / GLM 5.2 — the first shipped non-OpenAI registry model. A
@@ -1634,7 +2090,7 @@ var defaultModelPricing = {
       inputMicrosPerMillionTokens: 14e5,
       cachedInputMicrosPerMillionTokens: 14e4,
       outputMicrosPerMillionTokens: 44e5,
-      marginBps: 2500
+      marginBps: 500
     }
   }
 };
@@ -1693,11 +2149,14 @@ function objectStorageConfiguredForWorkspaceArchives(settings) {
     }
   }
 }
-function optional(name) {
-  const value = process.env[name];
+function optionalEnvironmentValue(name, source) {
+  const value = source[name];
   return value && value.trim().length > 0 ? value : void 0;
 }
-function getSettings() {
+function getSettings(source = process.env) {
+  const optional = (name) => optionalEnvironmentValue(name, source);
+  const modelCatalogSource = optional("OPENGENI_MODEL_CATALOG_SOURCE");
+  const modelCostPolicyJson = optional("OPENGENI_MODEL_COST_POLICY_JSON") ?? (modelCatalogSource === "database" ? "{}" : DEFAULT_MODEL_COST_POLICY_JSON);
   const raw = {
     serviceName: optional("OPENGENI_SERVICE_NAME"),
     environment: optional("OPENGENI_ENVIRONMENT"),
@@ -1742,6 +2201,8 @@ function getSettings() {
     analyticsPosthogHost: optional("OPENGENI_ANALYTICS_POSTHOG_HOST"),
     analyticsGa4MeasurementId: optional("OPENGENI_ANALYTICS_GA4_MEASUREMENT_ID"),
     publicBaseUrl: optional("OPENGENI_PUBLIC_BASE_URL"),
+    mcpOauthEnabled: optional("OPENGENI_MCP_OAUTH_ENABLED"),
+    mcpOauthTrustedProxyHops: optional("OPENGENI_MCP_OAUTH_TRUSTED_PROXY_HOPS"),
     webBaseUrl: optional("OPENGENI_WEB_BASE_URL"),
     agentReleasesBaseUrl: optional("OPENGENI_AGENT_RELEASES_BASE_URL"),
     agentStableVersion: optional("OPENGENI_AGENT_STABLE_VERSION"),
@@ -1813,6 +2274,9 @@ function getSettings() {
     goalIdleBackoffMs: optional("OPENGENI_GOAL_IDLE_BACKOFF_MS"),
     goalIdleBackoffMaxMs: optional("OPENGENI_GOAL_IDLE_BACKOFF_MAX_MS"),
     childLifecycleNoticesEnabled: optional("OPENGENI_CHILD_LIFECYCLE_NOTICES_ENABLED"),
+    hostMcpAuthoritySourceAdmissionEnabled: optional(
+      "OPENGENI_HOST_MCP_AUTHORITY_SOURCE_ADMISSION_ENABLED"
+    ),
     slackWorkspaceRoutingEnabled: optional("OPENGENI_SLACK_WORKSPACE_ROUTING_ENABLED"),
     agentMaxModelCallsPerTurn: optional("OPENGENI_AGENT_MAX_MODEL_CALLS_PER_TURN"),
     contextWindowTokens: optional("OPENGENI_CONTEXT_WINDOW_TOKENS"),
@@ -1882,6 +2346,10 @@ function getSettings() {
     voiceInputAzureAdToken: optional("OPENGENI_VOICE_INPUT_AZURE_AD_TOKEN"),
     voiceInputCodexExperimentalEnabled: optional("OPENGENI_VOICE_INPUT_CODEX_EXPERIMENTAL"),
     modelPricingJson: optional("OPENGENI_MODEL_PRICING_JSON"),
+    modelCatalogSource,
+    modelCostPolicyJson,
+    modelNotesJson: optional("OPENGENI_MODEL_NOTES_JSON"),
+    openrouterApiKey: optional("OPENGENI_OPENROUTER_API_KEY"),
     modelProvidersJson: optional("OPENGENI_MODEL_PROVIDERS_JSON"),
     codexSubscriptionEnabled: optional("OPENGENI_CODEX_SUBSCRIPTION_ENABLED"),
     supergrokSubscriptionEnabled: optional("OPENGENI_SUPERGROK_SUBSCRIPTION_ENABLED"),
@@ -1891,7 +2359,6 @@ function getSettings() {
     codexConnectedAppsEnabled: optional("OPENGENI_CODEX_CONNECTED_APPS_ENABLED"),
     codexToolSearchEnabled: optional("OPENGENI_CODEX_TOOL_SEARCH_ENABLED"),
     lazyToolSearchEnabled: optional("OPENGENI_LAZY_TOOL_SEARCH_ENABLED"),
-    codexCredentialLeasingEnabled: optional("OPENGENI_CODEX_CREDENTIAL_LEASING_ENABLED"),
     codexFleetPolicyShadowEnabled: optional("OPENGENI_CODEX_FLEET_POLICY_SHADOW_ENABLED"),
     codexProductSku: optional("OPENGENI_CODEX_PRODUCT_SKU"),
     openaiReasoningEffort: optional("OPENGENI_OPENAI_REASONING_EFFORT"),
@@ -1916,7 +2383,7 @@ function getSettings() {
     dockerNetwork: optional("OPENGENI_DOCKER_NETWORK"),
     dockerWorkspaceBaseDir: optional("OPENGENI_DOCKER_WORKSPACE_BASE_DIR"),
     modalAppName: optional("OPENGENI_MODAL_APP_NAME"),
-    modalImageRef: optional("OPENGENI_MODAL_IMAGE_REF"),
+    modalImageRef: optional("OPENGENI_MODAL_IMAGE_REF") ?? DEFAULT_MODAL_IMAGE_REF,
     modalImageId: optional("OPENGENI_MODAL_IMAGE_ID"),
     modalImageRegistrySecret: optional("OPENGENI_MODAL_IMAGE_REGISTRY_SECRET"),
     modalTimeoutSeconds: optional("OPENGENI_MODAL_TIMEOUT_SECONDS"),
@@ -2018,6 +2485,7 @@ function getSettings() {
     sandboxIdleGraceMs: optional("OPENGENI_SANDBOX_IDLE_GRACE_MS"),
     sandboxSnapshotIntervalMs: optional("OPENGENI_SANDBOX_SNAPSHOT_INTERVAL_MS"),
     sandboxSnapshotTimeoutMs: optional("OPENGENI_SANDBOX_SNAPSHOT_TIMEOUT_MS"),
+    sandboxDrainSnapshotTimeoutMs: optional("OPENGENI_SANDBOX_DRAIN_SNAPSHOT_TIMEOUT_MS"),
     sandboxRotationLeadMs: optional("OPENGENI_SANDBOX_ROTATION_LEAD_MS"),
     sandboxRotationBatchSize: optional("OPENGENI_SANDBOX_ROTATION_BATCH_SIZE"),
     sandboxLeaseTtlMs: optional("OPENGENI_SANDBOX_LEASE_TTL_MS"),
@@ -2092,6 +2560,12 @@ function getSettings() {
     managedAuthGithubClientId: optional("OPENGENI_MANAGED_AUTH_GITHUB_CLIENT_ID"),
     managedAuthGithubClientSecret: optional("OPENGENI_MANAGED_AUTH_GITHUB_CLIENT_SECRET"),
     managedAuthSessionSetMode: optional("OPENGENI_MANAGED_AUTH_SESSION_SET_MODE"),
+    organizationUserSetupEmailTokenTransport: optional(
+      "OPENGENI_ORGANIZATION_USER_SETUP_EMAIL_TOKEN_TRANSPORT"
+    ),
+    organizationUserSetupQueryEdgeSanitizationConfirmed: optional(
+      "OPENGENI_ORGANIZATION_USER_SETUP_QUERY_EDGE_SANITIZATION_CONFIRMED"
+    ),
     resendApiKey: optional("OPENGENI_RESEND_API_KEY"),
     emailFrom: optional("OPENGENI_EMAIL_FROM"),
     stripeSecretKey: optional("OPENGENI_STRIPE_SECRET_KEY"),
@@ -2107,7 +2581,7 @@ function getSettings() {
     sandboxRotationLeadMs: raw.sandboxRotationLeadMs === void 0 && parsed.sandboxBackend === "modal" ? Math.min(36e5, Math.floor(parsed.modalTimeoutSeconds * 1e3 / 2)) : parsed.sandboxRotationLeadMs,
     mcpServers: ensureBuiltInMcpServers(parsed)
   };
-  validateSettings(settings);
+  validateSettings(settings, source);
   return settings;
 }
 var LOCAL_FIRST_PARTY_DELEGATION_SECRET = "opengeni-local-first-party-delegation-secret-v1";
@@ -2167,8 +2641,13 @@ function sandboxArchiveCaptureTimeoutMs(settings) {
     settings.sandboxSnapshotTimeoutMs + SANDBOX_ARCHIVE_CAPTURE_SETTLEMENT_GRACE_MS
   );
 }
+function effectiveSandboxDrainSnapshotTimeoutMs(settings) {
+  return settings.sandboxDrainSnapshotTimeoutMs ?? settings.sandboxSnapshotTimeoutMs;
+}
 function sandboxLifecycleTransitionWaitMs(settings) {
-  const captureTimeoutMs = sandboxArchiveCaptureTimeoutMs(settings);
+  const captureTimeoutMs = sandboxArchiveCaptureTimeoutMs({
+    sandboxSnapshotTimeoutMs: effectiveSandboxDrainSnapshotTimeoutMs(settings)
+  });
   return Math.min(
     SANDBOX_LIFECYCLE_TRANSITION_MAX_WAIT_MS,
     settings.sandboxLeaseReaperPeriodMs + captureTimeoutMs + SANDBOX_LIFECYCLE_RETRY_HANDOFF_GRACE_MS
@@ -2422,10 +2901,8 @@ function legacyModelCapabilities(settings, input) {
     latencyModes: [{ id: "standard", upstream: "unknown", runnable: true }]
   });
 }
-function gatewayRequestPolicyForUpstreamModel(upstreamModelId) {
-  const model = Object.values(OPENGENI_GATEWAY_MODELS).find(
-    (candidate) => candidate.upstreamModelId === upstreamModelId
-  );
+function gatewayRequestPolicyForUpstreamModel(upstreamModelId, models = defaultGatewayCatalogModels()) {
+  const model = models.find((candidate) => candidate.upstreamModelId === upstreamModelId);
   if (!model) {
     return void 0;
   }
@@ -2456,30 +2933,83 @@ function gatewayModelCapabilities(settings, input) {
     latencyModes: [{ id: "standard", upstream: "supported", runnable: true }]
   });
 }
+function openRouterCustomModelCapabilities(settings) {
+  const legacy = legacyModelCapabilities(settings, {
+    reasoningEffort: false,
+    hostedWebSearch: false
+  });
+  return normalizeCapabilities({
+    ...legacy,
+    functionCalling: { upstream: "supported", runnable: true },
+    inputModalities: ["text"],
+    inputFileMediaTypes: [],
+    transports: {
+      ...legacy.transports,
+      sse: { upstream: "supported", runnable: true }
+    },
+    promptCaching: { upstream: "unsupported", runnable: false, mode: "none" },
+    latencyModes: [{ id: "standard", upstream: "supported", runnable: true }]
+  });
+}
 function gatewayRegistryProvider(settings, input) {
   const workspace = input.kind === "vercel-gateway-workspace";
-  const models = [OPENGENI_GATEWAY_MODELS.deepseek, OPENGENI_GATEWAY_MODELS.kimi].map((model) => {
-    const kimi = model === OPENGENI_GATEWAY_MODELS.kimi;
+  const organization = input.kind === "vercel-gateway-organization";
+  const scoped = workspace || organization;
+  const curated = organization ? [] : configuredGatewayCatalogModels(settings);
+  const upstreamIds = new Set(curated.map((model) => model.upstreamModelId));
+  const productIds = new Set(
+    parseModelProvidersJson(settings.modelProvidersJson).filter(
+      (provider) => provider.id !== WORKSPACE_GATEWAY_PROVIDER_ID && provider.id !== ORGANIZATION_GATEWAY_PROVIDER_ID
+    ).flatMap(
+      (provider) => provider.models.flatMap((model) => [model.id, ...model.aliases ?? []])
+    )
+  );
+  const models = curated.map((model) => {
+    const id = workspace ? model.workspaceProductId : organization ? `${ORGANIZATION_GATEWAY_MODEL_ID_PREFIX}${model.upstreamModelId}` : model.productId;
+    productIds.add(id);
     return {
-      id: workspace ? model.workspaceProductId : model.productId,
+      id,
       upstreamModelId: model.upstreamModelId,
       label: model.label,
-      shortLabel: model.shortLabel,
+      ...model.shortLabel ? { shortLabel: model.shortLabel } : {},
       capabilities: gatewayModelCapabilities(settings, {
         implicitCaching: model.implicitCaching,
-        vision: kimi,
-        inputFileMediaTypes: kimi ? ["application/pdf"] : []
+        vision: model.vision,
+        inputFileMediaTypes: model.inputFileMediaTypes
       }),
-      contextWindowTokens: 1e6,
-      effectiveContextWindowTokens: 9e5,
-      autoCompactTokenLimit: 85e4,
-      toolOutputTruncationTokens: settings.modelToolOutputTruncationTokens
+      contextWindowTokens: model.contextWindowTokens,
+      effectiveContextWindowTokens: model.effectiveContextWindowTokens,
+      autoCompactTokenLimit: model.autoCompactTokenLimit,
+      toolOutputTruncationTokens: settings.modelToolOutputTruncationTokens,
+      ...model.pricing === void 0 ? {} : { pricing: model.pricing }
     };
   });
+  if (scoped) {
+    for (const custom of input.customModels ?? []) {
+      const productId = `${workspace ? WORKSPACE_GATEWAY_MODEL_ID_PREFIX : ORGANIZATION_GATEWAY_MODEL_ID_PREFIX}${custom.upstreamModelId}`;
+      if (upstreamIds.has(custom.upstreamModelId) || productIds.has(productId)) continue;
+      upstreamIds.add(custom.upstreamModelId);
+      productIds.add(productId);
+      models.push({
+        id: productId,
+        upstreamModelId: custom.upstreamModelId,
+        label: custom.label?.trim() || custom.upstreamModelId,
+        capabilities: gatewayModelCapabilities(settings, {
+          implicitCaching: false,
+          vision: false,
+          inputFileMediaTypes: []
+        }),
+        contextWindowTokens: 1e6,
+        effectiveContextWindowTokens: 9e5,
+        autoCompactTokenLimit: 85e4,
+        toolOutputTruncationTokens: settings.modelToolOutputTruncationTokens
+      });
+    }
+  }
   return {
     kind: input.kind,
-    id: workspace ? WORKSPACE_GATEWAY_PROVIDER_ID : OPENGENI_GATEWAY_PROVIDER_ID,
-    label: workspace ? "Your Gateway" : "OpenGeni",
+    id: workspace ? WORKSPACE_GATEWAY_PROVIDER_ID : organization ? ORGANIZATION_GATEWAY_PROVIDER_ID : OPENGENI_GATEWAY_PROVIDER_ID,
+    label: workspace ? "Your Gateway" : organization ? "Organization Gateway" : "OpenGeni",
     // Responses preserves vision, reasoning items, and provider-native usage.
     // Model-specific compatibility stays at the reviewed request fence rather
     // than downgrading the whole provider wire.
@@ -2490,47 +3020,179 @@ function gatewayRegistryProvider(settings, input) {
     models
   };
 }
+function openRouterRegistryProvider(settings, input) {
+  const workspace = input.kind === "openrouter-workspace";
+  const organization = input.kind === "openrouter-organization";
+  const scoped = workspace || organization;
+  const curated = organization ? [] : configuredOpenRouterCatalogModels(settings);
+  const upstreamIds = new Set(curated.map((model) => model.upstreamModelId));
+  const productIds = new Set(
+    parseModelProvidersJson(settings.modelProvidersJson).filter(
+      (provider) => provider.id !== WORKSPACE_OPENROUTER_PROVIDER_ID && provider.id !== ORGANIZATION_OPENROUTER_PROVIDER_ID
+    ).flatMap(
+      (provider) => provider.models.flatMap((model) => [model.id, ...model.aliases ?? []])
+    )
+  );
+  const models = curated.map((model) => {
+    const id = workspace ? workspaceOpenRouterProductId(model.upstreamModelId) : organization ? `${ORGANIZATION_OPENROUTER_MODEL_ID_PREFIX}${model.upstreamModelId}` : `${OPENROUTER_MODEL_ID_PREFIX}${model.upstreamModelId}`;
+    const aliases = workspace ? model.aliases.map(workspaceOpenRouterProductId) : organization ? model.aliases.map((alias) => `${ORGANIZATION_OPENROUTER_MODEL_ID_PREFIX}${alias}`) : model.aliases;
+    productIds.add(id);
+    for (const alias of aliases) productIds.add(alias);
+    return {
+      id,
+      upstreamModelId: model.upstreamModelId,
+      aliases,
+      label: model.label,
+      ...model.shortLabel ? { shortLabel: model.shortLabel } : {},
+      capabilities: model.capabilities,
+      ...model.contextWindowTokens === void 0 ? {} : { contextWindowTokens: model.contextWindowTokens },
+      ...model.effectiveContextWindowTokens === void 0 ? {} : { effectiveContextWindowTokens: model.effectiveContextWindowTokens },
+      ...model.autoCompactTokenLimit === void 0 ? {} : { autoCompactTokenLimit: model.autoCompactTokenLimit },
+      toolOutputTruncationTokens: model.toolOutputTruncationTokens ?? settings.modelToolOutputTruncationTokens
+    };
+  });
+  if (scoped) {
+    for (const custom of input.customModels ?? []) {
+      const productId = `${workspace ? WORKSPACE_OPENROUTER_MODEL_ID_PREFIX : ORGANIZATION_OPENROUTER_MODEL_ID_PREFIX}${custom.upstreamModelId}`;
+      if (upstreamIds.has(custom.upstreamModelId) || productIds.has(productId)) continue;
+      upstreamIds.add(custom.upstreamModelId);
+      productIds.add(productId);
+      models.push({
+        id: productId,
+        upstreamModelId: custom.upstreamModelId,
+        aliases: [],
+        label: custom.label?.trim() || custom.upstreamModelId,
+        capabilities: openRouterCustomModelCapabilities(settings),
+        toolOutputTruncationTokens: settings.modelToolOutputTruncationTokens
+      });
+    }
+  }
+  if (models.length === 0) return null;
+  const defaultHeaders = {
+    "x-title": "OpenGeni",
+    ...settings.publicBaseUrl ? { "http-referer": settings.publicBaseUrl } : {}
+  };
+  return {
+    kind: input.kind,
+    id: workspace ? WORKSPACE_OPENROUTER_PROVIDER_ID : organization ? ORGANIZATION_OPENROUTER_PROVIDER_ID : OPENROUTER_PROVIDER_ID,
+    label: workspace ? "Your OpenRouter" : organization ? "Organization OpenRouter" : "OpenRouter",
+    api: "chat",
+    wireProfile: "openai",
+    baseUrl: OPENROUTER_BASE_URL,
+    ...input.apiKey ? { apiKey: input.apiKey } : {},
+    defaultHeaders,
+    publicDefaultHeaderNames: Object.keys(defaultHeaders),
+    models
+  };
+}
 function configuredRegistryProviders(settings) {
   const providers = parseModelProvidersJson(settings.modelProvidersJson);
-  if (!settings.vercelAiGatewayApiKey) {
-    return providers;
-  }
-  if (providers.some((provider) => provider.id === OPENGENI_GATEWAY_PROVIDER_ID)) {
-    throw new Error(
-      `${OPENGENI_GATEWAY_PROVIDER_ID} is reserved for OPENGENI_VERCEL_AI_GATEWAY_API_KEY`
+  const injected = [...providers];
+  if (settings.vercelAiGatewayApiKey && configuredGatewayCatalogModels(settings).length > 0) {
+    injected.push(
+      gatewayRegistryProvider(settings, {
+        kind: "vercel-gateway-managed",
+        apiKey: settings.vercelAiGatewayApiKey
+      })
     );
   }
-  return [
-    ...providers,
-    gatewayRegistryProvider(settings, {
-      kind: "vercel-gateway-managed",
-      apiKey: settings.vercelAiGatewayApiKey
-    })
-  ];
+  const openrouter = settings.openrouterApiKey ? openRouterRegistryProvider(settings, {
+    kind: "openrouter-managed",
+    apiKey: settings.openrouterApiKey
+  }) : null;
+  if (openrouter) injected.push(openrouter);
+  return injected;
 }
-function withWorkspaceGatewayCatalogProvider(settings) {
+function withWorkspaceGatewayCatalogProvider(settings, customModels = []) {
   const providers = parseModelProvidersJson(settings.modelProvidersJson);
-  if (providers.some((provider) => provider.id === WORKSPACE_GATEWAY_PROVIDER_ID)) {
-    return settings;
-  }
+  const withoutWorkspace = providers.filter(
+    (provider) => provider.id !== WORKSPACE_GATEWAY_PROVIDER_ID
+  );
+  const curatedCount = configuredGatewayCatalogModels(settings).length;
+  if (curatedCount === 0 && customModels.length === 0) return settings;
   return {
     ...settings,
     modelProvidersJson: JSON.stringify([
-      ...providers,
-      gatewayRegistryProvider(settings, { kind: "vercel-gateway-workspace" })
+      ...withoutWorkspace,
+      gatewayRegistryProvider(settings, {
+        kind: "vercel-gateway-workspace",
+        customModels
+      })
     ])
   };
 }
-function withWorkspaceGatewayCredential(settings, apiKey) {
+function withWorkspaceGatewayCredential(settings, apiKey, customModels = []) {
   if (!apiKey.trim()) {
     throw new Error("workspace AI Gateway credential is empty");
   }
-  const catalogSettings = withWorkspaceGatewayCatalogProvider(settings);
+  const catalogSettings = withWorkspaceGatewayCatalogProvider(settings, customModels);
   const providers = parseModelProvidersJson(catalogSettings.modelProvidersJson).map(
     (provider) => provider.id === WORKSPACE_GATEWAY_PROVIDER_ID ? { ...provider, apiKey } : provider
   );
   return { ...catalogSettings, modelProvidersJson: JSON.stringify(providers) };
 }
+function withWorkspaceOpenRouterCatalogProvider(settings, customModels = []) {
+  const providers = parseModelProvidersJson(settings.modelProvidersJson);
+  const withoutWorkspace = providers.filter(
+    (provider2) => provider2.id !== WORKSPACE_OPENROUTER_PROVIDER_ID
+  );
+  const provider = openRouterRegistryProvider(settings, {
+    kind: "openrouter-workspace",
+    customModels
+  });
+  if (!provider) return settings;
+  return {
+    ...settings,
+    modelProvidersJson: JSON.stringify([...withoutWorkspace, provider])
+  };
+}
+function withWorkspaceOpenRouterCredential(settings, apiKey, customModels = []) {
+  if (!apiKey.trim()) {
+    throw new Error("workspace OpenRouter credential is empty");
+  }
+  const catalogSettings = withWorkspaceOpenRouterCatalogProvider(settings, customModels);
+  const providers = parseModelProvidersJson(catalogSettings.modelProvidersJson).map(
+    (provider) => provider.id === WORKSPACE_OPENROUTER_PROVIDER_ID ? { ...provider, apiKey } : provider
+  );
+  return { ...catalogSettings, modelProvidersJson: JSON.stringify(providers) };
+}
+function withOrganizationGatewayCatalogProvider(settings, customModels = []) {
+  if (customModels.length === 0) return settings;
+  const providers = parseModelProvidersJson(settings.modelProvidersJson).filter(
+    (provider2) => provider2.id !== ORGANIZATION_GATEWAY_PROVIDER_ID
+  );
+  const provider = gatewayRegistryProvider(settings, {
+    kind: "vercel-gateway-organization",
+    customModels
+  });
+  return { ...settings, modelProvidersJson: JSON.stringify([...providers, provider]) };
+}
+function withOrganizationGatewayCredential(settings, apiKey, customModels = []) {
+  if (!apiKey.trim()) throw new Error("organization AI Gateway credential is empty");
+  const catalog = withOrganizationGatewayCatalogProvider(settings, customModels);
+  const providers = parseModelProvidersJson(catalog.modelProvidersJson).map(
+    (provider) => provider.id === ORGANIZATION_GATEWAY_PROVIDER_ID ? { ...provider, apiKey } : provider
+  );
+  return { ...catalog, modelProvidersJson: JSON.stringify(providers) };
+}
+function withOrganizationOpenRouterCatalogProvider(settings, customModels = []) {
+  const providers = parseModelProvidersJson(settings.modelProvidersJson).filter(
+    (provider2) => provider2.id !== ORGANIZATION_OPENROUTER_PROVIDER_ID
+  );
+  const provider = openRouterRegistryProvider(settings, {
+    kind: "openrouter-organization",
+    customModels
+  });
+  return provider ? { ...settings, modelProvidersJson: JSON.stringify([...providers, provider]) } : settings;
+}
+function withOrganizationOpenRouterCredential(settings, apiKey, customModels = []) {
+  if (!apiKey.trim()) throw new Error("organization OpenRouter credential is empty");
+  const catalog = withOrganizationOpenRouterCatalogProvider(settings, customModels);
+  const providers = parseModelProvidersJson(catalog.modelProvidersJson).map(
+    (provider) => provider.id === ORGANIZATION_OPENROUTER_PROVIDER_ID ? { ...provider, apiKey } : provider
+  );
+  return { ...catalog, modelProvidersJson: JSON.stringify(providers) };
+}
 var GPT56_FAST_BILLING_MULTIPLIER_BPS = 2e4;
 function productLabelForModelId(modelId) {
   const slug = modelId.startsWith(CODEX_MODEL_ID_PREFIX) ? modelId.slice(CODEX_MODEL_ID_PREFIX.length) : modelId;
@@ -2561,6 +3223,8 @@ function productShortLabelForModelId(modelId) {
       return "5.6 Terra";
     case "gpt-5.6-luna":
       return "5.6 Luna";
+    case "gpt-6-astra":
+      return "6 Astra";
     default:
       return null;
   }
@@ -2580,7 +3244,7 @@ function builtinContextLimitsForModel(settings, modelId) {
   return { contextWindowTokens: settings.contextWindowTokens };
 }
 function builtinLatencyModesForModel(modelId) {
-  if (isBuiltinGpt56ModelId(modelId) || modelId.startsWith("codex/gpt-5.6-")) {
+  if (isBuiltinGpt56ModelId(modelId) || modelId.startsWith("codex/gpt-5.6-") || modelId === "codex/gpt-6-astra") {
     return [
       { id: "standard", upstream: "supported", runnable: true },
       {
@@ -2643,31 +3307,60 @@ function assertLatencyModeRunnable(settings, modelId, latencyMode) {
   }
 }
 function registryCredentialSource(provider) {
-  if (provider.kind === "anonymous") {
-    return { kind: "deployment", mechanism: "none" };
-  }
-  if (provider.kind === "codex-subscription") {
-    return { kind: "connected_subscription", provider: "codex" };
-  }
-  if (provider.kind === "xai-subscription") {
-    return { kind: "connected_subscription", provider: "xai" };
-  }
-  if (provider.kind === "vercel-gateway-workspace") {
-    return { kind: "workspace_connection", mechanism: "api_key" };
+  switch (provider.kind) {
+    case "anonymous":
+      return { kind: "deployment", mechanism: "none" };
+    case "codex-subscription":
+      return { kind: "connected_subscription", provider: "codex" };
+    case "xai-subscription":
+      return { kind: "connected_subscription", provider: "xai" };
+    case "vercel-gateway-workspace":
+    case "openrouter-workspace":
+      return { kind: "workspace_connection", mechanism: "api_key" };
+    case "vercel-gateway-organization":
+    case "openrouter-organization":
+      return { kind: "organization_connection", mechanism: "api_key" };
+    case "api-key":
+    case "vercel-gateway-managed":
+    case "openrouter-managed":
+      return { kind: "deployment", mechanism: "api_key" };
+    default: {
+      const _exhaustive = provider.kind;
+      return _exhaustive;
+    }
   }
-  return { kind: "deployment", mechanism: "api_key" };
 }
 function registryBilling(provider) {
-  if (provider.kind === "anonymous") {
-    return { upstreamPayer: "deployment", metering: "external" };
-  }
-  if (provider.kind === "codex-subscription" || provider.kind === "xai-subscription") {
-    return { upstreamPayer: "connected_subscription", metering: "external" };
-  }
-  if (provider.kind === "vercel-gateway-workspace") {
-    return { upstreamPayer: "workspace", metering: "external" };
+  switch (provider.kind) {
+    case "anonymous":
+    case "openrouter-managed":
+      return { upstreamPayer: "deployment", metering: "external" };
+    case "codex-subscription":
+    case "xai-subscription":
+      return { upstreamPayer: "connected_subscription", metering: "external" };
+    case "vercel-gateway-workspace":
+    case "openrouter-workspace":
+      return { upstreamPayer: "workspace", metering: "external" };
+    case "vercel-gateway-organization":
+    case "openrouter-organization":
+      return { upstreamPayer: "organization", metering: "external" };
+    case "api-key":
+    case "vercel-gateway-managed":
+      return { upstreamPayer: "deployment", metering: "opengeni_credits" };
+    default: {
+      const _exhaustive = provider.kind;
+      return _exhaustive;
+    }
   }
-  return { upstreamPayer: "deployment", metering: "opengeni_credits" };
+}
+function configuredCostForModel(settings, productModelId, credentialSource) {
+  if (credentialSource.kind === "workspace_connection") return "workspace";
+  if (credentialSource.kind === "organization_connection") return "organization";
+  if (credentialSource.kind === "connected_subscription") return "subscription";
+  return parseModelCostPolicyJson(settings.modelCostPolicyJson)[productModelId] ?? "credits";
+}
+function modelCostClassForConfiguredModel(_settings, model) {
+  return model.cost;
 }
 function builtinCredentialSource(settings) {
   if (settings.openaiProvider === "azure" && !settings.azureOpenaiApiKey) {
@@ -2726,6 +3419,10 @@ function definitionVersionFor(model, provider, options = {}) {
     billing: model.billing,
     executionLimits: model.executionLimits,
     capabilities: model.capabilities,
+    // Workspace-facing free/credits classification is a separate live
+    // deployment policy. Operators must drain/fence accepted turns before
+    // changing it; it is intentionally not a second executable-definition
+    // freeze inside TurnExecutionPolicyV1.
     ...model.requestPolicy ? { requestPolicy: model.requestPolicy } : {},
     pricing: model.pricing ?? null
   });
@@ -2734,7 +3431,9 @@ function definitionVersionFor(model, provider, options = {}) {
 function legacyImplicitOpenAiDefinitionVersionFor(model, provider) {
   if (provider.wireProfile !== "openai") return null;
   const { definitionVersion: _definitionVersion, ...modelWithoutVersion } = model;
-  return definitionVersionFor(modelWithoutVersion, provider, { includeWireProfile: false });
+  return definitionVersionFor(modelWithoutVersion, provider, {
+    includeWireProfile: false
+  });
 }
 function builtinProviderId(settings) {
   return settings.openaiProvider === "azure" ? "azure" : "openai";
@@ -2742,7 +3441,7 @@ function builtinProviderId(settings) {
 function builtinProviderLabel(settings) {
   return settings.openaiProvider === "azure" ? "Azure OpenAI" : "OpenAI";
 }
-function configuredProviders(settings) {
+function configuredProviders(settings, source = process.env) {
   const credentialSource = builtinCredentialSource(settings);
   const builtin = {
     id: builtinProviderId(settings),
@@ -2771,7 +3470,7 @@ function configuredProviders(settings) {
       wireProfile: provider.wireProfile,
       builtin: false,
       baseUrl: provider.baseUrl,
-      apiKey: resolveProviderApiKey(provider),
+      apiKey: resolveProviderApiKey(provider, source),
       defaultQuery: provider.defaultQuery,
       defaultHeaders: provider.defaultHeaders,
       publicDefaultQueryNames: provider.publicDefaultQueryNames,
@@ -2799,7 +3498,7 @@ function withCodexCatalogProvider(settings) {
         ...legacyModelCapabilities(settings, {
           reasoningEffort: true,
           hostedWebSearch: true,
-          vision: slug.startsWith("gpt-5.6-")
+          vision: slug.startsWith("gpt-5.6-") || slug === "gpt-6-astra"
         }),
         ...builtinPromptCachingForModel(`${CODEX_MODEL_ID_PREFIX}${slug}`) ? {
           promptCaching: builtinPromptCachingForModel(`${CODEX_MODEL_ID_PREFIX}${slug}`)
@@ -2854,8 +3553,14 @@ function withXaiSubscriptionCatalogProvider(settings) {
         { id: "standard", upstream: "supported", runnable: true },
         { id: "fast", upstream: "supported", runnable: true }
       ];
-      capabilities.hostedTools.xSearch = { upstream: "supported", runnable: true };
-      capabilities.hostedTools.imageGeneration = { upstream: "supported", runnable: true };
+      capabilities.hostedTools.xSearch = {
+        upstream: "supported",
+        runnable: true
+      };
+      capabilities.hostedTools.imageGeneration = {
+        upstream: "supported",
+        runnable: true
+      };
       return {
         id: `${XAI_SUBSCRIPTION_MODEL_ID_PREFIX}${slug}`,
         upstreamModelId: slug,
@@ -2871,7 +3576,10 @@ function withXaiSubscriptionCatalogProvider(settings) {
       };
     })
   };
-  return { ...settings, modelProvidersJson: JSON.stringify([...providers, provider]) };
+  return {
+    ...settings,
+    modelProvidersJson: JSON.stringify([...providers, provider])
+  };
 }
 function policyProviderIdForModel(settings, modelId) {
   const canonicalModelId = canonicalizeConfiguredModelId(settings, modelId);
@@ -2884,6 +3592,9 @@ function policyProviderIdForModel(settings, modelId) {
   if (canonicalModelId.startsWith(WORKSPACE_GATEWAY_MODEL_ID_PREFIX)) {
     return WORKSPACE_GATEWAY_PROVIDER_ID;
   }
+  if (canonicalModelId.startsWith(WORKSPACE_OPENROUTER_MODEL_ID_PREFIX)) {
+    return WORKSPACE_OPENROUTER_PROVIDER_ID;
+  }
   const configured = configuredModels(settings).find((model) => model.id === canonicalModelId);
   return configured?.providerId ?? builtinProviderId(settings);
 }
@@ -2896,10 +3607,14 @@ function resolvedExecutionLimits(settings, model) {
   };
 }
 function finalizeConfiguredModel(settings, provider, input) {
-  const requestPolicy = provider.kind === "vercel-gateway-managed" || provider.kind === "vercel-gateway-workspace" ? gatewayRequestPolicyForUpstreamModel(input.upstreamModelId) : void 0;
+  const requestPolicy = provider.kind === "vercel-gateway-managed" || provider.kind === "vercel-gateway-workspace" || provider.kind === "vercel-gateway-organization" ? gatewayRequestPolicyForUpstreamModel(
+    input.upstreamModelId,
+    configuredGatewayCatalogModels(settings)
+  ) : void 0;
   const modelWithoutVersion = {
     schemaVersion: 1,
     ...input,
+    cost: configuredCostForModel(settings, input.id, input.credentialSource),
     ...requestPolicy ? { requestPolicy } : {},
     executionLimits: resolvedExecutionLimits(settings, input)
   };
@@ -2939,10 +3654,10 @@ function assertUniqueModelIdentities(models) {
     }
   }
 }
-function configuredModels(settings) {
+function configuredModels(settings, source = process.env) {
   const builtinId = builtinProviderId(settings);
   const builtinLabel = builtinProviderLabel(settings);
-  const providers = configuredProviders(settings);
+  const providers = configuredProviders(settings, source);
   const providerById = new Map(providers.map((provider) => [provider.id, provider]));
   const pricingSchedules = configuredModelPricingSchedules(settings);
   const parsedRegistry = configuredRegistryProviders(settings);
@@ -3031,7 +3746,10 @@ function configuredModels(settings) {
     }
   }
   assertUniqueModelIdentities(out);
-  return out;
+  const defaultIndex = out.findIndex(
+    (model) => model.id === settings.openaiModel || model.aliases.includes(settings.openaiModel)
+  );
+  return defaultIndex > 0 ? [out[defaultIndex], ...out.slice(0, defaultIndex), ...out.slice(defaultIndex + 1)] : out;
 }
 function canonicalizeConfiguredModelId(settings, modelId) {
   const models = configuredModels(settings);
@@ -3066,10 +3784,32 @@ function settingsForTurnExecutionPolicy(settings, modelId) {
     return withXaiSubscriptionCatalogProvider(settings);
   }
   if (modelId.startsWith(WORKSPACE_GATEWAY_MODEL_ID_PREFIX)) {
+    if (resolveModelProvider(settings, modelId)) {
+      return settings;
+    }
     return withWorkspaceGatewayCatalogProvider(settings);
   }
+  if (modelId.startsWith(WORKSPACE_OPENROUTER_MODEL_ID_PREFIX)) {
+    if (resolveModelProvider(settings, modelId)) {
+      return settings;
+    }
+    return withWorkspaceOpenRouterCatalogProvider(settings);
+  }
+  if (modelId.startsWith(ORGANIZATION_GATEWAY_MODEL_ID_PREFIX)) {
+    return resolveModelProvider(settings, modelId) ? settings : withOrganizationGatewayCatalogProvider(settings);
+  }
+  if (modelId.startsWith(ORGANIZATION_OPENROUTER_MODEL_ID_PREFIX)) {
+    return resolveModelProvider(settings, modelId) ? settings : withOrganizationOpenRouterCatalogProvider(settings);
+  }
   return settings;
 }
+function resolveModelProviderForTurn(settings, modelId) {
+  const catalogSettings = settingsForTurnExecutionPolicy(settings, modelId);
+  return resolveModelProvider(
+    catalogSettings,
+    canonicalizeConfiguredModelId(catalogSettings, modelId)
+  );
+}
 function resolveTurnExecutionPolicyV1(settings, input) {
   const catalogSettings = settingsForTurnExecutionPolicy(settings, input.modelId);
   const productModelId = canonicalizeConfiguredModelId(catalogSettings, input.modelId);
@@ -3147,7 +3887,7 @@ function configuredModelPricingSchedules(settings) {
   const configured = Object.fromEntries(
     Object.entries(parseModelPricingJson(settings.modelPricingJson)).map(([model, pricing]) => [
       model,
-      { default: pricing }
+      normalizeModelPricingSchedule(pricing)
     ])
   );
   return {
@@ -3260,12 +4000,7 @@ function calculateModelUsageCostBreakdown(settings, model, usage, options) {
 function calculateGatewayReportedCostMicros(settings, model, inferenceCostUsd, options) {
   return calculateGatewayReportedCostBreakdown(settings, model, inferenceCostUsd, options).creditCostMicros;
 }
-function calculateGatewayReportedCostBreakdown(settings, model, inferenceCostUsd, options) {
-  const schedule = configuredModelPricingSchedules(settings)[model];
-  if (!schedule) {
-    throw new Error(`Missing model pricing for ${model}`);
-  }
-  const pricing = selectModelPricing(schedule, positiveInt(options?.inputTokens));
+function parseGatewayReportedCostDecimal(inferenceCostUsd) {
   const match = /^(0|[1-9]\d*)(?:\.(\d{1,18}))?$/.exec(inferenceCostUsd);
   if (!match) {
     throw new Error("Invalid AI Gateway inference cost");
@@ -3274,16 +4009,35 @@ function calculateGatewayReportedCostBreakdown(settings, model, inferenceCostUsd
   const decimalDigits = BigInt(`${match[1]}${fraction}`);
   const decimalScale = 10n ** BigInt(fraction.length);
   const providerNumerator = decimalDigits * 1000000n;
-  const providerMicros = (providerNumerator + decimalScale - 1n) / decimalScale;
+  const providerCostMicros = (providerNumerator + decimalScale - 1n) / decimalScale;
+  if (providerCostMicros > BigInt(Number.MAX_SAFE_INTEGER)) {
+    throw new Error("AI Gateway inference cost exceeds the supported billing range");
+  }
+  return {
+    providerNumerator,
+    decimalScale,
+    providerCostMicros: Number(providerCostMicros)
+  };
+}
+function calculateGatewayReportedProviderCostMicros(inferenceCostUsd) {
+  return parseGatewayReportedCostDecimal(inferenceCostUsd).providerCostMicros;
+}
+function calculateGatewayReportedCostBreakdown(settings, model, inferenceCostUsd, options) {
+  const schedule = configuredModelPricingSchedules(settings)[model];
+  if (!schedule) {
+    throw new Error(`Missing model pricing for ${model}`);
+  }
+  const pricing = selectModelPricing(schedule, positiveInt(options?.inputTokens));
+  const { providerNumerator, decimalScale, providerCostMicros } = parseGatewayReportedCostDecimal(inferenceCostUsd);
   const marginBps = BigInt(1e4 + (pricing.marginBps ?? 0));
   const numerator = providerNumerator * marginBps;
   const denominator = decimalScale * 10000n;
   const creditMicros = (numerator + denominator - 1n) / denominator;
-  if (providerMicros > BigInt(Number.MAX_SAFE_INTEGER) || creditMicros > BigInt(Number.MAX_SAFE_INTEGER)) {
+  if (creditMicros > BigInt(Number.MAX_SAFE_INTEGER)) {
     throw new Error("AI Gateway inference cost exceeds the supported billing range");
   }
   return {
-    providerCostMicros: Number(providerMicros),
+    providerCostMicros,
     creditCostMicros: Number(creditMicros)
   };
 }
@@ -3555,7 +4309,7 @@ function parseModelPricingJson(raw) {
     if (!model.trim()) {
       throw new Error("OPENGENI_MODEL_PRICING_JSON contains an empty model name");
     }
-    out[model] = ModelPricingSchema.parse(value);
+    out[model] = z.union([ModelPricingSchema, ModelPricingScheduleSchema]).parse(value);
   }
   return out;
 }
@@ -3739,9 +4493,14 @@ function calculateEntryCostMicros(pricing, entry) {
   const inputTokens = positiveInt(entry.inputTokens);
   const outputTokens = positiveInt(entry.outputTokens);
   const cachedTokens = Math.min(inputTokens, cachedInputTokens(entry));
-  const uncachedInputTokens = Math.max(0, inputTokens - cachedTokens);
+  const cacheWriteTokens = Math.min(
+    Math.max(0, inputTokens - cachedTokens),
+    cacheWriteInputTokens(entry)
+  );
+  const uncachedInputTokens = Math.max(0, inputTokens - cachedTokens - cacheWriteTokens);
   const cachedInputRate = pricing.cachedInputMicrosPerMillionTokens ?? pricing.inputMicrosPerMillionTokens;
-  return Math.ceil(uncachedInputTokens * pricing.inputMicrosPerMillionTokens / 1e6) + Math.ceil(cachedTokens * cachedInputRate / 1e6) + Math.ceil(outputTokens * pricing.outputMicrosPerMillionTokens / 1e6);
+  const cacheWriteRate = pricing.cacheWriteMicrosPerMillionTokens ?? pricing.inputMicrosPerMillionTokens;
+  return Math.ceil(uncachedInputTokens * pricing.inputMicrosPerMillionTokens / 1e6) + Math.ceil(cachedTokens * cachedInputRate / 1e6) + Math.ceil(cacheWriteTokens * cacheWriteRate / 1e6) + Math.ceil(outputTokens * pricing.outputMicrosPerMillionTokens / 1e6);
 }
 function cachedInputTokens(entry) {
   const details = Array.isArray(entry.inputTokensDetails) ? entry.inputTokensDetails : entry.inputTokensDetails ? [entry.inputTokensDetails] : [];
@@ -3751,6 +4510,14 @@ function cachedInputTokens(entry) {
   }
   return total;
 }
+function cacheWriteInputTokens(entry) {
+  const details = Array.isArray(entry.inputTokensDetails) ? entry.inputTokensDetails : entry.inputTokensDetails ? [entry.inputTokensDetails] : [];
+  let total = 0;
+  for (const detail of details) {
+    total += positiveInt(detail.cache_write_tokens ?? detail.cacheWriteTokens);
+  }
+  return total;
+}
 function positiveInt(value) {
   return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
 }
@@ -3863,8 +4630,13 @@ function isDigestPinnedModalDesktopImage(settings) {
   if (settings.modalImageId) return true;
   return typeof settings.modalImageRef === "string" && MODAL_DESKTOP_IMAGE_DIGEST_REF.test(settings.modalImageRef);
 }
-function validateSettings(settings) {
+function validateSettings(settings, source = process.env) {
   temporalConnectionOptions(settings);
+  if (settings.organizationUserSetupEmailTokenTransport === "query" && !settings.organizationUserSetupQueryEdgeSanitizationConfirmed) {
+    throw new Error(
+      "OPENGENI_ORGANIZATION_USER_SETUP_QUERY_EDGE_SANITIZATION_CONFIRMED=true is required when OPENGENI_ORGANIZATION_USER_SETUP_EMAIL_TOKEN_TRANSPORT=query"
+    );
+  }
   if (settings.goalIdleBackoffMs.some((delayMs) => delayMs > settings.goalIdleBackoffMaxMs)) {
     throw new Error(
       `OPENGENI_GOAL_IDLE_BACKOFF_MS entries must not exceed OPENGENI_GOAL_IDLE_BACKOFF_MAX_MS (${settings.goalIdleBackoffMaxMs})`
@@ -3942,6 +4714,24 @@ function validateSettings(settings) {
       );
     }
   }
+  if (settings.mcpOauthEnabled) {
+    if (settings.productAccessMode === "configured") {
+      throw new Error(
+        "OPENGENI_MCP_OAUTH_ENABLED=true requires managed or local product access mode"
+      );
+    }
+    const publicOrigin = canonicalPublicOrigin(settings.publicBaseUrl);
+    if (!publicOrigin) {
+      throw new Error(
+        "OPENGENI_PUBLIC_BASE_URL must be a credential-free HTTP(S) origin when OPENGENI_MCP_OAUTH_ENABLED=true"
+      );
+    }
+    if (!publicOrigin.startsWith("https://") && !["local", "test"].includes(settings.environment)) {
+      throw new Error(
+        "OPENGENI_PUBLIC_BASE_URL must use https when OPENGENI_MCP_OAUTH_ENABLED=true outside local/test"
+      );
+    }
+  }
   environmentsEncryptionKeyBytes(settings);
   if (settings.integrationsEnabled) {
     if (settings.productAccessMode === "managed" && !settings.publicBaseUrl) {
@@ -4132,15 +4922,6 @@ function validateSettings(settings) {
   if (settings.productAccessMode !== "managed" && settings.billingMode === "stripe") {
     throw new Error("OPENGENI_BILLING_MODE=stripe requires OPENGENI_PRODUCT_ACCESS_MODE=managed");
   }
-  if (settings.billingMode === "stripe" || settings.usageLimitsMode === "managed") {
-    const pricing = configuredModelPricing(settings);
-    const missing = configuredAllowedModels(settings).filter((model) => !pricing[model]);
-    if (missing.length > 0) {
-      throw new Error(
-        `Missing model pricing for managed billing model(s): ${missing.join(", ")}. Set OPENGENI_MODEL_PRICING_JSON.`
-      );
-    }
-  }
   if (settings.usageLimitsMode === "static") {
     const limits = configuredStaticUsageLimits(settings);
     if (Object.keys(limits).length === 0) {
@@ -4274,6 +5055,11 @@ function validateSettings(settings) {
       throw new Error(`OPENGENI_MCP_SERVERS contains duplicate id ${server.id}`);
     }
     serverIds.add(server.id);
+    if (server.connectionRef?.authoritySource === "host" && !settings.hostMcpAuthoritySourceAdmissionEnabled) {
+      throw new Error(
+        "OPENGENI_MCP_SERVERS host-owned connection refs require OPENGENI_HOST_MCP_AUTHORITY_SOURCE_ADMISSION_ENABLED=true after the whole API/worker fleet is upgraded"
+      );
+    }
   }
   {
     const reaperPeriod = settings.sandboxLeaseReaperPeriodMs;
@@ -4289,11 +5075,35 @@ function validateSettings(settings) {
         `OPENGENI_SANDBOX_LEASE_REAPER_PERIOD_MS (${reaperPeriod}) must be strictly less than OPENGENI_SANDBOX_INTERACTION_HOLDER_TTL_MS (${interactionTtl}): the reaper must run more often than the controller-heartbeat horizon.`
       );
     }
+    if (settings.sandboxDrainSnapshotTimeoutMs !== void 0) {
+      const drainCaptureTimeoutMs2 = sandboxArchiveCaptureTimeoutMs({
+        sandboxSnapshotTimeoutMs: effectiveSandboxDrainSnapshotTimeoutMs(settings)
+      });
+      const requiredTransitionWaitMs = reaperPeriod + drainCaptureTimeoutMs2 + SANDBOX_LIFECYCLE_RETRY_HANDOFF_GRACE_MS;
+      if (requiredTransitionWaitMs > SANDBOX_LIFECYCLE_TRANSITION_MAX_WAIT_MS) {
+        throw new Error(
+          `OPENGENI_SANDBOX_DRAIN_SNAPSHOT_TIMEOUT_MS (${settings.sandboxDrainSnapshotTimeoutMs}) requires a sandbox lifecycle transition wait of ${requiredTransitionWaitMs}ms after one reaper period and provider settlement, exceeding the ${SANDBOX_LIFECYCLE_TRANSITION_MAX_WAIT_MS}ms limit. Lower the drain snapshot timeout or OPENGENI_SANDBOX_LEASE_REAPER_PERIOD_MS.`
+        );
+      }
+    }
+    const rotationLeadMs = settings.sandboxRotationLeadMs;
+    const ordinaryCaptureTimeoutMs = sandboxArchiveCaptureTimeoutMs(settings);
+    const drainCaptureTimeoutMs = sandboxArchiveCaptureTimeoutMs({
+      sandboxSnapshotTimeoutMs: effectiveSandboxDrainSnapshotTimeoutMs(settings)
+    });
+    const providerDeadlineCaptureTimeoutMs = Math.max(
+      ordinaryCaptureTimeoutMs,
+      drainCaptureTimeoutMs
+    );
+    if (!(rotationLeadMs > providerDeadlineCaptureTimeoutMs + reaperPeriod)) {
+      throw new Error(
+        `OPENGENI_SANDBOX_ROTATION_LEAD_MS (${rotationLeadMs}) must exceed the largest durable snapshot or drain capture timeout plus one reaper period (${providerDeadlineCaptureTimeoutMs + reaperPeriod}), including for persisted Modal leases after a default-backend rollout.`
+      );
+    }
     if (settings.sandboxBackend === "modal") {
       const idleGraceMs = settings.sandboxIdleGraceMs;
       const lifecycle = effectiveSandboxLifecycle(settings, "modal");
       const providerLifetimeMs = lifecycle.hardLifetimeMs;
-      const rotationLeadMs = lifecycle.rotationLeadMs;
       const idleTimeoutMs = lifecycle.providerIdleTimeoutMs;
       if (!(idleTimeoutMs <= providerLifetimeMs)) {
         throw new Error(
@@ -4305,12 +5115,6 @@ function validateSettings(settings) {
           `OPENGENI_SANDBOX_ROTATION_LEAD_MS (${rotationLeadMs}) must be strictly less than OPENGENI_MODAL_TIMEOUT_SECONDS*1000 (${providerLifetimeMs}).`
         );
       }
-      const captureTimeoutMs = sandboxArchiveCaptureTimeoutMs(settings);
-      if (!(rotationLeadMs > captureTimeoutMs + reaperPeriod)) {
-        throw new Error(
-          `OPENGENI_SANDBOX_ROTATION_LEAD_MS (${rotationLeadMs}) must exceed the durable capture timeout plus one reaper period (${captureTimeoutMs + reaperPeriod}).`
-        );
-      }
       if (!(viewerTtl < idleTimeoutMs)) {
         throw new Error(
           `OPENGENI_SANDBOX_VIEWER_HOLDER_TTL_MS (${viewerTtl}) must be strictly less than the effective box idle timeout (${idleTimeoutMs}): a viewer holder must be reapable before the box idles out from under it (the provider idle-timeout is the backstop).`
@@ -4340,15 +5144,29 @@ function validateSettings(settings) {
       "[opengeni] OPENGENI_SANDBOX_DESKTOP_ENABLED=true but neither OPENGENI_STREAM_TOKEN_SECRET nor OPENGENI_DELEGATION_SECRET is set: the desktop pixel plane will GRACEFULLY DEGRADE (DesktopStream.transport=null \u2014 no scoped stream tokens can be minted). Set OPENGENI_STREAM_TOKEN_SECRET to enable the live desktop stream."
     );
   }
+  if (settings.modelCatalogSource === "code") {
+    validateModelCatalogSettings(settings, source);
+  } else {
+    parseModelCostPolicyJson(settings.modelCostPolicyJson);
+  }
+}
+function validateModelCatalogSettings(settings, source = process.env) {
+  const costPolicy = parseModelCostPolicyJson(settings.modelCostPolicyJson);
+  const notes = parseModelNotesJson(settings.modelNotesJson);
   const registryProviders = parseModelProvidersJson(settings.modelProvidersJson);
   const builtinId = builtinProviderId(settings);
   const providerIds = /* @__PURE__ */ new Set();
   for (const provider of registryProviders) {
-    if (provider.kind === "vercel-gateway-managed" || provider.kind === "vercel-gateway-workspace" || provider.kind === "xai-subscription") {
+    if (provider.kind === "vercel-gateway-managed" || provider.kind === "vercel-gateway-workspace" || provider.kind === "vercel-gateway-organization" || provider.kind === "openrouter-workspace" || provider.kind === "openrouter-organization" || provider.kind === "xai-subscription") {
       throw new Error(
         `OPENGENI_MODEL_PROVIDERS_JSON provider kind ${provider.kind} is reserved for a reviewed OpenGeni credential broker`
       );
     }
+    if (RESERVED_MODEL_PROVIDER_IDS.has(provider.id)) {
+      throw new Error(
+        `OPENGENI_MODEL_PROVIDERS_JSON provider id ${provider.id} is reserved for a reviewed OpenGeni provider`
+      );
+    }
     if (provider.id === builtinId) {
       throw new Error(
         `OPENGENI_MODEL_PROVIDERS_JSON provider id ${provider.id} collides with the built-in provider id`
@@ -4360,13 +5178,66 @@ function validateSettings(settings) {
       );
     }
     providerIds.add(provider.id);
-    if (provider.kind !== "codex-subscription" && provider.kind !== "anonymous" && !resolveProviderApiKey(provider)) {
+    if (provider.kind !== "codex-subscription" && provider.kind !== "anonymous" && !resolveProviderApiKey(provider, source)) {
       throw new Error(
         `OPENGENI_MODEL_PROVIDERS_JSON provider ${provider.id} requires a resolvable API key (set apiKey or apiKeyEnv)`
       );
     }
   }
-  configuredModels(settings);
+  const models = configuredModels(settings, source);
+  const defaultCatalogSettings = settingsForTurnExecutionPolicy(settings, settings.openaiModel);
+  const defaultCatalogModels = defaultCatalogSettings === settings ? models : configuredModels(defaultCatalogSettings, source);
+  if (models.length === 0 && defaultCatalogModels.length === 0) {
+    throw new Error("The resolved model catalog contains no executable models");
+  }
+  const defaultModelId = canonicalizeConfiguredModelId(
+    defaultCatalogSettings,
+    settings.openaiModel
+  );
+  if (!defaultCatalogModels.some((model) => model.id === defaultModelId)) {
+    throw new Error(
+      `The default model ${settings.openaiModel} is not executable in the resolved model catalog`
+    );
+  }
+  const deploymentProductIds = new Set(
+    models.filter((model) => model.credentialSource.kind === "deployment").map((model) => model.id)
+  );
+  const noteProductIds = new Set(models.map((model) => model.id));
+  for (const model of configuredGatewayCatalogModels(settings)) {
+    deploymentProductIds.add(model.productId);
+    noteProductIds.add(model.productId);
+    noteProductIds.add(model.workspaceProductId);
+  }
+  for (const model of configuredOpenRouterCatalogModels(settings)) {
+    const productId = `${OPENROUTER_MODEL_ID_PREFIX}${model.upstreamModelId}`;
+    deploymentProductIds.add(productId);
+    noteProductIds.add(productId);
+    noteProductIds.add(`${WORKSPACE_OPENROUTER_MODEL_ID_PREFIX}${model.upstreamModelId}`);
+  }
+  if (settings.modelCatalogSource === "code") {
+    for (const productId of Object.keys(costPolicy)) {
+      if (!deploymentProductIds.has(productId)) {
+        throw new Error(
+          `OPENGENI_MODEL_COST_POLICY_JSON references unknown deployment model ${productId}`
+        );
+      }
+    }
+  }
+  for (const productId of Object.keys(notes)) {
+    if (!noteProductIds.has(productId)) {
+      throw new Error(`OPENGENI_MODEL_NOTES_JSON references unknown catalog model ${productId}`);
+    }
+  }
+  if (settings.billingMode === "stripe" || settings.usageLimitsMode === "managed") {
+    const pricing = configuredModelPricing(settings);
+    const missing = models.filter((model) => model.cost === "credits" && !pricing[model.id]).map((model) => model.id);
+    if (missing.length > 0) {
+      throw new Error(
+        `Missing model pricing for managed billing model(s): ${missing.join(", ")}. Set OPENGENI_MODEL_PRICING_JSON.`
+      );
+    }
+  }
+  return models;
 }
 function resolveStreamTokenSecret(settings) {
   const explicit = settings.streamTokenSecret?.trim();
@@ -4456,19 +5327,35 @@ export {
   CODEX_REALTIME_MODEL_ID,
   CapabilityStateV1Schema,
   CapabilitySupportV1,
+  ConfiguredModelCostClass,
   DEFAULT_AGENT_INSTRUCTIONS,
   DEFAULT_GOAL_IDLE_BACKOFF_MAX_MS,
   DEFAULT_GOAL_IDLE_BACKOFF_MS,
+  DEFAULT_MODAL_IMAGE_REF,
+  DEFAULT_MODEL_COST_POLICY_JSON,
+  DEFAULT_OPENROUTER_MODEL_ID,
   GOOGLE_DRIVE_PROVIDER_REQUEST_TIMEOUT_MAX_MS,
   GOOGLE_DRIVE_PROVIDER_RETRY_DELAY_MAX_MS,
+  GatewayCatalogModel,
   IntegrationOAuthClientConfigSchema,
   McpServerConnectionRefSchema,
   ModelCapabilitiesV1Schema,
+  ModelCatalogDocument,
+  ModelCostClass,
   ModelProviderApi,
   ModelProviderWireProfile,
   OPENGENI_GATEWAY_MODELS,
   OPENGENI_GATEWAY_PROVIDER_ID,
+  OPENGENI_OPENROUTER_MODELS,
   OPENGENI_REALTIME_MODEL_ID_PREFIX,
+  OPENROUTER_BASE_URL,
+  OPENROUTER_MODEL_ID_PREFIX,
+  OPENROUTER_PROVIDER_ID,
+  ORGANIZATION_GATEWAY_MODEL_ID_PREFIX,
+  ORGANIZATION_GATEWAY_PROVIDER_ID,
+  ORGANIZATION_OPENROUTER_MODEL_ID_PREFIX,
+  ORGANIZATION_OPENROUTER_PROVIDER_ID,
+  OpenRouterCatalogModel,
   RegistryProviderKind,
   SANDBOX_ARCHIVE_CAPTURE_MAX_TIMEOUT_MS,
   SANDBOX_ARCHIVE_CAPTURE_SETTLEMENT_GRACE_MS,
@@ -4484,14 +5371,20 @@ export {
   VERCEL_AI_GATEWAY_CONNECTION_ROLE,
   WORKSPACE_GATEWAY_MODEL_ID_PREFIX,
   WORKSPACE_GATEWAY_PROVIDER_ID,
+  WORKSPACE_OPENROUTER_CONNECTION_DOMAIN,
+  WORKSPACE_OPENROUTER_CONNECTION_ROLE,
+  WORKSPACE_OPENROUTER_MODEL_ID_PREFIX,
+  WORKSPACE_OPENROUTER_PROVIDER_ID,
   WORKSPACE_REALTIME_MODEL_ID_PREFIX,
   XAI_SUBSCRIPTION_MODEL_ID_PREFIX2 as XAI_SUBSCRIPTION_MODEL_ID_PREFIX,
   allowedFirstPartyMcpToolsForSession,
   applyGitAuthPointerEnvironment,
+  applyModelCatalogDocument,
   assertTurnExecutionPolicyMatchesConfigV1,
   builtinProviderId,
   calculateGatewayReportedCostBreakdown,
   calculateGatewayReportedCostMicros,
+  calculateGatewayReportedProviderCostMicros,
   calculateModelUsageCostBreakdown,
   calculateModelUsageCostMicros,
   calculateVideoGenerationCreditCostMicros,
@@ -4503,16 +5396,25 @@ export {
   configuredAllowedModels,
   configuredAllowedReasoningEfforts,
   configuredEntitlements,
+  configuredGatewayOrganizationProductModelIds,
+  configuredGatewayUpstreamModelIds,
+  configuredGatewayWorkspaceProductModelIds,
   configuredGoogleDriveSyncLimits,
+  configuredModelInputIdentities,
+  configuredModelNotes,
   configuredModelPricing,
   configuredModelPricingSchedules,
   configuredModels,
+  configuredOpenRouterOrganizationProductModelIds,
+  configuredOpenRouterUpstreamModelIds,
+  configuredOpenRouterWorkspaceProductModelIds,
   configuredProviders,
   configuredStaticUsageLimits,
   contextInputBudgetTokens,
   dbSearchPath,
   defaultModelPricing,
   effectiveModalIdleTimeoutSeconds,
+  effectiveSandboxDrainSnapshotTimeoutMs,
   effectiveSandboxLifecycle,
   environmentsEncryptionKeyBytes,
   firstPartyMcpBaseUrl,
@@ -4527,9 +5429,13 @@ export {
   hasGitHubRepositorySelection,
   isDirectOpenAiApiBaseUrl,
   isUsableVoiceInputSecret,
+  modelCostClassForConfiguredModel,
   parseExposedPorts,
   parseIntegrationsOauthClientsJson,
   parseMcpServers,
+  parseModelCatalogDocument,
+  parseModelCostPolicyJson,
+  parseModelNotesJson,
   parseModelPricingJson,
   parseModelProvidersJson,
   parseSandboxWarmRateJson,
@@ -4546,6 +5452,7 @@ export {
   resolveFirstPartyDelegationSecret,
   resolveFirstPartyMcpToolPolicy,
   resolveModelProvider,
+  resolveModelProviderForTurn,
   resolveNatsCalloutConfig,
   resolveNatsControlPlaneAuth,
   resolveProviderApiKey,
@@ -4569,10 +5476,17 @@ export {
   startupRetryOptions,
   streamTokenDegraded,
   temporalConnectionOptions,
+  validateModelCatalogSettings,
   voiceInputDeploymentConfigured,
   withCodexCatalogProvider,
+  withOrganizationGatewayCatalogProvider,
+  withOrganizationGatewayCredential,
+  withOrganizationOpenRouterCatalogProvider,
+  withOrganizationOpenRouterCredential,
   withWorkspaceGatewayCatalogProvider,
   withWorkspaceGatewayCredential,
+  withWorkspaceOpenRouterCatalogProvider,
+  withWorkspaceOpenRouterCredential,
   withXaiSubscriptionCatalogProvider
 };
 //# sourceMappingURL=index.js.map