Skip to content

Commit 0a42995

Browse files
fix: allow x-tfg resource headers only on inline sessions (#1076)
* fix: fail-closed x-tfg overlays for inline-session turns Restrict request-scoped skill/MCP/model headers to TrueFoundry-mode turns on inline sessions, and stop InlineSkillStore from falling through to registry resolve (API-key privilege escalation on turns). Co-authored-by: Cursor <cursoragent@cursor.com> * chore: clarify x-tfg header changeset wording Co-authored-by: Cursor <cursoragent@cursor.com> * fix: do not gate x-tfg-mcp-headers with inline resource checks x-tfg-mcp-headers only adds per-server invoke headers; it does not define MCP servers. Drop overlay naming from the allow helper. Co-authored-by: Cursor <cursoragent@cursor.com> * refactor: struct resolve inputs and turn-scoped skill mounts Colocate resolve input types on ServerDeps, move x-tfg-skills wrapping to resolveTurnSkillsStore, update closed-set skill tests, and clarify the changeset that x-tfg-skills does not accept registry skills. Co-authored-by: Cursor <cursoragent@cursor.com> * fix: harden inline resource resolve and keep Promise contracts Fail closed on x-tfg overlays, require object-shaped store resolve inputs, keep InlineSkillStore unknown-name errors as Promise rejections under require-await, type inline skills as GitSkill, and validate inline session create/spec replace against request-scoped headers. Co-authored-by: Cursor <cursoragent@cursor.com> * refactor: use one turn-skills resolve for HTTP and schedules Make ResolveTurnSkillsStoreInput.c optional so schedules call resolveTurnSkillsStore({}) and drop the separate prebuilt store. Co-authored-by: Cursor <cursoragent@cursor.com> * test: tighten sessionHttp allowInlineResources coverage Merge the inline PATCH case with resolve opt-in asserts and loop the repeated creator-only 403 checks. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent df52f0f commit 0a42995

20 files changed

Lines changed: 485 additions & 325 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+
In TrueFoundry mode, `x-tfg-skills`, `x-tfg-mcp`, and `x-tfg-models` are allowed when creating an inline session, replacing its spec, or running a turn on it. Create and replace only use the headers to check the spec and do not save them. `x-tfg-skills` must list every skill as a git skill; registry skill ids are not accepted. MCP servers and models fall back to the registry when a name is missing. Other routes reject these headers.

‎AGENTS.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
- AgentUIServer / server-port types (`AgentChatServer`, `AgentBuilderServer`, catalog ports, session/turn DTOs, stream events) MUST be defined only in `packages/assistant-ui-runtime/src/server/types.ts` / `events.ts`. `@truefoundry/trueforge-ui` MUST re-export them from `src/server/types.ts` (pass-through aliases only) and MUST NOT add hand-written parallel definitions of those ports/DTOs.
1212
- Runtime types backed by Zod schemas MUST be derived with named `z.infer<typeof Schema>` aliases; code MUST NOT duplicate those schemas as hand-written interfaces or indirect utility-type chains.
1313
- Modules MUST use static `import` and `import type`; they MUST NOT use `require()`, `require.resolve()`, or lint suppressions to bypass import checks.
14+
- After editing ESLint-covered files, run `pnpm exec eslint <changed-files> --max-warnings=0` and fix findings in the same change. Do not drop `async` solely to silence `@typescript-eslint/require-await` when the body can throw: keep Promise rejections via `Promise.resolve()` / `Promise.reject()` / `Promise.resolve().then(...)`.
1415
- A change that makes code unused MUST remove that dead code in the same change; it MUST NOT leave stale exports, files, documentation, duplicates, or “just in case” shims.
1516
- Every nested `AGENTS.md` MUST have a sibling `CLAUDE.md` containing only `@AGENTS.md`, so Cursor and Claude Code load the same scoped rules.
1617
- OpenAPI specs under `.github/fern/openapi/openapi.json` and `docs/openapi.json` are autogenerated in CI and MUST NOT be edited manually (both copies MUST stay identical)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ const app = createServerApp({
8383
clientName: configuration.MCP_DCR_OAUTH_CLIENT_NAME,
8484
}),
8585
resolveSkillStore: () => skillStore,
86+
resolveTurnSkillsStore: () => skillStore,
8687
resolveSandboxProviderStore: () => sandboxProviderStore,
8788
resolveWebSearchProviderStore: () => webSearchProviderStore,
8889
resolveAgentStore: () => agentStore,
8990
agentStore,
9091
sandboxEnvironmentStore,
9192
sandboxProviderStore,
92-
turnSkillsResolverStore: skillStore,
9393
withTransaction: callback => db.transaction().execute(callback),
9494
scheduleStore: new SqliteScheduleStore(db),
9595
tokenStore,

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
import type { Context } from 'hono';
1111
import { HTTPException } from 'hono/http-exception';
1212
import type { Logger } from 'winston';
13+
import type { ResolveTurnSkillsStoreInput } from '../app';
1314
import type { Authorizer } from '../auth/authorizer';
1415
import {
1516
createdBySubjectFromRequestContext,
@@ -72,14 +73,15 @@ export interface ScheduleTurnExecutionDeps<TTransaction> {
7273
activeTurns: ActiveTurnRegistry;
7374
eventSubscriptions: EventSubscriptionRegistry<TurnStreamingEvent>;
7475
logger: Logger;
75-
resolveModelProviderStore: (c: Context, runAsAgent?: AgentRecord) => IModelProviderStore<TTransaction>;
76-
resolveMcpServerStore: (c: Context, runAsAgent?: AgentRecord) => IMcpServerWithAuthStore<TTransaction>;
76+
resolveModelProviderStore: (input: { c: Context; runAsAgent?: AgentRecord }) => IModelProviderStore<TTransaction>;
77+
resolveMcpServerStore: (input: { c: Context; runAsAgent?: AgentRecord }) => IMcpServerWithAuthStore<TTransaction>;
7778
resolveSandboxProviderStore: (c: Context) => ISandboxProviderStore<TTransaction>;
7879
sandboxEnvironmentStore: ISandboxEnvironmentStore<TTransaction>;
7980
resolveWebSearchProviderStore: (c: Context) => IWebSearchProviderStore<TTransaction>;
8081
/** Persistence agent store (schedule agent binding is not caller-scoped). */
8182
agentStore: IAgentStore<TTransaction>;
82-
turnSkillsResolverStore: Pick<ISkillStore, 'resolveTurnSkills'>;
83+
/** Call with `{}` — schedules have no caller `x-tfg-skills`. */
84+
resolveTurnSkillsStore: (input: ResolveTurnSkillsStoreInput) => Pick<ISkillStore, 'resolveTurnSkills'>;
8385
}
8486

8587
export interface SchedulesRouterDeps<TTransaction> extends ScheduleTurnExecutionDeps<TTransaction> {
@@ -116,12 +118,12 @@ export async function startScheduleRunOnRequest<TTransaction>(params: {
116118
activeTurns: deps.activeTurns,
117119
eventSubscriptions: deps.eventSubscriptions,
118120
agentStore: deps.agentStore,
119-
modelProviderStore: deps.resolveModelProviderStore(c, prepared.agent),
120-
mcpServerStore: deps.resolveMcpServerStore(c, prepared.agent),
121+
modelProviderStore: deps.resolveModelProviderStore({ c, runAsAgent: prepared.agent }),
122+
mcpServerStore: deps.resolveMcpServerStore({ c, runAsAgent: prepared.agent }),
121123
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
122124
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,
123125
webSearchProviderStore: deps.resolveWebSearchProviderStore(c),
124-
skillStore: deps.turnSkillsResolverStore,
126+
skillStore: deps.resolveTurnSkillsStore({}),
125127
logger: deps.logger,
126128
},
127129
});

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

Lines changed: 68 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
* DB-backed sessions APIs (mounted at /api/v1/sessions and /api/internal/sessions).
33
*/
44
import { OpenAPIHono, type RouteHandler } from '@hono/zod-openapi';
5-
import type { ISessionStore, SessionHandle, SessionRecord, Sessions } from '@truefoundry/trueforge-core/agent-session';
5+
import type {
6+
AgentSpec,
7+
ISessionStore,
8+
SessionHandle,
9+
SessionRecord,
10+
Sessions,
11+
} from '@truefoundry/trueforge-core/agent-session';
612
import {
713
CancellationReason,
814
SessionStoreConflictError,
@@ -22,14 +28,16 @@ import type { Context } from 'hono';
2228
import { HTTPException } from 'hono/http-exception';
2329
import type { Logger } from 'winston';
2430
import { z } from 'zod';
31+
import type { ResolveSkillStoreInput } from '../app';
2532
import type { Authorizer } from '../auth/authorizer';
26-
import { createdBySubjectFromRequestContext, type ResolveRequestContext } from '../auth/identity';
33+
import { createdBySubjectFromRequestContext, type RequestContext, type ResolveRequestContext } from '../auth/identity';
2734
import configuration from '../config';
2835
import type { IAgentStore } from '../db/agentStore';
2936
import type { IMcpServerStore } from '../db/mcpServerStore';
3037
import type { IModelProviderStore } from '../db/modelProviderStore';
3138
import type { ISandboxEnvironmentStore } from '../db/sandboxEnvironmentStore';
3239
import type { ISandboxProviderStore } from '../db/sandboxProviderStore';
40+
import type { ISkillStore } from '../db/skillStore';
3341
import type { IWebSearchProviderStore } from '../db/webSearchProviderStore';
3442
import {
3543
cancelSessionRoute,
@@ -47,7 +55,6 @@ import { honoQueriesToRecord } from '../schemas/deepObjectQuery';
4755
import { isSessionAgentNameRef, parseListSessionsQuery, type Session } from '../schemas/session';
4856
import { newId } from '../utils/id';
4957
import { agentIfAccessible, canReadAgentBoundResource, canReadSession, resolveManagedAgentIds } from './agentAccess';
50-
import type { ResolveSkillStore } from './skills';
5158

5259
/** Request-reply path a replica serves to cancel a turn it owns. */
5360
export const SESSIONS_CANCEL_PATH = 'sessions/cancel';
@@ -79,9 +86,9 @@ export interface SessionsRouterDeps {
7986
sessions: Sessions;
8087
sessionStore: ISessionStore;
8188
activeTurns: ActiveTurnRegistry;
82-
resolveModelProviderStore: (c: Context) => IModelProviderStore;
83-
resolveMcpServerStore: (c: Context) => IMcpServerStore;
84-
resolveSkillStore: ResolveSkillStore;
89+
resolveModelProviderStore: (input: { c: Context; allowInlineResources?: boolean }) => IModelProviderStore;
90+
resolveMcpServerStore: (input: { c: Context; allowInlineResources?: boolean }) => IMcpServerStore;
91+
resolveSkillStore: (input: ResolveSkillStoreInput) => ISkillStore;
8592
resolveAgentStore: (c: Context) => IAgentStore;
8693
resolveSandboxProviderStore: (c: Context) => ISandboxProviderStore;
8794
sandboxEnvironmentStore: ISandboxEnvironmentStore;
@@ -234,6 +241,36 @@ function isSessionOwner({
234241
return subject_id === created_by_subject.subject_id;
235242
}
236243

244+
/**
245+
* Inline create and spec replace check model, MCP, and skill names against `x-tfg-*` when those
246+
* headers are present. The headers are not written onto the session.
247+
*/
248+
function validateInlineSessionSpec(
249+
deps: Pick<
250+
SessionsRouterDeps,
251+
| 'resolveModelProviderStore'
252+
| 'resolveMcpServerStore'
253+
| 'resolveSkillStore'
254+
| 'resolveSandboxProviderStore'
255+
| 'sandboxEnvironmentStore'
256+
| 'resolveWebSearchProviderStore'
257+
>,
258+
input: { c: Context; spec: AgentSpec; requestContext: RequestContext },
259+
): Promise<void> {
260+
const { c, spec, requestContext } = input;
261+
return validateAgentSpec({
262+
spec,
263+
tenant_id: requestContext.tenant_id,
264+
created_by_subject_id: requestContext.subject.id,
265+
modelProviderStore: deps.resolveModelProviderStore({ c, allowInlineResources: true }),
266+
mcpServerStore: deps.resolveMcpServerStore({ c, allowInlineResources: true }),
267+
skillStore: deps.resolveSkillStore({ c, allowInlineResources: true }),
268+
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
269+
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,
270+
webSearchProviderStore: deps.resolveWebSearchProviderStore(c),
271+
});
272+
}
273+
237274
type InternalSessionsRouterDeps = Pick<
238275
SessionsRouterDeps,
239276
| 'sessions'
@@ -289,16 +326,10 @@ function createGetOrCreateSessionByExternalIdHandler(
289326
}
290327
agent = { type: 'reference', id: named.id, name: named.name };
291328
} else {
292-
await validateAgentSpec({
329+
await validateInlineSessionSpec(deps, {
330+
c,
293331
spec: body.agent.spec,
294-
tenant_id: requestContext.tenant_id,
295-
created_by_subject_id: requestContext.subject.id,
296-
modelProviderStore: deps.resolveModelProviderStore(c),
297-
mcpServerStore: deps.resolveMcpServerStore(c),
298-
skillStore: deps.resolveSkillStore(c),
299-
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
300-
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,
301-
webSearchProviderStore: deps.resolveWebSearchProviderStore(c),
332+
requestContext,
302333
});
303334
agent = { type: 'inline', spec: body.agent.spec };
304335
}
@@ -364,16 +395,10 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {
364395
return c.json({ data: toWireSession(session.record) }, 201);
365396
}
366397

367-
await validateAgentSpec({
398+
await validateInlineSessionSpec(deps, {
399+
c,
368400
spec: body.agent.spec,
369-
tenant_id: requestContext.tenant_id,
370-
created_by_subject_id: requestContext.subject.id,
371-
modelProviderStore: deps.resolveModelProviderStore(c),
372-
mcpServerStore: deps.resolveMcpServerStore(c),
373-
skillStore: deps.resolveSkillStore(c),
374-
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
375-
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,
376-
webSearchProviderStore: deps.resolveWebSearchProviderStore(c),
401+
requestContext,
377402
});
378403
const session = await deps.sessions.create({
379404
tenant_id: requestContext.tenant_id,
@@ -458,17 +483,25 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {
458483
// Inline sessions may replace their agent; named (reference) sessions
459484
// cannot — the store rejects that with SessionStoreInvariantError → 422 below.
460485
if (body.agent !== undefined) {
461-
await validateAgentSpec({
462-
spec: body.agent.spec,
463-
tenant_id: requestContext.tenant_id,
464-
created_by_subject_id: requestContext.subject.id,
465-
modelProviderStore: deps.resolveModelProviderStore(c),
466-
mcpServerStore: deps.resolveMcpServerStore(c),
467-
skillStore: deps.resolveSkillStore(c),
468-
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
469-
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,
470-
webSearchProviderStore: deps.resolveWebSearchProviderStore(c),
471-
});
486+
if (existing.agent.type === 'inline') {
487+
await validateInlineSessionSpec(deps, {
488+
c,
489+
spec: body.agent.spec,
490+
requestContext,
491+
});
492+
} else {
493+
await validateAgentSpec({
494+
spec: body.agent.spec,
495+
tenant_id: requestContext.tenant_id,
496+
created_by_subject_id: requestContext.subject.id,
497+
modelProviderStore: deps.resolveModelProviderStore({ c }),
498+
mcpServerStore: deps.resolveMcpServerStore({ c }),
499+
skillStore: deps.resolveSkillStore({ c }),
500+
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
501+
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,
502+
webSearchProviderStore: deps.resolveWebSearchProviderStore(c),
503+
});
504+
}
472505
}
473506
try {
474507
await deps.sessionStore.updateSession({

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import { createSkillsRouter, type ResolveSkillStore } from './skills';
2222
import { createWebSearchProvidersRouter } from './webSearchProviders';
2323

2424
export interface SettingsRouterDeps<TTransaction> {
25-
resolveModelProviderStore: (c: Context) => IModelProviderStore<TTransaction>;
26-
resolveMcpServerStore: (c: Context) => IMcpServerWithAuthStore<TTransaction>;
25+
resolveModelProviderStore: (input: { c: Context }) => IModelProviderStore<TTransaction>;
26+
resolveMcpServerStore: (input: { c: Context }) => IMcpServerWithAuthStore<TTransaction>;
2727
tokenStore: IOAuthTokenStore<TTransaction>;
2828
resolveSkillStore: ResolveSkillStore<TTransaction>;
2929
resolveSandboxProviderStore: (c: Context) => ISandboxProviderStore<TTransaction>;
@@ -41,7 +41,7 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTra
4141
router.route(
4242
'/model-providers',
4343
createModelProvidersRouter({
44-
resolveModelProviderStore: deps.resolveModelProviderStore,
44+
resolveModelProviderStore: c => deps.resolveModelProviderStore({ c }),
4545
resolveAgentStore: deps.resolveAgentStore,
4646
withTransaction: deps.withTransaction,
4747
resolveRequestContext: deps.resolveRequestContext,
@@ -50,7 +50,7 @@ export function createSettingsRouter<TTransaction>(deps: SettingsRouterDeps<TTra
5050
router.route(
5151
'/mcp-servers',
5252
createSettingsMcpServersRouter({
53-
resolveMcpServerStore: deps.resolveMcpServerStore,
53+
resolveMcpServerStore: c => deps.resolveMcpServerStore({ c }),
5454
resolveAgentStore: deps.resolveAgentStore,
5555
tokenStore: deps.tokenStore,
5656
withTransaction: deps.withTransaction,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { findCatalogUsageConflict } from '../runtime/catalogUsage';
1616
import type { AvailableSkill, ConfiguredSkill, CreateSkillRequest, UpdateSkillRequest } from '../schemas/skill';
1717
import { parseTrueFoundryRegistrySkill } from '../schemas/skill';
1818

19+
/** Catalog and agent saves: Context only (HTTP layer rejects `x-tfg-skills` unless sessions opt in). */
1920
export type ResolveSkillStore<TTransaction = never> = (c: Context) => ISkillStore<TTransaction>;
2021

2122
export interface SkillsRouterDeps<TTransaction> {

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import type { Context } from 'hono';
3434
import { HTTPException } from 'hono/http-exception';
3535
import { streamSSE } from 'hono/streaming';
3636
import type { Logger } from 'winston';
37+
import type { ResolveMcpServerStoreInput, ResolveModelProviderStoreInput, ResolveTurnSkillsStoreInput } from '../app';
3738
import type { Authorizer } from '../auth/authorizer';
3839
import type { ResolveRequestContext } from '../auth/identity';
3940
import configuration from '../config';
@@ -117,9 +118,9 @@ export interface TurnsRouterDeps {
117118
sessions: Sessions;
118119
sessionStore: ISessionStore;
119120
activeTurns: ActiveTurnRegistry;
120-
resolveModelProviderStore: (c: Context, runAsAgent?: AgentRecord) => IModelProviderStore;
121-
resolveMcpServerStore: (c: Context, runAsAgent?: AgentRecord) => IMcpServerWithAuthStore;
122-
resolveSkillStore: (c: Context) => ISkillStore;
121+
resolveModelProviderStore: (input: ResolveModelProviderStoreInput) => IModelProviderStore;
122+
resolveMcpServerStore: (input: ResolveMcpServerStoreInput) => IMcpServerWithAuthStore;
123+
resolveTurnSkillsStore: (input: ResolveTurnSkillsStoreInput) => Pick<ISkillStore, 'resolveTurnSkills'>;
123124
resolveAgentStore: (c: Context) => IAgentStore;
124125
/** Resumable live turn-event transport: create-turn writes, subscribe polls. */
125126
eventSubscriptions: EventSubscriptionRegistry<TurnStreamingEvent>;
@@ -824,6 +825,8 @@ export function createTurnsRouter(deps: TurnsRouterDeps) {
824825
referencedAgent = agent;
825826
}
826827

828+
// x-tfg-skills / x-tfg-mcp / x-tfg-models on turns only when the session agent is inline.
829+
const allowInlineResources = session.record.agent.type === 'inline';
827830
const turnParams: BeginTurnExecutionParams = {
828831
session,
829832
input: body.input,
@@ -832,9 +835,17 @@ export function createTurnsRouter(deps: TurnsRouterDeps) {
832835
requestHeaders: c.req.header(),
833836
deps: {
834837
...deps,
835-
modelProviderStore: deps.resolveModelProviderStore(c, referencedAgent),
836-
mcpServerStore: deps.resolveMcpServerStore(c, referencedAgent),
837-
skillStore: deps.resolveSkillStore(c),
838+
modelProviderStore: deps.resolveModelProviderStore({
839+
c,
840+
allowInlineResources,
841+
...(referencedAgent !== undefined ? { runAsAgent: referencedAgent } : {}),
842+
}),
843+
mcpServerStore: deps.resolveMcpServerStore({
844+
c,
845+
allowInlineResources,
846+
...(referencedAgent !== undefined ? { runAsAgent: referencedAgent } : {}),
847+
}),
848+
skillStore: deps.resolveTurnSkillsStore({ c, allowInlineResources }),
838849
agentStore: deps.resolveAgentStore(c),
839850
sandboxProviderStore: deps.resolveSandboxProviderStore(c),
840851
sandboxEnvironmentStore: deps.sandboxEnvironmentStore,

0 commit comments

Comments
 (0)