The open-source agent harness - the runtime layer that turns an LLM into a working agent.
Add a log line when exchanging token
Chirag Jaine9569151cf92
diff --git a/packages/trueforge/src/main.ts b/packages/trueforge/src/main.tsindex cf549f4a8..84f423d36 100644--- a/packages/trueforge/src/main.ts+++ b/packages/trueforge/src/main.ts@@ -139,6 +139,7 @@ function createServiceFoundryServerClient(logger: Logger): TrueFoundryServiceFoufunction buildResolveModelProviderStore<TTransaction>(options: {persistenceStore: IModelProviderStore<TTransaction>;client: TrueFoundryServiceFoundryServerClient | undefined;+ logger: Logger;}): (c: Context, runAsAgent?: AgentRecord) => IModelProviderStore<TTransaction> {return (c: Context, runAsAgent?: AgentRecord) => {const { persistenceStore, client } = options;@@ -148,6 +149,7 @@ function buildResolveModelProviderStore<TTransaction>(options: {client,context: requestContext,agent: runAsAgent,+ logger: options.logger,});}return persistenceStore;@@ -162,6 +164,7 @@ function buildResolveMcpServerStore<TTransaction>(options: {persistenceStore: IMcpServerStore<TTransaction>;tokenStore: IOAuthTokenStore<TTransaction>;client: TrueFoundryServiceFoundryServerClient | undefined;+ logger: Logger;}): (c?: Context, runAsAgent?: AgentRecord) => IMcpServerWithAuthStore<TTransaction> {return (c?: Context, runAsAgent?: AgentRecord) => {const { persistenceStore, tokenStore, client } = options;@@ -172,6 +175,7 @@ function buildResolveMcpServerStore<TTransaction>(options: {client,context: requestContext,agent: runAsAgent,+ logger: options.logger,perServerHeaders: rawPerServerHeaders ? parsePerServerMcpHeaders(rawPerServerHeaders) : {},});}@@ -347,11 +351,13 @@ async function createDistributedPersistence(options: {const resolveModelProviderStore = buildResolveModelProviderStore({persistenceStore: modelProviderStore,client: serviceFoundryClient,+ logger,});const resolveMcpServerStore = buildResolveMcpServerStore({persistenceStore: mcpServerStore,tokenStore,client: serviceFoundryClient,+ logger,});const resolveAgentStore = buildResolveAgentStore({persistenceStore: agentStore,diff --git a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.tsindex 11aa0fbe6..7298118e0 100644--- a/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundryMcpServerStore.ts@@ -5,6 +5,7 @@ import {} from '@truefoundry/trueforge-core/agent-session/store/OffsetPageToken';import { McpConnectionError, type RemoteMcpHeaders } from '@truefoundry/trueforge-core/core';import { HTTPException } from 'hono/http-exception';+import type { Logger } from 'winston';import type { RequestContext, RequestSubject } from '../auth/identity';import { safeReturnTo } from '../auth/safeReturnTo';import { getPublicBaseUrl } from '../config';@@ -76,6 +77,7 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServclient: TrueFoundryMcpApiClient;context: RequestContext;agent: AgentRecord | undefined;+ logger: Pick<Logger, 'info'>;perServerHeaders?: PerServerMcpHeaders;}) {this.#client = input.client;@@ -83,6 +85,7 @@ export class TrueFoundryMcpServerStore<TTransaction = never> implements IMcpServclient: input.client,context: asTrueFoundryRequestContext(input.context),agent: input.agent,+ logger: input.logger,});this.#subject = input.context.subject;this.#perServerHeaders = input.perServerHeaders ?? {};diff --git a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.tsindex fbd7e5552..094b6ab0d 100644--- a/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts+++ b/packages/trueforge/src/truefoundry/TrueFoundryModelProviderStore.ts@@ -1,3 +1,4 @@+import type { Logger } from 'winston';import type { RequestContext } from '../auth/identity';import type { AgentRecord } from '../db/agentStore';import {@@ -23,12 +24,14 @@ export class TrueFoundryModelProviderStore<TTransaction = never> implements IModclient: TrueFoundryServiceFoundryServerClient;context: RequestContext;agent: AgentRecord | undefined;+ logger: Logger;}) {this.#client = input.client;this.#resolveAccessToken = accessTokenForRequest({client: input.client,context: asTrueFoundryRequestContext(input.context),agent: input.agent,+ logger: input.logger,});}diff --git a/packages/trueforge/src/truefoundry/accessToken.ts b/packages/trueforge/src/truefoundry/accessToken.tsindex 7add9bca6..573e019e0 100644--- a/packages/trueforge/src/truefoundry/accessToken.ts+++ b/packages/trueforge/src/truefoundry/accessToken.ts@@ -1,4 +1,5 @@import { HTTPException } from 'hono/http-exception';+import type { Logger } from 'winston';import type { RequestContext } from '../auth/identity';import type { AgentRecord } from '../db/agentStore';import { requireTrueFoundryAgentExternalId } from './errors';@@ -46,17 +47,24 @@ export function agentAccessToken(input: {client: AgentTokenVendor;context: RequestContext;agent: AgentRecord;+ logger: Logger;}): ResolveAccessToken {const { client, context } = input;const agentId = requireTrueFoundryAgentExternalId(input.agent);let pending: Promise<string> | undefined;return () => {- pending ??= client- .vendToken({ subject: context.subject, agentId, tenantName: context.tenant_id })- .catch((error: unknown) => {- pending = undefined;- throw error;+ if (pending === undefined) {+ input.logger.info('Exchanging user context for agent access token', {+ subject: context.subject.id,+ agentId,});+ pending = client+ .vendToken({ subject: context.subject, agentId, tenantName: context.tenant_id })+ .catch((error: unknown) => {+ pending = undefined;+ throw error;+ });+ }return pending;};}@@ -80,6 +88,7 @@ export function accessTokenForRequest(input: {client: AgentTokenVendor;context: TrueFoundryRequestContext;agent: AgentRecord | undefined;+ logger: Logger;}): ResolveAccessToken {if (input.agent === undefined) {return callerAccessToken(input.context);@@ -90,7 +99,12 @@ export function accessTokenForRequest(input: {if (existing !== undefined) {return existing;}- const resolve = agentAccessToken({ client: input.client, context: input.context, agent: input.agent });- cache.set(agentId, resolve);- return resolve;+ const resolveAgentAccessToken = agentAccessToken({+ client: input.client,+ context: input.context,+ agent: input.agent,+ logger: input.logger,+ });+ cache.set(agentId, resolveAgentAccessToken);+ return resolveAgentAccessToken;}diff --git a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.tsindex 20b77045a..240fa684a 100644--- a/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts+++ b/packages/trueforge/tests/unit/truefoundry/TrueFoundryMcpServerStore.test.ts@@ -59,6 +59,7 @@ function createStore(input?: {user_credential: input?.accessToken ?? ACCESS_TOKEN,}),agent: undefined,+ logger: { info: jest.fn() },});return { store, client };}diff --git a/packages/trueforge/tests/unit/truefoundry/accessToken.test.ts b/packages/trueforge/tests/unit/truefoundry/accessToken.test.tsindex e1b3073b7..570090f73 100644--- a/packages/trueforge/tests/unit/truefoundry/accessToken.test.ts+++ b/packages/trueforge/tests/unit/truefoundry/accessToken.test.ts@@ -16,6 +16,7 @@ const CONTEXT: RequestContext = {roles: [],user_credential: 'caller-token',};+const LOGGER = { info: jest.fn() };const AGENT: AgentRecord = {id: 'agent-1',@@ -43,8 +44,13 @@ describe('callerAccessToken', () => {describe('agentAccessToken', () => {it('vends a token scoped to the agent, naming the caller as the subject', async () => {const client = { vendToken: jest.fn().mockResolvedValue('agent-token') };+ const logger = { info: jest.fn() };- await expect(agentAccessToken({ client, context: CONTEXT, agent: AGENT })()).resolves.toBe('agent-token');+ await expect(agentAccessToken({ client, context: CONTEXT, agent: AGENT, logger })()).resolves.toBe('agent-token');+ expect(logger.info).toHaveBeenCalledWith('Exchanging user context for agent access token', {+ subject: 'user-1',+ agentId: 'ext-agent',+ });expect(client.vendToken).toHaveBeenCalledWith({subject: CONTEXT.subject,agentId: 'ext-agent',@@ -54,7 +60,7 @@ describe('agentAccessToken', () => {it('vends once and reuses the token for later calls', async () => {const client = { vendToken: jest.fn().mockResolvedValue('agent-token') };- const resolve = agentAccessToken({ client, context: CONTEXT, agent: AGENT });+ const resolve = agentAccessToken({ client, context: CONTEXT, agent: AGENT, logger: LOGGER });await expect(Promise.all([resolve(), resolve()])).resolves.toEqual(['agent-token', 'agent-token']);await expect(resolve()).resolves.toBe('agent-token');@@ -65,7 +71,7 @@ describe('agentAccessToken', () => {const client = {vendToken: jest.fn().mockRejectedValueOnce(new Error('vend failed')).mockResolvedValue('agent-token'),};- const resolve = agentAccessToken({ client, context: CONTEXT, agent: AGENT });+ const resolve = agentAccessToken({ client, context: CONTEXT, agent: AGENT, logger: LOGGER });await expect(resolve()).rejects.toThrow('vend failed');await expect(resolve()).resolves.toBe('agent-token');@@ -75,9 +81,14 @@ describe('agentAccessToken', () => {it('rejects with 422 when the agent was never registered with TrueFoundry', () => {const client = { vendToken: jest.fn() };- expect(() => agentAccessToken({ client, context: CONTEXT, agent: { ...AGENT, external_id: null } })).toThrow(- HTTPException,- );+ expect(() =>+ agentAccessToken({+ client,+ context: CONTEXT,+ agent: { ...AGENT, external_id: null },+ logger: LOGGER,+ }),+ ).toThrow(HTTPException);expect(client.vendToken).not.toHaveBeenCalled();});});@@ -93,7 +104,9 @@ describe('accessTokenForRequest', () => {const client = { vendToken: jest.fn() };const context = createTrueFoundryRequestContext(CONTEXT);- await expect(accessTokenForRequest({ client, context, agent: undefined })()).resolves.toBe('caller-token');+ await expect(accessTokenForRequest({ client, context, agent: undefined, logger: LOGGER })()).resolves.toBe(+ 'caller-token',+ );expect(client.vendToken).not.toHaveBeenCalled();});@@ -101,7 +114,9 @@ describe('accessTokenForRequest', () => {const client = { vendToken: jest.fn().mockResolvedValue('agent-token') };const context = createTrueFoundryRequestContext(CONTEXT);- await expect(accessTokenForRequest({ client, context, agent: AGENT })()).resolves.toBe('agent-token');+ await expect(accessTokenForRequest({ client, context, agent: AGENT, logger: LOGGER })()).resolves.toBe(+ 'agent-token',+ );expect(client.vendToken).toHaveBeenCalledTimes(1);});@@ -109,8 +124,8 @@ describe('accessTokenForRequest', () => {const client = { vendToken: jest.fn().mockResolvedValue('agent-token') };const context = createTrueFoundryRequestContext(CONTEXT);- const model = accessTokenForRequest({ client, context, agent: AGENT });- const mcp = accessTokenForRequest({ client, context, agent: AGENT });+ const model = accessTokenForRequest({ client, context, agent: AGENT, logger: LOGGER });+ const mcp = accessTokenForRequest({ client, context, agent: AGENT, logger: LOGGER });expect(model).toBe(mcp);await expect(Promise.all([model(), mcp()])).resolves.toEqual(['agent-token', 'agent-token']);@@ -122,10 +137,12 @@ describe('accessTokenForRequest', () => {const firstRequest = createTrueFoundryRequestContext(CONTEXT);const secondRequest = createTrueFoundryRequestContext(CONTEXT);- await expect(accessTokenForRequest({ client, context: firstRequest, agent: AGENT })()).resolves.toBe('agent-token');- await expect(accessTokenForRequest({ client, context: secondRequest, agent: AGENT })()).resolves.toBe(- 'agent-token',- );+ await expect(+ accessTokenForRequest({ client, context: firstRequest, agent: AGENT, logger: LOGGER })(),+ ).resolves.toBe('agent-token');+ await expect(+ accessTokenForRequest({ client, context: secondRequest, agent: AGENT, logger: LOGGER })(),+ ).resolves.toBe('agent-token');expect(client.vendToken).toHaveBeenCalledTimes(2);});});diff --git a/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts b/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.tsindex 12d324429..0ed40a21a 100644--- a/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts+++ b/packages/trueforge/tests/unit/truefoundry/perServerMcpHeaders.test.ts@@ -44,6 +44,7 @@ const storeWith = (perServerHeaders: Record<string, Record<string, string>>): Truser_credential: 'caller-token',}),agent: undefined,+ logger: { info: jest.fn() },perServerHeaders,});