Skip to content

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

AGE-2299: Refactor obtaining tenant specific control plane url for mcp auth (#827)

Srajan Asthana6b9b981a7753
diff --git a/.changeset/tenant-cp-url-mcp-oauth.md b/.changeset/tenant-cp-url-mcp-oauth.md
new file mode 100644
index 000000000..24b735ea3
--- /dev/null
+++ b/.changeset/tenant-cp-url-mcp-oauth.md
@@ -0,0 +1,5 @@
+---
+"@truefoundry/trueforge": patch
+---
+
+Resolve TrueFoundry MCP OAuth redirect origin from a cached tenant control-plane URL lookup instead of request context.
diff --git a/packages/trueforge/package.json b/packages/trueforge/package.json
index 2738c844a..9b59e6020 100644
--- a/packages/trueforge/package.json
+++ b/packages/trueforge/package.json
@@ -74,6 +74,7 @@
"hono": "^4.13.5",
"jose": "^6.2.10",
"kysely": "^0.29.5",
+ "lru-cache": "^11.5.3",
"openid-client": "^6.8.7",
"pg": "^8.23.0",
"redis": "^5.12.1",
diff --git a/packages/trueforge/src/apis/schedules.ts b/packages/trueforge/src/apis/schedules.ts
index 64afc962e..fa3c53010 100644
--- a/packages/trueforge/src/apis/schedules.ts
+++ b/packages/trueforge/src/apis/schedules.ts
@@ -87,8 +87,7 @@ export interface SchedulesRouterDeps<TTransaction> extends ScheduleTurnExecution
/**
* Prepare and start a schedule run using Context-based store resolvers. Caller must set
- * `request_context` (typically via {@link requestContextFromCreatedBySubject})
- * before calling.
+ * `request_context` (typically via requestContextFromCreatedBySubject) before calling.
*/
export async function startScheduleRunOnRequest<TTransaction>(params: {
c: Context;
diff --git a/packages/trueforge/src/truefoundry/TrueFoundryAuthenticator.ts b/packages/trueforge/src/truefoundry/TrueFoundryAuthenticator.ts
index 40dd5d150..7ae4e7fca 100644
--- a/packages/trueforge/src/truefoundry/TrueFoundryAuthenticator.ts
+++ b/packages/trueforge/src/truefoundry/TrueFoundryAuthenticator.ts
@@ -36,7 +36,6 @@ export class TrueFoundryAuthenticator implements Authenticator {
},
roles: session.user.roles,
user_credential: token,
- public_base_url: session.public_base_url,
});
}
}
diff --git a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts
index d07629ee3..91c996dbf 100644
--- a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts
+++ b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts
@@ -40,6 +40,7 @@ export type TrueFoundryMcpApiClient = Pick<
| 'getMcpAuthStatus'
| 'deleteMcpAuth'
| 'vendToken'
+ | 'getTenantControlPlaneUrl'
>;
function withoutAuthorization(headers: Record<string, string> | undefined): Record<string, string> {
@@ -51,7 +52,7 @@ function withoutAuthorization(headers: Record<string, string> | undefined): Reco
/**
* Absolute FE landing for the upstream authorize `redirectURL`.
- * Origin from the tenant session `public_base_url`; UI path prefix from process
+ * Origin from the tenant control-plane URL; UI path prefix from process
* `PUBLIC_BASE_URL` via {@link getPublicUiBasePath}. `return_to` is a browser path.
*
* TODO: add an env var for the public UI path prefix (do not keep deriving mount path from
@@ -63,7 +64,7 @@ export function resolveAuthorizeRedirectURL(input: { returnTo?: string; publicBa
const publicBase = new URL(getPublicUiBasePath(), `${origin}/`);
return new URL(safeReturnTo(input.returnTo), publicBase).href;
} catch (error) {
- throw new McpConnectionError('Tenant public base URL from session is required for TrueFoundry MCP OAuth', 500, {
+ throw new McpConnectionError('Tenant control-plane URL is required for TrueFoundry MCP OAuth', 500, {
cause: error,
});
}
@@ -75,7 +76,6 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServ
readonly #asAgent: ResolveAccessToken;
readonly #asUser: ResolveAccessToken;
readonly #subject: RequestSubject;
- readonly #publicBaseUrl: string | undefined;
readonly #perServerHeaders: PerServerMcpHeaders;
#gatewayUrl: string | undefined;
@@ -97,7 +97,6 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServ
this.#asAgent = tokens.asAgent;
this.#asUser = tokens.asUser;
this.#subject = requestContext.subject;
- this.#publicBaseUrl = requestContext.public_base_url;
this.#perServerHeaders = input.perServerHeaders ?? {};
}
@@ -230,10 +229,7 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServ
if (record === undefined) {
throw new McpServerNotFoundError(input.name);
}
- const publicBaseUrl = this.#publicBaseUrl;
- if (publicBaseUrl === undefined || publicBaseUrl.trim() === '') {
- throw new McpConnectionError('Tenant public base URL from session is required for TrueFoundry MCP OAuth', 500);
- }
+ const publicBaseUrl = await this.#client.getTenantControlPlaneUrl({ tenantName: input.tenant_id });
return this.#client.getMcpAuthorize({
accessToken: await this.#asUser(),
mcpServerId: record.id,
diff --git a/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts b/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts
index fc330f259..ab07a91b7 100644
--- a/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts
+++ b/packages/trueforge/src/truefoundry/TrueFoundryServiceFoundryServerClient.ts
@@ -1,5 +1,6 @@
import { extractErrorLogFields } from '@truefoundry/trueforge-core/core';
import { HTTPException } from 'hono/http-exception';
+import { LRUCache } from 'lru-cache';
import { fetch as undiciFetch, type Dispatcher } from 'undici';
import type { Logger } from 'winston';
import { z } from 'zod';
@@ -9,6 +10,11 @@ import { createInternalTlsDispatcher, normalizeInternalTlsUrl, type InternalTlsO
import { mapResolvedAgentSkillVersions, type ResolvedAgentSkillVersion } from './mapSfyAgentSkills';
import { parseSfyMcpAuthStatus, parseSfyMcpAuthorizeResult, type SfyMcpAuthSource } from './mapSfyMcpServers';
+/** How long a tenant control-plane URL stays cached between SFY lookups. */
+const TENANT_CONTROL_PLANE_URL_TTL_MS = 5 * 60 * 1000;
+/** Bound cache size so long-lived processes do not retain unbounded tenant URLs. */
+const TENANT_CONTROL_PLANE_URL_CACHE_MAX = 500;
+
const INTEGRATIONS_PATH = 'v1/provider-integrations';
const INSTALLATIONS_PATH = 'v1/llm-gateway/installations';
const MCP_SERVERS_PATH = 'v1/mcp';
@@ -45,18 +51,23 @@ const GetSessionUnauthenticatedSchema = z.object({
user: z.null(),
});
-const GetSessionAuthenticatedSchema = z
- .object({
- user: GetSessionUserSchema,
- controlPlaneURL: z.url(),
- })
- .transform(({ user, controlPlaneURL: public_base_url }) => ({ user, public_base_url }));
+const GetSessionAuthenticatedSchema = z.object({
+ user: GetSessionUserSchema,
+});
const GetSessionWireSchema = z.union([GetSessionUnauthenticatedSchema, GetSessionAuthenticatedSchema]);
/** Authenticated session payload returned by {@link TrueFoundryServiceFoundryServerClient.getSession}. */
export type GetSessionResponse = z.infer<typeof GetSessionAuthenticatedSchema>;
+/**
+ * `GET /v1/session?tenantName=` with the service API key — tenant `controlPlaneURL`
+ * for MCP OAuth redirect origin. CP URL comes from the query tenant.
+ */
+const TenantControlPlaneUrlSchema = z.object({
+ controlPlaneURL: z.url(),
+});
+
const ListResponseSchema = z.union([
z.array(z.unknown()),
z.object({
@@ -150,6 +161,10 @@ export class TrueFoundryServiceFoundryServerClient {
readonly #httpAgentTimeoutMs: number;
readonly #apiKey: string;
readonly #headers: Record<string, string>;
+ readonly #controlPlaneUrlByTenant = new LRUCache<string, string>({
+ max: TENANT_CONTROL_PLANE_URL_CACHE_MAX,
+ ttl: TENANT_CONTROL_PLANE_URL_TTL_MS,
+ });
constructor(input: {
serviceFoundryServerUrl: string;
@@ -512,6 +527,42 @@ export class TrueFoundryServiceFoundryServerClient {
return parsed.data;
}
+ /**
+ * Tenant control-plane URL from `GET v1/session?tenantName=` (service API key).
+ * Cached per tenant for 5 minutes.
+ */
+ async getTenantControlPlaneUrl(input: { tenantName: string }): Promise<string> {
+ const cached = this.#controlPlaneUrlByTenant.get(input.tenantName);
+ if (cached !== undefined) {
+ return cached;
+ }
+
+ let payload: unknown;
+ try {
+ payload = await this.#requestJson({
+ url: this.#url(SESSION_PATH, { tenantName: input.tenantName }),
+ accessToken: this.#apiKey,
+ method: 'GET',
+ });
+ } catch (error) {
+ const causeString = error instanceof Error ? error.message : String(error);
+ throw new HTTPException(500, {
+ message: `TrueFoundry ServiceFoundry session request failed: ${causeString}`,
+ cause: error,
+ });
+ }
+ const parsed = TenantControlPlaneUrlSchema.safeParse(payload);
+ if (!parsed.success) {
+ throw new HTTPException(500, {
+ message: 'TrueFoundry ServiceFoundry session response was malformed',
+ cause: parsed.error,
+ });
+ }
+ const controlPlaneURL = parsed.data.controlPlaneURL;
+ this.#controlPlaneUrlByTenant.set(input.tenantName, controlPlaneURL);
+ return controlPlaneURL;
+ }
+
async getAgentPermissions(input: {
accessToken: string;
externalIds?: readonly string[];
@@ -652,7 +703,7 @@ export class TrueFoundryServiceFoundryServerClient {
});
} catch (error) {
const timedOut = error instanceof Error && error.name === 'TimeoutError';
- this.#logger.warn('TrueFoundry ServiceFoundry server request failed', {
+ this.#logger.error('TrueFoundry ServiceFoundry server request failed', {
url: input.url.href,
method: input.method,
durationMs: Date.now() - startedAt,
diff --git a/packages/trueforge/src/truefoundry/accessToken.ts b/packages/trueforge/src/truefoundry/accessToken.ts
index 95088fd55..8f2d42ff4 100644
--- a/packages/trueforge/src/truefoundry/accessToken.ts
+++ b/packages/trueforge/src/truefoundry/accessToken.ts
@@ -32,17 +32,9 @@ const accessTokenCache: unique symbol = Symbol('truefoundryAccessTokenCache');
*/
export type TrueFoundryRequestContext = RequestContext & {
readonly [accessTokenCache]: Map<string, AccessTokens>;
- /**
- * Tenant public base URL from ServiceFoundry session (`controlPlaneURL`).
- * Set by {@link TrueFoundryAuthenticator}; may be absent on synthetic contexts
- * (e.g. schedule impersonation). Used as the MCP OAuth FE redirect origin.
- */
- public_base_url?: string;
};
-export function createTrueFoundryRequestContext(
- base: RequestContext & { public_base_url?: string },
-): TrueFoundryRequestContext {
+export function createTrueFoundryRequestContext(base: RequestContext): TrueFoundryRequestContext {
return { ...base, [accessTokenCache]: new Map() };
}
diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundryAuthenticator.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundryAuthenticator.test.ts
index c18417216..1e152c26d 100644
--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundryAuthenticator.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundryAuthenticator.test.ts
@@ -2,7 +2,7 @@ import type { Context } from 'hono';
import { TrueFoundryAuthenticator } from '../../../src/truefoundry/TrueFoundryAuthenticator';
describe('TrueFoundryAuthenticator', () => {
- it('stores public_base_url from GET /v1/session on request context', async () => {
+ it('maps GET /v1/session into request context identity', async () => {
const getSession = jest.fn().mockResolvedValue({
user: {
tenantName: 'internal',
@@ -14,7 +14,6 @@ describe('TrueFoundryAuthenticator', () => {
subjectSlug: '[email protected]',
},
},
- public_base_url: 'https://tenant.example.com',
});
const authenticator = new TrueFoundryAuthenticator({ getSession });
const context = {
@@ -31,7 +30,6 @@ describe('TrueFoundryAuthenticator', () => {
subject: { id: 'user-1', type: 'user', display_name: 'Alice' },
roles: ['tenant-admin'],
user_credential: 'tok',
- public_base_url: 'https://tenant.example.com',
});
});
});
diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
index 8173d726f..f20e1ceb2 100644
--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts
@@ -52,6 +52,7 @@ function createMockClient(): MockClient {
getMcpAuthStatus: jest.fn(),
deleteMcpAuth: jest.fn(),
vendToken: jest.fn(),
+ getTenantControlPlaneUrl: jest.fn(),
};
}
@@ -60,7 +61,7 @@ function createStore(input?: {
client?: MockClient;
subject?: { id: string; type: string; display_name: string };
agent?: AgentRecord;
- publicBaseUrl?: string;
+ controlPlaneUrl?: string;
}) {
const client = input?.client ?? createMockClient();
client.getMcpServerByName.mockResolvedValue(SFY_ROW);
@@ -69,6 +70,7 @@ function createStore(input?: {
client.getMcpAuthorize.mockResolvedValue({ status: 'authenticated' });
client.getMcpAuthStatus.mockResolvedValue({ status: 'authenticated' });
client.deleteMcpAuth.mockResolvedValue(undefined);
+ client.getTenantControlPlaneUrl.mockResolvedValue(input?.controlPlaneUrl ?? PUBLIC_BASE_URL);
if (input?.agent !== undefined) {
client.vendToken.mockResolvedValue({ subjectToken: SUBJECT_TOKEN, actorToken: ACTOR_TOKEN });
}
@@ -79,7 +81,6 @@ function createStore(input?: {
subject: input?.subject ?? { id: 'user-1', type: 'user', display_name: 'user-1' },
roles: [],
user_credential: input?.accessToken ?? ACCESS_TOKEN,
- public_base_url: input?.publicBaseUrl ?? PUBLIC_BASE_URL,
}),
agent: input?.agent,
logger: createLogger({ silent: true }),
@@ -159,10 +160,11 @@ describe('TrueFoundryMcpServerStore', () => {
});
describe('authorize', () => {
- it('derives upstream redirectURL from return_to and session public base URL', async () => {
+ it('derives upstream redirectURL from return_to and tenant control-plane URL', async () => {
const { store, client } = createStore();
const returnTo = '/trueforge/?screenType=mcp-auth&pUid=popup-1';
await store.authorize({ tenant_id: TENANT, name: 'github', userRef: 'user-1', returnTo });
+ expect(client.getTenantControlPlaneUrl).toHaveBeenCalledWith({ tenantName: TENANT });
expect(client.getMcpAuthorize).toHaveBeenCalledWith({
accessToken: ACCESS_TOKEN,
mcpServerId: 'mcp-id-1',
@@ -170,10 +172,10 @@ describe('TrueFoundryMcpServerStore', () => {
});
});
- it('throws when session public base URL is missing', async () => {
- const { store } = createStore({ publicBaseUrl: '' });
+ it('throws when tenant control-plane URL is invalid', async () => {
+ const { store } = createStore({ controlPlaneUrl: '' });
await expect(store.authorize({ tenant_id: TENANT, name: 'github', userRef: 'user-1' })).rejects.toMatchObject({
- message: 'Tenant public base URL from session is required for TrueFoundry MCP OAuth',
+ message: 'Tenant control-plane URL is required for TrueFoundry MCP OAuth',
statusCode: 500,
});
});
diff --git a/packages/trueforge/tests/unit/truefoundry/getTenantControlPlaneUrl.test.ts b/packages/trueforge/tests/unit/truefoundry/getTenantControlPlaneUrl.test.ts
new file mode 100644
index 000000000..0b67119d1
--- /dev/null
+++ b/packages/trueforge/tests/unit/truefoundry/getTenantControlPlaneUrl.test.ts
@@ -0,0 +1,68 @@
+import { createLogger, transports } from 'winston';
+import { TrueFoundryServiceFoundryServerClient } from '../../../src/truefoundry/TrueFoundryServiceFoundryServerClient';
+
+const fetchMock = jest.fn();
+
+jest.mock('undici', () => ({
+ Agent: class Agent {},
+ fetch: (...args: unknown[]) => fetchMock(...args),
+}));
+
+function jsonResponse(body: unknown): { ok: true; status: 200; text: () => Promise<string> } {
+ return {
+ ok: true,
+ status: 200,
+ text: async () => JSON.stringify(body),
+ };
+}
+
+describe('TrueFoundryServiceFoundryServerClient.getTenantControlPlaneUrl', () => {
+ beforeEach(() => {
+ fetchMock.mockReset();
+ });
+
+ it('fetches controlPlaneURL with the service API key and caches by tenant', async () => {
+ fetchMock.mockResolvedValue(
+ jsonResponse({
+ controlPlaneURL: 'https://tenant.example.com',
+ user: null,
+ }),
+ );
+
+ const client = new TrueFoundryServiceFoundryServerClient({
+ serviceFoundryServerUrl: 'https://sfy.example',
+ logger: createLogger({ transports: [new transports.Console({ silent: true })] }),
+ tls: { enabled: false, dir: '' },
+ httpTimeoutMs: 5_000,
+ httpAgentTimeoutMs: 5_000,
+ apiKey: 'service-key',
+ });
+
+ await expect(client.getTenantControlPlaneUrl({ tenantName: 'acme' })).resolves.toBe('https://tenant.example.com');
+ await expect(client.getTenantControlPlaneUrl({ tenantName: 'acme' })).resolves.toBe('https://tenant.example.com');
+
+ expect(fetchMock).toHaveBeenCalledTimes(1);
+ const [url, init] = fetchMock.mock.calls[0] as [URL, { headers: Record<string, string> }];
+ expect(url.toString()).toBe('https://sfy.example/v1/session?tenantName=acme');
+ expect(init.headers['authorization']).toBe('Bearer service-key');
+ });
+
+ it('caches control-plane URLs per tenant', async () => {
+ fetchMock
+ .mockResolvedValueOnce(jsonResponse({ controlPlaneURL: 'https://acme.example.com' }))
+ .mockResolvedValueOnce(jsonResponse({ controlPlaneURL: 'https://other.example.com' }));
+
+ const client = new TrueFoundryServiceFoundryServerClient({
+ serviceFoundryServerUrl: 'https://sfy.example',
+ logger: createLogger({ transports: [new transports.Console({ silent: true })] }),
+ tls: { enabled: false, dir: '' },
+ httpTimeoutMs: 5_000,
+ httpAgentTimeoutMs: 5_000,
+ apiKey: 'service-key',
+ });
+
+ await expect(client.getTenantControlPlaneUrl({ tenantName: 'acme' })).resolves.toBe('https://acme.example.com');
+ await expect(client.getTenantControlPlaneUrl({ tenantName: 'other' })).resolves.toBe('https://other.example.com');
+ expect(fetchMock).toHaveBeenCalledTimes(2);
+ });
+});
diff --git a/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts b/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts
index d84709fbb..1114ba0b4 100644
--- a/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts
@@ -25,6 +25,7 @@ function unusedClient(): TrueFoundryMcpApiClient {
getMcpAuthStatus: unused,
deleteMcpAuth: unused,
vendToken: () => Promise.resolve({ subjectToken: 'caller-token', actorToken: 'caller-token' }),
+ getTenantControlPlaneUrl: async () => 'https://tenant.example.com',
};
}
@@ -50,7 +51,6 @@ const storeWith = (perServerHeaders: Record<string, Record<string, string>>): Tr
subject: { id: 'user-1', type: 'user', display_name: 'user-1' },
roles: [],
user_credential: 'caller-token',
- public_base_url: 'https://tenant.example.com',
}),
agent: undefined,
logger: createLogger({ silent: true }),
diff --git a/packages/trueforge/tests/unit/truefoundry/trueFoundryNaming.test.ts b/packages/trueforge/tests/unit/truefoundry/trueFoundryNaming.test.ts
index 141f5506a..f5c626a68 100644
--- a/packages/trueforge/tests/unit/truefoundry/trueFoundryNaming.test.ts
+++ b/packages/trueforge/tests/unit/truefoundry/trueFoundryNaming.test.ts
@@ -265,6 +265,7 @@ describe('TrueFoundry naming vs NameSchema', () => {
getMcpAuthStatus: jest.fn().mockResolvedValue({ status: 'authenticated' }),
deleteMcpAuth: jest.fn(),
vendToken: jest.fn(),
+ getTenantControlPlaneUrl: jest.fn().mockResolvedValue('https://tenant.example.com'),
};
const store = new TrueFoundryMcpServerStore({
client,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8d15ba059..62172da15 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -168,6 +168,9 @@ importers:
kysely:
specifier: ^0.29.5
version: 0.29.5
+ lru-cache:
+ specifier: ^11.5.3
+ version: 11.5.3
openid-client:
specifier: ^6.8.7
version: 6.8.7
@@ -5889,6 +5892,10 @@ packages:
resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
+ resolution: {integrity: sha512-U4N8FgzmWxc8k1VH8Kr6lQg18U7Fjvby6wXHVRX/ZZ7IwWbRMgrRbP0Wrb5q5NVinryp4SQampHKdvtecItxUg==}
+ engines: {node: 20 || >=22}
+
resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
@@ -11107,10 +11114,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@eslint-community/regexpp': 4.12.2
'@typescript-eslint/scope-manager': 8.68.0
@@ -13624,6 +13631,8 @@ snapshots:
+
dependencies:
yallist: 3.1.1
@@ -15350,7 +15359,7 @@ snapshots:
dependencies:
'@typescript-eslint/typescript-estree': 8.68.0([email protected])([email protected])