Skip to content

Commit 38abb11

Browse files
Add TrueFoundryAgentStore for agents (#560)
1 parent c65b813 commit 38abb11

26 files changed

Lines changed: 1103 additions & 86 deletions
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@truefoundry/trueforge": patch
3+
---
4+
5+
Sync ServiceFoundry remote agents on create/update/delete and store the remote id in `external_id`. Filter `listAgents` by `external_ids`. Keep general ServiceFoundry HTTP at 10s and agent CRUD calls at 3s.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@truefoundry/trueforge": patch
3+
---
4+
5+
Reject reserved agent names `tfg` and `trueforge` in create requests.

‎packages/trueforge/.env.example‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ PORT=8790
2727
## ServiceFoundry server (caller token) and turns call the tenant's default AI Gateway. Unset = local
2828
## API-key model catalog. Mutually exclusive with OIDC.
2929
# TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL=https://servicefoundry-server.truefoundry.svc.cluster.local
30+
## Max ms for non-agent ServiceFoundry HTTP calls. Default 10000.
31+
# TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS=10000
32+
## Max ms for ServiceFoundry agent create/update/delete calls. Default 3000.
33+
# TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS=3000
3034

3135
## Internal mutual TLS for calls to the ServiceFoundry server. When true, trueforge presents its client
3236
## certificate (and upgrades a mesh-direct http:// peer URL to https://). Only meaningful in-cluster,

‎packages/trueforge/scripts/write-openapi.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ function canonicalise(value: unknown): unknown {
6060
const sessionStore = new InMemorySessionStore();
6161
const db = createSqliteDb(':memory:');
6262
const tokenStore = new SqliteOAuthTokenStore(db);
63+
const agentStore = new SqliteAgentStore(db);
6364
const app = createServerApp({
6465
modelCatalog: ModelCatalog.load(),
6566
resolveModelProviderStore: () => new SqliteModelProviderStore(db),
@@ -76,7 +77,7 @@ const app = createServerApp({
7677
skillStore: new SqliteSkillStore(db),
7778
sandboxCatalog: SandboxCatalog.load(),
7879
sandboxProviderStore: new SqliteSandboxProviderStore(db),
79-
agentStore: new SqliteAgentStore(db),
80+
resolveAgentStore: () => agentStore,
8081
scheduleStore: new SqliteScheduleStore(db),
8182
sessionStore,
8283
sessionMetricsStore: new SqliteSessionMetricsStore(db),

‎packages/trueforge/src/apis/agents.ts‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@ import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
55
import type { AgentSpec } from '@truefoundry/trueforge-core/agent-session';
66
import type { Context } from 'hono';
77
import { createdBySubjectFromRequestContext, type ResolveRequestContext } from '../auth/identity';
8-
import { AgentNameConflictError, type AgentRecord, type IAgentStore } from '../db/agentStore';
8+
import {
9+
AgentExternalIdConflictError,
10+
AgentNameConflictError,
11+
type AgentRecord,
12+
type IAgentStore,
13+
} from '../db/agentStore';
914
import type { IMcpServerStore } from '../db/mcpServerStore';
1015
import type { IModelProviderStore } from '../db/modelProviderStore';
1116
import type { ISandboxProviderStore } from '../db/sandboxProviderStore';
@@ -24,7 +29,7 @@ import { type Agent, type CreateAgentRequest } from '../schemas/agent';
2429
import { buildAgentCodeSnippets } from './agentCodeSnippets';
2530

2631
export interface AgentsRouterDeps<TTransaction> {
27-
agentStore: IAgentStore<TTransaction>;
32+
resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;
2833
resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;
2934
resolveMcpServerStore: (c: Context) => IMcpServerStore<TTransaction>;
3035
skillStore: ISkillStore<TTransaction>;
@@ -70,7 +75,7 @@ async function validateManifest<TTransaction>({
7075
export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransaction>) {
7176
const listHandler: RouteHandler<typeof listAgentsRoute> = async c => {
7277
const requestContext = deps.resolveRequestContext(c);
73-
const records = await deps.agentStore.listAgents(requestContext.tenant_id);
78+
const records = await deps.resolveAgentStore(c).listAgents({ tenant_id: requestContext.tenant_id });
7479
return c.json({ data: records.map(toWireAgent) }, 200);
7580
};
7681

@@ -85,7 +90,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
8590
tenant_id: requestContext.tenant_id,
8691
});
8792
try {
88-
const record = await deps.agentStore.createAgent({
93+
const record = await deps.resolveAgentStore(c).createAgent({
8994
tenant_id: requestContext.tenant_id,
9095
name: body.name,
9196
manifest,
@@ -94,7 +99,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
9499
});
95100
return c.json({ data: toWireAgent(record) }, 201);
96101
} catch (error) {
97-
if (error instanceof AgentNameConflictError) {
102+
if (error instanceof AgentNameConflictError || error instanceof AgentExternalIdConflictError) {
98103
return c.json({ error: { message: error.message } }, 409);
99104
}
100105
throw error;
@@ -104,7 +109,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
104109
const getHandler: RouteHandler<typeof getAgentRoute> = async c => {
105110
const { agent_id: agentId } = c.req.valid('param');
106111
const requestContext = deps.resolveRequestContext(c);
107-
const record = await deps.agentStore.getAgent({
112+
const record = await deps.resolveAgentStore(c).getAgent({
108113
tenant_id: requestContext.tenant_id,
109114
id: agentId,
110115
});
@@ -117,7 +122,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
117122
const getCodeSnippetsHandler: RouteHandler<typeof getAgentCodeSnippetsRoute> = async c => {
118123
const { agent_id: agentId } = c.req.valid('param');
119124
const requestContext = deps.resolveRequestContext(c);
120-
const record = await deps.agentStore.getAgent({
125+
const record = await deps.resolveAgentStore(c).getAgent({
121126
tenant_id: requestContext.tenant_id,
122127
id: agentId,
123128
});
@@ -138,7 +143,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
138143
const deleteHandler: RouteHandler<typeof deleteAgentRoute> = async c => {
139144
const { agent_id: agentId } = c.req.valid('param');
140145
const requestContext = deps.resolveRequestContext(c);
141-
await deps.agentStore.deleteAgent({ tenant_id: requestContext.tenant_id, id: agentId });
146+
await deps.resolveAgentStore(c).deleteAgent({ tenant_id: requestContext.tenant_id, id: agentId });
142147
return c.json({}, 200);
143148
};
144149

@@ -153,7 +158,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
153158
mcpServerStore: deps.resolveMcpServerStore(c),
154159
tenant_id: requestContext.tenant_id,
155160
});
156-
const record = await deps.agentStore.updateAgent({
161+
const record = await deps.resolveAgentStore(c).updateAgent({
157162
tenant_id: requestContext.tenant_id,
158163
id: agentId,
159164
manifest,

‎packages/trueforge/src/apis/schedules.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
55
import { InvalidPageTokenError, type Sessions } from '@truefoundry/trueforge-core/agent-session';
6+
import type { Context } from 'hono';
67
import {
78
createdBySubjectFromRequestContext,
89
hasAdminRole,
@@ -41,7 +42,7 @@ import { getTurnExecutionError, startTurnInProcess, type BeginTurnExecutionDeps
4142

4243
export interface SchedulesRouterDeps<TTransaction> {
4344
scheduleStore: IScheduleStore<TTransaction>;
44-
agentStore: IAgentStore<TTransaction>;
45+
resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;
4546
sessions: Sessions;
4647
turnDeps: BeginTurnExecutionDeps;
4748
withTransaction: WithTransaction<TTransaction>;
@@ -200,7 +201,7 @@ export function createSchedulesRouter<TTransaction>(deps: SchedulesRouterDeps<TT
200201
await startScheduleRun({
201202
item: { run, schedule },
202203
sessions: deps.sessions,
203-
agentStore: deps.agentStore,
204+
agentStore: deps.resolveAgentStore(c),
204205
startTurn: async turnParams => {
205206
await startTurnInProcess({ ...turnParams, deps: deps.turnDeps });
206207
},
@@ -235,7 +236,7 @@ export function createSchedulesRouter<TTransaction>(deps: SchedulesRouterDeps<TT
235236

236237
validateManifest(body.manifest);
237238

238-
const agent = await deps.agentStore.getAgent({
239+
const agent = await deps.resolveAgentStore(c).getAgent({
239240
tenant_id: requestContext.tenant_id,
240241
name: body.agent_name,
241242
});

‎packages/trueforge/src/apis/sessions.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export interface SessionsRouterDeps {
7575
resolveModelProviderStore: (c: Context) => IModelProviderStore;
7676
resolveMcpServerStore: (c: Context) => IMcpServerStore;
7777
skillStore: ISkillStore;
78-
agentStore: IAgentStore;
78+
resolveAgentStore: (c: Context) => IAgentStore;
7979
sandboxProviderStore: ISandboxProviderStore;
8080
redis?: RedisClientType | undefined;
8181
requestReplyRouter: RequestReplyRouter;
@@ -230,7 +230,7 @@ type InternalSessionsRouterDeps = Pick<
230230
| 'resolveModelProviderStore'
231231
| 'resolveMcpServerStore'
232232
| 'skillStore'
233-
| 'agentStore'
233+
| 'resolveAgentStore'
234234
| 'sandboxProviderStore'
235235
| 'resolveRequestContext'
236236
>;
@@ -260,7 +260,7 @@ function createGetOrCreateSessionByExternalIdHandler(
260260

261261
let agent: SessionRecord['agent'];
262262
if (isSessionAgentNameRef(body.agent)) {
263-
const named = await deps.agentStore.getAgent({
263+
const named = await deps.resolveAgentStore(c).getAgent({
264264
tenant_id: requestContext.tenant_id,
265265
name: body.agent.name,
266266
});
@@ -314,7 +314,7 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {
314314
const requestContext = deps.resolveRequestContext(c);
315315

316316
if (isSessionAgentNameRef(body.agent)) {
317-
const agent = await deps.agentStore.getAgent({
317+
const agent = await deps.resolveAgentStore(c).getAgent({
318318
tenant_id: requestContext.tenant_id,
319319
name: body.agent.name,
320320
});

‎packages/trueforge/src/apis/turns.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export interface TurnsRouterDeps {
106106
resolveModelProviderStore: (c: Context) => IModelProviderStore;
107107
resolveMcpServerStore: (c: Context) => IMcpServerWithAuthStore;
108108
skillStore: ISkillStore;
109-
agentStore: IAgentStore;
109+
resolveAgentStore: (c: Context) => IAgentStore;
110110
/** Resumable live turn-event transport: create-turn writes, subscribe polls. */
111111
eventSubscriptions: EventSubscriptionRegistry<TurnStreamingEvent>;
112112
sandboxProviderStore: ISandboxProviderStore;
@@ -116,15 +116,16 @@ export interface TurnsRouterDeps {
116116

117117
/**
118118
* Deps needed to create a turn and drain events in-process (no HTTP). Unlike the HTTP path, this
119-
* carries already-resolved `modelProviderStore` / `mcpServerStore` (the scheduler has no request
119+
* carries already-resolved `modelProviderStore` / `mcpServerStore` / `agentStore` (the scheduler has no request
120120
* context to resolve them).
121121
*/
122122
export type BeginTurnExecutionDeps = Pick<
123123
TurnsRouterDeps,
124-
'activeTurns' | 'eventSubscriptions' | 'skillStore' | 'agentStore' | 'sandboxProviderStore' | 'logger'
124+
'activeTurns' | 'eventSubscriptions' | 'skillStore' | 'sandboxProviderStore' | 'logger'
125125
> & {
126126
modelProviderStore: IModelProviderStore;
127127
mcpServerStore: IMcpServerWithAuthStore;
128+
agentStore: IAgentStore;
128129
};
129130

130131
/**
@@ -721,6 +722,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps) {
721722
...deps,
722723
modelProviderStore: deps.resolveModelProviderStore(c),
723724
mcpServerStore: deps.resolveMcpServerStore(c),
725+
agentStore: deps.resolveAgentStore(c),
724726
},
725727
};
726728

‎packages/trueforge/src/app.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,15 @@ export interface ServerDeps<TTransaction> {
174174
* Called without a context (e.g. the scheduler / OAuth callback) it returns the DB persistence store.
175175
*/
176176
resolveMcpServerStore: (c?: Context) => IMcpServerWithAuthStore<TTransaction>;
177+
/**
178+
* Per-request store: DB singleton, or a token-bound TrueFoundry decorator in TrueFoundry mode.
179+
* Called without a context (e.g. the scheduler) it returns the DB persistence store.
180+
*/
181+
resolveAgentStore: (c?: Context) => IAgentStore<TTransaction>;
177182
withTransaction: WithTransaction<TTransaction>;
178183
tokenStore: IOAuthTokenStore<TTransaction>;
179184
skillStore: ISkillStore<TTransaction>;
180185
sandboxProviderStore: ISandboxProviderStore<TTransaction>;
181-
agentStore: IAgentStore<TTransaction>;
182186
scheduleStore: IScheduleStore<TTransaction>;
183187
sessionStore: ISessionStore;
184188
sessionMetricsStore: ISessionMetricsStore;
@@ -291,7 +295,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
291295
'/api/v1/agents',
292296
withAuth(
293297
createAgentsRouter({
294-
agentStore: deps.agentStore,
298+
resolveAgentStore: deps.resolveAgentStore,
295299
resolveModelProviderStore: deps.resolveModelProviderStore,
296300
resolveMcpServerStore: deps.resolveMcpServerStore,
297301
skillStore: deps.skillStore,
@@ -307,15 +311,15 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
307311
withAuth(
308312
createSchedulesRouter({
309313
scheduleStore: deps.scheduleStore,
310-
agentStore: deps.agentStore,
314+
resolveAgentStore: deps.resolveAgentStore,
311315
sessions: deps.sessions,
312316
turnDeps: {
313317
activeTurns: deps.activeTurns,
314318
eventSubscriptions: deps.eventSubscriptions,
315319
modelProviderStore: deps.resolveModelProviderStore(),
316320
mcpServerStore: deps.resolveMcpServerStore(),
317321
skillStore: deps.skillStore,
318-
agentStore: deps.agentStore,
322+
agentStore: deps.resolveAgentStore(),
319323
sandboxProviderStore: deps.sandboxProviderStore,
320324
logger: deps.logger,
321325
},
@@ -349,7 +353,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
349353
resolveModelProviderStore: deps.resolveModelProviderStore,
350354
resolveMcpServerStore: deps.resolveMcpServerStore,
351355
skillStore: deps.skillStore,
352-
agentStore: deps.agentStore,
356+
resolveAgentStore: deps.resolveAgentStore,
353357
sandboxProviderStore: deps.sandboxProviderStore,
354358
resolveRequestContext,
355359
}),
@@ -376,7 +380,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
376380
resolveModelProviderStore: deps.resolveModelProviderStore,
377381
resolveMcpServerStore: deps.resolveMcpServerStore,
378382
skillStore: deps.skillStore,
379-
agentStore: deps.agentStore,
383+
resolveAgentStore: deps.resolveAgentStore,
380384
sandboxProviderStore: deps.sandboxProviderStore,
381385
redis: deps.redis,
382386
requestReplyRouter: deps.requestReplyRouter,
@@ -396,7 +400,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
396400
resolveModelProviderStore: deps.resolveModelProviderStore,
397401
resolveMcpServerStore: deps.resolveMcpServerStore,
398402
skillStore: deps.skillStore,
399-
agentStore: deps.agentStore,
403+
resolveAgentStore: deps.resolveAgentStore,
400404
eventSubscriptions: deps.eventSubscriptions,
401405
sandboxProviderStore: deps.sandboxProviderStore,
402406
logger: deps.logger,

‎packages/trueforge/src/config.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ export interface SharedServerConfiguration {
489489
* Env: `TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL`.
490490
*/
491491
TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL: string | undefined;
492+
/** Max ms for non-agent ServiceFoundry HTTP calls. Env: `TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS`. Default 10000. */
493+
TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS: number;
494+
/** Max ms for agent CRUD ServiceFoundry HTTP calls. Env: `TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS`. Default 3000. */
495+
TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS: number;
492496
/**
493497
* Present this pod's client certificate on outbound calls to the ServiceFoundry server (internal
494498
* mutual TLS) and upgrade a mesh-direct peer URL from http to https. Off by default, so an
@@ -664,6 +668,16 @@ const shared: SharedServerConfiguration = {
664668
SERVER_URL:
665669
getEnv('SERVER_URL', { defaultValue: `http://localhost:${String(port)}` }) ?? `http://localhost:${String(port)}`,
666670
TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL: getEnv('TRUEFOUNDRY_SERVICEFOUNDRY_SERVER_URL', { required: false }),
671+
TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS: parsePositiveInt({
672+
envKey: 'TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS',
673+
raw: getEnv('TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_TIMEOUT_MS'),
674+
defaultValue: 10_000,
675+
}),
676+
TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS: parsePositiveInt({
677+
envKey: 'TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS',
678+
raw: getEnv('TRUEFOUNDRY_SERVICEFOUNDRY_HTTP_AGENT_TIMEOUT_MS'),
679+
defaultValue: 3_000,
680+
}),
667681
TRUEFOUNDRY_MTLS_ENABLED: parseBoolean({
668682
envKey: 'TRUEFOUNDRY_MTLS_ENABLED',
669683
raw: getEnv('TRUEFOUNDRY_MTLS_ENABLED'),

0 commit comments

Comments
 (0)