The open-source agent harness - the runtime layer that turns an LLM into a working agent.
feat: TrueFoundry AI Gateway as a managed model provider (#483)
Chirag Jain8f1a2dcc69f6
diff --git a/.changeset/20260827213832-regenerate-sdk-from-openapi.md b/.changeset/20260827213832-regenerate-sdk-from-openapi.mdnew file mode 100644index 000000000..efd8ff00f--- /dev/null+++ b/.changeset/20260827213832-regenerate-sdk-from-openapi.md@@ -0,0 +1,5 @@+---+"@truefoundry/trueforge-sdk": patch+---++Regenerate SDK from updated OpenAPI spec.diff --git a/.changeset/truefoundry-ai-gateway-models.md b/.changeset/truefoundry-ai-gateway-models.mdnew file mode 100644index 000000000..ff12a200f--- /dev/null+++ b/.changeset/truefoundry-ai-gateway-models.md@@ -0,0 +1,7 @@+---+"@truefoundry/trueforge": minor+"@truefoundry/trueforge-core": minor+"@truefoundry/trueforge-ui": minor+---++Add a TrueFoundry-managed model registry. When `TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL` is set, models are listed from the TrueFoundry ServiceFoundry server and turns are routed through the tenant's default AI Gateway with the caller's token. Mutually exclusive with OIDC. Supports internal mutual TLS to the ServiceFoundry server via `TRUEFOUNDRY_MTLS_ENABLED`/`TRUEFOUNDRY_MTLS_CERTS_DIR`.diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.jsonindex 17bb1b0f0..c3968209a 100644--- a/.github/fern/openapi/openapi.json+++ b/.github/fern/openapi/openapi.json@@ -2565,6 +2565,7 @@"moonshot": "#/components/schemas/MoonshotModelProvider","openai": "#/components/schemas/OpenAIModelProvider","together": "#/components/schemas/TogetherAIModelProvider",+ "truefoundry": "#/components/schemas/TrueFoundryModelProvider","zai": "#/components/schemas/ZaiModelProvider"},"propertyName": "type"@@ -2594,6 +2595,9 @@{"$ref": "#/components/schemas/AlibabaModelProvider"},+ {+ "$ref": "#/components/schemas/TrueFoundryModelProvider"+ },{"$ref": "#/components/schemas/CustomModelProvider"}@@ -4071,6 +4075,39 @@],"type": "object"},+ "TrueFoundryModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "description": "Base URL of the TrueFoundry AI gateway the models are invoked against.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "description": "Models exposed by this provider (at least one).",+ "items": {+ "$ref": "#/components/schemas/ConfiguredModel"+ },+ "minItems": 1,+ "type": "array"+ },+ "type": {+ "enum": [+ "truefoundry"+ ],+ "type": "string"+ }+ },+ "required": [+ "models",+ "type",+ "base_url"+ ],+ "type": "object"+ },"TrueFoundrySystemToolInfo": {"properties": {"name": {@@ -5794,7 +5831,7 @@}}},- "description": "OIDC is configured and the request has no valid session cookie."+ "description": "Auth is configured and the request has no valid no Bearer token or session cookie."}},"summary": "List models for chat",@@ -6983,6 +7020,16 @@},"description": "Invalid request body."},+ "401": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Invalid Bearer token or auth cookie"+ },"403": {"content": {"application/json": {@@ -7782,6 +7829,16 @@}},"description": "A model provider with this name already exists."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Resource is managed by TrueFoundry (`TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL` is set)."}},"summary": "Create a model provider",@@ -7826,6 +7883,16 @@}},"description": "Invalid request body, or redacted API key with no stored secret to keep."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Resource is managed by TrueFoundry (`TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL` is set)."}},"summary": "Create or replace a model provider",diff --git a/docs/openapi.json b/docs/openapi.jsonindex 17bb1b0f0..c3968209a 100644--- a/docs/openapi.json+++ b/docs/openapi.json@@ -2565,6 +2565,7 @@"moonshot": "#/components/schemas/MoonshotModelProvider","openai": "#/components/schemas/OpenAIModelProvider","together": "#/components/schemas/TogetherAIModelProvider",+ "truefoundry": "#/components/schemas/TrueFoundryModelProvider","zai": "#/components/schemas/ZaiModelProvider"},"propertyName": "type"@@ -2594,6 +2595,9 @@{"$ref": "#/components/schemas/AlibabaModelProvider"},+ {+ "$ref": "#/components/schemas/TrueFoundryModelProvider"+ },{"$ref": "#/components/schemas/CustomModelProvider"}@@ -4071,6 +4075,39 @@],"type": "object"},+ "TrueFoundryModelProvider": {+ "additionalProperties": false,+ "properties": {+ "auth": {+ "$ref": "#/components/schemas/ModelProviderAuth"+ },+ "base_url": {+ "description": "Base URL of the TrueFoundry AI gateway the models are invoked against.",+ "format": "uri",+ "type": "string"+ },+ "models": {+ "description": "Models exposed by this provider (at least one).",+ "items": {+ "$ref": "#/components/schemas/ConfiguredModel"+ },+ "minItems": 1,+ "type": "array"+ },+ "type": {+ "enum": [+ "truefoundry"+ ],+ "type": "string"+ }+ },+ "required": [+ "models",+ "type",+ "base_url"+ ],+ "type": "object"+ },"TrueFoundrySystemToolInfo": {"properties": {"name": {@@ -5794,7 +5831,7 @@}}},- "description": "OIDC is configured and the request has no valid session cookie."+ "description": "Auth is configured and the request has no valid no Bearer token or session cookie."}},"summary": "List models for chat",@@ -6983,6 +7020,16 @@},"description": "Invalid request body."},+ "401": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Invalid Bearer token or auth cookie"+ },"403": {"content": {"application/json": {@@ -7782,6 +7829,16 @@}},"description": "A model provider with this name already exists."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Resource is managed by TrueFoundry (`TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL` is set)."}},"summary": "Create a model provider",@@ -7826,6 +7883,16 @@}},"description": "Invalid request body, or redacted API key with no stored secret to keep."+ },+ "424": {+ "content": {+ "application/json": {+ "schema": {+ "$ref": "#/components/schemas/RequestErrorResponse"+ }+ }+ },+ "description": "Resource is managed by TrueFoundry (`TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL` is set)."}},"summary": "Create or replace a model provider",diff --git a/packages/trueforge-core/src/core/llm/VercelAILLM.ts b/packages/trueforge-core/src/core/llm/VercelAILLM.tsindex 7860baa57..e3b0ce495 100644--- a/packages/trueforge-core/src/core/llm/VercelAILLM.ts+++ b/packages/trueforge-core/src/core/llm/VercelAILLM.ts@@ -63,6 +63,7 @@ export const VERCEL_AI_PROVIDER_NAMES = ['alibaba','together','custom',+ 'truefoundry',] as const;export type VercelAIProviderName = (typeof VERCEL_AI_PROVIDER_NAMES)[number];@@ -195,7 +196,8 @@ export function buildLanguageModel(config: VercelAIProviderConfig): LanguageModecase 'fireworks':case 'zai':case 'together':- case 'custom': {+ case 'custom':+ case 'truefoundry': {return compatibleModel(config);}default: {diff --git a/packages/trueforge-core/tests/core/llm/VercelAILLM.model.test.ts b/packages/trueforge-core/tests/core/llm/VercelAILLM.model.test.tsindex 7c2a62b1e..5b7766a0e 100644--- a/packages/trueforge-core/tests/core/llm/VercelAILLM.model.test.ts+++ b/packages/trueforge-core/tests/core/llm/VercelAILLM.model.test.ts@@ -41,7 +41,7 @@ describe('buildLanguageModel', () => {// The compatible providers take their endpoint from the caller, which the server resolves from// its own defaults. Throwing here beats letting the adapter build a request against no host.it('demands a baseUrl from every compatible provider', () => {- for (const provider of ['fireworks', 'zai', 'custom'] as const) {+ for (const provider of ['fireworks', 'zai', 'custom', 'truefoundry', 'together'] as const) {expect(() => buildLanguageModel(makeConfig({ provider }))).toThrow('baseUrl');const model: unknown = buildLanguageModel(makeConfig({ provider, baseUrl: 'http://localhost:11434/v1' }));if (typeof model !== 'object' || model === null) throw new Error('Expected model to be an object');diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/Client.tsindex bd756c624..94792f917 100644--- a/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts+++ b/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts@@ -1049,6 +1049,17 @@ export class SessionsClient {}),_response.rawResponse,);+ case 401:+ throw new TrueForge.UnauthorizedError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );case 403:throw new TrueForge.ForbiddenError(serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {@@ -1133,6 +1144,7 @@ export class SessionsClient {* @param {SessionsClient.RequestOptions} requestOptions - Request-specific configuration.** @throws {@link TrueForge.BadRequestError}+ * @throws {@link TrueForge.UnauthorizedError}* @throws {@link TrueForge.ForbiddenError}* @throws {@link TrueForge.NotFoundError}* @throws {@link TrueForge.PreconditionFailedError}@@ -1218,6 +1230,17 @@ export class SessionsClient {}),_response.rawResponse,);+ case 401:+ throw new TrueForge.UnauthorizedError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );case 403:throw new TrueForge.ForbiddenError(serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {diff --git a/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts b/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.tsindex a3fdeef0e..9dadd382d 100644--- a/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts+++ b/packages/trueforge-sdk/src/api/resources/settings/resources/modelProviders/client/Client.ts@@ -128,6 +128,7 @@ export class ModelProvidersClient {** @throws {@link TrueForge.BadRequestError}* @throws {@link TrueForge.ConflictError}+ * @throws {@link TrueForge.FailedDependencyError}* @throws {@link errors.TrueForgeError}* @throws {@link errors.TrueForgeTimeoutError}*@@ -226,6 +227,17 @@ export class ModelProvidersClient {}),_response.rawResponse,);+ case 424:+ throw new TrueForge.FailedDependencyError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );default:throw new errors.TrueForgeError({statusCode: _response.error.statusCode,@@ -250,6 +262,7 @@ export class ModelProvidersClient {* @param {ModelProvidersClient.RequestOptions} requestOptions - Request-specific configuration.** @throws {@link TrueForge.BadRequestError}+ * @throws {@link TrueForge.FailedDependencyError}* @throws {@link errors.TrueForgeError}* @throws {@link errors.TrueForgeTimeoutError}*@@ -337,6 +350,17 @@ export class ModelProvidersClient {}),_response.rawResponse,);+ case 424:+ throw new TrueForge.FailedDependencyError(+ serializers.RequestErrorResponse.parseOrThrow(_response.error.body, {+ unrecognizedObjectKeys: "passthrough",+ allowUnrecognizedUnionMembers: true,+ allowUnrecognizedEnumValues: true,+ skipValidation: true,+ breadcrumbsPrefix: ["response"],+ }),+ _response.rawResponse,+ );default:throw new errors.TrueForgeError({statusCode: _response.error.statusCode,diff --git a/packages/trueforge-sdk/src/api/types/ModelProviderManifest.ts b/packages/trueforge-sdk/src/api/types/ModelProviderManifest.tsindex 548b61e3a..c46feafc8 100644--- a/packages/trueforge-sdk/src/api/types/ModelProviderManifest.ts+++ b/packages/trueforge-sdk/src/api/types/ModelProviderManifest.ts@@ -11,4 +11,5 @@ export type ModelProviderManifest =| TrueForge.MoonshotModelProvider| TrueForge.OpenAiModelProvider| TrueForge.TogetherAiModelProvider+ | TrueForge.TrueFoundryModelProvider| TrueForge.ZaiModelProvider;diff --git a/packages/trueforge-sdk/src/api/types/TrueFoundryModelProvider.ts b/packages/trueforge-sdk/src/api/types/TrueFoundryModelProvider.tsnew file mode 100644index 000000000..c2f666e24--- /dev/null+++ b/packages/trueforge-sdk/src/api/types/TrueFoundryModelProvider.ts@@ -0,0 +1,12 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../index.js";++export interface TrueFoundryModelProvider {+ auth?: TrueForge.ModelProviderAuth;+ /** Base URL of the TrueFoundry AI gateway the models are invoked against. */+ baseUrl: string;+ /** Models exposed by this provider (at least one). */+ models: TrueForge.ConfiguredModel[];+ type: "truefoundry";+}diff --git a/packages/trueforge-sdk/src/api/types/index.ts b/packages/trueforge-sdk/src/api/types/index.tsindex afe4c7cd4..c3101d56d 100644--- a/packages/trueforge-sdk/src/api/types/index.ts+++ b/packages/trueforge-sdk/src/api/types/index.ts@@ -187,6 +187,7 @@ export * from "./ToolCallRef.js";export * from "./ToolInfo.js";export * from "./ToolResponseEvent.js";export * from "./ToolResponseRequiredEvent.js";+export * from "./TrueFoundryModelProvider.js";export * from "./TrueFoundrySystemToolInfo.js";export * from "./Turn.js";export * from "./TurnCreatedEvent.js";diff --git a/packages/trueforge-sdk/src/serialization/types/ModelProviderManifest.ts b/packages/trueforge-sdk/src/serialization/types/ModelProviderManifest.tsindex dfa5c0f3d..572a406a1 100644--- a/packages/trueforge-sdk/src/serialization/types/ModelProviderManifest.ts+++ b/packages/trueforge-sdk/src/serialization/types/ModelProviderManifest.ts@@ -11,6 +11,7 @@ import { GoogleGeminiModelProvider } from "./GoogleGeminiModelProvider.js";import { MoonshotModelProvider } from "./MoonshotModelProvider.js";import { OpenAiModelProvider } from "./OpenAiModelProvider.js";import { TogetherAiModelProvider } from "./TogetherAiModelProvider.js";+import { TrueFoundryModelProvider } from "./TrueFoundryModelProvider.js";import { ZaiModelProvider } from "./ZaiModelProvider.js";export const ModelProviderManifest: core.serialization.Schema<@@ -25,6 +26,7 @@ export const ModelProviderManifest: core.serialization.Schema<MoonshotModelProvider,OpenAiModelProvider,TogetherAiModelProvider,+ TrueFoundryModelProvider,ZaiModelProvider,]);@@ -38,5 +40,6 @@ export declare namespace ModelProviderManifest {| MoonshotModelProvider.Raw| OpenAiModelProvider.Raw| TogetherAiModelProvider.Raw+ | TrueFoundryModelProvider.Raw| ZaiModelProvider.Raw;}diff --git a/packages/trueforge-sdk/src/serialization/types/TrueFoundryModelProvider.ts b/packages/trueforge-sdk/src/serialization/types/TrueFoundryModelProvider.tsnew file mode 100644index 000000000..6f99e2072--- /dev/null+++ b/packages/trueforge-sdk/src/serialization/types/TrueFoundryModelProvider.ts@@ -0,0 +1,26 @@+// This file was auto-generated by Fern from our API Definition.++import type * as TrueForge from "../../api/index.js";+import * as core from "../../core/index.js";+import type * as serializers from "../index.js";+import { ConfiguredModel } from "./ConfiguredModel.js";+import { ModelProviderAuth } from "./ModelProviderAuth.js";++export const TrueFoundryModelProvider: core.serialization.ObjectSchema<+ serializers.TrueFoundryModelProvider.Raw,+ TrueForge.TrueFoundryModelProvider+> = core.serialization.object({+ auth: ModelProviderAuth.optional(),+ baseUrl: core.serialization.property("base_url", core.serialization.string()),+ models: core.serialization.list(ConfiguredModel),+ type: core.serialization.stringLiteral("truefoundry"),+});++export declare namespace TrueFoundryModelProvider {+ export interface Raw {+ auth?: ModelProviderAuth.Raw | null;+ base_url: string;+ models: ConfiguredModel.Raw[];+ type: "truefoundry";+ }+}diff --git a/packages/trueforge-sdk/src/serialization/types/index.ts b/packages/trueforge-sdk/src/serialization/types/index.tsindex afe4c7cd4..c3101d56d 100644--- a/packages/trueforge-sdk/src/serialization/types/index.ts+++ b/packages/trueforge-sdk/src/serialization/types/index.ts@@ -187,6 +187,7 @@ export * from "./ToolCallRef.js";export * from "./ToolInfo.js";export * from "./ToolResponseEvent.js";export * from "./ToolResponseRequiredEvent.js";+export * from "./TrueFoundryModelProvider.js";export * from "./TrueFoundrySystemToolInfo.js";export * from "./Turn.js";export * from "./TurnCreatedEvent.js";diff --git a/packages/trueforge-sdk/tests/wire/sessions.test.ts b/packages/trueforge-sdk/tests/wire/sessions.test.tsindex 3a3832433..f76be0c4a 100644--- a/packages/trueforge-sdk/tests/wire/sessions.test.ts+++ b/packages/trueforge-sdk/tests/wire/sessions.test.ts@@ -832,6 +832,26 @@ describe("SessionsClient", () => {const rawRequestBody = { stream: true };const rawResponseBody = { error: { message: "message" } };+ server+ .mockEndpoint()+ .post("/api/v1/sessions/session_id/turns")+ .jsonBody(rawRequestBody)+ .respondWith()+ .statusCode(401)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.sessions.createTurnStream("session_id", {});+ }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);+ });++ test("create_turn_stream (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });+ const rawRequestBody = { stream: true };+ const rawResponseBody = { error: { message: "message" } };+server.mockEndpoint().post("/api/v1/sessions/session_id/turns")@@ -846,7 +866,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.ForbiddenError);});- test("create_turn_stream (4)", async () => {+ test("create_turn_stream (5)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: true };@@ -866,7 +886,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.NotFoundError);});- test("create_turn_stream (5)", async () => {+ test("create_turn_stream (6)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: true };@@ -886,7 +906,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.PreconditionFailedError);});- test("create_turn_stream (6)", async () => {+ test("create_turn_stream (7)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: true };@@ -906,7 +926,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.ContentTooLargeError);});- test("create_turn_stream (7)", async () => {+ test("create_turn_stream (8)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: true };@@ -998,6 +1018,26 @@ describe("SessionsClient", () => {const rawRequestBody = { stream: false };const rawResponseBody = { error: { message: "message" } };+ server+ .mockEndpoint()+ .post("/api/v1/sessions/session_id/turns")+ .jsonBody(rawRequestBody)+ .respondWith()+ .statusCode(401)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.sessions.createTurn("session_id", {});+ }).rejects.toThrow(TrueForgeTypes.UnauthorizedError);+ });++ test("create_turn (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });+ const rawRequestBody = { stream: false };+ const rawResponseBody = { error: { message: "message" } };+server.mockEndpoint().post("/api/v1/sessions/session_id/turns")@@ -1012,7 +1052,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.ForbiddenError);});- test("create_turn (4)", async () => {+ test("create_turn (5)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: false };@@ -1032,7 +1072,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.NotFoundError);});- test("create_turn (5)", async () => {+ test("create_turn (6)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: false };@@ -1052,7 +1092,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.PreconditionFailedError);});- test("create_turn (6)", async () => {+ test("create_turn (7)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: false };@@ -1072,7 +1112,7 @@ describe("SessionsClient", () => {}).rejects.toThrow(TrueForgeTypes.ContentTooLargeError);});- test("create_turn (7)", async () => {+ test("create_turn (8)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });const rawRequestBody = { stream: false };diff --git a/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.ts b/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.tsindex 666adb3fb..6551d91b6 100644--- a/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.ts+++ b/packages/trueforge-sdk/tests/wire/settings/modelProviders.test.ts@@ -254,6 +254,54 @@ describe("ModelProvidersClient", () => {}).rejects.toThrow(TrueForgeTypes.ConflictError);});+ test("create (4)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });+ const rawRequestBody = {+ manifest: {+ auth: { api_key: "x" },+ models: [+ { model_id: "x", name: "xy", properties: {} },+ { model_id: "x", name: "xy", properties: {} },+ ],+ type: "alibaba",+ },+ };+ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .post("/api/v1/settings/model-providers")+ .jsonBody(rawRequestBody)+ .respondWith()+ .statusCode(424)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.modelProviders.create({+ manifest: {+ auth: {+ apiKey: "x",+ },+ models: [+ {+ modelId: "x",+ name: "xy",+ properties: {},+ },+ {+ modelId: "x",+ name: "xy",+ properties: {},+ },+ ],+ type: "alibaba",+ },+ });+ }).rejects.toThrow(TrueForgeTypes.FailedDependencyError);+ });+test("create_or_update (1)", async () => {const server = mockServerPool.createServer();const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });@@ -368,4 +416,52 @@ describe("ModelProvidersClient", () => {});}).rejects.toThrow(TrueForgeTypes.BadRequestError);});++ test("create_or_update (3)", async () => {+ const server = mockServerPool.createServer();+ const client = new TrueForge({ maxRetries: 0, token: "test", baseUrl: server.baseUrl });+ const rawRequestBody = {+ manifest: {+ auth: { api_key: "x" },+ models: [+ { model_id: "x", name: "xy", properties: {} },+ { model_id: "x", name: "xy", properties: {} },+ ],+ type: "alibaba",+ },+ };+ const rawResponseBody = { error: { message: "message" } };++ server+ .mockEndpoint()+ .put("/api/v1/settings/model-providers")+ .jsonBody(rawRequestBody)+ .respondWith()+ .statusCode(424)+ .jsonBody(rawResponseBody)+ .build();++ await expect(async () => {+ return await client.settings.modelProviders.createOrUpdate({+ manifest: {+ auth: {+ apiKey: "x",+ },+ models: [+ {+ modelId: "x",+ name: "xy",+ properties: {},+ },+ {+ modelId: "x",+ name: "xy",+ properties: {},+ },+ ],+ type: "alibaba",+ },+ });+ }).rejects.toThrow(TrueForgeTypes.FailedDependencyError);+ });});diff --git a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.ts b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.tsindex eac2c6154..2f12863cc 100644--- a/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.ts+++ b/packages/trueforge-ui/src/plugins/trueforge-agent-server-adapter/catalogs/modelProviderCatalog.ts@@ -71,7 +71,7 @@ export function toUiCatalogModelProviderEntry(const PROVIDER_TYPES: readonly string[] = [...Object.values(TrueForgeApi.CatalogWellKnownModelProviderType), 'custom'];-function isProviderType(type: string): type is TrueForgeApi.ModelProviderManifest['type'] {+function isProviderType(type: string): type is Exclude<TrueForgeApi.ModelProviderManifest['type'], 'truefoundry'> {return PROVIDER_TYPES.includes(type);}diff --git a/packages/trueforge/.env.example b/packages/trueforge/.env.exampleindex 56c23b01e..7d075ecf5 100644--- a/packages/trueforge/.env.example+++ b/packages/trueforge/.env.example@@ -23,6 +23,18 @@ PORT=8790## When unset, the catalog inlined at build time (catalog/model-catalog.yaml) is used.# MODEL_CATALOG_PATH=/path/to/model-catalog.yaml+## TrueFoundry mode. When set, GET /models lists tenant-enabled chat models from the TrueFoundry+## ServiceFoundry server (caller token) and turns call the tenant's default AI Gateway. Unset = local+## API-key model catalog. Mutually exclusive with OIDC.+# TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL=https://servicefoundry-server.truefoundry.svc.cluster.local++## Internal mutual TLS for calls to the ServiceFoundry server. When true, trueforge presents its client+## certificate (and upgrades a mesh-direct http:// peer URL to https://). Only meaningful in-cluster,+## where TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL points at the ServiceFoundry server Service directly.+# TRUEFOUNDRY_MTLS_ENABLED=false+## Directory holding the mTLS cert triple (tls.crt / tls.key / ca.crt) when TRUEFOUNDRY_MTLS_ENABLED=true.+# TRUEFOUNDRY_MTLS_CERTS_DIR=/etc/tls/truefoundry+## Optional override for the MCP catalog YAML (GET /catalog/mcp-servers).## When unset, the catalog inlined at build time (catalog/mcp-catalog.yaml) is used.# MCP_CATALOG_PATH=/path/to/mcp-catalog.yamldiff --git a/packages/trueforge/package.json b/packages/trueforge/package.jsonindex b6668da37..6b455e65d 100644--- a/packages/trueforge/package.json+++ b/packages/trueforge/package.json@@ -74,6 +74,7 @@"pg": "^8.23.0","redis": "^5.12.1","ulid": "^3.0.2",+ "undici": "7.29.0","winston": "^3.19.0","yaml": "^2.9.0","zod": "^4.4.3"diff --git a/packages/trueforge/scripts/write-openapi.ts b/packages/trueforge/scripts/write-openapi.tsindex bee0cedb2..0613b9fe7 100644--- a/packages/trueforge/scripts/write-openapi.ts+++ b/packages/trueforge/scripts/write-openapi.ts@@ -58,7 +58,7 @@ const sessionStore = new InMemorySessionStore();const db = createSqliteDb(':memory:');const app = createServerApp({modelCatalog: ModelCatalog.load(),- modelProviderStore: new SqliteModelProviderStore(db),+ resolveModelProviderStore: () => new SqliteModelProviderStore(db),withTransaction: callback => db.transaction().execute(callback),mcpCatalog: McpCatalog.load(),mcpServerStore: new SqliteMcpServerStore(db),diff --git a/packages/trueforge/src/apis/agents.ts b/packages/trueforge/src/apis/agents.tsindex bf1daf9a6..b5925ae13 100644--- a/packages/trueforge/src/apis/agents.ts+++ b/packages/trueforge/src/apis/agents.ts@@ -3,6 +3,7 @@*/import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';import type { AgentSpec } from '@truefoundry/trueforge-core/agent-session';+import type { Context } from 'hono';import { AgentNameConflictError, type AgentRecord, type IAgentStore } from '../db/agentStore';import type { IMcpServerStore } from '../db/mcpServerStore';import type { IModelProviderStore } from '../db/modelProviderStore';@@ -24,7 +25,7 @@ import { TENANT_ID } from './sessions';export interface AgentsRouterDeps<TTransaction> {agentStore: IAgentStore<TTransaction>;- modelProviderStore: IModelProviderStore<TTransaction>;+ resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;mcpServerStore: IMcpServerStore<TTransaction>;skillStore: ISkillStore<TTransaction>;sandboxProviderStore: ISandboxProviderStore<TTransaction>;@@ -43,14 +44,16 @@ function toWireAgent(record: AgentRecord): Agent {async function validateManifest<TTransaction>({spec,deps,+ store,}: {spec: AgentSpec;deps: AgentsRouterDeps<TTransaction>;+ store: IModelProviderStore<TTransaction>;}): Promise<AgentSpec> {await validateAgentSpec({spec,tenant_id: TENANT_ID,- modelProviderStore: deps.modelProviderStore,+ modelProviderStore: store,mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,sandboxProviderStore: deps.sandboxProviderStore,@@ -66,7 +69,11 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransacconst createHandler: RouteHandler<typeof createAgentRoute> = async c => {const body: CreateAgentRequest = c.req.valid('json');- const manifest = await validateManifest({ spec: body.manifest, deps });+ const manifest = await validateManifest({+ spec: body.manifest,+ deps,+ store: deps.resolveModelProviderStore(c),+ });try {const record = await deps.agentStore.createAgent({tenant_id: TENANT_ID,@@ -117,7 +124,11 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransacconst putHandler: RouteHandler<typeof putAgentRoute> = async c => {const { agent_id: agentId } = c.req.valid('param');const body = c.req.valid('json');- const manifest = await validateManifest({ spec: body.manifest, deps });+ const manifest = await validateManifest({+ spec: body.manifest,+ deps,+ store: deps.resolveModelProviderStore(c),+ });const record = await deps.agentStore.updateAgent({tenant_id: TENANT_ID,id: agentId,diff --git a/packages/trueforge/src/apis/modelProviders.ts b/packages/trueforge/src/apis/modelProviders.tsindex c189ae334..8be433fba 100644--- a/packages/trueforge/src/apis/modelProviders.ts+++ b/packages/trueforge/src/apis/modelProviders.ts@@ -1,4 +1,5 @@import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';+import type { Context } from 'hono';import {ModelProviderNameConflictError,type IModelProviderStore,@@ -21,7 +22,7 @@ import { MissingStoredSecretError, resolveStoredSecretValue, toRedactedSecretValimport { TENANT_ID } from './sessions';export interface ModelProvidersRouterDeps<TTransaction> {- modelProviderStore: IModelProviderStore<TTransaction>;+ resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;}@@ -42,15 +43,16 @@ function resolveModelProviderManifestForWrite({incoming: ModelProviderManifest;existing: ModelProviderManifest | undefined;}): ModelProviderManifest {- if (incoming.auth === undefined) {+ if (!('auth' in incoming) || incoming.auth === undefined) {return incoming;}+ const existingApiKey = existing && 'auth' in existing ? existing.auth?.api_key : undefined;return {...incoming,auth: {api_key: resolveStoredSecretValue({incoming: incoming.auth.api_key,- existing: existing?.auth?.api_key,+ existing: existingApiKey,}),},};@@ -65,7 +67,7 @@ function toWireProvider(record: ModelProviderRecord): ConfiguredModelProvider {export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRouterDeps<TTransaction>) {const listHandler: RouteHandler<typeof listModelProvidersRoute> = async c => {- const records = await deps.modelProviderStore.listProviders(TENANT_ID);+ const records = await deps.resolveModelProviderStore(c).listProviders({ tenant_id: TENANT_ID });return c.json({ data: records.map(toWireProvider) }, 200);};@@ -76,7 +78,7 @@ export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRoutry {// Create has no prior row; redacted keep resolves to MissingStoredSecretError → 400.const manifest = resolveModelProviderManifestForWrite({ incoming: provider, existing: undefined });- const record = await deps.modelProviderStore.createProvider({ tenant_id: TENANT_ID, name, manifest });+ const record = await deps.resolveModelProviderStore(c).createProvider({ tenant_id: TENANT_ID, name, manifest });return c.json({ data: toWireProvider(record) }, 201);} catch (error) {if (error instanceof MissingStoredSecretError) {@@ -90,6 +92,7 @@ export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRou};const putHandler: RouteHandler<typeof putModelProviderRoute> = async c => {+ const store = deps.resolveModelProviderStore(c);const body: UpdateModelProviderRequest = c.req.valid('json');const provider = body.manifest;const name = modelProviderName(provider);@@ -97,15 +100,12 @@ export function createModelProvidersRouter<TTransaction>(deps: ModelProvidersRou// Lock → resolve secret from that snapshot → upsert, all in one txn so concurrent keep// cannot re-write a secret over a rotate that committed in between.const record = await deps.withTransaction(async transaction => {- const existing = await deps.modelProviderStore.getProviderForUpdate(- { tenant_id: TENANT_ID, name },- transaction,- );+ const existing = await store.getProviderForUpdate({ tenant_id: TENANT_ID, name }, transaction);const manifest = resolveModelProviderManifestForWrite({incoming: provider,existing: existing?.manifest,});- return deps.modelProviderStore.upsertProvider({ tenant_id: TENANT_ID, name, manifest }, transaction);+ return store.upsertProvider({ tenant_id: TENANT_ID, name, manifest }, transaction);});return c.json({ data: toWireProvider(record) }, 200);} catch (error) {diff --git a/packages/trueforge/src/apis/models.ts b/packages/trueforge/src/apis/models.tsindex 59fee68c1..67172b04e 100644--- a/packages/trueforge/src/apis/models.ts+++ b/packages/trueforge/src/apis/models.ts@@ -1,4 +1,5 @@import { OpenAPIHono } from '@hono/zod-openapi';+import type { Context } from 'hono';import type { IModelProviderStore } from '../db/modelProviderStore';import type { WithTransaction } from '../db/transaction';import { listAvailableModelsRoute } from '../routes/modelRoutes';@@ -6,12 +7,13 @@ import { TENANT_ID } from './sessions';/** Chat slim list (mounted at /api/v1/models) — mirrors GET /api/v1/skills. */export function createModelsRouter<TTransaction>(deps: {- modelProviderStore: IModelProviderStore<TTransaction>;+ resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;}) {const router = new OpenAPIHono();- router.openapi(listAvailableModelsRoute, async c =>- c.json({ data: await deps.modelProviderStore.listModels(TENANT_ID) }, 200),- );+ router.openapi(listAvailableModelsRoute, async c => {+ const store = deps.resolveModelProviderStore(c);+ return c.json({ data: await store.listModels({ tenant_id: TENANT_ID }) }, 200);+ });return router;}diff --git a/packages/trueforge/src/apis/sessions.ts b/packages/trueforge/src/apis/sessions.tsindex b6a44f9ce..f62695ba1 100644--- a/packages/trueforge/src/apis/sessions.ts+++ b/packages/trueforge/src/apis/sessions.ts@@ -17,6 +17,7 @@ import {type RouteHandler as RequestReplyRouteHandler,type RequestReplyRouter,} from '@truefoundry/trueforge-core/request-reply';+import type { Context } from 'hono';import type { RedisClientType } from 'redis';import type { Logger } from 'winston';import { z } from 'zod';@@ -73,7 +74,7 @@ export interface SessionsRouterDeps {sessions: Sessions;sessionStore: ISessionStore;activeTurns: ActiveTurnRegistry;- modelProviderStore: IModelProviderStore;+ resolveModelProviderStore: (c: Context) => IModelProviderStore;mcpServerStore: IMcpServerStore;skillStore: ISkillStore;agentStore: IAgentStore;@@ -222,7 +223,7 @@ function checkSessionAccess({ userRef, createdBy }: { userRef: string; createdBytype InternalSessionsRouterDeps = Pick<SessionsRouterDeps,| 'sessions'- | 'modelProviderStore'+ | 'resolveModelProviderStore'| 'mcpServerStore'| 'skillStore'| 'agentStore'@@ -259,7 +260,7 @@ function createGetOrCreateSessionByExternalIdHandler(await validateAgentSpec({spec: body.agent.spec,tenant_id: TENANT_ID,- modelProviderStore: deps.modelProviderStore,+ modelProviderStore: deps.resolveModelProviderStore(c),mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,sandboxProviderStore: deps.sandboxProviderStore,@@ -312,7 +313,7 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {await validateAgentSpec({spec: body.agent.spec,tenant_id: TENANT_ID,- modelProviderStore: deps.modelProviderStore,+ modelProviderStore: deps.resolveModelProviderStore(c),mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,sandboxProviderStore: deps.sandboxProviderStore,@@ -370,7 +371,7 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {await validateAgentSpec({spec: body.agent.spec,tenant_id: TENANT_ID,- modelProviderStore: deps.modelProviderStore,+ modelProviderStore: deps.resolveModelProviderStore(c),mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,sandboxProviderStore: deps.sandboxProviderStore,diff --git a/packages/trueforge/src/apis/settings.ts b/packages/trueforge/src/apis/settings.tsindex 8738d2d2d..c87ec231e 100644--- a/packages/trueforge/src/apis/settings.ts+++ b/packages/trueforge/src/apis/settings.ts@@ -4,6 +4,7 @@* Auth is applied at the /api/v1/settings mount boundary in app.ts (admin when auth is enabled).*/import { OpenAPIHono } from '@hono/zod-openapi';+import type { Context } from 'hono';import type { Logger } from 'winston';import type { ResolveUserContext } from '../auth/identity';import type { IMcpServerStore } from '../db/mcpServerStore';@@ -18,7 +19,7 @@ import { createSandboxProvidersRouter } from './sandboxProviders';import { createSkillsRouter } from './skills';export interface SettingsRouterDeps<TTransaction> {- modelProviderStore: IModelProviderStore<TTransaction>;+ resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;mcpServerStore: IMcpServerStore<TTransaction>;tokenStore: IOAuthTokenStore<TTransaction>;skillStore: ISkillStore<TTransaction>;@@ -33,7 +34,7 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTrarouter.route('/model-providers',createModelProvidersRouter({- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,withTransaction: deps.withTransaction,}),);diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.tsindex 2ef791bac..b0d6453ac 100644--- a/packages/trueforge/src/apis/turns.ts+++ b/packages/trueforge/src/apis/turns.ts@@ -105,7 +105,7 @@ export interface TurnsRouterDeps {sessions: Sessions;sessionStore: ISessionStore;activeTurns: ActiveTurnRegistry;- modelProviderStore: IModelProviderStore;+ resolveModelProviderStore: (c: Context) => IModelProviderStore;mcpServerStore: IMcpServerStore;tokenStore: IOAuthTokenStore;skillStore: ISkillStore;@@ -117,19 +117,21 @@ export interface TurnsRouterDeps {resolveUserContext: ResolveUserContext;}-/** Deps needed to create a turn and drain events in-process (no HTTP). */+/**+ * Deps needed to create a turn and drain events in-process (no HTTP). Unlike the HTTP path, this+ * carries an already-resolved `modelProviderStore` (the scheduler has no request context to resolve one).+ */export type BeginTurnExecutionDeps = Pick<TurnsRouterDeps,| 'activeTurns'| 'eventSubscriptions'- | 'modelProviderStore'| 'mcpServerStore'| 'tokenStore'| 'skillStore'| 'agentStore'| 'sandboxProviderStore'| 'logger'->;+> & { modelProviderStore: IModelProviderStore };/*** Builds the per-turn resolver. Agent / MCP / sandbox / LLM lookups are wired@@ -161,19 +163,19 @@ function createTurnResolver(deps: {} = deps;return new TurnResourceResolver({llm: async name => {- const { providerConfig, defaultModelParams, modelProperties } = await getModelDetails({+ const resolved = await getModelDetails({tenant_id: TENANT_ID,name,store: modelProviderStore,});return {modelClient: new VercelAILLM({- providerConfig,+ providerConfig: resolved.providerConfig,logger,signal,}),- defaultModelParams,- modelProperties,+ defaultModelParams: resolved.defaultModelParams,+ modelProperties: resolved.modelProperties,};},mcp: async name => {@@ -672,7 +674,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps) {input: body.input,previous_turn_id: body.previous_turn_id,userRef,- deps,+ deps: { ...deps, modelProviderStore: deps.resolveModelProviderStore(c) },};try {diff --git a/packages/trueforge/src/app.ts b/packages/trueforge/src/app.tsindex ecc99ef7d..caf963a70 100644--- a/packages/trueforge/src/app.ts+++ b/packages/trueforge/src/app.ts@@ -48,6 +48,23 @@ import { zodErrorResponse, zodValidationHook } from './zodErrorResponse';const BEARER_AUTH_SCHEME = 'BearerAuth';+/** One line per request: method, path, status, duration. Skips `/healthz`. */+export function createAccessLogMiddleware(logger: Logger): MiddlewareHandler {+ return async (c, next) => {+ const started = performance.now();+ await next();+ if (c.req.path === '/healthz') {+ return;+ }+ logger.info('request', {+ method: c.req.method,+ path: c.req.path,+ status: c.res.status,+ duration_ms: Math.round(performance.now() - started),+ });+ };+}+/** Hono bodyLimit wrapper that returns the API error envelope on 413. */export function createRequestBodyLimitMiddleware(maxSize: number): MiddlewareHandler {return bodyLimit({@@ -148,7 +165,11 @@ export interface ServerDeps<TTransaction> {mcpCatalog: McpCatalog;skillCatalog: SkillCatalog;sandboxCatalog: SandboxCatalog;- modelProviderStore: IModelProviderStore<TTransaction>;+ /**+ * Per-request store: DB singleton, or a token-bound TrueFoundry store in TrueFoundry mode.+ * Called without a context (e.g. the scheduler) it returns the DB persistence store.+ */+ resolveModelProviderStore: (c?: Context) => IModelProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;mcpServerStore: IMcpServerStore<TTransaction>;tokenStore: IOAuthTokenStore<TTransaction>;@@ -175,6 +196,9 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {const app = new OpenAPIHono({ defaultHook: zodValidationHook });const authEnabled = deps.oidcClient != null;+ if (configuration.ACCESS_LOGS) {+ app.use('*', createAccessLogMiddleware(deps.logger));+ }app.use('*', createRequestBodyLimitMiddleware(configuration.MAX_REQUEST_BODY_BYTES));app.get('/healthz', c => c.json({ status: 'ok', version: PACKAGE_VERSION }));@@ -194,7 +218,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {'/api/v1/models',withAuth(createModelsRouter({- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,withTransaction: deps.withTransaction,}),),@@ -246,7 +270,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {withAuth(createAgentsRouter({agentStore: deps.agentStore,- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,sandboxProviderStore: deps.sandboxProviderStore,@@ -264,7 +288,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {turnDeps: {activeTurns: deps.activeTurns,eventSubscriptions: deps.eventSubscriptions,- modelProviderStore: deps.modelProviderStore,+ modelProviderStore: deps.resolveModelProviderStore(),mcpServerStore: deps.mcpServerStore,tokenStore: deps.tokenStore,skillStore: deps.skillStore,@@ -281,7 +305,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {'/api/v1/settings',withAdminAuth(createSettingsRouter({- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,mcpServerStore: deps.mcpServerStore,tokenStore: deps.tokenStore,skillStore: deps.skillStore,@@ -297,7 +321,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {withAuth(createInternalSessionsRouter({sessions: deps.sessions,- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,agentStore: deps.agentStore,@@ -322,7 +346,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {sessions: deps.sessions,sessionStore: deps.sessionStore,activeTurns: deps.activeTurns,- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,mcpServerStore: deps.mcpServerStore,skillStore: deps.skillStore,agentStore: deps.agentStore,@@ -341,7 +365,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {sessions: deps.sessions,sessionStore: deps.sessionStore,activeTurns: deps.activeTurns,- modelProviderStore: deps.modelProviderStore,+ resolveModelProviderStore: deps.resolveModelProviderStore,mcpServerStore: deps.mcpServerStore,tokenStore: deps.tokenStore,skillStore: deps.skillStore,diff --git a/packages/trueforge/src/auth/cookies.ts b/packages/trueforge/src/auth/cookies.tsindex 16af6e3e5..03db95d03 100644--- a/packages/trueforge/src/auth/cookies.ts+++ b/packages/trueforge/src/auth/cookies.ts@@ -6,6 +6,7 @@ import { getPublicBaseUrl } from '../config';export const OAUTH_STATE_COOKIE = 'oauth_state';export const ID_TOKEN_COOKIE = 'id_token';+export const ACCESS_TOKEN_COOKIE = 'accessToken';const OAuthStateSchema = z.object({state: z.string(),@@ -64,3 +65,7 @@ export function clearAuthCookie(params: { context: Context; name: string }): voiexport function readIdTokenCookie(params: { context: Context }): string | undefined {return getCookie(params.context, ID_TOKEN_COOKIE);}++export function readAccessTokenCookie(params: { context: Context }): string | undefined {+ return getCookie(params.context, ACCESS_TOKEN_COOKIE);+}diff --git a/packages/trueforge/src/auth/middleware.ts b/packages/trueforge/src/auth/middleware.tsindex 2e55adcbd..719de02df 100644--- a/packages/trueforge/src/auth/middleware.ts+++ b/packages/trueforge/src/auth/middleware.ts@@ -2,7 +2,7 @@ import type { Context, MiddlewareHandler } from 'hono';import { HTTPException } from 'hono/http-exception';import { jwtVerify } from 'jose';import { toUserContext, type IdTokenClaims } from './claims';-import { readIdTokenCookie } from './cookies';+import { readAccessTokenCookie, readIdTokenCookie } from './cookies';import { LOCAL_USER_CONTEXT, isAdmin, type UserContext } from './identity';import { getOidcVerify } from './oidc';@@ -15,11 +15,11 @@ declare module 'hono' {const AUTH_HEADER_TYPE = 'Bearer';/**- * OIDC ID token from `Authorization: Bearer <jwt>` when present.+ * Bearer token from `Authorization: Bearer <token>` when present.* Case-insensitive scheme; rejects empty credentials. Non-Bearer schemes → undefined* so cookie auth can still apply.*/-export function readBearerIdToken(c: Context): string | undefined {+export function readBearerToken(c: Context): string | undefined {const header = c.req.header('Authorization')?.trim();if (!header) {return undefined;@@ -32,11 +32,19 @@ export function readBearerIdToken(c: Context): string | undefined {return token.length > 0 ? token : undefined;}+export function requireAccessToken(c: Context): string {+ const token = readBearerToken(c) ?? readAccessTokenCookie({ context: c }) ?? readIdTokenCookie({ context: c });+ if (!token) {+ throw new HTTPException(401, { message: 'Authentication token required to list or call TrueFoundry models' });+ }+ return token;+}+/*** Prefer Bearer over the browser cookie when both are sent (explicit API auth wins).*/export function readIdToken(c: Context): string | undefined {- return readBearerIdToken(c) ?? readIdTokenCookie({ context: c });+ return readBearerToken(c) ?? readIdTokenCookie({ context: c });}/**diff --git a/packages/trueforge/src/config.ts b/packages/trueforge/src/config.tsindex 6bf3f0a73..5c87d6355 100644--- a/packages/trueforge/src/config.ts+++ b/packages/trueforge/src/config.ts@@ -318,6 +318,8 @@ export interface OIDCConfig {export interface SharedServerConfiguration {/** Log level. Env: `LOG_LEVEL`. */LOG_LEVEL: string;+ /** Log one line per HTTP request (except `/healthz`). Env: `ACCESS_LOGS`. Default true. */+ ACCESS_LOGS: boolean;/** Node environment. Env: `NODE_ENV`. */NODE_ENV: string | undefined;/** HTTP port the server listens on. Env: `PORT`. */@@ -430,6 +432,25 @@ export interface SharedServerConfiguration {* outside standalone development. Env: `PUBLIC_BASE_URL`.*/PUBLIC_BASE_URL: string;+ /**+ * When set, models are listed from the TrueFoundry ServiceFoundry server and invoked+ * via the AI Gateway with the caller's token. Unset = local model-provider store.+ * Env: `TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL`.+ */+ TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL: string | undefined;+ /**+ * Present this pod's client certificate on outbound calls to the ServiceFoundry server (internal+ * mutual TLS) and upgrade a mesh-direct peer URL from http to https. Off by default, so an+ * unconfigured deployment keeps calling over plain HTTP exactly as before.+ * Env: `TRUEFOUNDRY_MTLS_ENABLED`. Default false.+ */+ TRUEFOUNDRY_MTLS_ENABLED: boolean;+ /**+ * Directory holding the internal mTLS material used when `TRUEFOUNDRY_MTLS_ENABLED` is true — the+ * cert triple `tls.crt` / `tls.key` / `ca.crt`, so one chart value configures every component.+ * Env: `TRUEFOUNDRY_MTLS_CERTS_DIR`. Default `/etc/tls/truefoundry`.+ */+ TRUEFOUNDRY_MTLS_CERTS_DIR: string;}export type StandaloneServerConfiguration = SharedServerConfiguration & {@@ -513,6 +534,7 @@ const host = getEnv('HOST', { defaultValue: DEFAULT_HOST }) ?? DEFAULT_HOST;const shared: SharedServerConfiguration = {LOG_LEVEL: getEnv('LOG_LEVEL', { defaultValue: 'info' }) ?? 'info',+ ACCESS_LOGS: parseBoolean({ envKey: 'ACCESS_LOGS', raw: getEnv('ACCESS_LOGS'), defaultValue: true }),NODE_ENV: getEnv('NODE_ENV'),PORT: port,HOST: host,@@ -587,6 +609,14 @@ const shared: SharedServerConfiguration = {defaultValue: 500,}),PUBLIC_BASE_URL: getEnv('PUBLIC_BASE_URL', { defaultValue: '' }) ?? '',+ TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL: getEnv('TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL', { required: false }),+ TRUEFOUNDRY_MTLS_ENABLED: parseBoolean({+ envKey: 'TRUEFOUNDRY_MTLS_ENABLED',+ raw: getEnv('TRUEFOUNDRY_MTLS_ENABLED'),+ defaultValue: false,+ }),+ TRUEFOUNDRY_MTLS_CERTS_DIR:+ getEnv('TRUEFOUNDRY_MTLS_CERTS_DIR', { defaultValue: '/etc/tls/truefoundry' }) ?? '/etc/tls/truefoundry',};const configuration: ServerConfiguration = standalone@@ -626,6 +656,24 @@ export function isOidcConfigured(return !value.STANDALONE && value.OIDC !== undefined;}+/**+ * TrueFoundry mode: trueforge is backed by the ServiceFoundry server (models today, MCP and other+ * resources later) rather than its local catalog. Gated on `TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL`.+ */+export function isTrueFoundryModeEnabled(+ config: ServerConfiguration = configuration,+): config is ServerConfiguration & { TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL: string } {+ return config.TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL !== undefined;+}++// TrueFoundry mode authenticates each caller with their own gateway token, so browser SSO must be+// off — the two auth models are mutually exclusive.+if (isTrueFoundryModeEnabled(configuration) && isOidcConfigured(configuration)) {+ throw new Error(+ 'TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL (TrueFoundry mode) and OIDC (SSO) cannot both be enabled at once.',+ );+}+/*** Public origin for OAuth callbacks.* Standalone (non-development) → `http://localhost:$PORT`; otherwise `PUBLIC_BASE_URL`diff --git a/packages/trueforge/src/db/modelProviderStore.ts b/packages/trueforge/src/db/modelProviderStore.tsindex 3197ee57c..4a5be5a5b 100644--- a/packages/trueforge/src/db/modelProviderStore.ts+++ b/packages/trueforge/src/db/modelProviderStore.ts@@ -1,7 +1,7 @@/**- * DB-backed configured model providers: one row per provider per tenant,- * identity as columns plus the Zod-validated `ModelProviderManifest` document as jsonb.- * Implementations: PostgresModelProviderStore and SqliteModelProviderStore.+ * Configured model providers: identity columns plus the Zod-validated+ * `ModelProviderManifest` document. Implementations: Postgres, Sqlite, and+ * TrueFoundry (read-only ServiceFoundry server listing).*/import type { ResourceName } from '../schemas/common';import type { AvailableModel, ModelProviderManifest } from '../schemas/modelProvider';@@ -16,6 +16,10 @@ export interface ModelProviderRecord {updated_at: string;}+export interface ListModelProvidersInput {+ tenant_id: string;+}+export interface GetModelProviderInput {tenant_id: string;name: string;@@ -45,7 +49,7 @@ export class ModelProviderNameConflictError extends Error {}export interface IModelProviderStore<TTransaction = never> {- listProviders(tenantId: string, transaction?: TTransaction): Promise<ModelProviderRecord[]>;+ listProviders(input: ListModelProvidersInput, transaction?: TTransaction): Promise<ModelProviderRecord[]>;getProvider(input: GetModelProviderInput, transaction?: TTransaction): Promise<ModelProviderRecord | undefined>;/*** Load one provider while holding a row lock for the lifetime of `transaction`.@@ -61,7 +65,7 @@ export interface IModelProviderStore<TTransaction = never> {/** Single-row write: creates the provider or replaces the whole manifest (models included). */upsertProvider(input: UpsertModelProviderInput, transaction?: TTransaction): Promise<ModelProviderRecord>;/** Flattens manifests into the FQN read view for GET /models. */- listModels(tenantId: string, transaction?: TTransaction): Promise<AvailableModel[]>;+ listModels(input: ListModelProvidersInput, transaction?: TTransaction): Promise<AvailableModel[]>;}/** Application-side flatten shared by both store implementations. */diff --git a/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts b/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.tsindex e27fb7b96..f74ee0c9b 100644--- a/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts+++ b/packages/trueforge/src/db/postgres/model-provider-store/PostgresModelProviderStore.ts@@ -6,6 +6,7 @@ import {type CreateModelProviderInput,type GetModelProviderInput,type IModelProviderStore,+ type ListModelProvidersInput,type ModelProviderRecord,type UpsertModelProviderInput,} from '../../modelProviderStore';@@ -30,12 +31,15 @@ export class PostgresModelProviderStore implements IModelProviderStore<Transactithis.#db = db;}- async listProviders(tenantId: string, transaction?: Transaction<Database>): Promise<ModelProviderRecord[]> {+ async listProviders(+ input: ListModelProvidersInput,+ transaction?: Transaction<Database>,+ ): Promise<ModelProviderRecord[]> {const db = transaction ?? this.#db;const rows = await db.selectFrom('model_provider').selectAll()- .where('tenant_id', '=', tenantId)+ .where('tenant_id', '=', input.tenant_id).orderBy('name').execute();return rows.map(toRecord);@@ -120,7 +124,7 @@ export class PostgresModelProviderStore implements IModelProviderStore<Transactireturn toRecord(row);}- async listModels(tenantId: string, transaction?: Transaction<Database>): Promise<AvailableModel[]> {- return flattenProviderModels(await this.listProviders(tenantId, transaction));+ async listModels(input: ListModelProvidersInput, transaction?: Transaction<Database>): Promise<AvailableModel[]> {+ return flattenProviderModels(await this.listProviders(input, transaction));}}diff --git a/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts b/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.tsindex d6503d4f5..01fc242e0 100644--- a/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts+++ b/packages/trueforge/src/db/sqlite/model-provider-store/SqliteModelProviderStore.ts@@ -6,6 +6,7 @@ import {type CreateModelProviderInput,type GetModelProviderInput,type IModelProviderStore,+ type ListModelProvidersInput,type ModelProviderRecord,type UpsertModelProviderInput,} from '../../modelProviderStore';@@ -31,12 +32,15 @@ export class SqliteModelProviderStore implements IModelProviderStore<Transactionthis.#db = db;}- async listProviders(tenantId: string, transaction?: Transaction<Database>): Promise<ModelProviderRecord[]> {+ async listProviders(+ input: ListModelProvidersInput,+ transaction?: Transaction<Database>,+ ): Promise<ModelProviderRecord[]> {const db = transaction ?? this.#db;return await db.selectFrom('model_provider').select(recordColumns)- .where('tenant_id', '=', tenantId)+ .where('tenant_id', '=', input.tenant_id).orderBy('name').execute();}@@ -121,7 +125,7 @@ export class SqliteModelProviderStore implements IModelProviderStore<Transaction.executeTakeFirstOrThrow();}- async listModels(tenantId: string, transaction?: Transaction<Database>): Promise<AvailableModel[]> {- return flattenProviderModels(await this.listProviders(tenantId, transaction));+ async listModels(input: ListModelProvidersInput, transaction?: Transaction<Database>): Promise<AvailableModel[]> {+ return flattenProviderModels(await this.listProviders(input, transaction));}}diff --git a/packages/trueforge/src/main.ts b/packages/trueforge/src/main.tsindex 398d043af..9b76a49d0 100644--- a/packages/trueforge/src/main.ts+++ b/packages/trueforge/src/main.ts@@ -10,6 +10,7 @@* Postgres store modules stay dynamic so only the active engine is loaded.*/import { extractErrorLogFields } from '@truefoundry/trueforge-core/core';+import type { Context } from 'hono';import { mkdir } from 'node:fs/promises';import path from 'node:path';import {@@ -21,9 +22,10 @@ import { setCachedLocalSandboxSupport } from './sandbox/localRuntime';let configuration: typeof import('./config').default;let isOidcConfigured: typeof import('./config').isOidcConfigured;+let isTrueFoundryModeEnabled: typeof import('./config').isTrueFoundryModeEnabled;try {- ({ default: configuration, isOidcConfigured } = await import('./config'));+ ({ default: configuration, isOidcConfigured, isTrueFoundryModeEnabled } = await import('./config'));} catch (error) {console.error('Failed to start server: Failed to load configuration:',@@ -45,6 +47,7 @@ import type { RedisClientType } from 'redis';import type { Logger } from 'winston';import { createServerApp } from './app';+import { requireAccessToken } from './auth/middleware';import { initOidc } from './auth/oidc';import { McpCatalog } from './catalog/McpCatalog';import { ModelCatalog } from './catalog/ModelCatalog';@@ -69,12 +72,14 @@ import { PACKAGE_VERSION } from './packageVersion';import { ActiveTurnRegistry } from './runtime/activeTurns';import { EventSubscriptionRegistry } from './runtime/event-subscription';import { printStandaloneStartupBanner } from './startupBanner';+import { TrueFoundryModelProviderStore } from './truefoundry/TrueFoundryModelProviderStore';+import { TrueFoundryServiceFoundryServerClient } from './truefoundry/TrueFoundryServiceFoundryServerClient';/** Persistence + optional Redis wired for the selected topology. */interface ServerPersistence<TTransaction> {sessionStore: ISessionStore;sessionMetricsStore: ISessionMetricsStore;- modelProviderStore: IModelProviderStore<TTransaction>;+ resolveModelProviderStore: (c?: Context) => IModelProviderStore<TTransaction>;withTransaction: WithTransaction<TTransaction>;mcpServerStore: IMcpServerStore<TTransaction>;tokenStore: IOAuthTokenStore<TTransaction>;@@ -86,6 +91,30 @@ interface ServerPersistence<TTransaction> {redis: RedisClientType | undefined;}+/**+ * Per-request model-provider store resolver. In TrueFoundry mode every request gets a token-bound+ * store over a shared (mTLS) ServiceFoundry client; otherwise the persistence store is reused as-is.+ */+function buildResolveModelProviderStore<TTransaction>(options: {+ persistenceStore: IModelProviderStore<TTransaction>;+ logger: Logger;+}): (c?: Context) => IModelProviderStore<TTransaction> {+ if (!isTrueFoundryModeEnabled(configuration)) {+ return () => options.persistenceStore;+ }+ const client = new TrueFoundryServiceFoundryServerClient({+ serviceFoundryServerUrl: configuration.TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL,+ logger: options.logger,+ tls: { enabled: configuration.TRUEFOUNDRY_MTLS_ENABLED, dir: configuration.TRUEFOUNDRY_MTLS_CERTS_DIR },+ });+ // No request context (e.g. the scheduler) means no caller token, so TrueFoundry models are+ // unavailable there; fall back to the persistence store.+ return c =>+ c+ ? new TrueFoundryModelProviderStore<TTransaction>({ client, accessToken: requireAccessToken(c) })+ : options.persistenceStore;+}+/** SQLite stores; Redis unused (executor peering disabled). */async function createStandalonePersistence(options: {sqlitePath: string;@@ -128,7 +157,10 @@ async function createStandalonePersistence(options: {return {sessionStore: new SqliteSessionStore(db),sessionMetricsStore: new SqliteSessionMetricsStore(db),- modelProviderStore: new SqliteModelProviderStore(db),+ resolveModelProviderStore: buildResolveModelProviderStore({+ persistenceStore: new SqliteModelProviderStore(db),+ logger,+ }),withTransaction: callback => db.transaction().execute(callback),mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),@@ -197,7 +229,10 @@ async function createDistributedPersistence(options: {return {sessionStore: new PostgresSessionStore(db),sessionMetricsStore: new PostgresSessionMetricsStore(db),- modelProviderStore: new PostgresModelProviderStore(db),+ resolveModelProviderStore: buildResolveModelProviderStore({+ persistenceStore: new PostgresModelProviderStore(db),+ logger,+ }),withTransaction: callback => db.transaction().execute(callback),mcpServerStore: new PostgresMcpServerStore(db),tokenStore: new PostgresOAuthTokenStore(db),@@ -215,7 +250,7 @@ async function createServerRuntime<TTransaction>(persistence: ServerPersistence<const {sessionStore,sessionMetricsStore,- modelProviderStore,+ resolveModelProviderStore,withTransaction,mcpServerStore,tokenStore,@@ -254,7 +289,7 @@ async function createServerRuntime<TTransaction>(persistence: ServerPersistence<mcpCatalog: McpCatalog.load(),skillCatalog: SkillCatalog.load(),sandboxCatalog: SandboxCatalog.load(),- modelProviderStore,+ resolveModelProviderStore,withTransaction,mcpServerStore,tokenStore,diff --git a/packages/trueforge/src/routes/modelProviderRoutes.ts b/packages/trueforge/src/routes/modelProviderRoutes.tsindex 1c55fe26e..132208e1d 100644--- a/packages/trueforge/src/routes/modelProviderRoutes.ts+++ b/packages/trueforge/src/routes/modelProviderRoutes.ts@@ -11,6 +11,7 @@ import {ListModelProvidersResponseSchema,UpdateModelProviderRequestSchema,} from '../schemas/modelProvider';+import { trueFoundryManagedResponse } from '../truefoundry/trueFoundryManaged';import { OpenApiTag } from './openapiTags';export const listModelProvidersRoute = createRoute({@@ -66,6 +67,7 @@ export const createModelProviderRoute = createRoute({content: { 'application/json': { schema: RequestErrorResponseSchema } },description: 'A model provider with this name already exists.',},+ 424: trueFoundryManagedResponse,},});@@ -94,5 +96,6 @@ export const putModelProviderRoute = createRoute({content: { 'application/json': { schema: RequestErrorResponseSchema } },description: 'Invalid request body, or redacted API key with no stored secret to keep.',},+ 424: trueFoundryManagedResponse,},});diff --git a/packages/trueforge/src/routes/modelRoutes.ts b/packages/trueforge/src/routes/modelRoutes.tsindex e857e8d07..8b9d0654d 100644--- a/packages/trueforge/src/routes/modelRoutes.ts+++ b/packages/trueforge/src/routes/modelRoutes.ts@@ -19,7 +19,7 @@ export const listAvailableModelsRoute = createRoute({},401: {content: { 'application/json': { schema: RequestErrorResponseSchema } },- description: 'OIDC is configured and the request has no valid session cookie.',+ description: 'Auth is configured and the request has no valid no Bearer token or session cookie.',},},});diff --git a/packages/trueforge/src/routes/turnRoutes.ts b/packages/trueforge/src/routes/turnRoutes.tsindex 07359e9f5..7d9fe7764 100644--- a/packages/trueforge/src/routes/turnRoutes.ts+++ b/packages/trueforge/src/routes/turnRoutes.ts@@ -211,6 +211,10 @@ Use \`previous_turn_id\` to chain to the session's last turn (defaults to \`autocontent: { 'application/json': { schema: RequestErrorResponseSchema } },description: 'Invalid request body.',},+ 401: {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Invalid Bearer token or auth cookie',+ },403: {content: { 'application/json': { schema: RequestErrorResponseSchema } },description: 'Caller is not the session creator.',diff --git a/packages/trueforge/src/runtime/sessionResources.ts b/packages/trueforge/src/runtime/sessionResources.tsindex e053e6694..5206df875 100644--- a/packages/trueforge/src/runtime/sessionResources.ts+++ b/packages/trueforge/src/runtime/sessionResources.ts@@ -27,6 +27,7 @@ import { LocalSandboxProvider } from '../sandbox/local/provider/LocalSandboxProvimport { getCachedLocalSandboxSupport, isLocalSandboxFallbackEnabled } from '../sandbox/localRuntime';import { toDaytonaSandboxProvider } from '../sandbox/providerUtils';import { resolveConfiguredMcpRequestHeaders } from '../schemas/mcpServer';+import type { ReasoningEffort } from '../schemas/modelProvider';export interface McpConnection {url: string;@@ -49,6 +50,7 @@ export function parseModelFqn(name: string): { providerName: string; modelName:* Load turn-ready model config and defaults for a configured FQN (`provider/model`).* Malformed FQN or missing provider/model → HTTPException(422).*/+export async function getModelDetails({tenant_id,name,@@ -61,6 +63,7 @@ export async function getModelDetails({providerConfig: VercelAIProviderConfig;defaultModelParams: ModelParams;modelProperties: AgentDefinition['modelProperties'];+ reasoningEfforts: ReasoningEffort[] | undefined;}> {const parsed = parseModelFqn(name);if (parsed === undefined) {@@ -82,19 +85,19 @@ export async function getModelDetails({}// Provider types are adapter names, so this assignment is what keeps them so: a type with no// `buildLanguageModel` case fails to compile here.- const { type, base_url } = provider.manifest;+ const { type, base_url: baseUrl } = provider.manifest;return {providerConfig: {provider: { type, name: provider.name },model: { id: model.model_id, name: model.name },name,- baseUrl: base_url,- // Custom providers may omit auth; adapters still require a string.+ baseUrl,apiKey: provider.manifest.auth?.api_key ?? '',headers: {},},defaultModelParams: model.properties.max_output_tokens ? { max_tokens: model.properties.max_output_tokens } : {},modelProperties: { contextLength: model.properties.context_length },+ reasoningEfforts: model.properties.reasoning_efforts,};}@@ -306,27 +309,14 @@ export async function validateAgentSpec({skillStore: ISkillStore;sandboxProviderStore: ISandboxProviderStore;}): Promise<void> {- const parsed = parseModelFqn(spec.model.name);- if (parsed === undefined) {- throw new HTTPException(422, {- message: `Model name must be a fully qualified "provider/model": ${spec.model.name}`,- });- }- const provider = await modelProviderStore.getProvider({ tenant_id, name: parsed.providerName });- if (provider === undefined) {- throw new HTTPException(422, {- message: `Unknown model "${spec.model.name}" — provider not configured`,- });- }- const model = provider.manifest.models.find(entry => entry.name === parsed.modelName);- if (model === undefined) {- throw new HTTPException(422, {- message: `Unknown model "${spec.model.name}" — not configured on provider`,- });- }+ const resolved = await getModelDetails({+ tenant_id,+ name: spec.model.name,+ store: modelProviderStore,+ });const reasoningEffort = spec.model.params?.reasoning_effort;if (reasoningEffort !== undefined) {- const efforts = model.properties.reasoning_efforts;+ const efforts = resolved.reasoningEfforts;if (!efforts?.some(effort => effort === reasoningEffort)) {throw new HTTPException(422, {message: effortsdiff --git a/packages/trueforge/src/schemas/modelCatalog.ts b/packages/trueforge/src/schemas/modelCatalog.tsindex 6fc079b2c..fe5b7ebd6 100644--- a/packages/trueforge/src/schemas/modelCatalog.ts+++ b/packages/trueforge/src/schemas/modelCatalog.ts@@ -14,10 +14,12 @@ import {/*** Catalog entry. Well-known types list model presets; `custom` is a sentinel that* carries `supported_reasoning_efforts` for the custom-provider settings form.+ * `truefoundry` is TrueFoundry-managed (not a user-savable preset), so it is excluded.*/-export const CatalogWellKnownModelProviderTypeSchema = ModelProviderTypeSchema.exclude(['custom']).openapi(- 'CatalogWellKnownModelProviderType',-);+export const CatalogWellKnownModelProviderTypeSchema = ModelProviderTypeSchema.exclude([+ 'custom',+ 'truefoundry',+]).openapi('CatalogWellKnownModelProviderType');/** Same shape as a configured model; named for the catalog view it appears in. */export const CatalogModelSchema = ConfiguredModelSchema.openapi('CatalogModel');diff --git a/packages/trueforge/src/schemas/modelProvider.ts b/packages/trueforge/src/schemas/modelProvider.tsindex 56e1d6983..c6bed6176 100644--- a/packages/trueforge/src/schemas/modelProvider.ts+++ b/packages/trueforge/src/schemas/modelProvider.ts@@ -79,7 +79,7 @@ const ModelProviderManifestBaseSchema = z* one of each because the `(tenant_id, name)` primary key replaces the row rather than adding a* sibling. `base_url` defaults to the adapter's endpoint and stays overridable.*/-function wellKnownProviderSchema<Type extends Exclude<ModelProviderType, 'custom'>>({+function wellKnownProviderSchema<Type extends Exclude<ModelProviderType, 'custom' | 'truefoundry'>>({type,base_url,}: {@@ -132,6 +132,19 @@ const AlibabaModelProviderSchema = wellKnownProviderSchema({base_url: 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1',}).openapi('AlibabaModelProvider');+/**+ * Managed by TrueFoundry: modelled like `custom` (its own `base_url` + `auth`), but unnamed like a+ * well-known type. The gateway endpoint and passthrough token are populated by the store at runtime;+ * `auth` is stripped from API responses.+ */+const TrueFoundryModelProviderSchema = ModelProviderManifestBaseSchema.extend({+ type: z.literal('truefoundry'),+ base_url: z.url().describe('Base URL of the TrueFoundry AI gateway the models are invoked against.'),+ auth: ModelProviderAuthSchema.optional(),+})+ .strict()+ .openapi('TrueFoundryModelProvider');+/** The one type a caller names, because only it supplies its own endpoint. */const CustomModelProviderSchema = ModelProviderManifestBaseSchema.extend({type: z.literal('custom'),@@ -165,6 +178,7 @@ const ModelProviderBodySchema = zMoonshotModelProviderSchema,TogetherAIModelProviderSchema,AlibabaModelProviderSchema,+ TrueFoundryModelProviderSchema,CustomModelProviderSchema,]).superRefine(refineModelProviderManifest);diff --git a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.tsnew file mode 100644index 000000000..d9319ce59--- /dev/null+++ b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts@@ -0,0 +1,125 @@+import { HTTPException } from 'hono/http-exception';+import {+ flattenProviderModels,+ type CreateModelProviderInput,+ type GetModelProviderInput,+ type IModelProviderStore,+ type ListModelProvidersInput,+ type ModelProviderRecord,+ type UpsertModelProviderInput,+} from '../db/modelProviderStore';+import type { AvailableModel, ModelProviderManifest } from '../schemas/modelProvider';+import { mapEnabledModels, resolveDefaultGatewayUrl, type TrueFoundryEnabledModel } from './mapEnabledModels';+import { TRUEFOUNDRY_MANAGED_MESSAGE, TRUEFOUNDRY_MANAGED_STATUS } from './trueFoundryManaged';+import { TrueFoundryServiceFoundryServerClient } from './TrueFoundryServiceFoundryServerClient';++function managed(): never {+ throw new HTTPException(TRUEFOUNDRY_MANAGED_STATUS, { message: TRUEFOUNDRY_MANAGED_MESSAGE });+}++export class TrueFoundryModelProviderStore<TTransaction = never> implements IModelProviderStore<TTransaction> {+ readonly #client: TrueFoundryServiceFoundryServerClient;+ readonly #accessToken: string;++ constructor(input: { client: TrueFoundryServiceFoundryServerClient; accessToken: string }) {+ this.#client = input.client;+ this.#accessToken = input.accessToken;+ }++ async listProviders(input: ListModelProvidersInput, transaction?: TTransaction): Promise<ModelProviderRecord[]> {+ void transaction;+ return this.#records(input);+ }++ async getProvider(+ input: GetModelProviderInput,+ transaction?: TTransaction,+ ): Promise<ModelProviderRecord | undefined> {+ void transaction;+ const records = await this.#records(input);+ return records.find(record => record.name === input.name);+ }++ getProviderForUpdate(+ input: GetModelProviderInput,+ transaction: TTransaction,+ ): Promise<ModelProviderRecord | undefined> {+ void input;+ void transaction;+ return managed();+ }++ createProvider(input: CreateModelProviderInput, transaction?: TTransaction): Promise<ModelProviderRecord> {+ void input;+ void transaction;+ return managed();+ }++ upsertProvider(input: UpsertModelProviderInput, transaction?: TTransaction): Promise<ModelProviderRecord> {+ void input;+ void transaction;+ return managed();+ }++ async listModels(input: ListModelProvidersInput, transaction?: TTransaction): Promise<AvailableModel[]> {+ return flattenProviderModels(await this.listProviders(input, transaction));+ }++ async #records(input: { tenant_id: string }): Promise<ModelProviderRecord[]> {+ const [integrations, installations] = await Promise.all([+ this.#client.listProviderIntegrations(this.#accessToken),+ this.#client.listGatewayInstallations(this.#accessToken),+ ]);+ const gatewayUrl = resolveDefaultGatewayUrl(installations);+ return toRecords({+ tenant_id: input.tenant_id,+ gatewayUrl,+ accessToken: this.#accessToken,+ models: mapEnabledModels({ integrations }),+ });+ }+}++function toRecords(input: {+ tenant_id: string;+ gatewayUrl: string;+ accessToken: string;+ models: TrueFoundryEnabledModel[];+}): ModelProviderRecord[] {+ const byAccount = new Map<string, TrueFoundryEnabledModel[]>();+ for (const model of input.models) {+ const existing = byAccount.get(model.accountName);+ if (existing === undefined) {+ byAccount.set(model.accountName, [model]);+ } else {+ existing.push(model);+ }+ }+ const now = new Date().toISOString();+ return [...byAccount.entries()]+ .sort(([left], [right]) => left.localeCompare(right))+ .map(([accountName, models]) => ({+ tenant_id: input.tenant_id,+ name: accountName,+ manifest: toManifest({ models, gatewayUrl: input.gatewayUrl, accessToken: input.accessToken }),+ created_at: now,+ updated_at: now,+ }));+}++function toManifest(input: {+ models: TrueFoundryEnabledModel[];+ gatewayUrl: string;+ accessToken: string;+}): ModelProviderManifest {+ return {+ type: 'truefoundry',+ base_url: input.gatewayUrl,+ auth: { api_key: input.accessToken },+ models: input.models.map(model => ({+ name: model.modelName,+ model_id: `${model.accountName}/${model.modelName}`,+ properties: model.properties,+ })),+ };+}diff --git a/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts b/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.tsnew file mode 100644index 000000000..d31bacbbe--- /dev/null+++ b/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts@@ -0,0 +1,131 @@+import { extractErrorLogFields } from '@truefoundry/trueforge-core/core';+import { HTTPException } from 'hono/http-exception';+import { fetch as undiciFetch, type Dispatcher } from 'undici';+import type { Logger } from 'winston';+import { z } from 'zod';++import { createInternalTlsDispatcher, normalizeInternalTlsUrl, type InternalTlsOptions } from './internalTls';++const INTEGRATIONS_PATH = 'v1/provider-integrations';+const INSTALLATIONS_PATH = 'v1/llm-gateway/installations';+const INTEGRATIONS_PAGE_SIZE = 1000;++const ListResponseSchema = z.union([+ z.array(z.unknown()),+ z.object({+ data: z.array(z.unknown()).catch([]),+ pagination: z.object({ total: z.number().optional() }).optional(),+ }),+]);++const ServiceFoundryErrorSchema = z.object({+ message: z.union([z.string(), z.array(z.string())]).optional(),+});++async function readServiceFoundryErrorMessage(+ response: Awaited<ReturnType<typeof undiciFetch>>,+): Promise<string | undefined> {+ const body = await response.json().catch(() => undefined);+ const parsed = ServiceFoundryErrorSchema.safeParse(body);+ const message = parsed.success ? parsed.data.message : undefined;+ return Array.isArray(message) ? message.join(', ') : message;+}++export class TrueFoundryServiceFoundryServerClient {+ readonly #baseUrl: string;+ readonly #logger: Logger | undefined;+ readonly #dispatcher: Dispatcher | undefined;++ constructor(input: { serviceFoundryServerUrl: string; logger?: Logger; tls?: InternalTlsOptions }) {+ const tls = input.tls ?? { enabled: false, dir: '' };+ this.#baseUrl = normalizeInternalTlsUrl({ url: input.serviceFoundryServerUrl, enabled: tls.enabled }).replace(+ /\/+$/,+ '',+ );+ this.#dispatcher = createInternalTlsDispatcher(tls);+ this.#logger = input.logger;+ }++ async listProviderIntegrations(accessToken: string): Promise<unknown[]> {+ const items: unknown[] = [];+ let offset = 0;+ for (;;) {+ const payload = await this.#getJson(+ this.#url(INTEGRATIONS_PATH, {+ type: 'model',+ offset: String(offset),+ limit: String(INTEGRATIONS_PAGE_SIZE),+ }),+ accessToken,+ );+ const parsed = ListResponseSchema.safeParse(payload);+ if (!parsed.success) {+ break;+ }+ const page = Array.isArray(parsed.data) ? parsed.data : parsed.data.data;+ const total = Array.isArray(parsed.data) ? undefined : parsed.data.pagination?.total;+ items.push(...page);+ if (!total || items.length >= total || page.length === 0) {+ break;+ }+ offset = items.length;+ }+ return items;+ }++ listGatewayInstallations(accessToken: string): Promise<unknown> {+ return this.#getJson(this.#url(INSTALLATIONS_PATH), accessToken);+ }++ #url(path: string, search?: Record<string, string>): URL {+ const url = new URL(`${this.#baseUrl}/${path}`);+ if (search) {+ for (const [key, value] of Object.entries(search)) {+ url.searchParams.set(key, value);+ }+ }+ return url;+ }++ async #getJson(url: URL, accessToken: string): Promise<unknown> {+ const startedAt = Date.now();+ let response: Awaited<ReturnType<typeof undiciFetch>>;+ try {+ response = await undiciFetch(url, {+ method: 'GET',+ headers: {+ accept: 'application/json',+ authorization: `Bearer ${accessToken}`,+ },+ ...(this.#dispatcher ? { dispatcher: this.#dispatcher } : {}),+ });+ } catch (error) {+ this.#logger?.warn('TrueFoundry ServiceFoundry server request failed', {+ url: url.href,+ durationMs: Date.now() - startedAt,+ ...extractErrorLogFields(error),+ });+ throw new HTTPException(500, {+ message: 'TrueFoundry ServiceFoundry server request failed',+ cause: error,+ });+ }+ this.#logger?.info('TrueFoundry ServiceFoundry server request completed', {+ url: url.href,+ status: response.status,+ durationMs: Date.now() - startedAt,+ });+ if (response.status === 401 || response.status === 403) {+ throw new HTTPException(response.status, {+ message: 'TrueFoundry ServiceFoundry server rejected the request',+ });+ }+ if (!response.ok) {+ const detail = await readServiceFoundryErrorMessage(response);+ throw new HTTPException(424, {+ message: `TrueFoundry ServiceFoundry server request failed: ${detail ?? `HTTP ${String(response.status)}`}`,+ });+ }+ return response.json();+ }+}diff --git a/packages/trueforge/src/truefoundry/internalTls.ts b/packages/trueforge/src/truefoundry/internalTls.tsnew file mode 100644index 000000000..260f910da--- /dev/null+++ b/packages/trueforge/src/truefoundry/internalTls.ts@@ -0,0 +1,60 @@+/**+ * Client-side (outbound) mutual TLS for calling the TrueFoundry ServiceFoundry server. The cert triple+ * (`tls.crt` / `tls.key` / `ca.crt`) is mounted under `TRUEFOUNDRY_MTLS_CERTS_DIR`. The dispatcher is+ * scoped to the ServiceFoundry server client, so the internal certificate is never presented to the+ * external MCP servers or LLM providers trueforge also reaches over `fetch`.+ */+import { readFileSync } from 'node:fs';+import { join } from 'node:path';+import { rootCertificates } from 'node:tls';++import { Agent, type Dispatcher } from 'undici';++const TLS_CERT_FILE = 'tls.crt';+const TLS_KEY_FILE = 'tls.key';+const TLS_CA_FILE = 'ca.crt';++export interface InternalTlsOptions {+ enabled: boolean;+ dir: string;+}++function readTlsFile(input: { dir: string; fileName: string }): string {+ const filePath = join(input.dir, input.fileName);+ try {+ return readFileSync(filePath, 'utf8');+ } catch (error) {+ throw new Error(+ `TRUEFOUNDRY_MTLS_ENABLED is true but ${filePath} could not be read. Check that the mTLS secret ` ++ 'is mounted at TRUEFOUNDRY_MTLS_CERTS_DIR, or set TRUEFOUNDRY_MTLS_ENABLED=false.',+ { cause: error },+ );+ }+}++/** Upgrades an internal peer URL from http to https when mTLS is on; no-op otherwise. */+export function normalizeInternalTlsUrl(input: { url: string; enabled: boolean }): string {+ if (!input.enabled) {+ return input.url;+ }+ return input.url.startsWith('http://') ? `https://${input.url.slice('http://'.length)}` : input.url;+}++/** undici dispatcher presenting this pod's client cert and trusting the internal CA, or `undefined` when TLS is off. */+export function createInternalTlsDispatcher(options: InternalTlsOptions): Dispatcher | undefined {+ if (!options.enabled) {+ return undefined;+ }+ const ca = readTlsFile({ dir: options.dir, fileName: TLS_CA_FILE });+ const cert = readTlsFile({ dir: options.dir, fileName: TLS_CERT_FILE });+ const key = readTlsFile({ dir: options.dir, fileName: TLS_KEY_FILE });+ return new Agent({+ connect: {+ // Appended to the default roots, not replacing them: passing `ca` alone would override Node's+ // entire trust store for this dispatcher, breaking verification of the public ServiceFoundry edge.+ ca: [...rootCertificates, ca],+ cert,+ key,+ },+ });+}diff --git a/packages/trueforge/src/truefoundry/mapEnabledModels.ts b/packages/trueforge/src/truefoundry/mapEnabledModels.tsnew file mode 100644index 000000000..50dfbf402--- /dev/null+++ b/packages/trueforge/src/truefoundry/mapEnabledModels.ts@@ -0,0 +1,102 @@+import { SUPPORTED_REASONING_EFFORTS } from '@truefoundry/trueforge-core/core';+import { HTTPException } from 'hono/http-exception';+import { z } from 'zod';+import type { ModelProperties, ReasoningEffort } from '../schemas/modelProvider';++const ModelParamSchema = z.object({+ key: z.string(),+ supportedValues: z.array(z.string()).optional(),+});++const MetadataSchema = z.object({+ limits: z+ .object({+ context_window: z.number().optional(),+ max_input_tokens: z.number().optional(),+ max_output_tokens: z.number().optional(),+ max_tokens: z.number().optional(),+ })+ .optional(),+ params: z.array(ModelParamSchema).optional(),+});++const IntegrationSchema = z.object({+ name: z.string().min(1),+ manifest: z.object({ model_types: z.array(z.string()).optional() }),+ providerAccount: z.object({ name: z.string().min(1) }),+ metadata: MetadataSchema.optional(),+});++type IntegrationMetadata = z.infer<typeof MetadataSchema>;++function toReasoningEfforts(params: IntegrationMetadata['params']): ReasoningEffort[] | undefined {+ if (!params) {+ return undefined;+ }+ const matched: ReasoningEffort[] = [];+ for (const param of params) {+ if (param.key !== 'reasoning_effort') {+ continue;+ }+ for (const value of param.supportedValues ?? []) {+ const effort = SUPPORTED_REASONING_EFFORTS.find(item => item === value);+ if (effort && !matched.includes(effort)) {+ matched.push(effort);+ }+ }+ }+ return matched.length > 0 ? matched : undefined;+}++function toProperties(metadata: IntegrationMetadata | undefined): ModelProperties {+ const limits = metadata?.limits;+ const contextLength = limits?.context_window ?? limits?.max_input_tokens;+ const maxOutputTokens = limits?.max_output_tokens ?? limits?.max_tokens;+ const reasoningEfforts = toReasoningEfforts(metadata?.params);+ return {+ ...(contextLength ? { context_length: contextLength } : {}),+ ...(maxOutputTokens ? { max_output_tokens: maxOutputTokens } : {}),+ ...(reasoningEfforts ? { reasoning_efforts: reasoningEfforts } : {}),+ };+}++export interface TrueFoundryEnabledModel {+ accountName: string;+ modelName: string;+ properties: ModelProperties;+}++export function mapEnabledModels(input: { integrations: readonly unknown[] }): TrueFoundryEnabledModel[] {+ const models: TrueFoundryEnabledModel[] = [];+ for (const row of input.integrations) {+ const integration = IntegrationSchema.parse(row);+ if (!integration.manifest.model_types?.includes('chat')) {+ continue;+ }+ models.push({+ accountName: integration.providerAccount.name,+ modelName: integration.name,+ properties: toProperties(integration.metadata),+ });+ }+ return models;+}++const InstallationSchema = z.object({+ isDefault: z.boolean().optional(),+ manifest: z.object({ url: z.string().min(1) }),+});++const InstallationsEnvelopeSchema = z.union([z.array(z.unknown()), z.object({ data: z.array(z.unknown()) })]);++export function resolveDefaultGatewayUrl(payload: unknown): string {+ const envelope = InstallationsEnvelopeSchema.parse(payload);+ const rows = Array.isArray(envelope) ? envelope : envelope.data;+ for (const row of rows) {+ const installation = InstallationSchema.parse(row);+ if (installation.isDefault === true) {+ return installation.manifest.url;+ }+ }+ throw new HTTPException(502, { message: 'No default TrueFoundry AI gateway installation is configured' });+}diff --git a/packages/trueforge/src/truefoundry/trueFoundryManaged.ts b/packages/trueforge/src/truefoundry/trueFoundryManaged.tsnew file mode 100644index 000000000..0899fa7e9--- /dev/null+++ b/packages/trueforge/src/truefoundry/trueFoundryManaged.ts@@ -0,0 +1,9 @@+import { RequestErrorResponseSchema } from '../schemas/errors';++export const TRUEFOUNDRY_MANAGED_STATUS = 424 as const;+export const TRUEFOUNDRY_MANAGED_MESSAGE = 'This resource is managed by TrueFoundry';++export const trueFoundryManagedResponse = {+ content: { 'application/json': { schema: RequestErrorResponseSchema } },+ description: 'Resource is managed by TrueFoundry (`TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL` is set).',+} as const;diff --git a/packages/trueforge/tests/db/modelProviderStoreContractSuite.ts b/packages/trueforge/tests/db/modelProviderStoreContractSuite.tsindex 47afa2839..fff98930b 100644--- a/packages/trueforge/tests/db/modelProviderStoreContractSuite.ts+++ b/packages/trueforge/tests/db/modelProviderStoreContractSuite.ts@@ -91,7 +91,7 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideexpect(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);+ const providers = await store.listProviders({ tenant_id: TENANT });expect(providers).toEqual([updated]);});@@ -101,7 +101,7 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideawait store.upsertProvider({ tenant_id: TENANT, name: 'anthropic', manifest: anthropic });await store.upsertProvider({ tenant_id: 'other-tenant', name: 'anthropic', manifest: anthropic });- const providers = await store.listProviders(TENANT);+ const providers = await store.listProviders({ tenant_id: TENANT });expect(providers.map(record => record.name)).toEqual(['anthropic', 'openai']);expect(providers.every(record => record.tenant_id === TENANT)).toBe(true);});@@ -109,7 +109,11 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideit('stores custom providers with base_url', async () => {const store = getStore();const created = await store.upsertProvider({ tenant_id: TENANT, name: custom.name, manifest: custom });- expect(created.manifest.base_url).toBe('https://llm.internal.example.com/v1');+ const { manifest } = created;+ if (manifest.type !== 'custom') {+ throw new Error(`expected custom manifest, got ${manifest.type}`);+ }+ expect(manifest.base_url).toBe('https://llm.internal.example.com/v1');});it('listModels flattens documents into fully qualified names', async () => {@@ -118,7 +122,7 @@ export function runModelProviderStoreContractSuite(getStore: () => IModelProvideawait store.upsertProvider({ tenant_id: TENANT, name: 'openai', manifest: openai });await store.upsertProvider({ tenant_id: 'other-tenant', name: 'openai', manifest: openai });- const models = await store.listModels(TENANT);+ const models = await store.listModels({ tenant_id: TENANT });expect(models).toEqual([{name: 'anthropic/claude-sonnet-4-6',diff --git a/packages/trueforge/tests/unit/apis/agents.test.ts b/packages/trueforge/tests/unit/apis/agents.test.tsindex f1adefb7f..da5e48d39 100644--- a/packages/trueforge/tests/unit/apis/agents.test.ts+++ b/packages/trueforge/tests/unit/apis/agents.test.ts@@ -77,7 +77,7 @@ describe('agents router', () => {await modelProviderStore.upsertProvider({ tenant_id: 'default', name: 'anthropic', manifest: modelProvider });router = createAgentsRouter({agentStore: new SqliteAgentStore(db),- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore: new SqliteMcpServerStore(db),skillStore: new SqliteSkillStore(db),sandboxProviderStore: new SqliteSandboxProviderStore(db),diff --git a/packages/trueforge/tests/unit/apis/deletedSessionCrud.test.ts b/packages/trueforge/tests/unit/apis/deletedSessionCrud.test.tsindex 039442ffe..af1139c99 100644--- a/packages/trueforge/tests/unit/apis/deletedSessionCrud.test.ts+++ b/packages/trueforge/tests/unit/apis/deletedSessionCrud.test.ts@@ -40,7 +40,7 @@ describe('public CRUD after session deletion', () => {sessions,sessionStore,activeTurns,- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore,skillStore,agentStore,@@ -57,7 +57,7 @@ describe('public CRUD after session deletion', () => {sessions,sessionStore,activeTurns,- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore,tokenStore,skillStore,diff --git a/packages/trueforge/tests/unit/apis/modelProviders.test.ts b/packages/trueforge/tests/unit/apis/modelProviders.test.tsindex 29247b273..98808aec3 100644--- a/packages/trueforge/tests/unit/apis/modelProviders.test.ts+++ b/packages/trueforge/tests/unit/apis/modelProviders.test.ts@@ -94,7 +94,7 @@ async function createRouters(): Promise<{const modelProviderStore = new SqliteModelProviderStore(db);return {settingsRouter: createSettingsRouter({- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),skillStore: new SqliteSkillStore(db),@@ -110,7 +110,7 @@ async function createRouters(): Promise<{sandboxCatalog: SandboxCatalog.load(),}),modelsRouter: createModelsRouter({- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,withTransaction: callback => db.transaction().execute(callback),}),modelProviderStore,@@ -382,7 +382,10 @@ describe('model-provider secret redaction and strict PUT', () => {expect(updateBody.data.manifest.models).toHaveLength(2);const stored = await modelProviderStore.getProvider({ tenant_id: TENANT_ID, name: 'anthropic' });- expect(stored?.manifest.auth?.api_key).toBe('sk-ant-secret');+ if (!stored || !('auth' in stored.manifest)) {+ throw new Error('expected stored anthropic provider with auth');+ }+ expect(stored.manifest.auth?.api_key).toBe('sk-ant-secret');});it('PUT with a real api_key rotates the stored secret', async () => {@@ -398,7 +401,10 @@ describe('model-provider secret redaction and strict PUT', () => {});const stored = await modelProviderStore.getProvider({ tenant_id: TENANT_ID, name: 'anthropic' });- expect(stored?.manifest.auth?.api_key).toBe(rotatedKey);+ if (!stored || !('auth' in stored.manifest)) {+ throw new Error('expected stored anthropic provider with auth');+ }+ expect(stored.manifest.auth?.api_key).toBe(rotatedKey);});});diff --git a/packages/trueforge/tests/unit/apis/sandboxFileDownload.test.ts b/packages/trueforge/tests/unit/apis/sandboxFileDownload.test.tsindex 0d879082c..a46c0f545 100644--- a/packages/trueforge/tests/unit/apis/sandboxFileDownload.test.ts+++ b/packages/trueforge/tests/unit/apis/sandboxFileDownload.test.ts@@ -38,7 +38,7 @@ async function buildApp() {sessions,sessionStore,activeTurns: new ActiveTurnRegistry(),- modelProviderStore: new SqliteModelProviderStore(db),+ resolveModelProviderStore: () => new SqliteModelProviderStore(db),mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),skillStore: new SqliteSkillStore(db),diff --git a/packages/trueforge/tests/unit/apis/sessionHttp.test.ts b/packages/trueforge/tests/unit/apis/sessionHttp.test.tsindex 5761a7f4f..44e34cfb5 100644--- a/packages/trueforge/tests/unit/apis/sessionHttp.test.ts+++ b/packages/trueforge/tests/unit/apis/sessionHttp.test.ts@@ -79,7 +79,7 @@ describe('sessions HTTP agent binding', () => {sessions,sessionStore,activeTurns: new ActiveTurnRegistry(),- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore,skillStore,agentStore,diff --git a/packages/trueforge/tests/unit/apis/turnHarnessErrorStatus.test.ts b/packages/trueforge/tests/unit/apis/turnHarnessErrorStatus.test.tsindex 57eda0e70..b92f3ceaf 100644--- a/packages/trueforge/tests/unit/apis/turnHarnessErrorStatus.test.ts+++ b/packages/trueforge/tests/unit/apis/turnHarnessErrorStatus.test.ts@@ -55,7 +55,7 @@ async function postTurnRejectingWith(error: AgentHarnessError): Promise<Responsesessions,sessionStore: new SqliteSessionStore(db),activeTurns: new ActiveTurnRegistry(),- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),skillStore: new SqliteSkillStore(db),diff --git a/packages/trueforge/tests/unit/apis/turns.test.ts b/packages/trueforge/tests/unit/apis/turns.test.tsindex fdcf61cfc..3841cb327 100644--- a/packages/trueforge/tests/unit/apis/turns.test.ts+++ b/packages/trueforge/tests/unit/apis/turns.test.ts@@ -51,7 +51,7 @@ describe('turns', () => {sessions,sessionStore,activeTurns: new ActiveTurnRegistry(),- modelProviderStore: new SqliteModelProviderStore(db),+ resolveModelProviderStore: () => new SqliteModelProviderStore(db),mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),skillStore: new SqliteSkillStore(db),@@ -170,7 +170,7 @@ describe('turns', () => {sessions,sessionStore: new SqliteSessionStore(db),activeTurns: new ActiveTurnRegistry(),- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,agentStore: new SqliteAgentStore(db),mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),@@ -270,7 +270,7 @@ describe('turns', () => {sessions,sessionStore: new SqliteSessionStore(db),activeTurns: new ActiveTurnRegistry(),- modelProviderStore,+ resolveModelProviderStore: () => modelProviderStore,mcpServerStore: new SqliteMcpServerStore(db),tokenStore: new SqliteOAuthTokenStore(db),skillStore: new SqliteSkillStore(db),diff --git a/packages/trueforge/tests/unit/schemas/modelProvider.test.ts b/packages/trueforge/tests/unit/schemas/modelProvider.test.tsindex 77b8820e6..46095ca5f 100644--- a/packages/trueforge/tests/unit/schemas/modelProvider.test.ts+++ b/packages/trueforge/tests/unit/schemas/modelProvider.test.ts@@ -5,17 +5,24 @@ const models = [{ model_id: 'a-model', name: 'a-model', properties: {} }];function parse(body: Record<string, unknown>): { success: boolean; name?: string; base_url?: string } {const result = ModelProviderManifestSchema.safeParse({ auth: { api_key: 'k' }, models, ...body });- return result.success- ? { success: true, name: modelProviderName(result.data), base_url: result.data.base_url }- : { success: false };+ if (!result.success) {+ return { success: false };+ }+ return {+ success: true,+ name: modelProviderName(result.data),+ ...('base_url' in result.data && result.data.base_url !== undefined ? { base_url: result.data.base_url } : {}),+ };}/** A custom endpoint is arbitrary, so there is nothing to default to, and nothing to name it after. */-const CALLER_SUPPLIED_TYPES = ['custom'];+const NAMED_TYPES = ['custom'];+/** Types whose adapter has no implicit host — the endpoint must be supplied (custom by the caller, truefoundry by the store). */+const REQUIRES_BASE_URL = ['custom', 'truefoundry'];/** Only `custom` takes a name; the others reject one, so fixtures name just that type. */function providerFor(type: string, body: Record<string, unknown> = {}): Record<string, unknown> {- return { type, ...(CALLER_SUPPLIED_TYPES.includes(type) ? { name: 'internal' } : {}), ...body };+ return { type, ...(NAMED_TYPES.includes(type) ? { name: 'internal' } : {}), ...body };}describe('ModelProviderManifestSchema', () => {@@ -31,7 +38,7 @@ describe('ModelProviderManifestSchema', () => {it('defaults base_url for every type that has a known endpoint', () => {for (const type of VERCEL_AI_PROVIDER_NAMES) {const parsed = parse(providerFor(type));- if (CALLER_SUPPLIED_TYPES.includes(type)) {+ if (REQUIRES_BASE_URL.includes(type)) {expect([type, parsed.success]).toEqual([type, false]);} else {expect([type, parsed.base_url]).toEqual([type, expect.stringMatching(/^https:\/\//)]);diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex a539836a4..37d494647 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -171,6 +171,9 @@ importers:ulid:specifier: ^3.0.2version: 3.0.2+ undici:+ specifier: 7.29.0+ version: 7.29.0winston:specifier: ^3.19.0version: 3.19.0@@ -11056,10 +11059,10 @@ snapshots:transitivePeerDependencies:- supports-color- '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])':+ '@typescript-eslint/[email protected](@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])':dependencies:'@eslint-community/regexpp': 4.12.2- '@typescript-eslint/parser': 8.68.0([email protected]([email protected])([email protected]))([email protected])([email protected])+ '@typescript-eslint/parser': 8.68.0([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/scope-manager': 8.68.0'@typescript-eslint/type-utils': 8.68.0([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/utils': 8.68.0([email protected]([email protected])([email protected]))([email protected])([email protected])@@ -15283,7 +15286,7 @@ snapshots:[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]):dependencies:- '@typescript-eslint/eslint-plugin': 8.68.0(@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])+ '@typescript-eslint/eslint-plugin': 8.68.0(@typescript-eslint/[email protected]([email protected]([email protected])([email protected]))([email protected])([email protected]))([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/parser': 8.68.0([email protected]([email protected])([email protected]))([email protected])([email protected])'@typescript-eslint/typescript-estree': 8.68.0([email protected])([email protected])'@typescript-eslint/utils': 8.68.0([email protected]([email protected])([email protected]))([email protected])([email protected])