The open-source agent harness - the runtime layer that turns an LLM into a working agent.
Limit well-known model provider types to one configured provider (#64)
pranjaltrvda705c065ed50
diff --git a/fern/openapi/openapi.json b/fern/openapi/openapi.jsonindex 8927c905d..6266ee462 100644--- a/fern/openapi/openapi.json+++ b/fern/openapi/openapi.json@@ -194,6 +194,86 @@],"description": "Agent Definition"},+ "AlibabaModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "alibaba",+ "enum": [+ "alibaba"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "alibaba"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },+ "AnthropicModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://api.anthropic.com/v1",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "anthropic",+ "enum": [+ "anthropic"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "anthropic"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },"ApprovalAllow": {"properties": {"status": {@@ -317,44 +397,6 @@],"type": "object"},- "CallerSuppliedModelProvider": {- "additionalProperties": false,- "properties": {- "auth": {- "$ref": "#/components/schemas/ModelProviderAuth"- },- "base_url": {- "description": "Base URL of the provider's API.",- "format": "uri",- "type": "string"- },- "models": {- "items": {- "$ref": "#/components/schemas/ModelEntry"- },- "minItems": 1,- "type": "array"- },- "name": {- "$ref": "#/components/schemas/ResourceName"- },- "type": {- "enum": [- "alibaba",- "custom"- ],- "type": "string"- }- },- "required": [- "auth",- "models",- "type",- "base_url",- "name"- ],- "type": "object"- },"CancelSessionRequest": {"properties": {},"type": "object"@@ -461,8 +503,8 @@"fireworks","zai","moonshot",- "together",- "alibaba"+ "alibaba",+ "together"],"type": "string"}@@ -738,6 +780,43 @@},"type": "object"},+ "CustomModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "description": "Base URL of the provider's API.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "$ref": "#/components/schemas/ResourceName"+ },+ "type": {+ "enum": [+ "custom"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type",+ "name",+ "base_url"+ ],+ "type": "object"+ },"DaytonaSandboxProvider": {"additionalProperties": false,"properties": {@@ -861,6 +940,46 @@],"type": "string"},+ "FireworksModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://api.fireworks.ai/inference/v1",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "fireworks",+ "enum": [+ "fireworks"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "fireworks"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },"GenerativeUIConfig": {"default": {"enabled": true@@ -1025,6 +1144,46 @@],"type": "object"},+ "GoogleGeminiModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://generativelanguage.googleapis.com/v1beta",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "google-gemini",+ "enum": [+ "google-gemini"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "google-gemini"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },"LargeToolResponseConfig": {"default": {"enabled": true@@ -1877,12 +2036,47 @@"type": "object"},"ModelProvider": {- "anyOf": [+ "discriminator": {+ "mapping": {+ "alibaba": "#/components/schemas/AlibabaModelProvider",+ "anthropic": "#/components/schemas/AnthropicModelProvider",+ "custom": "#/components/schemas/CustomModelProvider",+ "fireworks": "#/components/schemas/FireworksModelProvider",+ "google-gemini": "#/components/schemas/GoogleGeminiModelProvider",+ "moonshot": "#/components/schemas/MoonshotModelProvider",+ "openai": "#/components/schemas/OpenAiModelProvider",+ "together": "#/components/schemas/TogetherModelProvider",+ "zai": "#/components/schemas/ZaiModelProvider"+ },+ "propertyName": "type"+ },+ "oneOf": [+ {+ "$ref": "#/components/schemas/OpenAiModelProvider"+ },+ {+ "$ref": "#/components/schemas/AnthropicModelProvider"+ },+ {+ "$ref": "#/components/schemas/GoogleGeminiModelProvider"+ },+ {+ "$ref": "#/components/schemas/FireworksModelProvider"+ },+ {+ "$ref": "#/components/schemas/ZaiModelProvider"+ },+ {+ "$ref": "#/components/schemas/MoonshotModelProvider"+ },{- "$ref": "#/components/schemas/WellKnownModelProvider"+ "$ref": "#/components/schemas/TogetherModelProvider"},{- "$ref": "#/components/schemas/CallerSuppliedModelProvider"+ "$ref": "#/components/schemas/AlibabaModelProvider"+ },+ {+ "$ref": "#/components/schemas/CustomModelProvider"}]},@@ -1899,6 +2093,86 @@],"type": "object"},+ "MoonshotModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://api.moonshot.ai/v1",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "moonshot",+ "enum": [+ "moonshot"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "moonshot"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },+ "OpenAiModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://api.openai.com/v1",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "openai",+ "enum": [+ "openai"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "openai"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },"PreviousTurnIdInput": {"anyOf": [{@@ -2679,6 +2953,46 @@],"type": "object"},+ "TogetherModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "default": "https://api.together.xyz/v1",+ "description": "Override of the provider's default API base URL.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "items": {+ "$ref": "#/components/schemas/ModelEntry"+ },+ "minItems": 1,+ "type": "array"+ },+ "name": {+ "default": "together",+ "enum": [+ "together"+ ],+ "type": "string"+ },+ "type": {+ "enum": [+ "together"+ ],+ "type": "string"+ }+ },+ "required": [+ "auth",+ "models",+ "type"+ ],+ "type": "object"+ },"TokenPagination": {"properties": {"limit": {@@ -3411,14 +3725,15 @@],"type": "object"},- "WellKnownModelProvider": {+ "ZaiModelProvider": {"additionalProperties": false,"properties": {"auth": {"$ref": "#/components/schemas/ModelProviderAuth"},"base_url": {- "description": "Optional override of the provider's default API base URL.",+ "default": "https://api.z.ai/api/paas/v4",+ "description": "Override of the provider's default API base URL.","format": "uri","type": "string"},@@ -3430,17 +3745,15 @@"type": "array"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "default": "zai",+ "enum": [+ "zai"+ ],+ "type": "string"},"type": {"enum": [- "openai",- "anthropic",- "google-gemini",- "fireworks",- "zai",- "moonshot",- "together"+ "zai"],"type": "string"}@@ -3448,8 +3761,7 @@"required": ["auth","models",- "type",- "name"+ "type"],"type": "object"}@@ -5301,7 +5613,7 @@"x-fern-sdk-method-name": "list"},"put": {- "description": "Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).",+ "description": "Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included). Every type but `custom` is named after itself, so each is limited to one configured provider and a repeat call replaces it; only `custom` providers are named, and numbered, by the caller.","requestBody": {"content": {"application/json": {diff --git a/packages/frontend/src/modelProviderCatalog.ts b/packages/frontend/src/modelProviderCatalog.tsindex aab7ab003..69dbbba81 100644--- a/packages/frontend/src/modelProviderCatalog.ts+++ b/packages/frontend/src/modelProviderCatalog.ts@@ -45,10 +45,12 @@ export function toHarnessModelEntry(model: UiModelEntry): Harness.ModelEntry {}export function toUiModelProvider(provider: Harness.ModelProvider): UiModelProvider {+ // Every type but `custom` is named after itself, so the wire leaves `name` optional.+ const name = provider.name ?? provider.type;return {- id: provider.name,+ id: name,type: provider.type,- name: provider.name,+ name,...(provider.baseUrl === undefined ? {} : { baseUrl: provider.baseUrl }),models: provider.models.map(toUiModelEntry),};@@ -62,15 +64,11 @@ export function toUiCatalogEntry(provider: Harness.CatalogProvider): UiModelProv};}-const WELL_KNOWN_TYPES: readonly string[] = Object.values(Harness.WellKnownModelProviderType);-const CALLER_SUPPLIED_TYPES: readonly string[] = Object.values(Harness.CallerSuppliedModelProviderType);--function isWellKnownType(type: string): type is Harness.WellKnownModelProviderType {- return WELL_KNOWN_TYPES.includes(type);-}+/** The catalog lists every type but `custom`, which only exists as tenant configuration. */+const PROVIDER_TYPES: readonly string[] = [...Object.values(Harness.CatalogProviderType), 'custom'];-function isCallerSuppliedType(type: string): type is Harness.CallerSuppliedModelProviderType {- return CALLER_SUPPLIED_TYPES.includes(type);+function isProviderType(type: string): type is Harness.ModelProvider['type'] {+ return PROVIDER_TYPES.includes(type);}export function toHarnessModelProvider(req: {@@ -82,28 +80,21 @@ export function toHarnessModelProvider(req: {}): Harness.ModelProvider {const models = req.models.map(toHarnessModelEntry);const auth = { apiKey: req.apiKey };- if (isWellKnownType(req.type)) {- return {- type: req.type,- name: req.name,- auth,- models,- ...(req.baseUrl === undefined ? {} : { baseUrl: req.baseUrl }),- };+ if (!isProviderType(req.type)) {+ throw new Error(`Unsupported model provider type: ${req.type}`);}- if (isCallerSuppliedType(req.type)) {- if (req.baseUrl === undefined || req.baseUrl.trim() === '') {+ const baseUrl = req.baseUrl?.trim() === '' ? undefined : req.baseUrl;+ // Only `custom` is named by its caller; the API names the rest after their type.+ if (req.type === 'custom') {+ if (baseUrl === undefined) {throw new Error(`Model providers of type "${req.type}" require a base URL`);}- return {- type: req.type,- name: req.name,- auth,- models,- baseUrl: req.baseUrl,- };+ return { type: req.type, name: req.name, auth, models, baseUrl };+ }+ if (baseUrl !== undefined) {+ return { type: req.type, auth, models, baseUrl };}- throw new Error(`Unsupported model provider type: ${req.type}`);+ return { type: req.type, auth, models };}async function resolveApiKey(req: { id?: string; apiKey: string }): Promise<string> {@@ -115,7 +106,7 @@ async function resolveApiKey(req: { id?: string; apiKey: string }): Promise<strithrow new Error('API key is required');}const listed = await client.settings.modelProviders.list();- const existing = listed.data.find(provider => provider.name === req.id);+ const existing = listed.data.find(provider => toUiModelProvider(provider).id === req.id);if (existing === undefined) {throw new Error(`Model provider "${req.id}" not found`);}diff --git a/packages/frontend/tests/modelProviderCatalog.test.ts b/packages/frontend/tests/modelProviderCatalog.test.tsindex 5e608669a..930fc5382 100644--- a/packages/frontend/tests/modelProviderCatalog.test.ts+++ b/packages/frontend/tests/modelProviderCatalog.test.ts@@ -109,9 +109,9 @@ describe('modelProviderCatalog mappers', () => {},],}),+ // No name: a well-known provider is named after its type by the API.{type: 'openai',- name: 'openai',auth: { apiKey: 'sk-test' },models: [{@@ -163,10 +163,7 @@ describe('modelProviderCatalog mappers', () => {// Catalog presets are copied straight into this form, so a type the API accepts but this mapper// does not is a preset the user cannot save.it('builds a body for every provider type the API accepts', () => {- const types = [- ...Object.values(TrueForgeApi.WellKnownModelProviderType),- ...Object.values(TrueForgeApi.CallerSuppliedModelProviderType),- ];+ const types = [...Object.values(TrueForgeApi.CatalogProviderType), 'custom'];for (const type of types) {const body = toHarnessModelProvider({type,diff --git a/packages/sdk/.fern/metadata.json b/packages/sdk/.fern/metadata.jsonindex 9b7a311ce..c3b3e74a3 100644--- a/packages/sdk/.fern/metadata.json+++ b/packages/sdk/.fern/metadata.json@@ -27,9 +27,10 @@"streamType": "web","useDefaultRequestParameterValues": true},- "originGitCommit": "1819002252c4073d5d0ebf0cc6488a32a481594e",+ "originGitCommit": "eab25dc9e6f0b57dd676d78befe0a33b5dbda76d","originGitCommitIsDirty": true,- "invokedBy": "manual",+ "invokedBy": "ci","requestedVersion": "0.0.0",+ "ciProvider": "github","sdkVersion": "0.0.0"}diff --git a/packages/sdk/reference.md b/packages/sdk/reference.mdindex bfcf6335e..c734ecf35 100644--- a/packages/sdk/reference.md+++ b/packages/sdk/reference.md@@ -2026,7 +2026,7 @@ await client.settings.modelProviders.list();<dl><dd>-Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).+Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included). Every type but `custom` is named after itself, so each is limited to one configured provider and a repeat call replaces it; only `custom` providers are named, and numbered, by the caller.</dd></dl></dd>@@ -2050,8 +2050,7 @@ await client.settings.modelProviders.upsert({name: "name",properties: {}}],- name: "name",- type: "openai"+ type: "alibaba"});```diff --git a/packages/sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts b/packages/sdk/src/api/resources/settings/resources/modelProviders/client/Client.tsindex 8dbba3461..17f7dfe51 100644--- a/packages/sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts+++ b/packages/sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts@@ -89,7 +89,7 @@ export class ModelProvidersClient {}/**- * Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).+ * Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included). Every type but `custom` is named after itself, so each is limited to one configured provider and a repeat call replaces it; only `custom` providers are named, and numbered, by the caller.** @param {TrueForge.ModelProvider} request* @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.@@ -108,8 +108,7 @@ export class ModelProvidersClient {* name: "name",* properties: {}* }],- * name: "name",- * type: "openai"+ * type: "alibaba"* })*/public upsert(diff --git a/packages/sdk/src/api/types/WellKnownModelProvider.ts b/packages/sdk/src/api/types/AlibabaModelProvider.tssimilarity index 52%rename from packages/sdk/src/api/types/WellKnownModelProvider.tsrename to packages/sdk/src/api/types/AlibabaModelProvider.tsindex 7a88f25c3..82d700bf1 100644--- a/packages/sdk/src/api/types/WellKnownModelProvider.ts+++ b/packages/sdk/src/api/types/AlibabaModelProvider.ts@@ -2,11 +2,11 @@import type * as TrueForge from "../index.js";-export interface WellKnownModelProvider {+export interface AlibabaModelProvider {auth: TrueForge.ModelProviderAuth;- /** Optional override of the provider's default API base URL. */+ /** Override of the provider's default API base URL. */baseUrl?: string;models: TrueForge.ModelEntry[];- name: TrueForge.ResourceName;- type: TrueForge.WellKnownModelProviderType;+ name?: "alibaba";+ type: "alibaba";}diff --git a/packages/sdk/src/api/types/AnthropicModelProvider.ts b/packages/sdk/src/api/types/AnthropicModelProvider.tsnew file mode 100644index 000000000..0197a2721--- /dev/null+++ b/packages/sdk/src/api/types/AnthropicModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface AnthropicModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "anthropic";+ type: "anthropic";+}diff --git a/packages/sdk/src/api/types/CallerSuppliedModelProviderType.ts b/packages/sdk/src/api/types/CallerSuppliedModelProviderType.tsdeleted file mode 100644index 41edbef22..000000000--- a/packages/sdk/src/api/types/CallerSuppliedModelProviderType.ts+++ /dev/null@@ -1,8 +0,0 @@-// This file was auto-generated by Fern from our API Definition.--export const CallerSuppliedModelProviderType = {- Alibaba: "alibaba",- Custom: "custom",-} as const;-export type CallerSuppliedModelProviderType =- (typeof CallerSuppliedModelProviderType)[keyof typeof CallerSuppliedModelProviderType];diff --git a/packages/sdk/src/api/types/CatalogProviderType.ts b/packages/sdk/src/api/types/CatalogProviderType.tsindex eb12330ed..36e8eb584 100644--- a/packages/sdk/src/api/types/CatalogProviderType.ts+++ b/packages/sdk/src/api/types/CatalogProviderType.ts@@ -7,7 +7,7 @@ export const CatalogProviderType = {Fireworks: "fireworks",Zai: "zai",Moonshot: "moonshot",- Together: "together",Alibaba: "alibaba",+ Together: "together",} as const;export type CatalogProviderType = (typeof CatalogProviderType)[keyof typeof CatalogProviderType];diff --git a/packages/sdk/src/api/types/CallerSuppliedModelProvider.ts b/packages/sdk/src/api/types/CustomModelProvider.tssimilarity index 74%rename from packages/sdk/src/api/types/CallerSuppliedModelProvider.tsrename to packages/sdk/src/api/types/CustomModelProvider.tsindex a90092dfe..2295019ab 100644--- a/packages/sdk/src/api/types/CallerSuppliedModelProvider.ts+++ b/packages/sdk/src/api/types/CustomModelProvider.ts@@ -2,11 +2,11 @@import type * as TrueForge from "../index.js";-export interface CallerSuppliedModelProvider {+export interface CustomModelProvider {auth: TrueForge.ModelProviderAuth;/** Base URL of the provider's API. */baseUrl: string;models: TrueForge.ModelEntry[];name: TrueForge.ResourceName;- type: TrueForge.CallerSuppliedModelProviderType;+ type: "custom";}diff --git a/packages/sdk/src/api/types/FireworksModelProvider.ts b/packages/sdk/src/api/types/FireworksModelProvider.tsnew file mode 100644index 000000000..0c627a9a3--- /dev/null+++ b/packages/sdk/src/api/types/FireworksModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface FireworksModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "fireworks";+ type: "fireworks";+}diff --git a/packages/sdk/src/api/types/GoogleGeminiModelProvider.ts b/packages/sdk/src/api/types/GoogleGeminiModelProvider.tsnew file mode 100644index 000000000..74c3a10d7--- /dev/null+++ b/packages/sdk/src/api/types/GoogleGeminiModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface GoogleGeminiModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "google-gemini";+ type: "google-gemini";+}diff --git a/packages/sdk/src/api/types/ModelProvider.ts b/packages/sdk/src/api/types/ModelProvider.tsindex 62c07f7e9..1e77ef3f0 100644--- a/packages/sdk/src/api/types/ModelProvider.ts+++ b/packages/sdk/src/api/types/ModelProvider.ts@@ -2,4 +2,13 @@import type * as TrueForge from "../index.js";-export type ModelProvider = TrueForge.WellKnownModelProvider | TrueForge.CallerSuppliedModelProvider;+export type ModelProvider =+ | TrueForge.AlibabaModelProvider+ | TrueForge.AnthropicModelProvider+ | TrueForge.CustomModelProvider+ | TrueForge.FireworksModelProvider+ | TrueForge.GoogleGeminiModelProvider+ | TrueForge.MoonshotModelProvider+ | TrueForge.OpenAiModelProvider+ | TrueForge.TogetherModelProvider+ | TrueForge.ZaiModelProvider;diff --git a/packages/sdk/src/api/types/MoonshotModelProvider.ts b/packages/sdk/src/api/types/MoonshotModelProvider.tsnew file mode 100644index 000000000..4a2db888a--- /dev/null+++ b/packages/sdk/src/api/types/MoonshotModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface MoonshotModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "moonshot";+ type: "moonshot";+}diff --git a/packages/sdk/src/api/types/OpenAiModelProvider.ts b/packages/sdk/src/api/types/OpenAiModelProvider.tsnew file mode 100644index 000000000..536816989--- /dev/null+++ b/packages/sdk/src/api/types/OpenAiModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface OpenAiModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "openai";+ type: "openai";+}diff --git a/packages/sdk/src/api/types/TogetherModelProvider.ts b/packages/sdk/src/api/types/TogetherModelProvider.tsnew file mode 100644index 000000000..936e99ec4--- /dev/null+++ b/packages/sdk/src/api/types/TogetherModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface TogetherModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "together";+ type: "together";+}diff --git a/packages/sdk/src/api/types/WellKnownModelProviderType.ts b/packages/sdk/src/api/types/WellKnownModelProviderType.tsdeleted file mode 100644index 52a950bf0..000000000--- a/packages/sdk/src/api/types/WellKnownModelProviderType.ts+++ /dev/null@@ -1,12 +0,0 @@-// This file was auto-generated by Fern from our API Definition.--export const WellKnownModelProviderType = {- Openai: "openai",- Anthropic: "anthropic",- GoogleGemini: "google-gemini",- Fireworks: "fireworks",- Zai: "zai",- Moonshot: "moonshot",- Together: "together",-} as const;-export type WellKnownModelProviderType = (typeof WellKnownModelProviderType)[keyof typeof WellKnownModelProviderType];diff --git a/packages/sdk/src/api/types/ZaiModelProvider.ts b/packages/sdk/src/api/types/ZaiModelProvider.tsnew file mode 100644index 000000000..a34861fe2--- /dev/null+++ b/packages/sdk/src/api/types/ZaiModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface ZaiModelProvider {+ auth: TrueForge.ModelProviderAuth;+ /** Override of the provider's default API base URL. */+ baseUrl?: string;+ models: TrueForge.ModelEntry[];+ name?: "zai";+ type: "zai";+}diff --git a/packages/sdk/src/api/types/index.ts b/packages/sdk/src/api/types/index.tsindex 1763a2c2d..d1c07853e 100644--- a/packages/sdk/src/api/types/index.ts+++ b/packages/sdk/src/api/types/index.ts@@ -5,6 +5,8 @@ export * from "./AgentParent.js";export * from "./AgentSpec.js";export * from "./AgentSpecModel.js";export * from "./AgentSpecUserMessage.js";+export * from "./AlibabaModelProvider.js";+export * from "./AnthropicModelProvider.js";export * from "./ApprovalAllow.js";export * from "./ApprovalDecision.js";export * from "./ApprovalDeny.js";@@ -13,8 +15,6 @@ export * from "./AuthMeResponse.js";export * from "./AuthRole.js";export * from "./BaseMcpAuthRequiredEvent.js";export * from "./BaseThreadDoneEvent.js";-export * from "./CallerSuppliedModelProvider.js";-export * from "./CallerSuppliedModelProviderType.js";export * from "./CancelSessionResponse.js";export * from "./CatalogDaytonaSandboxProvider.js";export * from "./CatalogMcpServer.js";@@ -32,12 +32,14 @@ export * from "./ConfiguredMcpServerAuth.js";export * from "./ContextManagementConfig.js";export * from "./ContextManagementConfigCompaction.js";export * from "./CreateAgentResponse.js";+export * from "./CustomModelProvider.js";export * from "./DaytonaSandboxProvider.js";export * from "./DaytonaSandboxProviderAuth.js";export * from "./DynamicSubAgentsConfig.js";export * from "./ExtendedChunkDeltaToolCall.js";export * from "./FileContent.js";export * from "./FinishReason.js";+export * from "./FireworksModelProvider.js";export * from "./GenerativeUiConfig.js";export * from "./GetAgentResponse.js";export * from "./GetCapabilitiesResponse.js";@@ -52,6 +54,7 @@ export * from "./GetSandboxProviderResponse.js";export * from "./GetSessionResponse.js";export * from "./GetSkillCatalogResponse.js";export * from "./GetTurnResponse.js";+export * from "./GoogleGeminiModelProvider.js";export * from "./LargeToolResponseConfig.js";export * from "./ListAgentsResponse.js";export * from "./ListAvailableMcpServersResponse.js";@@ -96,6 +99,8 @@ export * from "./ModelParams.js";export * from "./ModelProperties.js";export * from "./ModelProvider.js";export * from "./ModelProviderAuth.js";+export * from "./MoonshotModelProvider.js";+export * from "./OpenAiModelProvider.js";export * from "./PreviousTurnIdInput.js";export * from "./PutAgentResponse.js";export * from "./PutMcpServerResponse.js";@@ -134,6 +139,7 @@ export * from "./ThreadDoneEvent.js";export * from "./ThreadState.js";export * from "./ThreadStateDone.js";export * from "./ThreadStateError.js";+export * from "./TogetherModelProvider.js";export * from "./TokenPagination.js";export * from "./ToolApprovalRequiredEvent.js";export * from "./ToolCall.js";@@ -160,5 +166,4 @@ export * from "./UserMessageContent.js";export * from "./UserMessageContentItem.js";export * from "./UserToolApprovalEvent.js";export * from "./UserToolResponseEvent.js";-export * from "./WellKnownModelProvider.js";-export * from "./WellKnownModelProviderType.js";+export * from "./ZaiModelProvider.js";diff --git a/packages/sdk/src/serialization/types/AlibabaModelProvider.ts b/packages/sdk/src/serialization/types/AlibabaModelProvider.tsnew file mode 100644index 000000000..b418714f2--- /dev/null+++ b/packages/sdk/src/serialization/types/AlibabaModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const AlibabaModelProvider: core.serialization.ObjectSchema<+ serializers.AlibabaModelProvider.Raw,+ TrueForge.AlibabaModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("alibaba").optional(),+ type: core.serialization.stringLiteral("alibaba"),+});++export declare namespace AlibabaModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "alibaba" | null;+ type: "alibaba";+ }+}diff --git a/packages/sdk/src/serialization/types/WellKnownModelProvider.ts b/packages/sdk/src/serialization/types/AnthropicModelProvider.tssimilarity index 59%rename from packages/sdk/src/serialization/types/WellKnownModelProvider.tsrename to packages/sdk/src/serialization/types/AnthropicModelProvider.tsindex a78b35604..58dab5cb5 100644--- a/packages/sdk/src/serialization/types/WellKnownModelProvider.ts+++ b/packages/sdk/src/serialization/types/AnthropicModelProvider.ts@@ -5,26 +5,24 @@ import * as core from "../../core/index.js";import type * as serializers from "../index.js";import { ModelEntry } from "./ModelEntry.js";import { ModelProviderAuth } from "./ModelProviderAuth.js";-import { ResourceName } from "./ResourceName.js";-import { WellKnownModelProviderType } from "./WellKnownModelProviderType.js";-export const WellKnownModelProvider: core.serialization.ObjectSchema<- serializers.WellKnownModelProvider.Raw,- TrueForge.WellKnownModelProvider+export const AnthropicModelProvider: core.serialization.ObjectSchema<+ serializers.AnthropicModelProvider.Raw,+ TrueForge.AnthropicModelProvider> = core.serialization.object({auth: ModelProviderAuth,baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),models: core.serialization.list(ModelEntry),- name: ResourceName,- type: WellKnownModelProviderType,+ name: core.serialization.stringLiteral("anthropic").optional(),+ type: core.serialization.stringLiteral("anthropic"),});-export declare namespace WellKnownModelProvider {+export declare namespace AnthropicModelProvider {export interface Raw {auth: ModelProviderAuth.Raw;base_url?: string | null;models: ModelEntry.Raw[];- name: ResourceName.Raw;- type: WellKnownModelProviderType.Raw;+ name?: "anthropic" | null;+ type: "anthropic";}}diff --git a/packages/sdk/src/serialization/types/CallerSuppliedModelProviderType.ts b/packages/sdk/src/serialization/types/CallerSuppliedModelProviderType.tsdeleted file mode 100644index ef36c1e9d..000000000--- a/packages/sdk/src/serialization/types/CallerSuppliedModelProviderType.ts+++ /dev/null@@ -1,14 +0,0 @@-// This file was auto-generated by Fern from our API Definition.--import type * as TrueForge from "../../api/index.js";-import * as core from "../../core/index.js";-import type * as serializers from "../index.js";--export const CallerSuppliedModelProviderType: core.serialization.Schema<- serializers.CallerSuppliedModelProviderType.Raw,- TrueForge.CallerSuppliedModelProviderType-> = core.serialization.enum_(["alibaba", "custom"]);--export declare namespace CallerSuppliedModelProviderType {- export type Raw = "alibaba" | "custom";-}diff --git a/packages/sdk/src/serialization/types/CatalogProviderType.ts b/packages/sdk/src/serialization/types/CatalogProviderType.tsindex c8b7a4cda..2800fac72 100644--- a/packages/sdk/src/serialization/types/CatalogProviderType.ts+++ b/packages/sdk/src/serialization/types/CatalogProviderType.ts@@ -14,8 +14,8 @@ export const CatalogProviderType: core.serialization.Schema<"fireworks","zai","moonshot",- "together","alibaba",+ "together",]);export declare namespace CatalogProviderType {@@ -26,6 +26,6 @@ export declare namespace CatalogProviderType {| "fireworks"| "zai"| "moonshot"- | "together"- | "alibaba";+ | "alibaba"+ | "together";}diff --git a/packages/sdk/src/serialization/types/CallerSuppliedModelProvider.ts b/packages/sdk/src/serialization/types/CustomModelProvider.tssimilarity index 65%rename from packages/sdk/src/serialization/types/CallerSuppliedModelProvider.tsrename to packages/sdk/src/serialization/types/CustomModelProvider.tsindex 265a2a496..b55d29c5c 100644--- a/packages/sdk/src/serialization/types/CallerSuppliedModelProvider.ts+++ b/packages/sdk/src/serialization/types/CustomModelProvider.ts@@ -3,28 +3,27 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { CallerSuppliedModelProviderType } from "./CallerSuppliedModelProviderType.js";import { ModelEntry } from "./ModelEntry.js";import { ModelProviderAuth } from "./ModelProviderAuth.js";import { ResourceName } from "./ResourceName.js";-export const CallerSuppliedModelProvider: core.serialization.ObjectSchema<- serializers.CallerSuppliedModelProvider.Raw,- TrueForge.CallerSuppliedModelProvider+export const CustomModelProvider: core.serialization.ObjectSchema<+ serializers.CustomModelProvider.Raw,+ TrueForge.CustomModelProvider> = core.serialization.object({auth: ModelProviderAuth,baseUrl: core.serialization.property("base_url", core.serialization.string()),models: core.serialization.list(ModelEntry),name: ResourceName,- type: CallerSuppliedModelProviderType,+ type: core.serialization.stringLiteral("custom"),});-export declare namespace CallerSuppliedModelProvider {+export declare namespace CustomModelProvider {export interface Raw {auth: ModelProviderAuth.Raw;base_url: string;models: ModelEntry.Raw[];name: ResourceName.Raw;- type: CallerSuppliedModelProviderType.Raw;+ type: "custom";}}diff --git a/packages/sdk/src/serialization/types/FireworksModelProvider.ts b/packages/sdk/src/serialization/types/FireworksModelProvider.tsnew file mode 100644index 000000000..e84764e65--- /dev/null+++ b/packages/sdk/src/serialization/types/FireworksModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const FireworksModelProvider: core.serialization.ObjectSchema<+ serializers.FireworksModelProvider.Raw,+ TrueForge.FireworksModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("fireworks").optional(),+ type: core.serialization.stringLiteral("fireworks"),+});++export declare namespace FireworksModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "fireworks" | null;+ type: "fireworks";+ }+}diff --git a/packages/sdk/src/serialization/types/GoogleGeminiModelProvider.ts b/packages/sdk/src/serialization/types/GoogleGeminiModelProvider.tsnew file mode 100644index 000000000..0600c127c--- /dev/null+++ b/packages/sdk/src/serialization/types/GoogleGeminiModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const GoogleGeminiModelProvider: core.serialization.ObjectSchema<+ serializers.GoogleGeminiModelProvider.Raw,+ TrueForge.GoogleGeminiModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("google-gemini").optional(),+ type: core.serialization.stringLiteral("google-gemini"),+});++export declare namespace GoogleGeminiModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "google-gemini" | null;+ type: "google-gemini";+ }+}diff --git a/packages/sdk/src/serialization/types/ModelProvider.ts b/packages/sdk/src/serialization/types/ModelProvider.tsindex a9644f2fd..437ac6f3e 100644--- a/packages/sdk/src/serialization/types/ModelProvider.ts+++ b/packages/sdk/src/serialization/types/ModelProvider.ts@@ -3,12 +3,38 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { CallerSuppliedModelProvider } from "./CallerSuppliedModelProvider.js";-import { WellKnownModelProvider } from "./WellKnownModelProvider.js";+import { AlibabaModelProvider } from "./AlibabaModelProvider.js";+import { AnthropicModelProvider } from "./AnthropicModelProvider.js";+import { CustomModelProvider } from "./CustomModelProvider.js";+import { FireworksModelProvider } from "./FireworksModelProvider.js";+import { GoogleGeminiModelProvider } from "./GoogleGeminiModelProvider.js";+import { MoonshotModelProvider } from "./MoonshotModelProvider.js";+import { OpenAiModelProvider } from "./OpenAiModelProvider.js";+import { TogetherModelProvider } from "./TogetherModelProvider.js";+import { ZaiModelProvider } from "./ZaiModelProvider.js";export const ModelProvider: core.serialization.Schema<serializers.ModelProvider.Raw, TrueForge.ModelProvider> =- core.serialization.undiscriminatedUnion([WellKnownModelProvider, CallerSuppliedModelProvider]);+ core.serialization.undiscriminatedUnion([+ AlibabaModelProvider,+ AnthropicModelProvider,+ CustomModelProvider,+ FireworksModelProvider,+ GoogleGeminiModelProvider,+ MoonshotModelProvider,+ OpenAiModelProvider,+ TogetherModelProvider,+ ZaiModelProvider,+ ]);export declare namespace ModelProvider {- export type Raw = WellKnownModelProvider.Raw | CallerSuppliedModelProvider.Raw;+ export type Raw =+ | AlibabaModelProvider.Raw+ | AnthropicModelProvider.Raw+ | CustomModelProvider.Raw+ | FireworksModelProvider.Raw+ | GoogleGeminiModelProvider.Raw+ | MoonshotModelProvider.Raw+ | OpenAiModelProvider.Raw+ | TogetherModelProvider.Raw+ | ZaiModelProvider.Raw;}diff --git a/packages/sdk/src/serialization/types/MoonshotModelProvider.ts b/packages/sdk/src/serialization/types/MoonshotModelProvider.tsnew file mode 100644index 000000000..e569f2eeb--- /dev/null+++ b/packages/sdk/src/serialization/types/MoonshotModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const MoonshotModelProvider: core.serialization.ObjectSchema<+ serializers.MoonshotModelProvider.Raw,+ TrueForge.MoonshotModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("moonshot").optional(),+ type: core.serialization.stringLiteral("moonshot"),+});++export declare namespace MoonshotModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "moonshot" | null;+ type: "moonshot";+ }+}diff --git a/packages/sdk/src/serialization/types/OpenAiModelProvider.ts b/packages/sdk/src/serialization/types/OpenAiModelProvider.tsnew file mode 100644index 000000000..c5dff8d7d--- /dev/null+++ b/packages/sdk/src/serialization/types/OpenAiModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const OpenAiModelProvider: core.serialization.ObjectSchema<+ serializers.OpenAiModelProvider.Raw,+ TrueForge.OpenAiModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("openai").optional(),+ type: core.serialization.stringLiteral("openai"),+});++export declare namespace OpenAiModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "openai" | null;+ type: "openai";+ }+}diff --git a/packages/sdk/src/serialization/types/TogetherModelProvider.ts b/packages/sdk/src/serialization/types/TogetherModelProvider.tsnew file mode 100644index 000000000..f17832c72--- /dev/null+++ b/packages/sdk/src/serialization/types/TogetherModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const TogetherModelProvider: core.serialization.ObjectSchema<+ serializers.TogetherModelProvider.Raw,+ TrueForge.TogetherModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("together").optional(),+ type: core.serialization.stringLiteral("together"),+});++export declare namespace TogetherModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "together" | null;+ type: "together";+ }+}diff --git a/packages/sdk/src/serialization/types/WellKnownModelProviderType.ts b/packages/sdk/src/serialization/types/WellKnownModelProviderType.tsdeleted file mode 100644index a579bed01..000000000--- a/packages/sdk/src/serialization/types/WellKnownModelProviderType.ts+++ /dev/null@@ -1,14 +0,0 @@-// This file was auto-generated by Fern from our API Definition.--import type * as TrueForge from "../../api/index.js";-import * as core from "../../core/index.js";-import type * as serializers from "../index.js";--export const WellKnownModelProviderType: core.serialization.Schema<- serializers.WellKnownModelProviderType.Raw,- TrueForge.WellKnownModelProviderType-> = core.serialization.enum_(["openai", "anthropic", "google-gemini", "fireworks", "zai", "moonshot", "together"]);--export declare namespace WellKnownModelProviderType {- export type Raw = "openai" | "anthropic" | "google-gemini" | "fireworks" | "zai" | "moonshot" | "together";-}diff --git a/packages/sdk/src/serialization/types/ZaiModelProvider.ts b/packages/sdk/src/serialization/types/ZaiModelProvider.tsnew file mode 100644index 000000000..619cf5731--- /dev/null+++ b/packages/sdk/src/serialization/types/ZaiModelProvider.ts@@ -0,0 +1,28 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ModelEntry } from "./ModelEntry.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const ZaiModelProvider: core.serialization.ObjectSchema<+ serializers.ZaiModelProvider.Raw,+ TrueForge.ZaiModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth,+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),+ models: core.serialization.list(ModelEntry),+ name: core.serialization.stringLiteral("zai").optional(),+ type: core.serialization.stringLiteral("zai"),+});++export declare namespace ZaiModelProvider {+ export interface Raw {+ auth: ModelProviderAuth.Raw;+ base_url?: string | null;+ models: ModelEntry.Raw[];+ name?: "zai" | null;+ type: "zai";+ }+}diff --git a/packages/sdk/src/serialization/types/index.ts b/packages/sdk/src/serialization/types/index.tsindex 1763a2c2d..d1c07853e 100644--- a/packages/sdk/src/serialization/types/index.ts+++ b/packages/sdk/src/serialization/types/index.ts@@ -5,6 +5,8 @@ export * from "./AgentParent.js";export * from "./AgentSpec.js";export * from "./AgentSpecModel.js";export * from "./AgentSpecUserMessage.js";+export * from "./AlibabaModelProvider.js";+export * from "./AnthropicModelProvider.js";export * from "./ApprovalAllow.js";export * from "./ApprovalDecision.js";export * from "./ApprovalDeny.js";@@ -13,8 +15,6 @@ export * from "./AuthMeResponse.js";export * from "./AuthRole.js";export * from "./BaseMcpAuthRequiredEvent.js";export * from "./BaseThreadDoneEvent.js";-export * from "./CallerSuppliedModelProvider.js";-export * from "./CallerSuppliedModelProviderType.js";export * from "./CancelSessionResponse.js";export * from "./CatalogDaytonaSandboxProvider.js";export * from "./CatalogMcpServer.js";@@ -32,12 +32,14 @@ export * from "./ConfiguredMcpServerAuth.js";export * from "./ContextManagementConfig.js";export * from "./ContextManagementConfigCompaction.js";export * from "./CreateAgentResponse.js";+export * from "./CustomModelProvider.js";export * from "./DaytonaSandboxProvider.js";export * from "./DaytonaSandboxProviderAuth.js";export * from "./DynamicSubAgentsConfig.js";export * from "./ExtendedChunkDeltaToolCall.js";export * from "./FileContent.js";export * from "./FinishReason.js";+export * from "./FireworksModelProvider.js";export * from "./GenerativeUiConfig.js";export * from "./GetAgentResponse.js";export * from "./GetCapabilitiesResponse.js";@@ -52,6 +54,7 @@ export * from "./GetSandboxProviderResponse.js";export * from "./GetSessionResponse.js";export * from "./GetSkillCatalogResponse.js";export * from "./GetTurnResponse.js";+export * from "./GoogleGeminiModelProvider.js";export * from "./LargeToolResponseConfig.js";export * from "./ListAgentsResponse.js";export * from "./ListAvailableMcpServersResponse.js";@@ -96,6 +99,8 @@ export * from "./ModelParams.js";export * from "./ModelProperties.js";export * from "./ModelProvider.js";export * from "./ModelProviderAuth.js";+export * from "./MoonshotModelProvider.js";+export * from "./OpenAiModelProvider.js";export * from "./PreviousTurnIdInput.js";export * from "./PutAgentResponse.js";export * from "./PutMcpServerResponse.js";@@ -134,6 +139,7 @@ export * from "./ThreadDoneEvent.js";export * from "./ThreadState.js";export * from "./ThreadStateDone.js";export * from "./ThreadStateError.js";+export * from "./TogetherModelProvider.js";export * from "./TokenPagination.js";export * from "./ToolApprovalRequiredEvent.js";export * from "./ToolCall.js";@@ -160,5 +166,4 @@ export * from "./UserMessageContent.js";export * from "./UserMessageContentItem.js";export * from "./UserToolApprovalEvent.js";export * from "./UserToolResponseEvent.js";-export * from "./WellKnownModelProvider.js";-export * from "./WellKnownModelProviderType.js";+export * from "./ZaiModelProvider.js";diff --git a/packages/sdk/tests/wire/settings/modelProviders.test.ts b/packages/sdk/tests/wire/settings/modelProviders.test.tsindex 47a2cc986..b6a86f757 100644--- a/packages/sdk/tests/wire/settings/modelProviders.test.ts+++ b/packages/sdk/tests/wire/settings/modelProviders.test.ts@@ -15,8 +15,8 @@ describe("ModelProvidersClient", () => {auth: { api_key: "api_key" },base_url: "base_url",models: [{ model_id: "model_id", name: "name", properties: {} }],- name: "name",- type: "openai",+ name: "alibaba",+ type: "alibaba",},],};@@ -44,8 +44,8 @@ describe("ModelProvidersClient", () => {properties: {},},],- name: "name",- type: "openai",+ name: "alibaba",+ type: "alibaba",},],});@@ -57,16 +57,15 @@ describe("ModelProvidersClient", () => {const rawRequestBody = {auth: { api_key: "api_key" },models: [{ model_id: "model_id", name: "name", properties: {} }],- name: "name",- type: "openai",+ type: "alibaba",};const rawResponseBody = {data: {auth: { api_key: "api_key" },base_url: "base_url",models: [{ model_id: "model_id", name: "name", properties: {} }],- name: "name",- type: "openai",+ name: "alibaba",+ type: "alibaba",},};@@ -90,8 +89,7 @@ describe("ModelProvidersClient", () => {properties: {},},],- name: "name",- type: "openai",+ type: "alibaba",});expect(response).toEqual({data: {@@ -106,8 +104,8 @@ describe("ModelProvidersClient", () => {properties: {},},],- name: "name",- type: "openai",+ name: "alibaba",+ type: "alibaba",},});});@@ -121,8 +119,7 @@ describe("ModelProvidersClient", () => {{ model_id: "x", name: "xy", properties: {} },{ model_id: "x", name: "xy", properties: {} },],- name: "xy",- type: "openai",+ type: "alibaba",};const rawResponseBody = { error: { message: "message" } };@@ -152,8 +149,7 @@ describe("ModelProvidersClient", () => {properties: {},},],- name: "xy",- type: "openai",+ type: "alibaba",});}).rejects.toThrow(TrueForgeTypes.BadRequestError);});diff --git a/packages/server/src/apis/modelProviders.ts b/packages/server/src/apis/modelProviders.tsindex 2bf7a98de..1c260e060 100644--- a/packages/server/src/apis/modelProviders.ts+++ b/packages/server/src/apis/modelProviders.ts@@ -1,12 +1,11 @@import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';import type { ModelCatalog } from '../catalog/ModelCatalog';-import type { IModelProviderStore, ModelProviderRecord } from '../db/modelProviderStore';+import type { IModelProviderStore } from '../db/modelProviderStore';import {getModelProviderCatalogRoute,listModelProvidersRoute,putModelProviderRoute,} from '../routes/modelProviderRoutes';-import { toModelProviderManifest, type ModelProvider } from '../schemas/modelProvider';import { TENANT_ID } from './sessions';export interface ModelProvidersRouterDeps {@@ -14,14 +13,6 @@ export interface ModelProvidersRouterDeps {modelProviderStore: IModelProviderStore;}-/** Wire view of a stored provider: identity `name` plus persisted manifest. */-function toModelProvider(record: ModelProviderRecord): ModelProvider {- return {- ...record.manifest,- name: record.name,- };-}-export function createModelProvidersRouter(deps: ModelProvidersRouterDeps) {const catalogHandler: RouteHandler<typeof getModelProviderCatalogRoute> = c => {return c.json({ data: [...deps.modelCatalog.list()] }, 200);@@ -29,17 +20,15 @@ export function createModelProvidersRouter(deps: ModelProvidersRouterDeps) {const listHandler: RouteHandler<typeof listModelProvidersRoute> = async c => {const records = await deps.modelProviderStore.listProviders(TENANT_ID);- return c.json({ data: records.map(toModelProvider) }, 200);+ return c.json({ data: records.map(record => record.manifest) }, 200);};const putHandler: RouteHandler<typeof putModelProviderRoute> = async c => {- const body = c.req.valid('json');const record = await deps.modelProviderStore.upsertProvider({tenant_id: TENANT_ID,- name: body.name,- manifest: toModelProviderManifest(body),+ manifest: c.req.valid('json'),});- return c.json({ data: toModelProvider(record) }, 200);+ return c.json({ data: record.manifest }, 200);};const router = new OpenAPIHono();diff --git a/packages/server/src/db/modelProviderStore.ts b/packages/server/src/db/modelProviderStore.tsindex d19d1440e..d47de0af4 100644--- a/packages/server/src/db/modelProviderStore.ts+++ b/packages/server/src/db/modelProviderStore.ts@@ -1,15 +1,15 @@/*** DB-backed configured model providers: one row per provider per tenant,- * identity as columns plus a Zod-validated `ModelProviderManifest` jsonb document.+ * identity as columns plus the Zod-validated `ModelProvider` document as jsonb.* Implementations: PostgresModelProviderStore and SqliteModelProviderStore.*/import type { ResourceName } from '../schemas/common';-import type { Model, ModelProviderManifest } from '../schemas/modelProvider';+import type { Model, ModelProvider } from '../schemas/modelProvider';export interface ModelProviderRecord {tenant_id: string;name: ResourceName;- manifest: ModelProviderManifest;+ manifest: ModelProvider;/** ISO-8601 UTC instant. */created_at: string;/** ISO-8601 UTC instant. */@@ -23,8 +23,8 @@ export interface GetProviderInput {export interface UpsertProviderInput {tenant_id: string;- name: ResourceName;- manifest: ModelProviderManifest;+ /** Stored whole; its `name` becomes the row's key column. */+ manifest: ModelProvider;}export interface IModelProviderStore {diff --git a/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.ts b/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.tsindex b63700e68..d6246b890 100644--- a/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.ts+++ b/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.ts@@ -16,7 +16,7 @@ export async function up(db: Kysely<unknown>): Promise<void> {.addColumn('tenant_id', 'text', col => col.notNull())// key: natural key within tenant; first segment of fully qualified model names.addColumn('name', 'text', col => col.notNull())- // ModelProviderManifest document; replaced whole on every upsert+ // ModelProvider document; replaced whole on every upsert.addColumn('manifest', 'jsonb', col => col.notNull()).addColumn('created_at', 'timestamptz', col => col.notNull()).addColumn('updated_at', 'timestamptz', col => col.notNull())diff --git a/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts b/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.tsindex 0dfb1aeff..a1459c65d 100644--- a/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts+++ b/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts@@ -52,7 +52,7 @@ export class PostgresModelProviderStore implements IModelProviderStore {.insertInto('model_provider').values({tenant_id: input.tenant_id,- name: input.name,+ name: input.manifest.name,manifest: json(input.manifest),created_at: now(),updated_at: now(),diff --git a/packages/server/src/db/postgres/types.ts b/packages/server/src/db/postgres/types.tsindex 4d1783184..a11dc79dc 100644--- a/packages/server/src/db/postgres/types.ts+++ b/packages/server/src/db/postgres/types.ts@@ -15,7 +15,7 @@ import type {import type { CurrentContextUsage } from '@truefoundry/utils-core/core/runtime/contextUsage';import type { ColumnType, Generated, JSONColumnType } from 'kysely';import type { McpServerManifest } from '../../schemas/mcpServer';-import type { ModelProviderManifest } from '../../schemas/modelProvider';+import type { ModelProvider } from '../../schemas/modelProvider';import type { SandboxProviderManifest } from '../../schemas/sandboxProvider';import type { SkillManifest } from '../../schemas/skill';import type { OAuthClient, OAuthPendingAuthorizationData, OAuthServer, OAuthToken } from '../mcpServerStore';@@ -300,8 +300,8 @@ export interface ModelProviderTable {tenant_id: string;/** key: natural key within tenant; first segment of fully qualified model names */name: string;- /** ModelProviderManifest document; replaced whole on every upsert */- manifest: JSONColumnType<ModelProviderManifest, ModelProviderManifest, ModelProviderManifest>;+ /** ModelProvider document; replaced whole on every upsert */+ manifest: JSONColumnType<ModelProvider, ModelProvider, ModelProvider>;created_at: Date;updated_at: Date;}diff --git a/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts b/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.tsindex d320007ca..5dce52dd5 100644--- a/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts+++ b/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts@@ -1,5 +1,5 @@import type { ExpressionBuilder, Kysely } from 'kysely';-import type { Model, ModelProviderManifest } from '../../../schemas/modelProvider';+import type { Model, ModelProvider } from '../../../schemas/modelProvider';import {flattenProviderModels,type GetProviderInput,@@ -15,7 +15,7 @@ function recordColumns(eb: ExpressionBuilder<Database, 'model_provider'>) {return ['tenant_id' as const,'name' as const,- jsonText<ModelProviderManifest>(eb.ref('manifest')).as('manifest'),+ jsonText<ModelProvider>(eb.ref('manifest')).as('manifest'),'created_at' as const,'updated_at' as const,];@@ -52,7 +52,7 @@ export class SqliteModelProviderStore implements IModelProviderStore {.insertInto('model_provider').values({tenant_id: input.tenant_id,- name: input.name,+ name: input.manifest.name,manifest: jsonbBind(input.manifest),created_at: timestamp,updated_at: timestamp,diff --git a/packages/server/src/db/sqlite/types.ts b/packages/server/src/db/sqlite/types.tsindex a31ddc638..c496b2aac 100644--- a/packages/server/src/db/sqlite/types.ts+++ b/packages/server/src/db/sqlite/types.ts@@ -18,7 +18,7 @@ import type {import type { CurrentContextUsage } from '@truefoundry/utils-core/core/runtime/contextUsage';import type { ColumnType, Generated, JSONColumnType } from 'kysely';import type { McpServerManifest } from '../../schemas/mcpServer';-import type { ModelProviderManifest } from '../../schemas/modelProvider';+import type { ModelProvider } from '../../schemas/modelProvider';import type { SandboxProviderManifest } from '../../schemas/sandboxProvider';import type { SkillManifest } from '../../schemas/skill';import type { OAuthClient, OAuthPendingAuthorizationData, OAuthServer, OAuthToken } from '../mcpServerStore';@@ -152,8 +152,8 @@ export interface ThreadCapabilityStateTable {export interface ModelProviderTable {tenant_id: string;name: string;- /** ModelProviderManifest document; replaced whole on every upsert */- manifest: JsonbColumn<ModelProviderManifest>;+ /** ModelProvider document; replaced whole on every upsert */+ manifest: JsonbColumn<ModelProvider>;created_at: string;updated_at: string;}diff --git a/packages/server/src/routes/modelProviderRoutes.ts b/packages/server/src/routes/modelProviderRoutes.tsindex d5383b607..52d366fb5 100644--- a/packages/server/src/routes/modelProviderRoutes.ts+++ b/packages/server/src/routes/modelProviderRoutes.ts@@ -53,7 +53,9 @@ export const putModelProviderRoute = createRoute({tags: [MODEL_PROVIDERS_TAG],summary: 'Create or replace a model provider',description:- 'Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).',+ 'Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included). ' ++ 'Every type but `custom` is named after itself, so each is limited to one configured provider and a repeat ' ++ 'call replaces it; only `custom` providers are named, and numbered, by the caller.','x-fern-sdk-group-name': ['settings', 'modelProviders'],'x-fern-sdk-method-name': 'upsert',request: {diff --git a/packages/server/src/runtime/sessionResources.ts b/packages/server/src/runtime/sessionResources.tsindex 525f83ea0..c0f30041e 100644--- a/packages/server/src/runtime/sessionResources.ts+++ b/packages/server/src/runtime/sessionResources.ts@@ -23,7 +23,6 @@ import type { ISkillStore } from '../db/skillStore';import { isMcpAuthRequired, resolveMcpAuth } from '../mcp/auth/mcpDcr';import type { IOAuthTokenStore } from '../mcp/auth/types';import { resolveConfiguredMcpRequestHeaders } from '../schemas/mcpServer';-import { PROVIDER_DEFAULT_BASE_URLS } from '../schemas/modelProvider';import { toDaytonaSandboxProviderInput } from '../schemas/sandboxProvider';export interface McpConnection {@@ -75,13 +74,13 @@ export async function getModelProviderConfig({});}// Provider types are adapter names, so this assignment is what keeps them so: a type with no- // `buildLanguageModel` case fails to compile here. An explicit base_url always wins.+ // `buildLanguageModel` case fails to compile here.const { type, base_url } = provider.manifest;return {provider: type,name,modelId: model.model_id,- baseUrl: base_url ?? PROVIDER_DEFAULT_BASE_URLS[type],+ baseUrl: base_url,apiKey: provider.manifest.auth.api_key,headers: {},};diff --git a/packages/server/src/schemas/modelProvider.ts b/packages/server/src/schemas/modelProvider.tsindex 4d02ee020..c0c424095 100644--- a/packages/server/src/schemas/modelProvider.ts+++ b/packages/server/src/schemas/modelProvider.ts@@ -4,49 +4,14 @@* ModelCatalog.*/import { z } from '@hono/zod-openapi';-import type { VercelAIProviderName } from '@truefoundry/utils-core/core';-import { SUPPORTED_REASONING_EFFORTS } from '@truefoundry/utils-core/core';+import { SUPPORTED_REASONING_EFFORTS, VERCEL_AI_PROVIDER_NAMES } from '@truefoundry/utils-core/core';import { NameSchema, uniqueNames } from './common';-/**- * A provider's endpoint is either already known or it isn't, and that is the only thing the wire- * shape turns on. `openai`, `anthropic` and `google-gemini` get theirs from their dedicated Vercel- * AI SDK adapter; the OpenAI-compatible ones named here get {@link PROVIDER_DEFAULT_BASE_URLS}.- *- * `satisfies` ties both lists to the adapters the harness can actually build. A type missing from- * them is the dangerous direction — its catalog entries would be unconfigurable — so a test asserts- * the two together cover every adapter.- */-const WELL_KNOWN_BASE_URL_TYPES = [- 'openai',- 'anthropic',- 'google-gemini',- 'fireworks',- 'zai',- 'moonshot',- 'together',-] as const satisfies readonly VercelAIProviderName[];--/** `alibaba` scopes its endpoint to the caller's workspace, `custom` is arbitrary by definition. */-const CALLER_SUPPLIED_BASE_URL_TYPES = ['alibaba', 'custom'] as const satisfies readonly VercelAIProviderName[];--export const ProviderTypeSchema = z- .enum([...WELL_KNOWN_BASE_URL_TYPES, ...CALLER_SUPPLIED_BASE_URL_TYPES])- .openapi('ProviderType');+/** Every type the harness has an adapter for; a test asserts each one has a schema below. */+export const ProviderTypeSchema = z.enum(VERCEL_AI_PROVIDER_NAMES).openapi('ProviderType');export type ProviderType = z.infer<typeof ProviderTypeSchema>;-/**- * Endpoint to use when a manifest omits `base_url`. Absent means the provider's adapter supplies its- * own, or that the schema required a `base_url` in the first place.- */-export const PROVIDER_DEFAULT_BASE_URLS: Partial<Record<ProviderType, string>> = {- fireworks: 'https://api.fireworks.ai/inference/v1',- zai: 'https://api.z.ai/api/paas/v4',- moonshot: 'https://api.moonshot.ai/v1',- together: 'https://api.together.xyz/v1',-};-export const ModelPropertiesSchema = z.object({context_length: z.number().int().positive().optional(),@@ -105,26 +70,83 @@ const ModelProviderManifestBaseSchema = z}).strict();-/** The endpoint is already known, so `base_url` only overrides it. */-const WellKnownModelProviderManifestSchema = ModelProviderManifestBaseSchema.extend({- type: z.enum(WELL_KNOWN_BASE_URL_TYPES),- base_url: z.url().optional().describe("Optional override of the provider's default API base URL."),-}).strict();--/** Nothing to fall back on, so `base_url` is required. */-const CallerSuppliedModelProviderManifestSchema = ModelProviderManifestBaseSchema.extend({- type: z.enum(CALLER_SUPPLIED_BASE_URL_TYPES),- base_url: z.url().describe("Base URL of the provider's API."),-}).strict();-/**- * Non-identity fields of a configured provider, shared verbatim between the- * PUT request body and the persisted `model_provider.manifest` document.+ * Naming a provider after its type limits a tenant to one of each: the `(tenant_id, name)` primary+ * key replaces the row rather than adding a sibling. `base_url` defaults to the adapter's endpoint.*/-export const ModelProviderManifestObjectSchema = z.union([- WellKnownModelProviderManifestSchema,- CallerSuppliedModelProviderManifestSchema,-]);+function wellKnownProviderSchema<Type extends Exclude<ProviderType, 'custom'>>({+ type,+ base_url,+}: {+ type: Type;+ base_url: string;+}) {+ return ModelProviderManifestBaseSchema.extend({+ type: z.literal(type),+ name: z.literal(type).default(type),+ base_url: z.url().default(base_url).describe("Override of the provider's default API base URL."),+ }).strict();+}++const OpenAiModelProviderSchema = wellKnownProviderSchema({+ type: 'openai',+ base_url: 'https://api.openai.com/v1',+}).openapi('OpenAiModelProvider');++const AnthropicModelProviderSchema = wellKnownProviderSchema({+ type: 'anthropic',+ base_url: 'https://api.anthropic.com/v1',+}).openapi('AnthropicModelProvider');++const GoogleGeminiModelProviderSchema = wellKnownProviderSchema({+ type: 'google-gemini',+ base_url: 'https://generativelanguage.googleapis.com/v1beta',+}).openapi('GoogleGeminiModelProvider');++const FireworksModelProviderSchema = wellKnownProviderSchema({+ type: 'fireworks',+ base_url: 'https://api.fireworks.ai/inference/v1',+}).openapi('FireworksModelProvider');++const ZaiModelProviderSchema = wellKnownProviderSchema({+ type: 'zai',+ base_url: 'https://api.z.ai/api/paas/v4',+}).openapi('ZaiModelProvider');++const MoonshotModelProviderSchema = wellKnownProviderSchema({+ type: 'moonshot',+ base_url: 'https://api.moonshot.ai/v1',+}).openapi('MoonshotModelProvider');++const TogetherModelProviderSchema = wellKnownProviderSchema({+ type: 'together',+ base_url: 'https://api.together.xyz/v1',+}).openapi('TogetherModelProvider');++const AlibabaModelProviderSchema = wellKnownProviderSchema({+ type: 'alibaba',+ base_url: 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1',+}).openapi('AlibabaModelProvider');++const CustomModelProviderSchema = ModelProviderManifestBaseSchema.extend({+ type: z.literal('custom'),+ name: NameSchema,+ base_url: z.url().describe("Base URL of the provider's API."),+})+ .strict()+ .openapi('CustomModelProvider');++const MODEL_PROVIDER_SCHEMAS = [+ OpenAiModelProviderSchema,+ AnthropicModelProviderSchema,+ GoogleGeminiModelProviderSchema,+ FireworksModelProviderSchema,+ ZaiModelProviderSchema,+ MoonshotModelProviderSchema,+ TogetherModelProviderSchema,+ AlibabaModelProviderSchema,+ CustomModelProviderSchema,+] as const;export function refineModelProviderManifest(manifest: { models: { model_id: string; name: string }[] },@@ -134,22 +156,13 @@ export function refineModelProviderManifest(}export type ModelProperties = z.infer<typeof ModelPropertiesSchema>;-export type ModelProviderManifest = z.infer<typeof ModelProviderManifestObjectSchema>;--const WellKnownModelProviderSchema = WellKnownModelProviderManifestSchema.extend({ name: NameSchema })- .strict()- .openapi('WellKnownModelProvider');--const CallerSuppliedModelProviderSchema = CallerSuppliedModelProviderManifestSchema.extend({ name: NameSchema })- .strict()- .openapi('CallerSuppliedModelProvider');/**- * Configured provider: PUT body and list/upsert response data (identity `name`- * plus manifest fields, including `auth.api_key`).+ * Configured provider: PUT body, response data, and the persisted `model_provider.manifest` document+ * in one shape. The `name` column is written from it, so the two cannot disagree.*/export const ModelProviderSchema = z- .union([WellKnownModelProviderSchema, CallerSuppliedModelProviderSchema])+ .discriminatedUnion('type', MODEL_PROVIDER_SCHEMAS).superRefine(refineModelProviderManifest).openapi('ModelProvider');@@ -186,12 +199,4 @@ export const ListModelsResponseSchema = z.openapi('ListModelsResponse');export type ModelProvider = z.infer<typeof ModelProviderSchema>;-export type PutModelProviderRequest = ModelProvider;export type Model = z.infer<typeof ModelSchema>;--/** Strip wire identity `name`; remaining fields are the persisted manifest document. */-export function toModelProviderManifest(provider: ModelProvider): ModelProviderManifest {- const { name, ...manifest } = provider;- void name;- return manifest;-}diff --git a/packages/server/tests/db/modelProviderStoreContractSuite.ts b/packages/server/tests/db/modelProviderStoreContractSuite.tsindex 6b3047930..ac3828d47 100644--- a/packages/server/tests/db/modelProviderStoreContractSuite.ts+++ b/packages/server/tests/db/modelProviderStoreContractSuite.ts@@ -3,40 +3,53 @@* Runs under jest against a fresh store per test (see backend test files).*/import type { IModelProviderStore } from '../../src/db/modelProviderStore';-import type { ModelProviderManifest } from '../../src/schemas/modelProvider';+import type { ModelProvider } from '../../src/schemas/modelProvider';const TENANT = 'default';-function manifest(overrides: Partial<ModelProviderManifest> = {}): ModelProviderManifest {- return {- type: 'anthropic',- base_url: 'https://api.anthropic.com/v1',- auth: { api_key: 'sk-ant-test' },- models: [- {- model_id: 'claude-sonnet-4-6',- name: 'claude-sonnet-4-6',- properties: { context_length: 200000, max_output_tokens: 32768, reasoning_efforts: ['low', 'high'] },- },- ],- ...overrides,- };-}+/** Each type pins its own `name`, so one fixture per provider. */+const anthropic = {+ type: 'anthropic',+ name: 'anthropic',+ base_url: 'https://api.anthropic.com/v1',+ auth: { api_key: 'sk-ant-test' },+ models: [+ {+ model_id: 'claude-sonnet-4-6',+ name: 'claude-sonnet-4-6',+ properties: { context_length: 200000, max_output_tokens: 32768, reasoning_efforts: ['low', 'high'] },+ },+ ],+} satisfies ModelProvider;++const openai = {+ type: 'openai',+ name: 'openai',+ base_url: 'https://api.openai.com/v1',+ auth: { api_key: 'sk-oai-test' },+ models: [+ { model_id: 'gpt-5.6-sol', name: 'gpt-5-6-sol', properties: { context_length: 400000, max_output_tokens: 32768 } },+ ],+} satisfies ModelProvider;++const custom = {+ type: 'custom',+ name: 'internal',+ base_url: 'https://llm.internal.example.com/v1',+ auth: { api_key: 'sk-custom' },+ models: anthropic.models,+} satisfies ModelProvider;const ISO_UTC = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;export function runModelProviderStoreContractSuite(getStore: () => IModelProviderStore): void {- it('upsert creates a provider and round-trips the manifest', async () => {+ it('upsert creates a provider and round-trips the document', async () => {const store = getStore();- const created = await store.upsertProvider({- tenant_id: TENANT,- name: 'anthropic',- manifest: manifest(),- });+ const created = await store.upsertProvider({ tenant_id: TENANT, manifest: anthropic });expect(created.tenant_id).toBe(TENANT);expect(created.name).toBe('anthropic');- expect(created.manifest).toEqual(manifest());+ expect(created.manifest).toEqual(anthropic);expect(created.created_at).toMatch(ISO_UTC);expect(created.updated_at).toBe(created.created_at);@@ -49,15 +62,12 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideexpect(await store.getProvider({ tenant_id: TENANT, name: 'missing' })).toBeUndefined();});- it('upsert replaces the whole manifest and preserves created_at', async () => {+ it('upsert replaces the whole document and preserves created_at', async () => {const store = getStore();- const created = await store.upsertProvider({- tenant_id: TENANT,- name: 'anthropic',- manifest: manifest(),- });+ const created = await store.upsertProvider({ tenant_id: TENANT, manifest: anthropic });- const replacement = manifest({+ const replacement = {+ ...anthropic,auth: { api_key: 'sk-ant-rotated' },models: [{@@ -66,12 +76,8 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideproperties: { context_length: 200000, max_output_tokens: 65536 },},],- });- const updated = await store.upsertProvider({- tenant_id: TENANT,- name: 'anthropic',- manifest: replacement,- });+ };+ const updated = await store.upsertProvider({ tenant_id: TENANT, manifest: replacement });expect(updated.manifest).toEqual(replacement);expect(updated.created_at).toBe(created.created_at);@@ -83,52 +89,26 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideit('listProviders returns only the tenant, ordered by name', async () => {const store = getStore();- await store.upsertProvider({- tenant_id: TENANT,- name: 'openai',- manifest: manifest({ type: 'openai' }),- });- await store.upsertProvider({ tenant_id: TENANT, name: 'anthropic', manifest: manifest() });- await store.upsertProvider({- tenant_id: 'other-tenant',- name: 'anthropic',- manifest: manifest(),- });+ await store.upsertProvider({ tenant_id: TENANT, manifest: openai });+ await store.upsertProvider({ tenant_id: TENANT, manifest: anthropic });+ await store.upsertProvider({ tenant_id: 'other-tenant', manifest: anthropic });const providers = await store.listProviders(TENANT);- expect(providers.map(provider => provider.name)).toEqual(['anthropic', 'openai']);- expect(providers.every(provider => provider.tenant_id === TENANT)).toBe(true);+ expect(providers.map(record => record.name)).toEqual(['anthropic', 'openai']);+ expect(providers.every(record => record.tenant_id === TENANT)).toBe(true);});it('stores custom providers with base_url', async () => {const store = getStore();- const custom = manifest({ type: 'custom', base_url: 'https://llm.internal.example.com/v1' });- const created = await store.upsertProvider({ tenant_id: TENANT, name: 'internal', manifest: custom });+ const created = await store.upsertProvider({ tenant_id: TENANT, manifest: custom });expect(created.manifest.base_url).toBe('https://llm.internal.example.com/v1');});- it('listModels flattens manifests into fully qualified names', async () => {+ it('listModels flattens documents into fully qualified names', async () => {const store = getStore();- await store.upsertProvider({ tenant_id: TENANT, name: 'anthropic', manifest: manifest() });- await store.upsertProvider({- tenant_id: TENANT,- name: 'openai',- manifest: manifest({- type: 'openai',- models: [- {- model_id: 'gpt-5.6-sol',- name: 'gpt-5-6-sol',- properties: { context_length: 400000, max_output_tokens: 32768 },- },- ],- }),- });- await store.upsertProvider({- tenant_id: 'other-tenant',- name: 'openai',- manifest: manifest({ type: 'openai' }),- });+ await store.upsertProvider({ tenant_id: TENANT, manifest: anthropic });+ await store.upsertProvider({ tenant_id: TENANT, manifest: openai });+ await store.upsertProvider({ tenant_id: 'other-tenant', manifest: openai });const models = await store.listModels(TENANT);expect(models).toEqual([diff --git a/packages/server/tests/unit/apis/agents.test.ts b/packages/server/tests/unit/apis/agents.test.tsindex ace5cddd2..304fb0c1c 100644--- a/packages/server/tests/unit/apis/agents.test.ts+++ b/packages/server/tests/unit/apis/agents.test.ts@@ -7,9 +7,10 @@ import { SqliteModelProviderStore } from '../../../src/db/sqlite/model-provider-import { SqliteSandboxProviderStore } from '../../../src/db/sqlite/sandbox-provider-store/SqliteSandboxProviderStore';import { SqliteSkillStore } from '../../../src/db/sqlite/skill-store/SqliteSkillStore';-const modelProviderBody = {+const modelProvider = {type: 'anthropic' as const,- name: 'anthropic',+ name: 'anthropic' as const,+ base_url: 'https://api.anthropic.com/v1',auth: { api_key: 'sk-ant-secret' },models: [{@@ -46,15 +47,7 @@ describe('agents router', () => {const db = createSqliteDb(':memory:');await migrateSqliteToLatest(db);const modelProviderStore = new SqliteModelProviderStore(db);- await modelProviderStore.upsertProvider({- tenant_id: 'default',- name: modelProviderBody.name,- manifest: {- type: modelProviderBody.type,- auth: modelProviderBody.auth,- models: modelProviderBody.models,- },- });+ await modelProviderStore.upsertProvider({ tenant_id: 'default', manifest: modelProvider });router = createAgentsRouter({agentStore: new SqliteAgentStore(db),modelProviderStore,diff --git a/packages/server/tests/unit/apis/createTurnNonStreaming.test.ts b/packages/server/tests/unit/apis/createTurnNonStreaming.test.tsindex 5c06f805e..32a746cf2 100644--- a/packages/server/tests/unit/apis/createTurnNonStreaming.test.ts+++ b/packages/server/tests/unit/apis/createTurnNonStreaming.test.ts@@ -24,9 +24,11 @@ describe('create turn non-streaming', () => {const modelProviderStore = new SqliteModelProviderStore(db);await modelProviderStore.upsertProvider({tenant_id: 'default',- name: 'test-provider',manifest: {- type: 'openai',+ // Caller-named, so `custom` is the only type it can be.+ type: 'custom',+ name: 'test-provider',+ base_url: 'https://llm.test.example.com/v1',auth: { api_key: 'sk-test' },models: [{diff --git a/packages/server/tests/unit/apis/modelProviders.test.ts b/packages/server/tests/unit/apis/modelProviders.test.tsindex 1c036877b..c9df09ce0 100644--- a/packages/server/tests/unit/apis/modelProviders.test.ts+++ b/packages/server/tests/unit/apis/modelProviders.test.ts@@ -21,11 +21,13 @@ const model = {const anthropicBody = {type: 'anthropic' as const,- name: 'anthropic',auth: { api_key: 'sk-ant-secret' },models: [model],};+/** What the body above is stored and echoed as: named after its type, endpoint from its schema. */+const anthropicProvider = { ...anthropicBody, name: 'anthropic', base_url: 'https://api.anthropic.com/v1' };+const customBody = {type: 'custom' as const,name: 'internal',@@ -89,11 +91,11 @@ describe('settings model-providers and models routers', () => {it('PUT upserts a well-known provider without base_url and echoes the stored auth', async () => {const response = await settingsRouter.request('/model-providers', putInit(anthropicBody));expect(response.status).toBe(200);- expect(await response.json()).toEqual({ data: anthropicBody });+ expect(await response.json()).toEqual({ data: anthropicProvider });const list = await settingsRouter.request('/model-providers');expect(list.status).toBe(200);- expect(await list.json()).toEqual({ data: [anthropicBody] });+ expect(await list.json()).toEqual({ data: [anthropicProvider] });});it('PUT requires base_url for custom providers', async () => {@@ -131,19 +133,61 @@ describe('settings model-providers and models routers', () => {});});+describe('well-known types are limited to one provider', () => {+ it('PUT replaces the configured provider instead of adding a second of the type', async () => {+ const { settingsRouter, modelsRouter } = await createRouters();+ expect((await settingsRouter.request('/model-providers', putInit(anthropicBody))).status).toBe(200);++ const rotated = { ...anthropicBody, auth: { api_key: 'sk-ant-rotated' } };+ const update = await settingsRouter.request('/model-providers', putInit(rotated));+ expect(update.status).toBe(200);+ expect(await update.json()).toEqual({ data: { ...anthropicProvider, auth: rotated.auth } });++ const list = await settingsRouter.request('/model-providers');+ expect(await list.json()).toEqual({ data: [{ ...anthropicProvider, auth: rotated.auth }] });+ const models = await modelsRouter.request('/');+ expect(((await models.json()) as { data: { name: string }[] }).data.map(entry => entry.name)).toEqual([+ 'anthropic/claude-sonnet-4-6',+ ]);+ });++ it('PUT rejects a name of its own for a well-known type', async () => {+ const { settingsRouter } = await createRouters();+ const named = await settingsRouter.request('/model-providers', putInit({ ...anthropicBody, name: 'anthropic-eu' }));+ expect(named.status).toBe(400);++ const list = await settingsRouter.request('/model-providers');+ expect(await list.json()).toEqual({ data: [] });+ });++ it('PUT keeps a caller-supplied base_url over the schema default', async () => {+ const { settingsRouter } = await createRouters();+ const proxied = { ...anthropicBody, base_url: 'https://gateway.internal.example.com/v1' };+ const response = await settingsRouter.request('/model-providers', putInit(proxied));+ expect(response.status).toBe(200);+ expect(await response.json()).toEqual({ data: { ...anthropicProvider, base_url: proxied.base_url } });+ });++ it('PUT allows several caller-supplied providers, which each name their own endpoint', async () => {+ const { settingsRouter } = await createRouters();+ const second = { ...customBody, name: 'internal-eu', base_url: 'https://llm.eu.example.com/v1' };+ expect((await settingsRouter.request('/model-providers', putInit(customBody))).status).toBe(200);+ expect((await settingsRouter.request('/model-providers', putInit(second))).status).toBe(200);++ const list = await settingsRouter.request('/model-providers');+ expect(await list.json()).toEqual({ data: [customBody, second] });+ });+});+describe('catalog presets are configurable', () => {- // A preset is meant to be copied into a PUT body with an api_key added. Every type the catalog- // ships must therefore be in the configuration union; five of them once were not.+ // A preset is copied into a PUT body with an api_key added, so every catalog type must parse.it.each(ModelCatalog.load().list())('PUT accepts the $type preset', async preset => {const { settingsRouter } = await createRouters();- // `logo` is catalog-only discovery metadata — omit it from the configured PUT body.+ // `logo` is catalog-only metadata; everything else copies straight into a PUT body.const { logo, ...presetWithoutLogo } = preset;const body = {...presetWithoutLogo,auth: { api_key: `sk-${preset.name}` },- // Alibaba is the one catalog type that also needs a base_url: a MaaS host embeds the- // workspace id, so there is nothing to default to.- ...(preset.type === 'alibaba' ? { base_url: 'https://ws-x.ap-southeast-1.maas.aliyuncs.com/v1' } : {}),};expect(logo === undefined || typeof logo === 'string').toBe(true);const response = await settingsRouter.request('/model-providers', putInit(body));diff --git a/packages/server/tests/unit/apis/sessionHttp.test.ts b/packages/server/tests/unit/apis/sessionHttp.test.tsindex 6dca87fa4..5b52cc787 100644--- a/packages/server/tests/unit/apis/sessionHttp.test.ts+++ b/packages/server/tests/unit/apis/sessionHttp.test.ts@@ -43,9 +43,10 @@ describe('sessions HTTP agent binding', () => {await modelProviderStore.upsertProvider({tenant_id: TENANT_ID,- name: 'anthropic',manifest: {type: 'anthropic',+ name: 'anthropic',+ base_url: 'https://api.anthropic.com/v1',auth: { api_key: 'sk-ant-secret' },models: [{diff --git a/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts b/packages/server/tests/unit/apis/turnStreamAfterDelete.test.tsindex 7e04699cd..3761e4bdd 100644--- a/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts+++ b/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts@@ -29,9 +29,11 @@ describe('turn SSE after session deletion', () => {const modelProviderStore = new SqliteModelProviderStore(db);await modelProviderStore.upsertProvider({tenant_id: 'default',- name: 'test-provider',manifest: {- type: 'openai',+ // Caller-named, so `custom` is the only type it can be.+ type: 'custom',+ name: 'test-provider',+ base_url: 'https://llm.test.example.com/v1',auth: { api_key: 'sk-test' },models: [{diff --git a/packages/server/tests/unit/runtime/sessionResources.test.ts b/packages/server/tests/unit/runtime/sessionResources.test.tsindex 85a0220f3..3fa7f49bd 100644--- a/packages/server/tests/unit/runtime/sessionResources.test.ts+++ b/packages/server/tests/unit/runtime/sessionResources.test.ts@@ -16,9 +16,11 @@ describe('validateAgentSpec', () => {const modelProviderStore = new SqliteModelProviderStore(db);await modelProviderStore.upsertProvider({tenant_id: TENANT_ID,- name: 'test-provider',manifest: {- type: 'openai',+ // Caller-named, so `custom` is the only type it can be.+ type: 'custom',+ name: 'test-provider',+ base_url: 'https://llm.test.example.com/v1',auth: { api_key: 'sk-test' },models: [{diff --git a/packages/server/tests/unit/schemas/modelProvider.test.ts b/packages/server/tests/unit/schemas/modelProvider.test.tsindex 5d45252db..a761acb03 100644--- a/packages/server/tests/unit/schemas/modelProvider.test.ts+++ b/packages/server/tests/unit/schemas/modelProvider.test.ts@@ -1,38 +1,65 @@import { VERCEL_AI_PROVIDER_NAMES } from '@truefoundry/utils-core/core';-import { ModelProviderManifestObjectSchema, PROVIDER_DEFAULT_BASE_URLS } from '../../../src/schemas/modelProvider';+import { ModelProviderSchema } from '../../../src/schemas/modelProvider';const models = [{ model_id: 'a-model', name: 'a-model', properties: {} }];-function parses(body: Record<string, unknown>): boolean {- return ModelProviderManifestObjectSchema.safeParse({ auth: { api_key: 'k' }, models, ...body }).success;+function parse(body: Record<string, unknown>): { success: boolean; name?: string; base_url?: string } {+ const result = ModelProviderSchema.safeParse({ auth: { api_key: 'k' }, models, ...body });+ return result.success+ ? { success: true, name: result.data.name, base_url: result.data.base_url }+ : { success: false };}-describe('ModelProviderManifestObjectSchema', () => {- // The `satisfies` on the two type lists rejects a name with no adapter, but not an adapter left- // out of both lists. That omission is what once left most of the catalog unconfigurable.+/** A custom endpoint is arbitrary, so there is nothing to default to. */+const TYPES_WITHOUT_DEFAULT_BASE_URL = ['custom'];++describe('ModelProviderSchema', () => {+ // A type with no schema of its own leaves its catalog entries unconfigurable.it('can configure every adapter the harness can build', () => {- const rejected = VERCEL_AI_PROVIDER_NAMES.filter(type => !parses({ type, base_url: 'https://example.com/v1' }));+ const rejected = VERCEL_AI_PROVIDER_NAMES.filter(+ type => !parse({ type, name: type, base_url: 'https://example.com/v1' }).success,+ );expect(rejected).toEqual([]);});- // Omitting base_url is only safe when something downstream supplies one, otherwise- // buildLanguageModel throws at turn time instead of the API rejecting the config.- it('only allows omitting base_url where an endpoint is known', () => {+ // A named endpoint keeps buildLanguageModel off its adapter's implicit default.+ it('defaults base_url for every type that has a known endpoint', () => {for (const type of VERCEL_AI_PROVIDER_NAMES) {- const dedicatedAdapter = ['openai', 'anthropic', 'google-gemini'].includes(type);- const hasEndpoint = dedicatedAdapter || PROVIDER_DEFAULT_BASE_URLS[type] !== undefined;- expect([type, parses({ type })]).toEqual([type, hasEndpoint]);+ const parsed = parse({ type });+ if (TYPES_WITHOUT_DEFAULT_BASE_URL.includes(type)) {+ expect([type, parsed.success]).toEqual([type, false]);+ } else {+ expect([type, parsed.base_url]).toEqual([type, expect.stringMatching(/^https:\/\//)]);+ }}});- // An effort the adapter cannot map is dropped on the way to the provider, so a session that- // requests it runs at the provider default and reports success.+ it('keeps a caller-supplied base_url over the default', () => {+ expect(parse({ type: 'openai', base_url: 'https://gateway.internal/v1' }).base_url).toBe(+ 'https://gateway.internal/v1',+ );+ });++ // Pinning the name to the type is what makes a second write replace the first.+ it('names every type but custom after itself', () => {+ expect(parse({ type: 'anthropic' }).name).toBe('anthropic');+ expect(parse({ type: 'anthropic', name: 'anthropic' }).name).toBe('anthropic');+ expect(parse({ type: 'anthropic', name: 'anthropic-eu' }).success).toBe(false);+ });++ it('requires a caller-supplied name for custom providers', () => {+ const base = { type: 'custom', base_url: 'https://llm.internal/v1' };+ expect(parse({ ...base, name: 'internal' }).name).toBe('internal');+ expect(parse(base).success).toBe(false);+ });++ // An unmappable effort is dropped on the way out, so the session silently runs at the default.it('rejects a reasoning effort no adapter can honour', () => {const withEfforts = (efforts: string[]): boolean =>- parses({+ parse({type: 'anthropic',models: [{ model_id: 'a-model', name: 'a-model', properties: { reasoning_efforts: efforts } }],- });+ }).success;expect(withEfforts(['low', 'medium', 'high', 'max'])).toBe(true);expect(withEfforts(['ultra'])).toBe(false);});