Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

AGE-1530: Add model catalog and DB-backed model-provider CRUD. (#29)

Srajan Asthanaa024f49fa561
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e8c73e2d8..73c2a6c0a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -46,9 +46,9 @@ jobs:
- name: Test
run: pnpm test
- # Gate store suites so they do not start unless session-store paths changed.
- agent-session-store-changes:
- name: Detect Session Store Changes
+ # Gate store suites so they do not start unless store-related paths changed.
+ store-changes:
+ name: Detect Store Changes
runs-on: ubuntu-latest
timeout-minutes: 5
permissions:
@@ -61,13 +61,14 @@ jobs:
- name: Check out repository code
uses: actions/checkout@v4
- - name: Detect session-store path changes
+ - name: Detect store path changes
uses: dorny/paths-filter@v4
id: filter
with:
filters: |
store:
- 'packages/server/src/db/**'
+ - 'packages/server/src/catalog/**'
- 'packages/server/tsup.config.ts'
- 'packages/server/tests/db/**'
- 'packages/server/jest.store.postgres.config.cjs'
@@ -79,9 +80,9 @@ jobs:
- '.github/workflows/ci.yml'
postgres-store-tests:
- name: Postgres Session Store Tests
- needs: agent-session-store-changes
- if: needs.agent-session-store-changes.outputs.store == 'true'
+ name: Postgres Store Tests
+ needs: store-changes
+ if: needs.store-changes.outputs.store == 'true'
runs-on: ubuntu-latest
timeout-minutes: 20
permissions:
@@ -121,15 +122,15 @@ jobs:
- name: Build
run: pnpm build
- - name: Postgres session store contract tests
+ - name: Postgres store contract tests
env:
SESSION_STORE_TEST_PG_URL: postgres://proto:proto@localhost:55432/proto
run: pnpm --dir packages/server test:store:postgres
sqlite-store-tests:
- name: SQLite Session Store Tests
- needs: agent-session-store-changes
- if: needs.agent-session-store-changes.outputs.store == 'true'
+ name: SQLite Store Tests
+ needs: store-changes
+ if: needs.store-changes.outputs.store == 'true'
runs-on: ubuntu-latest
timeout-minutes: 20
permissions:
@@ -154,5 +155,5 @@ jobs:
- name: Build
run: pnpm build
- - name: SQLite session store contract tests
+ - name: SQLite store contract tests
run: pnpm --dir packages/server test:store:sqlite
diff --git a/.gitignore b/.gitignore
index f4c230458..1623a77c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,6 @@ coverage/
.pnpm-store/
.eslintcache
packages/harness/src/core/sandbox/sandboxScripts.gen.ts
+packages/server/src/catalog/modelCatalog.gen.ts
ui-shots/*.png
data/
diff --git a/docker-compose.yml b/docker-compose.yml
index 73f329f48..b8583bc2e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,8 +61,7 @@ services:
env_file:
- path: packages/server/.env
required: true
- # The YAML registry (models.yaml, mcp.yaml, skills.yaml) is not baked into
- # the image. Copy registry-example to registry before starting the service.
+ # Copy registry-example to registry before starting the service.
volumes:
- ./packages/server/registry:/app/packages/server/registry:ro
depends_on:
diff --git a/fern/openapi/openapi.json b/fern/openapi/openapi.json
index 2a7783b57..036b762b5 100644
--- a/fern/openapi/openapi.json
+++ b/fern/openapi/openapi.json
@@ -86,7 +86,25 @@
"type": "array"
},
"model": {
- "$ref": "#/components/schemas/Model"
+ "allOf": [
+ {
+ "$ref": "#/components/schemas/Model"
+ },
+ {
+ "properties": {
+ "name": {
+ "minLength": 1,
+ "type": "string"
+ },
+ "params": {
+ "$ref": "#/components/schemas/ModelParams"
+ }
+ },
+ "required": [
+ "name"
+ ]
+ }
+ ]
},
"response_format": {
"$ref": "#/components/schemas/ResponseFormat"
@@ -286,6 +304,34 @@
"properties": {},
"type": "object"
},
+ "CatalogProvider": {
+ "additionalProperties": false,
+ "properties": {
+ "models": {
+ "items": {
+ "$ref": "#/components/schemas/ModelEntry"
+ },
+ "minItems": 1,
+ "type": "array"
+ },
+ "name": {
+ "$ref": "#/components/schemas/ResourceName"
+ },
+ "type": {
+ "enum": [
+ "openai",
+ "anthropic"
+ ],
+ "type": "string"
+ }
+ },
+ "required": [
+ "type",
+ "name",
+ "models"
+ ],
+ "type": "object"
+ },
"ChatCompletionChunkDeltaToolCall": {
"properties": {
"function": {
@@ -606,6 +652,20 @@
],
"type": "object"
},
+ "GetModelProviderCatalogResponse": {
+ "properties": {
+ "data": {
+ "items": {
+ "$ref": "#/components/schemas/CatalogProvider"
+ },
+ "type": "array"
+ }
+ },
+ "required": [
+ "data"
+ ],
+ "type": "object"
+ },
"GetSessionResponse": {
"properties": {
"data": {
@@ -692,6 +752,49 @@
},
"type": "object"
},
+ "ListLegacyModelsResponse": {
+ "properties": {
+ "data": {
+ "items": {
+ "allOf": [
+ {
+ "$ref": "#/components/schemas/ModelEntry"
+ },
+ {
+ "discriminator": {
+ "mapping": {
+ "anthropic": "#/components/schemas/AnthropicProviderModelEntry",
+ "generic": "#/components/schemas/GenericProviderModelEntry",
+ "google-gemini": "#/components/schemas/GoogleGeminiProviderModelEntry",
+ "openai": "#/components/schemas/OpenAIProviderModelEntry"
+ },
+ "propertyName": "provider"
+ },
+ "oneOf": [
+ {
+ "$ref": "#/components/schemas/OpenAIProviderModelEntry"
+ },
+ {
+ "$ref": "#/components/schemas/AnthropicProviderModelEntry"
+ },
+ {
+ "$ref": "#/components/schemas/GoogleGeminiProviderModelEntry"
+ },
+ {
+ "$ref": "#/components/schemas/GenericProviderModelEntry"
+ }
+ ]
+ }
+ ]
+ },
+ "type": "array"
+ }
+ },
+ "required": [
+ "data"
+ ],
+ "type": "object"
+ },
"ListMcpServersResponse": {
"properties": {
"data": {
@@ -722,11 +825,25 @@
],
"type": "object"
},
+ "ListModelProvidersResponse": {
+ "properties": {
+ "data": {
+ "items": {
+ "$ref": "#/components/schemas/ModelProvider"
+ },
+ "type": "array"
+ }
+ },
+ "required": [
+ "data"
+ ],
+ "type": "object"
+ },
"ListModelsResponse": {
"properties": {
"data": {
"items": {
- "$ref": "#/components/schemas/ModelEntry"
+ "$ref": "#/components/schemas/Model"
},
"type": "array"
}
@@ -1140,44 +1257,55 @@
"type": "object"
},
"Model": {
+ "additionalProperties": false,
"properties": {
+ "model_id": {
+ "description": "Upstream, provider-specific identifier sent to the provider API.",
+ "type": "string"
+ },
"name": {
- "minLength": 1,
+ "description": "Fully qualified name `name/model_name`, e.g. \"openai/gpt-5-6-sol\".",
"type": "string"
},
- "params": {
- "$ref": "#/components/schemas/ModelParams"
+ "properties": {
+ "$ref": "#/components/schemas/ModelProperties"
}
},
"required": [
- "name"
+ "name",
+ "model_id",
+ "properties"
],
"type": "object"
},
"ModelEntry": {
- "discriminator": {
- "mapping": {
- "anthropic": "#/components/schemas/AnthropicProviderModelEntry",
- "generic": "#/components/schemas/GenericProviderModelEntry",
- "google-gemini": "#/components/schemas/GoogleGeminiProviderModelEntry",
- "openai": "#/components/schemas/OpenAIProviderModelEntry"
- },
- "propertyName": "provider"
- },
- "oneOf": [
- {
- "$ref": "#/components/schemas/OpenAIProviderModelEntry"
- },
- {
- "$ref": "#/components/schemas/AnthropicProviderModelEntry"
+ "additionalProperties": false,
+ "properties": {
+ "model_id": {
+ "description": "Upstream, provider-specific identifier sent to the provider API.",
+ "minLength": 1,
+ "type": "string"
},
- {
- "$ref": "#/components/schemas/GoogleGeminiProviderModelEntry"
+ "name": {
+ "allOf": [
+ {
+ "$ref": "#/components/schemas/ResourceName"
+ },
+ {
+ "description": "Internal identifier; forms the fully qualified name `name/model_name`."
+ }
+ ]
},
- {
- "$ref": "#/components/schemas/GenericProviderModelEntry"
+ "properties": {
+ "$ref": "#/components/schemas/ModelProperties"
}
- ]
+ },
+ "required": [
+ "model_id",
+ "name",
+ "properties"
+ ],
+ "type": "object"
},
"ModelMessageDeltaEvent": {
"properties": {
@@ -1387,6 +1515,79 @@
},
"type": "object"
},
+ "ModelProperties": {
+ "additionalProperties": false,
+ "properties": {
+ "context_length": {
+ "exclusiveMinimum": 0,
+ "type": "integer"
+ },
+ "max_output_tokens": {
+ "exclusiveMinimum": 0,
+ "type": "integer"
+ },
+ "reasoning_efforts": {
+ "items": {
+ "minLength": 1,
+ "type": "string"
+ },
+ "minItems": 1,
+ "type": "array"
+ }
+ },
+ "required": [
+ "context_length",
+ "max_output_tokens"
+ ],
+ "type": "object"
+ },
+ "ModelProvider": {
+ "additionalProperties": false,
+ "properties": {
+ "auth": {
+ "$ref": "#/components/schemas/ModelProviderAuth"
+ },
+ "base_url": {
+ "description": "Base URL of the provider's API.",
+ "format": "uri",
+ "type": "string"
+ },
+ "models": {
+ "items": {
+ "$ref": "#/components/schemas/ModelEntry"
+ },
+ "minItems": 1,
+ "type": "array"
+ },
+ "name": {
+ "$ref": "#/components/schemas/ResourceName"
+ },
+ "type": {
+ "$ref": "#/components/schemas/ProviderType"
+ }
+ },
+ "required": [
+ "type",
+ "base_url",
+ "auth",
+ "models",
+ "name"
+ ],
+ "type": "object"
+ },
+ "ModelProviderAuth": {
+ "additionalProperties": false,
+ "properties": {
+ "api_key": {
+ "minLength": 1,
+ "type": "string"
+ }
+ },
+ "required": [
+ "api_key"
+ ],
+ "type": "object"
+ },
"OpenAIProviderModelEntry": {
"additionalProperties": false,
"properties": {
@@ -1458,6 +1659,25 @@
"default": "auto",
"description": "Defaults to 'auto' (chain to session last turn). Use 'null' for the session's first turn."
},
+ "ProviderType": {
+ "enum": [
+ "openai",
+ "anthropic",
+ "custom"
+ ],
+ "type": "string"
+ },
+ "PutModelProviderResponse": {
+ "properties": {
+ "data": {
+ "$ref": "#/components/schemas/ModelProvider"
+ }
+ },
+ "required": [
+ "data"
+ ],
+ "type": "object"
+ },
"RawToolCall": {
"allOf": [
{
@@ -1508,6 +1728,12 @@
],
"type": "object"
},
+ "ResourceName": {
+ "maxLength": 64,
+ "minLength": 2,
+ "pattern": "^[a-z](?:[a-z0-9._-]{0,62}[a-z0-9])$",
+ "type": "string"
+ },
"ResponseFormat": {
"oneOf": [
{
@@ -2759,7 +2985,7 @@
"x-fern-sdk-method-name": "get_capabilities"
}
},
- "/api/v1/mcp-servers": {
+ "/api/v1/legacy/mcp-servers": {
"get": {
"description": "MCP servers declared in mcp.yaml, each with a passive auth_status snapshot. Auth headers are configured via env vars and never returned.",
"responses": {
@@ -2776,15 +3002,16 @@
},
"summary": "List MCP servers",
"tags": [
- "MCP Servers"
+ "Legacy MCP Servers"
],
"x-fern-sdk-group-name": [
+ "legacy",
"mcp_servers"
],
"x-fern-sdk-method-name": "list"
}
},
- "/api/v1/mcp-servers/oauth/callback": {
+ "/api/v1/legacy/mcp-servers/oauth/callback": {
"get": {
"parameters": [
{
@@ -2845,12 +3072,12 @@
},
"summary": "OAuth callback for MCP authorization",
"tags": [
- "MCP OAuth"
+ "Legacy MCP OAuth"
],
"x-fern-ignore": true
}
},
- "/api/v1/mcp-servers/{name}/authorize": {
+ "/api/v1/legacy/mcp-servers/{name}/authorize": {
"get": {
"description": "Registers a DCR client for this server if none exists yet, then returns an authorization URL to redirect the user to so they can complete the OAuth consent flow. Short-circuits to `{status: authenticated}` with no URL if the server is already connected.",
"parameters": [
@@ -2901,15 +3128,16 @@
},
"summary": "Start (or short-circuit) the auth flow for an MCP server",
"tags": [
- "MCP Servers"
+ "Legacy MCP Servers"
],
"x-fern-sdk-group-name": [
+ "legacy",
"mcp_servers"
],
"x-fern-sdk-method-name": "authorize"
}
},
- "/api/v1/mcp-servers/{name}/tools": {
+ "/api/v1/legacy/mcp-servers/{name}/tools": {
"get": {
"description": "All tools exposed by the given MCP server (non-paginated), as returned by the MCP `tools/list` call. No agent-spec tool selectors are applied — this is the raw server catalog.",
"parameters": [
@@ -2969,17 +3197,70 @@
},
"summary": "List tools of an MCP server",
"tags": [
- "MCP Servers"
+ "Legacy MCP Servers"
],
"x-fern-sdk-group-name": [
+ "legacy",
"mcp_servers"
],
"x-fern-sdk-method-name": "list_tools"
}
},
+ "/api/v1/legacy/models": {
+ "get": {
+ "description": "Models declared in models.yaml — the registry the runtime still uses for turns.",
+ "responses": {
+ "200": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/ListLegacyModelsResponse"
+ }
+ }
+ },
+ "description": "All configured models."
+ }
+ },
+ "summary": "List models (models.yaml)",
+ "tags": [
+ "Legacy Models"
+ ],
+ "x-fern-sdk-group-name": [
+ "legacy",
+ "models"
+ ],
+ "x-fern-sdk-method-name": "list"
+ }
+ },
+ "/api/v1/legacy/skills": {
+ "get": {
+ "description": "Agent skills declared in skills.yaml.",
+ "responses": {
+ "200": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/ListSkillsResponse"
+ }
+ }
+ },
+ "description": "All configured skills."
+ }
+ },
+ "summary": "List skills",
+ "tags": [
+ "Legacy Skills"
+ ],
+ "x-fern-sdk-group-name": [
+ "legacy",
+ "skills"
+ ],
+ "x-fern-sdk-method-name": "list"
+ }
+ },
"/api/v1/models": {
"get": {
- "description": "Models declared in models.yaml, reachable through the OpenAI-compatible API at the file's base_url.",
+ "description": "Models across all configured model providers, addressed by fully qualified name `name/model_name`.",
"responses": {
"200": {
"content": {
@@ -2989,7 +3270,7 @@
}
}
},
- "description": "All configured models."
+ "description": "All models of all configured providers."
}
},
"summary": "List models",
@@ -3808,29 +4089,100 @@
"x-fern-sdk-method-name": "list_turn_events"
}
},
- "/api/v1/skills": {
+ "/api/v1/settings/model-providers": {
"get": {
- "description": "Agent skills declared in skills.yaml.",
+ "description": "All configured providers with their models.",
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
- "$ref": "#/components/schemas/ListSkillsResponse"
+ "$ref": "#/components/schemas/ListModelProvidersResponse"
}
}
},
- "description": "All configured skills."
+ "description": "All configured model providers."
}
},
- "summary": "List skills",
+ "summary": "List configured model providers",
"tags": [
- "Skills"
+ "Model Providers"
],
"x-fern-sdk-group-name": [
- "skills"
+ "settings",
+ "modelProviders"
],
"x-fern-sdk-method-name": "list"
+ },
+ "put": {
+ "description": "Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).",
+ "requestBody": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/ModelProvider"
+ }
+ }
+ },
+ "required": true
+ },
+ "responses": {
+ "200": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/PutModelProviderResponse"
+ }
+ }
+ },
+ "description": "The saved provider."
+ },
+ "400": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/RequestErrorResponse"
+ }
+ }
+ },
+ "description": "Invalid request body."
+ }
+ },
+ "summary": "Create or replace a model provider",
+ "tags": [
+ "Model Providers"
+ ],
+ "x-fern-sdk-group-name": [
+ "settings",
+ "modelProviders"
+ ],
+ "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: copy an entry into PUT /settings/model-providers to configure it. Custom providers are not listed here.",
+ "responses": {
+ "200": {
+ "content": {
+ "application/json": {
+ "schema": {
+ "$ref": "#/components/schemas/GetModelProviderCatalogResponse"
+ }
+ }
+ },
+ "description": "The shipped catalog, verbatim."
+ }
+ },
+ "summary": "Get the model catalog",
+ "tags": [
+ "Model Providers"
+ ],
+ "x-fern-sdk-group-name": [
+ "settings",
+ "modelProviders"
+ ],
+ "x-fern-sdk-method-name": "catalog"
}
}
},
diff --git a/packages/frontend/README.md b/packages/frontend/README.md
index 8b0845471..29efe4a6c 100644
--- a/packages/frontend/README.md
+++ b/packages/frontend/README.md
@@ -56,10 +56,10 @@ docker compose up --build # UI + API on http://localhost:8791
The SDK has no catalog client. On boot the app:
-1. `GET /api/v1/models` → seeds `defaultAgentSpec.model.name`
+1. `GET /api/v1/legacy/models` → seeds `defaultAgentSpec.model.name`
2. Renders custom `ComposerRightSection` controls that `fetch` models/MCP and call `updateAgentSpec`
-Skills: catalog UI lists `GET /api/v1/skills` (empty state when none). Selection is local-only — session admission still rejects `agent_spec.skills`.
+Skills: catalog UI lists `GET /api/v1/legacy/skills` (empty state when none). Selection is local-only — session admission still rejects `agent_spec.skills`.
## Gaps
diff --git a/packages/frontend/src/App.tsx b/packages/frontend/src/App.tsx
index 51af9aff4..4adadcb77 100644
--- a/packages/frontend/src/App.tsx
+++ b/packages/frontend/src/App.tsx
@@ -142,7 +142,7 @@ export function App() {
const [models, serverCapabilities] = await Promise.all([listModels(), getCapabilities()]);
const first = models[0];
if (!first) {
- throw new Error('No models in GET /api/v1/models — check models.yaml');
+ throw new Error('No models in GET /api/v1/legacy/models — check models.yaml');
}
if (!state.cancelled) {
const defaultReasoningEffort = first.reasoning_efforts?.[0];
diff --git a/packages/frontend/src/catalog.ts b/packages/frontend/src/catalog.ts
index 5fb5da14a..b1d57a8bb 100644
--- a/packages/frontend/src/catalog.ts
+++ b/packages/frontend/src/catalog.ts
@@ -49,17 +49,17 @@ async function fetchJson<T>(path: string): Promise<T> {
}
export async function listModels(): Promise<ModelEntry[]> {
- const body = await fetchJson<ListEnvelope<ModelEntry>>('/api/v1/models');
+ const body = await fetchJson<ListEnvelope<ModelEntry>>('/api/v1/legacy/models');
return body.data;
}
export async function listMcpServers(): Promise<McpServerEntry[]> {
- const body = await fetchJson<ListEnvelope<McpServerEntry>>('/api/v1/mcp-servers');
+ const body = await fetchJson<ListEnvelope<McpServerEntry>>('/api/v1/legacy/mcp-servers');
return body.data;
}
export async function listSkills(): Promise<SkillEntry[]> {
- const body = await fetchJson<ListEnvelope<SkillEntry>>('/api/v1/skills');
+ const body = await fetchJson<ListEnvelope<SkillEntry>>('/api/v1/legacy/skills');
return body.data;
}
diff --git a/packages/frontend/tests/apiErrors.test.ts b/packages/frontend/tests/apiErrors.test.ts
index 031a97b9d..4c9f153d1 100644
--- a/packages/frontend/tests/apiErrors.test.ts
+++ b/packages/frontend/tests/apiErrors.test.ts
@@ -37,7 +37,7 @@ describe('api error interceptor', () => {
stubbedResponse = () => {
throw new Error('connection refused');
};
- await assert.rejects(fetch('/api/v1/skills'), /connection refused/);
+ await assert.rejects(fetch('/api/v1/legacy/skills'), /connection refused/);
const [record] = getApiErrorsSnapshot();
assert.ok(record);
diff --git a/packages/sdk/.fern/metadata.json b/packages/sdk/.fern/metadata.json
index 4cbe38c6b..906a3a4e5 100644
--- a/packages/sdk/.fern/metadata.json
+++ b/packages/sdk/.fern/metadata.json
@@ -26,7 +26,7 @@
"streamType": "web",
"useDefaultRequestParameterValues": true
},
- "originGitCommit": "c4bd4f7de2af782b3f6b977060eaae948d76d75d",
+ "originGitCommit": "0e17a9cb712eccd6768612277b0e0753a98f3ec8",
"originGitCommitIsDirty": true,
"invokedBy": "ci",
"requestedVersion": "0.0.0",
diff --git a/packages/sdk/README.md b/packages/sdk/README.md
index ab161a5c8..fae45d4b7 100644
--- a/packages/sdk/README.md
+++ b/packages/sdk/README.md
@@ -62,7 +62,7 @@ following namespace:
```typescript
import { TrueHarness } from "trueharness";
-const request: TrueHarness.AuthorizeMcpServersRequest = {
+const request: TrueHarness.ListSessionsRequest = {
...
};
```
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 0b1fbf342..7ad5c53f8 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -40,17 +40,6 @@
},
"default": "./dist/cjs/api/resources/server/exports.js"
},
- "./mcpServers": {
- "import": {
- "types": "./dist/esm/api/resources/mcpServers/exports.d.mts",
- "default": "./dist/esm/api/resources/mcpServers/exports.mjs"
- },
- "require": {
- "types": "./dist/cjs/api/resources/mcpServers/exports.d.ts",
- "default": "./dist/cjs/api/resources/mcpServers/exports.js"
- },
- "default": "./dist/cjs/api/resources/mcpServers/exports.js"
- },
"./models": {
"import": {
"types": "./dist/esm/api/resources/models/exports.d.mts",
@@ -73,16 +62,71 @@
},
"default": "./dist/cjs/api/resources/sessions/exports.js"
},
- "./skills": {
+ "./legacy": {
+ "import": {
+ "types": "./dist/esm/api/resources/legacy/exports.d.mts",
+ "default": "./dist/esm/api/resources/legacy/exports.mjs"
+ },
+ "require": {
+ "types": "./dist/cjs/api/resources/legacy/exports.d.ts",
+ "default": "./dist/cjs/api/resources/legacy/exports.js"
+ },
+ "default": "./dist/cjs/api/resources/legacy/exports.js"
+ },
+ "./legacy/mcpServers": {
+ "import": {
+ "types": "./dist/esm/api/resources/legacy/resources/mcpServers/exports.d.mts",
+ "default": "./dist/esm/api/resources/legacy/resources/mcpServers/exports.mjs"
+ },
+ "require": {
+ "types": "./dist/cjs/api/resources/legacy/resources/mcpServers/exports.d.ts",
+ "default": "./dist/cjs/api/resources/legacy/resources/mcpServers/exports.js"
+ },
+ "default": "./dist/cjs/api/resources/legacy/resources/mcpServers/exports.js"
+ },
+ "./legacy/models": {
+ "import": {
+ "types": "./dist/esm/api/resources/legacy/resources/models/exports.d.mts",
+ "default": "./dist/esm/api/resources/legacy/resources/models/exports.mjs"
+ },
+ "require": {
+ "types": "./dist/cjs/api/resources/legacy/resources/models/exports.d.ts",
+ "default": "./dist/cjs/api/resources/legacy/resources/models/exports.js"
+ },
+ "default": "./dist/cjs/api/resources/legacy/resources/models/exports.js"
+ },
+ "./legacy/skills": {
+ "import": {
+ "types": "./dist/esm/api/resources/legacy/resources/skills/exports.d.mts",
+ "default": "./dist/esm/api/resources/legacy/resources/skills/exports.mjs"
+ },
+ "require": {
+ "types": "./dist/cjs/api/resources/legacy/resources/skills/exports.d.ts",
+ "default": "./dist/cjs/api/resources/legacy/resources/skills/exports.js"
+ },
+ "default": "./dist/cjs/api/resources/legacy/resources/skills/exports.js"
+ },
+ "./settings": {
+ "import": {
+ "types": "./dist/esm/api/resources/settings/exports.d.mts",
+ "default": "./dist/esm/api/resources/settings/exports.mjs"
+ },
+ "require": {
+ "types": "./dist/cjs/api/resources/settings/exports.d.ts",
+ "default": "./dist/cjs/api/resources/settings/exports.js"
+ },
+ "default": "./dist/cjs/api/resources/settings/exports.js"
+ },
+ "./settings/modelProviders": {
"import": {
- "types": "./dist/esm/api/resources/skills/exports.d.mts",
- "default": "./dist/esm/api/resources/skills/exports.mjs"
+ "types": "./dist/esm/api/resources/settings/resources/modelProviders/exports.d.mts",
+ "default": "./dist/esm/api/resources/settings/resources/modelProviders/exports.mjs"
},
"require": {
- "types": "./dist/cjs/api/resources/skills/exports.d.ts",
- "default": "./dist/cjs/api/resources/skills/exports.js"
+ "types": "./dist/cjs/api/resources/settings/resources/modelProviders/exports.d.ts",
+ "default": "./dist/cjs/api/resources/settings/resources/modelProviders/exports.js"
},
- "default": "./dist/cjs/api/resources/skills/exports.js"
+ "default": "./dist/cjs/api/resources/settings/resources/modelProviders/exports.js"
},
"./package.json": "./package.json"
},
diff --git a/packages/sdk/reference.md b/packages/sdk/reference.md
index 1b39b208f..bd91e3dd9 100644
--- a/packages/sdk/reference.md
+++ b/packages/sdk/reference.md
@@ -55,8 +55,8 @@ await client.server.getCapabilities();
</dl>
</details>
-## McpServers
-<details><summary><code>client.mcpServers.<a href="/src/api/resources/mcpServers/client/Client.ts">list</a>() -> TrueHarness.ListMcpServersResponse</code></summary>
+## Models
+<details><summary><code>client.models.<a href="/src/api/resources/models/client/Client.ts">list</a>() -> TrueHarness.ListModelsResponse</code></summary>
<dl>
<dd>
@@ -68,7 +68,7 @@ await client.server.getCapabilities();
<dl>
<dd>
-MCP servers declared in mcp.yaml, each with a passive auth_status snapshot. Auth headers are configured via env vars and never returned.
+Models across all configured model providers, addressed by fully qualified name `name/model_name`.
</dd>
</dl>
</dd>
@@ -83,7 +83,7 @@ MCP servers declared in mcp.yaml, each with a passive auth_status snapshot. Auth
<dd>
```typescript
-await client.mcpServers.list();
+await client.models.list();
```
</dd>
@@ -99,7 +99,7 @@ await client.mcpServers.list();
<dl>
<dd>
-**requestOptions:** `McpServersClient.RequestOptions`
+**requestOptions:** `ModelsClient.RequestOptions`
</dd>
</dl>
@@ -111,7 +111,8 @@ await client.mcpServers.list();
</dl>
</details>
-<details><summary><code>client.mcpServers.<a href="/src/api/resources/mcpServers/client/Client.ts">authorize</a>(name, { ...params }) -> TrueHarness.McpAuthorizeResponse</code></summary>
+## Sessions
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">list</a>({ ...params }) -> core.Page&lt;TrueHarness.Session, TrueHarness.ListSessionsResponse&gt;</code></summary>
<dl>
<dd>
@@ -123,7 +124,7 @@ await client.mcpServers.list();
<dl>
<dd>
-Registers a DCR client for this server if none exists yet, then returns an authorization URL to redirect the user to so they can complete the OAuth consent flow. Short-circuits to `{status: authenticated}` with no URL if the server is already connected.
+List sessions (newest first by default), token-paginated. Pass `page_token` to fetch the next page, keeping the other query params constant.
</dd>
</dl>
</dd>
@@ -138,9 +139,7 @@ Registers a DCR client for this server if none exists yet, then returns an autho
<dd>
```typescript
-await client.mcpServers.authorize("name", {
- redirectUrl: "redirect_url"
-});
+await client.sessions.list();
```
</dd>
@@ -156,15 +155,7 @@ await client.mcpServers.authorize("name", {
<dl>
<dd>
-**name:** `string` — MCP server name from mcp.yaml.
-
-</dd>
-</dl>
-
-<dl>
-<dd>
-
-**request:** `TrueHarness.AuthorizeMcpServersRequest`
+**request:** `TrueHarness.ListSessionsRequest`
</dd>
</dl>
@@ -172,7 +163,7 @@ await client.mcpServers.authorize("name", {
<dl>
<dd>
-**requestOptions:** `McpServersClient.RequestOptions`
+**requestOptions:** `SessionsClient.RequestOptions`
</dd>
</dl>
@@ -184,7 +175,7 @@ await client.mcpServers.authorize("name", {
</dl>
</details>
-<details><summary><code>client.mcpServers.<a href="/src/api/resources/mcpServers/client/Client.ts">listTools</a>(name) -> TrueHarness.ListMcpToolsResponse</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">create</a>({ ...params }) -> TrueHarness.GetSessionResponse</code></summary>
<dl>
<dd>
@@ -196,7 +187,7 @@ await client.mcpServers.authorize("name", {
<dl>
<dd>
-All tools exposed by the given MCP server (non-paginated), as returned by the MCP `tools/list` call. No agent-spec tool selectors are applied — this is the raw server catalog.
+Create a session holding an inline agent spec. Turns are executed against this spec.
</dd>
</dl>
</dd>
@@ -211,7 +202,18 @@ All tools exposed by the given MCP server (non-paginated), as returned by the MC
<dd>
```typescript
-await client.mcpServers.listTools("name");
+await client.sessions.create({
+ agentSpec: {
+ model: {
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1
+ }
+ }
+ }
+});
```
</dd>
@@ -227,7 +229,7 @@ await client.mcpServers.listTools("name");
<dl>
<dd>
-**name:** `string` — MCP server name from mcp.yaml.
+**request:** `TrueHarness.CreateSessionRequest`
</dd>
</dl>
@@ -235,7 +237,7 @@ await client.mcpServers.listTools("name");
<dl>
<dd>
-**requestOptions:** `McpServersClient.RequestOptions`
+**requestOptions:** `SessionsClient.RequestOptions`
</dd>
</dl>
@@ -247,8 +249,7 @@ await client.mcpServers.listTools("name");
</dl>
</details>
-## Models
-<details><summary><code>client.models.<a href="/src/api/resources/models/client/Client.ts">list</a>() -> TrueHarness.ListModelsResponse</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">get</a>(sessionId) -> TrueHarness.GetSessionResponse</code></summary>
<dl>
<dd>
@@ -260,7 +261,7 @@ await client.mcpServers.listTools("name");
<dl>
<dd>
-Models declared in models.yaml, reachable through the OpenAI-compatible API at the file's base_url.
+Fetch a session by ID.
</dd>
</dl>
</dd>
@@ -275,7 +276,7 @@ Models declared in models.yaml, reachable through the OpenAI-compatible API at t
<dd>
```typescript
-await client.models.list();
+await client.sessions.get("sessionId");
```
</dd>
@@ -291,7 +292,15 @@ await client.models.list();
<dl>
<dd>
-**requestOptions:** `ModelsClient.RequestOptions`
+**sessionId:** `string` — Session identifier.
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**requestOptions:** `SessionsClient.RequestOptions`
</dd>
</dl>
@@ -303,8 +312,7 @@ await client.models.list();
</dl>
</details>
-## Sessions
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">list</a>({ ...params }) -> core.Page&lt;TrueHarness.Session, TrueHarness.ListSessionsResponse&gt;</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">update</a>(sessionId, { ...params }) -> TrueHarness.GetSessionResponse</code></summary>
<dl>
<dd>
@@ -316,7 +324,7 @@ await client.models.list();
<dl>
<dd>
-List sessions (newest first by default), token-paginated. Pass `page_token` to fetch the next page, keeping the other query params constant.
+Update a session's inline agent spec. An empty body is a valid no-op that refreshes `updated_at`.
</dd>
</dl>
</dd>
@@ -331,7 +339,7 @@ List sessions (newest first by default), token-paginated. Pass `page_token` to f
<dd>
```typescript
-await client.sessions.list();
+await client.sessions.update("sessionId");
```
</dd>
@@ -347,7 +355,15 @@ await client.sessions.list();
<dl>
<dd>
-**request:** `TrueHarness.ListSessionsRequest`
+**sessionId:** `string` — Session identifier.
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**request:** `TrueHarness.UpdateSessionRequest`
</dd>
</dl>
@@ -367,7 +383,7 @@ await client.sessions.list();
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">create</a>({ ...params }) -> TrueHarness.GetSessionResponse</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">cancel</a>(sessionId, { ...params }) -> TrueHarness.CancelSessionResponse</code></summary>
<dl>
<dd>
@@ -379,7 +395,7 @@ await client.sessions.list();
<dl>
<dd>
-Create a session holding an inline agent spec. Turns are executed against this spec.
+Cancel the running last turn for a session.
</dd>
</dl>
</dd>
@@ -394,13 +410,7 @@ Create a session holding an inline agent spec. Turns are executed against this s
<dd>
```typescript
-await client.sessions.create({
- agentSpec: {
- model: {
- name: "name"
- }
- }
-});
+await client.sessions.cancel("sessionId");
```
</dd>
@@ -416,7 +426,15 @@ await client.sessions.create({
<dl>
<dd>
-**request:** `TrueHarness.CreateSessionRequest`
+**sessionId:** `string` — Session identifier.
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**request:** `TrueHarness.CancelSessionRequest`
</dd>
</dl>
@@ -436,7 +454,7 @@ await client.sessions.create({
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">get</a>(sessionId) -> TrueHarness.GetSessionResponse</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">listEvents</a>(sessionId, { ...params }) -> core.Page&lt;TrueHarness.SessionEventItem, TrueHarness.ListSessionEventsResponse&gt;</code></summary>
<dl>
<dd>
@@ -448,7 +466,7 @@ await client.sessions.create({
<dl>
<dd>
-Fetch a session by ID.
+List session events as `{ turn_id, event }` across the active turn branch (newest first), including persisted events from a running tip. Each turn contributes turn.created, content events (model.message, tool.call, …), and turn.done when terminal; streaming deltas are not included. Use `page_token` to paginate backward toward older events while retaining the original branch anchor.
</dd>
</dl>
</dd>
@@ -463,7 +481,7 @@ Fetch a session by ID.
<dd>
```typescript
-await client.sessions.get("sessionId");
+await client.sessions.listEvents("sessionId");
```
</dd>
@@ -487,6 +505,14 @@ await client.sessions.get("sessionId");
<dl>
<dd>
+**request:** `TrueHarness.ListEventsSessionsRequest`
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
**requestOptions:** `SessionsClient.RequestOptions`
</dd>
@@ -499,7 +525,7 @@ await client.sessions.get("sessionId");
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">update</a>(sessionId, { ...params }) -> TrueHarness.GetSessionResponse</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">listTurns</a>(sessionId, { ...params }) -> core.Page&lt;TrueHarness.Turn, TrueHarness.ListTurnsResponse&gt;</code></summary>
<dl>
<dd>
@@ -511,7 +537,7 @@ await client.sessions.get("sessionId");
<dl>
<dd>
-Update a session's inline agent spec. An empty body is a valid no-op that refreshes `updated_at`.
+List turns for a session (newest first by default), token-paginated.
</dd>
</dl>
</dd>
@@ -526,7 +552,7 @@ Update a session's inline agent spec. An empty body is a valid no-op that refres
<dd>
```typescript
-await client.sessions.update("sessionId");
+await client.sessions.listTurns("sessionId");
```
</dd>
@@ -550,7 +576,7 @@ await client.sessions.update("sessionId");
<dl>
<dd>
-**request:** `TrueHarness.UpdateSessionRequest`
+**request:** `TrueHarness.ListTurnsSessionsRequest`
</dd>
</dl>
@@ -570,7 +596,7 @@ await client.sessions.update("sessionId");
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">cancel</a>(sessionId, { ...params }) -> TrueHarness.CancelSessionResponse</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">createTurn</a>(sessionId, { ...params }) -> core.Stream&lt;TrueHarness.TurnStreamingEvent&gt;</code></summary>
<dl>
<dd>
@@ -582,7 +608,8 @@ await client.sessions.update("sessionId");
<dl>
<dd>
-Cancel the running last turn for a session.
+Create a turn within a session and stream its execution as Server-Sent Events.
+Use `previous_turn_id` to chain to the session's last turn (defaults to `auto`).
</dd>
</dl>
</dd>
@@ -597,7 +624,10 @@ Cancel the running last turn for a session.
<dd>
```typescript
-await client.sessions.cancel("sessionId");
+const response = await client.sessions.createTurn("sessionId");
+for await (const item of response) {
+ console.log(item);
+}
```
</dd>
@@ -621,7 +651,7 @@ await client.sessions.cancel("sessionId");
<dl>
<dd>
-**request:** `TrueHarness.CancelSessionRequest`
+**request:** `TrueHarness.CreateTurnRequest`
</dd>
</dl>
@@ -641,7 +671,7 @@ await client.sessions.cancel("sessionId");
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">listEvents</a>(sessionId, { ...params }) -> core.Page&lt;TrueHarness.SessionEventItem, TrueHarness.ListSessionEventsResponse&gt;</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">getTurn</a>(sessionId, turnId) -> TrueHarness.GetTurnResponse</code></summary>
<dl>
<dd>
@@ -653,7 +683,7 @@ await client.sessions.cancel("sessionId");
<dl>
<dd>
-List session events as `{ turn_id, event }` across the active turn branch (newest first), including persisted events from a running tip. Each turn contributes turn.created, content events (model.message, tool.call, …), and turn.done when terminal; streaming deltas are not included. Use `page_token` to paginate backward toward older events while retaining the original branch anchor.
+Fetch a single turn by ID.
</dd>
</dl>
</dd>
@@ -668,7 +698,7 @@ List session events as `{ turn_id, event }` across the active turn branch (newes
<dd>
```typescript
-await client.sessions.listEvents("sessionId");
+await client.sessions.getTurn("sessionId", "turnId");
```
</dd>
@@ -692,7 +722,7 @@ await client.sessions.listEvents("sessionId");
<dl>
<dd>
-**request:** `TrueHarness.ListEventsSessionsRequest`
+**turnId:** `string` — Turn identifier.
</dd>
</dl>
@@ -712,7 +742,7 @@ await client.sessions.listEvents("sessionId");
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">listTurns</a>(sessionId, { ...params }) -> core.Page&lt;TrueHarness.Turn, TrueHarness.ListTurnsResponse&gt;</code></summary>
+<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">listTurnEvents</a>(sessionId, turnId, { ...params }) -> core.Page&lt;TrueHarness.SessionEvent, TrueHarness.ListTurnEventsResponse&gt;</code></summary>
<dl>
<dd>
@@ -724,7 +754,7 @@ await client.sessions.listEvents("sessionId");
<dl>
<dd>
-List turns for a session (newest first by default), token-paginated.
+Paginated persisted events for a turn (insertion order by default).
</dd>
</dl>
</dd>
@@ -739,7 +769,7 @@ List turns for a session (newest first by default), token-paginated.
<dd>
```typescript
-await client.sessions.listTurns("sessionId");
+await client.sessions.listTurnEvents("sessionId", "turnId");
```
</dd>
@@ -763,7 +793,15 @@ await client.sessions.listTurns("sessionId");
<dl>
<dd>
-**request:** `TrueHarness.ListTurnsSessionsRequest`
+**turnId:** `string` — Turn identifier.
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**request:** `TrueHarness.ListTurnEventsSessionsRequest`
</dd>
</dl>
@@ -783,7 +821,8 @@ await client.sessions.listTurns("sessionId");
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">createTurn</a>(sessionId, { ...params }) -> core.Stream&lt;TrueHarness.TurnStreamingEvent&gt;</code></summary>
+## Legacy McpServers
+<details><summary><code>client.legacy.mcpServers.<a href="/src/api/resources/legacy/resources/mcpServers/client/Client.ts">list</a>() -> TrueHarness.ListMcpServersResponse</code></summary>
<dl>
<dd>
@@ -795,8 +834,7 @@ await client.sessions.listTurns("sessionId");
<dl>
<dd>
-Create a turn within a session and stream its execution as Server-Sent Events.
-Use `previous_turn_id` to chain to the session's last turn (defaults to `auto`).
+MCP servers declared in mcp.yaml, each with a passive auth_status snapshot. Auth headers are configured via env vars and never returned.
</dd>
</dl>
</dd>
@@ -811,10 +849,7 @@ Use `previous_turn_id` to chain to the session's last turn (defaults to `auto`).
<dd>
```typescript
-const response = await client.sessions.createTurn("sessionId");
-for await (const item of response) {
- console.log(item);
-}
+await client.legacy.mcpServers.list();
```
</dd>
@@ -830,15 +865,64 @@ for await (const item of response) {
<dl>
<dd>
-**sessionId:** `string` — Session identifier.
+**requestOptions:** `McpServersClient.RequestOptions`
</dd>
</dl>
+</dd>
+</dl>
+
+
+</dd>
+</dl>
+</details>
+<details><summary><code>client.legacy.mcpServers.<a href="/src/api/resources/legacy/resources/mcpServers/client/Client.ts">authorize</a>(name, { ...params }) -> TrueHarness.McpAuthorizeResponse</code></summary>
<dl>
<dd>
-**request:** `TrueHarness.CreateTurnRequest`
+#### 📝 Description
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+Registers a DCR client for this server if none exists yet, then returns an authorization URL to redirect the user to so they can complete the OAuth consent flow. Short-circuits to `{status: authenticated}` with no URL if the server is already connected.
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### 🔌 Usage
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+```typescript
+await client.legacy.mcpServers.authorize("name", {
+ redirectUrl: "redirect_url"
+});
+
+```
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### ⚙️ Parameters
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+**name:** `string` — MCP server name from mcp.yaml.
</dd>
</dl>
@@ -846,7 +930,15 @@ for await (const item of response) {
<dl>
<dd>
-**requestOptions:** `SessionsClient.RequestOptions`
+**request:** `TrueHarness.legacy.AuthorizeMcpServersRequest`
+
+</dd>
+</dl>
+
+<dl>
+<dd>
+
+**requestOptions:** `McpServersClient.RequestOptions`
</dd>
</dl>
@@ -858,7 +950,7 @@ for await (const item of response) {
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">getTurn</a>(sessionId, turnId) -> TrueHarness.GetTurnResponse</code></summary>
+<details><summary><code>client.legacy.mcpServers.<a href="/src/api/resources/legacy/resources/mcpServers/client/Client.ts">listTools</a>(name) -> TrueHarness.ListMcpToolsResponse</code></summary>
<dl>
<dd>
@@ -870,7 +962,7 @@ for await (const item of response) {
<dl>
<dd>
-Fetch a single turn by ID.
+All tools exposed by the given MCP server (non-paginated), as returned by the MCP `tools/list` call. No agent-spec tool selectors are applied — this is the raw server catalog.
</dd>
</dl>
</dd>
@@ -885,7 +977,7 @@ Fetch a single turn by ID.
<dd>
```typescript
-await client.sessions.getTurn("sessionId", "turnId");
+await client.legacy.mcpServers.listTools("name");
```
</dd>
@@ -901,7 +993,7 @@ await client.sessions.getTurn("sessionId", "turnId");
<dl>
<dd>
-**sessionId:** `string` — Session identifier.
+**name:** `string` — MCP server name from mcp.yaml.
</dd>
</dl>
@@ -909,15 +1001,63 @@ await client.sessions.getTurn("sessionId", "turnId");
<dl>
<dd>
-**turnId:** `string` — Turn identifier.
+**requestOptions:** `McpServersClient.RequestOptions`
</dd>
</dl>
+</dd>
+</dl>
+
+</dd>
+</dl>
+</details>
+
+## Legacy Models
+<details><summary><code>client.legacy.models.<a href="/src/api/resources/legacy/resources/models/client/Client.ts">list</a>() -> TrueHarness.ListLegacyModelsResponse</code></summary>
<dl>
<dd>
-**requestOptions:** `SessionsClient.RequestOptions`
+#### 📝 Description
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+Models declared in models.yaml — the registry the runtime still uses for turns.
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### 🔌 Usage
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+```typescript
+await client.legacy.models.list();
+
+```
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### ⚙️ Parameters
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+**requestOptions:** `ModelsClient.RequestOptions`
</dd>
</dl>
@@ -929,7 +1069,8 @@ await client.sessions.getTurn("sessionId", "turnId");
</dl>
</details>
-<details><summary><code>client.sessions.<a href="/src/api/resources/sessions/client/Client.ts">listTurnEvents</a>(sessionId, turnId, { ...params }) -> core.Page&lt;TrueHarness.SessionEvent, TrueHarness.ListTurnEventsResponse&gt;</code></summary>
+## Legacy Skills
+<details><summary><code>client.legacy.skills.<a href="/src/api/resources/legacy/resources/skills/client/Client.ts">list</a>() -> TrueHarness.ListSkillsResponse</code></summary>
<dl>
<dd>
@@ -941,7 +1082,7 @@ await client.sessions.getTurn("sessionId", "turnId");
<dl>
<dd>
-Paginated persisted events for a turn (insertion order by default).
+Agent skills declared in skills.yaml.
</dd>
</dl>
</dd>
@@ -956,7 +1097,7 @@ Paginated persisted events for a turn (insertion order by default).
<dd>
```typescript
-await client.sessions.listTurnEvents("sessionId", "turnId");
+await client.legacy.skills.list();
```
</dd>
@@ -972,23 +1113,133 @@ await client.sessions.listTurnEvents("sessionId", "turnId");
<dl>
<dd>
-**sessionId:** `string` — Session identifier.
+**requestOptions:** `SkillsClient.RequestOptions`
</dd>
</dl>
+</dd>
+</dl>
+
+</dd>
+</dl>
+</details>
+
+## Settings ModelProviders
+<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">list</a>() -> TrueHarness.ListModelProvidersResponse</code></summary>
<dl>
<dd>
-**turnId:** `string` — Turn identifier.
+#### 📝 Description
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+All configured providers with their models.
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### 🔌 Usage
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+```typescript
+await client.settings.modelProviders.list();
+
+```
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### ⚙️ Parameters
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+**requestOptions:** `ModelProvidersClient.RequestOptions`
</dd>
</dl>
+</dd>
+</dl>
+
+
+</dd>
+</dl>
+</details>
+<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">upsert</a>({ ...params }) -> TrueHarness.PutModelProviderResponse</code></summary>
<dl>
<dd>
-**request:** `TrueHarness.ListTurnEventsSessionsRequest`
+#### 📝 Description
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### 🔌 Usage
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+```typescript
+await client.settings.modelProviders.upsert({
+ auth: {
+ apiKey: "api_key"
+ },
+ baseUrl: "base_url",
+ models: [{
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1
+ }
+ }],
+ name: "name",
+ type: "openai"
+});
+
+```
+</dd>
+</dl>
+</dd>
+</dl>
+
+#### ⚙️ Parameters
+
+<dl>
+<dd>
+
+<dl>
+<dd>
+
+**request:** `TrueHarness.ModelProvider`
</dd>
</dl>
@@ -996,7 +1247,7 @@ await client.sessions.listTurnEvents("sessionId", "turnId");
<dl>
<dd>
-**requestOptions:** `SessionsClient.RequestOptions`
+**requestOptions:** `ModelProvidersClient.RequestOptions`
</dd>
</dl>
@@ -1008,8 +1259,7 @@ await client.sessions.listTurnEvents("sessionId", "turnId");
</dl>
</details>
-## Skills
-<details><summary><code>client.skills.<a href="/src/api/resources/skills/client/Client.ts">list</a>() -> TrueHarness.ListSkillsResponse</code></summary>
+<details><summary><code>client.settings.modelProviders.<a href="/src/api/resources/settings/resources/modelProviders/client/Client.ts">catalog</a>() -> TrueHarness.GetModelProviderCatalogResponse</code></summary>
<dl>
<dd>
@@ -1021,7 +1271,7 @@ await client.sessions.listTurnEvents("sessionId", "turnId");
<dl>
<dd>
-Agent skills declared in skills.yaml.
+Provider and model presets shipped with the server (model-catalog.yaml). Discovery-only: copy an entry into PUT /settings/model-providers to configure it. Custom providers are not listed here.
</dd>
</dl>
</dd>
@@ -1036,7 +1286,7 @@ Agent skills declared in skills.yaml.
<dd>
```typescript
-await client.skills.list();
+await client.settings.modelProviders.catalog();
```
</dd>
@@ -1052,7 +1302,7 @@ await client.skills.list();
<dl>
<dd>
-**requestOptions:** `SkillsClient.RequestOptions`
+**requestOptions:** `ModelProvidersClient.RequestOptions`
</dd>
</dl>
diff --git a/packages/sdk/src/Client.ts b/packages/sdk/src/Client.ts
index e543a13fd..98d7f4fcb 100644
--- a/packages/sdk/src/Client.ts
+++ b/packages/sdk/src/Client.ts
@@ -1,10 +1,10 @@
// This file was auto-generated by Fern from our API Definition.
-import { McpServersClient } from "./api/resources/mcpServers/client/Client.js";
+import { LegacyClient } from "./api/resources/legacy/client/Client.js";
import { ModelsClient } from "./api/resources/models/client/Client.js";
import { ServerClient } from "./api/resources/server/client/Client.js";
import { SessionsClient } from "./api/resources/sessions/client/Client.js";
-import { SkillsClient } from "./api/resources/skills/client/Client.js";
+import { SettingsClient } from "./api/resources/settings/client/Client.js";
import type { BaseClientOptions, BaseRequestOptions } from "./BaseClient.js";
import { type NormalizedClientOptions, normalizeClientOptions } from "./BaseClient.js";
import * as core from "./core/index.js";
@@ -18,10 +18,10 @@ export declare namespace TrueHarness {
export class TrueHarness {
protected readonly _options: NormalizedClientOptions<TrueHarness.Options>;
protected _server: ServerClient | undefined;
- protected _mcpServers: McpServersClient | undefined;
protected _models: ModelsClient | undefined;
protected _sessions: SessionsClient | undefined;
- protected _skills: SkillsClient | undefined;
+ protected _legacy: LegacyClient | undefined;
+ protected _settings: SettingsClient | undefined;
constructor(options: TrueHarness.Options) {
this._options = normalizeClientOptions(options);
@@ -31,10 +31,6 @@ export class TrueHarness {
return (this._server ??= new ServerClient(this._options));
}
- public get mcpServers(): McpServersClient {
- return (this._mcpServers ??= new McpServersClient(this._options));
- }
-
public get models(): ModelsClient {
return (this._models ??= new ModelsClient(this._options));
}
@@ -43,8 +39,12 @@ export class TrueHarness {
return (this._sessions ??= new SessionsClient(this._options));
}
- public get skills(): SkillsClient {
- return (this._skills ??= new SkillsClient(this._options));
+ public get legacy(): LegacyClient {
+ return (this._legacy ??= new LegacyClient(this._options));
+ }
+
+ public get settings(): SettingsClient {
+ return (this._settings ??= new SettingsClient(this._options));
}
/**
diff --git a/packages/sdk/src/api/resources/index.ts b/packages/sdk/src/api/resources/index.ts
index fc0b050b6..46dca3748 100644
--- a/packages/sdk/src/api/resources/index.ts
+++ b/packages/sdk/src/api/resources/index.ts
@@ -1,7 +1,6 @@
-export * from "./mcpServers/client/requests/index.js";
-export * as mcpServers from "./mcpServers/index.js";
+export * as legacy from "./legacy/index.js";
export * as models from "./models/index.js";
export * as server from "./server/index.js";
export * from "./sessions/client/requests/index.js";
export * as sessions from "./sessions/index.js";
-export * as skills from "./skills/index.js";
+export * as settings from "./settings/index.js";
diff --git a/packages/sdk/src/api/resources/legacy/client/Client.ts b/packages/sdk/src/api/resources/legacy/client/Client.ts
new file mode 100644
index 000000000..3cbdf18d2
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/client/Client.ts
@@ -0,0 +1,34 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type { BaseClientOptions } from "../../../../BaseClient.js";
+import { type NormalizedClientOptions, normalizeClientOptions } from "../../../../BaseClient.js";
+import { McpServersClient } from "../resources/mcpServers/client/Client.js";
+import { ModelsClient } from "../resources/models/client/Client.js";
+import { SkillsClient } from "../resources/skills/client/Client.js";
+
+export declare namespace LegacyClient {
+ export type Options = BaseClientOptions;
+}
+
+export class LegacyClient {
+ protected readonly _options: NormalizedClientOptions<LegacyClient.Options>;
+ protected _mcpServers: McpServersClient | undefined;
+ protected _models: ModelsClient | undefined;
+ protected _skills: SkillsClient | undefined;
+
+ constructor(options: LegacyClient.Options) {
+ this._options = normalizeClientOptions(options);
+ }
+
+ public get mcpServers(): McpServersClient {
+ return (this._mcpServers ??= new McpServersClient(this._options));
+ }
+
+ public get models(): ModelsClient {
+ return (this._models ??= new ModelsClient(this._options));
+ }
+
+ public get skills(): SkillsClient {
+ return (this._skills ??= new SkillsClient(this._options));
+ }
+}
diff --git a/packages/sdk/src/api/resources/skills/client/index.ts b/packages/sdk/src/api/resources/legacy/client/index.ts
similarity index 100%
rename from packages/sdk/src/api/resources/skills/client/index.ts
rename to packages/sdk/src/api/resources/legacy/client/index.ts
diff --git a/packages/sdk/src/api/resources/legacy/exports.ts b/packages/sdk/src/api/resources/legacy/exports.ts
new file mode 100644
index 000000000..196c9b7a1
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/exports.ts
@@ -0,0 +1,5 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export { LegacyClient } from "./client/Client.js";
+export * from "./client/index.js";
+export * from "./resources/index.js";
diff --git a/packages/sdk/src/api/resources/legacy/index.ts b/packages/sdk/src/api/resources/legacy/index.ts
new file mode 100644
index 000000000..9eb1192dc
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/index.ts
@@ -0,0 +1,2 @@
+export * from "./client/index.js";
+export * from "./resources/index.js";
diff --git a/packages/sdk/src/api/resources/legacy/resources/index.ts b/packages/sdk/src/api/resources/legacy/resources/index.ts
new file mode 100644
index 000000000..f08e4f023
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/resources/index.ts
@@ -0,0 +1,4 @@
+export * from "./mcpServers/client/requests/index.js";
+export * as mcpServers from "./mcpServers/index.js";
+export * as models from "./models/index.js";
+export * as skills from "./skills/index.js";
diff --git a/packages/sdk/src/api/resources/mcpServers/client/Client.ts b/packages/sdk/src/api/resources/legacy/resources/mcpServers/client/Client.ts
similarity index 90%
rename from packages/sdk/src/api/resources/mcpServers/client/Client.ts
rename to packages/sdk/src/api/resources/legacy/resources/mcpServers/client/Client.ts
index 66e9df918..a3a139f0d 100644
--- a/packages/sdk/src/api/resources/mcpServers/client/Client.ts
+++ b/packages/sdk/src/api/resources/legacy/resources/mcpServers/client/Client.ts
@@ -1,13 +1,13 @@
// This file was auto-generated by Fern from our API Definition.
-import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.js";
-import { type NormalizedClientOptions, normalizeClientOptions } 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 TrueHarness from "../../../index.js";
+import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";
+import { type NormalizedClientOptions, normalizeClientOptions } 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 TrueHarness from "../../../../../index.js";
export declare namespace McpServersClient {
export type Options = BaseClientOptions;
@@ -31,7 +31,7 @@ export class McpServersClient {
* @throws {@link errors.TrueHarnessTimeoutError}
*
* @example
- * await client.mcpServers.list()
+ * await client.legacy.mcpServers.list()
*/
public list(
requestOptions?: McpServersClient.RequestOptions,
@@ -47,7 +47,7 @@ export class McpServersClient {
url: core.url.join(
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)),
- "api/v1/mcp-servers",
+ "api/v1/legacy/mcp-servers",
),
method: "GET",
headers: _headers,
@@ -79,14 +79,14 @@ export class McpServersClient {
});
}
- return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/mcp-servers");
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/legacy/mcp-servers");
}
/**
* Registers a DCR client for this server if none exists yet, then returns an authorization URL to redirect the user to so they can complete the OAuth consent flow. Short-circuits to `{status: authenticated}` with no URL if the server is already connected.
*
* @param {string} name - MCP server name from mcp.yaml.
- * @param {TrueHarness.AuthorizeMcpServersRequest} request
+ * @param {TrueHarness.legacy.AuthorizeMcpServersRequest} request
* @param {McpServersClient.RequestOptions} requestOptions - Request-specific configuration.
*
* @throws {@link TrueHarness.NotFoundError}
@@ -94,13 +94,13 @@ export class McpServersClient {
* @throws {@link errors.TrueHarnessTimeoutError}
*
* @example
- * await client.mcpServers.authorize("name", {
+ * await client.legacy.mcpServers.authorize("name", {
* redirectUrl: "redirect_url"
* })
*/
public authorize(
name: string,
- request: TrueHarness.AuthorizeMcpServersRequest,
+ request: TrueHarness.legacy.AuthorizeMcpServersRequest,
requestOptions?: McpServersClient.RequestOptions,
): core.HttpResponsePromise<TrueHarness.McpAuthorizeResponse> {
return core.HttpResponsePromise.fromPromise(this.__authorize(name, request, requestOptions));
@@ -108,7 +108,7 @@ export class McpServersClient {
private async __authorize(
name: string,
- request: TrueHarness.AuthorizeMcpServersRequest,
+ request: TrueHarness.legacy.AuthorizeMcpServersRequest,
requestOptions?: McpServersClient.RequestOptions,
): Promise<core.WithRawResponse<TrueHarness.McpAuthorizeResponse>> {
const { redirectUrl } = request;
@@ -120,7 +120,7 @@ export class McpServersClient {
url: core.url.join(
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)),
- `api/v1/mcp-servers/${core.url.encodePathParam(name)}/authorize`,
+ `api/v1/legacy/mcp-servers/${core.url.encodePathParam(name)}/authorize`,
),
method: "GET",
headers: _headers,
@@ -174,7 +174,7 @@ export class McpServersClient {
_response.error,
_response.rawResponse,
"GET",
- "/api/v1/mcp-servers/{name}/authorize",
+ "/api/v1/legacy/mcp-servers/{name}/authorize",
);
}
@@ -191,7 +191,7 @@ export class McpServersClient {
* @throws {@link errors.TrueHarnessTimeoutError}
*
* @example
- * await client.mcpServers.listTools("name")
+ * await client.legacy.mcpServers.listTools("name")
*/
public listTools(
name: string,
@@ -209,7 +209,7 @@ export class McpServersClient {
url: core.url.join(
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)),
- `api/v1/mcp-servers/${core.url.encodePathParam(name)}/tools`,
+ `api/v1/legacy/mcp-servers/${core.url.encodePathParam(name)}/tools`,
),
method: "GET",
headers: _headers,
@@ -281,7 +281,7 @@ export class McpServersClient {
_response.error,
_response.rawResponse,
"GET",
- "/api/v1/mcp-servers/{name}/tools",
+ "/api/v1/legacy/mcp-servers/{name}/tools",
);
}
}
diff --git a/packages/sdk/src/api/resources/mcpServers/client/index.ts b/packages/sdk/src/api/resources/legacy/resources/mcpServers/client/index.ts
similarity index 100%
rename from packages/sdk/src/api/resources/mcpServers/client/index.ts
rename to packages/sdk/src/api/resources/legacy/resources/mcpServers/client/index.ts
diff --git a/packages/sdk/src/api/resources/mcpServers/client/requests/AuthorizeMcpServersRequest.ts b/packages/sdk/src/api/resources/legacy/resources/mcpServers/client/requests/AuthorizeMcpServersRequest.ts
similarity index 100%
rename from packages/sdk/src/api/resources/mcpServers/client/requests/AuthorizeMcpServersRequest.ts
rename to packages/sdk/src/api/resources/legacy/resources/mcpServers/client/requests/AuthorizeMcpServersRequest.ts
diff --git a/packages/sdk/src/api/resources/mcpServers/client/requests/index.ts b/packages/sdk/src/api/resources/legacy/resources/mcpServers/client/requests/index.ts
similarity index 100%
rename from packages/sdk/src/api/resources/mcpServers/client/requests/index.ts
rename to packages/sdk/src/api/resources/legacy/resources/mcpServers/client/requests/index.ts
diff --git a/packages/sdk/src/api/resources/mcpServers/exports.ts b/packages/sdk/src/api/resources/legacy/resources/mcpServers/exports.ts
similarity index 100%
rename from packages/sdk/src/api/resources/mcpServers/exports.ts
rename to packages/sdk/src/api/resources/legacy/resources/mcpServers/exports.ts
diff --git a/packages/sdk/src/api/resources/mcpServers/index.ts b/packages/sdk/src/api/resources/legacy/resources/mcpServers/index.ts
similarity index 100%
rename from packages/sdk/src/api/resources/mcpServers/index.ts
rename to packages/sdk/src/api/resources/legacy/resources/mcpServers/index.ts
diff --git a/packages/sdk/src/api/resources/legacy/resources/models/client/Client.ts b/packages/sdk/src/api/resources/legacy/resources/models/client/Client.ts
new file mode 100644
index 000000000..5cdaf07c3
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/resources/models/client/Client.ts
@@ -0,0 +1,84 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";
+import { type NormalizedClientOptions, normalizeClientOptions } 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 type * as TrueHarness from "../../../../../index.js";
+
+export declare namespace ModelsClient {
+ export type Options = BaseClientOptions;
+
+ export interface RequestOptions extends BaseRequestOptions {}
+}
+
+export class ModelsClient {
+ protected readonly _options: NormalizedClientOptions<ModelsClient.Options>;
+
+ constructor(options: ModelsClient.Options) {
+ this._options = normalizeClientOptions(options);
+ }
+
+ /**
+ * Models declared in models.yaml — the registry the runtime still uses for turns.
+ *
+ * @param {ModelsClient.RequestOptions} requestOptions - Request-specific configuration.
+ *
+ * @throws {@link errors.TrueHarnessError}
+ * @throws {@link errors.TrueHarnessTimeoutError}
+ *
+ * @example
+ * await client.legacy.models.list()
+ */
+ public list(
+ requestOptions?: ModelsClient.RequestOptions,
+ ): core.HttpResponsePromise<TrueHarness.ListLegacyModelsResponse> {
+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));
+ }
+
+ private async __list(
+ requestOptions?: ModelsClient.RequestOptions,
+ ): Promise<core.WithRawResponse<TrueHarness.ListLegacyModelsResponse>> {
+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(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/legacy/models",
+ ),
+ 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.ListLegacyModelsResponse.parseOrThrow(_response.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ rawResponse: _response.rawResponse,
+ };
+ }
+
+ if (_response.error.reason === "status-code") {
+ throw new errors.TrueHarnessError({
+ statusCode: _response.error.statusCode,
+ body: _response.error.body,
+ rawResponse: _response.rawResponse,
+ });
+ }
+
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/legacy/models");
+ }
+}
diff --git a/packages/sdk/src/api/resources/legacy/resources/models/client/index.ts b/packages/sdk/src/api/resources/legacy/resources/models/client/index.ts
new file mode 100644
index 000000000..cb0ff5c3b
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/resources/models/client/index.ts
@@ -0,0 +1 @@
+export {};
diff --git a/packages/sdk/src/api/resources/legacy/resources/models/exports.ts b/packages/sdk/src/api/resources/legacy/resources/models/exports.ts
new file mode 100644
index 000000000..32c5deac0
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/resources/models/exports.ts
@@ -0,0 +1,4 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export { ModelsClient } from "./client/Client.js";
+export * from "./client/index.js";
diff --git a/packages/sdk/src/api/resources/skills/index.ts b/packages/sdk/src/api/resources/legacy/resources/models/index.ts
similarity index 100%
rename from packages/sdk/src/api/resources/skills/index.ts
rename to packages/sdk/src/api/resources/legacy/resources/models/index.ts
diff --git a/packages/sdk/src/api/resources/skills/client/Client.ts b/packages/sdk/src/api/resources/legacy/resources/skills/client/Client.ts
similarity index 82%
rename from packages/sdk/src/api/resources/skills/client/Client.ts
rename to packages/sdk/src/api/resources/legacy/resources/skills/client/Client.ts
index edeeedb5c..0361c5a0d 100644
--- a/packages/sdk/src/api/resources/skills/client/Client.ts
+++ b/packages/sdk/src/api/resources/legacy/resources/skills/client/Client.ts
@@ -1,13 +1,13 @@
// This file was auto-generated by Fern from our API Definition.
-import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.js";
-import { type NormalizedClientOptions, normalizeClientOptions } 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 type * as TrueHarness from "../../../index.js";
+import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";
+import { type NormalizedClientOptions, normalizeClientOptions } 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 type * as TrueHarness from "../../../../../index.js";
export declare namespace SkillsClient {
export type Options = BaseClientOptions;
@@ -31,7 +31,7 @@ export class SkillsClient {
* @throws {@link errors.TrueHarnessTimeoutError}
*
* @example
- * await client.skills.list()
+ * await client.legacy.skills.list()
*/
public list(
requestOptions?: SkillsClient.RequestOptions,
@@ -47,7 +47,7 @@ export class SkillsClient {
url: core.url.join(
(await core.Supplier.get(this._options.baseUrl)) ??
(await core.Supplier.get(this._options.environment)),
- "api/v1/skills",
+ "api/v1/legacy/skills",
),
method: "GET",
headers: _headers,
@@ -79,6 +79,6 @@ export class SkillsClient {
});
}
- return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/skills");
+ return handleNonStatusCodeError(_response.error, _response.rawResponse, "GET", "/api/v1/legacy/skills");
}
}
diff --git a/packages/sdk/src/api/resources/legacy/resources/skills/client/index.ts b/packages/sdk/src/api/resources/legacy/resources/skills/client/index.ts
new file mode 100644
index 000000000..cb0ff5c3b
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/resources/skills/client/index.ts
@@ -0,0 +1 @@
+export {};
diff --git a/packages/sdk/src/api/resources/skills/exports.ts b/packages/sdk/src/api/resources/legacy/resources/skills/exports.ts
similarity index 100%
rename from packages/sdk/src/api/resources/skills/exports.ts
rename to packages/sdk/src/api/resources/legacy/resources/skills/exports.ts
diff --git a/packages/sdk/src/api/resources/legacy/resources/skills/index.ts b/packages/sdk/src/api/resources/legacy/resources/skills/index.ts
new file mode 100644
index 000000000..914b8c3c7
--- /dev/null
+++ b/packages/sdk/src/api/resources/legacy/resources/skills/index.ts
@@ -0,0 +1 @@
+export * from "./client/index.js";
diff --git a/packages/sdk/src/api/resources/models/client/Client.ts b/packages/sdk/src/api/resources/models/client/Client.ts
index ee592e914..36244284e 100644
--- a/packages/sdk/src/api/resources/models/client/Client.ts
+++ b/packages/sdk/src/api/resources/models/client/Client.ts
@@ -23,7 +23,7 @@ export class ModelsClient {
}
/**
- * Models declared in models.yaml, reachable through the OpenAI-compatible API at the file's base_url.
+ * Models across all configured model providers, addressed by fully qualified name `name/model_name`.
*
* @param {ModelsClient.RequestOptions} requestOptions - Request-specific configuration.
*
diff --git a/packages/sdk/src/api/resources/sessions/client/Client.ts b/packages/sdk/src/api/resources/sessions/client/Client.ts
index fae1c5f95..16d8d148c 100644
--- a/packages/sdk/src/api/resources/sessions/client/Client.ts
+++ b/packages/sdk/src/api/resources/sessions/client/Client.ts
@@ -148,7 +148,12 @@ export class SessionsClient {
* await client.sessions.create({
* agentSpec: {
* model: {
- * name: "name"
+ * modelId: "model_id",
+ * name: "name",
+ * properties: {
+ * contextLength: 1,
+ * maxOutputTokens: 1
+ * }
* }
* }
* })
diff --git a/packages/sdk/src/api/resources/sessions/client/requests/CreateSessionRequest.ts b/packages/sdk/src/api/resources/sessions/client/requests/CreateSessionRequest.ts
index 6fd0540df..fc2ce45e2 100644
--- a/packages/sdk/src/api/resources/sessions/client/requests/CreateSessionRequest.ts
+++ b/packages/sdk/src/api/resources/sessions/client/requests/CreateSessionRequest.ts
@@ -7,7 +7,12 @@ import type * as TrueHarness from "../../../../index.js";
* {
* agentSpec: {
* model: {
- * name: "name"
+ * modelId: "model_id",
+ * name: "name",
+ * properties: {
+ * contextLength: 1,
+ * maxOutputTokens: 1
+ * }
* }
* }
* }
diff --git a/packages/sdk/src/api/resources/settings/client/Client.ts b/packages/sdk/src/api/resources/settings/client/Client.ts
new file mode 100644
index 000000000..9ba055e96
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/client/Client.ts
@@ -0,0 +1,22 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type { BaseClientOptions } from "../../../../BaseClient.js";
+import { type NormalizedClientOptions, normalizeClientOptions } from "../../../../BaseClient.js";
+import { ModelProvidersClient } from "../resources/modelProviders/client/Client.js";
+
+export declare namespace SettingsClient {
+ export type Options = BaseClientOptions;
+}
+
+export class SettingsClient {
+ protected readonly _options: NormalizedClientOptions<SettingsClient.Options>;
+ protected _modelProviders: ModelProvidersClient | undefined;
+
+ constructor(options: SettingsClient.Options) {
+ this._options = normalizeClientOptions(options);
+ }
+
+ public get modelProviders(): ModelProvidersClient {
+ return (this._modelProviders ??= new ModelProvidersClient(this._options));
+ }
+}
diff --git a/packages/sdk/src/api/resources/settings/client/index.ts b/packages/sdk/src/api/resources/settings/client/index.ts
new file mode 100644
index 000000000..cb0ff5c3b
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/client/index.ts
@@ -0,0 +1 @@
+export {};
diff --git a/packages/sdk/src/api/resources/settings/exports.ts b/packages/sdk/src/api/resources/settings/exports.ts
new file mode 100644
index 000000000..9de5d6aea
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/exports.ts
@@ -0,0 +1,5 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export { SettingsClient } from "./client/Client.js";
+export * from "./client/index.js";
+export * from "./resources/index.js";
diff --git a/packages/sdk/src/api/resources/settings/index.ts b/packages/sdk/src/api/resources/settings/index.ts
new file mode 100644
index 000000000..9eb1192dc
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/index.ts
@@ -0,0 +1,2 @@
+export * from "./client/index.js";
+export * from "./resources/index.js";
diff --git a/packages/sdk/src/api/resources/settings/resources/index.ts b/packages/sdk/src/api/resources/settings/resources/index.ts
new file mode 100644
index 000000000..013d81239
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/resources/index.ts
@@ -0,0 +1 @@
+export * as modelProviders from "./modelProviders/index.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.ts
new file mode 100644
index 000000000..940805f99
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts
@@ -0,0 +1,264 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type { BaseClientOptions, BaseRequestOptions } from "../../../../../../BaseClient.js";
+import { type NormalizedClientOptions, normalizeClientOptions } from "../../../../../../BaseClient.js";
+import { mergeHeaders } from "../../../../../../core/headers.js";
+import * as core from "../../../../../../core/index.js";
+import { mergeAdditionalBodyParameters } from "../../../../../../core/requestBody.js";
+import { handleNonStatusCodeError } from "../../../../../../errors/handleNonStatusCodeError.js";
+import * as errors from "../../../../../../errors/index.js";
+import * as serializers from "../../../../../../serialization/index.js";
+import * as TrueHarness from "../../../../../index.js";
+
+export declare namespace ModelProvidersClient {
+ export type Options = BaseClientOptions;
+
+ export interface RequestOptions extends BaseRequestOptions {}
+}
+
+export class ModelProvidersClient {
+ protected readonly _options: NormalizedClientOptions<ModelProvidersClient.Options>;
+
+ constructor(options: ModelProvidersClient.Options) {
+ this._options = normalizeClientOptions(options);
+ }
+
+ /**
+ * All configured providers with their models.
+ *
+ * @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.
+ *
+ * @throws {@link errors.TrueHarnessError}
+ * @throws {@link errors.TrueHarnessTimeoutError}
+ *
+ * @example
+ * await client.settings.modelProviders.list()
+ */
+ public list(
+ requestOptions?: ModelProvidersClient.RequestOptions,
+ ): core.HttpResponsePromise<TrueHarness.ListModelProvidersResponse> {
+ return core.HttpResponsePromise.fromPromise(this.__list(requestOptions));
+ }
+
+ private async __list(
+ requestOptions?: ModelProvidersClient.RequestOptions,
+ ): Promise<core.WithRawResponse<TrueHarness.ListModelProvidersResponse>> {
+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(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",
+ ),
+ 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.ListModelProvidersResponse.parseOrThrow(_response.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ rawResponse: _response.rawResponse,
+ };
+ }
+
+ if (_response.error.reason === "status-code") {
+ throw new errors.TrueHarnessError({
+ statusCode: _response.error.statusCode,
+ body: _response.error.body,
+ rawResponse: _response.rawResponse,
+ });
+ }
+
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "GET",
+ "/api/v1/settings/model-providers",
+ );
+ }
+
+ /**
+ * Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).
+ *
+ * @param {TrueHarness.ModelProvider} request
+ * @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.
+ *
+ * @throws {@link TrueHarness.BadRequestError}
+ * @throws {@link errors.TrueHarnessError}
+ * @throws {@link errors.TrueHarnessTimeoutError}
+ *
+ * @example
+ * await client.settings.modelProviders.upsert({
+ * auth: {
+ * apiKey: "api_key"
+ * },
+ * baseUrl: "base_url",
+ * models: [{
+ * modelId: "model_id",
+ * name: "name",
+ * properties: {
+ * contextLength: 1,
+ * maxOutputTokens: 1
+ * }
+ * }],
+ * name: "name",
+ * type: "openai"
+ * })
+ */
+ public upsert(
+ request: TrueHarness.ModelProvider,
+ requestOptions?: ModelProvidersClient.RequestOptions,
+ ): core.HttpResponsePromise<TrueHarness.PutModelProviderResponse> {
+ return core.HttpResponsePromise.fromPromise(this.__upsert(request, requestOptions));
+ }
+
+ private async __upsert(
+ request: TrueHarness.ModelProvider,
+ requestOptions?: ModelProvidersClient.RequestOptions,
+ ): Promise<core.WithRawResponse<TrueHarness.PutModelProviderResponse>> {
+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(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",
+ ),
+ method: "PUT",
+ headers: _headers,
+ contentType: "application/json",
+ queryString: core.url.queryBuilder().mergeAdditional(requestOptions?.queryParams).build(),
+ requestType: "json",
+ body: mergeAdditionalBodyParameters(
+ serializers.ModelProvider.jsonOrThrow(request, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ omitUndefined: true,
+ }),
+ requestOptions?.additionalBodyParameters,
+ ),
+ 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.PutModelProviderResponse.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 400:
+ throw new TrueHarness.BadRequestError(
+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {
+ unrecognizedObjectKeys: "passthrough",
+ allowUnrecognizedUnionMembers: true,
+ allowUnrecognizedEnumValues: true,
+ skipValidation: true,
+ breadcrumbsPrefix: ["response"],
+ }),
+ _response.rawResponse,
+ );
+ default:
+ throw new errors.TrueHarnessError({
+ statusCode: _response.error.statusCode,
+ body: _response.error.body,
+ rawResponse: _response.rawResponse,
+ });
+ }
+ }
+
+ return handleNonStatusCodeError(
+ _response.error,
+ _response.rawResponse,
+ "PUT",
+ "/api/v1/settings/model-providers",
+ );
+ }
+
+ /**
+ * Provider and model presets shipped with the server (model-catalog.yaml). Discovery-only: copy an entry into PUT /settings/model-providers to configure it. Custom providers are not listed here.
+ *
+ * @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.
+ *
+ * @throws {@link errors.TrueHarnessError}
+ * @throws {@link errors.TrueHarnessTimeoutError}
+ *
+ * @example
+ * await client.settings.modelProviders.catalog()
+ */
+ public catalog(
+ requestOptions?: ModelProvidersClient.RequestOptions,
+ ): core.HttpResponsePromise<TrueHarness.GetModelProviderCatalogResponse> {
+ return core.HttpResponsePromise.fromPromise(this.__catalog(requestOptions));
+ }
+
+ private async __catalog(
+ requestOptions?: ModelProvidersClient.RequestOptions,
+ ): Promise<core.WithRawResponse<TrueHarness.GetModelProviderCatalogResponse>> {
+ const _headers: core.Fetcher.Args["headers"] = mergeHeaders(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") {
+ throw new errors.TrueHarnessError({
+ 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/modelProviders/client/index.ts b/packages/sdk/src/api/resources/settings/resources/modelProviders/client/index.ts
new file mode 100644
index 000000000..cb0ff5c3b
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/resources/modelProviders/client/index.ts
@@ -0,0 +1 @@
+export {};
diff --git a/packages/sdk/src/api/resources/settings/resources/modelProviders/exports.ts b/packages/sdk/src/api/resources/settings/resources/modelProviders/exports.ts
new file mode 100644
index 000000000..442243954
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/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/settings/resources/modelProviders/index.ts b/packages/sdk/src/api/resources/settings/resources/modelProviders/index.ts
new file mode 100644
index 000000000..914b8c3c7
--- /dev/null
+++ b/packages/sdk/src/api/resources/settings/resources/modelProviders/index.ts
@@ -0,0 +1 @@
+export * from "./client/index.js";
diff --git a/packages/sdk/src/api/types/AgentSpec.ts b/packages/sdk/src/api/types/AgentSpec.ts
index 65aab7004..fba49eead 100644
--- a/packages/sdk/src/api/types/AgentSpec.ts
+++ b/packages/sdk/src/api/types/AgentSpec.ts
@@ -10,7 +10,7 @@ export interface AgentSpec {
instructions?: string;
mcpServers?: TrueHarness.McpServer[];
messages?: TrueHarness.AgentSpecUserMessage[];
- model: TrueHarness.Model;
+ model: TrueHarness.AgentSpecModel;
responseFormat?: TrueHarness.ResponseFormat;
skills?: TrueHarness.SkillMount[];
variables?: Record<string, string>;
diff --git a/packages/sdk/src/api/types/AgentSpecModel.ts b/packages/sdk/src/api/types/AgentSpecModel.ts
new file mode 100644
index 000000000..629f0ec23
--- /dev/null
+++ b/packages/sdk/src/api/types/AgentSpecModel.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface AgentSpecModel extends TrueHarness.Model {
+ params?: TrueHarness.ModelParams;
+}
diff --git a/packages/sdk/src/api/types/AnthropicProviderModelEntry.ts b/packages/sdk/src/api/types/AnthropicProviderModelEntry.ts
deleted file mode 100644
index b5fb26519..000000000
--- a/packages/sdk/src/api/types/AnthropicProviderModelEntry.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-export interface AnthropicProviderModelEntry {
- apiKey?: string;
- baseUrl?: string;
- headers?: Record<string, string>;
- maxOutputTokens: number;
- modelId?: string;
- name: string;
- provider: "anthropic";
- reasoningEfforts?: string[];
-}
diff --git a/packages/sdk/src/api/types/CatalogProvider.ts b/packages/sdk/src/api/types/CatalogProvider.ts
new file mode 100644
index 000000000..fd8f3874b
--- /dev/null
+++ b/packages/sdk/src/api/types/CatalogProvider.ts
@@ -0,0 +1,9 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface CatalogProvider {
+ models: TrueHarness.ModelEntry[];
+ name: TrueHarness.ResourceName;
+ type: TrueHarness.CatalogProviderType;
+}
diff --git a/packages/sdk/src/api/types/CatalogProviderType.ts b/packages/sdk/src/api/types/CatalogProviderType.ts
new file mode 100644
index 000000000..e9356ce63
--- /dev/null
+++ b/packages/sdk/src/api/types/CatalogProviderType.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export const CatalogProviderType = {
+ Openai: "openai",
+ Anthropic: "anthropic",
+} as const;
+export type CatalogProviderType = (typeof CatalogProviderType)[keyof typeof CatalogProviderType];
diff --git a/packages/sdk/src/api/types/GenericProviderModelEntry.ts b/packages/sdk/src/api/types/GenericProviderModelEntry.ts
deleted file mode 100644
index b12af83ca..000000000
--- a/packages/sdk/src/api/types/GenericProviderModelEntry.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-export interface GenericProviderModelEntry {
- apiFormat?: "openai-chat-completions";
- apiKey?: string;
- baseUrl: string;
- headers?: Record<string, string>;
- maxOutputTokens: number;
- modelId?: string;
- name: string;
- provider: "generic";
- reasoningEfforts?: string[];
-}
diff --git a/packages/sdk/src/api/types/GetModelProviderCatalogResponse.ts b/packages/sdk/src/api/types/GetModelProviderCatalogResponse.ts
new file mode 100644
index 000000000..87f0648a6
--- /dev/null
+++ b/packages/sdk/src/api/types/GetModelProviderCatalogResponse.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface GetModelProviderCatalogResponse {
+ data: TrueHarness.CatalogProvider[];
+}
diff --git a/packages/sdk/src/api/types/GoogleGeminiProviderModelEntry.ts b/packages/sdk/src/api/types/GoogleGeminiProviderModelEntry.ts
deleted file mode 100644
index 6179f02ec..000000000
--- a/packages/sdk/src/api/types/GoogleGeminiProviderModelEntry.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-export interface GoogleGeminiProviderModelEntry {
- apiKey?: string;
- baseUrl?: string;
- headers?: Record<string, string>;
- maxOutputTokens: number;
- modelId?: string;
- name: string;
- provider: "google-gemini";
- reasoningEfforts?: string[];
-}
diff --git a/packages/sdk/src/api/types/ListLegacyModelsResponse.ts b/packages/sdk/src/api/types/ListLegacyModelsResponse.ts
new file mode 100644
index 000000000..0ae6451bf
--- /dev/null
+++ b/packages/sdk/src/api/types/ListLegacyModelsResponse.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface ListLegacyModelsResponse {
+ data: TrueHarness.ListLegacyModelsResponseDataItem[];
+}
diff --git a/packages/sdk/src/api/types/ListLegacyModelsResponseDataItem.ts b/packages/sdk/src/api/types/ListLegacyModelsResponseDataItem.ts
new file mode 100644
index 000000000..7fa2b4fed
--- /dev/null
+++ b/packages/sdk/src/api/types/ListLegacyModelsResponseDataItem.ts
@@ -0,0 +1,16 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface ListLegacyModelsResponseDataItem {
+ apiKey?: string;
+ baseUrl?: string;
+ headers?: Record<string, string>;
+ maxOutputTokens?: number;
+ modelId?: string;
+ name?: string;
+ provider?: "openai";
+ reasoningEfforts?: string[];
+ apiFormat?: "openai-chat-completions";
+ properties: TrueHarness.ModelProperties;
+}
diff --git a/packages/sdk/src/api/types/ListModelProvidersResponse.ts b/packages/sdk/src/api/types/ListModelProvidersResponse.ts
new file mode 100644
index 000000000..7dc86c517
--- /dev/null
+++ b/packages/sdk/src/api/types/ListModelProvidersResponse.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface ListModelProvidersResponse {
+ data: TrueHarness.ModelProvider[];
+}
diff --git a/packages/sdk/src/api/types/ListModelsResponse.ts b/packages/sdk/src/api/types/ListModelsResponse.ts
index 4c3f817b8..ffd2bfcc0 100644
--- a/packages/sdk/src/api/types/ListModelsResponse.ts
+++ b/packages/sdk/src/api/types/ListModelsResponse.ts
@@ -3,5 +3,5 @@
import type * as TrueHarness from "../index.js";
export interface ListModelsResponse {
- data: TrueHarness.ModelEntry[];
+ data: TrueHarness.Model[];
}
diff --git a/packages/sdk/src/api/types/Model.ts b/packages/sdk/src/api/types/Model.ts
index a4fac0dc9..6726e9045 100644
--- a/packages/sdk/src/api/types/Model.ts
+++ b/packages/sdk/src/api/types/Model.ts
@@ -3,6 +3,9 @@
import type * as TrueHarness from "../index.js";
export interface Model {
+ /** Upstream, provider-specific identifier sent to the provider API. */
+ modelId: string;
+ /** Fully qualified name `name/model_name`, e.g. "openai/gpt-5-6-sol". */
name: string;
- params?: TrueHarness.ModelParams;
+ properties: TrueHarness.ModelProperties;
}
diff --git a/packages/sdk/src/api/types/ModelEntry.ts b/packages/sdk/src/api/types/ModelEntry.ts
index 68aa6d4d3..25973bbfb 100644
--- a/packages/sdk/src/api/types/ModelEntry.ts
+++ b/packages/sdk/src/api/types/ModelEntry.ts
@@ -2,8 +2,10 @@
import type * as TrueHarness from "../index.js";
-export type ModelEntry =
- | TrueHarness.AnthropicProviderModelEntry
- | TrueHarness.GenericProviderModelEntry
- | TrueHarness.GoogleGeminiProviderModelEntry
- | TrueHarness.OpenAiProviderModelEntry;
+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;
+ properties: TrueHarness.ModelProperties;
+}
diff --git a/packages/sdk/src/api/types/ModelProperties.ts b/packages/sdk/src/api/types/ModelProperties.ts
new file mode 100644
index 000000000..e0c7ebbf2
--- /dev/null
+++ b/packages/sdk/src/api/types/ModelProperties.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export interface ModelProperties {
+ contextLength: number;
+ maxOutputTokens: number;
+ reasoningEfforts?: string[];
+}
diff --git a/packages/sdk/src/api/types/ModelProvider.ts b/packages/sdk/src/api/types/ModelProvider.ts
new file mode 100644
index 000000000..471bf12ae
--- /dev/null
+++ b/packages/sdk/src/api/types/ModelProvider.ts
@@ -0,0 +1,12 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface ModelProvider {
+ auth: TrueHarness.ModelProviderAuth;
+ /** Base URL of the provider's API. */
+ baseUrl: string;
+ models: TrueHarness.ModelEntry[];
+ name: TrueHarness.ResourceName;
+ type: TrueHarness.ProviderType;
+}
diff --git a/packages/sdk/src/api/types/ModelProviderAuth.ts b/packages/sdk/src/api/types/ModelProviderAuth.ts
new file mode 100644
index 000000000..0a7eaa224
--- /dev/null
+++ b/packages/sdk/src/api/types/ModelProviderAuth.ts
@@ -0,0 +1,5 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export interface ModelProviderAuth {
+ apiKey: string;
+}
diff --git a/packages/sdk/src/api/types/OpenAiProviderModelEntry.ts b/packages/sdk/src/api/types/OpenAiProviderModelEntry.ts
deleted file mode 100644
index 0292f66cc..000000000
--- a/packages/sdk/src/api/types/OpenAiProviderModelEntry.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-export interface OpenAiProviderModelEntry {
- apiKey?: string;
- baseUrl?: string;
- headers?: Record<string, string>;
- maxOutputTokens: number;
- modelId?: string;
- name: string;
- provider: "openai";
- reasoningEfforts?: string[];
-}
diff --git a/packages/sdk/src/api/types/ProviderType.ts b/packages/sdk/src/api/types/ProviderType.ts
new file mode 100644
index 000000000..2268e4b55
--- /dev/null
+++ b/packages/sdk/src/api/types/ProviderType.ts
@@ -0,0 +1,8 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export const ProviderType = {
+ Openai: "openai",
+ Anthropic: "anthropic",
+ Custom: "custom",
+} as const;
+export type ProviderType = (typeof ProviderType)[keyof typeof ProviderType];
diff --git a/packages/sdk/src/api/types/PutModelProviderResponse.ts b/packages/sdk/src/api/types/PutModelProviderResponse.ts
new file mode 100644
index 000000000..428434c27
--- /dev/null
+++ b/packages/sdk/src/api/types/PutModelProviderResponse.ts
@@ -0,0 +1,7 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../index.js";
+
+export interface PutModelProviderResponse {
+ data: TrueHarness.ModelProvider;
+}
diff --git a/packages/sdk/src/api/types/ResourceName.ts b/packages/sdk/src/api/types/ResourceName.ts
new file mode 100644
index 000000000..f135c1be3
--- /dev/null
+++ b/packages/sdk/src/api/types/ResourceName.ts
@@ -0,0 +1,3 @@
+// This file was auto-generated by Fern from our API Definition.
+
+export type ResourceName = string;
diff --git a/packages/sdk/src/api/types/index.ts b/packages/sdk/src/api/types/index.ts
index b2304233c..60d425c9d 100644
--- a/packages/sdk/src/api/types/index.ts
+++ b/packages/sdk/src/api/types/index.ts
@@ -2,8 +2,8 @@ export * from "./ActionRequiredEvent.js";
export * from "./AgentInfo.js";
export * from "./AgentParent.js";
export * from "./AgentSpec.js";
+export * from "./AgentSpecModel.js";
export * from "./AgentSpecUserMessage.js";
-export * from "./AnthropicProviderModelEntry.js";
export * from "./ApprovalAllow.js";
export * from "./ApprovalDecision.js";
export * from "./ApprovalDeny.js";
@@ -11,6 +11,8 @@ export * from "./AskUserQuestionsConfig.js";
export * from "./BaseMcpAuthRequiredEvent.js";
export * from "./BaseThreadDoneEvent.js";
export * from "./CancelSessionResponse.js";
+export * from "./CatalogProvider.js";
+export * from "./CatalogProviderType.js";
export * from "./ChatCompletionChunkDeltaToolCall.js";
export * from "./ChatCompletionChunkDeltaToolCallFunction.js";
export * from "./ChatCompletionContentPartRefusal.js";
@@ -24,16 +26,18 @@ export * from "./ExtendedChunkDeltaToolCall.js";
export * from "./FileContent.js";
export * from "./FinishReason.js";
export * from "./GenerativeUiConfig.js";
-export * from "./GenericProviderModelEntry.js";
export * from "./GetCapabilitiesResponse.js";
export * from "./GetCapabilitiesResponseData.js";
export * from "./GetCapabilitiesResponseDataSandbox.js";
+export * from "./GetModelProviderCatalogResponse.js";
export * from "./GetSessionResponse.js";
export * from "./GetTurnResponse.js";
-export * from "./GoogleGeminiProviderModelEntry.js";
export * from "./LargeToolResponseConfig.js";
+export * from "./ListLegacyModelsResponse.js";
+export * from "./ListLegacyModelsResponseDataItem.js";
export * from "./ListMcpServersResponse.js";
export * from "./ListMcpToolsResponse.js";
+export * from "./ListModelProvidersResponse.js";
export * from "./ListModelsResponse.js";
export * from "./ListSessionEventsResponse.js";
export * from "./ListSessionsOrder.js";
@@ -67,11 +71,16 @@ export * from "./ModelMessageEventContentOneItem.js";
export * from "./ModelMessageUsage.js";
export * from "./ModelMessageUsageInputTokensBreakdown.js";
export * from "./ModelParams.js";
-export * from "./OpenAiProviderModelEntry.js";
+export * from "./ModelProperties.js";
+export * from "./ModelProvider.js";
+export * from "./ModelProviderAuth.js";
export * from "./PreviousTurnIdInput.js";
+export * from "./ProviderType.js";
+export * from "./PutModelProviderResponse.js";
export * from "./RawToolCall.js";
export * from "./RequestErrorResponse.js";
export * from "./RequestErrorResponseError.js";
+export * from "./ResourceName.js";
export * from "./ResponseFormat.js";
export * from "./ResponseFormatJsonSchema.js";
export * from "./ResponseFormatJsonSchemaJsonSchema.js";
diff --git a/packages/sdk/src/serialization/types/AgentSpec.ts b/packages/sdk/src/serialization/types/AgentSpec.ts
index 5f14ff318..076572b5a 100644
--- a/packages/sdk/src/serialization/types/AgentSpec.ts
+++ b/packages/sdk/src/serialization/types/AgentSpec.ts
@@ -3,9 +3,9 @@
import type * as TrueHarness from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
+import { AgentSpecModel } from "./AgentSpecModel.js";
import { AgentSpecUserMessage } from "./AgentSpecUserMessage.js";
import { McpServer } from "./McpServer.js";
-import { Model } from "./Model.js";
import { ResponseFormat } from "./ResponseFormat.js";
import { RuntimeConfig } from "./RuntimeConfig.js";
import { SkillMount } from "./SkillMount.js";
@@ -16,7 +16,7 @@ export const AgentSpec: core.serialization.ObjectSchema<serializers.AgentSpec.Ra
instructions: core.serialization.string().optional(),
mcpServers: core.serialization.property("mcp_servers", core.serialization.list(McpServer).optional()),
messages: core.serialization.list(AgentSpecUserMessage).optional(),
- model: Model,
+ model: AgentSpecModel,
responseFormat: core.serialization.property("response_format", ResponseFormat.optional()),
skills: core.serialization.list(SkillMount).optional(),
variables: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
@@ -28,7 +28,7 @@ export declare namespace AgentSpec {
instructions?: string | null;
mcp_servers?: McpServer.Raw[] | null;
messages?: AgentSpecUserMessage.Raw[] | null;
- model: Model.Raw;
+ model: AgentSpecModel.Raw;
response_format?: ResponseFormat.Raw | null;
skills?: SkillMount.Raw[] | null;
variables?: Record<string, string> | null;
diff --git a/packages/sdk/src/serialization/types/AgentSpecModel.ts b/packages/sdk/src/serialization/types/AgentSpecModel.ts
new file mode 100644
index 000000000..03d80fb71
--- /dev/null
+++ b/packages/sdk/src/serialization/types/AgentSpecModel.ts
@@ -0,0 +1,22 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { Model } from "./Model.js";
+import { ModelParams } from "./ModelParams.js";
+
+export const AgentSpecModel: core.serialization.ObjectSchema<
+ serializers.AgentSpecModel.Raw,
+ TrueHarness.AgentSpecModel
+> = core.serialization
+ .object({
+ params: ModelParams.optional(),
+ })
+ .extend(Model);
+
+export declare namespace AgentSpecModel {
+ export interface Raw extends Model.Raw {
+ params?: ModelParams.Raw | null;
+ }
+}
diff --git a/packages/sdk/src/serialization/types/AnthropicProviderModelEntry.ts b/packages/sdk/src/serialization/types/AnthropicProviderModelEntry.ts
deleted file mode 100644
index 1cff9cf18..000000000
--- a/packages/sdk/src/serialization/types/AnthropicProviderModelEntry.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-import type * as TrueHarness from "../../api/index.js";
-import * as core from "../../core/index.js";
-import type * as serializers from "../index.js";
-
-export const AnthropicProviderModelEntry: core.serialization.ObjectSchema<
- serializers.AnthropicProviderModelEntry.Raw,
- TrueHarness.AnthropicProviderModelEntry
-> = core.serialization.object({
- apiKey: core.serialization.property("api_key", core.serialization.string().optional()),
- baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),
- headers: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
- maxOutputTokens: core.serialization.property("max_output_tokens", core.serialization.number()),
- modelId: core.serialization.property("model_id", core.serialization.string().optional()),
- name: core.serialization.string(),
- provider: core.serialization.stringLiteral("anthropic"),
- reasoningEfforts: core.serialization.property(
- "reasoning_efforts",
- core.serialization.list(core.serialization.string()).optional(),
- ),
-});
-
-export declare namespace AnthropicProviderModelEntry {
- export interface Raw {
- api_key?: string | null;
- base_url?: string | null;
- headers?: Record<string, string> | null;
- max_output_tokens: number;
- model_id?: string | null;
- name: string;
- provider: "anthropic";
- reasoning_efforts?: string[] | null;
- }
-}
diff --git a/packages/sdk/src/serialization/types/CatalogProvider.ts b/packages/sdk/src/serialization/types/CatalogProvider.ts
new file mode 100644
index 000000000..e2150a02d
--- /dev/null
+++ b/packages/sdk/src/serialization/types/CatalogProvider.ts
@@ -0,0 +1,25 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { CatalogProviderType } from "./CatalogProviderType.js";
+import { ModelEntry } from "./ModelEntry.js";
+import { ResourceName } from "./ResourceName.js";
+
+export const CatalogProvider: core.serialization.ObjectSchema<
+ serializers.CatalogProvider.Raw,
+ TrueHarness.CatalogProvider
+> = core.serialization.object({
+ models: core.serialization.list(ModelEntry),
+ name: ResourceName,
+ type: CatalogProviderType,
+});
+
+export declare namespace CatalogProvider {
+ export interface Raw {
+ models: ModelEntry.Raw[];
+ name: ResourceName.Raw;
+ type: CatalogProviderType.Raw;
+ }
+}
diff --git a/packages/sdk/src/serialization/types/CatalogProviderType.ts b/packages/sdk/src/serialization/types/CatalogProviderType.ts
new file mode 100644
index 000000000..8f58147d5
--- /dev/null
+++ b/packages/sdk/src/serialization/types/CatalogProviderType.ts
@@ -0,0 +1,14 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+
+export const CatalogProviderType: core.serialization.Schema<
+ serializers.CatalogProviderType.Raw,
+ TrueHarness.CatalogProviderType
+> = core.serialization.enum_(["openai", "anthropic"]);
+
+export declare namespace CatalogProviderType {
+ export type Raw = "openai" | "anthropic";
+}
diff --git a/packages/sdk/src/serialization/types/GetModelProviderCatalogResponse.ts b/packages/sdk/src/serialization/types/GetModelProviderCatalogResponse.ts
new file mode 100644
index 000000000..6582d6ecb
--- /dev/null
+++ b/packages/sdk/src/serialization/types/GetModelProviderCatalogResponse.ts
@@ -0,0 +1,19 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { CatalogProvider } from "./CatalogProvider.js";
+
+export const GetModelProviderCatalogResponse: core.serialization.ObjectSchema<
+ serializers.GetModelProviderCatalogResponse.Raw,
+ TrueHarness.GetModelProviderCatalogResponse
+> = core.serialization.object({
+ data: core.serialization.list(CatalogProvider),
+});
+
+export declare namespace GetModelProviderCatalogResponse {
+ export interface Raw {
+ data: CatalogProvider.Raw[];
+ }
+}
diff --git a/packages/sdk/src/serialization/types/GoogleGeminiProviderModelEntry.ts b/packages/sdk/src/serialization/types/GoogleGeminiProviderModelEntry.ts
deleted file mode 100644
index 619b9f41b..000000000
--- a/packages/sdk/src/serialization/types/GoogleGeminiProviderModelEntry.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-import type * as TrueHarness from "../../api/index.js";
-import * as core from "../../core/index.js";
-import type * as serializers from "../index.js";
-
-export const GoogleGeminiProviderModelEntry: core.serialization.ObjectSchema<
- serializers.GoogleGeminiProviderModelEntry.Raw,
- TrueHarness.GoogleGeminiProviderModelEntry
-> = core.serialization.object({
- apiKey: core.serialization.property("api_key", core.serialization.string().optional()),
- baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),
- headers: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
- maxOutputTokens: core.serialization.property("max_output_tokens", core.serialization.number()),
- modelId: core.serialization.property("model_id", core.serialization.string().optional()),
- name: core.serialization.string(),
- provider: core.serialization.stringLiteral("google-gemini"),
- reasoningEfforts: core.serialization.property(
- "reasoning_efforts",
- core.serialization.list(core.serialization.string()).optional(),
- ),
-});
-
-export declare namespace GoogleGeminiProviderModelEntry {
- export interface Raw {
- api_key?: string | null;
- base_url?: string | null;
- headers?: Record<string, string> | null;
- max_output_tokens: number;
- model_id?: string | null;
- name: string;
- provider: "google-gemini";
- reasoning_efforts?: string[] | null;
- }
-}
diff --git a/packages/sdk/src/serialization/types/ListLegacyModelsResponse.ts b/packages/sdk/src/serialization/types/ListLegacyModelsResponse.ts
new file mode 100644
index 000000000..2981be32b
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ListLegacyModelsResponse.ts
@@ -0,0 +1,19 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { ListLegacyModelsResponseDataItem } from "./ListLegacyModelsResponseDataItem.js";
+
+export const ListLegacyModelsResponse: core.serialization.ObjectSchema<
+ serializers.ListLegacyModelsResponse.Raw,
+ TrueHarness.ListLegacyModelsResponse
+> = core.serialization.object({
+ data: core.serialization.list(ListLegacyModelsResponseDataItem),
+});
+
+export declare namespace ListLegacyModelsResponse {
+ export interface Raw {
+ data: ListLegacyModelsResponseDataItem.Raw[];
+ }
+}
diff --git a/packages/sdk/src/serialization/types/GenericProviderModelEntry.ts b/packages/sdk/src/serialization/types/ListLegacyModelsResponseDataItem.ts
similarity index 63%
rename from packages/sdk/src/serialization/types/GenericProviderModelEntry.ts
rename to packages/sdk/src/serialization/types/ListLegacyModelsResponseDataItem.ts
index 13148cc50..5347f8a4a 100644
--- a/packages/sdk/src/serialization/types/GenericProviderModelEntry.ts
+++ b/packages/sdk/src/serialization/types/ListLegacyModelsResponseDataItem.ts
@@ -3,38 +3,41 @@
import type * as TrueHarness from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
+import { ModelProperties } from "./ModelProperties.js";
-export const GenericProviderModelEntry: core.serialization.ObjectSchema<
- serializers.GenericProviderModelEntry.Raw,
- TrueHarness.GenericProviderModelEntry
+export const ListLegacyModelsResponseDataItem: core.serialization.ObjectSchema<
+ serializers.ListLegacyModelsResponseDataItem.Raw,
+ TrueHarness.ListLegacyModelsResponseDataItem
> = core.serialization.object({
- apiFormat: core.serialization.property(
- "api_format",
- core.serialization.stringLiteral("openai-chat-completions").optional(),
- ),
apiKey: core.serialization.property("api_key", core.serialization.string().optional()),
- baseUrl: core.serialization.property("base_url", core.serialization.string()),
+ baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),
headers: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
- maxOutputTokens: core.serialization.property("max_output_tokens", core.serialization.number()),
+ maxOutputTokens: core.serialization.property("max_output_tokens", core.serialization.number().optional()),
modelId: core.serialization.property("model_id", core.serialization.string().optional()),
- name: core.serialization.string(),
- provider: core.serialization.stringLiteral("generic"),
+ name: core.serialization.string().optional(),
+ provider: core.serialization.stringLiteral("openai").optional(),
reasoningEfforts: core.serialization.property(
"reasoning_efforts",
core.serialization.list(core.serialization.string()).optional(),
),
+ apiFormat: core.serialization.property(
+ "api_format",
+ core.serialization.stringLiteral("openai-chat-completions").optional(),
+ ),
+ properties: ModelProperties,
});
-export declare namespace GenericProviderModelEntry {
+export declare namespace ListLegacyModelsResponseDataItem {
export interface Raw {
- api_format?: "openai-chat-completions" | null;
api_key?: string | null;
- base_url: string;
+ base_url?: string | null;
headers?: Record<string, string> | null;
- max_output_tokens: number;
+ max_output_tokens?: number | null;
model_id?: string | null;
- name: string;
- provider: "generic";
+ name?: string | null;
+ provider?: "openai" | null;
reasoning_efforts?: string[] | null;
+ api_format?: "openai-chat-completions" | null;
+ properties: ModelProperties.Raw;
}
}
diff --git a/packages/sdk/src/serialization/types/ListModelProvidersResponse.ts b/packages/sdk/src/serialization/types/ListModelProvidersResponse.ts
new file mode 100644
index 000000000..6886a2ebd
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ListModelProvidersResponse.ts
@@ -0,0 +1,19 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { ModelProvider } from "./ModelProvider.js";
+
+export const ListModelProvidersResponse: core.serialization.ObjectSchema<
+ serializers.ListModelProvidersResponse.Raw,
+ TrueHarness.ListModelProvidersResponse
+> = core.serialization.object({
+ data: core.serialization.list(ModelProvider),
+});
+
+export declare namespace ListModelProvidersResponse {
+ export interface Raw {
+ data: ModelProvider.Raw[];
+ }
+}
diff --git a/packages/sdk/src/serialization/types/ListModelsResponse.ts b/packages/sdk/src/serialization/types/ListModelsResponse.ts
index 6c9348a74..94ad0c928 100644
--- a/packages/sdk/src/serialization/types/ListModelsResponse.ts
+++ b/packages/sdk/src/serialization/types/ListModelsResponse.ts
@@ -3,17 +3,17 @@
import type * as TrueHarness from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
-import { ModelEntry } from "./ModelEntry.js";
+import { Model } from "./Model.js";
export const ListModelsResponse: core.serialization.ObjectSchema<
serializers.ListModelsResponse.Raw,
TrueHarness.ListModelsResponse
> = core.serialization.object({
- data: core.serialization.list(ModelEntry),
+ data: core.serialization.list(Model),
});
export declare namespace ListModelsResponse {
export interface Raw {
- data: ModelEntry.Raw[];
+ data: Model.Raw[];
}
}
diff --git a/packages/sdk/src/serialization/types/Model.ts b/packages/sdk/src/serialization/types/Model.ts
index b39df0f83..ec3bc9df8 100644
--- a/packages/sdk/src/serialization/types/Model.ts
+++ b/packages/sdk/src/serialization/types/Model.ts
@@ -3,17 +3,19 @@
import type * as TrueHarness from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
-import { ModelParams } from "./ModelParams.js";
+import { ModelProperties } from "./ModelProperties.js";
export const Model: core.serialization.ObjectSchema<serializers.Model.Raw, TrueHarness.Model> =
core.serialization.object({
+ modelId: core.serialization.property("model_id", core.serialization.string()),
name: core.serialization.string(),
- params: ModelParams.optional(),
+ properties: ModelProperties,
});
export declare namespace Model {
export interface Raw {
+ model_id: string;
name: string;
- params?: ModelParams.Raw | null;
+ properties: ModelProperties.Raw;
}
}
diff --git a/packages/sdk/src/serialization/types/ModelEntry.ts b/packages/sdk/src/serialization/types/ModelEntry.ts
index 8b188db33..c93039183 100644
--- a/packages/sdk/src/serialization/types/ModelEntry.ts
+++ b/packages/sdk/src/serialization/types/ModelEntry.ts
@@ -3,23 +3,19 @@
import type * as TrueHarness from "../../api/index.js";
import * as core from "../../core/index.js";
import type * as serializers from "../index.js";
-import { AnthropicProviderModelEntry } from "./AnthropicProviderModelEntry.js";
-import { GenericProviderModelEntry } from "./GenericProviderModelEntry.js";
-import { GoogleGeminiProviderModelEntry } from "./GoogleGeminiProviderModelEntry.js";
-import { OpenAiProviderModelEntry } from "./OpenAiProviderModelEntry.js";
+import { ModelProperties } from "./ModelProperties.js";
-export const ModelEntry: core.serialization.Schema<serializers.ModelEntry.Raw, TrueHarness.ModelEntry> =
- core.serialization.undiscriminatedUnion([
- AnthropicProviderModelEntry,
- GenericProviderModelEntry,
- GoogleGeminiProviderModelEntry,
- OpenAiProviderModelEntry,
- ]);
+export const ModelEntry: core.serialization.ObjectSchema<serializers.ModelEntry.Raw, TrueHarness.ModelEntry> =
+ core.serialization.object({
+ modelId: core.serialization.property("model_id", core.serialization.string()),
+ name: core.serialization.string(),
+ properties: ModelProperties,
+ });
export declare namespace ModelEntry {
- export type Raw =
- | AnthropicProviderModelEntry.Raw
- | GenericProviderModelEntry.Raw
- | GoogleGeminiProviderModelEntry.Raw
- | OpenAiProviderModelEntry.Raw;
+ export interface Raw {
+ model_id: string;
+ name: string;
+ properties: ModelProperties.Raw;
+ }
}
diff --git a/packages/sdk/src/serialization/types/ModelProperties.ts b/packages/sdk/src/serialization/types/ModelProperties.ts
new file mode 100644
index 000000000..1e9e3232d
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ModelProperties.ts
@@ -0,0 +1,25 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+
+export const ModelProperties: core.serialization.ObjectSchema<
+ serializers.ModelProperties.Raw,
+ TrueHarness.ModelProperties
+> = core.serialization.object({
+ contextLength: core.serialization.property("context_length", core.serialization.number()),
+ maxOutputTokens: core.serialization.property("max_output_tokens", core.serialization.number()),
+ reasoningEfforts: core.serialization.property(
+ "reasoning_efforts",
+ core.serialization.list(core.serialization.string()).optional(),
+ ),
+});
+
+export declare namespace ModelProperties {
+ export interface Raw {
+ context_length: number;
+ max_output_tokens: number;
+ reasoning_efforts?: string[] | null;
+ }
+}
diff --git a/packages/sdk/src/serialization/types/ModelProvider.ts b/packages/sdk/src/serialization/types/ModelProvider.ts
new file mode 100644
index 000000000..47dd07119
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ModelProvider.ts
@@ -0,0 +1,28 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { ModelEntry } from "./ModelEntry.js";
+import { ModelProviderAuth } from "./ModelProviderAuth.js";
+import { ProviderType } from "./ProviderType.js";
+import { ResourceName } from "./ResourceName.js";
+
+export const ModelProvider: core.serialization.ObjectSchema<serializers.ModelProvider.Raw, TrueHarness.ModelProvider> =
+ core.serialization.object({
+ auth: ModelProviderAuth,
+ baseUrl: core.serialization.property("base_url", core.serialization.string()),
+ models: core.serialization.list(ModelEntry),
+ name: ResourceName,
+ type: ProviderType,
+ });
+
+export declare namespace ModelProvider {
+ export interface Raw {
+ auth: ModelProviderAuth.Raw;
+ base_url: string;
+ models: ModelEntry.Raw[];
+ name: ResourceName.Raw;
+ type: ProviderType.Raw;
+ }
+}
diff --git a/packages/sdk/src/serialization/types/ModelProviderAuth.ts b/packages/sdk/src/serialization/types/ModelProviderAuth.ts
new file mode 100644
index 000000000..ee5b15969
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ModelProviderAuth.ts
@@ -0,0 +1,18 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+
+export const ModelProviderAuth: core.serialization.ObjectSchema<
+ serializers.ModelProviderAuth.Raw,
+ TrueHarness.ModelProviderAuth
+> = core.serialization.object({
+ apiKey: core.serialization.property("api_key", core.serialization.string()),
+});
+
+export declare namespace ModelProviderAuth {
+ export interface Raw {
+ api_key: string;
+ }
+}
diff --git a/packages/sdk/src/serialization/types/OpenAiProviderModelEntry.ts b/packages/sdk/src/serialization/types/OpenAiProviderModelEntry.ts
deleted file mode 100644
index 04cbc5288..000000000
--- a/packages/sdk/src/serialization/types/OpenAiProviderModelEntry.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-// This file was auto-generated by Fern from our API Definition.
-
-import type * as TrueHarness from "../../api/index.js";
-import * as core from "../../core/index.js";
-import type * as serializers from "../index.js";
-
-export const OpenAiProviderModelEntry: core.serialization.ObjectSchema<
- serializers.OpenAiProviderModelEntry.Raw,
- TrueHarness.OpenAiProviderModelEntry
-> = core.serialization.object({
- apiKey: core.serialization.property("api_key", core.serialization.string().optional()),
- baseUrl: core.serialization.property("base_url", core.serialization.string().optional()),
- headers: core.serialization.record(core.serialization.string(), core.serialization.string()).optional(),
- maxOutputTokens: core.serialization.property("max_output_tokens", core.serialization.number()),
- modelId: core.serialization.property("model_id", core.serialization.string().optional()),
- name: core.serialization.string(),
- provider: core.serialization.stringLiteral("openai"),
- reasoningEfforts: core.serialization.property(
- "reasoning_efforts",
- core.serialization.list(core.serialization.string()).optional(),
- ),
-});
-
-export declare namespace OpenAiProviderModelEntry {
- export interface Raw {
- api_key?: string | null;
- base_url?: string | null;
- headers?: Record<string, string> | null;
- max_output_tokens: number;
- model_id?: string | null;
- name: string;
- provider: "openai";
- reasoning_efforts?: string[] | null;
- }
-}
diff --git a/packages/sdk/src/serialization/types/ProviderType.ts b/packages/sdk/src/serialization/types/ProviderType.ts
new file mode 100644
index 000000000..5807e789b
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ProviderType.ts
@@ -0,0 +1,12 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+
+export const ProviderType: core.serialization.Schema<serializers.ProviderType.Raw, TrueHarness.ProviderType> =
+ core.serialization.enum_(["openai", "anthropic", "custom"]);
+
+export declare namespace ProviderType {
+ export type Raw = "openai" | "anthropic" | "custom";
+}
diff --git a/packages/sdk/src/serialization/types/PutModelProviderResponse.ts b/packages/sdk/src/serialization/types/PutModelProviderResponse.ts
new file mode 100644
index 000000000..4cade2950
--- /dev/null
+++ b/packages/sdk/src/serialization/types/PutModelProviderResponse.ts
@@ -0,0 +1,19 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+import { ModelProvider } from "./ModelProvider.js";
+
+export const PutModelProviderResponse: core.serialization.ObjectSchema<
+ serializers.PutModelProviderResponse.Raw,
+ TrueHarness.PutModelProviderResponse
+> = core.serialization.object({
+ data: ModelProvider,
+});
+
+export declare namespace PutModelProviderResponse {
+ export interface Raw {
+ data: ModelProvider.Raw;
+ }
+}
diff --git a/packages/sdk/src/serialization/types/ResourceName.ts b/packages/sdk/src/serialization/types/ResourceName.ts
new file mode 100644
index 000000000..0b08f59cd
--- /dev/null
+++ b/packages/sdk/src/serialization/types/ResourceName.ts
@@ -0,0 +1,12 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import type * as TrueHarness from "../../api/index.js";
+import * as core from "../../core/index.js";
+import type * as serializers from "../index.js";
+
+export const ResourceName: core.serialization.Schema<serializers.ResourceName.Raw, TrueHarness.ResourceName> =
+ core.serialization.string();
+
+export declare namespace ResourceName {
+ export type Raw = string;
+}
diff --git a/packages/sdk/src/serialization/types/index.ts b/packages/sdk/src/serialization/types/index.ts
index b2304233c..60d425c9d 100644
--- a/packages/sdk/src/serialization/types/index.ts
+++ b/packages/sdk/src/serialization/types/index.ts
@@ -2,8 +2,8 @@ export * from "./ActionRequiredEvent.js";
export * from "./AgentInfo.js";
export * from "./AgentParent.js";
export * from "./AgentSpec.js";
+export * from "./AgentSpecModel.js";
export * from "./AgentSpecUserMessage.js";
-export * from "./AnthropicProviderModelEntry.js";
export * from "./ApprovalAllow.js";
export * from "./ApprovalDecision.js";
export * from "./ApprovalDeny.js";
@@ -11,6 +11,8 @@ export * from "./AskUserQuestionsConfig.js";
export * from "./BaseMcpAuthRequiredEvent.js";
export * from "./BaseThreadDoneEvent.js";
export * from "./CancelSessionResponse.js";
+export * from "./CatalogProvider.js";
+export * from "./CatalogProviderType.js";
export * from "./ChatCompletionChunkDeltaToolCall.js";
export * from "./ChatCompletionChunkDeltaToolCallFunction.js";
export * from "./ChatCompletionContentPartRefusal.js";
@@ -24,16 +26,18 @@ export * from "./ExtendedChunkDeltaToolCall.js";
export * from "./FileContent.js";
export * from "./FinishReason.js";
export * from "./GenerativeUiConfig.js";
-export * from "./GenericProviderModelEntry.js";
export * from "./GetCapabilitiesResponse.js";
export * from "./GetCapabilitiesResponseData.js";
export * from "./GetCapabilitiesResponseDataSandbox.js";
+export * from "./GetModelProviderCatalogResponse.js";
export * from "./GetSessionResponse.js";
export * from "./GetTurnResponse.js";
-export * from "./GoogleGeminiProviderModelEntry.js";
export * from "./LargeToolResponseConfig.js";
+export * from "./ListLegacyModelsResponse.js";
+export * from "./ListLegacyModelsResponseDataItem.js";
export * from "./ListMcpServersResponse.js";
export * from "./ListMcpToolsResponse.js";
+export * from "./ListModelProvidersResponse.js";
export * from "./ListModelsResponse.js";
export * from "./ListSessionEventsResponse.js";
export * from "./ListSessionsOrder.js";
@@ -67,11 +71,16 @@ export * from "./ModelMessageEventContentOneItem.js";
export * from "./ModelMessageUsage.js";
export * from "./ModelMessageUsageInputTokensBreakdown.js";
export * from "./ModelParams.js";
-export * from "./OpenAiProviderModelEntry.js";
+export * from "./ModelProperties.js";
+export * from "./ModelProvider.js";
+export * from "./ModelProviderAuth.js";
export * from "./PreviousTurnIdInput.js";
+export * from "./ProviderType.js";
+export * from "./PutModelProviderResponse.js";
export * from "./RawToolCall.js";
export * from "./RequestErrorResponse.js";
export * from "./RequestErrorResponseError.js";
+export * from "./ResourceName.js";
export * from "./ResponseFormat.js";
export * from "./ResponseFormatJsonSchema.js";
export * from "./ResponseFormatJsonSchemaJsonSchema.js";
diff --git a/packages/sdk/tests/wire/mcpServers.test.ts b/packages/sdk/tests/wire/legacy/mcpServers.test.ts
similarity index 79%
rename from packages/sdk/tests/wire/mcpServers.test.ts
rename to packages/sdk/tests/wire/legacy/mcpServers.test.ts
index 0c86e32b1..997f01505 100644
--- a/packages/sdk/tests/wire/mcpServers.test.ts
+++ b/packages/sdk/tests/wire/legacy/mcpServers.test.ts
@@ -1,8 +1,8 @@
// This file was auto-generated by Fern from our API Definition.
-import * as TrueHarnessTypes from "../../src/api/index";
-import { TrueHarness } from "../../src/Client";
-import { mockServerPool } from "../mock-server/MockServerPool";
+import * as TrueHarnessTypes from "../../../src/api/index";
+import { TrueHarness } from "../../../src/Client";
+import { mockServerPool } from "../../mock-server/MockServerPool";
describe("McpServersClient", () => {
test("list", async () => {
@@ -15,13 +15,13 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers")
+ .get("/api/v1/legacy/mcp-servers")
.respondWith()
.statusCode(200)
.jsonBody(rawResponseBody)
.build();
- const response = await client.mcpServers.list();
+ const response = await client.legacy.mcpServers.list();
expect(response).toEqual({
data: [
{
@@ -44,13 +44,13 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers/name/authorize")
+ .get("/api/v1/legacy/mcp-servers/name/authorize")
.respondWith()
.statusCode(200)
.jsonBody(rawResponseBody)
.build();
- const response = await client.mcpServers.authorize("name", {
+ const response = await client.legacy.mcpServers.authorize("name", {
redirectUrl: "redirect_url",
});
expect(response).toEqual({
@@ -67,14 +67,14 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers/name/authorize")
+ .get("/api/v1/legacy/mcp-servers/name/authorize")
.respondWith()
.statusCode(404)
.jsonBody(rawResponseBody)
.build();
await expect(async () => {
- return await client.mcpServers.authorize("name", {
+ return await client.legacy.mcpServers.authorize("name", {
redirectUrl: "redirect_url",
});
}).rejects.toThrow(TrueHarnessTypes.NotFoundError);
@@ -88,13 +88,13 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers/name/tools")
+ .get("/api/v1/legacy/mcp-servers/name/tools")
.respondWith()
.statusCode(200)
.jsonBody(rawResponseBody)
.build();
- const response = await client.mcpServers.listTools("name");
+ const response = await client.legacy.mcpServers.listTools("name");
expect(response).toEqual({
data: [
{
@@ -112,14 +112,14 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers/name/tools")
+ .get("/api/v1/legacy/mcp-servers/name/tools")
.respondWith()
.statusCode(401)
.jsonBody(rawResponseBody)
.build();
await expect(async () => {
- return await client.mcpServers.listTools("name");
+ return await client.legacy.mcpServers.listTools("name");
}).rejects.toThrow(TrueHarnessTypes.UnauthorizedError);
});
@@ -131,14 +131,14 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers/name/tools")
+ .get("/api/v1/legacy/mcp-servers/name/tools")
.respondWith()
.statusCode(404)
.jsonBody(rawResponseBody)
.build();
await expect(async () => {
- return await client.mcpServers.listTools("name");
+ return await client.legacy.mcpServers.listTools("name");
}).rejects.toThrow(TrueHarnessTypes.NotFoundError);
});
@@ -150,14 +150,14 @@ describe("McpServersClient", () => {
server
.mockEndpoint()
- .get("/api/v1/mcp-servers/name/tools")
+ .get("/api/v1/legacy/mcp-servers/name/tools")
.respondWith()
.statusCode(502)
.jsonBody(rawResponseBody)
.build();
await expect(async () => {
- return await client.mcpServers.listTools("name");
+ return await client.legacy.mcpServers.listTools("name");
}).rejects.toThrow(TrueHarnessTypes.BadGatewayError);
});
});
diff --git a/packages/sdk/tests/wire/legacy/models.test.ts b/packages/sdk/tests/wire/legacy/models.test.ts
new file mode 100644
index 000000000..e4ecbb10e
--- /dev/null
+++ b/packages/sdk/tests/wire/legacy/models.test.ts
@@ -0,0 +1,59 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import { TrueHarness } from "../../../src/Client";
+import { mockServerPool } from "../../mock-server/MockServerPool";
+
+describe("ModelsClient", () => {
+ test("list", async () => {
+ const server = mockServerPool.createServer();
+ const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
+
+ const rawResponseBody = {
+ data: [
+ {
+ model_id: "model_id",
+ name: "name",
+ properties: { context_length: 1, max_output_tokens: 1 },
+ api_key: "api_key",
+ base_url: "base_url",
+ headers: { key: "value" },
+ max_output_tokens: 1,
+ provider: "openai",
+ reasoning_efforts: ["reasoning_efforts"],
+ api_format: "openai-chat-completions",
+ },
+ ],
+ };
+
+ server
+ .mockEndpoint()
+ .get("/api/v1/legacy/models")
+ .respondWith()
+ .statusCode(200)
+ .jsonBody(rawResponseBody)
+ .build();
+
+ const response = await client.legacy.models.list();
+ expect(response).toEqual({
+ data: [
+ {
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ apiKey: "api_key",
+ baseUrl: "base_url",
+ headers: {
+ key: "value",
+ },
+ maxOutputTokens: 1,
+ provider: "openai",
+ reasoningEfforts: ["reasoning_efforts"],
+ apiFormat: "openai-chat-completions",
+ },
+ ],
+ });
+ });
+});
diff --git a/packages/sdk/tests/wire/skills.test.ts b/packages/sdk/tests/wire/legacy/skills.test.ts
similarity index 65%
rename from packages/sdk/tests/wire/skills.test.ts
rename to packages/sdk/tests/wire/legacy/skills.test.ts
index c2480b050..0a37d4513 100644
--- a/packages/sdk/tests/wire/skills.test.ts
+++ b/packages/sdk/tests/wire/legacy/skills.test.ts
@@ -1,7 +1,7 @@
// This file was auto-generated by Fern from our API Definition.
-import { TrueHarness } from "../../src/Client";
-import { mockServerPool } from "../mock-server/MockServerPool";
+import { TrueHarness } from "../../../src/Client";
+import { mockServerPool } from "../../mock-server/MockServerPool";
describe("SkillsClient", () => {
test("list", async () => {
@@ -12,9 +12,15 @@ describe("SkillsClient", () => {
data: [{ description: "description", name: "name", path: "path", ref: "ref", url: "url" }],
};
- server.mockEndpoint().get("/api/v1/skills").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
+ server
+ .mockEndpoint()
+ .get("/api/v1/legacy/skills")
+ .respondWith()
+ .statusCode(200)
+ .jsonBody(rawResponseBody)
+ .build();
- const response = await client.skills.list();
+ const response = await client.legacy.skills.list();
expect(response).toEqual({
data: [
{
diff --git a/packages/sdk/tests/wire/models.test.ts b/packages/sdk/tests/wire/models.test.ts
index 9c1ba0c13..ed42f4b67 100644
--- a/packages/sdk/tests/wire/models.test.ts
+++ b/packages/sdk/tests/wire/models.test.ts
@@ -9,18 +9,7 @@ describe("ModelsClient", () => {
const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
const rawResponseBody = {
- data: [
- {
- api_key: "api_key",
- base_url: "base_url",
- headers: { key: "value" },
- max_output_tokens: 1,
- model_id: "model_id",
- name: "name",
- provider: "anthropic",
- reasoning_efforts: ["reasoning_efforts"],
- },
- ],
+ data: [{ model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } }],
};
server.mockEndpoint().get("/api/v1/models").respondWith().statusCode(200).jsonBody(rawResponseBody).build();
@@ -29,16 +18,12 @@ describe("ModelsClient", () => {
expect(response).toEqual({
data: [
{
- apiKey: "api_key",
- baseUrl: "base_url",
- headers: {
- key: "value",
- },
- maxOutputTokens: 1,
modelId: "model_id",
name: "name",
- provider: "anthropic",
- reasoningEfforts: ["reasoning_efforts"],
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
],
});
diff --git a/packages/sdk/tests/wire/sessions.test.ts b/packages/sdk/tests/wire/sessions.test.ts
index 1e3f7ba45..2224f8ee7 100644
--- a/packages/sdk/tests/wire/sessions.test.ts
+++ b/packages/sdk/tests/wire/sessions.test.ts
@@ -12,7 +12,13 @@ describe("SessionsClient", () => {
const rawResponseBody = {
data: [
{
- agent_spec: { model: { name: "name" } },
+ agent_spec: {
+ model: {
+ model_id: "model_id",
+ name: "name",
+ properties: { context_length: 1, max_output_tokens: 1 },
+ },
+ },
created_at: "created_at",
id: "id",
title: "title",
@@ -35,7 +41,12 @@ describe("SessionsClient", () => {
{
agentSpec: {
model: {
+ modelId: "model_id",
name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
},
createdAt: "created_at",
@@ -74,14 +85,22 @@ describe("SessionsClient", () => {
test("create (1)", async () => {
const server = mockServerPool.createServer();
const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
- const rawRequestBody = { agent_spec: { model: { name: "name" } } };
+ const rawRequestBody = {
+ agent_spec: {
+ model: { model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } },
+ },
+ };
const rawResponseBody = {
data: {
agent_spec: {
instructions: "instructions",
mcp_servers: [{ name: "name" }],
messages: [{ content: "content", type: "user.message" }],
- model: { name: "name" },
+ model: {
+ model_id: "model_id",
+ name: "name",
+ properties: { context_length: 1, max_output_tokens: 1 },
+ },
response_format: { type: "text" },
skills: [{ description: "description", name: "name", ref: "ref", type: "git", url: "url" }],
variables: { key: "value" },
@@ -105,7 +124,12 @@ describe("SessionsClient", () => {
const response = await client.sessions.create({
agentSpec: {
model: {
+ modelId: "model_id",
name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
},
});
@@ -125,7 +149,12 @@ describe("SessionsClient", () => {
},
],
model: {
+ modelId: "model_id",
name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
responseFormat: {
type: "text",
@@ -154,7 +183,11 @@ describe("SessionsClient", () => {
test("create (2)", async () => {
const server = mockServerPool.createServer();
const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
- const rawRequestBody = { agent_spec: { model: { name: "x" } } };
+ const rawRequestBody = {
+ agent_spec: {
+ model: { model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } },
+ },
+ };
const rawResponseBody = { error: { message: "message" } };
server
@@ -170,7 +203,12 @@ describe("SessionsClient", () => {
return await client.sessions.create({
agentSpec: {
model: {
- name: "x",
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
},
});
@@ -180,7 +218,11 @@ describe("SessionsClient", () => {
test("create (3)", async () => {
const server = mockServerPool.createServer();
const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
- const rawRequestBody = { agent_spec: { model: { name: "x" } } };
+ const rawRequestBody = {
+ agent_spec: {
+ model: { model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } },
+ },
+ };
const rawResponseBody = { error: { message: "message" } };
server
@@ -196,7 +238,12 @@ describe("SessionsClient", () => {
return await client.sessions.create({
agentSpec: {
model: {
- name: "x",
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
},
});
@@ -213,7 +260,11 @@ describe("SessionsClient", () => {
instructions: "instructions",
mcp_servers: [{ name: "name" }],
messages: [{ content: "content", type: "user.message" }],
- model: { name: "name" },
+ model: {
+ model_id: "model_id",
+ name: "name",
+ properties: { context_length: 1, max_output_tokens: 1 },
+ },
response_format: { type: "text" },
skills: [{ description: "description", name: "name", ref: "ref", type: "git", url: "url" }],
variables: { key: "value" },
@@ -250,7 +301,12 @@ describe("SessionsClient", () => {
},
],
model: {
+ modelId: "model_id",
name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
responseFormat: {
type: "text",
@@ -305,7 +361,11 @@ describe("SessionsClient", () => {
instructions: "instructions",
mcp_servers: [{ name: "name" }],
messages: [{ content: "content", type: "user.message" }],
- model: { name: "name" },
+ model: {
+ model_id: "model_id",
+ name: "name",
+ properties: { context_length: 1, max_output_tokens: 1 },
+ },
response_format: { type: "text" },
skills: [{ description: "description", name: "name", ref: "ref", type: "git", url: "url" }],
variables: { key: "value" },
@@ -343,7 +403,12 @@ describe("SessionsClient", () => {
},
],
model: {
+ modelId: "model_id",
name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
},
responseFormat: {
type: "text",
diff --git a/packages/sdk/tests/wire/settings/modelProviders.test.ts b/packages/sdk/tests/wire/settings/modelProviders.test.ts
new file mode 100644
index 000000000..f3cc4f483
--- /dev/null
+++ b/packages/sdk/tests/wire/settings/modelProviders.test.ts
@@ -0,0 +1,228 @@
+// This file was auto-generated by Fern from our API Definition.
+
+import * as TrueHarnessTypes from "../../../src/api/index";
+import { TrueHarness } from "../../../src/Client";
+import { mockServerPool } from "../../mock-server/MockServerPool";
+
+describe("ModelProvidersClient", () => {
+ test("list", async () => {
+ const server = mockServerPool.createServer();
+ const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
+
+ const rawResponseBody = {
+ data: [
+ {
+ auth: { api_key: "api_key" },
+ base_url: "base_url",
+ models: [
+ { model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } },
+ ],
+ name: "name",
+ type: "openai",
+ },
+ ],
+ };
+
+ server
+ .mockEndpoint()
+ .get("/api/v1/settings/model-providers")
+ .respondWith()
+ .statusCode(200)
+ .jsonBody(rawResponseBody)
+ .build();
+
+ const response = await client.settings.modelProviders.list();
+ expect(response).toEqual({
+ data: [
+ {
+ auth: {
+ apiKey: "api_key",
+ },
+ baseUrl: "base_url",
+ models: [
+ {
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ },
+ ],
+ name: "name",
+ type: "openai",
+ },
+ ],
+ });
+ });
+
+ test("upsert (1)", async () => {
+ const server = mockServerPool.createServer();
+ const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
+ const rawRequestBody = {
+ auth: { api_key: "api_key" },
+ base_url: "base_url",
+ models: [{ model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } }],
+ name: "name",
+ type: "openai",
+ };
+ const rawResponseBody = {
+ data: {
+ auth: { api_key: "api_key" },
+ base_url: "base_url",
+ models: [
+ { model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } },
+ ],
+ name: "name",
+ type: "openai",
+ },
+ };
+
+ server
+ .mockEndpoint()
+ .put("/api/v1/settings/model-providers")
+ .jsonBody(rawRequestBody)
+ .respondWith()
+ .statusCode(200)
+ .jsonBody(rawResponseBody)
+ .build();
+
+ const response = await client.settings.modelProviders.upsert({
+ auth: {
+ apiKey: "api_key",
+ },
+ baseUrl: "base_url",
+ models: [
+ {
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ },
+ ],
+ name: "name",
+ type: "openai",
+ });
+ expect(response).toEqual({
+ data: {
+ auth: {
+ apiKey: "api_key",
+ },
+ baseUrl: "base_url",
+ models: [
+ {
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ },
+ ],
+ name: "name",
+ type: "openai",
+ },
+ });
+ });
+
+ test("upsert (2)", async () => {
+ const server = mockServerPool.createServer();
+ const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
+ const rawRequestBody = {
+ auth: { api_key: "x" },
+ base_url: "base_url",
+ models: [
+ { model_id: "x", name: "xy", properties: { context_length: 1, max_output_tokens: 1 } },
+ { model_id: "x", name: "xy", properties: { context_length: 1, max_output_tokens: 1 } },
+ ],
+ name: "xy",
+ type: "openai",
+ };
+ const rawResponseBody = { error: { message: "message" } };
+
+ server
+ .mockEndpoint()
+ .put("/api/v1/settings/model-providers")
+ .jsonBody(rawRequestBody)
+ .respondWith()
+ .statusCode(400)
+ .jsonBody(rawResponseBody)
+ .build();
+
+ await expect(async () => {
+ return await client.settings.modelProviders.upsert({
+ auth: {
+ apiKey: "x",
+ },
+ baseUrl: "base_url",
+ models: [
+ {
+ modelId: "x",
+ name: "xy",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ },
+ {
+ modelId: "x",
+ name: "xy",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ },
+ ],
+ name: "xy",
+ type: "openai",
+ });
+ }).rejects.toThrow(TrueHarnessTypes.BadRequestError);
+ });
+
+ test("catalog", async () => {
+ const server = mockServerPool.createServer();
+ const client = new TrueHarness({ maxRetries: 0, environment: server.baseUrl });
+
+ const rawResponseBody = {
+ data: [
+ {
+ models: [
+ { model_id: "model_id", name: "name", properties: { context_length: 1, max_output_tokens: 1 } },
+ ],
+ name: "name",
+ 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: [
+ {
+ models: [
+ {
+ modelId: "model_id",
+ name: "name",
+ properties: {
+ contextLength: 1,
+ maxOutputTokens: 1,
+ },
+ },
+ ],
+ name: "name",
+ type: "openai",
+ },
+ ],
+ });
+ });
+});
diff --git a/packages/server/.env.example b/packages/server/.env.example
index 72adb0300..5f005b9b3 100644
--- a/packages/server/.env.example
+++ b/packages/server/.env.example
@@ -14,6 +14,10 @@ PORT=8790
# in models.yaml; only its API key lives here.
# REGISTRY_DIR=registry
+# Optional override for the model catalog YAML (GET /settings/model-providers/catalog).
+# When unset, the catalog inlined at build time (src/catalog/model-catalog.yaml) is used.
+# MODEL_CATALOG_PATH=/path/to/model-catalog.yaml
+
# Frontend build the server serves alongside the API. Optional, defaults to
# ../frontend/dist relative to the working directory. With no build there the
# server logs a warning and serves the API only.
diff --git a/packages/server/jest.store.postgres.config.cjs b/packages/server/jest.store.postgres.config.cjs
index 8b971479f..8697dedd6 100644
--- a/packages/server/jest.store.postgres.config.cjs
+++ b/packages/server/jest.store.postgres.config.cjs
@@ -1,7 +1,7 @@
/** @type {import('jest').Config} */
module.exports = {
testEnvironment: 'node',
- globalSetup: '<rootDir>/tests/db/session-store/postgres/globalSetup.ts',
+ globalSetup: '<rootDir>/tests/db/postgres/globalSetup.ts',
transform: {
'^.+\\.(m?js|tsx?)$': [
'@swc/jest',
@@ -22,6 +22,6 @@ module.exports = {
transformIgnorePatterns: ['/node_modules/(?!.*kysely)'],
testTimeout: 120_000,
maxWorkers: '50%',
- roots: ['<rootDir>/tests/db/session-store/postgres', '<rootDir>/src'],
- testMatch: ['<rootDir>/tests/db/session-store/postgres/**/*.test.ts'],
+ roots: ['<rootDir>/tests/db', '<rootDir>/src'],
+ testMatch: ['<rootDir>/tests/db/**/postgres/**/*.test.ts'],
};
diff --git a/packages/server/jest.store.sqlite.config.cjs b/packages/server/jest.store.sqlite.config.cjs
index edaaa340d..1b49b934b 100644
--- a/packages/server/jest.store.sqlite.config.cjs
+++ b/packages/server/jest.store.sqlite.config.cjs
@@ -21,6 +21,6 @@ module.exports = {
transformIgnorePatterns: ['/node_modules/(?!.*kysely)'],
testTimeout: 120_000,
maxWorkers: '50%',
- roots: ['<rootDir>/tests/db/session-store/sqlite', '<rootDir>/src'],
- testMatch: ['<rootDir>/tests/db/session-store/sqlite/**/*.test.ts'],
+ roots: ['<rootDir>/tests/db', '<rootDir>/src'],
+ testMatch: ['<rootDir>/tests/db/**/sqlite/**/*.test.ts'],
};
diff --git a/packages/server/package.json b/packages/server/package.json
index 1935ca478..89e53a7e8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -7,15 +7,19 @@
"private": true,
"type": "module",
"scripts": {
- "build": "tsc --noEmit && tsup",
- "predev": "pnpm --filter @truefoundry/utils build:gen",
- "dev": "NODE_OPTIONS='--conditions=development' NODE_ENV=development tsx watch --env-file=.env src/main.ts",
- "predev:no-watch": "pnpm --filter @truefoundry/utils build:gen",
+ "build:gen": "node scripts/generate-catalog.mjs",
+ "build:gen:watch": "node --watch-path=src/catalog/model-catalog.yaml scripts/generate-catalog.mjs",
+ "build": "pnpm run build:gen && tsc --noEmit && tsup",
+ "predev": "pnpm --filter @truefoundry/utils build:gen && pnpm run build:gen",
+ "dev": "pnpm run --parallel catalog-watch dev:serve",
+ "catalog-watch": "pnpm run build:gen:watch",
+ "dev:serve": "NODE_OPTIONS='--conditions=development' NODE_ENV=development tsx watch --env-file=.env src/main.ts",
+ "predev:no-watch": "pnpm --filter @truefoundry/utils build:gen && pnpm run build:gen",
"dev:no-watch": "NODE_OPTIONS='--conditions=development' NODE_ENV=production tsx --env-file=.env src/main.ts",
"migrate": "NODE_OPTIONS='--conditions=development' tsx --env-file=.env src/db/postgres/migrate-cli.ts",
- "typecheck": "tsc --noEmit && tsc --noEmit -p tests/db/tsconfig.json && tsc --noEmit -p tests/unit/tsconfig.json",
- "openapi:write": "NODE_OPTIONS='--conditions=development' tsx --env-file=.env.test scripts/write-openapi.ts",
- "test": "NODE_OPTIONS='--conditions=development' tsx --env-file=.env.test --test \"tests/unit/**/*.test.ts\"",
+ "typecheck": "pnpm run build:gen && tsc --noEmit && tsc --noEmit -p tests/db/tsconfig.json && tsc --noEmit -p tests/unit/tsconfig.json",
+ "openapi:write": "pnpm run build:gen && NODE_OPTIONS='--conditions=development' tsx --env-file=.env.test scripts/write-openapi.ts",
+ "test": "pnpm run build:gen && NODE_OPTIONS='--conditions=development' tsx --env-file=.env.test --test \"tests/unit/**/*.test.ts\"",
"test:store:postgres": "jest --config jest.store.postgres.config.cjs",
"test:store:sqlite": "jest --config jest.store.sqlite.config.cjs"
},
diff --git a/packages/server/scripts/generate-catalog.mjs b/packages/server/scripts/generate-catalog.mjs
new file mode 100644
index 000000000..2068c969a
--- /dev/null
+++ b/packages/server/scripts/generate-catalog.mjs
@@ -0,0 +1,19 @@
+/**
+ * Inlines model-catalog.yaml into a generated TS module so ModelCatalog can
+ * load the shipped catalog with no loose YAML beside the bundle. A plain
+ * generated `.ts` file works unchanged across tsup and tsx — no loaders needed.
+ *
+ * Runs via the `build:gen` script before build/typecheck/test/dev. The
+ * generated output (src/catalog/modelCatalog.gen.ts) is gitignored.
+ */
+import { readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const root = join(dirname(fileURLToPath(import.meta.url)), '..');
+const yaml = readFileSync(join(root, 'src/catalog/model-catalog.yaml'), 'utf-8');
+
+const out = `// AUTO-GENERATED by scripts/generate-catalog.mjs — do not edit.
+export const shippedModelCatalogYaml = ${JSON.stringify(yaml)} as const;
+`;
+writeFileSync(join(root, 'src/catalog/modelCatalog.gen.ts'), out);
diff --git a/packages/server/scripts/write-openapi.ts b/packages/server/scripts/write-openapi.ts
index 893562819..1a9bd8868 100644
--- a/packages/server/scripts/write-openapi.ts
+++ b/packages/server/scripts/write-openapi.ts
@@ -11,10 +11,13 @@ import { mkdirSync, writeFileSync } from 'node:fs';
import path from 'node:path';
import winston from 'winston';
import { buildOpenApiDocument, createServerApp } from '../src/app';
+import { ModelCatalog } from '../src/catalog/ModelCatalog';
+import { createSqliteDb } from '../src/db/sqlite/client';
+import { SqliteModelProviderStore } from '../src/db/sqlite/model-provider-store/SqliteModelProviderStore';
+import { McpStore } from '../src/legacy-registry-store/McpStore';
+import { ModelStore } from '../src/legacy-registry-store/ModelStore';
+import { SkillStore } from '../src/legacy-registry-store/SkillStore';
import { ActiveTurnRegistry } from '../src/runtime/activeTurns';
-import { McpStore } from '../src/store/McpStore';
-import { ModelStore } from '../src/store/ModelStore';
-import { SkillStore } from '../src/store/SkillStore';
function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === 'object' && value !== null;
@@ -39,6 +42,8 @@ function canonicalise(value: unknown): unknown {
const sessionStore = new InMemorySessionStore();
const app = createServerApp({
modelStore: ModelStore.load(),
+ modelCatalog: ModelCatalog.load(),
+ modelProviderStore: new SqliteModelProviderStore(createSqliteDb(':memory:')),
mcpStore: McpStore.load(),
skillStore: SkillStore.load(),
sessionStore,
diff --git a/packages/server/src/apis/mcp.ts b/packages/server/src/apis/legacyMcp.ts
similarity index 94%
rename from packages/server/src/apis/mcp.ts
rename to packages/server/src/apis/legacyMcp.ts
index 0ea57d7f7..9efc15c52 100644
--- a/packages/server/src/apis/mcp.ts
+++ b/packages/server/src/apis/legacyMcp.ts
@@ -1,10 +1,10 @@
import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
import { extractErrorLogFields, isAuthRequired, McpConnectionError, RemoteMCP } from '@truefoundry/utils/core';
import type { Logger } from 'winston';
-import { authorizeMcpServerRoute, listMcpServersRoute, listMcpToolsRoute } from '../routes/mcpRoutes';
-import type { McpStore } from '../store/McpStore';
+import type { McpStore } from '../legacy-registry-store/McpStore';
+import { authorizeMcpServerRoute, listMcpServersRoute, listMcpToolsRoute } from '../routes/legacyMcpRoutes';
-export interface McpRouterDeps {
+export interface LegacyMcpRouterDeps {
mcpStore: McpStore;
logger: Logger;
}
@@ -20,7 +20,7 @@ function omitUndefinedEntries(obj: Record<string, unknown>): Record<string, unkn
return out;
}
-export function createMcpRouter(deps: McpRouterDeps) {
+export function createLegacyMcpRouter(deps: LegacyMcpRouterDeps) {
// auth_status here is a passive check only (no live refresh attempt); `authentication_required`
// vs `not_required` — see route description.
// TODO(mcp-dcr): once IMcpTokenStore lands, batch-check stored tokens for all DCR-configured
diff --git a/packages/server/src/apis/mcpOAuth.ts b/packages/server/src/apis/legacyMcpOAuth.ts
similarity index 85%
rename from packages/server/src/apis/mcpOAuth.ts
rename to packages/server/src/apis/legacyMcpOAuth.ts
index d5f2c3b03..a3c63f053 100644
--- a/packages/server/src/apis/mcpOAuth.ts
+++ b/packages/server/src/apis/legacyMcpOAuth.ts
@@ -1,8 +1,8 @@
import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
import type { Logger } from 'winston';
-import { mcpOAuthCallbackRoute } from '../routes/mcpOAuthRoutes';
+import { mcpOAuthCallbackRoute } from '../routes/legacyMcpOAuthRoutes';
-export interface McpOAuthRouterDeps {
+export interface LegacyMcpOAuthRouterDeps {
logger: Logger;
}
@@ -10,7 +10,7 @@ export interface McpOAuthRouterDeps {
const STUB_CONNECTED_REDIRECT = '/mcp/oauth/connected';
const STUB_FAILED_REDIRECT = '/mcp/oauth/failed';
-export function createMcpOAuthRouter(deps: McpOAuthRouterDeps) {
+export function createLegacyMcpOAuthRouter(deps: LegacyMcpOAuthRouterDeps) {
const callbackHandler: RouteHandler<typeof mcpOAuthCallbackRoute> = c => {
const { state, code, error, error_description: errorDescription } = c.req.valid('query');
diff --git a/packages/server/src/apis/legacyModels.ts b/packages/server/src/apis/legacyModels.ts
new file mode 100644
index 000000000..f25689d71
--- /dev/null
+++ b/packages/server/src/apis/legacyModels.ts
@@ -0,0 +1,10 @@
+import { OpenAPIHono } from '@hono/zod-openapi';
+import type { ModelStore } from '../legacy-registry-store/ModelStore';
+import { listLegacyModelsRoute } from '../routes/legacyModelRoutes';
+
+/** YAML-backed registry list (mounted at /api/v1/legacy/models). */
+export function createLegacyModelsRouter(store: ModelStore) {
+ const router = new OpenAPIHono();
+ router.openapi(listLegacyModelsRoute, c => c.json({ data: store.list() }, 200));
+ return router;
+}
diff --git a/packages/server/src/apis/legacySkills.ts b/packages/server/src/apis/legacySkills.ts
new file mode 100644
index 000000000..3c32ac586
--- /dev/null
+++ b/packages/server/src/apis/legacySkills.ts
@@ -0,0 +1,9 @@
+import { OpenAPIHono } from '@hono/zod-openapi';
+import type { SkillStore } from '../legacy-registry-store/SkillStore';
+import { listSkillsRoute } from '../routes/legacySkillRoutes';
+
+export function createLegacySkillsRouter(store: SkillStore) {
+ const router = new OpenAPIHono();
+ router.openapi(listSkillsRoute, c => c.json({ data: store.list() }, 200));
+ return router;
+}
diff --git a/packages/server/src/apis/modelProviders.ts b/packages/server/src/apis/modelProviders.ts
new file mode 100644
index 000000000..3f33e8156
--- /dev/null
+++ b/packages/server/src/apis/modelProviders.ts
@@ -0,0 +1,51 @@
+import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
+import type { ModelCatalog } from '../catalog/ModelCatalog';
+import type { IModelProviderStore, ModelProviderRecord } from '../db/modelProviderStore';
+import {
+ getModelProviderCatalogRoute,
+ listModelProvidersRoute,
+ putModelProviderRoute,
+} from '../routes/modelProviderRoutes';
+import type { ModelProvider, ProviderManifest } from '../schemas/modelProvider';
+import { TENANT_ID } from './sessions';
+
+export interface ModelProvidersRouterDeps {
+ modelCatalog: ModelCatalog;
+ modelProviderStore: IModelProviderStore;
+}
+
+/** Wire view of a stored provider: identity `name` plus persisted manifest. */
+function toModelProvider(record: ModelProviderRecord): ModelProvider {
+ return {
+ ...record.manifest,
+ name: record.name,
+ };
+}
+
+export function createModelProvidersRouter(deps: ModelProvidersRouterDeps) {
+ const catalogHandler: RouteHandler<typeof getModelProviderCatalogRoute> = c => {
+ return c.json({ data: [...deps.modelCatalog.list()] }, 200);
+ };
+
+ const listHandler: RouteHandler<typeof listModelProvidersRoute> = async c => {
+ const records = await deps.modelProviderStore.listProviders(TENANT_ID);
+ return c.json({ data: records.map(toModelProvider) }, 200);
+ };
+
+ const putHandler: RouteHandler<typeof putModelProviderRoute> = async c => {
+ const { name, ...manifestFields } = c.req.valid('json');
+ const manifest: ProviderManifest = manifestFields;
+ const record = await deps.modelProviderStore.upsertProvider({
+ tenant_id: TENANT_ID,
+ name,
+ manifest,
+ });
+ return c.json({ data: toModelProvider(record) }, 200);
+ };
+
+ 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/models.ts b/packages/server/src/apis/models.ts
index 32c33906e..2fdeabb8e 100644
--- a/packages/server/src/apis/models.ts
+++ b/packages/server/src/apis/models.ts
@@ -1,9 +1,11 @@
import { OpenAPIHono } from '@hono/zod-openapi';
+import type { IModelProviderStore } from '../db/modelProviderStore';
import { listModelsRoute } from '../routes/modelRoutes';
-import type { ModelStore } from '../store/ModelStore';
+import { TENANT_ID } from './sessions';
-export function createModelsRouter(store: ModelStore) {
+/** FQN read view over configured model providers (mounted at /api/v1/models). */
+export function createModelsRouter(store: IModelProviderStore) {
const router = new OpenAPIHono();
- router.openapi(listModelsRoute, c => c.json({ data: store.list() }, 200));
+ router.openapi(listModelsRoute, async c => c.json({ data: await store.listModels(TENANT_ID) }, 200));
return router;
}
diff --git a/packages/server/src/apis/sessions.ts b/packages/server/src/apis/sessions.ts
index c714079b8..44394c94e 100644
--- a/packages/server/src/apis/sessions.ts
+++ b/packages/server/src/apis/sessions.ts
@@ -12,6 +12,8 @@ import type { RedisClientType } from 'redis';
import { ulid } from 'ulid';
import { z } from 'zod';
import configuration from '../config';
+import type { McpStore } from '../legacy-registry-store/McpStore';
+import type { ModelStore } from '../legacy-registry-store/ModelStore';
import {
cancelSessionRoute,
createSessionRoute,
@@ -24,8 +26,6 @@ import {
import type { ActiveTurnRegistry } from '../runtime/activeTurns';
import { executorFromTurnId } from '../runtime/peeringIds';
import type { Session } from '../schemas/session';
-import type { McpStore } from '../store/McpStore';
-import type { ModelStore } from '../store/ModelStore';
/** The server is single-tenant; every record lives under one fixed tenant scope. */
export const TENANT_ID = 'default';
diff --git a/packages/server/src/apis/settings.ts b/packages/server/src/apis/settings.ts
new file mode 100644
index 000000000..2de72cc4e
--- /dev/null
+++ b/packages/server/src/apis/settings.ts
@@ -0,0 +1,26 @@
+/**
+ * Admin/settings API surface under /api/v1/settings.
+ * Sub-routers (model-providers today; mcp/skills/sandbox later) mount here so
+ * a single policy can wrap the whole tree later without touching each resource.
+ */
+import { OpenAPIHono } from '@hono/zod-openapi';
+import type { ModelCatalog } from '../catalog/ModelCatalog';
+import type { IModelProviderStore } from '../db/modelProviderStore';
+import { createModelProvidersRouter } from './modelProviders';
+
+export interface SettingsRouterDeps {
+ modelCatalog: ModelCatalog;
+ modelProviderStore: IModelProviderStore;
+}
+
+export function createSettingsRouter(deps: SettingsRouterDeps) {
+ const router = new OpenAPIHono();
+ router.route(
+ '/model-providers',
+ createModelProvidersRouter({
+ modelCatalog: deps.modelCatalog,
+ modelProviderStore: deps.modelProviderStore,
+ }),
+ );
+ return router;
+}
diff --git a/packages/server/src/apis/skills.ts b/packages/server/src/apis/skills.ts
deleted file mode 100644
index 8db54bf41..000000000
--- a/packages/server/src/apis/skills.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { OpenAPIHono } from '@hono/zod-openapi';
-import { listSkillsRoute } from '../routes/skillRoutes';
-import type { SkillStore } from '../store/SkillStore';
-
-export function createSkillsRouter(store: SkillStore) {
- const router = new OpenAPIHono();
- router.openapi(listSkillsRoute, c => c.json({ data: store.list() }, 200));
- return router;
-}
diff --git a/packages/server/src/apis/turns.ts b/packages/server/src/apis/turns.ts
index e3b3fe384..9d1597872 100644
--- a/packages/server/src/apis/turns.ts
+++ b/packages/server/src/apis/turns.ts
@@ -20,11 +20,11 @@ import {
import { streamSSE } from 'hono/streaming';
import type { Logger } from 'winston';
import configuration from '../config';
+import type { McpStore } from '../legacy-registry-store/McpStore';
+import type { ModelStore } from '../legacy-registry-store/ModelStore';
import { createAndExecuteTurnRoute, getTurnRoute, listTurnEventsRoute, listTurnsRoute } from '../routes/turnRoutes';
import type { ActiveTurnRegistry } from '../runtime/activeTurns';
import { mintPeeredTurnId } from '../runtime/peeringIds';
-import type { McpStore } from '../store/McpStore';
-import type { ModelStore } from '../store/ModelStore';
import { TENANT_ID } from './sessions';
function toWireTurn(record: TurnRecordWithoutSnapshot): Turn {
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 2b8103c68..627c52e1d 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -8,16 +8,20 @@ import { HTTPException } from 'hono/http-exception';
import type { RedisClientType } from 'redis';
import type { Logger } from 'winston';
import { createCapabilitiesRouter } from './apis/capabilities';
-import { createMcpRouter } from './apis/mcp';
-import { createMcpOAuthRouter } from './apis/mcpOAuth';
+import { createLegacyMcpRouter } from './apis/legacyMcp';
+import { createLegacyMcpOAuthRouter } from './apis/legacyMcpOAuth';
+import { createLegacyModelsRouter } from './apis/legacyModels';
+import { createLegacySkillsRouter } from './apis/legacySkills';
import { createModelsRouter } from './apis/models';
import { createSessionsRouter } from './apis/sessions';
-import { createSkillsRouter } from './apis/skills';
+import { createSettingsRouter } from './apis/settings';
import { createTurnsRouter } from './apis/turns';
+import type { ModelCatalog } from './catalog/ModelCatalog';
+import type { IModelProviderStore } from './db/modelProviderStore';
+import type { McpStore } from './legacy-registry-store/McpStore';
+import type { ModelStore } from './legacy-registry-store/ModelStore';
+import type { SkillStore } from './legacy-registry-store/SkillStore';
import type { ActiveTurnRegistry } from './runtime/activeTurns';
-import type { McpStore } from './store/McpStore';
-import type { ModelStore } from './store/ModelStore';
-import type { SkillStore } from './store/SkillStore';
const openApiDocConfig = {
openapi: '3.1.0',
@@ -39,6 +43,8 @@ function routeNotFound(c: Context) {
export interface ServerDeps {
modelStore: ModelStore;
+ modelCatalog: ModelCatalog;
+ modelProviderStore: IModelProviderStore;
mcpStore: McpStore;
skillStore: SkillStore;
sessionStore: ISessionStore;
@@ -59,10 +65,16 @@ export function createServerApp(deps: ServerDeps) {
app.get('/healthz', c => c.text('OK!'));
app.route('/api/v1/capabilities', createCapabilitiesRouter({ sandboxEnabled: deps.sandboxFactory !== undefined }));
- app.route('/api/v1/models', createModelsRouter(deps.modelStore));
- app.route('/api/v1/mcp-servers', createMcpRouter({ mcpStore: deps.mcpStore, logger: deps.logger }));
- app.route('/api/v1/mcp-servers/oauth', createMcpOAuthRouter({ logger: deps.logger }));
- app.route('/api/v1/skills', createSkillsRouter(deps.skillStore));
+ app.route('/api/v1/models', createModelsRouter(deps.modelProviderStore));
+ app.route(
+ '/api/v1/settings',
+ createSettingsRouter({ modelCatalog: deps.modelCatalog, modelProviderStore: deps.modelProviderStore }),
+ );
+ // YAML registry surfaces — non-legacy paths reserved for future DB-backed CRUD.
+ app.route('/api/v1/legacy/models', createLegacyModelsRouter(deps.modelStore));
+ app.route('/api/v1/legacy/mcp-servers', createLegacyMcpRouter({ mcpStore: deps.mcpStore, logger: deps.logger }));
+ app.route('/api/v1/legacy/mcp-servers/oauth', createLegacyMcpOAuthRouter({ logger: deps.logger }));
+ app.route('/api/v1/legacy/skills', createLegacySkillsRouter(deps.skillStore));
app.route(
'/api/v1/sessions',
createSessionsRouter({
diff --git a/packages/server/src/catalog/ModelCatalog.ts b/packages/server/src/catalog/ModelCatalog.ts
new file mode 100644
index 000000000..b38d44b34
--- /dev/null
+++ b/packages/server/src/catalog/ModelCatalog.ts
@@ -0,0 +1,34 @@
+/**
+ * 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.
+ *
+ * Default: YAML inlined into `modelCatalog.gen.ts` at build time. Optional
+ * override: `MODEL_CATALOG_PATH` (file on disk).
+ */
+import configuration from '../config';
+import { ModelCatalogFileSchema, type CatalogProvider } from '../schemas/modelCatalog';
+import { loadYamlAtPath, parseYamlString } from './loadYaml';
+import { shippedModelCatalogYaml } from './modelCatalog.gen';
+
+export class ModelCatalog {
+ private readonly providers: readonly CatalogProvider[];
+
+ constructor(providers: readonly CatalogProvider[]) {
+ this.providers = providers;
+ }
+
+ /** Loads and validates the catalog. Throws on any error. */
+ static load(): ModelCatalog {
+ if (configuration.MODEL_CATALOG_PATH !== undefined) {
+ const file = loadYamlAtPath(configuration.MODEL_CATALOG_PATH, ModelCatalogFileSchema);
+ return new ModelCatalog(file.providers);
+ }
+ const file = parseYamlString(shippedModelCatalogYaml, ModelCatalogFileSchema, 'shipped model-catalog');
+ return new ModelCatalog(file.providers);
+ }
+
+ list(): readonly CatalogProvider[] {
+ return this.providers;
+ }
+}
diff --git a/packages/server/src/store/loadYaml.ts b/packages/server/src/catalog/loadYaml.ts
similarity index 63%
rename from packages/server/src/store/loadYaml.ts
rename to packages/server/src/catalog/loadYaml.ts
index c45472a89..6dc8695ae 100644
--- a/packages/server/src/store/loadYaml.ts
+++ b/packages/server/src/catalog/loadYaml.ts
@@ -9,24 +9,13 @@ import { parse } from 'yaml';
import type { z } from 'zod';
import configuration from '../config';
-export function loadYamlFile<T>(fileName: string, schema: z.ZodType<T>): T {
- const filePath = path.join(configuration.REGISTRY_DIR, fileName);
-
- let raw: string;
- try {
- raw = fs.readFileSync(filePath, 'utf8');
- } catch (error) {
- throw new Error(
- `Failed to read config file ${filePath}: ${error instanceof Error ? error.message : String(error)}`,
- { cause: error },
- );
- }
-
+/** Parses and validates YAML text. `label` is used in error messages. */
+export function parseYamlString<T>(raw: string, schema: z.ZodType<T>, label: string): T {
let document: unknown;
try {
document = parse(raw);
} catch (error) {
- throw new Error(`Invalid YAML in ${filePath}: ${error instanceof Error ? error.message : String(error)}`, {
+ throw new Error(`Invalid YAML in ${label}: ${error instanceof Error ? error.message : String(error)}`, {
cause: error,
});
}
@@ -36,7 +25,26 @@ export function loadYamlFile<T>(fileName: string, schema: z.ZodType<T>): T {
const issues = result.error.issues
.map(issue => ` - ${issue.path.length > 0 ? issue.path.join('.') : '(root)'}: ${issue.message}`)
.join('\n');
- throw new Error(`Invalid config in ${filePath}:\n${issues}`);
+ throw new Error(`Invalid config in ${label}:\n${issues}`);
}
return result.data;
}
+
+export function loadYamlAtPath<T>(filePath: string, schema: z.ZodType<T>): T {
+ let raw: string;
+ try {
+ raw = fs.readFileSync(filePath, 'utf8');
+ } catch (error) {
+ throw new Error(
+ `Failed to read config file ${filePath}: ${error instanceof Error ? error.message : String(error)}`,
+ { cause: error },
+ );
+ }
+
+ return parseYamlString(raw, schema, filePath);
+}
+
+/** Loads a YAML file from `REGISTRY_DIR` (legacy registry stores). */
+export function loadYamlFile<T>(fileName: string, schema: z.ZodType<T>): T {
+ return loadYamlAtPath(path.join(configuration.REGISTRY_DIR, fileName), schema);
+}
diff --git a/packages/server/src/catalog/model-catalog.yaml b/packages/server/src/catalog/model-catalog.yaml
new file mode 100644
index 000000000..dfabdc9a2
--- /dev/null
+++ b/packages/server/src/catalog/model-catalog.yaml
@@ -0,0 +1,23 @@
+# Shipped model catalog: provider/model presets offered by
+# GET /api/v1/settings/model-providers/catalog for the settings UI to copy into
+# PUT /api/v1/settings/model-providers bodies. Discovery-only — never executed against.
+type: model-catalog
+providers:
+ - type: openai
+ name: openai
+ models:
+ - model_id: gpt-5.6-sol
+ name: gpt-5-6-sol
+ properties:
+ context_length: 400000
+ max_output_tokens: 32768
+ reasoning_efforts: [low, medium, high]
+ - type: anthropic
+ name: anthropic
+ models:
+ - model_id: claude-sonnet-4-6
+ name: claude-sonnet-4-6
+ properties:
+ context_length: 200000
+ max_output_tokens: 32768
+ reasoning_efforts: [low, medium, high]
diff --git a/packages/server/src/config.ts b/packages/server/src/config.ts
index f36f58fbe..5b3fc239a 100644
--- a/packages/server/src/config.ts
+++ b/packages/server/src/config.ts
@@ -226,6 +226,12 @@ export interface ServerConfiguration {
* `./registry`.
*/
REGISTRY_DIR: string;
+ /**
+ * Optional override for the model catalog YAML (discovery presets for
+ * GET /settings/model-providers/catalog). When unset, the catalog inlined at build
+ * time is used. Separate from `REGISTRY_DIR`. Env: `MODEL_CATALOG_PATH`.
+ */
+ MODEL_CATALOG_PATH: string | undefined;
/**
* Frontend build served alongside the API; a missing directory leaves the server API-only.
* Env: `FRONTEND_DIR`, defaults to `../frontend/dist` relative to the working directory.
@@ -354,6 +360,10 @@ const singleBinary = parseBoolean({
const configuration: ServerConfiguration = {
PORT: parsePort(getEnv('PORT')),
REGISTRY_DIR: path.resolve(getEnv('REGISTRY_DIR', { defaultValue: 'registry' }) ?? 'registry'),
+ MODEL_CATALOG_PATH: (() => {
+ const override = getEnv('MODEL_CATALOG_PATH');
+ return override === undefined || override === '' ? undefined : path.resolve(override);
+ })(),
FRONTEND_DIR: path.resolve(getEnv('FRONTEND_DIR', { defaultValue: DEFAULT_FRONTEND_DIR }) ?? DEFAULT_FRONTEND_DIR),
MODEL_API_KEY: getEnv('MODEL_API_KEY', { required: true }) ?? '',
MODEL_API_KEY_BY_NAME: parseApiKeysByName(),
diff --git a/packages/server/src/db/modelProviderStore.ts b/packages/server/src/db/modelProviderStore.ts
new file mode 100644
index 000000000..1d210a350
--- /dev/null
+++ b/packages/server/src/db/modelProviderStore.ts
@@ -0,0 +1,48 @@
+/**
+ * DB-backed configured model providers: one row per provider per tenant,
+ * identity as columns plus a Zod-validated `ProviderManifest` jsonb document.
+ * Implementations: PostgresModelProviderStore and SqliteModelProviderStore.
+ */
+import type { ResourceName } from '../schemas/common';
+import type { Model, ProviderManifest } from '../schemas/modelProvider';
+
+export interface ModelProviderRecord {
+ tenant_id: string;
+ name: ResourceName;
+ manifest: ProviderManifest;
+ /** ISO-8601 UTC instant. */
+ created_at: string;
+ /** ISO-8601 UTC instant. */
+ updated_at: string;
+}
+
+export interface GetProviderInput {
+ tenant_id: string;
+ name: string;
+}
+
+export interface UpsertProviderInput {
+ tenant_id: string;
+ name: ResourceName;
+ manifest: ProviderManifest;
+}
+
+export interface IModelProviderStore {
+ listProviders(tenantId: string): Promise<ModelProviderRecord[]>;
+ getProvider(input: GetProviderInput): Promise<ModelProviderRecord | undefined>;
+ /** Single-row write: creates the provider or replaces the whole manifest (models included). */
+ upsertProvider(input: UpsertProviderInput): Promise<ModelProviderRecord>;
+ /** Flattens manifests into the FQN read view for GET /models. */
+ listModels(tenantId: string): Promise<Model[]>;
+}
+
+/** Application-side flatten shared by both store implementations. */
+export function flattenProviderModels(records: ModelProviderRecord[]): Model[] {
+ return records.flatMap(record =>
+ record.manifest.models.map(model => ({
+ name: `${record.name}/${model.name}`,
+ model_id: model.model_id,
+ properties: model.properties,
+ })),
+ );
+}
diff --git a/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.ts b/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.ts
new file mode 100644
index 000000000..26e3630a1
--- /dev/null
+++ b/packages/server/src/db/postgres/migrations/20260803_000001_model_provider.ts
@@ -0,0 +1,28 @@
+import type { Kysely } from 'kysely';
+
+/**
+ * Configured model providers (canonical DDL owner).
+ *
+ * Manifest pattern: identity as columns, everything else (type, base_url,
+ * auth, models) in one `manifest` jsonb validated by Zod on every write.
+ * The PK is the only DB-level invariant — all others live at the Zod layer —
+ * so future manifest fields are schema changes, not migrations.
+ */
+export async function up(db: Kysely<unknown>): Promise<void> {
+ await db.schema
+ .createTable('model_provider')
+ // key
+ .addColumn('tenant_id', 'text', col => col.notNull())
+ // key: natural key within tenant; first segment of fully qualified model names
+ .addColumn('name', 'text', col => col.notNull())
+ // ProviderManifest document; replaced whole on every upsert
+ .addColumn('manifest', 'jsonb', col => col.notNull())
+ .addColumn('created_at', 'timestamptz', col => col.notNull())
+ .addColumn('updated_at', 'timestamptz', col => col.notNull())
+ .addPrimaryKeyConstraint('model_provider_pkey', ['tenant_id', 'name'])
+ .execute();
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+ await db.schema.dropTable('model_provider').ifExists().cascade().execute();
+}
diff --git a/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts b/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts
new file mode 100644
index 000000000..0dfb1aeff
--- /dev/null
+++ b/packages/server/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts
@@ -0,0 +1,74 @@
+import type { Kysely, Selectable } from 'kysely';
+import type { Model } from '../../../schemas/modelProvider';
+import {
+ flattenProviderModels,
+ type GetProviderInput,
+ type IModelProviderStore,
+ type ModelProviderRecord,
+ type UpsertProviderInput,
+} from '../../modelProviderStore';
+import { json, now } from '../sqlExpressions';
+import type { Database, ModelProviderTable } from '../types';
+
+function toRecord(row: Selectable<ModelProviderTable>): ModelProviderRecord {
+ return {
+ tenant_id: row.tenant_id,
+ name: row.name,
+ manifest: row.manifest,
+ created_at: row.created_at.toISOString(),
+ updated_at: row.updated_at.toISOString(),
+ };
+}
+
+export class PostgresModelProviderStore implements IModelProviderStore {
+ readonly #db: Kysely<Database>;
+
+ constructor(db: Kysely<Database>) {
+ this.#db = db;
+ }
+
+ async listProviders(tenantId: string): Promise<ModelProviderRecord[]> {
+ const rows = await this.#db
+ .selectFrom('model_provider')
+ .selectAll()
+ .where('tenant_id', '=', tenantId)
+ .orderBy('name')
+ .execute();
+ return rows.map(toRecord);
+ }
+
+ async getProvider(input: GetProviderInput): Promise<ModelProviderRecord | undefined> {
+ const row = await this.#db
+ .selectFrom('model_provider')
+ .selectAll()
+ .where('tenant_id', '=', input.tenant_id)
+ .where('name', '=', input.name)
+ .executeTakeFirst();
+ return row === undefined ? undefined : toRecord(row);
+ }
+
+ async upsertProvider(input: UpsertProviderInput): Promise<ModelProviderRecord> {
+ const row = await this.#db
+ .insertInto('model_provider')
+ .values({
+ tenant_id: input.tenant_id,
+ name: input.name,
+ manifest: json(input.manifest),
+ created_at: now(),
+ updated_at: now(),
+ })
+ .onConflict(oc =>
+ oc.columns(['tenant_id', 'name']).doUpdateSet({
+ manifest: json(input.manifest),
+ updated_at: now(),
+ }),
+ )
+ .returningAll()
+ .executeTakeFirstOrThrow();
+ return toRecord(row);
+ }
+
+ async listModels(tenantId: string): Promise<Model[]> {
+ return flattenProviderModels(await this.listProviders(tenantId));
+ }
+}
diff --git a/packages/server/src/db/postgres/session-store/queries/capabilities.ts b/packages/server/src/db/postgres/session-store/queries/capabilities.ts
index c4af561d0..2ad42d8df 100644
--- a/packages/server/src/db/postgres/session-store/queries/capabilities.ts
+++ b/packages/server/src/db/postgres/session-store/queries/capabilities.ts
@@ -1,7 +1,8 @@
import type { PatchThreadCapabilityStateInput } from '@truefoundry/utils/agent-session/store/ISessionStore';
import { sql, type Kysely } from 'kysely';
+import { json } from '../../sqlExpressions';
import type { Database } from '../../types';
-import { json, values } from '../sqlExpressions';
+import { values } from '../sqlExpressions';
import { classifyTurnFenceWriteFailure, turnRunningFence } from './turns';
/**
diff --git a/packages/server/src/db/postgres/session-store/queries/events.ts b/packages/server/src/db/postgres/session-store/queries/events.ts
index cfb620efb..70c9d2a78 100644
--- a/packages/server/src/db/postgres/session-store/queries/events.ts
+++ b/packages/server/src/db/postgres/session-store/queries/events.ts
@@ -14,8 +14,9 @@ import {
import { SessionNotFoundError, TurnNotFoundError } from '@truefoundry/utils/agent-session/store/SessionStoreErrors';
import type { Kysely } from 'kysely';
import { sql } from 'kysely';
+import { json } from '../../sqlExpressions';
import type { Database } from '../../types';
-import { json, unnestWithOrdinality, values } from '../sqlExpressions';
+import { unnestWithOrdinality, values } from '../sqlExpressions';
import { classifyTurnFenceWriteFailure, turnRunningFence } from './turns';
export async function appendToEvents(db: Kysely<Database>, input: AppendToEventsInput): Promise<void> {
diff --git a/packages/server/src/db/postgres/session-store/queries/sessions.ts b/packages/server/src/db/postgres/session-store/queries/sessions.ts
index 5459d9b0a..a37a111bb 100644
--- a/packages/server/src/db/postgres/session-store/queries/sessions.ts
+++ b/packages/server/src/db/postgres/session-store/queries/sessions.ts
@@ -13,8 +13,8 @@ import {
SessionStoreInvariantError,
} from '@truefoundry/utils/agent-session/store/SessionStoreErrors';
import { sql, type Kysely } from 'kysely';
+import { json } from '../../sqlExpressions';
import type { Database } from '../../types';
-import { json } from '../sqlExpressions';
function isPgUniqueViolation(error: unknown): boolean {
if (typeof error !== 'object' || error === null) {
diff --git a/packages/server/src/db/postgres/session-store/queries/threads.ts b/packages/server/src/db/postgres/session-store/queries/threads.ts
index 6f2f7a39e..3762c79ae 100644
--- a/packages/server/src/db/postgres/session-store/queries/threads.ts
+++ b/packages/server/src/db/postgres/session-store/queries/threads.ts
@@ -11,8 +11,9 @@ import type { AgentInfo } from '@truefoundry/utils/core/events/schema';
import type { ContextMessage, SubAgentCompletionMarker } from '@truefoundry/utils/core/runtime/AgentThread.types';
import type { CurrentContextUsage } from '@truefoundry/utils/core/runtime/contextUsage';
import { sql, type Kysely, type RawBuilder, type Transaction } from 'kysely';
+import { json, jsonbSet } from '../../sqlExpressions';
import type { Database, TurnThreadCheckpoint } from '../../types';
-import { json, jsonbSet, values } from '../sqlExpressions';
+import { values } from '../sqlExpressions';
import {
assertTurnRunning,
classifyTurnFenceWriteFailure,
diff --git a/packages/server/src/db/postgres/session-store/queries/turns.ts b/packages/server/src/db/postgres/session-store/queries/turns.ts
index 7380d53a1..55431081d 100644
--- a/packages/server/src/db/postgres/session-store/queries/turns.ts
+++ b/packages/server/src/db/postgres/session-store/queries/turns.ts
@@ -29,8 +29,9 @@ import { getEmptyCurrentContextUsage } from '@truefoundry/utils/core/runtime/con
import type { SandboxInfo } from '@truefoundry/utils/core/sandbox/Sandbox';
import { sql, type Kysely, type QueryCreator, type RawBuilder, type Transaction } from 'kysely';
import { isUniqueViolation } from '../../client';
+import { json } from '../../sqlExpressions';
import type { Database, TurnCheckpoint, TurnThreadCheckpoint } from '../../types';
-import { json, lateralUnnestBigintArrayWithOrdinality } from '../sqlExpressions';
+import { lateralUnnestBigintArrayWithOrdinality } from '../sqlExpressions';
type TurnCustom = Record<string, never>;
diff --git a/packages/server/src/db/postgres/session-store/sqlExpressions.ts b/packages/server/src/db/postgres/session-store/sqlExpressions.ts
index 08e64ffd4..3351a31e0 100644
--- a/packages/server/src/db/postgres/session-store/sqlExpressions.ts
+++ b/packages/server/src/db/postgres/session-store/sqlExpressions.ts
@@ -1,25 +1,8 @@
/**
- * Shared Kysely SQL expression helpers for the Postgres session store.
+ * Session-store-only helpers for Postgres (VALUES / unnest join shapes).
+ * Shared JSON/time helpers live in `../sqlExpressions`.
*/
-import { sql, type AliasedRawBuilder, type Expression, type RawBuilder } from 'kysely';
-
-/** Bind a JS value as jsonb (stringified + cast). Required for arrays and for `||` / jsonb_set operands. */
-export function json<T>(value: T): RawBuilder<T> {
- return sql`${JSON.stringify(value)}::jsonb`;
-}
-
-/**
- * `jsonb_set(target, path, new_value)`.
- * `path` may be a text[] expression (`sql\`ARRAY['threads', ${id}]\``) or a literal path
- * expression (`sql\`'{sandbox_info}'\`` / `sql\`'{completion}'\``).
- */
-export function jsonbSet<T = unknown>(
- target: Expression<unknown>,
- path: Expression<unknown>,
- newValue: Expression<unknown>,
-): RawBuilder<T> {
- return sql<T>`jsonb_set(${target}, ${path}, ${newValue})`;
-}
+import { sql, type AliasedRawBuilder, type Expression } from 'kysely';
/**
* Typed `(VALUES ...) AS alias(col1, col2, ...)` for use in `.selectFrom(...)`.
@@ -68,8 +51,3 @@ export function lateralUnnestBigintArrayWithOrdinality<A extends string>(
const aliasSql = sql`${wrappedAlias}(append_id, pos)`;
return sql<{ append_id: number; pos: number }>`LATERAL unnest(${arrayExpr}) WITH ORDINALITY`.as<A>(aliasSql);
}
-
-/** `now()` timestamptz expression. */
-export function now(): RawBuilder<Date> {
- return sql<Date>`now()`;
-}
diff --git a/packages/server/src/db/postgres/sqlExpressions.ts b/packages/server/src/db/postgres/sqlExpressions.ts
new file mode 100644
index 000000000..24b4b04d3
--- /dev/null
+++ b/packages/server/src/db/postgres/sqlExpressions.ts
@@ -0,0 +1,27 @@
+/**
+ * Shared Kysely SQL expression helpers for Postgres stores.
+ */
+import { sql, type Expression, type RawBuilder } from 'kysely';
+
+/** Bind a JS value as jsonb (stringified + cast). Required for arrays and for `||` / jsonb_set operands. */
+export function json<T>(value: T): RawBuilder<T> {
+ return sql`${JSON.stringify(value)}::jsonb`;
+}
+
+/**
+ * `jsonb_set(target, path, new_value)`.
+ * `path` may be a text[] expression (`sql\`ARRAY['threads', ${id}]\``) or a literal path
+ * expression (`sql\`'{sandbox_info}'\`` / `sql\`'{completion}'\``).
+ */
+export function jsonbSet<T = unknown>(
+ target: Expression<unknown>,
+ path: Expression<unknown>,
+ newValue: Expression<unknown>,
+): RawBuilder<T> {
+ return sql<T>`jsonb_set(${target}, ${path}, ${newValue})`;
+}
+
+/** `now()` timestamptz expression. */
+export function now(): RawBuilder<Date> {
+ return sql<Date>`now()`;
+}
diff --git a/packages/server/src/db/postgres/types.ts b/packages/server/src/db/postgres/types.ts
index d387c0e7a..6b5c81356 100644
--- a/packages/server/src/db/postgres/types.ts
+++ b/packages/server/src/db/postgres/types.ts
@@ -14,7 +14,8 @@ import type {
} from '@truefoundry/utils/core';
import type { CurrentContextUsage } from '@truefoundry/utils/core/runtime/contextUsage';
import type { ColumnType, Generated, JSONColumnType } from 'kysely';
-import type { McpServerManifest } from '../../store/schemas';
+import type { McpServerManifest } from '../../legacy-registry-store/schemas';
+import type { ProviderManifest } from '../../schemas/modelProvider';
import type { McpOAuthPendingAuthorizationData, McpOAuthToken, OAuthClient, OAuthServer } from '../mcpOAuthTypes';
/**
@@ -282,6 +283,22 @@ export interface ThreadCapabilityStateTable {
updated_at: Date;
}
+/**
+ * Configured model providers — manifest pattern: identity as columns,
+ * everything else in one Zod-validated jsonb document.
+ * PRIMARY KEY (tenant_id, name)
+ */
+export interface ModelProviderTable {
+ /** key */
+ tenant_id: string;
+ /** key: natural key within tenant; first segment of fully qualified model names */
+ name: string;
+ /** ProviderManifest document; replaced whole on every upsert */
+ manifest: JSONColumnType<ProviderManifest, ProviderManifest, ProviderManifest>;
+ created_at: Date;
+ updated_at: Date;
+}
+
/**
* PRIMARY KEY (id)
* UNIQUE (tenant_id, name) — the natural lookup key.
@@ -357,6 +374,7 @@ export interface Database {
session_event: SessionEventTable;
thread_context_log: ThreadContextLogTable;
thread_capability_state: ThreadCapabilityStateTable;
+ model_provider: ModelProviderTable;
mcp_server: McpServerTable;
oauth_token: OAuthTokenTable;
oauth_pending_authorization: OAuthPendingAuthorizationTable;
diff --git a/packages/server/src/db/sqlite/client.ts b/packages/server/src/db/sqlite/client.ts
index 0d494a397..6be122d72 100644
--- a/packages/server/src/db/sqlite/client.ts
+++ b/packages/server/src/db/sqlite/client.ts
@@ -136,6 +136,7 @@ const JSON_RESULT_COLUMNS = new Set([
'turn_state',
'thread_checkpoint',
'event',
+ 'manifest',
]);
/** Top-level row field only — `$[0]."body"`, not `$[0]."body"."content"`. */
diff --git a/packages/server/src/db/sqlite/migrations/20260803_000001_model_provider.ts b/packages/server/src/db/sqlite/migrations/20260803_000001_model_provider.ts
new file mode 100644
index 000000000..4a70dd91b
--- /dev/null
+++ b/packages/server/src/db/sqlite/migrations/20260803_000001_model_provider.ts
@@ -0,0 +1,23 @@
+import { sql, type Kysely } from 'kysely';
+
+/**
+ * Configured model providers for SQLite (canonical DDL owner).
+ * Mirrors the Postgres `model_provider` table: manifest is BLOB SQLite JSONB
+ * (via jsonb(...)), timestamps are ISO-8601 TEXT.
+ */
+export async function up(db: Kysely<unknown>): Promise<void> {
+ await sql`
+ CREATE TABLE model_provider (
+ tenant_id TEXT NOT NULL,
+ name TEXT NOT NULL,
+ manifest BLOB NOT NULL,
+ created_at TEXT NOT NULL,
+ updated_at TEXT NOT NULL,
+ PRIMARY KEY (tenant_id, name)
+ ) STRICT
+ `.execute(db);
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+ await sql`DROP TABLE IF EXISTS model_provider`.execute(db);
+}
diff --git a/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts b/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts
new file mode 100644
index 000000000..1c76855b5
--- /dev/null
+++ b/packages/server/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts
@@ -0,0 +1,73 @@
+import type { ExpressionBuilder, Kysely } from 'kysely';
+import type { Model, ProviderManifest } from '../../../schemas/modelProvider';
+import {
+ flattenProviderModels,
+ type GetProviderInput,
+ type IModelProviderStore,
+ type ModelProviderRecord,
+ type UpsertProviderInput,
+} from '../../modelProviderStore';
+import { jsonbBind, jsonText, nowIso } from '../sqlExpressions';
+import type { Database } from '../types';
+
+/** Column list projecting the JSONB manifest as parsed JSON (see JSON_RESULT_COLUMNS). */
+function recordColumns(eb: ExpressionBuilder<Database, 'model_provider'>) {
+ return [
+ 'tenant_id' as const,
+ 'name' as const,
+ jsonText<ProviderManifest>(eb.ref('manifest')).as('manifest'),
+ 'created_at' as const,
+ 'updated_at' as const,
+ ];
+}
+
+export class SqliteModelProviderStore implements IModelProviderStore {
+ readonly #db: Kysely<Database>;
+
+ constructor(db: Kysely<Database>) {
+ this.#db = db;
+ }
+
+ async listProviders(tenantId: string): Promise<ModelProviderRecord[]> {
+ return await this.#db
+ .selectFrom('model_provider')
+ .select(recordColumns)
+ .where('tenant_id', '=', tenantId)
+ .orderBy('name')
+ .execute();
+ }
+
+ async getProvider(input: GetProviderInput): Promise<ModelProviderRecord | undefined> {
+ return await this.#db
+ .selectFrom('model_provider')
+ .select(recordColumns)
+ .where('tenant_id', '=', input.tenant_id)
+ .where('name', '=', input.name)
+ .executeTakeFirst();
+ }
+
+ async upsertProvider(input: UpsertProviderInput): Promise<ModelProviderRecord> {
+ const timestamp = nowIso();
+ return await this.#db
+ .insertInto('model_provider')
+ .values({
+ tenant_id: input.tenant_id,
+ name: input.name,
+ manifest: jsonbBind(input.manifest),
+ created_at: timestamp,
+ updated_at: timestamp,
+ })
+ .onConflict(oc =>
+ oc.columns(['tenant_id', 'name']).doUpdateSet({
+ manifest: jsonbBind(input.manifest),
+ updated_at: timestamp,
+ }),
+ )
+ .returning(recordColumns)
+ .executeTakeFirstOrThrow();
+ }
+
+ async listModels(tenantId: string): Promise<Model[]> {
+ return flattenProviderModels(await this.listProviders(tenantId));
+ }
+}
diff --git a/packages/server/src/db/sqlite/session-store/queries/capabilities.ts b/packages/server/src/db/sqlite/session-store/queries/capabilities.ts
index 558e3b9f8..fa372fb02 100644
--- a/packages/server/src/db/sqlite/session-store/queries/capabilities.ts
+++ b/packages/server/src/db/sqlite/session-store/queries/capabilities.ts
@@ -1,7 +1,7 @@
import type { PatchThreadCapabilityStateInput } from '@truefoundry/utils/agent-session/store/ISessionStore';
import { sql, type Kysely } from 'kysely';
+import { jsonbBind, nowIso } from '../../sqlExpressions';
import type { Database } from '../../types';
-import { jsonbBind, nowIso } from '../sqlExpressions';
import { classifyTurnFenceWriteFailure } from './turns';
/**
diff --git a/packages/server/src/db/sqlite/session-store/queries/events.ts b/packages/server/src/db/sqlite/session-store/queries/events.ts
index 3034c51f3..0bfdf5521 100644
--- a/packages/server/src/db/sqlite/session-store/queries/events.ts
+++ b/packages/server/src/db/sqlite/session-store/queries/events.ts
@@ -13,8 +13,8 @@ import {
} from '@truefoundry/utils/agent-session/store/SessionEventPageToken';
import { SessionNotFoundError, TurnNotFoundError } from '@truefoundry/utils/agent-session/store/SessionStoreErrors';
import { sql, type Kysely } from 'kysely';
+import { jsonbBind, jsonText } from '../../sqlExpressions';
import type { Database } from '../../types';
-import { jsonbBind, jsonText } from '../sqlExpressions';
import { classifyTurnFenceWriteFailure, type TurnKeys } from './turns';
export async function appendToEvents(db: Kysely<Database>, input: AppendToEventsInput): Promise<void> {
diff --git a/packages/server/src/db/sqlite/session-store/queries/sessions.ts b/packages/server/src/db/sqlite/session-store/queries/sessions.ts
index 64bcbb982..46a36b700 100644
--- a/packages/server/src/db/sqlite/session-store/queries/sessions.ts
+++ b/packages/server/src/db/sqlite/session-store/queries/sessions.ts
@@ -15,8 +15,8 @@ import {
} from '@truefoundry/utils/agent-session/store/SessionStoreErrors';
import { sql, type Kysely } from 'kysely';
import { isUniqueViolation } from '../../client';
+import { jsonbBind, jsonText, nowIso } from '../../sqlExpressions';
import type { Database } from '../../types';
-import { jsonbBind, jsonText, nowIso } from '../sqlExpressions';
type SessionCustom = Record<string, never>;
type ProtoSessionRecord = SessionRecord<SessionCustom>;
diff --git a/packages/server/src/db/sqlite/session-store/queries/threads.ts b/packages/server/src/db/sqlite/session-store/queries/threads.ts
index 30729d00b..852abbb58 100644
--- a/packages/server/src/db/sqlite/session-store/queries/threads.ts
+++ b/packages/server/src/db/sqlite/session-store/queries/threads.ts
@@ -9,8 +9,9 @@ import type {
import type { ContextMessage, SubAgentCompletionMarker } from '@truefoundry/utils/core/runtime/AgentThread.types';
import type { CurrentContextUsage } from '@truefoundry/utils/core/runtime/contextUsage';
import { sql, type Kysely, type RawBuilder, type Transaction } from 'kysely';
+import { jsonbBind, jsonbSet, nowIso } from '../../sqlExpressions';
import type { Database, TurnThreadCheckpoint } from '../../types';
-import { jsonbBind, jsonbSet, nowIso, sortedByAppendId } from '../sqlExpressions';
+import { sortedByAppendId } from '../sqlExpressions';
import {
assertTurnRunning,
classifyTurnFenceWriteFailure,
diff --git a/packages/server/src/db/sqlite/session-store/queries/turns.ts b/packages/server/src/db/sqlite/session-store/queries/turns.ts
index e32ea74c0..5c282952a 100644
--- a/packages/server/src/db/sqlite/session-store/queries/turns.ts
+++ b/packages/server/src/db/sqlite/session-store/queries/turns.ts
@@ -29,8 +29,9 @@ import { getEmptyCurrentContextUsage } from '@truefoundry/utils/core/runtime/con
import type { SandboxInfo } from '@truefoundry/utils/core/sandbox/Sandbox';
import { sql, type Kysely, type RawBuilder, type Transaction } from 'kysely';
import { isUniqueViolation } from '../../client';
+import { jsonbBind, jsonText, nowIso } from '../../sqlExpressions';
import type { Database, TurnCheckpoint, TurnThreadCheckpoint } from '../../types';
-import { jsonbBind, jsonText, nowIso, sortedByAppendId } from '../sqlExpressions';
+import { sortedByAppendId } from '../sqlExpressions';
type TurnCustom = Record<string, never>;
diff --git a/packages/server/src/db/sqlite/session-store/sqlExpressions.ts b/packages/server/src/db/sqlite/session-store/sqlExpressions.ts
index fad3f64d3..59b835028 100644
--- a/packages/server/src/db/sqlite/session-store/sqlExpressions.ts
+++ b/packages/server/src/db/sqlite/session-store/sqlExpressions.ts
@@ -1,35 +1,7 @@
/**
- * Shared Kysely SQL expression helpers for the SQLite session store.
- * JSON authority: SQLite JSON1 — bind text via jsonb(?); read via json(column).
- * ParseJSONResultsPlugin parses top-level json() columns only (see createSqliteDb).
+ * Session-store-only helpers for SQLite (append_id ordering quirks).
+ * Shared JSON/time helpers live in `../sqlExpressions`.
*/
-import { sql, type Expression, type RawBuilder } from 'kysely';
-
-/** Bind a JS value as SQLite JSONB BLOB (stringify in JS, convert in SQL). */
-export function jsonbBind(value: unknown): RawBuilder<string> {
- return sql`jsonb(${JSON.stringify(value)})`;
-}
-
-/**
- * `jsonb_set(column, path, jsonb(?))`.
- * `path` must be a fixed literal from call sites (e.g. `'$.completion'`).
- */
-export function jsonbSet(column: Expression<unknown>, path: string, value: unknown): RawBuilder<string> {
- return sql`jsonb_set(${column}, ${path}, ${jsonbBind(value)})`;
-}
-
-/**
- * Project a JSONB column to minified text JSON.
- * With ParseJSONResultsPlugin, the result row field is the parsed JS value typed as `T`.
- */
-export function jsonText<T>(column: Expression<unknown>): RawBuilder<T> {
- return sql<T>`json(${column})`;
-}
-
-/** Current UTC instant as ISO-8601 text for TEXT timestamp columns. */
-export function nowIso(): string {
- return new Date().toISOString();
-}
/**
* SQLite RETURNING row order is unspecified. Multi-row INSERT assigns increasing
diff --git a/packages/server/src/db/sqlite/sqlExpressions.ts b/packages/server/src/db/sqlite/sqlExpressions.ts
new file mode 100644
index 000000000..d588c848a
--- /dev/null
+++ b/packages/server/src/db/sqlite/sqlExpressions.ts
@@ -0,0 +1,32 @@
+/**
+ * Shared Kysely SQL expression helpers for SQLite stores.
+ * JSON authority: SQLite JSON1 — bind text via jsonb(?); read via json(column).
+ * ParseJSONResultsPlugin parses top-level json() columns only (see createSqliteDb).
+ */
+import { sql, type Expression, type RawBuilder } from 'kysely';
+
+/** Bind a JS value as SQLite JSONB BLOB (stringify in JS, convert in SQL). */
+export function jsonbBind(value: unknown): RawBuilder<string> {
+ return sql`jsonb(${JSON.stringify(value)})`;
+}
+
+/**
+ * `jsonb_set(column, path, jsonb(?))`.
+ * `path` must be a fixed literal from call sites (e.g. `'$.completion'`).
+ */
+export function jsonbSet(column: Expression<unknown>, path: string, value: unknown): RawBuilder<string> {
+ return sql`jsonb_set(${column}, ${path}, ${jsonbBind(value)})`;
+}
+
+/**
+ * Project a JSONB column to minified text JSON.
+ * With ParseJSONResultsPlugin, the result row field is the parsed JS value typed as `T`.
+ */
+export function jsonText<T>(column: Expression<unknown>): RawBuilder<T> {
+ return sql<T>`json(${column})`;
+}
+
+/** Current UTC instant as ISO-8601 text for TEXT timestamp columns. */
+export function nowIso(): string {
+ return new Date().toISOString();
+}
diff --git a/packages/server/src/db/sqlite/types.ts b/packages/server/src/db/sqlite/types.ts
index 2d28be7c8..2f2018510 100644
--- a/packages/server/src/db/sqlite/types.ts
+++ b/packages/server/src/db/sqlite/types.ts
@@ -17,7 +17,8 @@ import type {
} from '@truefoundry/utils/core';
import type { CurrentContextUsage } from '@truefoundry/utils/core/runtime/contextUsage';
import type { ColumnType, Generated, JSONColumnType } from 'kysely';
-import type { McpServerManifest } from '../../store/schemas';
+import type { McpServerManifest } from '../../legacy-registry-store/schemas';
+import type { ProviderManifest } from '../../schemas/modelProvider';
import type { McpOAuthPendingAuthorizationData, McpOAuthToken, OAuthClient, OAuthServer } from '../mcpOAuthTypes';
/**
@@ -139,6 +140,19 @@ export interface ThreadCapabilityStateTable {
updated_at: string;
}
+/**
+ * Configured model providers — mirrors the Postgres `model_provider` table.
+ * PRIMARY KEY (tenant_id, name)
+ */
+export interface ModelProviderTable {
+ tenant_id: string;
+ name: string;
+ /** ProviderManifest document; replaced whole on every upsert */
+ manifest: JsonbColumn<ProviderManifest>;
+ created_at: string;
+ updated_at: string;
+}
+
/**
* PRIMARY KEY (id)
* UNIQUE (tenant_id, name) — the natural lookup key;
@@ -195,6 +209,7 @@ export interface Database {
session_event: SessionEventTable;
thread_context_log: ThreadContextLogTable;
thread_capability_state: ThreadCapabilityStateTable;
+ model_provider: ModelProviderTable;
mcp_server: McpServerTable;
oauth_token: OAuthTokenTable;
oauth_pending_authorization: OAuthPendingAuthorizationTable;
diff --git a/packages/server/src/store/McpStore.ts b/packages/server/src/legacy-registry-store/McpStore.ts
similarity index 95%
rename from packages/server/src/store/McpStore.ts
rename to packages/server/src/legacy-registry-store/McpStore.ts
index d97a4a188..1c11c92a0 100644
--- a/packages/server/src/store/McpStore.ts
+++ b/packages/server/src/legacy-registry-store/McpStore.ts
@@ -3,8 +3,8 @@
* MCP_HEADERS / MCP_{NAME}_HEADERS env vars and are never exposed in list
* output.
*/
+import { loadYamlFile } from '../catalog/loadYaml';
import configuration, { CONFIG_FILES, normalizeEnvName } from '../config';
-import { loadYamlFile } from './loadYaml';
import { McpFileSchema, type McpServerEntry } from './schemas';
export class McpStore {
diff --git a/packages/server/src/store/ModelStore.ts b/packages/server/src/legacy-registry-store/ModelStore.ts
similarity index 98%
rename from packages/server/src/store/ModelStore.ts
rename to packages/server/src/legacy-registry-store/ModelStore.ts
index 9318b2bc8..eccb8a331 100644
--- a/packages/server/src/store/ModelStore.ts
+++ b/packages/server/src/legacy-registry-store/ModelStore.ts
@@ -6,8 +6,8 @@
* Credentials are injected at runtime from env vars and are never exposed in
* list output.
*/
+import { loadYamlFile } from '../catalog/loadYaml';
import configuration, { CONFIG_FILES, normalizeEnvName } from '../config';
-import { loadYamlFile } from './loadYaml';
import { ModelsFileSchema, type ModelEntry } from './schemas';
/**
diff --git a/packages/server/src/store/SkillStore.ts b/packages/server/src/legacy-registry-store/SkillStore.ts
similarity index 92%
rename from packages/server/src/store/SkillStore.ts
rename to packages/server/src/legacy-registry-store/SkillStore.ts
index 1fdc7fd1e..7462aafd0 100644
--- a/packages/server/src/store/SkillStore.ts
+++ b/packages/server/src/legacy-registry-store/SkillStore.ts
@@ -1,8 +1,8 @@
/**
* Catalog of agent skills from skills.yaml (git-based skills).
*/
+import { loadYamlFile } from '../catalog/loadYaml';
import { CONFIG_FILES } from '../config';
-import { loadYamlFile } from './loadYaml';
import { SkillsFileSchema, type SkillEntry } from './schemas';
export class SkillStore {
diff --git a/packages/server/src/store/schemas.ts b/packages/server/src/legacy-registry-store/schemas.ts
similarity index 92%
rename from packages/server/src/store/schemas.ts
rename to packages/server/src/legacy-registry-store/schemas.ts
index a70a265e3..10b931dca 100644
--- a/packages/server/src/store/schemas.ts
+++ b/packages/server/src/legacy-registry-store/schemas.ts
@@ -1,5 +1,6 @@
/**
- * Zod schemas for the YAML config files (models.yaml, mcp.yaml, skills.yaml).
+ * Zod schemas for the legacy YAML registry files (models.yaml, mcp.yaml, skills.yaml).
+ * Separate from DB-backed model-provider / catalog schemas under src/schemas/.
* Validation is strict: unknown keys, duplicate names, or missing fields make
* the server fail at startup.
*
@@ -7,20 +8,7 @@
*/
import { z } from '@hono/zod-openapi';
import { normalizeEnvName } from '../config';
-
-/** Adds a validation issue if two entries share a name. */
-function uniqueNames(entries: { name: string }[], ctx: z.RefinementCtx): void {
- const seen = new Set<string>();
- for (const entry of entries) {
- if (seen.has(entry.name)) {
- ctx.addIssue({
- code: z.ZodIssueCode.custom,
- message: `Duplicate name "${entry.name}" — names must be unique`,
- });
- }
- seen.add(entry.name);
- }
-}
+import { uniqueNames } from '../schemas/common';
/**
* Adds a validation issue if two names normalize to the same `{NAME}` env var
diff --git a/packages/server/src/main.ts b/packages/server/src/main.ts
index a01951423..0e387417c 100644
--- a/packages/server/src/main.ts
+++ b/packages/server/src/main.ts
@@ -24,21 +24,25 @@ try {
{ connectRedis },
{ RequestReplyExecutor, RequestReplyRouter },
{ PostgresSessionStore },
+ { ModelCatalog },
+ { PostgresModelProviderStore },
] = await Promise.all([
import('./app'),
import('./frontend'),
import('./config'),
import('./db/postgres/client'),
import('./db/migratePostgres'),
- import('./store/ModelStore'),
- import('./store/McpStore'),
- import('./store/SkillStore'),
+ import('./legacy-registry-store/ModelStore'),
+ import('./legacy-registry-store/McpStore'),
+ import('./legacy-registry-store/SkillStore'),
import('@truefoundry/utils/agent-session'),
import('./runtime/activeTurns'),
import('./runtime/sandboxFactory'),
import('./runtime/redis'),
import('@truefoundry/utils/request-reply'),
import('./db/postgres/session-store/PostgresSessionStore'),
+ import('./catalog/ModelCatalog'),
+ import('./db/postgres/model-provider-store/PostgresModelProviderStore'),
]);
// Console logger shared by the server runtime (harness components require one).
@@ -68,6 +72,8 @@ try {
const app = createServerApp({
modelStore: ModelStore.load(),
+ modelCatalog: ModelCatalog.load(),
+ modelProviderStore: new PostgresModelProviderStore(db),
mcpStore: McpStore.load(),
skillStore,
sessionStore,
diff --git a/packages/server/src/routes/mcpOAuthRoutes.ts b/packages/server/src/routes/legacyMcpOAuthRoutes.ts
similarity index 96%
rename from packages/server/src/routes/mcpOAuthRoutes.ts
rename to packages/server/src/routes/legacyMcpOAuthRoutes.ts
index afdf2e852..5e30d9b51 100644
--- a/packages/server/src/routes/mcpOAuthRoutes.ts
+++ b/packages/server/src/routes/legacyMcpOAuthRoutes.ts
@@ -1,7 +1,7 @@
import { createRoute, z } from '@hono/zod-openapi';
import { RequestErrorResponseSchema } from '../schemas/errors';
-const MCP_OAUTH_TAG = 'MCP OAuth';
+const MCP_OAUTH_TAG = 'Legacy MCP OAuth';
const McpOAuthCallbackQuerySchema = z.object({
state: z.string().min(1).describe('Opaque token; correlates this callback to its pending authorization.'),
diff --git a/packages/server/src/routes/mcpRoutes.ts b/packages/server/src/routes/legacyMcpRoutes.ts
similarity index 94%
rename from packages/server/src/routes/mcpRoutes.ts
rename to packages/server/src/routes/legacyMcpRoutes.ts
index 8df46d513..a0398e92a 100644
--- a/packages/server/src/routes/mcpRoutes.ts
+++ b/packages/server/src/routes/legacyMcpRoutes.ts
@@ -1,8 +1,8 @@
import { createRoute, z } from '@hono/zod-openapi';
+import { McpServerEntrySchema } from '../legacy-registry-store/schemas';
import { RequestErrorResponseSchema } from '../schemas/errors';
-import { McpServerEntrySchema } from '../store/schemas';
-const MCP_SERVERS_TAG = 'MCP Servers';
+const MCP_SERVERS_TAG = 'Legacy MCP Servers';
// Extends the yaml-validation schema with a response-only field — `auth_status` isn't a valid
// mcp.yaml key, so it's added here rather than on McpServerEntrySchema itself.
@@ -30,7 +30,7 @@ export const listMcpServersRoute = createRoute({
description:
'MCP servers declared in mcp.yaml, each with a passive auth_status snapshot. Auth headers are ' +
'configured via env vars and never returned.',
- 'x-fern-sdk-group-name': ['mcp_servers'],
+ 'x-fern-sdk-group-name': ['legacy', 'mcp_servers'],
'x-fern-sdk-method-name': 'list',
responses: {
200: {
@@ -62,7 +62,7 @@ export const listMcpToolsRoute = createRoute({
path: '/{name}/tools',
tags: [MCP_SERVERS_TAG],
summary: 'List tools of an MCP server',
- 'x-fern-sdk-group-name': ['mcp_servers'],
+ 'x-fern-sdk-group-name': ['legacy', 'mcp_servers'],
'x-fern-sdk-method-name': 'list_tools',
description:
'All tools exposed by the given MCP server (non-paginated), as returned by the MCP `tools/list` call. No agent-spec tool selectors are applied — this is the raw server catalog.',
@@ -105,7 +105,7 @@ export const authorizeMcpServerRoute = createRoute({
path: '/{name}/authorize',
tags: [MCP_SERVERS_TAG],
summary: 'Start (or short-circuit) the auth flow for an MCP server',
- 'x-fern-sdk-group-name': ['mcp_servers'],
+ 'x-fern-sdk-group-name': ['legacy', 'mcp_servers'],
'x-fern-sdk-method-name': 'authorize',
description:
'Registers a DCR client for this server if none exists yet, then returns an authorization URL to ' +
diff --git a/packages/server/src/routes/legacyModelRoutes.ts b/packages/server/src/routes/legacyModelRoutes.ts
new file mode 100644
index 000000000..e0cb109dd
--- /dev/null
+++ b/packages/server/src/routes/legacyModelRoutes.ts
@@ -0,0 +1,25 @@
+import { createRoute, z } from '@hono/zod-openapi';
+import { ModelEntrySchema } from '../legacy-registry-store/schemas';
+
+const ListLegacyModelsResponseSchema = z
+ .object({
+ data: z.array(ModelEntrySchema),
+ })
+ .openapi('ListLegacyModelsResponse');
+
+/** YAML-backed registry list; runtime still uses ModelStore for turns. */
+export const listLegacyModelsRoute = createRoute({
+ method: 'get',
+ path: '/',
+ tags: ['Legacy Models'],
+ summary: 'List models (models.yaml)',
+ 'x-fern-sdk-group-name': ['legacy', 'models'],
+ 'x-fern-sdk-method-name': 'list',
+ description: 'Models declared in models.yaml — the registry the runtime still uses for turns.',
+ responses: {
+ 200: {
+ content: { 'application/json': { schema: ListLegacyModelsResponseSchema } },
+ description: 'All configured models.',
+ },
+ },
+});
diff --git a/packages/server/src/routes/skillRoutes.ts b/packages/server/src/routes/legacySkillRoutes.ts
similarity index 78%
rename from packages/server/src/routes/skillRoutes.ts
rename to packages/server/src/routes/legacySkillRoutes.ts
index 2ee505d0c..259c616ab 100644
--- a/packages/server/src/routes/skillRoutes.ts
+++ b/packages/server/src/routes/legacySkillRoutes.ts
@@ -1,5 +1,5 @@
import { createRoute, z } from '@hono/zod-openapi';
-import { SkillEntrySchema } from '../store/schemas';
+import { SkillEntrySchema } from '../legacy-registry-store/schemas';
const ListSkillsResponseSchema = z
.object({
@@ -10,9 +10,9 @@ const ListSkillsResponseSchema = z
export const listSkillsRoute = createRoute({
method: 'get',
path: '/',
- tags: ['Skills'],
+ tags: ['Legacy Skills'],
summary: 'List skills',
- 'x-fern-sdk-group-name': ['skills'],
+ 'x-fern-sdk-group-name': ['legacy', 'skills'],
'x-fern-sdk-method-name': 'list',
description: 'Agent skills declared in skills.yaml.',
responses: {
diff --git a/packages/server/src/routes/modelProviderRoutes.ts b/packages/server/src/routes/modelProviderRoutes.ts
new file mode 100644
index 000000000..d5383b607
--- /dev/null
+++ b/packages/server/src/routes/modelProviderRoutes.ts
@@ -0,0 +1,75 @@
+/**
+ * Model-provider route definitions (mounted at /api/v1/settings/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,
+ PutModelProviderResponseSchema,
+} from '../schemas/modelProvider';
+
+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: copy an entry ' +
+ 'into PUT /settings/model-providers to configure it. Custom providers are not listed here.',
+ '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.',
+ },
+ },
+});
+
+export const listModelProvidersRoute = createRoute({
+ method: 'get',
+ path: '/',
+ tags: [MODEL_PROVIDERS_TAG],
+ summary: 'List configured model providers',
+ description: 'All configured providers with their models.',
+ 'x-fern-sdk-group-name': ['settings', 'modelProviders'],
+ 'x-fern-sdk-method-name': 'list',
+ responses: {
+ 200: {
+ content: { 'application/json': { schema: ListModelProvidersResponseSchema } },
+ description: 'All configured model providers.',
+ },
+ },
+});
+
+export const putModelProviderRoute = createRoute({
+ method: 'put',
+ path: '/',
+ tags: [MODEL_PROVIDERS_TAG],
+ summary: 'Create or replace a model provider',
+ description:
+ 'Full upsert keyed by `name`: creates the provider or replaces its entire configuration (models included).',
+ 'x-fern-sdk-group-name': ['settings', 'modelProviders'],
+ 'x-fern-sdk-method-name': 'upsert',
+ request: {
+ body: {
+ content: { 'application/json': { schema: PutModelProviderRequestSchema } },
+ required: true,
+ },
+ },
+ responses: {
+ 200: {
+ content: { 'application/json': { schema: PutModelProviderResponseSchema } },
+ description: 'The saved provider.',
+ },
+ 400: {
+ content: { 'application/json': { schema: RequestErrorResponseSchema } },
+ description: 'Invalid request body.',
+ },
+ },
+});
diff --git a/packages/server/src/routes/modelRoutes.ts b/packages/server/src/routes/modelRoutes.ts
index c1c92714d..72fa58de6 100644
--- a/packages/server/src/routes/modelRoutes.ts
+++ b/packages/server/src/routes/modelRoutes.ts
@@ -1,11 +1,5 @@
-import { createRoute, z } from '@hono/zod-openapi';
-import { ModelEntrySchema } from '../store/schemas';
-
-const ListModelsResponseSchema = z
- .object({
- data: z.array(ModelEntrySchema),
- })
- .openapi('ListModelsResponse');
+import { createRoute } from '@hono/zod-openapi';
+import { ListModelsResponseSchema } from '../schemas/modelProvider';
export const listModelsRoute = createRoute({
method: 'get',
@@ -14,11 +8,11 @@ export const listModelsRoute = createRoute({
summary: 'List models',
'x-fern-sdk-group-name': ['models'],
'x-fern-sdk-method-name': 'list',
- description: "Models declared in models.yaml, reachable through the OpenAI-compatible API at the file's base_url.",
+ description: 'Models across all configured model providers, addressed by fully qualified name `name/model_name`.',
responses: {
200: {
content: { 'application/json': { schema: ListModelsResponseSchema } },
- description: 'All configured models.',
+ description: 'All models of all configured providers.',
},
},
});
diff --git a/packages/server/src/schemas/AGENTS.md b/packages/server/src/schemas/AGENTS.md
new file mode 100644
index 000000000..69b78e71f
--- /dev/null
+++ b/packages/server/src/schemas/AGENTS.md
@@ -0,0 +1 @@
+- Breaking changes to Zod schemas that back persisted JSON (e.g. `model_provider.manifest`) MUST include a data migration or rewrite for existing rows.
diff --git a/packages/server/src/schemas/CLAUDE.md b/packages/server/src/schemas/CLAUDE.md
new file mode 100644
index 000000000..43c994c2d
--- /dev/null
+++ b/packages/server/src/schemas/CLAUDE.md
@@ -0,0 +1 @@
diff --git a/packages/server/src/schemas/common.ts b/packages/server/src/schemas/common.ts
new file mode 100644
index 000000000..c67aee677
--- /dev/null
+++ b/packages/server/src/schemas/common.ts
@@ -0,0 +1,34 @@
+/**
+ * Server-wide shared Zod field schemas and refinements.
+ */
+import { z } from '@hono/zod-openapi';
+
+/**
+ * Lowercase slug, 2–64 chars: starts with a letter, ends with alphanumeric,
+ * may contain ".", "_" or "-" in between (aligned with SF model-integration names).
+ */
+export const NameSchema = z
+ .string()
+ .min(2)
+ .max(64)
+ .regex(
+ /^[a-z](?:[a-z0-9._-]{0,62}[a-z0-9])$/,
+ 'must be 2–64 lowercase chars: start with a letter, end with alphanumeric, optionally separated by ".", "_" or "-"',
+ )
+ .openapi('ResourceName');
+
+export type ResourceName = z.infer<typeof NameSchema>;
+
+/** Adds a validation issue if two entries share a name. */
+export function uniqueNames(entries: { name: string }[], ctx: z.RefinementCtx): void {
+ const seen = new Set<string>();
+ for (const entry of entries) {
+ if (seen.has(entry.name)) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: `Duplicate name "${entry.name}" — names must be unique`,
+ });
+ }
+ seen.add(entry.name);
+ }
+}
diff --git a/packages/server/src/schemas/modelCatalog.ts b/packages/server/src/schemas/modelCatalog.ts
new file mode 100644
index 000000000..c0f8e3a7c
--- /dev/null
+++ b/packages/server/src/schemas/modelCatalog.ts
@@ -0,0 +1,39 @@
+/**
+ * Shipped model-catalog.yaml schemas (discovery presets). Separate from
+ * configured provider manifests in modelProvider.ts.
+ */
+import { z } from '@hono/zod-openapi';
+import { NameSchema, uniqueNames } from './common';
+import { ModelEntrySchema, ProviderTypeSchema, refineUniqueModels } from './modelProvider';
+
+/** Catalog entry: no `custom` providers — those exist only as tenant configuration. */
+export const CatalogProviderSchema = z
+ .object({
+ type: ProviderTypeSchema.exclude(['custom']),
+ name: NameSchema,
+ models: z.array(ModelEntrySchema).min(1),
+ })
+ .strict()
+ .openapi('CatalogProvider');
+
+export const ModelCatalogFileSchema = z
+ .object({
+ type: z.literal('model-catalog'),
+ providers: z.array(CatalogProviderSchema),
+ })
+ .strict()
+ .superRefine((file, ctx) => {
+ uniqueNames(file.providers, ctx);
+ for (const provider of file.providers) {
+ refineUniqueModels(provider.models, ctx);
+ }
+ });
+
+export const GetModelProviderCatalogResponseSchema = z
+ .object({
+ data: z.array(CatalogProviderSchema),
+ })
+ .openapi('GetModelProviderCatalogResponse');
+
+export type CatalogProvider = z.infer<typeof CatalogProviderSchema>;
+export type ModelCatalogFile = z.infer<typeof ModelCatalogFileSchema>;
diff --git a/packages/server/src/schemas/modelProvider.ts b/packages/server/src/schemas/modelProvider.ts
new file mode 100644
index 000000000..b0c56273e
--- /dev/null
+++ b/packages/server/src/schemas/modelProvider.ts
@@ -0,0 +1,118 @@
+/**
+ * Model-provider domain + wire schemas: configured provider manifests (DB /
+ * PUT body) and OpenAPI request/response shapes. Catalog file schemas live on
+ * ModelCatalog.
+ */
+import { z } from '@hono/zod-openapi';
+import { NameSchema, uniqueNames } from './common';
+
+export const ProviderTypeSchema = z.enum(['openai', 'anthropic', 'custom']).openapi('ProviderType');
+
+export const ModelPropertiesSchema = z
+ .object({
+ context_length: z.number().int().positive(),
+ max_output_tokens: z.number().int().positive(),
+ reasoning_efforts: z.array(z.string().min(1)).min(1).optional(),
+ })
+ .strict()
+ .openapi('ModelProperties');
+
+export const ModelEntrySchema = z
+ .object({
+ model_id: z.string().min(1).describe('Upstream, provider-specific identifier sent to the provider API.'),
+ name: NameSchema.describe('Internal identifier; forms the fully qualified name `name/model_name`.'),
+ properties: ModelPropertiesSchema,
+ })
+ .strict()
+ .openapi('ModelEntry');
+
+/** Adds issues when two models share a `model_id` or a `name`. */
+export function refineUniqueModels(models: { model_id: string; name: string }[], ctx: z.RefinementCtx): void {
+ uniqueNames(models, ctx);
+ const seenModelIds = new Set<string>();
+ for (const model of models) {
+ if (seenModelIds.has(model.model_id)) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: `Duplicate model_id "${model.model_id}" — model_ids must be unique within a provider`,
+ path: ['models'],
+ });
+ }
+ seenModelIds.add(model.model_id);
+ }
+}
+
+const ProviderAuthSchema = z
+ .object({
+ api_key: z.string().min(1),
+ })
+ .strict()
+ .openapi('ModelProviderAuth');
+
+/**
+ * Non-identity fields of a configured provider, shared verbatim between the
+ * PUT request body and the persisted `model_provider.manifest` document.
+ * Compose with `.superRefine(refineProviderManifest)` after any `.extend()`.
+ */
+export const ProviderManifestObjectSchema = z
+ .object({
+ type: ProviderTypeSchema,
+ base_url: z.string().url().describe("Base URL of the provider's API."),
+ auth: ProviderAuthSchema,
+ models: z.array(ModelEntrySchema).min(1),
+ })
+ .strict();
+
+export function refineProviderManifest(
+ manifest: { models: { model_id: string; name: string }[] },
+ ctx: z.RefinementCtx,
+): void {
+ refineUniqueModels(manifest.models, ctx);
+}
+
+export type ModelProperties = z.infer<typeof ModelPropertiesSchema>;
+export type ProviderManifest = z.infer<typeof ProviderManifestObjectSchema>;
+
+/**
+ * Configured provider: PUT body and list/upsert response data (identity `name`
+ * plus manifest fields, including `auth.api_key`).
+ */
+export const ModelProviderSchema = ProviderManifestObjectSchema.extend({
+ name: NameSchema,
+})
+ .superRefine(refineProviderManifest)
+ .openapi('ModelProvider');
+
+export const PutModelProviderRequestSchema = ModelProviderSchema;
+
+export const ListModelProvidersResponseSchema = z
+ .object({
+ data: z.array(ModelProviderSchema),
+ })
+ .openapi('ListModelProvidersResponse');
+
+export const PutModelProviderResponseSchema = z
+ .object({
+ data: ModelProviderSchema,
+ })
+ .openapi('PutModelProviderResponse');
+
+/** Read view: the fully qualified name resolves the provider, so no provider object is nested. */
+export const ModelSchema = z
+ .object({
+ name: z.string().describe('Fully qualified name `name/model_name`, e.g. "openai/gpt-5-6-sol".'),
+ model_id: z.string().describe('Upstream, provider-specific identifier sent to the provider API.'),
+ properties: ModelPropertiesSchema,
+ })
+ .strict()
+ .openapi('Model');
+
+export const ListModelsResponseSchema = z
+ .object({
+ data: z.array(ModelSchema),
+ })
+ .openapi('ListModelsResponse');
+
+export type ModelProvider = z.infer<typeof ModelProviderSchema>;
+export type PutModelProviderRequest = ModelProvider;
+export type Model = z.infer<typeof ModelSchema>;
diff --git a/packages/server/tests/db/modelProviderStoreContractSuite.ts b/packages/server/tests/db/modelProviderStoreContractSuite.ts
new file mode 100644
index 000000000..54b4740dd
--- /dev/null
+++ b/packages/server/tests/db/modelProviderStoreContractSuite.ts
@@ -0,0 +1,147 @@
+/**
+ * Backend-agnostic behavioural contract for IModelProviderStore.
+ * Runs under jest against a fresh store per test (see backend test files).
+ */
+import type { IModelProviderStore } from '../../src/db/modelProviderStore';
+import type { ProviderManifest } from '../../src/schemas/modelProvider';
+
+const TENANT = 'default';
+
+function manifest(overrides: Partial<ProviderManifest> = {}): ProviderManifest {
+ return {
+ type: 'anthropic',
+ base_url: 'https://api.anthropic.com/v1',
+ auth: { api_key: 'sk-ant-test' },
+ models: [
+ {
+ model_id: 'claude-sonnet-4-6',
+ name: 'claude-sonnet-4-6',
+ properties: { context_length: 200000, max_output_tokens: 32768, reasoning_efforts: ['low', 'high'] },
+ },
+ ],
+ ...overrides,
+ };
+}
+
+const ISO_UTC = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+
+export function runModelProviderStoreContractSuite(getStore: () => IModelProviderStore): void {
+ it('upsert creates a provider and round-trips the manifest', async () => {
+ const store = getStore();
+ const created = await store.upsertProvider({
+ tenant_id: TENANT,
+ name: 'anthropic',
+ manifest: manifest(),
+ });
+
+ expect(created.tenant_id).toBe(TENANT);
+ expect(created.name).toBe('anthropic');
+ expect(created.manifest).toEqual(manifest());
+ expect(created.created_at).toMatch(ISO_UTC);
+ expect(created.updated_at).toBe(created.created_at);
+
+ const fetched = await store.getProvider({ tenant_id: TENANT, name: 'anthropic' });
+ expect(fetched).toEqual(created);
+ });
+
+ it('getProvider returns undefined for unknown providers', async () => {
+ const store = getStore();
+ expect(await store.getProvider({ tenant_id: TENANT, name: 'missing' })).toBeUndefined();
+ });
+
+ it('upsert replaces the whole manifest and preserves created_at', async () => {
+ const store = getStore();
+ const created = await store.upsertProvider({
+ tenant_id: TENANT,
+ name: 'anthropic',
+ manifest: manifest(),
+ });
+
+ const replacement = manifest({
+ auth: { api_key: 'sk-ant-rotated' },
+ models: [
+ {
+ model_id: 'claude-opus-4-6',
+ name: 'claude-opus-4-6',
+ properties: { context_length: 200000, max_output_tokens: 65536 },
+ },
+ ],
+ });
+ const updated = await store.upsertProvider({
+ tenant_id: TENANT,
+ name: 'anthropic',
+ manifest: replacement,
+ });
+
+ expect(updated.manifest).toEqual(replacement);
+ expect(updated.created_at).toBe(created.created_at);
+ expect(Date.parse(updated.updated_at)).toBeGreaterThanOrEqual(Date.parse(created.updated_at));
+
+ const providers = await store.listProviders(TENANT);
+ expect(providers).toEqual([updated]);
+ });
+
+ it('listProviders returns only the tenant, ordered by name', async () => {
+ const store = getStore();
+ await store.upsertProvider({
+ tenant_id: TENANT,
+ name: 'openai',
+ manifest: manifest({ type: 'openai' }),
+ });
+ await store.upsertProvider({ tenant_id: TENANT, name: 'anthropic', manifest: manifest() });
+ await store.upsertProvider({
+ tenant_id: 'other-tenant',
+ name: 'anthropic',
+ manifest: manifest(),
+ });
+
+ const providers = await store.listProviders(TENANT);
+ expect(providers.map(provider => provider.name)).toEqual(['anthropic', 'openai']);
+ expect(providers.every(provider => provider.tenant_id === TENANT)).toBe(true);
+ });
+
+ it('stores custom providers with base_url', async () => {
+ const store = getStore();
+ const custom = manifest({ type: 'custom', base_url: 'https://llm.internal.example.com/v1' });
+ const created = await store.upsertProvider({ tenant_id: TENANT, name: 'internal', manifest: custom });
+ expect(created.manifest.base_url).toBe('https://llm.internal.example.com/v1');
+ });
+
+ it('listModels flattens manifests into fully qualified names', async () => {
+ const store = getStore();
+ await store.upsertProvider({ tenant_id: TENANT, name: 'anthropic', manifest: manifest() });
+ await store.upsertProvider({
+ tenant_id: TENANT,
+ name: 'openai',
+ manifest: manifest({
+ type: 'openai',
+ models: [
+ {
+ model_id: 'gpt-5.6-sol',
+ name: 'gpt-5-6-sol',
+ properties: { context_length: 400000, max_output_tokens: 32768 },
+ },
+ ],
+ }),
+ });
+ await store.upsertProvider({
+ tenant_id: 'other-tenant',
+ name: 'openai',
+ manifest: manifest({ type: 'openai' }),
+ });
+
+ const models = await store.listModels(TENANT);
+ expect(models).toEqual([
+ {
+ name: 'anthropic/claude-sonnet-4-6',
+ model_id: 'claude-sonnet-4-6',
+ properties: { context_length: 200000, max_output_tokens: 32768, reasoning_efforts: ['low', 'high'] },
+ },
+ {
+ name: 'openai/gpt-5-6-sol',
+ model_id: 'gpt-5.6-sol',
+ properties: { context_length: 400000, max_output_tokens: 32768 },
+ },
+ ]);
+ });
+}
diff --git a/packages/server/tests/db/session-store/postgres/globalSetup.ts b/packages/server/tests/db/postgres/globalSetup.ts
similarity index 100%
rename from packages/server/tests/db/session-store/postgres/globalSetup.ts
rename to packages/server/tests/db/postgres/globalSetup.ts
diff --git a/packages/server/tests/db/postgres/model-provider-store/contract.test.ts b/packages/server/tests/db/postgres/model-provider-store/contract.test.ts
new file mode 100644
index 000000000..f0952f640
--- /dev/null
+++ b/packages/server/tests/db/postgres/model-provider-store/contract.test.ts
@@ -0,0 +1,35 @@
+import { sql } from 'kysely';
+
+import { PostgresModelProviderStore } from '../../../../src/db/postgres/model-provider-store/PostgresModelProviderStore';
+import { runModelProviderStoreContractSuite } from '../../modelProviderStoreContractSuite';
+import { createPostgresTestDatabase, type PostgresTestDatabase } from '../testDatabase';
+
+const describePg = process.env['PG_STORE_TESTS_ENABLED'] === '1' ? describe : describe.skip;
+
+describePg('PostgresModelProviderStore (IModelProviderStore contract)', () => {
+ let env: PostgresTestDatabase | undefined;
+
+ beforeAll(async () => {
+ env = await createPostgresTestDatabase();
+ if (env === undefined) {
+ throw new Error('Postgres test environment unavailable despite globalSetup probe');
+ }
+ }, 120_000);
+
+ afterAll(async () => {
+ await env?.teardown();
+ });
+
+ beforeEach(async () => {
+ if (env !== undefined) {
+ await sql`TRUNCATE TABLE model_provider`.execute(env.db);
+ }
+ });
+
+ runModelProviderStoreContractSuite(() => {
+ if (env === undefined) {
+ throw new Error('Postgres test environment not initialized');
+ }
+ return new PostgresModelProviderStore(env.db);
+ });
+});
diff --git a/packages/server/tests/db/session-store/postgres/contract.test.ts b/packages/server/tests/db/postgres/session-store/contract.test.ts
similarity index 52%
rename from packages/server/tests/db/session-store/postgres/contract.test.ts
rename to packages/server/tests/db/postgres/session-store/contract.test.ts
index c317d705c..9c87b8bee 100644
--- a/packages/server/tests/db/session-store/postgres/contract.test.ts
+++ b/packages/server/tests/db/postgres/session-store/contract.test.ts
@@ -1,15 +1,17 @@
import type { ISessionStore } from '@truefoundry/utils/agent-session/store/ISessionStore';
+import { sql } from 'kysely';
import { runStoreContractSuite } from '../../../../../harness/tests/agent-session/store/storeContractSuite';
-import { createPostgresStoreEnvironment } from './helpers';
+import { PostgresSessionStore } from '../../../../src/db/postgres/session-store/PostgresSessionStore';
+import { createPostgresTestDatabase, type PostgresTestDatabase } from '../testDatabase';
const describePg = process.env['PG_STORE_TESTS_ENABLED'] === '1' ? describe : describe.skip;
describePg('PostgresSessionStore (ISessionStore contract)', () => {
- let env: Awaited<ReturnType<typeof createPostgresStoreEnvironment>>;
+ let env: PostgresTestDatabase | undefined;
beforeAll(async () => {
- env = await createPostgresStoreEnvironment();
+ env = await createPostgresTestDatabase();
if (env === undefined) {
throw new Error('Postgres test environment unavailable despite globalSetup probe');
}
@@ -19,14 +21,26 @@ describePg('PostgresSessionStore (ISessionStore contract)', () => {
await env?.teardown();
});
+ // One database per file; truncate between tests because CREATE DATABASE is slow.
beforeEach(async () => {
- await env?.reset();
+ if (env !== undefined) {
+ await sql`
+ TRUNCATE TABLE
+ thread_capability_state,
+ session_event,
+ thread_context_log,
+ turn_thread,
+ turn,
+ session
+ RESTART IDENTITY CASCADE
+ `.execute(env.db);
+ }
});
runStoreContractSuite((): ISessionStore => {
if (env === undefined) {
throw new Error('Postgres test environment not initialized');
}
- return env.store;
+ return new PostgresSessionStore(env.db);
});
});
diff --git a/packages/server/tests/db/session-store/postgres/helpers.ts b/packages/server/tests/db/postgres/testDatabase.ts
similarity index 62%
rename from packages/server/tests/db/session-store/postgres/helpers.ts
rename to packages/server/tests/db/postgres/testDatabase.ts
index 9290706e9..2dcc9c947 100644
--- a/packages/server/tests/db/session-store/postgres/helpers.ts
+++ b/packages/server/tests/db/postgres/testDatabase.ts
@@ -1,33 +1,22 @@
-import { sql, type Kysely } from 'kysely';
+/**
+ * Creates a throwaway, fully migrated Postgres database for store tests.
+ * Returns undefined when globalSetup found no reachable Postgres (suite skips).
+ */
+import type { Kysely } from 'kysely';
import { Pool } from 'pg';
import { ulid } from 'ulid';
-import { migrateToLatest } from '../../../../src/db/migratePostgres';
-import { createDb } from '../../../../src/db/postgres/client';
-import { PostgresSessionStore } from '../../../../src/db/postgres/session-store/PostgresSessionStore';
-import type { Database } from '../../../../src/db/postgres/types';
+import { migrateToLatest } from '../../../src/db/migratePostgres';
+import { createDb } from '../../../src/db/postgres/client';
+import type { Database } from '../../../src/db/postgres/types';
const ADMIN_URL_ENV = 'PG_STORE_TESTS_ADMIN_URL';
-export interface PostgresStoreEnvironment {
- store: PostgresSessionStore;
- reset: () => Promise<void>;
+export interface PostgresTestDatabase {
+ db: Kysely<Database>;
teardown: () => Promise<void>;
}
-async function truncateSessionStore(db: Kysely<Database>): Promise<void> {
- await sql`
- TRUNCATE TABLE
- thread_capability_state,
- session_event,
- thread_context_log,
- turn_thread,
- turn,
- session
- RESTART IDENTITY CASCADE
- `.execute(db);
-}
-
function resolveAdminUrl(): string | undefined {
const url = process.env[ADMIN_URL_ENV];
if (url === undefined || url === '') {
@@ -62,11 +51,7 @@ async function dropDatabase(adminUrl: string, databaseName: string): Promise<voi
}
}
-/**
- * Creates a throwaway database, migrates it, and returns a PostgresSessionStore bound to it.
- * Each test file should call this once in beforeAll and teardown in afterAll.
- */
-export async function createPostgresStoreEnvironment(): Promise<PostgresStoreEnvironment | undefined> {
+export async function createPostgresTestDatabase(): Promise<PostgresTestDatabase | undefined> {
const adminUrl = resolveAdminUrl();
if (adminUrl === undefined) {
return undefined;
@@ -78,9 +63,6 @@ export async function createPostgresStoreEnvironment(): Promise<PostgresStoreEnv
const adminPool = new Pool({ connectionString: adminUrl });
try {
await adminPool.query(`CREATE DATABASE "${databaseName}"`);
- } catch (error) {
- await adminPool.end();
- throw error;
} finally {
await adminPool.end();
}
@@ -95,10 +77,8 @@ export async function createPostgresStoreEnvironment(): Promise<PostgresStoreEnv
throw error;
}
- const store = new PostgresSessionStore(db);
return {
- store,
- reset: () => truncateSessionStore(db),
+ db,
async teardown() {
await db.destroy();
await dropDatabase(adminUrl, databaseName);
diff --git a/packages/server/tests/db/session-store/sqlite/helpers.ts b/packages/server/tests/db/session-store/sqlite/helpers.ts
deleted file mode 100644
index 450434078..000000000
--- a/packages/server/tests/db/session-store/sqlite/helpers.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { promises as fs } from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-
-import { migrateSqliteToLatest } from '../../../../src/db/migrateSqlite';
-import { createSqliteDb } from '../../../../src/db/sqlite/client';
-import { SqliteSessionStore } from '../../../../src/db/sqlite/session-store/SqliteSessionStore';
-
-export interface SqliteStoreEnvironment {
- store: SqliteSessionStore;
- teardown: () => Promise<void>;
-}
-
-/**
- * Creates a throwaway file DB under an OS temp dir, migrates it, and returns
- * a SqliteSessionStore. Each contract test gets a fresh database.
- */
-export async function createSqliteStoreEnvironment(): Promise<SqliteStoreEnvironment> {
- const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'harness-sqlite-'));
- const dbPath = path.join(tempDir, 'session.sqlite');
- const db = createSqliteDb(dbPath);
-
- try {
- await migrateSqliteToLatest(db);
- } catch (error) {
- await db.destroy();
- await fs.rm(tempDir, { recursive: true, force: true });
- throw error;
- }
-
- const store = new SqliteSessionStore(db);
- return {
- store,
- async teardown() {
- await db.destroy();
- await fs.rm(tempDir, { recursive: true, force: true });
- },
- };
-}
diff --git a/packages/server/tests/db/sqlite/model-provider-store/contract.test.ts b/packages/server/tests/db/sqlite/model-provider-store/contract.test.ts
new file mode 100644
index 000000000..4154dd131
--- /dev/null
+++ b/packages/server/tests/db/sqlite/model-provider-store/contract.test.ts
@@ -0,0 +1,17 @@
+import { SqliteModelProviderStore } from '../../../../src/db/sqlite/model-provider-store/SqliteModelProviderStore';
+import { runModelProviderStoreContractSuite } from '../../modelProviderStoreContractSuite';
+import { createSqliteTestDatabase, type SqliteTestDatabase } from '../testDatabase';
+
+describe('SqliteModelProviderStore (IModelProviderStore contract)', () => {
+ let env: SqliteTestDatabase;
+
+ beforeEach(async () => {
+ env = await createSqliteTestDatabase();
+ }, 120_000);
+
+ afterEach(async () => {
+ await env?.teardown();
+ });
+
+ runModelProviderStoreContractSuite(() => new SqliteModelProviderStore(env.db));
+});
diff --git a/packages/server/tests/db/session-store/sqlite/contract.test.ts b/packages/server/tests/db/sqlite/session-store/contract.test.ts
similarity index 52%
rename from packages/server/tests/db/session-store/sqlite/contract.test.ts
rename to packages/server/tests/db/sqlite/session-store/contract.test.ts
index 573462238..e0d6c4f2c 100644
--- a/packages/server/tests/db/session-store/sqlite/contract.test.ts
+++ b/packages/server/tests/db/sqlite/session-store/contract.test.ts
@@ -1,18 +1,19 @@
import type { ISessionStore } from '@truefoundry/utils/agent-session/store/ISessionStore';
import { runStoreContractSuite } from '../../../../../harness/tests/agent-session/store/storeContractSuite';
-import { createSqliteStoreEnvironment } from './helpers';
+import { SqliteSessionStore } from '../../../../src/db/sqlite/session-store/SqliteSessionStore';
+import { createSqliteTestDatabase, type SqliteTestDatabase } from '../testDatabase';
describe('SqliteSessionStore (ISessionStore contract)', () => {
- let env: Awaited<ReturnType<typeof createSqliteStoreEnvironment>>;
+ let env: SqliteTestDatabase;
beforeEach(async () => {
- env = await createSqliteStoreEnvironment();
+ env = await createSqliteTestDatabase();
}, 120_000);
afterEach(async () => {
await env?.teardown();
});
- runStoreContractSuite((): ISessionStore => env.store);
+ runStoreContractSuite((): ISessionStore => new SqliteSessionStore(env.db));
});
diff --git a/packages/server/tests/db/sqlite/testDatabase.ts b/packages/server/tests/db/sqlite/testDatabase.ts
new file mode 100644
index 000000000..0b2e80a8c
--- /dev/null
+++ b/packages/server/tests/db/sqlite/testDatabase.ts
@@ -0,0 +1,39 @@
+/**
+ * Creates a throwaway, fully migrated SQLite file database under an OS temp
+ * dir for store tests. Each call gets a fresh database.
+ */
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+
+import type { Kysely } from 'kysely';
+
+import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';
+import { createSqliteDb } from '../../../src/db/sqlite/client';
+import type { Database } from '../../../src/db/sqlite/types';
+
+export interface SqliteTestDatabase {
+ db: Kysely<Database>;
+ teardown: () => Promise<void>;
+}
+
+export async function createSqliteTestDatabase(): Promise<SqliteTestDatabase> {
+ const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'harness-sqlite-'));
+ const db = createSqliteDb(path.join(tempDir, 'store.sqlite'));
+
+ try {
+ await migrateSqliteToLatest(db);
+ } catch (error) {
+ await db.destroy();
+ await fs.rm(tempDir, { recursive: true, force: true });
+ throw error;
+ }
+
+ return {
+ db,
+ async teardown() {
+ await db.destroy();
+ await fs.rm(tempDir, { recursive: true, force: true });
+ },
+ };
+}
diff --git a/packages/server/tests/unit/apis/deletedSessionCrud.test.ts b/packages/server/tests/unit/apis/deletedSessionCrud.test.ts
index e3b30d201..c516bbb4a 100644
--- a/packages/server/tests/unit/apis/deletedSessionCrud.test.ts
+++ b/packages/server/tests/unit/apis/deletedSessionCrud.test.ts
@@ -7,10 +7,10 @@ import { createClient } from 'redis';
import { createLogger } from 'winston';
import { createSessionsRouter, TENANT_ID } from '../../../src/apis/sessions';
import { createTurnsRouter } from '../../../src/apis/turns';
+import { McpStore } from '../../../src/legacy-registry-store/McpStore';
+import { ModelStore } from '../../../src/legacy-registry-store/ModelStore';
import { ActiveTurnRegistry } from '../../../src/runtime/activeTurns';
import { ListSessionsResponseSchema } from '../../../src/schemas/session';
-import { McpStore } from '../../../src/store/McpStore';
-import { ModelStore } from '../../../src/store/ModelStore';
describe('public CRUD after session deletion', () => {
it('returns not found for session and turn operations', async () => {
diff --git a/packages/server/tests/unit/apis/modelProviders.test.ts b/packages/server/tests/unit/apis/modelProviders.test.ts
new file mode 100644
index 000000000..6ebc4fc87
--- /dev/null
+++ b/packages/server/tests/unit/apis/modelProviders.test.ts
@@ -0,0 +1,89 @@
+import assert from 'node:assert/strict';
+import { before, describe, it } from 'node:test';
+import { createModelsRouter } from '../../../src/apis/models';
+import { createSettingsRouter } from '../../../src/apis/settings';
+import { ModelCatalog } from '../../../src/catalog/ModelCatalog';
+import { migrateSqliteToLatest } from '../../../src/db/migrateSqlite';
+import { createSqliteDb } from '../../../src/db/sqlite/client';
+import { SqliteModelProviderStore } from '../../../src/db/sqlite/model-provider-store/SqliteModelProviderStore';
+
+const putBody = {
+ type: 'anthropic',
+ name: 'anthropic',
+ base_url: 'https://api.anthropic.com/v1',
+ auth: { api_key: 'sk-ant-secret' },
+ models: [
+ {
+ model_id: 'claude-sonnet-4-6',
+ name: 'claude-sonnet-4-6',
+ properties: { context_length: 200000, max_output_tokens: 32768, reasoning_efforts: ['low', 'high'] },
+ },
+ ],
+};
+
+function putInit(body: unknown): RequestInit {
+ return {
+ method: 'PUT',
+ headers: { 'content-type': 'application/json' },
+ body: JSON.stringify(body),
+ };
+}
+
+describe('settings model-providers and models routers', () => {
+ let settingsRouter: ReturnType<typeof createSettingsRouter>;
+ let modelsRouter: ReturnType<typeof createModelsRouter>;
+
+ before(async () => {
+ const db = createSqliteDb(':memory:');
+ await migrateSqliteToLatest(db);
+ const modelProviderStore = new SqliteModelProviderStore(db);
+ settingsRouter = createSettingsRouter({ modelCatalog: ModelCatalog.load(), modelProviderStore });
+ modelsRouter = createModelsRouter(modelProviderStore);
+ });
+
+ it('GET /model-providers/catalog returns the shipped catalog verbatim', async () => {
+ const response = await settingsRouter.request('/model-providers/catalog');
+ assert.equal(response.status, 200);
+ const body = (await response.json()) as { data: { type: string; name: string }[] };
+ assert.deepEqual(
+ body.data.map(provider => provider.name),
+ ModelCatalog.load()
+ .list()
+ .map(provider => provider.name),
+ );
+ assert.ok(body.data.every(provider => provider.type !== 'custom'));
+ });
+
+ it('PUT upserts a provider and echoes the stored auth', async () => {
+ const response = await settingsRouter.request('/model-providers', putInit(putBody));
+ assert.equal(response.status, 200);
+ assert.deepEqual(await response.json(), { data: putBody });
+
+ const list = await settingsRouter.request('/model-providers');
+ assert.equal(list.status, 200);
+ assert.deepEqual(await list.json(), { data: [putBody] });
+ });
+
+ it('PUT rejects invalid bodies at the Zod layer', async () => {
+ const { base_url: _, ...withoutBaseUrl } = putBody;
+ const missingBaseUrl = await settingsRouter.request('/model-providers', putInit(withoutBaseUrl));
+ assert.equal(missingBaseUrl.status, 400);
+
+ const badName = await settingsRouter.request('/model-providers', putInit({ ...putBody, name: 'Not A Slug' }));
+ assert.equal(badName.status, 400);
+ });
+
+ it('GET /models returns the FQN read view', async () => {
+ const response = await modelsRouter.request('/');
+ assert.equal(response.status, 200);
+ assert.deepEqual(await response.json(), {
+ data: [
+ {
+ name: 'anthropic/claude-sonnet-4-6',
+ model_id: 'claude-sonnet-4-6',
+ properties: putBody.models[0]?.properties,
+ },
+ ],
+ });
+ });
+});
diff --git a/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts b/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts
index d51ec00e8..d46e781ea 100644
--- a/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts
+++ b/packages/server/tests/unit/apis/turnStreamAfterDelete.test.ts
@@ -5,9 +5,9 @@ import assert from 'node:assert/strict';
import { describe, it } from 'node:test';
import { createLogger } from 'winston';
import { createTurnsRouter } from '../../../src/apis/turns';
+import { McpStore } from '../../../src/legacy-registry-store/McpStore';
+import { ModelStore } from '../../../src/legacy-registry-store/ModelStore';
import { ActiveTurnRegistry } from '../../../src/runtime/activeTurns';
-import { McpStore } from '../../../src/store/McpStore';
-import { ModelStore } from '../../../src/store/ModelStore';
describe('turn SSE after session deletion', () => {
it('warns when the stream ends because the session/turn was removed', async () => {
diff --git a/packages/server/tsup.config.ts b/packages/server/tsup.config.ts
index 4a2df8fe9..1787d1113 100644
--- a/packages/server/tsup.config.ts
+++ b/packages/server/tsup.config.ts
@@ -4,7 +4,8 @@ import { fileURLToPath } from 'node:url';
import { defineConfig } from 'tsup';
-const srcDbDir = path.join(path.dirname(fileURLToPath(import.meta.url)), 'src/db');
+const packageDir = path.dirname(fileURLToPath(import.meta.url));
+const srcDbDir = path.join(packageDir, 'src/db');
function migrationEntries(engine: 'postgres' | 'sqlite'): Record<string, string> {
const migrationsDir = path.join(srcDbDir, engine, 'migrations');