The open-source agent harness - the runtime layer that turns an LLM into a working agent.
updated Model selector with provider properties (#187)
Govinda Vashishtha1dbf34a00cda
diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.jsonindex 2893a5583..324437bfb 100644--- a/.github/fern/openapi/openapi.json+++ b/.github/fern/openapi/openapi.json@@ -190,7 +190,14 @@{"properties": {"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]}},"required": [@@ -461,14 +468,7 @@"additionalProperties": false,"properties": {"auth": {- "allOf": [- {- "$ref": "#/components/schemas/ConfiguredMcpServerAuth"- },- {- "description": "Optional default auth settings for the preset."- }- ]+ "$ref": "#/components/schemas/ConfiguredMcpServerAuth"},"logo": {"description": "URL of the MCP server logo asset.",@@ -476,7 +476,14 @@"type": "string"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"type": {"$ref": "#/components/schemas/McpServerType"@@ -513,7 +520,14 @@"type": "string"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"path": {"description": "Path to the skill directory within the repository. Omit to use the repository root.",@@ -703,13 +717,27 @@"additionalProperties": false,"properties": {"auth": {- "$ref": "#/components/schemas/ConfiguredMcpServerAuth"+ "allOf": [+ {+ "$ref": "#/components/schemas/ConfiguredMcpServerAuth"+ },+ {+ "description": "Optional auth settings. Omit when the server needs no credentials."+ }+ ]},"auth_status": {"$ref": "#/components/schemas/McpAuthStatus"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"type": {"$ref": "#/components/schemas/McpServerType"@@ -729,7 +757,7 @@"type": "object"},"ConfiguredMcpServerAuth": {- "description": "Optional auth settings. Omit when the server needs no credentials.",+ "description": "Optional default auth settings for the preset.","discriminator": {"mapping": {"dcr": "#/components/schemas/McpServerDcrAuth",@@ -853,7 +881,14 @@"type": "array"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"type": {"enum": [@@ -1827,10 +1862,24 @@"additionalProperties": false,"properties": {"auth": {- "$ref": "#/components/schemas/ConfiguredMcpServerAuth"+ "allOf": [+ {+ "$ref": "#/components/schemas/ConfiguredMcpServerAuth"+ },+ {+ "description": "Optional auth settings. Omit when the server needs no credentials."+ }+ ]},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"type": {"$ref": "#/components/schemas/McpServerType"@@ -1858,7 +1907,14 @@"$ref": "#/components/schemas/McpAuthStatus"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"url": {"description": "URL of the remote MCP server.",@@ -1919,11 +1975,15 @@},"properties": {"$ref": "#/components/schemas/ModelProperties"+ },+ "provider": {+ "$ref": "#/components/schemas/ModelListProvider"}},"required": ["name","model_id",+ "provider","properties"],"type": "object"@@ -1937,14 +1997,7 @@"type": "string"},"name": {- "allOf": [- {- "$ref": "#/components/schemas/ResourceName"- },- {- "description": "Internal identifier; forms the fully qualified name `name/model_name`."- }- ]+ "$ref": "#/components/schemas/ResourceName"},"properties": {"$ref": "#/components/schemas/ModelProperties"@@ -1957,6 +2010,21 @@],"type": "object"},+ "ModelListProvider": {+ "additionalProperties": false,+ "description": "Owning configured provider.",+ "properties": {+ "name": {+ "description": "Configured provider resource name; matches the FQN prefix of `name`.",+ "minLength": 1,+ "type": "string"+ }+ },+ "required": [+ "name"+ ],+ "type": "object"+ },"ModelMessageDeltaEvent": {"properties": {"content": {@@ -2506,7 +2574,7 @@"type": "object"},"ResourceName": {- "description": "Fully qualified name. Unique within a tenant.",+ "description": "Internal identifier; forms the fully qualified name `name/model_name`.","maxLength": 64,"minLength": 2,"pattern": "^[a-z](?:[a-z0-9._-]{0,62}[a-z0-9])$",@@ -2880,7 +2948,14 @@"additionalProperties": false,"properties": {"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]}},"required": [@@ -3008,7 +3083,14 @@"type": "string"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]},"path": {"description": "Path to the skill directory within the repository. Omit to use the repository root.",@@ -3066,7 +3148,14 @@"type": "string"},"name": {- "$ref": "#/components/schemas/ResourceName"+ "allOf": [+ {+ "$ref": "#/components/schemas/ResourceName"+ },+ {+ "description": "Fully qualified name. Unique within a tenant."+ }+ ]}},"required": [@@ -4574,6 +4663,150 @@"x-fern-sdk-method-name": "get_capabilities"}},+ "/api/v1/catalog/mcp-servers": {+ "get": {+ "description": "Shipped MCP server presets (discovery-only). Copy into PUT /settings/mcp-servers to configure.",+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/GetMcpServerCatalogResponse"+ }+ }+ },+ "description": "Shipped MCP server presets."+ },+ "401": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Not authenticated."+ }+ },+ "summary": "Get the MCP catalog",+ "tags": [+ "Catalog"+ ],+ "x-fern-sdk-group-name": [+ "catalog",+ "mcpServers"+ ],+ "x-fern-sdk-method-name": "list"+ }+ },+ "/api/v1/catalog/model-providers": {+ "get": {+ "description": "Shipped model-provider presets (discovery-only). Copy into PUT /settings/model-providers to configure. Includes a `custom` sentinel with `supported_reasoning_efforts`.",+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/GetModelProviderCatalogResponse"+ }+ }+ },+ "description": "Shipped model-provider presets."+ },+ "401": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Not authenticated."+ }+ },+ "summary": "Get the model catalog",+ "tags": [+ "Catalog"+ ],+ "x-fern-sdk-group-name": [+ "catalog",+ "modelProviders"+ ],+ "x-fern-sdk-method-name": "list"+ }+ },+ "/api/v1/catalog/sandbox-providers": {+ "get": {+ "description": "Shipped sandbox-provider presets (discovery-only). Copy into PUT /settings/sandbox-providers to configure.",+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/GetSandboxProviderCatalogResponse"+ }+ }+ },+ "description": "Shipped sandbox-provider presets."+ },+ "401": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Not authenticated."+ }+ },+ "summary": "Get the sandbox provider catalog",+ "tags": [+ "Catalog"+ ],+ "x-fern-sdk-group-name": [+ "catalog",+ "sandboxProviders"+ ],+ "x-fern-sdk-method-name": "list"+ }+ },+ "/api/v1/catalog/skills": {+ "get": {+ "description": "Shipped skill presets (discovery-only). Copy into PUT /settings/skills to configure.",+ "responses": {+ "200": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/GetSkillCatalogResponse"+ }+ }+ },+ "description": "Shipped skill presets."+ },+ "401": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Not authenticated."+ }+ },+ "summary": "Get the skill catalog",+ "tags": [+ "Catalog"+ ],+ "x-fern-sdk-group-name": [+ "catalog",+ "skills"+ ],+ "x-fern-sdk-method-name": "list"+ }+ },"/api/v1/mcp-servers": {"get": {"description": "MCP servers as a slim name/url list for the composer. No auth or auth_status.",@@ -6170,52 +6403,6 @@"x-fern-sdk-method-name": "upsert"}},- "/api/v1/settings/mcp-servers/catalog": {- "get": {- "description": "MCP server presets shipped with the server (mcp-catalog.yaml). Discovery-only: copy an entry into PUT /settings/mcp-servers to configure it.",- "responses": {- "200": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/GetMcpServerCatalogResponse"- }- }- },- "description": "The shipped catalog, verbatim."- },- "401": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the request has no valid session cookie."- },- "403": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the caller is authenticated but not an admin."- }- },- "summary": "Get the MCP catalog",- "tags": [- "MCP Servers"- ],- "x-fern-sdk-group-name": [- "settings",- "mcpServers"- ],- "x-fern-sdk-method-name": "catalog"- }- },"/api/v1/settings/mcp-servers/{name}": {"get": {"description": "A single MCP server by name, with nested auth_status (settings / admin projection). Header auth values are redacted.",@@ -6434,52 +6621,6 @@"x-fern-sdk-method-name": "upsert"}},- "/api/v1/settings/model-providers/catalog": {- "get": {- "description": "Provider and model presets shipped with the server (model-catalog.yaml). Discovery-only: an entry becomes a PUT /settings/model-providers body once the catalog-only `logo` and `name` are dropped and `auth` is added. Includes a `custom` sentinel with `supported_reasoning_efforts` for the custom-provider form (not configurable from catalog).",- "responses": {- "200": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/GetModelProviderCatalogResponse"- }- }- },- "description": "The shipped catalog, verbatim."- },- "401": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the request has no valid session cookie."- },- "403": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the caller is authenticated but not an admin."- }- },- "summary": "Get the model catalog",- "tags": [- "Model Providers"- ],- "x-fern-sdk-group-name": [- "settings",- "modelProviders"- ],- "x-fern-sdk-method-name": "catalog"- }- },"/api/v1/settings/sandbox-providers": {"get": {"description": "The single configured sandbox provider for this tenant.",@@ -6560,52 +6701,6 @@"x-fern-sdk-method-name": "upsert"}},- "/api/v1/settings/sandbox-providers/catalog": {- "get": {- "description": "Sandbox provider presets shipped with the server (sandbox-catalog.yaml). Discovery-only: copy an entry into PUT /settings/sandbox-providers to configure it.",- "responses": {- "200": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/GetSandboxProviderCatalogResponse"- }- }- },- "description": "The shipped catalog, verbatim."- },- "401": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the request has no valid session cookie."- },- "403": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the caller is authenticated but not an admin."- }- },- "summary": "Get the sandbox provider catalog",- "tags": [- "Sandbox Providers"- ],- "x-fern-sdk-group-name": [- "settings",- "sandboxProviders"- ],- "x-fern-sdk-method-name": "catalog"- }- },"/api/v1/settings/skills": {"get": {"description": "All configured skills with full manifests (settings / admin projection).",@@ -6696,52 +6791,6 @@"x-fern-sdk-method-name": "upsert"}},- "/api/v1/settings/skills/catalog": {- "get": {- "description": "Skill presets shipped with the server (skill-catalog.yaml). Discovery-only: copy an entry into PUT /settings/skills to configure it.",- "responses": {- "200": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/GetSkillCatalogResponse"- }- }- },- "description": "The shipped catalog, verbatim."- },- "401": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the request has no valid session cookie."- },- "403": {- "content": {- "application/json": {- "schema": {- "$ref": "#/components/schemas/RequestErrorResponse"- }- }- },- "description": "OIDC is configured and the caller is authenticated but not an admin."- }- },- "summary": "Get the skill catalog",- "tags": [- "Skills"- ],- "x-fern-sdk-group-name": [- "settings",- "skills"- ],- "x-fern-sdk-method-name": "catalog"- }- },"/api/v1/skills": {"get": {"description": "Configured skills as a slim name/description list for the composer.",diff --git a/packages/frontend/package.json b/packages/frontend/package.jsonindex 83b23483d..32be1dcd7 100644--- a/packages/frontend/package.json+++ b/packages/frontend/package.json@@ -24,7 +24,7 @@"@assistant-ui/core": "0.2.22","@assistant-ui/react": "^0.14.24","@assistant-ui/store": "0.2.21",- "@truefoundry/assistant-ui-runtime": "0.1.12",+ "@truefoundry/assistant-ui-runtime": "0.1.13","@truefoundry/trueforge-ui": "workspace:*","monaco-editor": "^0.52.0","react": "^19.2.4",diff --git a/packages/frontend/src/connectorCatalog.ts b/packages/frontend/src/connectorCatalog.tsindex 7504a699d..11bc41ef1 100644--- a/packages/frontend/src/connectorCatalog.ts+++ b/packages/frontend/src/connectorCatalog.ts@@ -161,7 +161,7 @@ export function createConnectorCatalog(): ConnectorCatalogServer<> {return {getConnectorCatalog: async () => {- const body = await client.settings.mcpServers.catalog();+ const body = await client.catalog.mcpServers.list();return body.data.map(toUiCatalogEntry);},getConnector: async req => {diff --git a/packages/frontend/src/harnessBuilderServer.ts b/packages/frontend/src/harnessBuilderServer.tsindex f7fde2020..199414771 100644--- a/packages/frontend/src/harnessBuilderServer.ts+++ b/packages/frontend/src/harnessBuilderServer.ts@@ -9,23 +9,38 @@ import type {SearchAgentsParams,} from '@truefoundry/trueforge-ui';import type { TrueForgeApi } from 'trueforge-sdk';-import { listConfiguredMcpServers, listModels, listSkills } from './composerLists';+import { listConfiguredMcpServers, listSkills } from './composerLists';import { toUiConnectorFromReadEntry } from './connectorCatalog';import { createHarnessClient, harnessClient, type CreateHarnessClientOptions } from './harnessClient';import { agentManifest, toHarnessAgentSpec, toUiAgentSpec, type HarnessAgentSpec } from './harnessServer';-/** Harness model names are `provider/model`. */-export function providerOf(name: string): string {- return name.split('/')[0] ?? name;+/** Well-known catalog entries key logos by `type` (same as configured provider resource name). */+export function modelProviderLogosByName(+ catalog: readonly TrueForgeApi.CatalogModelProvider[],+): ReadonlyMap<string, string> {+ const logos = new Map<string, string>();+ for (const entry of catalog) {+ if (entry.type === 'custom' || entry.logo === undefined) {+ continue;+ }+ logos.set(entry.type, entry.logo);+ }+ return logos;}-/** Map harness model rows onto the UI picker shape (incl. reasoning-effort options). */-export function toModelSelection(model: TrueForgeApi.Model): ModelSelection {+/** Map harness model rows onto the UI picker shape (nested provider + properties + optional logo). */+export function toModelSelection({ model, logo }: { model: TrueForgeApi.Model; logo?: string }): ModelSelection {const efforts = model.properties.reasoningEfforts;return {+ id: model.modelId,name: model.name,- provider: providerOf(model.name),- ...(efforts !== undefined && efforts.length > 0 ? { reasoningEfforts: [...efforts] } : {}),+ provider: {+ name: model.provider.name,+ ...(logo === undefined ? {} : { logo }),+ },+ properties: {+ ...(efforts !== undefined && efforts.length > 0 ? { reasoningEfforts: [...efforts] } : {}),+ },};}@@ -45,7 +60,21 @@ export function createHarnessBuilderServer(return {getCapabilities: () => client.server.getCapabilities(),- getModels: async () => (await listModels()).map(toModelSelection),+ getModels: async () => {+ // Catalog logos are optional UI enrichment — a catalog failure must not blank the picker.+ const [modelsBody, catalogEntries] = await Promise.all([+ client.models.list(),+ client.catalog.modelProviders.list().then(+ body => body.data,+ () => [],+ ),+ ]);+ const logosByName = modelProviderLogosByName(catalogEntries);+ return modelsBody.data.map(model => {+ const logo = logosByName.get(model.provider.name);+ return toModelSelection(logo === undefined ? { model } : { model, logo });+ });+ },// Skills require a configured sandbox provider; keep the picker empty when skill capability is off.getSkills: async () => {const skills = await listSkills();diff --git a/packages/frontend/src/modelProviderCatalog.ts b/packages/frontend/src/modelProviderCatalog.tsindex 49af9c0c4..ecac0873e 100644--- a/packages/frontend/src/modelProviderCatalog.ts+++ b/packages/frontend/src/modelProviderCatalog.ts@@ -159,7 +159,7 @@ export function createModelProviderCatalog(): ModelCatalogServer<> {return {getModelProviderCatalog: async () => {- const body = await client.settings.modelProviders.catalog();+ const body = await client.catalog.modelProviders.list();return body.data.map(toUiCatalogModelProviderEntry);},listModelProviders: async () => {diff --git a/packages/frontend/src/sandboxProviderCatalog.ts b/packages/frontend/src/sandboxProviderCatalog.tsindex b3ceefd4b..078281b42 100644--- a/packages/frontend/src/sandboxProviderCatalog.ts+++ b/packages/frontend/src/sandboxProviderCatalog.ts@@ -92,7 +92,7 @@ async function resolveApiKey(apiKey: string | undefined): Promise<string> {export function createSandboxProviderCatalog(): SandboxCatalogServer {return {getSandboxProviderCatalog: async () => {- const body = await client.settings.sandboxProviders.catalog();+ const body = await client.catalog.sandboxProviders.list();return body.data.map(toUiCatalogEntry);},listSandboxProviders: async req => {diff --git a/packages/frontend/src/skillCatalog.ts b/packages/frontend/src/skillCatalog.tsindex fbc775469..fcd2abcc3 100644--- a/packages/frontend/src/skillCatalog.ts+++ b/packages/frontend/src/skillCatalog.ts@@ -53,11 +53,11 @@ export function toUiSkill(skill: TrueForgeApi.SkillManifest, catalogNames: Readoexport function createSkillCatalog(): SkillCatalogServer<UiSkill> {return {getSkillCatalog: async () => {- const body = await client.settings.skills.catalog();+ const body = await client.catalog.skills.list();return body.data.map(toUiCatalogEntry);},listSkills: async req => {- const [listed, catalog] = await Promise.all([client.settings.skills.list(), client.settings.skills.catalog()]);+ const [listed, catalog] = await Promise.all([client.settings.skills.list(), client.catalog.skills.list()]);const catalogNames = new Set(catalog.data.map(entry => entry.name));const skills = listed.data.map(skill => toUiSkill(skill, catalogNames));const query = req?.query?.trim().toLowerCase();diff --git a/packages/frontend/tests/harnessBuilderServer.test.ts b/packages/frontend/tests/harnessBuilderServer.test.tsindex 699caec55..d6b88dae2 100644--- a/packages/frontend/tests/harnessBuilderServer.test.ts+++ b/packages/frontend/tests/harnessBuilderServer.test.ts@@ -1,33 +1,145 @@import assert from 'node:assert/strict';import { describe, it } from 'node:test';-import { createHarnessBuilderServer, providerOf, toModelSelection } from '../src/harnessBuilderServer';+import { createHarnessBuilderServer, modelProviderLogosByName, toModelSelection } from '../src/harnessBuilderServer';describe('harnessBuilderServer', () => {- it('providerOf takes the segment before the first slash', () => {- assert.equal(providerOf('openai/gpt-4o'), 'openai');- assert.equal(providerOf('anthropic/claude-sonnet-4'), 'anthropic');- });-- it('providerOf falls back to the full name when there is no slash', () => {- assert.equal(providerOf('gpt-4o'), 'gpt-4o');+ it('modelProviderLogosByName maps well-known catalog logos by type', () => {+ const logos = modelProviderLogosByName([+ {+ type: 'openai',+ logo: 'https://assets.example/openai.svg',+ models: [{ modelId: 'gpt', name: 'gpt', properties: {} }],+ },+ {+ type: 'anthropic',+ models: [{ modelId: 'claude', name: 'claude', properties: {} }],+ },+ { type: 'custom', supportedReasoningEfforts: ['low'] },+ ]);+ assert.equal(logos.get('openai'), 'https://assets.example/openai.svg');+ assert.equal(logos.has('anthropic'), false);+ assert.equal(logos.has('custom'), false);});- it('toModelSelection forwards reasoningEfforts when present', () => {+ it('toModelSelection maps nested provider + properties and optional logo', () => {assert.deepEqual(toModelSelection({+ model: {+ modelId: 'o3',+ name: 'openai/o3',+ provider: { name: 'openai' },+ properties: { reasoningEfforts: ['low', 'medium', 'high'] },+ },+ logo: 'https://assets.example/openai.svg',+ }),+ {+ id: 'o3',name: 'openai/o3',+ provider: { name: 'openai', logo: 'https://assets.example/openai.svg' },properties: { reasoningEfforts: ['low', 'medium', 'high'] },+ },+ );+ assert.deepEqual(+ toModelSelection({+ model: {+ modelId: 'gpt-4o',+ name: 'openai/gpt-4o',+ provider: { name: 'openai' },+ properties: {},+ },}),{- name: 'openai/o3',- provider: 'openai',- reasoningEfforts: ['low', 'medium', 'high'],+ id: 'gpt-4o',+ name: 'openai/gpt-4o',+ provider: { name: 'openai' },+ properties: {},},);- assert.deepEqual(toModelSelection({ name: 'openai/gpt-4o', properties: {} }), {- name: 'openai/gpt-4o',- provider: 'openai',- });+ });++ it('getModels joins catalog logos onto provider', async () => {+ const fetchMock: typeof fetch = async input => {+ const url = input instanceof Request ? input.url : String(input);+ if (url.endsWith('/api/v1/models')) {+ return Response.json({+ data: [+ {+ model_id: 'gpt-5-6-sol',+ name: 'openai/gpt-5-6-sol',+ provider: { name: 'openai' },+ properties: {},+ },+ {+ model_id: 'local-llama',+ name: 'internal/local-llama',+ provider: { name: 'internal' },+ properties: {},+ },+ ],+ });+ }+ if (url.endsWith('/api/v1/catalog/model-providers')) {+ return Response.json({+ data: [+ {+ type: 'openai',+ logo: 'https://assets.example/openai.svg',+ models: [{ model_id: 'gpt-5.6-sol', name: 'gpt-5-6-sol', properties: {} }],+ },+ { type: 'custom', supported_reasoning_efforts: ['low'] },+ ],+ });+ }+ return new Response(`Unexpected request: ${url}`, { status: 500 });+ };++ const builder = createHarnessBuilderServer({ fetch: fetchMock });+ assert.deepEqual(await builder.getModels(), [+ {+ id: 'gpt-5-6-sol',+ name: 'openai/gpt-5-6-sol',+ provider: { name: 'openai', logo: 'https://assets.example/openai.svg' },+ properties: {},+ },+ {+ id: 'local-llama',+ name: 'internal/local-llama',+ provider: { name: 'internal' },+ properties: {},+ },+ ]);+ });++ it('getModels still returns models when the catalog request fails', async () => {+ const fetchMock: typeof fetch = async input => {+ const url = input instanceof Request ? input.url : String(input);+ if (url.endsWith('/api/v1/models')) {+ return Response.json({+ data: [+ {+ model_id: 'gpt-5-6-sol',+ name: 'openai/gpt-5-6-sol',+ provider: { name: 'openai' },+ properties: {},+ },+ ],+ });+ }+ if (url.endsWith('/api/v1/catalog/model-providers')) {+ return new Response('catalog unavailable', { status: 500 });+ }+ return new Response(`Unexpected request: ${url}`, { status: 500 });+ };++ const builder = createHarnessBuilderServer({ fetch: fetchMock });+ assert.deepEqual(await builder.getModels(), [+ {+ id: 'gpt-5-6-sol',+ name: 'openai/gpt-5-6-sol',+ provider: { name: 'openai' },+ properties: {},+ },+ ]);});it('gets capabilities through the configured harness client', async () => {diff --git a/packages/sdk/.fern/metadata.json b/packages/sdk/.fern/metadata.jsonindex 6910e5b7b..983b23545 100644--- a/packages/sdk/.fern/metadata.json+++ b/packages/sdk/.fern/metadata.json@@ -28,7 +28,7 @@"streamType": "web","useDefaultRequestParameterValues": true},- "originGitCommit": "98015f5b2b16475ab69e6a0c6b67fc44d803bca7",+ "originGitCommit": "8df34ca793fa54137fa08741b27f259def98ab50","originGitCommitIsDirty": true,"invokedBy": "ci","requestedVersion": "0.0.0",diff --git a/packages/sdk/package.json b/packages/sdk/package.jsonindex 6268a71a4..adce6e576 100644--- a/packages/sdk/package.json+++ b/packages/sdk/package.json@@ -106,6 +106,61 @@},"default": "./dist/cjs/api/resources/skills/exports.js"},+ "./catalog": {+ "import": {+ "types": "./dist/esm/api/resources/catalog/exports.d.mts",+ "default": "./dist/esm/api/resources/catalog/exports.mjs"+ },+ "require": {+ "types": "./dist/cjs/api/resources/catalog/exports.d.ts",+ "default": "./dist/cjs/api/resources/catalog/exports.js"+ },+ "default": "./dist/cjs/api/resources/catalog/exports.js"+ },+ "./catalog/mcpServers": {+ "import": {+ "types": "./dist/esm/api/resources/catalog/resources/mcpServers/exports.d.mts",+ "default": "./dist/esm/api/resources/catalog/resources/mcpServers/exports.mjs"+ },+ "require": {+ "types": "./dist/cjs/api/resources/catalog/resources/mcpServers/exports.d.ts",+ "default": "./dist/cjs/api/resources/catalog/resources/mcpServers/exports.js"+ },+ "default": "./dist/cjs/api/resources/catalog/resources/mcpServers/exports.js"+ },+ "./catalog/modelProviders": {+ "import": {+ "types": "./dist/esm/api/resources/catalog/resources/modelProviders/exports.d.mts",+ "default": "./dist/esm/api/resources/catalog/resources/modelProviders/exports.mjs"+ },+ "require": {+ "types": "./dist/cjs/api/resources/catalog/resources/modelProviders/exports.d.ts",+ "default": "./dist/cjs/api/resources/catalog/resources/modelProviders/exports.js"+ },+ "default": "./dist/cjs/api/resources/catalog/resources/modelProviders/exports.js"+ },+ "./catalog/sandboxProviders": {+ "import": {+ "types": "./dist/esm/api/resources/catalog/resources/sandboxProviders/exports.d.mts",+ "default": "./dist/esm/api/resources/catalog/resources/sandboxProviders/exports.mjs"+ },+ "require": {+ "types": "./dist/cjs/api/resources/catalog/resources/sandboxProviders/exports.d.ts",+ "default": "./dist/cjs/api/resources/catalog/resources/sandboxProviders/exports.js"+ },+ "default": "./dist/cjs/api/resources/catalog/resources/sandboxProviders/exports.js"+ },+ "./catalog/skills": {+ "import": {+ "types": "./dist/esm/api/resources/catalog/resources/skills/exports.d.mts",+ "default": "./dist/esm/api/resources/catalog/resources/skills/exports.mjs"+ },+ "require": {+ "types": "./dist/cjs/api/resources/catalog/resources/skills/exports.d.ts",+ "default": "./dist/cjs/api/resources/catalog/resources/skills/exports.js"+ },+ "default": "./dist/cjs/api/resources/catalog/resources/skills/exports.js"+ },"./settings": {"import": {"types": "./dist/esm/api/resources/settings/exports.d.mts",diff --git a/packages/sdk/pnpm-lock.yaml b/packages/sdk/pnpm-lock.yamlindex 010f9c47d..3e88bc9ff 100644--- a/packages/sdk/pnpm-lock.yaml+++ b/packages/sdk/pnpm-lock.yaml@@ -25,7 +25,7 @@ importers:version: 5.9.3vitest:specifier: ^4.1.1- version: 4.1.10(@types/[email protected])([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected]))+ version: 4.1.10(@types/[email protected])([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected]))webpack:specifier: ^5.105.4version: 5.109.2@@ -449,8 +449,8 @@ packages:resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}engines: {node: '>=8'}- resolution: {integrity: sha512-3WJtd7/lVq2Jnuz6wed1l9+1ZD2u2Tet1/1NBc4Iedkmgbu+I7YuAqdAQ8T+VZtnwysMsAf3IqSq9D1gyZjA2g==}+ resolution: {integrity: sha512-bNglH7lPH5l+yHOes7Zr4VqxhOy4BQ9ZBUX4VdoFgxMpzJk7W1ZoO3Vgd9Pxa9PyjQ76sfm2aKH/nzEcCNRlew==}resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}@@ -797,8 +797,8 @@ packages:resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}engines: {node: '>=6'}- resolution: {integrity: sha512-rGbJiKeQ4WDe3EXlDAIaQcwftVfv2Q8o1awFNfvXolJYKkb1AuZY1RTOmqx4LJXZENbWZA7eIsYGHuEzHsi1nQ==}+ resolution: {integrity: sha512-CN9BVxWhgS/hRxtUMjtC2uRWSTcSfQFHMDWma6sKKfIivCD91sM+FOPfvwoaRMqCSrUpe1nv3jDamd9eEQ4y+w==}engines: {node: '>=10'}hasBin: true@@ -1174,14 +1174,14 @@ snapshots:chai: 6.2.2tinyrainbow: 3.1.1- '@vitest/[email protected]([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected]))':+ '@vitest/[email protected]([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected]))':dependencies:'@vitest/spy': 4.1.10estree-walker: 3.0.3magic-string: 0.30.21optionalDependencies:msw: 2.11.2(@types/[email protected])([email protected])- vite: 8.2.1(@types/[email protected])([email protected])+ vite: 8.2.1(@types/[email protected])([email protected])'@vitest/[email protected]':dependencies:@@ -1319,7 +1319,7 @@ snapshots:dependencies:baseline-browser-mapping: 2.11.13caniuse-lite: 1.0.30001809- electron-to-chromium: 1.5.404+ electron-to-chromium: 1.5.405node-releases: 2.0.53update-browserslist-db: 1.3.1([email protected])@@ -1358,7 +1358,7 @@ snapshots:- [email protected]: {}+ [email protected]: {}@@ -1487,7 +1487,7 @@ snapshots:'@jridgewell/trace-mapping': 0.3.31jest-worker: 27.5.1schema-utils: 4.3.3- terser: 5.49.2+ terser: 5.50.0webpack: 5.109.2@@ -1618,7 +1618,7 @@ snapshots:dependencies:'@jridgewell/source-map': 0.3.11acorn: 8.18.0@@ -1666,7 +1666,7 @@ snapshots:escalade: 3.2.0picocolors: 1.1.1dependencies:lightningcss: 1.33.0picomatch: 4.0.5@@ -1676,12 +1676,12 @@ snapshots:optionalDependencies:'@types/node': 20.19.43fsevents: 2.3.3- terser: 5.49.2+ terser: 5.50.0- [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected])):+ [email protected](@types/[email protected])([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected])):dependencies:'@vitest/expect': 4.1.10- '@vitest/mocker': 4.1.10([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected]))+ '@vitest/mocker': 4.1.10([email protected](@types/[email protected])([email protected]))([email protected](@types/[email protected])([email protected]))'@vitest/pretty-format': 4.1.10'@vitest/runner': 4.1.10'@vitest/snapshot': 4.1.10@@ -1698,7 +1698,7 @@ snapshots:tinyexec: 1.3.0tinyglobby: 0.2.17tinyrainbow: 3.1.1- vite: 8.2.1(@types/[email protected])([email protected])+ vite: 8.2.1(@types/[email protected])([email protected])why-is-node-running: 2.3.0optionalDependencies:'@types/node': 20.19.43diff --git a/packages/sdk/reference.md b/packages/sdk/reference.mdindex 239bc4d31..fdfec6aa4 100644--- a/packages/sdk/reference.md+++ b/packages/sdk/reference.md@@ -1800,8 +1800,8 @@ await client.skills.list();</dl></details>-## Settings McpServers-<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">list</a>() -> TrueForge.ListMcpServersResponse</code></summary>+## Catalog McpServers+<details><summary><code>client.catalog.mcpServers.<a href="/src/api/resources/catalog/resources/mcpServers/client/Client.ts">list</a>() -> TrueForge.GetMcpServerCatalogResponse</code></summary><dl><dd>@@ -1813,7 +1813,7 @@ await client.skills.list();<dl><dd>-All MCP servers with nested auth_status (settings / admin projection). Header auth values are redacted.+Shipped MCP server presets (discovery-only). Copy into PUT /settings/mcp-servers to configure.</dd></dl></dd>@@ -1828,7 +1828,7 @@ All MCP servers with nested auth_status (settings / admin projection). Header au<dd>```typescript-await client.settings.mcpServers.list();+await client.catalog.mcpServers.list();```</dd>@@ -1856,7 +1856,8 @@ await client.settings.mcpServers.list();</dl></details>-<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutMcpServerResponse</code></summary>+## Catalog ModelProviders+<details><summary><code>client.catalog.modelProviders.<a href="/src/api/resources/catalog/resources/modelProviders/client/Client.ts">list</a>() -> TrueForge.GetModelProviderCatalogResponse</code></summary><dl><dd>@@ -1868,7 +1869,7 @@ await client.settings.mcpServers.list();<dl><dd>-Create or replace by `name`. Does not start DCR or change oauth client columns. Header secrets: real value sets/rotates; redacted keeps existing (400 if none).+Shipped model-provider presets (discovery-only). Copy into PUT /settings/model-providers to configure. Includes a `custom` sentinel with `supported_reasoning_efforts`.</dd></dl></dd>@@ -1883,10 +1884,7 @@ Create or replace by `name`. Does not start DCR or change oauth client columns.<dd>```typescript-await client.settings.mcpServers.upsert({- name: "name",- url: "url"-});+await client.catalog.modelProviders.list();```</dd>@@ -1902,15 +1900,7 @@ await client.settings.mcpServers.upsert({<dl><dd>-**request:** `TrueForge.settings.McpServerManifest`--</dd>-</dl>--<dl>-<dd>--**requestOptions:** `McpServersClient.RequestOptions`+**requestOptions:** `ModelProvidersClient.RequestOptions`</dd></dl>@@ -1922,7 +1912,8 @@ await client.settings.mcpServers.upsert({</dl></details>-<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">catalog</a>() -> TrueForge.GetMcpServerCatalogResponse</code></summary>+## Catalog SandboxProviders+<details><summary><code>client.catalog.sandboxProviders.<a href="/src/api/resources/catalog/resources/sandboxProviders/client/Client.ts">list</a>() -> TrueForge.GetSandboxProviderCatalogResponse</code></summary><dl><dd>@@ -1934,7 +1925,7 @@ await client.settings.mcpServers.upsert({<dl><dd>-MCP server presets shipped with the server (mcp-catalog.yaml). Discovery-only: copy an entry into PUT /settings/mcp-servers to configure it.+Shipped sandbox-provider presets (discovery-only). Copy into PUT /settings/sandbox-providers to configure.</dd></dl></dd>@@ -1949,7 +1940,7 @@ MCP server presets shipped with the server (mcp-catalog.yaml). Discovery-only: c<dd>```typescript-await client.settings.mcpServers.catalog();+await client.catalog.sandboxProviders.list();```</dd>@@ -1965,7 +1956,7 @@ await client.settings.mcpServers.catalog();<dl><dd>-**requestOptions:** `McpServersClient.RequestOptions`+**requestOptions:** `SandboxProvidersClient.RequestOptions`</dd></dl>@@ -1977,7 +1968,8 @@ await client.settings.mcpServers.catalog();</dl></details>-<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">get</a>(name) -> TrueForge.GetMcpServerResponse</code></summary>+## Catalog Skills+<details><summary><code>client.catalog.skills.<a href="/src/api/resources/catalog/resources/skills/client/Client.ts">list</a>() -> TrueForge.GetSkillCatalogResponse</code></summary><dl><dd>@@ -1989,7 +1981,7 @@ await client.settings.mcpServers.catalog();<dl><dd>-A single MCP server by name, with nested auth_status (settings / admin projection). Header auth values are redacted.+Shipped skill presets (discovery-only). Copy into PUT /settings/skills to configure.</dd></dl></dd>@@ -2004,7 +1996,7 @@ A single MCP server by name, with nested auth_status (settings / admin projectio<dd>```typescript-await client.settings.mcpServers.get("name");+await client.catalog.skills.list();```</dd>@@ -2020,15 +2012,7 @@ await client.settings.mcpServers.get("name");<dl><dd>-**name:** `string` — MCP server name.--</dd>-</dl>--<dl>-<dd>--**requestOptions:** `McpServersClient.RequestOptions`+**requestOptions:** `SkillsClient.RequestOptions`</dd></dl>@@ -2040,7 +2024,8 @@ await client.settings.mcpServers.get("name");</dl></details>-<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">listTools</a>(name) -> TrueForge.ListMcpServerToolsResponse</code></summary>+## Settings McpServers+<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">list</a>() -> TrueForge.ListMcpServersResponse</code></summary><dl><dd>@@ -2052,7 +2037,7 @@ await client.settings.mcpServers.get("name");<dl><dd>-All tools exposed by the given MCP server (non-paginated), as returned by the MCP `tools/list` call.+All MCP servers with nested auth_status (settings / admin projection). Header auth values are redacted.</dd></dl></dd>@@ -2067,7 +2052,7 @@ All tools exposed by the given MCP server (non-paginated), as returned by the MC<dd>```typescript-await client.settings.mcpServers.listTools("name");+await client.settings.mcpServers.list();```</dd>@@ -2083,14 +2068,6 @@ await client.settings.mcpServers.listTools("name");<dl><dd>-**name:** `string` — MCP server name.--</dd>-</dl>--<dl>-<dd>-**requestOptions:** `McpServersClient.RequestOptions`</dd>@@ -2103,8 +2080,7 @@ await client.settings.mcpServers.listTools("name");</dl></details>-## Settings ModelProviders-<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">list</a>() -> TrueForge.ListModelProvidersResponse</code></summary>+<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutMcpServerResponse</code></summary><dl><dd>@@ -2116,7 +2092,7 @@ await client.settings.mcpServers.listTools("name");<dl><dd>-All configured providers with their models.+Create or replace by `name`. Does not start DCR or change oauth client columns. Header secrets: real value sets/rotates; redacted keeps existing (400 if none).</dd></dl></dd>@@ -2131,7 +2107,10 @@ All configured providers with their models.<dd>```typescript-await client.settings.modelProviders.list();+await client.settings.mcpServers.upsert({+ name: "name",+ url: "url"+});```</dd>@@ -2147,7 +2126,15 @@ await client.settings.modelProviders.list();<dl><dd>-**requestOptions:** `ModelProvidersClient.RequestOptions`+**request:** `TrueForge.settings.McpServerManifest`++</dd>+</dl>++<dl>+<dd>++**requestOptions:** `McpServersClient.RequestOptions`</dd></dl>@@ -2159,7 +2146,7 @@ await client.settings.modelProviders.list();</dl></details>-<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutModelProviderResponse</code></summary>+<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">get</a>(name) -> TrueForge.GetMcpServerResponse</code></summary><dl><dd>@@ -2171,7 +2158,7 @@ await client.settings.modelProviders.list();<dl><dd>-Create or replace a provider (models included). Well-known types use `type` as `name` (one each); `custom` is named by the caller. `auth.api_key`: real value sets/rotates; redacted keeps existing (400 if none).+A single MCP server by name, with nested auth_status (settings / admin projection). Header auth values are redacted.</dd></dl></dd>@@ -2186,17 +2173,7 @@ Create or replace a provider (models included). Well-known types use `type` as `<dd>```typescript-await client.settings.modelProviders.upsert({- auth: {- apiKey: "api_key"- },- models: [{- modelId: "model_id",- name: "name",- properties: {}- }],- type: "alibaba"-});+await client.settings.mcpServers.get("name");```</dd>@@ -2212,7 +2189,7 @@ await client.settings.modelProviders.upsert({<dl><dd>-**request:** `TrueForge.ModelProvider`+**name:** `string` — MCP server name.</dd></dl>@@ -2220,7 +2197,7 @@ await client.settings.modelProviders.upsert({<dl><dd>-**requestOptions:** `ModelProvidersClient.RequestOptions`+**requestOptions:** `McpServersClient.RequestOptions`</dd></dl>@@ -2232,7 +2209,7 @@ await client.settings.modelProviders.upsert({</dl></details>-<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">catalog</a>() -> TrueForge.GetModelProviderCatalogResponse</code></summary>+<details><summary><code>client.settings.mcpServers.<a href="/src/api/resources/settings/resources/mcpServers/client/Client.ts">listTools</a>(name) -> TrueForge.ListMcpServerToolsResponse</code></summary><dl><dd>@@ -2244,7 +2221,7 @@ await client.settings.modelProviders.upsert({<dl><dd>-Provider and model presets shipped with the server (model-catalog.yaml). Discovery-only: an entry becomes a PUT /settings/model-providers body once the catalog-only `logo` and `name` are dropped and `auth` is added. Includes a `custom` sentinel with `supported_reasoning_efforts` for the custom-provider form (not configurable from catalog).+All tools exposed by the given MCP server (non-paginated), as returned by the MCP `tools/list` call.</dd></dl></dd>@@ -2259,7 +2236,7 @@ Provider and model presets shipped with the server (model-catalog.yaml). Discove<dd>```typescript-await client.settings.modelProviders.catalog();+await client.settings.mcpServers.listTools("name");```</dd>@@ -2275,7 +2252,15 @@ await client.settings.modelProviders.catalog();<dl><dd>-**requestOptions:** `ModelProvidersClient.RequestOptions`+**name:** `string` — MCP server name.++</dd>+</dl>++<dl>+<dd>++**requestOptions:** `McpServersClient.RequestOptions`</dd></dl>@@ -2287,8 +2272,8 @@ await client.settings.modelProviders.catalog();</dl></details>-## Settings SandboxProviders-<details><summary><code>client.settings.sandboxProviders.<a href="/src/api/resources/settings/resources/sandboxProviders/client/Client.ts">get</a>() -> TrueForge.GetSandboxProviderResponse</code></summary>+## Settings ModelProviders+<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">list</a>() -> TrueForge.ListModelProvidersResponse</code></summary><dl><dd>@@ -2300,7 +2285,7 @@ await client.settings.modelProviders.catalog();<dl><dd>-The single configured sandbox provider for this tenant.+All configured providers with their models.</dd></dl></dd>@@ -2315,7 +2300,7 @@ The single configured sandbox provider for this tenant.<dd>```typescript-await client.settings.sandboxProviders.get();+await client.settings.modelProviders.list();```</dd>@@ -2331,7 +2316,7 @@ await client.settings.sandboxProviders.get();<dl><dd>-**requestOptions:** `SandboxProvidersClient.RequestOptions`+**requestOptions:** `ModelProvidersClient.RequestOptions`</dd></dl>@@ -2343,7 +2328,7 @@ await client.settings.sandboxProviders.get();</dl></details>-<details><summary><code>client.settings.sandboxProviders.<a href="/src/api/resources/settings/resources/sandboxProviders/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutSandboxProviderResponse</code></summary>+<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutModelProviderResponse</code></summary><dl><dd>@@ -2355,7 +2340,7 @@ await client.settings.sandboxProviders.get();<dl><dd>-Upserts the single sandbox provider for this tenant: creates it or replaces its entire configuration.+Create or replace a provider (models included). Well-known types use `type` as `name` (one each); `custom` is named by the caller. `auth.api_key`: real value sets/rotates; redacted keeps existing (400 if none).</dd></dl></dd>@@ -2370,16 +2355,16 @@ Upserts the single sandbox provider for this tenant: creates it or replaces its<dd>```typescript-await client.settings.sandboxProviders.upsert({+await client.settings.modelProviders.upsert({auth: {apiKey: "api_key"},- autoArchiveIntervalInMinutes: 1,- autoDeleteIntervalInMinutes: 1,- autoStopIntervalInMinutes: 1,- execTimeoutMs: 1,- snapshotName: "snapshot_name",- type: "daytona"+ models: [{+ modelId: "model_id",+ name: "name",+ properties: {}+ }],+ type: "alibaba"});```@@ -2396,7 +2381,7 @@ await client.settings.sandboxProviders.upsert({<dl><dd>-**request:** `TrueForge.DaytonaSandboxProvider`+**request:** `TrueForge.ModelProvider`</dd></dl>@@ -2404,7 +2389,7 @@ await client.settings.sandboxProviders.upsert({<dl><dd>-**requestOptions:** `SandboxProvidersClient.RequestOptions`+**requestOptions:** `ModelProvidersClient.RequestOptions`</dd></dl>@@ -2416,7 +2401,8 @@ await client.settings.sandboxProviders.upsert({</dl></details>-<details><summary><code>client.settings.sandboxProviders.<a href="/src/api/resources/settings/resources/sandboxProviders/client/Client.ts">catalog</a>() -> TrueForge.GetSandboxProviderCatalogResponse</code></summary>+## Settings SandboxProviders+<details><summary><code>client.settings.sandboxProviders.<a href="/src/api/resources/settings/resources/sandboxProviders/client/Client.ts">get</a>() -> TrueForge.GetSandboxProviderResponse</code></summary><dl><dd>@@ -2428,7 +2414,7 @@ await client.settings.sandboxProviders.upsert({<dl><dd>-Sandbox provider presets shipped with the server (sandbox-catalog.yaml). Discovery-only: copy an entry into PUT /settings/sandbox-providers to configure it.+The single configured sandbox provider for this tenant.</dd></dl></dd>@@ -2443,7 +2429,7 @@ Sandbox provider presets shipped with the server (sandbox-catalog.yaml). Discove<dd>```typescript-await client.settings.sandboxProviders.catalog();+await client.settings.sandboxProviders.get();```</dd>@@ -2471,8 +2457,7 @@ await client.settings.sandboxProviders.catalog();</dl></details>-## Settings Skills-<details><summary><code>client.settings.skills.<a href="/src/api/resources/settings/resources/skills/client/Client.ts">list</a>() -> TrueForge.ListConfiguredSkillsResponse</code></summary>+<details><summary><code>client.settings.sandboxProviders.<a href="/src/api/resources/settings/resources/sandboxProviders/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutSandboxProviderResponse</code></summary><dl><dd>@@ -2484,7 +2469,7 @@ await client.settings.sandboxProviders.catalog();<dl><dd>-All configured skills with full manifests (settings / admin projection).+Upserts the single sandbox provider for this tenant: creates it or replaces its entire configuration.</dd></dl></dd>@@ -2499,7 +2484,17 @@ All configured skills with full manifests (settings / admin projection).<dd>```typescript-await client.settings.skills.list();+await client.settings.sandboxProviders.upsert({+ auth: {+ apiKey: "api_key"+ },+ autoArchiveIntervalInMinutes: 1,+ autoDeleteIntervalInMinutes: 1,+ autoStopIntervalInMinutes: 1,+ execTimeoutMs: 1,+ snapshotName: "snapshot_name",+ type: "daytona"+});```</dd>@@ -2515,7 +2510,15 @@ await client.settings.skills.list();<dl><dd>-**requestOptions:** `SkillsClient.RequestOptions`+**request:** `TrueForge.DaytonaSandboxProvider`++</dd>+</dl>++<dl>+<dd>++**requestOptions:** `SandboxProvidersClient.RequestOptions`</dd></dl>@@ -2527,7 +2530,8 @@ await client.settings.skills.list();</dl></details>-<details><summary><code>client.settings.skills.<a href="/src/api/resources/settings/resources/skills/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutSkillResponse</code></summary>+## Settings Skills+<details><summary><code>client.settings.skills.<a href="/src/api/resources/settings/resources/skills/client/Client.ts">list</a>() -> TrueForge.ListConfiguredSkillsResponse</code></summary><dl><dd>@@ -2539,7 +2543,7 @@ await client.settings.skills.list();<dl><dd>-Full upsert keyed by `name`: creates the skill or replaces its entire manifest.+All configured skills with full manifests (settings / admin projection).</dd></dl></dd>@@ -2554,13 +2558,7 @@ Full upsert keyed by `name`: creates the skill or replaces its entire manifest.<dd>```typescript-await client.settings.skills.upsert({- description: "description",- name: "name",- ref: "ref",- type: "git",- url: "url"-});+await client.settings.skills.list();```</dd>@@ -2576,14 +2574,6 @@ await client.settings.skills.upsert({<dl><dd>-**request:** `TrueForge.SkillManifest`--</dd>-</dl>--<dl>-<dd>-**requestOptions:** `SkillsClient.RequestOptions`</dd>@@ -2596,7 +2586,7 @@ await client.settings.skills.upsert({</dl></details>-<details><summary><code>client.settings.skills.<a href="/src/api/resources/settings/resources/skills/client/Client.ts">catalog</a>() -> TrueForge.GetSkillCatalogResponse</code></summary>+<details><summary><code>client.settings.skills.<a href="/src/api/resources/settings/resources/skills/client/Client.ts">upsert</a>({ ...params }) -> TrueForge.PutSkillResponse</code></summary><dl><dd>@@ -2608,7 +2598,7 @@ await client.settings.skills.upsert({<dl><dd>-Skill presets shipped with the server (skill-catalog.yaml). Discovery-only: copy an entry into PUT /settings/skills to configure it.+Full upsert keyed by `name`: creates the skill or replaces its entire manifest.</dd></dl></dd>@@ -2623,7 +2613,13 @@ Skill presets shipped with the server (skill-catalog.yaml). Discovery-only: copy<dd>```typescript-await client.settings.skills.catalog();+await client.settings.skills.upsert({+ description: "description",+ name: "name",+ ref: "ref",+ type: "git",+ url: "url"+});```</dd>@@ -2639,6 +2635,14 @@ await client.settings.skills.catalog();<dl><dd>+**request:** `TrueForge.SkillManifest`++</dd>+</dl>++<dl>+<dd>+**requestOptions:** `SkillsClient.RequestOptions`</dd>diff --git a/packages/sdk/src/Client.ts b/packages/sdk/src/Client.tsindex 55c0591c9..f250cc59d 100644--- a/packages/sdk/src/Client.ts+++ b/packages/sdk/src/Client.ts@@ -2,6 +2,7 @@import { AgentsClient } from "./api/resources/agents/client/Client.js";import { AuthClient } from "./api/resources/auth/client/Client.js";+import { CatalogClient } from "./api/resources/catalog/client/Client.js";import { McpServersClient } from "./api/resources/mcpServers/client/Client.js";import { ModelsClient } from "./api/resources/models/client/Client.js";import { ServerClient } from "./api/resources/server/client/Client.js";@@ -27,6 +28,7 @@ export class TrueForge {protected _models: ModelsClient | undefined;protected _sessions: SessionsClient | undefined;protected _skills: SkillsClient | undefined;+ protected _catalog: CatalogClient | undefined;protected _settings: SettingsClient | undefined;constructor(options: TrueForge.Options) {@@ -61,6 +63,10 @@ export class TrueForge {return (this._skills ??= new SkillsClient(this._options));}+ public get catalog(): CatalogClient {+ return (this._catalog ??= new CatalogClient(this._options));+ }+public get settings(): SettingsClient {return (this._settings ??= new SettingsClient(this._options));}diff --git a/packages/sdk/src/api/resources/agents/client/requests/AgentWriteRequest.ts b/packages/sdk/src/api/resources/agents/client/requests/AgentWriteRequest.tsindex 5a1c4cdef..5e3b9d022 100644--- a/packages/sdk/src/api/resources/agents/client/requests/AgentWriteRequest.ts+++ b/packages/sdk/src/api/resources/agents/client/requests/AgentWriteRequest.ts@@ -12,5 +12,6 @@ import type * as TrueForge from "../../../../index.js";* }*/export interface AgentWriteRequest extends TrueForge.AgentSpec {- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;}diff --git a/packages/sdk/src/api/resources/catalog/client/Client.ts b/packages/sdk/src/api/resources/catalog/client/Client.tsnew file mode 100644index 000000000..5d8213162--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/client/Client.ts@@ -0,0 +1,40 @@+// This file was auto-generated by Fern from our API Definition.++import type { BaseClientOptions } from "../../../../BaseClient.js";+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../BaseClient.js";+import { McpServersClient } from "../resources/mcpServers/client/Client.js";+import { ModelProvidersClient } from "../resources/modelProviders/client/Client.js";+import { SandboxProvidersClient } from "../resources/sandboxProviders/client/Client.js";+import { SkillsClient } from "../resources/skills/client/Client.js";++export declare namespace CatalogClient {+ export type Options = BaseClientOptions;+}++export class CatalogClient {+ protected readonly _options: NormalizedClientOptionsWithAuth<CatalogClient.Options>;+ protected _mcpServers: McpServersClient | undefined;+ protected _modelProviders: ModelProvidersClient | undefined;+ protected _sandboxProviders: SandboxProvidersClient | undefined;+ protected _skills: SkillsClient | undefined;++ constructor(options: CatalogClient.Options) {+ this._options = normalizeClientOptionsWithAuth(options);+ }++ public get mcpServers(): McpServersClient {+ return (this._mcpServers ??= new McpServersClient(this._options));+ }++ public get modelProviders(): ModelProvidersClient {+ return (this._modelProviders ??= new ModelProvidersClient(this._options));+ }++ public get sandboxProviders(): SandboxProvidersClient {+ return (this._sandboxProviders ??= new SandboxProvidersClient(this._options));+ }++ public get skills(): SkillsClient {+ return (this._skills ??= new SkillsClient(this._options));+ }+}diff --git a/packages/sdk/src/api/resources/catalog/client/index.ts b/packages/sdk/src/api/resources/catalog/client/index.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/client/index.ts@@ -0,0 +1 @@+export {};diff --git a/packages/sdk/src/api/resources/catalog/exports.ts b/packages/sdk/src/api/resources/catalog/exports.tsnew file mode 100644index 000000000..157766f23--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/exports.ts@@ -0,0 +1,5 @@+// This file was auto-generated by Fern from our API Definition.++export { CatalogClient } from "./client/Client.js";+export * from "./client/index.js";+export * from "./resources/index.js";diff --git a/packages/sdk/src/api/resources/catalog/index.ts b/packages/sdk/src/api/resources/catalog/index.tsnew file mode 100644index 000000000..9eb1192dc--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/index.ts@@ -0,0 +1,2 @@+export * from "./client/index.js";+export * from "./resources/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/index.ts b/packages/sdk/src/api/resources/catalog/resources/index.tsnew file mode 100644index 000000000..160fb572f--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/index.ts@@ -0,0 +1,4 @@+export * as mcpServers from "./mcpServers/index.js";+export * as modelProviders from "./modelProviders/index.js";+export * as sandboxProviders from "./sandboxProviders/index.js";+export * as skills from "./skills/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/mcpServers/client/Client.ts b/packages/sdk/src/api/resources/catalog/resources/mcpServers/client/Client.tsnew file mode 100644index 000000000..60372ab8f--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/mcpServers/client/Client.ts@@ -0,0 +1,104 @@+// This file was auto-generated by Fern from our API Definition.++import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.js";+import { mergeHeaders } from "../../../../../../core/headers.js";+import * as core from "../../../../../../core/index.js";+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";+import * as errors from "../../../../../../errors/index.js";+import * as serializers from "../../../../../../serialization/index.js";+import * as TrueForge from "../../../../../index.js";++export declare namespace McpServersClient {+ export type Options = BaseClientOptions;++ export interface RequestOptions extends BaseRequestOptions {}+}++export class McpServersClient {+ protected readonly _options: NormalizedClientOptionsWithAuth<McpServersClient.Options>;++ constructor(options: McpServersClient.Options) {+ this._options = normalizeClientOptionsWithAuth(options);+ }++ /**+ * Shipped MCP server presets (discovery-only). Copy into PUT /settings/mcp-servers to configure.+ *+ * @param {McpServersClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.UnauthorizedError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.catalog.mcpServers.list()+ */+ public list(+ requestOptions?: McpServersClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.GetMcpServerCatalogResponse> {+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));+ }++ private async __list(+ requestOptions?: McpServersClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.GetMcpServerCatalogResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ "api/v1/catalog/mcp-servers",+ ),+ method: "GET",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.GetMcpServerCatalogResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 401:+ throw new TrueForge.UnauthorizedError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/catalog/mcp-servers");+ }+}diff --git a/packages/sdk/src/api/resources/catalog/resources/mcpServers/client/index.ts b/packages/sdk/src/api/resources/catalog/resources/mcpServers/client/index.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/mcpServers/client/index.ts@@ -0,0 +1 @@+export {};diff --git a/packages/sdk/src/api/resources/catalog/resources/mcpServers/exports.ts b/packages/sdk/src/api/resources/catalog/resources/mcpServers/exports.tsnew file mode 100644index 000000000..3a0df5f61--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/mcpServers/exports.ts@@ -0,0 +1,4 @@+// This file was auto-generated by Fern from our API Definition.++export { McpServersClient } from "./client/Client.js";+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/mcpServers/index.ts b/packages/sdk/src/api/resources/catalog/resources/mcpServers/index.tsnew file mode 100644index 000000000..914b8c3c7--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/mcpServers/index.ts@@ -0,0 +1 @@+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/modelProviders/client/Client.ts b/packages/sdk/src/api/resources/catalog/resources/modelProviders/client/Client.tsnew file mode 100644index 000000000..09459680f--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/modelProviders/client/Client.ts@@ -0,0 +1,109 @@+// This file was auto-generated by Fern from our API Definition.++import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.js";+import { mergeHeaders } from "../../../../../../core/headers.js";+import * as core from "../../../../../../core/index.js";+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";+import * as errors from "../../../../../../errors/index.js";+import * as serializers from "../../../../../../serialization/index.js";+import * as TrueForge from "../../../../../index.js";++export declare namespace ModelProvidersClient {+ export type Options = BaseClientOptions;++ export interface RequestOptions extends BaseRequestOptions {}+}++export class ModelProvidersClient {+ protected readonly _options: NormalizedClientOptionsWithAuth<ModelProvidersClient.Options>;++ constructor(options: ModelProvidersClient.Options) {+ this._options = normalizeClientOptionsWithAuth(options);+ }++ /**+ * Shipped model-provider presets (discovery-only). Copy into PUT /settings/model-providers to configure. Includes a `custom` sentinel with `supported_reasoning_efforts`.+ *+ * @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.UnauthorizedError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.catalog.modelProviders.list()+ */+ public list(+ requestOptions?: ModelProvidersClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.GetModelProviderCatalogResponse> {+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));+ }++ private async __list(+ requestOptions?: ModelProvidersClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.GetModelProviderCatalogResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ "api/v1/catalog/model-providers",+ ),+ method: "GET",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.GetModelProviderCatalogResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 401:+ throw new TrueForge.UnauthorizedError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(+ _response.error,+ _response.rawResponse,+ "GET",+ "/api/v1/catalog/model-providers",+ );+ }+}diff --git a/packages/sdk/src/api/resources/catalog/resources/modelProviders/client/index.ts b/packages/sdk/src/api/resources/catalog/resources/modelProviders/client/index.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/modelProviders/client/index.ts@@ -0,0 +1 @@+export {};diff --git a/packages/sdk/src/api/resources/catalog/resources/modelProviders/exports.ts b/packages/sdk/src/api/resources/catalog/resources/modelProviders/exports.tsnew file mode 100644index 000000000..442243954--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/modelProviders/exports.ts@@ -0,0 +1,4 @@+// This file was auto-generated by Fern from our API Definition.++export { ModelProvidersClient } from "./client/Client.js";+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/modelProviders/index.ts b/packages/sdk/src/api/resources/catalog/resources/modelProviders/index.tsnew file mode 100644index 000000000..914b8c3c7--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/modelProviders/index.ts@@ -0,0 +1 @@+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/client/Client.ts b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/client/Client.tsnew file mode 100644index 000000000..72d68b615--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/client/Client.ts@@ -0,0 +1,109 @@+// This file was auto-generated by Fern from our API Definition.++import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.js";+import { mergeHeaders } from "../../../../../../core/headers.js";+import * as core from "../../../../../../core/index.js";+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";+import * as errors from "../../../../../../errors/index.js";+import * as serializers from "../../../../../../serialization/index.js";+import * as TrueForge from "../../../../../index.js";++export declare namespace SandboxProvidersClient {+ export type Options = BaseClientOptions;++ export interface RequestOptions extends BaseRequestOptions {}+}++export class SandboxProvidersClient {+ protected readonly _options: NormalizedClientOptionsWithAuth<SandboxProvidersClient.Options>;++ constructor(options: SandboxProvidersClient.Options) {+ this._options = normalizeClientOptionsWithAuth(options);+ }++ /**+ * Shipped sandbox-provider presets (discovery-only). Copy into PUT /settings/sandbox-providers to configure.+ *+ * @param {SandboxProvidersClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.UnauthorizedError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.catalog.sandboxProviders.list()+ */+ public list(+ requestOptions?: SandboxProvidersClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.GetSandboxProviderCatalogResponse> {+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));+ }++ private async __list(+ requestOptions?: SandboxProvidersClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.GetSandboxProviderCatalogResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ "api/v1/catalog/sandbox-providers",+ ),+ method: "GET",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.GetSandboxProviderCatalogResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 401:+ throw new TrueForge.UnauthorizedError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(+ _response.error,+ _response.rawResponse,+ "GET",+ "/api/v1/catalog/sandbox-providers",+ );+ }+}diff --git a/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/client/index.ts b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/client/index.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/client/index.ts@@ -0,0 +1 @@+export {};diff --git a/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/exports.ts b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/exports.tsnew file mode 100644index 000000000..f900688f4--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/exports.ts@@ -0,0 +1,4 @@+// This file was auto-generated by Fern from our API Definition.++export { SandboxProvidersClient } from "./client/Client.js";+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/index.ts b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/index.tsnew file mode 100644index 000000000..914b8c3c7--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/sandboxProviders/index.ts@@ -0,0 +1 @@+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/skills/client/Client.ts b/packages/sdk/src/api/resources/catalog/resources/skills/client/Client.tsnew file mode 100644index 000000000..fd0af8c34--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/skills/client/Client.ts@@ -0,0 +1,104 @@+// This file was auto-generated by Fern from our API Definition.++import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";+import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../../../BaseClient.js";+import { mergeHeaders } from "../../../../../../core/headers.js";+import * as core from "../../../../../../core/index.js";+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";+import * as errors from "../../../../../../errors/index.js";+import * as serializers from "../../../../../../serialization/index.js";+import * as TrueForge from "../../../../../index.js";++export declare namespace SkillsClient {+ export type Options = BaseClientOptions;++ export interface RequestOptions extends BaseRequestOptions {}+}++export class SkillsClient {+ protected readonly _options: NormalizedClientOptionsWithAuth<SkillsClient.Options>;++ constructor(options: SkillsClient.Options) {+ this._options = normalizeClientOptionsWithAuth(options);+ }++ /**+ * Shipped skill presets (discovery-only). Copy into PUT /settings/skills to configure.+ *+ * @param {SkillsClient.RequestOptions} requestOptions - Request-specific configuration.+ *+ * @throws {@link TrueForge.UnauthorizedError}+ * @throws {@link errors.TrueForgeError}+ * @throws {@link errors.TrueForgeTimeoutError}+ *+ * @example+ * await client.catalog.skills.list()+ */+ public list(+ requestOptions?: SkillsClient.RequestOptions,+ ): core.HttpResponsePromise<TrueForge.GetSkillCatalogResponse> {+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));+ }++ private async __list(+ requestOptions?: SkillsClient.RequestOptions,+ ): Promise<core.WithRawResponse<TrueForge.GetSkillCatalogResponse>> {+ const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(+ _authRequest.headers,+ this._options?.headers,+ requestOptions?.headers,+ );+ const _response = await (this._options.fetcher ?? core.fetcher)({+ url: core.url.join(+ (await core.Supplier.get(this._options.baseUrl)) ??+ (await core.Supplier.get(this._options.environment)),+ "api/v1/catalog/skills",+ ),+ method: "GET",+ headers: _headers,+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),+ timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,+ maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,+ abortSignal: requestOptions?.abortSignal,+ fetchFn: this._options?.fetch,+ logging: this._options.logging,+ });+ if (_response.ok) {+ return {+ data: serializers.GetSkillCatalogResponse.parseOrThrow(_response.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ rawResponse: _response.rawResponse,+ };+ }++ if (_response.error.reason === "status-code") {+ switch (_response.error.statusCode) {+ case 401:+ throw new TrueForge.UnauthorizedError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );+ default:+ throw new errors.TrueForgeError({+ statusCode: _response.error.statusCode,+ body: _response.error.body,+ rawResponse: _response.rawResponse,+ });+ }+ }++ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/catalog/skills");+ }+}diff --git a/packages/sdk/src/api/resources/catalog/resources/skills/client/index.ts b/packages/sdk/src/api/resources/catalog/resources/skills/client/index.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/skills/client/index.ts@@ -0,0 +1 @@+export {};diff --git a/packages/sdk/src/api/resources/catalog/resources/skills/exports.ts b/packages/sdk/src/api/resources/catalog/resources/skills/exports.tsnew file mode 100644index 000000000..b13b787d5--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/skills/exports.ts@@ -0,0 +1,4 @@+// This file was auto-generated by Fern from our API Definition.++export { SkillsClient } from "./client/Client.js";+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/catalog/resources/skills/index.ts b/packages/sdk/src/api/resources/catalog/resources/skills/index.tsnew file mode 100644index 000000000..914b8c3c7--- /dev/null+++ b/packages/sdk/src/api/resources/catalog/resources/skills/index.ts@@ -0,0 +1 @@+export * from "./client/index.js";diff --git a/packages/sdk/src/api/resources/index.ts b/packages/sdk/src/api/resources/index.tsindex 32797cdef..1cffd4220 100644--- a/packages/sdk/src/api/resources/index.ts+++ b/packages/sdk/src/api/resources/index.ts@@ -1,6 +1,7 @@export * from "./agents/client/requests/index.js";export * as agents from "./agents/index.js";export * as auth from "./auth/index.js";+export * as catalog from "./catalog/index.js";export * from "./mcpServers/client/requests/index.js";export * as mcpServers from "./mcpServers/index.js";export * as models from "./models/index.js";diff --git a/packages/sdk/src/api/resources/settings/resources/index.ts b/packages/sdk/src/api/resources/settings/resources/index.tsindex c1abe74c3..aa7a12040 100644--- a/packages/sdk/src/api/resources/settings/resources/index.ts+++ b/packages/sdk/src/api/resources/settings/resources/index.ts@@ -1,5 +1,6 @@export * from "./mcpServers/client/requests/index.js";export * as mcpServers from "./mcpServers/index.js";+export * from "./mcpServers/types/index.js";export * as modelProviders from "./modelProviders/index.js";export * as sandboxProviders from "./sandboxProviders/index.js";export * as skills from "./skills/index.js";diff --git a/packages/sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts b/packages/sdk/src/api/resources/settings/resources/mcpServers/client/Client.tsindex 7171cf2ce..307ab12ad 100644--- a/packages/sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts+++ b/packages/sdk/src/api/resources/settings/resources/mcpServers/client/Client.ts@@ -227,103 +227,6 @@ export class McpServersClient {return handleNonStatusCodeError(_response.error, _response.rawResponse, "PUT", "/api/v1/settings/mcp-servers");}- /**- * MCP server presets shipped with the server (mcp-catalog.yaml). Discovery-only: copy an entry into PUT /settings/mcp-servers to configure it.- *- * @param {McpServersClient.RequestOptions} requestOptions - Request-specific configuration.- *- * @throws {@link TrueForge.UnauthorizedError}- * @throws {@link TrueForge.ForbiddenError}- * @throws {@link errors.TrueForgeError}- * @throws {@link errors.TrueForgeTimeoutError}- *- * @example- * await client.settings.mcpServers.catalog()- */- public catalog(- requestOptions?: McpServersClient.RequestOptions,- ): core.HttpResponsePromise<TrueForge.GetMcpServerCatalogResponse> {- return core.HttpResponsePromise.fromPromise(this.__catalog(requestOptions));- }-- private async __catalog(- requestOptions?: McpServersClient.RequestOptions,- ): Promise<core.WithRawResponse<TrueForge.GetMcpServerCatalogResponse>> {- const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();- const _headers: core.Fetcher.Args["headers"] = mergeHeaders(- _authRequest.headers,- this._options?.headers,- requestOptions?.headers,- );- const _response = await (this._options.fetcher ?? core.fetcher)({- url: core.url.join(- (await core.Supplier.get(this._options.baseUrl)) ??- (await core.Supplier.get(this._options.environment)),- "api/v1/settings/mcp-servers/catalog",- ),- method: "GET",- headers: _headers,- queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),- timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,- maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,- abortSignal: requestOptions?.abortSignal,- fetchFn: this._options?.fetch,- logging: this._options.logging,- });- if (_response.ok) {- return {- data: serializers.GetMcpServerCatalogResponse.parseOrThrow(_response.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- rawResponse: _response.rawResponse,- };- }-- if (_response.error.reason === "status-code") {- switch (_response.error.statusCode) {- case 401:- throw new TrueForge.UnauthorizedError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- case 403:- throw new TrueForge.ForbiddenError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- default:- throw new errors.TrueForgeError({- statusCode: _response.error.statusCode,- body: _response.error.body,- rawResponse: _response.rawResponse,- });- }- }-- return handleNonStatusCodeError(- _response.error,- _response.rawResponse,- "GET",- "/api/v1/settings/mcp-servers/catalog",- );- }-/*** A single MCP server by name, with nested auth_status (settings / admin projection). Header auth values are redacted.*diff --git a/packages/sdk/src/api/resources/settings/resources/mcpServers/client/requests/McpServerManifest.ts b/packages/sdk/src/api/resources/settings/resources/mcpServers/client/requests/McpServerManifest.tsindex f41afde64..38b2fb2d1 100644--- a/packages/sdk/src/api/resources/settings/resources/mcpServers/client/requests/McpServerManifest.ts+++ b/packages/sdk/src/api/resources/settings/resources/mcpServers/client/requests/McpServerManifest.ts@@ -10,8 +10,10 @@ import type * as TrueForge from "../../../../../../index.js";* }*/export interface McpServerManifest {- auth?: TrueForge.ConfiguredMcpServerAuth;- name: TrueForge.ResourceName;+ /** Optional auth settings. Omit when the server needs no credentials. */+ auth?: TrueForge.settings.McpServerManifestAuth;+ /** Fully qualified name. Unique within a tenant. */+ name: string;/** URL of the remote MCP server. */url: string;}diff --git a/packages/sdk/src/api/resources/settings/resources/mcpServers/index.ts b/packages/sdk/src/api/resources/settings/resources/mcpServers/index.tsindex 914b8c3c7..d9adb1af9 100644--- a/packages/sdk/src/api/resources/settings/resources/mcpServers/index.ts+++ b/packages/sdk/src/api/resources/settings/resources/mcpServers/index.ts@@ -1 +1,2 @@export * from "./client/index.js";+export * from "./types/index.js";diff --git a/packages/sdk/src/api/resources/settings/resources/mcpServers/types/McpServerManifestAuth.ts b/packages/sdk/src/api/resources/settings/resources/mcpServers/types/McpServerManifestAuth.tsnew file mode 100644index 000000000..9cd21f5d5--- /dev/null+++ b/packages/sdk/src/api/resources/settings/resources/mcpServers/types/McpServerManifestAuth.ts@@ -0,0 +1,8 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../../../../index.js";++/**+ * Optional auth settings. Omit when the server needs no credentials.+ */+export type McpServerManifestAuth = TrueForge.McpServerDcrAuth | TrueForge.McpServerHeaderAuth;diff --git a/packages/sdk/src/api/resources/settings/resources/mcpServers/types/index.ts b/packages/sdk/src/api/resources/settings/resources/mcpServers/types/index.tsnew file mode 100644index 000000000..d6d7776f0--- /dev/null+++ b/packages/sdk/src/api/resources/settings/resources/mcpServers/types/index.ts@@ -0,0 +1 @@+export * from "./McpServerManifestAuth.js";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 d0763185d..560f053aa 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@@ -228,101 +228,4 @@ export class ModelProvidersClient {"/api/v1/settings/model-providers",);}-- /**- * Provider and model presets shipped with the server (model-catalog.yaml). Discovery-only: an entry becomes a PUT /settings/model-providers body once the catalog-only `logo` and `name` are dropped and `auth` is added. Includes a `custom` sentinel with `supported_reasoning_efforts` for the custom-provider form (not configurable from catalog).- *- * @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.- *- * @throws {@link TrueForge.UnauthorizedError}- * @throws {@link TrueForge.ForbiddenError}- * @throws {@link errors.TrueForgeError}- * @throws {@link errors.TrueForgeTimeoutError}- *- * @example- * await client.settings.modelProviders.catalog()- */- public catalog(- requestOptions?: ModelProvidersClient.RequestOptions,- ): core.HttpResponsePromise<TrueForge.GetModelProviderCatalogResponse> {- return core.HttpResponsePromise.fromPromise(this.__catalog(requestOptions));- }-- private async __catalog(- requestOptions?: ModelProvidersClient.RequestOptions,- ): Promise<core.WithRawResponse<TrueForge.GetModelProviderCatalogResponse>> {- const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();- const _headers: core.Fetcher.Args["headers"] = mergeHeaders(- _authRequest.headers,- this._options?.headers,- requestOptions?.headers,- );- const _response = await (this._options.fetcher ?? core.fetcher)({- url: core.url.join(- (await core.Supplier.get(this._options.baseUrl)) ??- (await core.Supplier.get(this._options.environment)),- "api/v1/settings/model-providers/catalog",- ),- method: "GET",- headers: _headers,- queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),- timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,- maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,- abortSignal: requestOptions?.abortSignal,- fetchFn: this._options?.fetch,- logging: this._options.logging,- });- if (_response.ok) {- return {- data: serializers.GetModelProviderCatalogResponse.parseOrThrow(_response.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- rawResponse: _response.rawResponse,- };- }-- if (_response.error.reason === "status-code") {- switch (_response.error.statusCode) {- case 401:- throw new TrueForge.UnauthorizedError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- case 403:- throw new TrueForge.ForbiddenError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- default:- throw new errors.TrueForgeError({- statusCode: _response.error.statusCode,- body: _response.error.body,- rawResponse: _response.rawResponse,- });- }- }-- return handleNonStatusCodeError(- _response.error,- _response.rawResponse,- "GET",- "/api/v1/settings/model-providers/catalog",- );- }}diff --git a/packages/sdk/src/api/resources/settings/resources/sandboxProviders/client/Client.ts b/packages/sdk/src/api/resources/settings/resources/sandboxProviders/client/Client.tsindex edc2ea4d3..e1c39e1ef 100644--- a/packages/sdk/src/api/resources/settings/resources/sandboxProviders/client/Client.ts+++ b/packages/sdk/src/api/resources/settings/resources/sandboxProviders/client/Client.ts@@ -216,101 +216,4 @@ export class SandboxProvidersClient {"/api/v1/settings/sandbox-providers",);}-- /**- * Sandbox provider presets shipped with the server (sandbox-catalog.yaml). Discovery-only: copy an entry into PUT /settings/sandbox-providers to configure it.- *- * @param {SandboxProvidersClient.RequestOptions} requestOptions - Request-specific configuration.- *- * @throws {@link TrueForge.UnauthorizedError}- * @throws {@link TrueForge.ForbiddenError}- * @throws {@link errors.TrueForgeError}- * @throws {@link errors.TrueForgeTimeoutError}- *- * @example- * await client.settings.sandboxProviders.catalog()- */- public catalog(- requestOptions?: SandboxProvidersClient.RequestOptions,- ): core.HttpResponsePromise<TrueForge.GetSandboxProviderCatalogResponse> {- return core.HttpResponsePromise.fromPromise(this.__catalog(requestOptions));- }-- private async __catalog(- requestOptions?: SandboxProvidersClient.RequestOptions,- ): Promise<core.WithRawResponse<TrueForge.GetSandboxProviderCatalogResponse>> {- const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();- const _headers: core.Fetcher.Args["headers"] = mergeHeaders(- _authRequest.headers,- this._options?.headers,- requestOptions?.headers,- );- const _response = await (this._options.fetcher ?? core.fetcher)({- url: core.url.join(- (await core.Supplier.get(this._options.baseUrl)) ??- (await core.Supplier.get(this._options.environment)),- "api/v1/settings/sandbox-providers/catalog",- ),- method: "GET",- headers: _headers,- queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),- timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,- maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,- abortSignal: requestOptions?.abortSignal,- fetchFn: this._options?.fetch,- logging: this._options.logging,- });- if (_response.ok) {- return {- data: serializers.GetSandboxProviderCatalogResponse.parseOrThrow(_response.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- rawResponse: _response.rawResponse,- };- }-- if (_response.error.reason === "status-code") {- switch (_response.error.statusCode) {- case 401:- throw new TrueForge.UnauthorizedError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- case 403:- throw new TrueForge.ForbiddenError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- default:- throw new errors.TrueForgeError({- statusCode: _response.error.statusCode,- body: _response.error.body,- rawResponse: _response.rawResponse,- });- }- }-- return handleNonStatusCodeError(- _response.error,- _response.rawResponse,- "GET",- "/api/v1/settings/sandbox-providers/catalog",- );- }}diff --git a/packages/sdk/src/api/resources/settings/resources/skills/client/Client.ts b/packages/sdk/src/api/resources/settings/resources/skills/client/Client.tsindex e39d079c7..337d10a8a 100644--- a/packages/sdk/src/api/resources/settings/resources/skills/client/Client.ts+++ b/packages/sdk/src/api/resources/settings/resources/skills/client/Client.ts@@ -214,101 +214,4 @@ export class SkillsClient {return handleNonStatusCodeError(_response.error, _response.rawResponse, "PUT", "/api/v1/settings/skills");}-- /**- * Skill presets shipped with the server (skill-catalog.yaml). Discovery-only: copy an entry into PUT /settings/skills to configure it.- *- * @param {SkillsClient.RequestOptions} requestOptions - Request-specific configuration.- *- * @throws {@link TrueForge.UnauthorizedError}- * @throws {@link TrueForge.ForbiddenError}- * @throws {@link errors.TrueForgeError}- * @throws {@link errors.TrueForgeTimeoutError}- *- * @example- * await client.settings.skills.catalog()- */- public catalog(- requestOptions?: SkillsClient.RequestOptions,- ): core.HttpResponsePromise<TrueForge.GetSkillCatalogResponse> {- return core.HttpResponsePromise.fromPromise(this.__catalog(requestOptions));- }-- private async __catalog(- requestOptions?: SkillsClient.RequestOptions,- ): Promise<core.WithRawResponse<TrueForge.GetSkillCatalogResponse>> {- const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest();- const _headers: core.Fetcher.Args["headers"] = mergeHeaders(- _authRequest.headers,- this._options?.headers,- requestOptions?.headers,- );- const _response = await (this._options.fetcher ?? core.fetcher)({- url: core.url.join(- (await core.Supplier.get(this._options.baseUrl)) ??- (await core.Supplier.get(this._options.environment)),- "api/v1/settings/skills/catalog",- ),- method: "GET",- headers: _headers,- queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),- timeoutMs: (requestOptions?.timeoutInSeconds ?? this._options?.timeoutInSeconds ?? 60) * 1000,- maxRetries: requestOptions?.maxRetries ?? this._options?.maxRetries,- abortSignal: requestOptions?.abortSignal,- fetchFn: this._options?.fetch,- logging: this._options.logging,- });- if (_response.ok) {- return {- data: serializers.GetSkillCatalogResponse.parseOrThrow(_response.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- rawResponse: _response.rawResponse,- };- }-- if (_response.error.reason === "status-code") {- switch (_response.error.statusCode) {- case 401:- throw new TrueForge.UnauthorizedError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- case 403:- throw new TrueForge.ForbiddenError(- serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {- unrecognizedObjectKeys: "passthrough",- allowUnrecognizedUnionMembers: true,- allowUnrecognizedEnumValues: true,- skipValidation: true,- breadcrumbsPrefix: ["response"],- }),- _response.rawResponse,- );- default:- throw new errors.TrueForgeError({- statusCode: _response.error.statusCode,- body: _response.error.body,- rawResponse: _response.rawResponse,- });- }- }-- return handleNonStatusCodeError(- _response.error,- _response.rawResponse,- "GET",- "/api/v1/settings/skills/catalog",- );- }}diff --git a/packages/sdk/src/api/types/CatalogMcpServer.ts b/packages/sdk/src/api/types/CatalogMcpServer.tsindex f966f80e2..9299b326a 100644--- a/packages/sdk/src/api/types/CatalogMcpServer.ts+++ b/packages/sdk/src/api/types/CatalogMcpServer.ts@@ -3,11 +3,11 @@import type * as TrueForge from "../index.js";export interface CatalogMcpServer {- /** Optional default auth settings for the preset. */- auth?: TrueForge.CatalogMcpServerAuth;+ auth?: TrueForge.ConfiguredMcpServerAuth;/** URL of the MCP server logo asset. */logo?: string;- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;type: TrueForge.McpServerType;/** URL of the remote MCP server. */url: string;diff --git a/packages/sdk/src/api/types/CatalogMcpServerAuth.ts b/packages/sdk/src/api/types/CatalogMcpServerAuth.tsdeleted file mode 100644index 35cbd0181..000000000--- a/packages/sdk/src/api/types/CatalogMcpServerAuth.ts+++ /dev/null@@ -1,8 +0,0 @@-// This file was auto-generated by Fern from our API Definition.--import type * as TrueForge from "../index.js";--/**- * Optional default auth settings for the preset.- */-export type CatalogMcpServerAuth = TrueForge.McpServerDcrAuth | TrueForge.McpServerHeaderAuth;diff --git a/packages/sdk/src/api/types/CatalogSkill.ts b/packages/sdk/src/api/types/CatalogSkill.tsindex c2a97aa87..5363671f3 100644--- a/packages/sdk/src/api/types/CatalogSkill.ts+++ b/packages/sdk/src/api/types/CatalogSkill.ts@@ -5,7 +5,8 @@ import type * as TrueForge from "../index.js";export interface CatalogSkill {/** Concise guidance for when the agent should use the skill. */description: string;- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;/** Path to the skill directory within the repository. Omit to use the repository root. */path?: string;/** Git ref — branch name, tag, or commit SHA. */diff --git a/packages/sdk/src/api/types/ConfiguredMcpServer.ts b/packages/sdk/src/api/types/ConfiguredMcpServer.tsindex dcb8390c6..4bbe32fba 100644--- a/packages/sdk/src/api/types/ConfiguredMcpServer.ts+++ b/packages/sdk/src/api/types/ConfiguredMcpServer.ts@@ -3,9 +3,11 @@import type * as TrueForge from "../index.js";export interface ConfiguredMcpServer {+ /** Optional auth settings. Omit when the server needs no credentials. */auth?: TrueForge.ConfiguredMcpServerAuth;authStatus: TrueForge.McpAuthStatus;- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;type: TrueForge.McpServerType;/** URL of the remote MCP server. */url: string;diff --git a/packages/sdk/src/api/types/ConfiguredMcpServerAuth.ts b/packages/sdk/src/api/types/ConfiguredMcpServerAuth.tsindex 7322b92bf..d0f252d25 100644--- a/packages/sdk/src/api/types/ConfiguredMcpServerAuth.ts+++ b/packages/sdk/src/api/types/ConfiguredMcpServerAuth.ts@@ -3,6 +3,6 @@import type * as TrueForge from "../index.js";/**- * Optional auth settings. Omit when the server needs no credentials.+ * Optional default auth settings for the preset.*/export type ConfiguredMcpServerAuth = TrueForge.McpServerDcrAuth | TrueForge.McpServerHeaderAuth;diff --git a/packages/sdk/src/api/types/CustomModelProvider.ts b/packages/sdk/src/api/types/CustomModelProvider.tsindex 51f2cea0b..811f63470 100644--- a/packages/sdk/src/api/types/CustomModelProvider.ts+++ b/packages/sdk/src/api/types/CustomModelProvider.ts@@ -8,6 +8,7 @@ export interface CustomModelProvider {baseUrl: string;/** Models exposed by this provider (at least one). */models: TrueForge.ModelEntry[];- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;type: "custom";}diff --git a/packages/sdk/src/api/types/McpServerReadEntry.ts b/packages/sdk/src/api/types/McpServerReadEntry.tsindex 0342b0b6e..8e7130b45 100644--- a/packages/sdk/src/api/types/McpServerReadEntry.ts+++ b/packages/sdk/src/api/types/McpServerReadEntry.ts@@ -5,7 +5,8 @@ import type * as TrueForge from "../index.js";export interface McpServerReadEntry {auth?: TrueForge.McpServerAuthPublic;authStatus: TrueForge.McpAuthStatus;- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;/** URL of the remote MCP server. */url: string;}diff --git a/packages/sdk/src/api/types/Model.ts b/packages/sdk/src/api/types/Model.tsindex 3f9b6b7e9..7c785bfd1 100644--- a/packages/sdk/src/api/types/Model.ts+++ b/packages/sdk/src/api/types/Model.ts@@ -8,4 +8,5 @@ export interface Model {/** Fully qualified name `provider_name/model_name`, e.g. "openai/gpt-5-6-sol". Unique within a tenant. */name: string;properties: TrueForge.ModelProperties;+ provider: TrueForge.ModelListProvider;}diff --git a/packages/sdk/src/api/types/ModelEntry.ts b/packages/sdk/src/api/types/ModelEntry.tsindex dd3a8d46f..71576add4 100644--- a/packages/sdk/src/api/types/ModelEntry.ts+++ b/packages/sdk/src/api/types/ModelEntry.ts@@ -5,7 +5,6 @@ import type * as TrueForge from "../index.js";export interface ModelEntry {/** Upstream, provider-specific identifier sent to the provider API. */modelId: string;- /** Internal identifier; forms the fully qualified name `name/model_name`. */- name: string;+ name: TrueForge.ResourceName;properties: TrueForge.ModelProperties;}diff --git a/packages/sdk/src/api/types/ModelListProvider.ts b/packages/sdk/src/api/types/ModelListProvider.tsnew file mode 100644index 000000000..6486825da--- /dev/null+++ b/packages/sdk/src/api/types/ModelListProvider.ts@@ -0,0 +1,9 @@+// This file was auto-generated by Fern from our API Definition.++/**+ * Owning configured provider.+ */+export interface ModelListProvider {+ /** Configured provider resource name; matches the FQN prefix of `name`. */+ name: string;+}diff --git a/packages/sdk/src/api/types/ResourceName.ts b/packages/sdk/src/api/types/ResourceName.tsindex cc4bd44aa..9262e6cc1 100644--- a/packages/sdk/src/api/types/ResourceName.ts+++ b/packages/sdk/src/api/types/ResourceName.ts@@ -1,6 +1,6 @@// This file was auto-generated by Fern from our API Definition./**- * Fully qualified name. Unique within a tenant.+ * Internal identifier; forms the fully qualified name `name/model_name`.*/export type ResourceName = string;diff --git a/packages/sdk/src/api/types/SessionAgentNameRef.ts b/packages/sdk/src/api/types/SessionAgentNameRef.tsindex 1a9cf43f3..0382709ee 100644--- a/packages/sdk/src/api/types/SessionAgentNameRef.ts+++ b/packages/sdk/src/api/types/SessionAgentNameRef.ts@@ -1,7 +1,6 @@// This file was auto-generated by Fern from our API Definition.-import type * as TrueForge from "../index.js";-export interface SessionAgentNameRef {- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;}diff --git a/packages/sdk/src/api/types/SkillManifest.ts b/packages/sdk/src/api/types/SkillManifest.tsindex be259a29a..264eaccd4 100644--- a/packages/sdk/src/api/types/SkillManifest.ts+++ b/packages/sdk/src/api/types/SkillManifest.ts@@ -5,7 +5,8 @@ import type * as TrueForge from "../index.js";export interface SkillManifest {/** Concise guidance for when the agent should use the skill. */description: string;- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;/** Path to the skill directory within the repository. Omit to use the repository root. */path?: string;/** Git ref — branch name, tag, or commit SHA. */diff --git a/packages/sdk/src/api/types/SkillReadEntry.ts b/packages/sdk/src/api/types/SkillReadEntry.tsindex 2fb965b32..9bb5f0d26 100644--- a/packages/sdk/src/api/types/SkillReadEntry.ts+++ b/packages/sdk/src/api/types/SkillReadEntry.ts@@ -1,9 +1,8 @@// This file was auto-generated by Fern from our API Definition.-import type * as TrueForge from "../index.js";-export interface SkillReadEntry {/** Concise guidance for when the agent should use the skill. */description: string;- name: TrueForge.ResourceName;+ /** Fully qualified name. Unique within a tenant. */+ name: string;}diff --git a/packages/sdk/src/api/types/index.ts b/packages/sdk/src/api/types/index.tsindex 5aa608164..8ed8dffa2 100644--- a/packages/sdk/src/api/types/index.ts+++ b/packages/sdk/src/api/types/index.ts@@ -17,7 +17,6 @@ export * from "./CancelSessionResponse.js";export * from "./CatalogCustomModelProvider.js";export * from "./CatalogDaytonaSandboxProvider.js";export * from "./CatalogMcpServer.js";-export * from "./CatalogMcpServerAuth.js";export * from "./CatalogModelProvider.js";export * from "./CatalogSkill.js";export * from "./CatalogWellKnownModelProvider.js";@@ -97,6 +96,7 @@ export * from "./MeResponse.js";export * from "./MeResponseType.js";export * from "./Model.js";export * from "./ModelEntry.js";+export * from "./ModelListProvider.js";export * from "./ModelMessageDeltaEvent.js";export * from "./ModelMessageEvent.js";export * from "./ModelMessageEventContent.js";diff --git a/packages/sdk/src/serialization/resources/agents/client/requests/AgentWriteRequest.ts b/packages/sdk/src/serialization/resources/agents/client/requests/AgentWriteRequest.tsindex 38b47a79a..8e58d0e05 100644--- a/packages/sdk/src/serialization/resources/agents/client/requests/AgentWriteRequest.ts+++ b/packages/sdk/src/serialization/resources/agents/client/requests/AgentWriteRequest.ts@@ -4,19 +4,18 @@ import type * as TrueForge from "../../../../../api/index.js";import * as core from "../../../../../core/index.js";import type * as serializers from "../../../../index.js";import { AgentSpec } from "../../../../types/AgentSpec.js";-import { ResourceName } from "../../../../types/ResourceName.js";export const AgentWriteRequest: core.serialization.Schema<serializers.AgentWriteRequest.Raw,TrueForge.AgentWriteRequest> = core.serialization.object({- name: ResourceName,+ name: core.serialization.string(),}).extend(AgentSpec);export declare namespace AgentWriteRequest {export interface Raw extends AgentSpec.Raw {- name: ResourceName.Raw;+ name: string;}}diff --git a/packages/sdk/src/serialization/resources/settings/resources/index.ts b/packages/sdk/src/serialization/resources/settings/resources/index.tsindex 76d13fe6a..5d32abc0e 100644--- a/packages/sdk/src/serialization/resources/settings/resources/index.ts+++ b/packages/sdk/src/serialization/resources/settings/resources/index.ts@@ -1,2 +1,3 @@export * from "./mcpServers/client/requests/index.js";export * as mcpServers from "./mcpServers/index.js";+export * from "./mcpServers/types/index.js";diff --git a/packages/sdk/src/serialization/resources/settings/resources/mcpServers/client/requests/McpServerManifest.ts b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/client/requests/McpServerManifest.tsindex 9f89302c1..5f46d56cf 100644--- a/packages/sdk/src/serialization/resources/settings/resources/mcpServers/client/requests/McpServerManifest.ts+++ b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/client/requests/McpServerManifest.ts@@ -3,22 +3,21 @@import type * as TrueForge from "../../../../../../../api/index.js";import * as core from "../../../../../../../core/index.js";import type * as serializers from "../../../../../../index.js";-import { ConfiguredMcpServerAuth } from "../../../../../../types/ConfiguredMcpServerAuth.js";-import { ResourceName } from "../../../../../../types/ResourceName.js";+import { McpServerManifestAuth } from "../../types/McpServerManifestAuth.js";export const McpServerManifest: core.serialization.Schema<serializers.settings.McpServerManifest.Raw,TrueForge.settings.McpServerManifest> = core.serialization.object({- auth: ConfiguredMcpServerAuth.optional(),- name: ResourceName,+ auth: McpServerManifestAuth.optional(),+ name: core.serialization.string(),url: core.serialization.string(),});export declare namespace McpServerManifest {export interface Raw {- auth?: ConfiguredMcpServerAuth.Raw | null;- name: ResourceName.Raw;+ auth?: McpServerManifestAuth.Raw | null;+ name: string;url: string;}}diff --git a/packages/sdk/src/serialization/resources/settings/resources/mcpServers/index.ts b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/index.tsindex 914b8c3c7..d9adb1af9 100644--- a/packages/sdk/src/serialization/resources/settings/resources/mcpServers/index.ts+++ b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/index.ts@@ -1 +1,2 @@export * from "./client/index.js";+export * from "./types/index.js";diff --git a/packages/sdk/src/serialization/resources/settings/resources/mcpServers/types/McpServerManifestAuth.ts b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/types/McpServerManifestAuth.tsnew file mode 100644index 000000000..619ff1092--- /dev/null+++ b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/types/McpServerManifestAuth.ts@@ -0,0 +1,16 @@+// 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 { McpServerDcrAuth } from "../../../../../types/McpServerDcrAuth.js";+import { McpServerHeaderAuth } from "../../../../../types/McpServerHeaderAuth.js";++export const McpServerManifestAuth: core.serialization.Schema<+ serializers.settings.McpServerManifestAuth.Raw,+ TrueForge.settings.McpServerManifestAuth+> = core.serialization.undiscriminatedUnion([McpServerDcrAuth, McpServerHeaderAuth]);++export declare namespace McpServerManifestAuth {+ export type Raw = McpServerDcrAuth.Raw | McpServerHeaderAuth.Raw;+}diff --git a/packages/sdk/src/serialization/resources/settings/resources/mcpServers/types/index.ts b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/types/index.tsnew file mode 100644index 000000000..d6d7776f0--- /dev/null+++ b/packages/sdk/src/serialization/resources/settings/resources/mcpServers/types/index.ts@@ -0,0 +1 @@+export * from "./McpServerManifestAuth.js";diff --git a/packages/sdk/src/serialization/types/CatalogMcpServer.ts b/packages/sdk/src/serialization/types/CatalogMcpServer.tsindex 7addfa9dc..123178409 100644--- a/packages/sdk/src/serialization/types/CatalogMcpServer.ts+++ b/packages/sdk/src/serialization/types/CatalogMcpServer.ts@@ -3,26 +3,25 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { CatalogMcpServerAuth } from "./CatalogMcpServerAuth.js";+import { ConfiguredMcpServerAuth } from "./ConfiguredMcpServerAuth.js";import { McpServerType } from "./McpServerType.js";-import { ResourceName } from "./ResourceName.js";export const CatalogMcpServer: core.serialization.ObjectSchema<serializers.CatalogMcpServer.Raw,TrueForge.CatalogMcpServer> = core.serialization.object({- auth: CatalogMcpServerAuth.optional(),+ auth: ConfiguredMcpServerAuth.optional(),logo: core.serialization.string().optional(),- name: ResourceName,+ name: core.serialization.string(),type: McpServerType,url: core.serialization.string(),});export declare namespace CatalogMcpServer {export interface Raw {- auth?: CatalogMcpServerAuth.Raw | null;+ auth?: ConfiguredMcpServerAuth.Raw | null;logo?: string | null;- name: ResourceName.Raw;+ name: string;type: McpServerType.Raw;url: string;}diff --git a/packages/sdk/src/serialization/types/CatalogMcpServerAuth.ts b/packages/sdk/src/serialization/types/CatalogMcpServerAuth.tsdeleted file mode 100644index e5881b763..000000000--- a/packages/sdk/src/serialization/types/CatalogMcpServerAuth.ts+++ /dev/null@@ -1,16 +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";-import { McpServerDcrAuth } from "./McpServerDcrAuth.js";-import { McpServerHeaderAuth } from "./McpServerHeaderAuth.js";--export const CatalogMcpServerAuth: core.serialization.Schema<- serializers.CatalogMcpServerAuth.Raw,- TrueForge.CatalogMcpServerAuth-> = core.serialization.undiscriminatedUnion([McpServerDcrAuth, McpServerHeaderAuth]);--export declare namespace CatalogMcpServerAuth {- export type Raw = McpServerDcrAuth.Raw | McpServerHeaderAuth.Raw;-}diff --git a/packages/sdk/src/serialization/types/CatalogSkill.ts b/packages/sdk/src/serialization/types/CatalogSkill.tsindex 2b226f16b..a63b6389f 100644--- a/packages/sdk/src/serialization/types/CatalogSkill.ts+++ b/packages/sdk/src/serialization/types/CatalogSkill.ts@@ -3,13 +3,12 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { ResourceName } from "./ResourceName.js";import { SkillType } from "./SkillType.js";export const CatalogSkill: core.serialization.ObjectSchema<serializers.CatalogSkill.Raw, TrueForge.CatalogSkill> =core.serialization.object({description: core.serialization.string(),- name: ResourceName,+ name: core.serialization.string(),path: core.serialization.string().optional(),ref: core.serialization.string(),type: SkillType,@@ -19,7 +18,7 @@ export const CatalogSkill: core.serialization.ObjectSchema<serializers.CatalogSkexport declare namespace CatalogSkill {export interface Raw {description: string;- name: ResourceName.Raw;+ name: string;path?: string | null;ref: string;type: SkillType.Raw;diff --git a/packages/sdk/src/serialization/types/ConfiguredMcpServer.ts b/packages/sdk/src/serialization/types/ConfiguredMcpServer.tsindex 1b9d53155..2960414e2 100644--- a/packages/sdk/src/serialization/types/ConfiguredMcpServer.ts+++ b/packages/sdk/src/serialization/types/ConfiguredMcpServer.ts@@ -6,7 +6,6 @@ import type * as serializers from "../index.js";import { ConfiguredMcpServerAuth } from "./ConfiguredMcpServerAuth.js";import { McpAuthStatus } from "./McpAuthStatus.js";import { McpServerType } from "./McpServerType.js";-import { ResourceName } from "./ResourceName.js";export const ConfiguredMcpServer: core.serialization.ObjectSchema<serializers.ConfiguredMcpServer.Raw,@@ -14,7 +13,7 @@ export const ConfiguredMcpServer: core.serialization.ObjectSchema<> = core.serialization.object({auth: ConfiguredMcpServerAuth.optional(),authStatus: core.serialization.property("auth_status", McpAuthStatus),- name: ResourceName,+ name: core.serialization.string(),type: McpServerType,url: core.serialization.string(),});@@ -23,7 +22,7 @@ export declare namespace ConfiguredMcpServer {export interface Raw {auth?: ConfiguredMcpServerAuth.Raw | null;auth_status: McpAuthStatus.Raw;- name: ResourceName.Raw;+ name: string;type: McpServerType.Raw;url: string;}diff --git a/packages/sdk/src/serialization/types/CustomModelProvider.ts b/packages/sdk/src/serialization/types/CustomModelProvider.tsindex dec97b6aa..4953c1c4a 100644--- a/packages/sdk/src/serialization/types/CustomModelProvider.ts+++ b/packages/sdk/src/serialization/types/CustomModelProvider.ts@@ -5,7 +5,6 @@ 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";export const CustomModelProvider: core.serialization.ObjectSchema<serializers.CustomModelProvider.Raw,@@ -14,7 +13,7 @@ export const CustomModelProvider: core.serialization.ObjectSchema<auth: ModelProviderAuth.optional(),baseUrl: core.serialization.property("base_url", core.serialization.string()),models: core.serialization.list(ModelEntry),- name: ResourceName,+ name: core.serialization.string(),type: core.serialization.stringLiteral("custom"),});@@ -23,7 +22,7 @@ export declare namespace CustomModelProvider {auth?: ModelProviderAuth.Raw | null;base_url: string;models: ModelEntry.Raw[];- name: ResourceName.Raw;+ name: string;type: "custom";}}diff --git a/packages/sdk/src/serialization/types/McpServerReadEntry.ts b/packages/sdk/src/serialization/types/McpServerReadEntry.tsindex a5e2d7c6f..c8de90e4b 100644--- a/packages/sdk/src/serialization/types/McpServerReadEntry.ts+++ b/packages/sdk/src/serialization/types/McpServerReadEntry.ts@@ -5,7 +5,6 @@ import * as core from "../../core/index.js";import type * as serializers from "../index.js";import { McpAuthStatus } from "./McpAuthStatus.js";import { McpServerAuthPublic } from "./McpServerAuthPublic.js";-import { ResourceName } from "./ResourceName.js";export const McpServerReadEntry: core.serialization.ObjectSchema<serializers.McpServerReadEntry.Raw,@@ -13,7 +12,7 @@ export const McpServerReadEntry: core.serialization.ObjectSchema<> = core.serialization.object({auth: McpServerAuthPublic.optional(),authStatus: core.serialization.property("auth_status", McpAuthStatus),- name: ResourceName,+ name: core.serialization.string(),url: core.serialization.string(),});@@ -21,7 +20,7 @@ export declare namespace McpServerReadEntry {export interface Raw {auth?: McpServerAuthPublic.Raw | null;auth_status: McpAuthStatus.Raw;- name: ResourceName.Raw;+ name: string;url: string;}}diff --git a/packages/sdk/src/serialization/types/Model.ts b/packages/sdk/src/serialization/types/Model.tsindex 4fddf6100..1790235e4 100644--- a/packages/sdk/src/serialization/types/Model.ts+++ b/packages/sdk/src/serialization/types/Model.ts@@ -3,6 +3,7 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";+import { ModelListProvider } from "./ModelListProvider.js";import { ModelProperties } from "./ModelProperties.js";export const Model: core.serialization.ObjectSchema<serializers.Model.Raw, TrueForge.Model> = core.serialization.object(@@ -10,6 +11,7 @@ export const Model: core.serialization.ObjectSchema<serializers.Model.Raw, TrueFmodelId: core.serialization.property("model_id", core.serialization.string()),name: core.serialization.string(),properties: ModelProperties,+ provider: ModelListProvider,},);@@ -18,5 +20,6 @@ export declare namespace Model {model_id: string;name: string;properties: ModelProperties.Raw;+ provider: ModelListProvider.Raw;}}diff --git a/packages/sdk/src/serialization/types/ModelEntry.ts b/packages/sdk/src/serialization/types/ModelEntry.tsindex a4031e5ff..233c7e24b 100644--- a/packages/sdk/src/serialization/types/ModelEntry.ts+++ b/packages/sdk/src/serialization/types/ModelEntry.ts@@ -4,18 +4,19 @@ import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";import { ModelProperties } from "./ModelProperties.js";+import { ResourceName } from "./ResourceName.js";export const ModelEntry: core.serialization.ObjectSchema<serializers.ModelEntry.Raw, TrueForge.ModelEntry> =core.serialization.object({modelId: core.serialization.property("model_id", core.serialization.string()),- name: core.serialization.string(),+ name: ResourceName,properties: ModelProperties,});export declare namespace ModelEntry {export interface Raw {model_id: string;- name: string;+ name: ResourceName.Raw;properties: ModelProperties.Raw;}}diff --git a/packages/sdk/src/serialization/types/ModelListProvider.ts b/packages/sdk/src/serialization/types/ModelListProvider.tsnew file mode 100644index 000000000..f70587c1f--- /dev/null+++ b/packages/sdk/src/serialization/types/ModelListProvider.ts@@ -0,0 +1,18 @@+// 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 ModelListProvider: core.serialization.ObjectSchema<+ serializers.ModelListProvider.Raw,+ TrueForge.ModelListProvider+> = core.serialization.object({+ name: core.serialization.string(),+});++export declare namespace ModelListProvider {+ export interface Raw {+ name: string;+ }+}diff --git a/packages/sdk/src/serialization/types/SessionAgentNameRef.ts b/packages/sdk/src/serialization/types/SessionAgentNameRef.tsindex 526ff60de..7f4e5fe45 100644--- a/packages/sdk/src/serialization/types/SessionAgentNameRef.ts+++ b/packages/sdk/src/serialization/types/SessionAgentNameRef.ts@@ -3,17 +3,16 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { ResourceName } from "./ResourceName.js";export const SessionAgentNameRef: core.serialization.ObjectSchema<serializers.SessionAgentNameRef.Raw,TrueForge.SessionAgentNameRef> = core.serialization.object({- name: ResourceName,+ name: core.serialization.string(),});export declare namespace SessionAgentNameRef {export interface Raw {- name: ResourceName.Raw;+ name: string;}}diff --git a/packages/sdk/src/serialization/types/SkillManifest.ts b/packages/sdk/src/serialization/types/SkillManifest.tsindex 2b832a937..850188953 100644--- a/packages/sdk/src/serialization/types/SkillManifest.ts+++ b/packages/sdk/src/serialization/types/SkillManifest.ts@@ -3,13 +3,12 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { ResourceName } from "./ResourceName.js";import { SkillType } from "./SkillType.js";export const SkillManifest: core.serialization.ObjectSchema<serializers.SkillManifest.Raw, TrueForge.SkillManifest> =core.serialization.object({description: core.serialization.string(),- name: ResourceName,+ name: core.serialization.string(),path: core.serialization.string().optional(),ref: core.serialization.string(),type: SkillType,@@ -19,7 +18,7 @@ export const SkillManifest: core.serialization.ObjectSchema<serializers.SkillManexport declare namespace SkillManifest {export interface Raw {description: string;- name: ResourceName.Raw;+ name: string;path?: string | null;ref: string;type: SkillType.Raw;diff --git a/packages/sdk/src/serialization/types/SkillReadEntry.ts b/packages/sdk/src/serialization/types/SkillReadEntry.tsindex 2e0789895..e9b7c5abb 100644--- a/packages/sdk/src/serialization/types/SkillReadEntry.ts+++ b/packages/sdk/src/serialization/types/SkillReadEntry.ts@@ -3,17 +3,16 @@import type * as TrueForge from "../../api/index.js";import * as core from "../../core/index.js";import type * as serializers from "../index.js";-import { ResourceName } from "./ResourceName.js";export const SkillReadEntry: core.serialization.ObjectSchema<serializers.SkillReadEntry.Raw, TrueForge.SkillReadEntry> =core.serialization.object({description: core.serialization.string(),- name: ResourceName,+ name: core.serialization.string(),});export declare namespace SkillReadEntry {export interface Raw {description: string;- name: ResourceName.Raw;+ name: string;}}diff --git a/packages/sdk/src/serialization/types/index.ts b/packages/sdk/src/serialization/types/index.tsindex 5aa608164..8ed8dffa2 100644--- a/packages/sdk/src/serialization/types/index.ts+++ b/packages/sdk/src/serialization/types/index.ts@@ -17,7 +17,6 @@ export * from "./CancelSessionResponse.js";export * from "./CatalogCustomModelProvider.js";export * from "./CatalogDaytonaSandboxProvider.js";export * from "./CatalogMcpServer.js";-export * from "./CatalogMcpServerAuth.js";export * from "./CatalogModelProvider.js";export * from "./CatalogSkill.js";export * from "./CatalogWellKnownModelProvider.js";@@ -97,6 +96,7 @@ export * from "./MeResponse.js";export * from "./MeResponseType.js";export * from "./Model.js";export * from "./ModelEntry.js";+export * from "./ModelListProvider.js";export * from "./ModelMessageDeltaEvent.js";export * from "./ModelMessageEvent.js";export * from "./ModelMessageEventContent.js";diff --git a/packages/sdk/tests/wire/catalog/mcpServers.test.ts b/packages/sdk/tests/wire/catalog/mcpServers.test.tsnew file mode 100644index 000000000..67e7c6b87--- /dev/null+++ b/packages/sdk/tests/wire/catalog/mcpServers.test.ts@@ -0,0 +1,58 @@+// This file was auto-generated by Fern from our API Definition.++import * as TrueForgeTypes from "../../../src/api/index";+import { TrueForge } from "../../../src/Client";+import { mockServerPool } from "../../mock-server/MockServerPool";++describe("McpServersClient", () => {+ test("list (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {+ data: [{ auth: { type: "dcr" }, logo: "logo", name: "name", type: "remote", url: "url" }],+ };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/mcp-servers")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.catalog.mcpServers.list();+ expect(response).toEqual({+ data: [+ {+ auth: {+ type: "dcr",+ },+ logo: "logo",+ name: "name",+ type: "remote",+ url: "url",+ },+ ],+ });+ });++ test("list (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/mcp-servers")+ .respondWith()+ .statusCode(401)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.catalog.mcpServers.list();+ }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);+ });+});diff --git a/packages/sdk/tests/wire/catalog/modelProviders.test.ts b/packages/sdk/tests/wire/catalog/modelProviders.test.tsnew file mode 100644index 000000000..bb67497ab--- /dev/null+++ b/packages/sdk/tests/wire/catalog/modelProviders.test.ts@@ -0,0 +1,60 @@+// This file was auto-generated by Fern from our API Definition.++import * as TrueForgeTypes from "../../../src/api/index";+import { TrueForge } from "../../../src/Client";+import { mockServerPool } from "../../mock-server/MockServerPool";++describe("ModelProvidersClient", () => {+ test("list (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {+ data: [{ logo: "logo", models: [{ model_id: "model_id", name: "name", properties: {} }], type: "openai" }],+ };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/model-providers")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.catalog.modelProviders.list();+ expect(response).toEqual({+ data: [+ {+ logo: "logo",+ models: [+ {+ modelId: "model_id",+ name: "name",+ properties: {},+ },+ ],+ type: "openai",+ },+ ],+ });+ });++ test("list (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/model-providers")+ .respondWith()+ .statusCode(401)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.catalog.modelProviders.list();+ }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);+ });+});diff --git a/packages/sdk/tests/wire/catalog/sandboxProviders.test.ts b/packages/sdk/tests/wire/catalog/sandboxProviders.test.tsnew file mode 100644index 000000000..86623a7ac--- /dev/null+++ b/packages/sdk/tests/wire/catalog/sandboxProviders.test.ts@@ -0,0 +1,66 @@+// This file was auto-generated by Fern from our API Definition.++import * as TrueForgeTypes from "../../../src/api/index";+import { TrueForge } from "../../../src/Client";+import { mockServerPool } from "../../mock-server/MockServerPool";++describe("SandboxProvidersClient", () => {+ test("list (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {+ data: [+ {+ auto_archive_interval_in_minutes: 1,+ auto_delete_interval_in_minutes: 1,+ auto_stop_interval_in_minutes: 1,+ exec_timeout_ms: 1,+ snapshot_name: "snapshot_name",+ type: "daytona",+ },+ ],+ };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/sandbox-providers")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.catalog.sandboxProviders.list();+ expect(response).toEqual({+ data: [+ {+ autoArchiveIntervalInMinutes: 1,+ autoDeleteIntervalInMinutes: 1,+ autoStopIntervalInMinutes: 1,+ execTimeoutMs: 1,+ snapshotName: "snapshot_name",+ type: "daytona",+ },+ ],+ });+ });++ test("list (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/sandbox-providers")+ .respondWith()+ .statusCode(401)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.catalog.sandboxProviders.list();+ }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);+ });+});diff --git a/packages/sdk/tests/wire/catalog/skills.test.ts b/packages/sdk/tests/wire/catalog/skills.test.tsnew file mode 100644index 000000000..4167870ec--- /dev/null+++ b/packages/sdk/tests/wire/catalog/skills.test.ts@@ -0,0 +1,57 @@+// This file was auto-generated by Fern from our API Definition.++import * as TrueForgeTypes from "../../../src/api/index";+import { TrueForge } from "../../../src/Client";+import { mockServerPool } from "../../mock-server/MockServerPool";++describe("SkillsClient", () => {+ test("list (1)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = {+ data: [{ description: "description", name: "name", path: "path", ref: "ref", type: "git", url: "url" }],+ };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/skills")+ .respondWith()+ .statusCode(200)+ .jsonBody(rawResponseBody)+ .build();++ const response = await client.catalog.skills.list();+ expect(response).toEqual({+ data: [+ {+ description: "description",+ name: "name",+ path: "path",+ ref: "ref",+ type: "git",+ url: "url",+ },+ ],+ });+ });++ test("list (2)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });++ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .get("/api/v1/catalog/skills")+ .respondWith()+ .statusCode(401)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.catalog.skills.list();+ }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);+ });+});diff --git a/packages/sdk/tests/wire/models.test.ts b/packages/sdk/tests/wire/models.test.tsindex 7e517f3cb..eb42a6f36 100644--- a/packages/sdk/tests/wire/models.test.ts+++ b/packages/sdk/tests/wire/models.test.ts@@ -9,7 +9,9 @@ describe("ModelsClient", () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });- const rawResponseBody = { data: [{ model_id: "model_id", name: "name", properties: {} }] };+ const rawResponseBody = {+ data: [{ model_id: "model_id", name: "name", properties: {}, provider: { name: "name" } }],+ };server.mockEndpoint().get("/api/v1/models").respondWith().statusCode(200).jsonBody(rawResponseBody).build();@@ -20,6 +22,9 @@ describe("ModelsClient", () => {modelId: "model_id",name: "name",properties: {},+ provider: {+ name: "name",+ },},],});diff --git a/packages/sdk/tests/wire/settings/mcpServers.test.ts b/packages/sdk/tests/wire/settings/mcpServers.test.tsindex 2dcadc893..6631b2f04 100644--- a/packages/sdk/tests/wire/settings/mcpServers.test.ts+++ b/packages/sdk/tests/wire/settings/mcpServers.test.ts@@ -174,76 +174,6 @@ describe("McpServersClient", () => {}).rejects.toThrow(TrueForgeTypes.UnprocessableEntityError);});- test("catalog (1)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = {- data: [{ auth: { type: "dcr" }, logo: "logo", name: "name", type: "remote", url: "url" }],- };-- server- .mockEndpoint()- .get("/api/v1/settings/mcp-servers/catalog")- .respondWith()- .statusCode(200)- .jsonBody(rawResponseBody)- .build();-- const response = await client.settings.mcpServers.catalog();- expect(response).toEqual({- data: [- {- auth: {- type: "dcr",- },- logo: "logo",- name: "name",- type: "remote",- url: "url",- },- ],- });- });-- test("catalog (2)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/mcp-servers/catalog")- .respondWith()- .statusCode(401)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.mcpServers.catalog();- }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);- });-- test("catalog (3)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/mcp-servers/catalog")- .respondWith()- .statusCode(403)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.mcpServers.catalog();- }).rejects.toThrow(TrueForgeTypes.ForbiddenError);- });-test("get (1)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });diff --git a/packages/sdk/tests/wire/settings/modelProviders.test.ts b/packages/sdk/tests/wire/settings/modelProviders.test.tsindex e70e02105..2e3c381ff 100644--- a/packages/sdk/tests/wire/settings/modelProviders.test.ts+++ b/packages/sdk/tests/wire/settings/modelProviders.test.ts@@ -187,76 +187,4 @@ describe("ModelProvidersClient", () => {});}).rejects.toThrow(TrueForgeTypes.BadRequestError);});-- test("catalog (1)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = {- data: [{ logo: "logo", models: [{ model_id: "model_id", name: "name", properties: {} }], type: "openai" }],- };-- server- .mockEndpoint()- .get("/api/v1/settings/model-providers/catalog")- .respondWith()- .statusCode(200)- .jsonBody(rawResponseBody)- .build();-- const response = await client.settings.modelProviders.catalog();- expect(response).toEqual({- data: [- {- logo: "logo",- models: [- {- modelId: "model_id",- name: "name",- properties: {},- },- ],- type: "openai",- },- ],- });- });-- test("catalog (2)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/model-providers/catalog")- .respondWith()- .statusCode(401)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.modelProviders.catalog();- }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);- });-- test("catalog (3)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/model-providers/catalog")- .respondWith()- .statusCode(403)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.modelProviders.catalog();- }).rejects.toThrow(TrueForgeTypes.ForbiddenError);- });});diff --git a/packages/sdk/tests/wire/settings/sandboxProviders.test.ts b/packages/sdk/tests/wire/settings/sandboxProviders.test.tsindex 9989413fd..ded012c12 100644--- a/packages/sdk/tests/wire/settings/sandboxProviders.test.ts+++ b/packages/sdk/tests/wire/settings/sandboxProviders.test.ts@@ -160,82 +160,4 @@ describe("SandboxProvidersClient", () => {});}).rejects.toThrow(TrueForgeTypes.BadRequestError);});-- test("catalog (1)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = {- data: [- {- auto_archive_interval_in_minutes: 1,- auto_delete_interval_in_minutes: 1,- auto_stop_interval_in_minutes: 1,- exec_timeout_ms: 1,- snapshot_name: "snapshot_name",- type: "daytona",- },- ],- };-- server- .mockEndpoint()- .get("/api/v1/settings/sandbox-providers/catalog")- .respondWith()- .statusCode(200)- .jsonBody(rawResponseBody)- .build();-- const response = await client.settings.sandboxProviders.catalog();- expect(response).toEqual({- data: [- {- autoArchiveIntervalInMinutes: 1,- autoDeleteIntervalInMinutes: 1,- autoStopIntervalInMinutes: 1,- execTimeoutMs: 1,- snapshotName: "snapshot_name",- type: "daytona",- },- ],- });- });-- test("catalog (2)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/sandbox-providers/catalog")- .respondWith()- .statusCode(401)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.sandboxProviders.catalog();- }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);- });-- test("catalog (3)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/sandbox-providers/catalog")- .respondWith()- .statusCode(403)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.sandboxProviders.catalog();- }).rejects.toThrow(TrueForgeTypes.ForbiddenError);- });});diff --git a/packages/sdk/tests/wire/settings/skills.test.ts b/packages/sdk/tests/wire/settings/skills.test.tsindex a1f3bcf29..26bf97f6e 100644--- a/packages/sdk/tests/wire/settings/skills.test.ts+++ b/packages/sdk/tests/wire/settings/skills.test.ts@@ -135,73 +135,4 @@ describe("SkillsClient", () => {});}).rejects.toThrow(TrueForgeTypes.BadRequestError);});-- test("catalog (1)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = {- data: [{ description: "description", name: "name", path: "path", ref: "ref", type: "git", url: "url" }],- };-- server- .mockEndpoint()- .get("/api/v1/settings/skills/catalog")- .respondWith()- .statusCode(200)- .jsonBody(rawResponseBody)- .build();-- const response = await client.settings.skills.catalog();- expect(response).toEqual({- data: [- {- description: "description",- name: "name",- path: "path",- ref: "ref",- type: "git",- url: "url",- },- ],- });- });-- test("catalog (2)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/skills/catalog")- .respondWith()- .statusCode(401)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.skills.catalog();- }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);- });-- test("catalog (3)", async () => {- const server = mockServerPool.createServer();- const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });-- const rawResponseBody = { error: { message: "message" } };-- server- .mockEndpoint()- .get("/api/v1/settings/skills/catalog")- .respondWith()- .statusCode(403)- .jsonBody(rawResponseBody)- .build();-- await expect(async () => {- return await client.settings.skills.catalog();- }).rejects.toThrow(TrueForgeTypes.ForbiddenError);- });});diff --git a/packages/server/.env.example b/packages/server/.env.exampleindex ee9ee389a..7fb5f91ea 100644--- a/packages/server/.env.example+++ b/packages/server/.env.example@@ -13,19 +13,19 @@## HTTP port the server listens on. Optional, defaults to 8790.PORT=8790-## Optional override for the model catalog YAML (GET /settings/model-providers/catalog).+## Optional override for the model catalog YAML (GET /catalog/model-providers).## When unset, the catalog inlined at build time (catalog/model-catalog.yaml) is used.# MODEL_CATALOG_PATH=/path/to/model-catalog.yaml-## Optional override for the MCP catalog YAML (GET /settings/mcp-servers/catalog).+## Optional override for the MCP catalog YAML (GET /catalog/mcp-servers).## When unset, the catalog inlined at build time (catalog/mcp-catalog.yaml) is used.# MCP_CATALOG_PATH=/path/to/mcp-catalog.yaml-## Optional override for the skill catalog YAML (GET /settings/skills/catalog).+## Optional override for the skill catalog YAML (GET /catalog/skills).## When unset, the catalog inlined at build time (catalog/skill-catalog.yaml) is used.# SKILL_CATALOG_PATH=/path/to/skill-catalog.yaml-## Optional override for the sandbox catalog YAML (GET /settings/sandbox-providers/catalog).+## Optional override for the sandbox catalog YAML (GET /catalog/sandbox-providers).## When unset, the catalog inlined at build time (catalog/sandbox-catalog.yaml) is used.# SANDBOX_CATALOG_PATH=/path/to/sandbox-catalog.yaml@@ -94,7 +94,7 @@ REDIS_URL=redis://localhost:6379## ---------------------------------------------------------------------------## Sandbox process knobs. Provider identity/credentials are configured via-## PUT /api/v1/settings/sandbox-providers (copy from GET .../catalog). Without a+## PUT /api/v1/settings/sandbox-providers (copy from GET /api/v1/catalog/sandbox-providers). Without a## configured provider, agent specs with config.sandbox.enabled (or skills) are## rejected at session creation.## ---------------------------------------------------------------------------diff --git a/packages/server/catalog/mcp-catalog.yaml b/packages/server/catalog/mcp-catalog.yamlindex c4c0d5544..32540ef15 100644--- a/packages/server/catalog/mcp-catalog.yaml+++ b/packages/server/catalog/mcp-catalog.yaml@@ -1,5 +1,5 @@# Shipped MCP catalog: server presets offered by-# GET /api/v1/settings/mcp-servers/catalog for the settings UI to copy into+# GET /api/v1/catalog/mcp-servers for the UI to copy into# PUT /api/v1/settings/mcp-servers bodies. Discovery-only — never executed against.mcp_servers:- type: remotediff --git a/packages/server/catalog/model-catalog.yaml b/packages/server/catalog/model-catalog.yamlindex 36ebd7513..8b7b76407 100644--- a/packages/server/catalog/model-catalog.yaml+++ b/packages/server/catalog/model-catalog.yaml@@ -1,5 +1,5 @@# Shipped model catalog: provider/model presets offered by-# GET /api/v1/settings/model-providers/catalog for the settings UI to copy into+# GET /api/v1/catalog/model-providers for the UI to copy into# PUT /api/v1/settings/model-providers bodies. Discovery-only — never executed against.providers:- type: openaidiff --git a/packages/server/catalog/sandbox-catalog.yaml b/packages/server/catalog/sandbox-catalog.yamlindex 716c31734..4fe98b77a 100644--- a/packages/server/catalog/sandbox-catalog.yaml+++ b/packages/server/catalog/sandbox-catalog.yaml@@ -1,5 +1,5 @@# Shipped sandbox catalog: provider presets offered by-# GET /api/v1/settings/sandbox-providers/catalog for the settings UI to copy into+# GET /api/v1/catalog/sandbox-providers for the UI to copy into# PUT /api/v1/settings/sandbox-providers bodies. Discovery-only — never executed against.providers:- type: daytonadiff --git a/packages/server/catalog/skill-catalog.yaml b/packages/server/catalog/skill-catalog.yamlindex b92c03411..728d92d5e 100644--- a/packages/server/catalog/skill-catalog.yaml+++ b/packages/server/catalog/skill-catalog.yaml@@ -1,5 +1,5 @@# Shipped skill catalog: skill presets offered by-# GET /api/v1/settings/skills/catalog for the settings UI to copy into+# GET /api/v1/catalog/skills for the UI to copy into# PUT /api/v1/settings/skills bodies. Discovery-only — never executed against.## Entries reference upstream skill repos directly (url + path + ref); installingdiff --git a/packages/server/src/apis/catalog.ts b/packages/server/src/apis/catalog.tsnew file mode 100644index 000000000..07698fc80--- /dev/null+++ b/packages/server/src/apis/catalog.ts@@ -0,0 +1,52 @@+import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';+import { SUPPORTED_REASONING_EFFORTS } from '@truefoundry/utils-core/core';+import type { McpCatalog } from '../catalog/McpCatalog';+import type { ModelCatalog } from '../catalog/ModelCatalog';+import type { SandboxCatalog } from '../catalog/SandboxCatalog';+import type { SkillCatalog } from '../catalog/SkillCatalog';+import {+ listMcpServerCatalogRoute,+ listModelProviderCatalogRoute,+ listSandboxProviderCatalogRoute,+ listSkillCatalogRoute,+} from '../routes/catalogRoutes';+import type { CatalogModelProvider } from '../schemas/modelCatalog';++export interface CatalogRouterDeps {+ modelCatalog: ModelCatalog;+ mcpCatalog: McpCatalog;+ skillCatalog: SkillCatalog;+ sandboxCatalog: SandboxCatalog;+}++export function createCatalogRouter(deps: CatalogRouterDeps) {+ const listModelProvidersHandler: RouteHandler<typeof listModelProviderCatalogRoute> = c => {+ const loadedProvidersCatalog = deps.modelCatalog.list();+ // make a copy of the loaded providers catalog and add the custom provider sentinel+ const providersCatalog: CatalogModelProvider[] = [...loadedProvidersCatalog];+ providersCatalog.push({+ type: 'custom',+ supported_reasoning_efforts: [...SUPPORTED_REASONING_EFFORTS],+ });+ return c.json({ data: providersCatalog }, 200);+ };++ const listMcpServersHandler: RouteHandler<typeof listMcpServerCatalogRoute> = c => {+ return c.json({ data: [...deps.mcpCatalog.list()] }, 200);+ };++ const listSkillsHandler: RouteHandler<typeof listSkillCatalogRoute> = c => {+ return c.json({ data: [...deps.skillCatalog.list()] }, 200);+ };++ const listSandboxProvidersHandler: RouteHandler<typeof listSandboxProviderCatalogRoute> = c => {+ return c.json({ data: [...deps.sandboxCatalog.list()] }, 200);+ };++ const router = new OpenAPIHono();+ router.openapi(listModelProviderCatalogRoute, listModelProvidersHandler);+ router.openapi(listMcpServerCatalogRoute, listMcpServersHandler);+ router.openapi(listSkillCatalogRoute, listSkillsHandler);+ router.openapi(listSandboxProviderCatalogRoute, listSandboxProvidersHandler);+ return router;+}diff --git a/packages/server/src/apis/mcpServers.ts b/packages/server/src/apis/mcpServers.tsindex cfa47e697..4ad52ed43 100644--- a/packages/server/src/apis/mcpServers.ts+++ b/packages/server/src/apis/mcpServers.ts@@ -2,7 +2,6 @@ import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';import { extractErrorLogFields, isAuthRequired, McpConnectionError, RemoteMCP } from '@truefoundry/utils-core/core';import type { Logger } from 'winston';import type { ResolveUserContext } from '../auth/identity';-import type { McpCatalog } from '../catalog/McpCatalog';import configuration from '../config';import type { IMcpServerStore, McpServerRecord } from '../db/mcpServerStore';import type { WithTransaction } from '../db/transaction';@@ -12,7 +11,6 @@ import type { IOAuthTokenStore, OAuthClientRecord, OAuthToken } from '../mcp/autimport {authorizeMcpServerRoute,deleteMcpServerAuthRoute,- getMcpServerCatalogRoute,getMcpServerRoute,listAvailableMcpServersRoute,listMcpServersRoute,@@ -26,7 +24,6 @@ import { MissingStoredSecretError, resolveStoredSecretValue, toRedactedSecretValimport { TENANT_ID } from './sessions';export interface SettingsMcpServersRouterDeps<TTransaction> {- mcpCatalog: McpCatalog;mcpServerStore: IMcpServerStore<TTransaction>;tokenStore: IOAuthTokenStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;@@ -139,10 +136,6 @@ function toMcpServerReadEntry({/** Admin/settings MCP CRUD (mounted at /api/v1/settings/mcp-servers). */export function createSettingsMcpServersRouter<TTransaction>(deps: SettingsMcpServersRouterDeps<TTransaction>) {- const catalogHandler: RouteHandler<typeof getMcpServerCatalogRoute> = c => {- return c.json({ data: [...deps.mcpCatalog.list()] }, 200);- };-const listHandler: RouteHandler<typeof listMcpServersRoute> = async c => {const userRef = deps.resolveUserContext(c).userRef;const records = await deps.mcpServerStore.listServers({ tenant_id: TENANT_ID, names: undefined });@@ -294,8 +287,6 @@ export function createSettingsMcpServersRouter<TTransaction>(deps: SettingsMcpSe};const router = new OpenAPIHono();- // Static `/catalog` before `/{name}/…` so "catalog" is not captured as a name.- router.openapi(getMcpServerCatalogRoute, catalogHandler);router.openapi(listMcpServersRoute, listHandler);router.openapi(putMcpServerRoute, putHandler);// `/{name}/tools` before `/{name}` so the tools suffix is not swallowed.diff --git a/packages/server/src/apis/modelProviders.ts b/packages/server/src/apis/modelProviders.tsindex 2c79e9081..6ead6621c 100644--- a/packages/server/src/apis/modelProviders.ts+++ b/packages/server/src/apis/modelProviders.ts@@ -1,20 +1,12 @@import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';-import { SUPPORTED_REASONING_EFFORTS } from '@truefoundry/utils-core/core';-import type { ModelCatalog } from '../catalog/ModelCatalog';import type { IModelProviderStore } from '../db/modelProviderStore';import type { WithTransaction } from '../db/transaction';-import {- getModelProviderCatalogRoute,- listModelProvidersRoute,- putModelProviderRoute,-} from '../routes/modelProviderRoutes';-import type { CatalogModelProvider } from '../schemas/modelCatalog';+import { listModelProvidersRoute, putModelProviderRoute } from '../routes/modelProviderRoutes';import { modelProviderName, type ModelProvider } from '../schemas/modelProvider';import { MissingStoredSecretError, resolveStoredSecretValue, toRedactedSecretValue } from '../utils/secretRedaction';import { TENANT_ID } from './sessions';export interface ModelProvidersRouterDeps<TTransaction> {- modelCatalog: ModelCatalog;modelProviderStore: IModelProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;}@@ -30,17 +22,6 @@ function redactModelProvider(manifest: ModelProvider): ModelProvider {}export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRouterDeps<TTransaction>) {- const catalogHandler: RouteHandler<typeof getModelProviderCatalogRoute> = c => {- const loadedProvidersCatalog = deps.modelCatalog.list();- // make a copy of the loaded providers catalog and add the custom provider sentinel- const providersCatalog: CatalogModelProvider[] = [...loadedProvidersCatalog];- providersCatalog.push({- type: 'custom',- supported_reasoning_efforts: [...SUPPORTED_REASONING_EFFORTS],- });- return c.json({ data: providersCatalog }, 200);- };-const listHandler: RouteHandler<typeof listModelProvidersRoute> = async c => {const records = await deps.modelProviderStore.listProviders(TENANT_ID);return c.json({ data: records.map(record => redactModelProvider(record.manifest)) }, 200);@@ -81,7 +62,6 @@ export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRou};const router = new OpenAPIHono();- router.openapi(getModelProviderCatalogRoute, catalogHandler);router.openapi(listModelProvidersRoute, listHandler);router.openapi(putModelProviderRoute, putHandler);return router;diff --git a/packages/server/src/apis/sandboxProviders.ts b/packages/server/src/apis/sandboxProviders.tsindex 3ff2a8873..c1837285b 100644--- a/packages/server/src/apis/sandboxProviders.ts+++ b/packages/server/src/apis/sandboxProviders.ts@@ -1,27 +1,17 @@import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';-import type { SandboxCatalog } from '../catalog/SandboxCatalog';import type { ISandboxProviderStore } from '../db/sandboxProviderStore';import type { WithTransaction } from '../db/transaction';-import {- getSandboxProviderCatalogRoute,- getSandboxProviderRoute,- putSandboxProviderRoute,-} from '../routes/sandboxProviderRoutes';+import { getSandboxProviderRoute, putSandboxProviderRoute } from '../routes/sandboxProviderRoutes';import type { SandboxProvider } from '../schemas/sandboxProvider';import { TENANT_ID } from './sessions';export interface SandboxProvidersRouterDeps<TTransaction> {- sandboxCatalog: SandboxCatalog;sandboxProviderStore: ISandboxProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;}/** Admin/settings sandbox provider surface (mounted at /api/v1/settings/sandbox-providers). */export function createSandboxProvidersRouter<TTransaction>(deps: SandboxProvidersRouterDeps<TTransaction>) {- const catalogHandler: RouteHandler<typeof getSandboxProviderCatalogRoute> = c => {- return c.json({ data: [...deps.sandboxCatalog.list()] }, 200);- };-const getHandler: RouteHandler<typeof getSandboxProviderRoute> = async c => {const record = await deps.sandboxProviderStore.getSandboxProvider(TENANT_ID);if (record === undefined) {@@ -40,7 +30,6 @@ export function createSandboxProvidersRouter<TTransaction>(deps: SandboxProvider};const router = new OpenAPIHono();- router.openapi(getSandboxProviderCatalogRoute, catalogHandler);router.openapi(getSandboxProviderRoute, getHandler);router.openapi(putSandboxProviderRoute, putHandler);return router;diff --git a/packages/server/src/apis/settings.ts b/packages/server/src/apis/settings.tsindex 0b3f76b5a..dcc6855b3 100644--- a/packages/server/src/apis/settings.ts+++ b/packages/server/src/apis/settings.ts@@ -6,10 +6,6 @@import { OpenAPIHono } from '@hono/zod-openapi';import type { Logger } from 'winston';import type { ResolveUserContext } from '../auth/identity';-import type { McpCatalog } from '../catalog/McpCatalog';-import type { ModelCatalog } from '../catalog/ModelCatalog';-import type { SandboxCatalog } from '../catalog/SandboxCatalog';-import type { SkillCatalog } from '../catalog/SkillCatalog';import type { IMcpServerStore } from '../db/mcpServerStore';import type { IModelProviderStore } from '../db/modelProviderStore';import type { ISandboxProviderStore } from '../db/sandboxProviderStore';@@ -22,14 +18,10 @@ import { createSandboxProvidersRouter } from './sandboxProviders';import { createSkillsRouter } from './skills';export interface SettingsRouterDeps<TTransaction> {- modelCatalog: ModelCatalog;modelProviderStore: IModelProviderStore<TTransaction>;- mcpCatalog: McpCatalog;mcpServerStore: IMcpServerStore<TTransaction>;tokenStore: IOAuthTokenStore<TTransaction>;- skillCatalog: SkillCatalog;skillStore: ISkillStore<TTransaction>;- sandboxCatalog: SandboxCatalog;sandboxProviderStore: ISandboxProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;logger: Logger;@@ -41,7 +33,6 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTrarouter.route('/model-providers',createModelProvidersRouter({- modelCatalog: deps.modelCatalog,modelProviderStore: deps.modelProviderStore,withTransaction: deps.withTransaction,}),@@ -49,7 +40,6 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTrarouter.route('/mcp-servers',createSettingsMcpServersRouter({- mcpCatalog: deps.mcpCatalog,mcpServerStore: deps.mcpServerStore,tokenStore: deps.tokenStore,withTransaction: deps.withTransaction,@@ -60,7 +50,6 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTrarouter.route('/skills',createSkillsRouter({- skillCatalog: deps.skillCatalog,skillStore: deps.skillStore,withTransaction: deps.withTransaction,}),@@ -68,7 +57,6 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTrarouter.route('/sandbox-providers',createSandboxProvidersRouter({- sandboxCatalog: deps.sandboxCatalog,sandboxProviderStore: deps.sandboxProviderStore,withTransaction: deps.withTransaction,}),diff --git a/packages/server/src/apis/skills.ts b/packages/server/src/apis/skills.tsindex 88c8f8307..be027e952 100644--- a/packages/server/src/apis/skills.ts+++ b/packages/server/src/apis/skills.ts@@ -1,18 +1,11 @@import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';-import type { SkillCatalog } from '../catalog/SkillCatalog';import type { ISkillStore, SkillRecord } from '../db/skillStore';import type { WithTransaction } from '../db/transaction';-import {- getSkillCatalogRoute,- listAvailableSkillsRoute,- listConfiguredSkillsRoute,- putSkillRoute,-} from '../routes/skillRoutes';+import { listAvailableSkillsRoute, listConfiguredSkillsRoute, putSkillRoute } from '../routes/skillRoutes';import type { ConfiguredSkill, SkillManifest } from '../schemas/skill';import { TENANT_ID } from './sessions';export interface SkillsRouterDeps<TTransaction> {- skillCatalog: SkillCatalog;skillStore: ISkillStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;}@@ -27,10 +20,6 @@ function toConfiguredSkill(record: SkillRecord): ConfiguredSkill {/** Admin/settings skills CRUD (mounted at /api/v1/settings/skills). */export function createSkillsRouter<TTransaction>(deps: SkillsRouterDeps<TTransaction>) {- const catalogHandler: RouteHandler<typeof getSkillCatalogRoute> = c => {- return c.json({ data: [...deps.skillCatalog.list()] }, 200);- };-const listConfiguredHandler: RouteHandler<typeof listConfiguredSkillsRoute> = async c => {const records = await deps.skillStore.listSkills({ tenant_id: TENANT_ID, names: undefined });return c.json({ data: records.map(toConfiguredSkill) }, 200);@@ -47,8 +36,6 @@ export function createSkillsRouter<TTransaction>(deps: SkillsRouterDeps<TTransac};const router = new OpenAPIHono();- // Static `/catalog` before `/` so path order matches model-providers / mcp-servers.- router.openapi(getSkillCatalogRoute, catalogHandler);router.openapi(listConfiguredSkillsRoute, listConfiguredHandler);router.openapi(putSkillRoute, putHandler);return router;diff --git a/packages/server/src/app.ts b/packages/server/src/app.tsindex 7f1b673cf..ad1b19e8a 100644--- a/packages/server/src/app.ts+++ b/packages/server/src/app.ts@@ -11,6 +11,7 @@ import type { Logger } from 'winston';import { createAgentsRouter } from './apis/agents';import { createAuthRouter } from './apis/auth';import { createCapabilitiesRouter } from './apis/capabilities';+import { createCatalogRouter } from './apis/catalog';import { createMcpOAuthRouter } from './apis/mcpOAuth';import { createMcpServersRouter } from './apis/mcpServers';import { createModelsRouter } from './apis/models';@@ -151,6 +152,17 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {}),),);+ app.route(+ '/api/v1/catalog',+ withAuth(+ createCatalogRouter({+ modelCatalog: deps.modelCatalog,+ mcpCatalog: deps.mcpCatalog,+ skillCatalog: deps.skillCatalog,+ sandboxCatalog: deps.sandboxCatalog,+ }),+ ),+ );// Public MCP OAuth callback must be registered before the gated `/mcp-servers` mount so// `withAuth` cannot intercept IdP redirects to `/api/v1/mcp-servers/oauth/*`.app.route(@@ -200,14 +212,10 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {'/api/v1/settings',withAdminAuth(createSettingsRouter({- modelCatalog: deps.modelCatalog,modelProviderStore: deps.modelProviderStore,- mcpCatalog: deps.mcpCatalog,mcpServerStore: deps.mcpServerStore,tokenStore: deps.tokenStore,- skillCatalog: deps.skillCatalog,skillStore: deps.skillStore,- sandboxCatalog: deps.sandboxCatalog,sandboxProviderStore: deps.sandboxProviderStore,withTransaction: deps.withTransaction,logger: deps.logger,diff --git a/packages/server/src/catalog/McpCatalog.ts b/packages/server/src/catalog/McpCatalog.tsindex 8623007a8..fe2b40082 100644--- a/packages/server/src/catalog/McpCatalog.ts+++ b/packages/server/src/catalog/McpCatalog.ts@@ -1,7 +1,8 @@/*** Shipped MCP catalog (mcp-catalog.yaml): the discovery list of server- * presets the settings UI copies into PUT /settings/mcp-servers bodies.- * Never consulted on writes and never read by the runtime.+ * presets offered by GET /catalog/mcp-servers for the UI to copy into+ * PUT /settings/mcp-servers bodies. Never consulted on writes and never+ * read by the runtime.** Default: YAML inlined into `mcpCatalog.gen.ts` at build time. Optional* override: `MCP_CATALOG_PATH` (file on disk).diff --git a/packages/server/src/catalog/ModelCatalog.ts b/packages/server/src/catalog/ModelCatalog.tsindex 28af6fc21..880f3dd48 100644--- a/packages/server/src/catalog/ModelCatalog.ts+++ b/packages/server/src/catalog/ModelCatalog.ts@@ -1,7 +1,8 @@/*** Shipped model catalog (model-catalog.yaml): the discovery list of provider- * and model presets the settings UI copies into PUT /settings/model-providers bodies.- * Never consulted on writes and never read by the runtime.+ * and model presets offered by GET /catalog/model-providers for the UI to copy+ * into PUT /settings/model-providers bodies. Never consulted on writes and never+ * read by the runtime.** Default: YAML inlined into `modelCatalog.gen.ts` at build time. Optional* override: `MODEL_CATALOG_PATH` (file on disk).diff --git a/packages/server/src/catalog/SandboxCatalog.ts b/packages/server/src/catalog/SandboxCatalog.tsindex e1621066d..3ace3afb2 100644--- a/packages/server/src/catalog/SandboxCatalog.ts+++ b/packages/server/src/catalog/SandboxCatalog.ts@@ -1,7 +1,8 @@/*** Shipped sandbox catalog (sandbox-catalog.yaml): the discovery list of provider- * presets the settings UI copies into PUT /settings/sandbox-providers bodies.- * Never consulted on writes and never read by the runtime.+ * presets offered by GET /catalog/sandbox-providers for the UI to copy into+ * PUT /settings/sandbox-providers bodies. Never consulted on writes and never+ * read by the runtime.** Default: YAML inlined into `sandboxCatalog.gen.ts` at build time. Optional* override: `SANDBOX_CATALOG_PATH` (file on disk).diff --git a/packages/server/src/catalog/SkillCatalog.ts b/packages/server/src/catalog/SkillCatalog.tsindex bd5c09132..ca57be9ba 100644--- a/packages/server/src/catalog/SkillCatalog.ts+++ b/packages/server/src/catalog/SkillCatalog.ts@@ -1,7 +1,8 @@/*** Shipped skill catalog (skill-catalog.yaml): the discovery list of skill- * presets the settings UI copies into PUT /settings/skills bodies.- * Never consulted on writes and never read by the runtime.+ * presets offered by GET /catalog/skills for the UI to copy into+ * PUT /settings/skills bodies. Never consulted on writes and never+ * read by the runtime.** Default: YAML inlined into `skillCatalog.gen.ts` at build time. Optional* override: `SKILL_CATALOG_PATH` (file on disk).diff --git a/packages/server/src/config.ts b/packages/server/src/config.tsindex 2e98600e8..ac2f763e2 100644--- a/packages/server/src/config.ts+++ b/packages/server/src/config.ts@@ -280,25 +280,25 @@ export interface SharedServerConfiguration {EXECUTOR_ID: string;/*** Optional override for the model catalog YAML (discovery presets for- * GET /settings/model-providers/catalog). When unset, the catalog inlined at build+ * GET /catalog/model-providers). When unset, the catalog inlined at build* time is used. Env: `MODEL_CATALOG_PATH`.*/MODEL_CATALOG_PATH: string | undefined;/*** Optional override for the MCP catalog YAML (discovery presets for- * GET /settings/mcp-servers/catalog). When unset, the catalog inlined at build+ * GET /catalog/mcp-servers). When unset, the catalog inlined at build* time is used. Env: `MCP_CATALOG_PATH`.*/MCP_CATALOG_PATH: string | undefined;/*** Optional override for the skill catalog YAML (discovery presets for- * GET /settings/skills/catalog). When unset, the catalog inlined at build+ * GET /catalog/skills). When unset, the catalog inlined at build* time is used. Env: `SKILL_CATALOG_PATH`.*/SKILL_CATALOG_PATH: string | undefined;/*** Optional override for the sandbox catalog YAML (discovery presets for- * GET /settings/sandbox-providers/catalog). When unset, the catalog inlined at build+ * GET /catalog/sandbox-providers). When unset, the catalog inlined at build* time is used. Env: `SANDBOX_CATALOG_PATH`.*/SANDBOX_CATALOG_PATH: string | undefined;diff --git a/packages/server/src/db/modelProviderStore.ts b/packages/server/src/db/modelProviderStore.tsindex 39dd1b6c0..2bf14d44d 100644--- a/packages/server/src/db/modelProviderStore.ts+++ b/packages/server/src/db/modelProviderStore.ts@@ -49,6 +49,7 @@ export function flattenProviderModels(records: ModelProviderRecord[]): Model[] {record.manifest.models.map(model => ({name: `${record.name}/${model.name}`,model_id: model.model_id,+ provider: { name: record.name },properties: model.properties,})),);diff --git a/packages/server/src/routes/catalogRoutes.ts b/packages/server/src/routes/catalogRoutes.tsnew file mode 100644index 000000000..d7036c421--- /dev/null+++ b/packages/server/src/routes/catalogRoutes.ts@@ -0,0 +1,95 @@+/**+ * Discovery catalog routes (mounted at /api/v1/catalog).+ * Readable by any authenticated user — not under admin /settings.+ */+import { createRoute } from '@hono/zod-openapi';+import { RequestErrorResponseSchema } from '../schemas/errors';+import { GetMcpServerCatalogResponseSchema } from '../schemas/mcpCatalog';+import { GetModelProviderCatalogResponseSchema } from '../schemas/modelCatalog';+import { GetSandboxProviderCatalogResponseSchema } from '../schemas/sandboxCatalog';+import { GetSkillCatalogResponseSchema } from '../schemas/skillCatalog';++const CATALOG_TAG = 'Catalog';++export const listModelProviderCatalogRoute = createRoute({+ method: 'get',+ path: '/model-providers',+ tags: [CATALOG_TAG],+ summary: 'Get the model catalog',+ description:+ 'Shipped model-provider presets (discovery-only). Copy into PUT /settings/model-providers to configure. ' ++ 'Includes a `custom` sentinel with `supported_reasoning_efforts`.',+ 'x-fern-sdk-group-name': ['catalog', 'modelProviders'],+ 'x-fern-sdk-method-name': 'list',+ responses: {+ 200: {+ content: { 'application/json': { schema: GetModelProviderCatalogResponseSchema } },+ description: 'Shipped model-provider presets.',+ },+ 401: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Not authenticated.',+ },+ },+});++export const listMcpServerCatalogRoute = createRoute({+ method: 'get',+ path: '/mcp-servers',+ tags: [CATALOG_TAG],+ summary: 'Get the MCP catalog',+ description: 'Shipped MCP server presets (discovery-only). Copy into PUT /settings/mcp-servers to configure.',+ 'x-fern-sdk-group-name': ['catalog', 'mcpServers'],+ 'x-fern-sdk-method-name': 'list',+ responses: {+ 200: {+ content: { 'application/json': { schema: GetMcpServerCatalogResponseSchema } },+ description: 'Shipped MCP server presets.',+ },+ 401: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Not authenticated.',+ },+ },+});++export const listSkillCatalogRoute = createRoute({+ method: 'get',+ path: '/skills',+ tags: [CATALOG_TAG],+ summary: 'Get the skill catalog',+ description: 'Shipped skill presets (discovery-only). Copy into PUT /settings/skills to configure.',+ 'x-fern-sdk-group-name': ['catalog', 'skills'],+ 'x-fern-sdk-method-name': 'list',+ responses: {+ 200: {+ content: { 'application/json': { schema: GetSkillCatalogResponseSchema } },+ description: 'Shipped skill presets.',+ },+ 401: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Not authenticated.',+ },+ },+});++export const listSandboxProviderCatalogRoute = createRoute({+ method: 'get',+ path: '/sandbox-providers',+ tags: [CATALOG_TAG],+ summary: 'Get the sandbox provider catalog',+ description:+ 'Shipped sandbox-provider presets (discovery-only). Copy into PUT /settings/sandbox-providers to configure.',+ 'x-fern-sdk-group-name': ['catalog', 'sandboxProviders'],+ 'x-fern-sdk-method-name': 'list',+ responses: {+ 200: {+ content: { 'application/json': { schema: GetSandboxProviderCatalogResponseSchema } },+ description: 'Shipped sandbox-provider presets.',+ },+ 401: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Not authenticated.',+ },+ },+});diff --git a/packages/server/src/routes/mcpServerRoutes.ts b/packages/server/src/routes/mcpServerRoutes.tsindex ec9889b26..2d8a440f8 100644--- a/packages/server/src/routes/mcpServerRoutes.ts+++ b/packages/server/src/routes/mcpServerRoutes.ts@@ -5,7 +5,6 @@*/import { createRoute, z } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';-import { GetMcpServerCatalogResponseSchema } from '../schemas/mcpCatalog';import {GetMcpServerResponseSchema,ListAvailableMcpServersResponseSchema,@@ -17,32 +16,6 @@ import {const MCP_SERVERS_TAG = 'MCP Servers';-export const getMcpServerCatalogRoute = createRoute({- method: 'get',- path: '/catalog',- tags: [MCP_SERVERS_TAG],- summary: 'Get the MCP catalog',- description:- 'MCP server presets shipped with the server (mcp-catalog.yaml). Discovery-only: copy an entry ' +- 'into PUT /settings/mcp-servers to configure it.',- 'x-fern-sdk-group-name': ['settings', 'mcpServers'],- 'x-fern-sdk-method-name': 'catalog',- responses: {- 200: {- content: { 'application/json': { schema: GetMcpServerCatalogResponseSchema } },- description: 'The shipped catalog, verbatim.',- },- 401: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the request has no valid session cookie.',- },- 403: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the caller is authenticated but not an admin.',- },- },-});-/** Chat/composer read view — mounted at /api/v1/mcp-servers (not under settings). */export const listAvailableMcpServersRoute = createRoute({method: 'get',diff --git a/packages/server/src/routes/modelProviderRoutes.ts b/packages/server/src/routes/modelProviderRoutes.tsindex a8ec26775..da74a09bb 100644--- a/packages/server/src/routes/modelProviderRoutes.ts+++ b/packages/server/src/routes/modelProviderRoutes.ts@@ -1,10 +1,10 @@/**- * Model-provider route definitions (mounted at /api/v1/settings/model-providers).+ * Model-provider admin route definitions (mounted at /api/v1/settings/model-providers).+ * Discovery catalog lives at GET /api/v1/catalog/model-providers.* Handlers are registered in apis/modelProviders.ts.*/import { createRoute } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';-import { GetModelProviderCatalogResponseSchema } from '../schemas/modelCatalog';import {ListModelProvidersResponseSchema,PutModelProviderRequestSchema,@@ -13,33 +13,6 @@ import {const MODEL_PROVIDERS_TAG = 'Model Providers';-export const getModelProviderCatalogRoute = createRoute({- method: 'get',- path: '/catalog',- tags: [MODEL_PROVIDERS_TAG],- summary: 'Get the model catalog',- description:- 'Provider and model presets shipped with the server (model-catalog.yaml). Discovery-only: an entry becomes a ' +- 'PUT /settings/model-providers body once the catalog-only `logo` and `name` are dropped and `auth` is added. ' +- 'Includes a `custom` sentinel with `supported_reasoning_efforts` for the custom-provider form (not configurable from catalog).',- 'x-fern-sdk-group-name': ['settings', 'modelProviders'],- 'x-fern-sdk-method-name': 'catalog',- responses: {- 200: {- content: { 'application/json': { schema: GetModelProviderCatalogResponseSchema } },- description: 'The shipped catalog, verbatim.',- },- 401: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the request has no valid session cookie.',- },- 403: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the caller is authenticated but not an admin.',- },- },-});-export const listModelProvidersRoute = createRoute({method: 'get',path: '/',diff --git a/packages/server/src/routes/sandboxProviderRoutes.ts b/packages/server/src/routes/sandboxProviderRoutes.tsindex 3b541240b..2387f715b 100644--- a/packages/server/src/routes/sandboxProviderRoutes.ts+++ b/packages/server/src/routes/sandboxProviderRoutes.ts@@ -1,10 +1,10 @@/**- * Sandbox-provider route definitions (mounted at /api/v1/settings/sandbox-providers).+ * Sandbox-provider admin route definitions (mounted at /api/v1/settings/sandbox-providers).+ * Discovery catalog lives at GET /api/v1/catalog/sandbox-providers.* Handlers are registered in apis/sandboxProviders.ts.*/import { createRoute } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';-import { GetSandboxProviderCatalogResponseSchema } from '../schemas/sandboxCatalog';import {GetSandboxProviderResponseSchema,PutSandboxProviderRequestSchema,@@ -13,32 +13,6 @@ import {const SANDBOX_PROVIDERS_TAG = 'Sandbox Providers';-export const getSandboxProviderCatalogRoute = createRoute({- method: 'get',- path: '/catalog',- tags: [SANDBOX_PROVIDERS_TAG],- summary: 'Get the sandbox provider catalog',- description:- 'Sandbox provider presets shipped with the server (sandbox-catalog.yaml). Discovery-only: copy an entry ' +- 'into PUT /settings/sandbox-providers to configure it.',- 'x-fern-sdk-group-name': ['settings', 'sandboxProviders'],- 'x-fern-sdk-method-name': 'catalog',- responses: {- 200: {- content: { 'application/json': { schema: GetSandboxProviderCatalogResponseSchema } },- description: 'The shipped catalog, verbatim.',- },- 401: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the request has no valid session cookie.',- },- 403: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the caller is authenticated but not an admin.',- },- },-});-export const getSandboxProviderRoute = createRoute({method: 'get',path: '/',diff --git a/packages/server/src/routes/skillRoutes.ts b/packages/server/src/routes/skillRoutes.tsindex 7ea9ca5d7..8ca72a38a 100644--- a/packages/server/src/routes/skillRoutes.ts+++ b/packages/server/src/routes/skillRoutes.ts@@ -2,6 +2,7 @@* DB-backed skill route definitions.* Admin routes mount at /api/v1/settings/skills; the chat list mounts at* /api/v1/skills.+ * Discovery catalog lives at GET /api/v1/catalog/skills.*/import { createRoute } from '@hono/zod-openapi';import { RequestErrorResponseSchema } from '../schemas/errors';@@ -11,36 +12,9 @@ import {PutSkillRequestSchema,PutSkillResponseSchema,} from '../schemas/skill';-import { GetSkillCatalogResponseSchema } from '../schemas/skillCatalog';const SKILLS_TAG = 'Skills';-export const getSkillCatalogRoute = createRoute({- method: 'get',- path: '/catalog',- tags: [SKILLS_TAG],- summary: 'Get the skill catalog',- description:- 'Skill presets shipped with the server (skill-catalog.yaml). Discovery-only: copy an entry ' +- 'into PUT /settings/skills to configure it.',- 'x-fern-sdk-group-name': ['settings', 'skills'],- 'x-fern-sdk-method-name': 'catalog',- responses: {- 200: {- content: { 'application/json': { schema: GetSkillCatalogResponseSchema } },- description: 'The shipped catalog, verbatim.',- },- 401: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the request has no valid session cookie.',- },- 403: {- content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the caller is authenticated but not an admin.',- },- },-});-/** Chat/composer read view — mounted at /api/v1/skills (not under settings). */export const listAvailableSkillsRoute = createRoute({method: 'get',diff --git a/packages/server/src/schemas/modelProvider.ts b/packages/server/src/schemas/modelProvider.tsindex fc2d86c18..6cd0d0328 100644--- a/packages/server/src/schemas/modelProvider.ts+++ b/packages/server/src/schemas/modelProvider.ts@@ -189,13 +189,22 @@ export const PutModelProviderResponseSchema = z}).openapi('PutModelProviderResponse');-/** Read view: the fully qualified name resolves the provider, so no provider object is nested. */+/** Provider identity on the models list read view. */+export const ModelListProviderSchema = z+ .object({+ name: z.string().min(1).describe('Configured provider resource name; matches the FQN prefix of `name`.'),+ })+ .strict()+ .openapi('ModelListProvider');++/** Read view over configured providers: FQN plus explicit provider identity for clients. */export const ModelSchema = z.object({name: z.string().describe('Fully qualified name `provider_name/model_name`, e.g. "openai/gpt-5-6-sol". Unique within a tenant.'),model_id: z.string().describe('Upstream, provider-specific identifier sent to the provider API.'),+ provider: ModelListProviderSchema.describe('Owning configured provider.'),properties: ModelPropertiesSchema.describe('Optional model capability metadata.'),}).strict()@@ -208,4 +217,5 @@ export const ListModelsResponseSchema = z.openapi('ListModelsResponse');export type ModelProvider = z.infer<typeof ModelProviderSchema>;+export type ModelListProvider = z.infer<typeof ModelListProviderSchema>;export type Model = z.infer<typeof ModelSchema>;diff --git a/packages/server/tests/db/modelProviderStoreContractSuite.ts b/packages/server/tests/db/modelProviderStoreContractSuite.tsindex d70eeface..853a1568f 100644--- a/packages/server/tests/db/modelProviderStoreContractSuite.ts+++ b/packages/server/tests/db/modelProviderStoreContractSuite.ts@@ -113,11 +113,13 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvide{name: 'anthropic/claude-sonnet-4-6',model_id: 'claude-sonnet-4-6',+ provider: { name: 'anthropic' },properties: { context_length: 200000, max_output_tokens: 32768, reasoning_efforts: ['low', 'high'] },},{name: 'openai/gpt-5-6-sol',model_id: 'gpt-5.6-sol',+ provider: { name: 'openai' },properties: { context_length: 400000, max_output_tokens: 32768 },},]);diff --git a/packages/server/tests/unit/apis/mcpOAuth.test.ts b/packages/server/tests/unit/apis/mcpOAuth.test.tsindex 59a6f16c8..c7fc47d2f 100644--- a/packages/server/tests/unit/apis/mcpOAuth.test.ts+++ b/packages/server/tests/unit/apis/mcpOAuth.test.ts@@ -6,7 +6,6 @@ import winston from 'winston';import { createMcpOAuthRouter } from '../../../src/apis/mcpOAuth';import { createMcpServersRouter, createSettingsMcpServersRouter } from '../../../src/apis/mcpServers';import { LOCAL_USER_CONTEXT } from '../../../src/auth/identity';-import { McpCatalog } from '../../../src/catalog/McpCatalog';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteMcpServerStore } from '../../../src/db/sqlite/mcp-server-store/SqliteMcpServerStore';@@ -89,7 +88,6 @@ describe('MCP OAuth authorize + callback', () => {withTransaction = callback => db.transaction().execute(callback);logger = winston.createLogger({ silent: true });settingsRouter = createSettingsMcpServersRouter({- mcpCatalog: McpCatalog.load(),mcpServerStore,tokenStore,withTransaction,diff --git a/packages/server/tests/unit/apis/mcpServers.test.ts b/packages/server/tests/unit/apis/mcpServers.test.tsindex ca91d9926..143efa7ac 100644--- a/packages/server/tests/unit/apis/mcpServers.test.ts+++ b/packages/server/tests/unit/apis/mcpServers.test.ts@@ -1,8 +1,12 @@import winston from 'winston';+import { createCatalogRouter } from '../../../src/apis/catalog';import { createMcpServersRouter, createSettingsMcpServersRouter } from '../../../src/apis/mcpServers';import { TENANT_ID } from '../../../src/apis/sessions';import { LOCAL_USER_CONTEXT } from '../../../src/auth/identity';import { McpCatalog } from '../../../src/catalog/McpCatalog';+import { ModelCatalog } from '../../../src/catalog/ModelCatalog';+import { SandboxCatalog } from '../../../src/catalog/SandboxCatalog';+import { SkillCatalog } from '../../../src/catalog/SkillCatalog';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteMcpServerStore } from '../../../src/db/sqlite/mcp-server-store/SqliteMcpServerStore';@@ -54,6 +58,7 @@ function putInit(body: unknown): RequestInit {describe('mcp-servers routers', () => {let settingsRouter: ReturnType<typeof createSettingsMcpServersRouter>;+ let catalogRouter: ReturnType<typeof createCatalogRouter>;let mcpServersRouter: ReturnType<typeof createMcpServersRouter>;let mcpServerStore: SqliteMcpServerStore;let tokenStore: SqliteOAuthTokenStore;@@ -74,13 +79,18 @@ describe('mcp-servers routers', () => {withTransaction = callback => db.transaction().execute(callback);logger = winston.createLogger({ silent: true });settingsRouter = createSettingsMcpServersRouter({- mcpCatalog: McpCatalog.load(),mcpServerStore,tokenStore,withTransaction,logger,resolveUserContext: () => LOCAL_USER_CONTEXT,});+ catalogRouter = createCatalogRouter({+ modelCatalog: ModelCatalog.load(),+ mcpCatalog: McpCatalog.load(),+ skillCatalog: SkillCatalog.load(),+ sandboxCatalog: SandboxCatalog.load(),+ });mcpServersRouter = createMcpServersRouter({mcpServerStore,tokenStore,@@ -118,8 +128,8 @@ describe('mcp-servers routers', () => {globalThis.fetch = originalFetch;});- it('GET /catalog returns the shipped catalog verbatim', async () => {- const response = await settingsRouter.request('/catalog');+ it('GET /catalog/mcp-servers returns the shipped catalog verbatim', async () => {+ const response = await catalogRouter.request('/mcp-servers');expect(response.status).toBe(200);const body = (await response.json()) as { data: { name: string }[] };expect(body.data.map(server => server.name)).toEqual(diff --git a/packages/server/tests/unit/apis/modelProviders.test.ts b/packages/server/tests/unit/apis/modelProviders.test.tsindex af460ddee..392b4d6cc 100644--- a/packages/server/tests/unit/apis/modelProviders.test.ts+++ b/packages/server/tests/unit/apis/modelProviders.test.ts@@ -1,4 +1,5 @@import winston from 'winston';+import { createCatalogRouter } from '../../../src/apis/catalog';import { createModelsRouter } from '../../../src/apis/models';import { TENANT_ID } from '../../../src/apis/sessions';import { createSettingsRouter } from '../../../src/apis/settings';@@ -68,6 +69,7 @@ function withRedactedApiKey<T extends { auth: { api_key: string } }>(provider: Tasync function createRouters(): Promise<{settingsRouter: ReturnType<typeof createSettingsRouter>;+ catalogRouter: ReturnType<typeof createCatalogRouter>;modelsRouter: ReturnType<typeof createModelsRouter>;modelProviderStore: IModelProviderStore;}> {@@ -76,19 +78,21 @@ async function createRouters(): Promise<{const modelProviderStore = new SqliteModelProviderStore(db);return {settingsRouter: createSettingsRouter({- modelCatalog: ModelCatalog.load(),modelProviderStore,- mcpCatalog: McpCatalog.load(),mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),- skillCatalog: SkillCatalog.load(),skillStore: new SqliteSkillStore(db),- sandboxCatalog: SandboxCatalog.load(),sandboxProviderStore: new SqliteSandboxProviderStore(db),withTransaction: callback => db.transaction().execute(callback),logger: winston.createLogger({ silent: true }),resolveUserContext: () => LOCAL_USER_CONTEXT,}),+ catalogRouter: createCatalogRouter({+ modelCatalog: ModelCatalog.load(),+ mcpCatalog: McpCatalog.load(),+ skillCatalog: SkillCatalog.load(),+ sandboxCatalog: SandboxCatalog.load(),+ }),modelsRouter: createModelsRouter({modelProviderStore,withTransaction: callback => db.transaction().execute(callback),@@ -99,14 +103,15 @@ async function createRouters(): Promise<{describe('settings model-providers and models routers', () => {let settingsRouter: ReturnType<typeof createSettingsRouter>;+ let catalogRouter: ReturnType<typeof createCatalogRouter>;let modelsRouter: ReturnType<typeof createModelsRouter>;beforeAll(async () => {- ({ settingsRouter, modelsRouter } = await createRouters());+ ({ settingsRouter, catalogRouter, modelsRouter } = await createRouters());});- it('GET /model-providers/catalog returns shipped presets plus a custom sentinel', async () => {- const response = await settingsRouter.request('/model-providers/catalog');+ it('GET /catalog/model-providers returns shipped presets plus a custom sentinel', async () => {+ const response = await catalogRouter.request('/model-providers');expect(response.status).toBe(200);const body = (await response.json()) as {data: { type: string; supported_reasoning_efforts?: string[] }[];@@ -144,7 +149,7 @@ describe('settings model-providers and models routers', () => {expect(badName.status).toBe(400);});- it('GET /models returns the FQN read view', async () => {+ it('GET /models returns the FQN read view with provider.name', async () => {const response = await modelsRouter.request('/');expect(response.status).toBe(200);expect(await response.json()).toEqual({@@ -152,11 +157,13 @@ describe('settings model-providers and models routers', () => {{name: 'anthropic/claude-sonnet-4-6',model_id: 'claude-sonnet-4-6',+ provider: { name: 'anthropic' },properties: model.properties,},{name: 'internal/claude-sonnet-4-6',model_id: 'claude-sonnet-4-6',+ provider: { name: 'internal' },properties: model.properties,},],diff --git a/packages/server/tests/unit/apis/sandboxProviders.test.ts b/packages/server/tests/unit/apis/sandboxProviders.test.tsindex 32f3ee538..183b589f4 100644--- a/packages/server/tests/unit/apis/sandboxProviders.test.ts+++ b/packages/server/tests/unit/apis/sandboxProviders.test.ts@@ -1,5 +1,9 @@+import { createCatalogRouter } from '../../../src/apis/catalog';import { createSandboxProvidersRouter } from '../../../src/apis/sandboxProviders';+import { McpCatalog } from '../../../src/catalog/McpCatalog';+import { ModelCatalog } from '../../../src/catalog/ModelCatalog';import { SandboxCatalog } from '../../../src/catalog/SandboxCatalog';+import { SkillCatalog } from '../../../src/catalog/SkillCatalog';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';import { createSqliteDb } from '../../../src/db/sqlite/client';import { SqliteSandboxProviderStore } from '../../../src/db/sqlite/sandbox-provider-store/SqliteSandboxProviderStore';@@ -24,19 +28,25 @@ function putInit(body: unknown): RequestInit {describe('sandboxProviders router', () => {let settingsRouter: ReturnType<typeof createSandboxProvidersRouter>;+ let catalogRouter: ReturnType<typeof createCatalogRouter>;beforeAll(async () => {const db = createSqliteDb(':memory:');await migrateSqliteToLatest(db);settingsRouter = createSandboxProvidersRouter({- sandboxCatalog: SandboxCatalog.load(),sandboxProviderStore: new SqliteSandboxProviderStore(db),withTransaction: callback => db.transaction().execute(callback),});+ catalogRouter = createCatalogRouter({+ modelCatalog: ModelCatalog.load(),+ mcpCatalog: McpCatalog.load(),+ skillCatalog: SkillCatalog.load(),+ sandboxCatalog: SandboxCatalog.load(),+ });});- it('GET /catalog returns the shipped catalog verbatim', async () => {- const response = await settingsRouter.request('/catalog');+ it('GET /catalog/sandbox-providers returns the shipped catalog verbatim', async () => {+ const response = await catalogRouter.request('/sandbox-providers');expect(response.status).toBe(200);expect(await response.json()).toEqual({ data: [...SandboxCatalog.load().list()] });});diff --git a/packages/server/tests/unit/apis/skills.test.ts b/packages/server/tests/unit/apis/skills.test.tsindex 2624f9a3b..2ba4b20b6 100644--- a/packages/server/tests/unit/apis/skills.test.ts+++ b/packages/server/tests/unit/apis/skills.test.ts@@ -1,4 +1,8 @@+import { createCatalogRouter } from '../../../src/apis/catalog';import { createAvailableSkillsRouter, createSkillsRouter } from '../../../src/apis/skills';+import { McpCatalog } from '../../../src/catalog/McpCatalog';+import { ModelCatalog } from '../../../src/catalog/ModelCatalog';+import { SandboxCatalog } from '../../../src/catalog/SandboxCatalog';import { SkillCatalog } from '../../../src/catalog/SkillCatalog';import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';import { createSqliteDb } from '../../../src/db/sqlite/client';@@ -23,6 +27,7 @@ function putInit(body: unknown): RequestInit {describe('skills routers', () => {let settingsRouter: ReturnType<typeof createSkillsRouter>;+ let catalogRouter: ReturnType<typeof createCatalogRouter>;let availableRouter: ReturnType<typeof createAvailableSkillsRouter>;beforeAll(async () => {@@ -30,18 +35,23 @@ describe('skills routers', () => {await migrateSqliteToLatest(db);const skillStore = new SqliteSkillStore(db);settingsRouter = createSkillsRouter({- skillCatalog: SkillCatalog.load(),skillStore,withTransaction: callback => db.transaction().execute(callback),});+ catalogRouter = createCatalogRouter({+ modelCatalog: ModelCatalog.load(),+ mcpCatalog: McpCatalog.load(),+ skillCatalog: SkillCatalog.load(),+ sandboxCatalog: SandboxCatalog.load(),+ });availableRouter = createAvailableSkillsRouter({skillStore,withTransaction: callback => db.transaction().execute(callback),});});- it('GET /catalog returns the shipped catalog verbatim', async () => {- const response = await settingsRouter.request('/catalog');+ it('GET /catalog/skills returns the shipped catalog verbatim', async () => {+ const response = await catalogRouter.request('/skills');expect(response.status).toBe(200);const body = (await response.json()) as { data: { name: string }[] };expect(body.data.map(skill => skill.name)).toEqual(diff --git a/packages/trueforge-ui-sdk/CHANGELOG.md b/packages/trueforge-ui-sdk/CHANGELOG.mdindex b53cb552b..e3ebc7b23 100644--- a/packages/trueforge-ui-sdk/CHANGELOG.md+++ b/packages/trueforge-ui-sdk/CHANGELOG.md@@ -30,7 +30,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0Hosts no longer need `@import '@truefoundry/trueforge-ui/styles.css'` (exportkept for SSR). Semantic tokens and dark mode are scoped to `.aui-theme-root`(no `html.dark` / `:root` retheme of the host page).-- **Dependency** — `@truefoundry/assistant-ui-runtime` pinned to `0.1.12`.+- **Dependency** — `@truefoundry/assistant-ui-runtime` pinned to `0.1.13`.+ `ModelSelectorEntry` now requires `id`, nested `provider: ProviderEntry`, and+ `properties: ModelProperties` (replacing flat `provider` / `providerLogo` /+ `reasoningEfforts`). Re-exports `ProviderEntry` and `ModelProperties`.### Fixed@@ -49,7 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0longer defines `AgentChatServer` / `AgentBuilderServer` / catalog DTOs locally.Host-facing types are re-exported from `@truefoundry/assistant-ui-runtime/server`via `src/server/types.ts`. Prefer importing types from `@truefoundry/trueforge-ui`- (hosts should not need the runtime package for types). Requires runtime `0.1.12`.+ (hosts should not need the runtime package for types). Requires runtime `0.1.13`.- **Removed public pagination helpers** — `PageResult`, `TokenPagination`,`ListSessionsResponse`, `ListTurnsResponse`, `ListSessionEventsResponse`, andopaque `SessionEvent` are gone from this package. Chat list APIs use runtimediff --git a/packages/trueforge-ui-sdk/docs/compatibility.md b/packages/trueforge-ui-sdk/docs/compatibility.mdindex 34b028390..07fa0085b 100644--- a/packages/trueforge-ui-sdk/docs/compatibility.md+++ b/packages/trueforge-ui-sdk/docs/compatibility.md@@ -21,7 +21,7 @@ Install once at the app root.| ----------------------------------- | ------------- || `@assistant-ui/core` | `^0.2.22` || `@assistant-ui/react` | `^0.14.24` |-| `@truefoundry/assistant-ui-runtime` | `0.1.12` |+| `@truefoundry/assistant-ui-runtime` | `0.1.13` || `truefoundry-gateway-sdk` | `^0.4.0-rc.6` || `lucide-react` | `^0.562.0` |diff --git a/packages/trueforge-ui-sdk/docs/server.md b/packages/trueforge-ui-sdk/docs/server.mdindex 2e7e21318..434890140 100644--- a/packages/trueforge-ui-sdk/docs/server.md+++ b/packages/trueforge-ui-sdk/docs/server.md@@ -176,7 +176,17 @@ type MyModel = ModelEntry & { latencyMs: number };const server: AgentUIServer<MyModel> = createTrueFoundryServer({// …- getModels: async () => [{ name: '…', provider: '…', apiModel: '…', modelId: '…', latencyMs: 12 }],+ getModels: async () => [+ {+ id: '…',+ name: '…',+ provider: { name: '…' },+ properties: {},+ apiModel: '…',+ modelId: '…',+ latencyMs: 12,+ },+ ],});// server.getModels() → Promise<MyModel[]>```diff --git a/packages/trueforge-ui-sdk/example/package.json b/packages/trueforge-ui-sdk/example/package.jsonindex 08d453aac..4ff15501a 100644--- a/packages/trueforge-ui-sdk/example/package.json+++ b/packages/trueforge-ui-sdk/example/package.json@@ -12,7 +12,7 @@"dependencies": {"@assistant-ui/core": "^0.2.22","@assistant-ui/react": "^0.14.24",- "@truefoundry/assistant-ui-runtime": "0.1.12",+ "@truefoundry/assistant-ui-runtime": "0.1.13","@truefoundry/trueforge-ui": "link:..","react": "^19.2.4","react-dom": "^19.2.4",diff --git a/packages/trueforge-ui-sdk/example/yarn.lock b/packages/trueforge-ui-sdk/example/yarn.lockindex 023e1e633..323841010 100644--- a/packages/trueforge-ui-sdk/example/yarn.lock+++ b/packages/trueforge-ui-sdk/example/yarn.lock@@ -1425,10 +1425,10 @@"@tailwindcss/oxide" "4.3.3"tailwindcss "4.3.3"-"@truefoundry/assistant-ui-runtime@^0.1.10":- version "0.1.10"- resolved "https://registry.yarnpkg.com/@truefoundry/assistant-ui-runtime/-/assistant-ui-runtime-0.1.10.tgz#71fef92257ea2534c74498e3769ee259d1dbb112"- integrity sha512-EDIIssQt6y/WVGLRf1Vd7JdS0Ewvuzn8jWCCueiMj38L+Hfcdih3TBr6H2hhEby9C4ULxTl4xbBVG3ybmVxPSw==+"@truefoundry/[email protected]":+ version "0.1.13"+ resolved "https://registry.yarnpkg.com/@truefoundry/assistant-ui-runtime/-/assistant-ui-runtime-0.1.13.tgz#64191bf904a31c5a32f45c3314ebe86117f2e57a"+ integrity sha512-pmY4Fvm5tZmX+uhsr3RegTeY3yYrdQdqaqYV5QzPZyrOPloboVPO07jbcZ2/D7S33622Ug0drhKGvWHpYTMTDw==dependencies:"@assistant-ui/core" "^0.2.22""@assistant-ui/store" "^0.2.21"diff --git a/packages/trueforge-ui-sdk/package.json b/packages/trueforge-ui-sdk/package.jsonindex f0ebeb741..e7a14a782 100644--- a/packages/trueforge-ui-sdk/package.json+++ b/packages/trueforge-ui-sdk/package.json@@ -85,7 +85,7 @@"@openuidev/react-headless": "^0.9.4","@openuidev/react-lang": "^0.2.9","@openuidev/react-ui": "^0.13.2",- "@truefoundry/assistant-ui-runtime": "0.1.12",+ "@truefoundry/assistant-ui-runtime": "0.1.13","clsx": "^2.1.1","lucide-react": "^0.562.0","monaco-editor": "^0.56.0",diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsxindex 42b772392..dd37db374 100644--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftModelSelector.tsx@@ -16,8 +16,6 @@ import { CatalogLogo } from '../primitives/CatalogLogo.js';import { useDraftCatalog } from './DraftCatalogProvider.js';import { modelPatchWithReasoningEffort } from './reasoningEffort.js';-type RichModel = ModelSelection & { apiModel?: string; modelId?: string };-function monogram(value: string): string {const trimmed = value.trim();return trimmed ? trimmed.charAt(0).toUpperCase() : '?';@@ -45,8 +43,28 @@ function displayModelLabel(modelName: string): string {return slash >= 0 ? modelName.slice(slash + 1) : modelName;}-function modelValue(model: RichModel): string {- return model.apiModel ?? model.name;+type ProviderSection = {+ name: string;+ logo?: string;+ models: ModelSelection[];+};++function groupModelsByProvider(models: ModelSelection[]): ProviderSection[] {+ const sections: ProviderSection[] = [];+ const byProvider = new Map<string, ProviderSection>();+ for (const model of models) {+ const name = model.provider.name.trim() || 'Other';+ const existing = byProvider.get(name);+ if (existing) {+ existing.models.push(model);+ if (!existing.logo && model.provider.logo) existing.logo = model.provider.logo;+ continue;+ }+ const section: ProviderSection = { name, logo: model.provider.logo, models: [model] };+ byProvider.set(name, section);+ sections.push(section);+ }+ return sections;}export type DraftModelSelectorProps = {@@ -55,8 +73,7 @@ export type DraftModelSelectorProps = {};export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorProps) {- const { models: rawModels, loading, ensureLoaded } = useDraftCatalog();- const models = rawModels as RichModel[];+ const { models, loading, ensureLoaded } = useDraftCatalog();const { agentSpec } = useTrueFoundryAgentSpec();const updateAgentSpec = useTrueFoundryUpdateAgentSpec();const catalog = useOptionalCatalogServer();@@ -73,10 +90,10 @@ export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorPrensureLoaded();}, [ensureLoaded]);- const selectedName = agentSpec?.model?.name ?? (models[0] ? modelValue(models[0]) : '');- const selected = models.find(m => modelValue(m) === selectedName || m.name === selectedName);+ const selectedName = agentSpec?.model?.name ?? models[0]?.name ?? '';+ const selected = models.find(m => m.name === selectedName);const label = selected- ? displayModelLabel(modelValue(selected))+ ? displayModelLabel(selected.name): selectedName? displayModelLabel(selectedName): loading@@ -89,12 +106,13 @@ export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorPrreturn models.filter(m =>m.name.toLowerCase().includes(needle) ||- (m.apiModel?.toLowerCase().includes(needle) ?? false) ||- (m.modelId?.toLowerCase().includes(needle) ?? false) ||- m.provider.toLowerCase().includes(needle),+ m.id.toLowerCase().includes(needle) ||+ m.provider.name.toLowerCase().includes(needle),);}, [models, query]);+ const sections = useMemo(() => groupModelsByProvider(filtered), [filtered]);+useEffect(() => {if (!open) return;const handler = (e: MouseEvent) => {@@ -106,7 +124,7 @@ export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorPrreturn () => document.removeEventListener('mousedown', handler);}, [open]);- const account = selected?.provider ?? selectedName;+ const account = selected?.provider.name ?? selectedName;const content = (<>@@ -153,36 +171,52 @@ export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorPr<p className="text-muted-foreground px-2 py-4 text-center text-sm">No models</p>)) : (- filtered.map(model => {- const value = modelValue(model);- // If there is no selected model, consider the first in the filtered list as active- const active = selectedName ? value === selectedName || model.name === selectedName : filtered[0] === model;-+ sections.map((section, sectionIndex) => {+ const headingId = `${menuId}-provider-${sectionIndex}`;return (- <button- key={value || model.modelId || model.name}- type="button"- role="option"- aria-selected={active}- className={cn(- 'flex w-full items-center gap-2 rounded-md px-2 py-2 text-left text-sm',- active ? 'bg-accent' : 'hover:bg-accent/60',- )}- onClick={() => {- updateAgentSpec?.({- model: modelPatchWithReasoningEffort(value, agentSpec?.model?.params, model.reasoningEfforts),- });- setOpen(false);- setQuery('');- }}+ <div+ key={section.name}+ role="group"+ aria-labelledby={headingId}+ className={cn(sectionIndex > 0 && 'mt-2')}>- <ProviderMark- logo={model.providerLogo}- label={model.provider || model.name}- className="size-5 text-xs"- />- <span className="truncate font-medium">{displayModelLabel(value)}</span>- </button>+ <div+ id={headingId}+ className="text-muted-foreground flex items-center gap-1.5 px-2 py-1.5 text-[11px] font-medium tracking-wide uppercase"+ >+ <ProviderMark logo={section.logo} label={section.name} className="size-3.5 text-[9px]" />+ <span className="truncate">{section.name}</span>+ </div>+ {section.models.map(model => {+ // If there is no selected model, consider the first in the filtered list as active+ const active = selectedName ? model.name === selectedName : filtered[0] === model;+ return (+ <button+ key={model.id || model.name}+ type="button"+ role="option"+ aria-selected={active}+ className={cn(+ 'flex w-full items-center rounded-md px-2 py-2 text-left text-sm',+ active ? 'bg-accent' : 'hover:bg-accent/60',+ )}+ onClick={() => {+ updateAgentSpec?.({+ model: modelPatchWithReasoningEffort(+ model.name,+ agentSpec?.model?.params,+ model.properties.reasoningEfforts,+ ),+ });+ setOpen(false);+ setQuery('');+ }}+ >+ <span className="truncate font-medium">{displayModelLabel(model.name)}</span>+ </button>+ );+ })}+ </div>);}))}@@ -206,7 +240,7 @@ export function DraftModelSelector({ disabled, isRunning }: DraftModelSelectorPr})}onClick={() => setOpen(v => !v)}>- <ProviderMark logo={selected?.providerLogo} label={account} className="size-5 text-[10px]" />+ <ProviderMark logo={selected?.provider.logo} label={account} className="size-5 text-[10px]" /><span className="truncate">{label}</span><Icon name="chevron-down" className="size-3.5 shrink-0 opacity-60" /></button>diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/DraftReasoningEffortSelector.tsx b/packages/trueforge-ui-sdk/src/atoms/draft/DraftReasoningEffortSelector.tsxindex bb52a733a..c120aedec 100644--- a/packages/trueforge-ui-sdk/src/atoms/draft/DraftReasoningEffortSelector.tsx+++ b/packages/trueforge-ui-sdk/src/atoms/draft/DraftReasoningEffortSelector.tsx@@ -4,7 +4,6 @@ import { useTrueFoundryAgentSpec, useTrueFoundryUpdateAgentSpec } from '@truefouimport { useEffect, useId, useRef, useState } from 'react';import { Icon } from '../../icons/Icon.js';-import type { ModelSelection } from '../../server/types.js';import { auiButtonClass } from '../lib/buttonClasses.js';import { cn } from '../lib/cn.js';import { useCompactLayout } from '../lib/CompactLayoutContext.js';@@ -13,20 +12,13 @@ import { BottomSheet } from '../primitives/BottomSheet.js';import { useDraftCatalog } from './DraftCatalogProvider.js';import { hasReasoningEfforts, modelPatchWithReasoningEffort, resolveReasoningEffort } from './reasoningEffort.js';-type RichModel = ModelSelection & { apiModel?: string; modelId?: string };--function modelValue(model: RichModel): string {- return model.apiModel ?? model.name;-}-export type DraftReasoningEffortSelectorProps = {disabled?: boolean;isRunning?: boolean;};export function DraftReasoningEffortSelector({ disabled, isRunning }: DraftReasoningEffortSelectorProps) {- const { models: rawModels, ensureLoaded } = useDraftCatalog();- const models = rawModels as RichModel[];+ const { models, ensureLoaded } = useDraftCatalog();const { agentSpec } = useTrueFoundryAgentSpec();const updateAgentSpec = useTrueFoundryUpdateAgentSpec();const [open, setOpen] = useState(false);@@ -36,9 +28,9 @@ export function DraftReasoningEffortSelector({ disabled, isRunning }: DraftReasoconst isMobile = useIsMobile();const compactLayout = useCompactLayout();- const selectedName = agentSpec?.model?.name ?? (models[0] ? modelValue(models[0]) : '');- const selected = models.find(m => modelValue(m) === selectedName || m.name === selectedName);- const efforts = selected?.reasoningEfforts;+ const selectedName = agentSpec?.model?.name ?? models[0]?.name ?? '';+ const selected = models.find(m => m.name === selectedName);+ const efforts = selected?.properties.reasoningEfforts;const currentEffort = agentSpec?.model?.params?.reasoningEffort;// Display fallback only — coerce into the spec on model change / explicit pick.const resolved = resolveReasoningEffort(efforts, currentEffort);@@ -67,11 +59,10 @@ export function DraftReasoningEffortSelector({ disabled, isRunning }: DraftReasoreturn;}if (currentEffort === undefined) return;- const modelKey = modelValue(selected);- if (clearedStickyEffortForModelRef.current === modelKey) return;- clearedStickyEffortForModelRef.current = modelKey;+ if (clearedStickyEffortForModelRef.current === selected.name) return;+ clearedStickyEffortForModelRef.current = selected.name;updateAgentSpec({- model: modelPatchWithReasoningEffort(modelKey, agentSpec?.model?.params, undefined),+ model: modelPatchWithReasoningEffort(selected.name, agentSpec?.model?.params, undefined),});}, [updateAgentSpec, selected, efforts, currentEffort, agentSpec?.model?.params]);@@ -104,7 +95,7 @@ export function DraftReasoningEffortSelector({ disabled, isRunning }: DraftReasoif (!selected || !updateAgentSpec) return;updateAgentSpec({model: modelPatchWithReasoningEffort(- modelValue(selected),+ selected.name,{ ...agentSpec?.model?.params, reasoningEffort: effort },efforts,),diff --git a/packages/trueforge-ui-sdk/src/atoms/draft/reasoningEffort.ts b/packages/trueforge-ui-sdk/src/atoms/draft/reasoningEffort.tsindex 9b4afda70..de6c4d34e 100644--- a/packages/trueforge-ui-sdk/src/atoms/draft/reasoningEffort.ts+++ b/packages/trueforge-ui-sdk/src/atoms/draft/reasoningEffort.ts@@ -1,14 +1,13 @@import type { Model, ModelParams, ModelSelection } from '../../server/types.js';-export function hasReasoningEfforts(efforts: ModelSelection['reasoningEfforts']): efforts is string[] {+type ReasoningEfforts = ModelSelection['properties']['reasoningEfforts'];++export function hasReasoningEfforts(efforts: ReasoningEfforts): efforts is string[] {return Array.isArray(efforts) && efforts.length > 0;}/** Keep current if still listed; otherwise the lowest non-"none" effort; none if model has no efforts. */-export function resolveReasoningEffort(- efforts: ModelSelection['reasoningEfforts'],- current: string | undefined,-): string | undefined {+export function resolveReasoningEffort(efforts: ReasoningEfforts, current: string | undefined): string | undefined {if (!hasReasoningEfforts(efforts)) return undefined;if (current && efforts.includes(current)) return current;// Default to the lowest real effort, not "none" — catalog lists are ordered ascending.@@ -26,7 +25,7 @@ export function resolveReasoningEffort(export function modelPatchWithReasoningEffort(name: string,existingParams: ModelParams | undefined,- efforts: ModelSelection['reasoningEfforts'],+ efforts: ReasoningEfforts,): Model {const nextEffort = resolveReasoningEffort(efforts, existingParams?.reasoningEffort);if (nextEffort === undefined) {diff --git a/packages/trueforge-ui-sdk/src/index.ts b/packages/trueforge-ui-sdk/src/index.tsindex 23fb5a41f..2d4bc6bab 100644--- a/packages/trueforge-ui-sdk/src/index.ts+++ b/packages/trueforge-ui-sdk/src/index.ts@@ -281,12 +281,14 @@ export type {ModelCatalogServer,ModelEntry,ModelParams,+ ModelProperties,ModelProviderBase,ModelProviderCatalogEntry,ModelProviderConfigBase,ModelSelection,PageParams,PreviousTurnIdInput,+ ProviderEntry,ProviderType,RegistrySkill,SandboxCatalogServer,diff --git a/packages/trueforge-ui-sdk/src/server/types.ts b/packages/trueforge-ui-sdk/src/server/types.tsindex eb9439c6e..93e49f9d4 100644--- a/packages/trueforge-ui-sdk/src/server/types.ts+++ b/packages/trueforge-ui-sdk/src/server/types.ts@@ -50,12 +50,14 @@ export type {ModelCatalogServer,ModelEntry,ModelParams,+ ModelProperties,ModelProviderBase,ModelProviderCatalogEntry,ModelProviderConfigBase,ModelSelection,PageParams,PreviousTurnIdInput,+ ProviderEntry,ProviderType,RegistrySkill,SandboxCatalogServer,diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsxindex 3f385364d..fb5c0149a 100644--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftCatalogProvider.test.tsx@@ -91,7 +91,14 @@ describe('DraftCatalogProvider', () => {expect(getMcp).toHaveBeenCalledTimes(1);await act(async () => {- models.resolve([{ name: 'openai/gpt-4.1', provider: 'OpenAI' }]);+ models.resolve([+ {+ id: 'gpt-4.1',+ name: 'openai/gpt-4.1',+ provider: { name: 'OpenAI' },+ properties: {},+ },+ ]);skills.resolve([{ id: 'skill-1', name: 'Release notes' }]);connectors.resolve([{ id: 'mcp-1', name: 'GitHub' }]);await Promise.all([models.promise, skills.promise, connectors.promise]);@@ -128,7 +135,14 @@ describe('DraftCatalogProvider', () => {it('keeps successful lists when a sibling catalog call fails', async () => {const server = createMockAgentUIServer({- getModels: async () => [{ name: 'openai/gpt-4.1', provider: 'OpenAI' }],+ getModels: async () => [+ {+ id: 'gpt-4.1',+ name: 'openai/gpt-4.1',+ provider: { name: 'OpenAI' },+ properties: {},+ },+ ],getSkills: async () => {throw new Error('Skills unavailable');},diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftComposerSections.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftComposerSections.test.tsxindex df59af2a4..acadb7e13 100644--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftComposerSections.test.tsx+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftComposerSections.test.tsx@@ -28,9 +28,10 @@ function DraftSections({const server = createMockAgentUIServer({getModels: async () => [{+ id: 'gpt-4.1',name: 'openai/gpt-4.1',- provider: 'OpenAI',- reasoningEfforts: ['low', 'high'],+ provider: { name: 'OpenAI' },+ properties: { reasoningEfforts: ['low', 'high'] },},],});diff --git a/packages/trueforge-ui-sdk/test/atoms/draft/DraftModelSelector.test.tsx b/packages/trueforge-ui-sdk/test/atoms/draft/DraftModelSelector.test.tsxindex ad932f72d..485b5bdc8 100644--- a/packages/trueforge-ui-sdk/test/atoms/draft/DraftModelSelector.test.tsx+++ b/packages/trueforge-ui-sdk/test/atoms/draft/DraftModelSelector.test.tsx@@ -18,11 +18,17 @@ vi.mock('@truefoundry/assistant-ui-runtime', () => ({}));const models: ModelSelection[] = [- { name: 'openai/gpt-4.1', provider: 'OpenAI', providerLogo: 'https://assets.example/openai.svg' },{+ id: 'gpt-4.1',+ name: 'openai/gpt-4.1',+ provider: { name: 'OpenAI', logo: 'https://assets.example/openai.svg' },+ properties: {},+ },+ {+ id: 'claude-3.7-sonnet',name: 'anthropic/claude-3.7-sonnet',- provider: 'Anthropic',- reasoningEfforts: ['low', 'high'],+ provider: { name: 'Anthropic' },+ properties: { reasoningEfforts: ['low', 'high'] },},];@@ -70,20 +76,25 @@ describe('DraftModelSelector', () => {const listbox = screen.getByRole('listbox', { name: 'Select model' });expect(within(listbox).getAllByRole('option')).toHaveLength(2);+ const providerGroups = within(listbox).getAllByRole('group');+ expect(providerGroups).toHaveLength(2);+ expect(providerGroups[0]).toHaveTextContent(/openai/i);+ expect(providerGroups[1]).toHaveTextContent(/anthropic/i);expect(within(listbox)- .getByRole('option', { name: /gpt-4.1/i })+ .getByRole('group', { name: /openai/i }).querySelector('img')?.getAttribute('src'),).toBe('https://assets.example/openai.svg');expect(within(listbox)- .getByRole('option', { name: /claude-3.7-sonnet/i })+ .getByRole('option', { name: /gpt-4.1/i }).querySelector('img'),).toBeNull();fireEvent.change(screen.getByRole('searchbox'), { target: { value: 'anthropic' } });expect(within(listbox).getAllByRole('option')).toHaveLength(1);+ expect(within(listbox).getAllByRole('group')).toHaveLength(1);expect(within(listbox).getByRole('option')).toHaveTextContent('claude-3.7-sonnet');fireEvent.click(within(listbox).getByRole('option'));diff --git a/packages/trueforge-ui-sdk/test/server/createTrueFoundryServer.test.ts b/packages/trueforge-ui-sdk/test/server/createTrueFoundryServer.test.tsindex 1a2a3a9e4..b62190dad 100644--- a/packages/trueforge-ui-sdk/test/server/createTrueFoundryServer.test.ts+++ b/packages/trueforge-ui-sdk/test/server/createTrueFoundryServer.test.ts@@ -22,7 +22,14 @@ describe('createTrueFoundryServer', () => {data: { sandbox: { enabled: true }, skill: { enabled: true } },};const getCapabilities = vi.fn(async () => capabilities);- const getModels = vi.fn(async () => [{ name: 'm', provider: 'p', apiModel: 'p/m', modelId: 'm' }]);+ const getModels = vi.fn(async () => [+ {+ id: 'm',+ name: 'p/m',+ provider: { name: 'p' },+ properties: {},+ },+ ]);const getSkills = vi.fn(async () => []);const getMcp = vi.fn(async () => []);const searchAgents = vi.fn(async () => [{ name: 'ask-ai-agent', agentId: 'ask-ai-agent' }]);diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 26c8cbaed..dcfe2b097 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -58,8 +58,8 @@ importers:specifier: 0.2.21version: 0.2.21(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])'@truefoundry/assistant-ui-runtime':- specifier: 0.1.12- version: 0.1.12(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))+ specifier: 0.1.13+ version: 0.1.13(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))'@truefoundry/trueforge-ui':specifier: workspace:*version: link:../trueforge-ui-sdk@@ -307,8 +307,8 @@ importers:specifier: ^0.13.2version: 0.13.3(@openuidev/[email protected]([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected]))))(@openuidev/[email protected](@modelcontextprotocol/[email protected]([email protected])([email protected]))([email protected])([email protected]))(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))'@truefoundry/assistant-ui-runtime':- specifier: 0.1.12- version: 0.1.12(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))+ specifier: 0.1.13+ version: 0.1.13(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))clsx:specifier: ^2.1.1version: 2.1.1@@ -3215,8 +3215,8 @@ packages:'@types/react-dom':optional: true- '@truefoundry/[email protected]':- resolution: {integrity: sha512-b+FYGIbw7zUrjG7UCafFpNjFMwAl9V6qSX8wyAT0I4P95rbT1WY7sQNr6LPQG7cq+8Jf/P9I5YKKzbecXcUpag==}+ '@truefoundry/[email protected]':+ resolution: {integrity: sha512-pmY4Fvm5tZmX+uhsr3RegTeY3yYrdQdqaqYV5QzPZyrOPloboVPO07jbcZ2/D7S33622Ug0drhKGvWHpYTMTDw==}peerDependencies:'@types/react': '*'react: ^18 || ^19@@ -9829,7 +9829,7 @@ snapshots:'@types/react': 19.2.17'@types/react-dom': 19.2.3(@types/[email protected])- '@truefoundry/[email protected](@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))':+ '@truefoundry/[email protected](@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected])([email protected](@types/[email protected])([email protected])([email protected]([email protected])))':dependencies:'@assistant-ui/core': 0.2.22(@assistant-ui/[email protected](@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]))(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected]([email protected](@opentelemetry/[email protected])))([email protected])([email protected](@opentelemetry/[email protected]))([email protected](@types/[email protected])([email protected])([email protected]([email protected])))'@assistant-ui/store': 0.2.21(@assistant-ui/[email protected](@types/[email protected])([email protected]))(@types/[email protected])([email protected])@@ -10015,10 +10015,10 @@ snapshots:transitivePeerDependencies:- supports-color- '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])':+ '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])':dependencies:'@eslint-community/regexpp': 4.12.2- '@typescript-eslint/parser': 8.65.0([email protected]([email protected])([email protected]))([email protected])([email protected])+ '@typescript-eslint/parser': 8.65.0([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/scope-manager': 8.65.0'@typescript-eslint/type-utils': 8.65.0([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/utils': 8.65.0([email protected]([email protected])([email protected]))([email protected])([email protected])@@ -13896,7 +13896,7 @@ snapshots:[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]):dependencies:- '@typescript-eslint/eslint-plugin': 8.65.0(@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])+ '@typescript-eslint/eslint-plugin': 8.65.0(@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/parser': 8.65.0([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/typescript-estree': 8.65.0([email protected])([email protected])'@typescript-eslint/utils': 8.65.0([email protected]([email protected])([email protected]))([email protected])([email protected])