Skip to content

Commit 45b8a9e

Browse files
Add TrueFoundryAgentStore for SF remote agent sync
1 parent 1c67237 commit 45b8a9e

22 files changed

Lines changed: 858 additions & 70 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 via TrueFoundryAgentStore and store the remote id in `external_id`.

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

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

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
55
import type { AgentSpec } from '@truefoundry/trueforge-core/agent-session';
66
import type { Context } from 'hono';
7-
import { AgentNameConflictError, type AgentRecord, type IAgentStore } from '../db/agentStore';
7+
import {
8+
AgentExternalIdConflictError,
9+
AgentNameConflictError,
10+
type AgentRecord,
11+
type IAgentStore,
12+
} from '../db/agentStore';
813
import type { IMcpServerStore } from '../db/mcpServerStore';
914
import type { IModelProviderStore } from '../db/modelProviderStore';
1015
import type { ISandboxProviderStore } from '../db/sandboxProviderStore';
@@ -24,7 +29,7 @@ import { buildAgentCodeSnippets } from './agentCodeSnippets';
2429
import { TENANT_ID } from './sessions';
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>;
@@ -65,7 +70,7 @@ async function validateManifest<TTransaction>({
6570

6671
export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransaction>) {
6772
const listHandler: RouteHandler<typeof listAgentsRoute> = async c => {
68-
const records = await deps.agentStore.listAgents(TENANT_ID);
73+
const records = await deps.resolveAgentStore(c).listAgents(TENANT_ID);
6974
return c.json({ data: records.map(toWireAgent) }, 200);
7075
};
7176

@@ -78,15 +83,15 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
7883
mcpServerStore: deps.resolveMcpServerStore(c),
7984
});
8085
try {
81-
const record = await deps.agentStore.createAgent({
86+
const record = await deps.resolveAgentStore(c).createAgent({
8287
tenant_id: TENANT_ID,
8388
name: body.name,
8489
manifest,
8590
external_id: null,
8691
});
8792
return c.json({ data: toWireAgent(record) }, 201);
8893
} catch (error) {
89-
if (error instanceof AgentNameConflictError) {
94+
if (error instanceof AgentNameConflictError || error instanceof AgentExternalIdConflictError) {
9095
return c.json({ error: { message: error.message } }, 409);
9196
}
9297
throw error;
@@ -95,7 +100,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
95100

96101
const getHandler: RouteHandler<typeof getAgentRoute> = async c => {
97102
const { agent_id: agentId } = c.req.valid('param');
98-
const record = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, id: agentId });
103+
const record = await deps.resolveAgentStore(c).getAgent({ tenant_id: TENANT_ID, id: agentId });
99104
if (record === undefined) {
100105
return c.json({ error: { message: `Agent not found: ${agentId}` } }, 404);
101106
}
@@ -104,7 +109,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
104109

105110
const getCodeSnippetsHandler: RouteHandler<typeof getAgentCodeSnippetsRoute> = async c => {
106111
const { agent_id: agentId } = c.req.valid('param');
107-
const record = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, id: agentId });
112+
const record = await deps.resolveAgentStore(c).getAgent({ tenant_id: TENANT_ID, id: agentId });
108113
if (record === undefined) {
109114
return c.json({ error: { message: `Agent not found: ${agentId}` } }, 404);
110115
}
@@ -121,7 +126,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
121126

122127
const deleteHandler: RouteHandler<typeof deleteAgentRoute> = async c => {
123128
const { agent_id: agentId } = c.req.valid('param');
124-
await deps.agentStore.deleteAgent({ tenant_id: TENANT_ID, id: agentId });
129+
await deps.resolveAgentStore(c).deleteAgent({ tenant_id: TENANT_ID, id: agentId });
125130
return c.json({}, 200);
126131
};
127132

@@ -134,7 +139,7 @@ export function createAgentsRouter<TTransaction>(deps: AgentsRouterDeps<TTransac
134139
modelProviderStore: deps.resolveModelProviderStore(c),
135140
mcpServerStore: deps.resolveMcpServerStore(c),
136141
});
137-
const record = await deps.agentStore.updateAgent({
142+
const record = await deps.resolveAgentStore(c).updateAgent({
138143
tenant_id: TENANT_ID,
139144
id: agentId,
140145
manifest,

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { getTurnExecutionError, startTurnInProcess, type BeginTurnExecutionDeps
3838

3939
export interface SchedulesRouterDeps<TTransaction> {
4040
scheduleStore: IScheduleStore<TTransaction>;
41-
agentStore: IAgentStore<TTransaction>;
41+
resolveAgentStore: (c: Context) => IAgentStore<TTransaction>;
4242
sessions: Sessions;
4343
turnDeps: BeginTurnExecutionDeps;
4444
withTransaction: WithTransaction<TTransaction>;
@@ -185,7 +185,7 @@ export function createSchedulesRouter<TTransaction>(deps: SchedulesRouterDeps<TT
185185
await startScheduleRun({
186186
item: { run, schedule },
187187
sessions: deps.sessions,
188-
agentStore: deps.agentStore,
188+
agentStore: deps.resolveAgentStore(c),
189189
startTurn: async turnParams => {
190190
await startTurnInProcess({ ...turnParams, deps: deps.turnDeps });
191191
},
@@ -217,7 +217,7 @@ export function createSchedulesRouter<TTransaction>(deps: SchedulesRouterDeps<TT
217217

218218
validateManifest(body.manifest);
219219

220-
const agent = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, name: body.agent_name });
220+
const agent = await deps.resolveAgentStore(c).getAgent({ tenant_id: TENANT_ID, name: body.agent_name });
221221
if (agent === undefined) {
222222
return c.json({ error: { message: `Agent not found: ${body.agent_name}` } }, 400);
223223
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export interface SessionsRouterDeps {
7878
resolveModelProviderStore: (c: Context) => IModelProviderStore;
7979
resolveMcpServerStore: (c: Context) => IMcpServerStore;
8080
skillStore: ISkillStore;
81-
agentStore: IAgentStore;
81+
resolveAgentStore: (c: Context) => IAgentStore;
8282
sandboxProviderStore: ISandboxProviderStore;
8383
redis?: RedisClientType | undefined;
8484
requestReplyRouter: RequestReplyRouter;
@@ -227,7 +227,7 @@ type InternalSessionsRouterDeps = Pick<
227227
| 'resolveModelProviderStore'
228228
| 'resolveMcpServerStore'
229229
| 'skillStore'
230-
| 'agentStore'
230+
| 'resolveAgentStore'
231231
| 'sandboxProviderStore'
232232
| 'resolveUserContext'
233233
>;
@@ -252,7 +252,7 @@ function createGetOrCreateSessionByExternalIdHandler(
252252

253253
let agent: SessionRecord['agent'];
254254
if (isSessionAgentNameRef(body.agent)) {
255-
const named = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, name: body.agent.name });
255+
const named = await deps.resolveAgentStore(c).getAgent({ tenant_id: TENANT_ID, name: body.agent.name });
256256
if (named === undefined) {
257257
return c.json({ error: { message: `Agent not found: ${body.agent.name}` } }, 404);
258258
}
@@ -296,7 +296,7 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {
296296
const sessionId = newId();
297297

298298
if (isSessionAgentNameRef(body.agent)) {
299-
const agent = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, name: body.agent.name });
299+
const agent = await deps.resolveAgentStore(c).getAgent({ tenant_id: TENANT_ID, name: body.agent.name });
300300
if (agent === undefined) {
301301
return c.json({ error: { message: `Agent not found: ${body.agent.name}` } }, 404);
302302
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export interface TurnsRouterDeps {
109109
resolveMcpServerStore: (c: Context) => IMcpServerStore;
110110
tokenStore: IOAuthTokenStore;
111111
skillStore: ISkillStore;
112-
agentStore: IAgentStore;
112+
resolveAgentStore: (c: Context) => IAgentStore;
113113
/** Resumable live turn-event transport: create-turn writes, subscribe polls. */
114114
eventSubscriptions: EventSubscriptionRegistry<TurnStreamingEvent>;
115115
sandboxProviderStore: ISandboxProviderStore;
@@ -119,15 +119,16 @@ export interface TurnsRouterDeps {
119119

120120
/**
121121
* Deps needed to create a turn and drain events in-process (no HTTP). Unlike the HTTP path, this
122-
* carries already-resolved `modelProviderStore` / `mcpServerStore` (the scheduler has no request
122+
* carries already-resolved `modelProviderStore` / `mcpServerStore` / `agentStore` (the scheduler has no request
123123
* context to resolve them).
124124
*/
125125
export type BeginTurnExecutionDeps = Pick<
126126
TurnsRouterDeps,
127-
'activeTurns' | 'eventSubscriptions' | 'tokenStore' | 'skillStore' | 'agentStore' | 'sandboxProviderStore' | 'logger'
127+
'activeTurns' | 'eventSubscriptions' | 'tokenStore' | 'skillStore' | 'sandboxProviderStore' | 'logger'
128128
> & {
129129
modelProviderStore: IModelProviderStore;
130130
mcpServerStore: IMcpServerStore;
131+
agentStore: IAgentStore;
131132
};
132133

133134
/**
@@ -675,6 +676,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps) {
675676
...deps,
676677
modelProviderStore: deps.resolveModelProviderStore(c),
677678
mcpServerStore: deps.resolveMcpServerStore(c),
679+
agentStore: deps.resolveAgentStore(c),
678680
},
679681
};
680682

‎packages/trueforge/src/app.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,15 @@ export interface ServerDeps<TTransaction> {
175175
* Called without a context (e.g. the scheduler / OAuth callback) it returns the DB persistence store.
176176
*/
177177
resolveMcpServerStore: (c?: Context) => IMcpServerWithAuthStore<TTransaction>;
178+
/**
179+
* Per-request store: DB singleton, or a token-bound TrueFoundry decorator in TrueFoundry mode.
180+
* Called without a context (e.g. the scheduler) it returns the DB persistence store.
181+
*/
182+
resolveAgentStore: (c?: Context) => IAgentStore<TTransaction>;
178183
withTransaction: WithTransaction<TTransaction>;
179184
tokenStore: IOAuthTokenStore<TTransaction>;
180185
skillStore: ISkillStore<TTransaction>;
181186
sandboxProviderStore: ISandboxProviderStore<TTransaction>;
182-
agentStore: IAgentStore<TTransaction>;
183187
scheduleStore: IScheduleStore<TTransaction>;
184188
sessionStore: ISessionStore;
185189
sessionMetricsStore: ISessionMetricsStore;
@@ -273,7 +277,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
273277
'/api/v1/agents',
274278
withAuth(
275279
createAgentsRouter({
276-
agentStore: deps.agentStore,
280+
resolveAgentStore: deps.resolveAgentStore,
277281
resolveModelProviderStore: deps.resolveModelProviderStore,
278282
resolveMcpServerStore: deps.resolveMcpServerStore,
279283
skillStore: deps.skillStore,
@@ -287,7 +291,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
287291
withAuth(
288292
createSchedulesRouter({
289293
scheduleStore: deps.scheduleStore,
290-
agentStore: deps.agentStore,
294+
resolveAgentStore: deps.resolveAgentStore,
291295
sessions: deps.sessions,
292296
turnDeps: {
293297
activeTurns: deps.activeTurns,
@@ -296,7 +300,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
296300
mcpServerStore: deps.resolveMcpServerStore(),
297301
tokenStore: deps.tokenStore,
298302
skillStore: deps.skillStore,
299-
agentStore: deps.agentStore,
303+
agentStore: deps.resolveAgentStore(),
300304
sandboxProviderStore: deps.sandboxProviderStore,
301305
logger: deps.logger,
302306
},
@@ -328,7 +332,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
328332
resolveModelProviderStore: deps.resolveModelProviderStore,
329333
resolveMcpServerStore: deps.resolveMcpServerStore,
330334
skillStore: deps.skillStore,
331-
agentStore: deps.agentStore,
335+
resolveAgentStore: deps.resolveAgentStore,
332336
sandboxProviderStore: deps.sandboxProviderStore,
333337
resolveUserContext,
334338
}),
@@ -353,7 +357,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
353357
resolveModelProviderStore: deps.resolveModelProviderStore,
354358
resolveMcpServerStore: deps.resolveMcpServerStore,
355359
skillStore: deps.skillStore,
356-
agentStore: deps.agentStore,
360+
resolveAgentStore: deps.resolveAgentStore,
357361
sandboxProviderStore: deps.sandboxProviderStore,
358362
redis: deps.redis,
359363
requestReplyRouter: deps.requestReplyRouter,
@@ -373,7 +377,7 @@ export function createServerApp<TTransaction>(deps: ServerDeps<TTransaction>) {
373377
resolveMcpServerStore: deps.resolveMcpServerStore,
374378
tokenStore: deps.tokenStore,
375379
skillStore: deps.skillStore,
376-
agentStore: deps.agentStore,
380+
resolveAgentStore: deps.resolveAgentStore,
377381
eventSubscriptions: deps.eventSubscriptions,
378382
sandboxProviderStore: deps.sandboxProviderStore,
379383
logger: deps.logger,

‎packages/trueforge/src/auth/middleware.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function requireAccessToken(c: Context): string {
4040
const token = readAccessToken(c);
4141
if (!token) {
4242
throw new HTTPException(401, {
43-
message: 'Authentication token required to list or call TrueFoundry models and MCP servers',
43+
message: 'Authentication token required to list or call TrueFoundry models, MCP servers, and agents',
4444
});
4545
}
4646
return token;

0 commit comments

Comments
 (0)