From a318868a33be9fc8066ba5b48163f8bad0a12c0d Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 14:30:38 +0530 Subject: [PATCH 01/13] feat(auth): implement service API key support for session creator in turns API --- .../assume-session-creator-create-turn.md | 5 ++ packages/trueforge/src/apis/turns.ts | 62 +++++++++++++++---- packages/trueforge/src/app.ts | 6 +- packages/trueforge/src/auth/assumeUser.ts | 25 ++++++++ packages/trueforge/src/auth/middleware.ts | 25 ++++++++ 5 files changed, 109 insertions(+), 14 deletions(-) create mode 100644 .changeset/assume-session-creator-create-turn.md create mode 100644 packages/trueforge/src/auth/assumeUser.ts diff --git a/.changeset/assume-session-creator-create-turn.md b/.changeset/assume-session-creator-create-turn.md new file mode 100644 index 000000000..2ee7c6439 --- /dev/null +++ b/.changeset/assume-session-creator-create-turn.md @@ -0,0 +1,5 @@ +--- +'@truefoundry/trueforge': patch +--- + +Service API key may create or list turns on `/api/v1/sessions/{session_id}/turns` with `assume-user: session-creator` (identity is the session creator). diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index 55af58ad4..22c282e07 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -67,6 +67,7 @@ import { HTTPException } from 'hono/http-exception'; import { streamSSE } from 'hono/streaming'; import type { Logger } from 'winston'; import { z } from 'zod'; +import { ASSUME_USER_HEADER, parseAssumeUserHeader } from '../auth/assumeUser'; import type { Authorizer } from '../auth/authorizer'; import { requestContextFromCreatedBySubject, @@ -1145,6 +1146,39 @@ function isSessionOwner({ return created_by_subject.subject_id === subject_id; } +async function resolveTurnSession(params: { + c: Context; + sessions: Sessions; + session_id: string; +}): Promise<{ requestContext: RequestContext; session: SessionHandle }> { + const { c, sessions, session_id: sessionId } = params; + const existing = c.get('request_context'); + if (!existing) { + parseAssumeUserHeader(c.req.header(ASSUME_USER_HEADER)); + const session = await sessions.getById({ session_id: sessionId }); + if (!session) { + throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); + } + const requestContext = requestContextFromCreatedBySubject({ + tenant_id: session.record.tenant_id, + created_by_subject: session.record.created_by_subject, + user_credential: null, + }); + c.set('request_context', requestContext); + updateLogContext({ tenant_id: session.record.tenant_id, session_id: sessionId }); + return { requestContext, session }; + } + + const session = await sessions.get({ + tenant_id: existing.tenant_id, + session_id: sessionId, + }); + if (!session) { + throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); + } + return { requestContext: existing, session }; +} + /** Request-reply path the owner serves for inbound turn events. */ const TURNS_SEND_EVENTS_PATH = 'turns/send-events'; @@ -1791,14 +1825,11 @@ export function createTurnsRouter(deps: TurnsRouterDeps = async c => { const { session_id: sessionId } = c.req.valid('param'); const query = c.req.valid('query'); - const requestContext = deps.resolveRequestContext(c); - const session = await deps.sessions.get({ - tenant_id: requestContext.tenant_id, + const { requestContext, session } = await resolveTurnSession({ + c, + sessions: deps.sessions, session_id: sessionId, }); - if (!session) { - return c.json({ error: { message: `Session not found: ${sessionId}` } }, 404); - } const allowed = await canReadSession({ session_id: session.record.session_id, accessControlStore: deps.accessControlStore, @@ -1970,16 +2001,15 @@ export function createTurnsRouter(deps: TurnsRouterDeps = async c => { const { session_id: sessionId } = c.req.valid('param'); const body = c.req.valid('json'); - const requestContext = deps.resolveRequestContext(c); - - const session = await deps.sessions.get({ - tenant_id: requestContext.tenant_id, + const serviceAuth = !c.get('request_context'); + const { requestContext, session } = await resolveTurnSession({ + c, + sessions: deps.sessions, session_id: sessionId, }); - if (!session) { - return c.json({ error: { message: `Session not found: ${sessionId}` } }, 404); - } + if ( + !serviceAuth && !isSessionOwner({ subject_id: requestContext.subject.id, created_by_subject: session.record.created_by_subject, @@ -1997,6 +2027,12 @@ export function createTurnsRouter(deps: TurnsRouterDeps(deps: ServerDeps) { sessions: deps.sessions, sessionStore: deps.sessionStore, }), - authMiddleware, + createAuthOrServiceKeyMiddleware({ + authenticator: deps.authenticator, + apiKey: configuration.TRUEFORGE_API_KEY, + }), ), ); diff --git a/packages/trueforge/src/auth/assumeUser.ts b/packages/trueforge/src/auth/assumeUser.ts new file mode 100644 index 000000000..5a4ccb66b --- /dev/null +++ b/packages/trueforge/src/auth/assumeUser.ts @@ -0,0 +1,25 @@ +import { HTTPException } from 'hono/http-exception'; + +export const ASSUME_USER_HEADER = 'assume-user'; + +export enum AssumeUser { + SessionCreator = 'session-creator', +} + +const ASSUME_USER_BY_VALUE: Record = { + [AssumeUser.SessionCreator]: AssumeUser.SessionCreator, +}; + +export function parseAssumeUserHeader(header: string | undefined): AssumeUser { + const raw = header?.trim(); + if (!raw) { + throw new HTTPException(400, { message: `Missing ${ASSUME_USER_HEADER} header` }); + } + const assumed = ASSUME_USER_BY_VALUE[raw]; + if (!assumed) { + throw new HTTPException(400, { + message: `Invalid ${ASSUME_USER_HEADER}: only "${AssumeUser.SessionCreator}" is supported`, + }); + } + return assumed; +} diff --git a/packages/trueforge/src/auth/middleware.ts b/packages/trueforge/src/auth/middleware.ts index 867b66229..591317088 100644 --- a/packages/trueforge/src/auth/middleware.ts +++ b/packages/trueforge/src/auth/middleware.ts @@ -83,6 +83,31 @@ export function createApiKeyAuthMiddleware(apiKey: string): MiddlewareHandler { }; } +export function createAuthOrServiceKeyMiddleware(params: { + authenticator: Authenticator; + apiKey: string; +}): MiddlewareHandler { + const { authenticator, apiKey } = params; + return async (c, next) => { + const token = readBearerToken(c); + if (token && matchesServiceKey({ provided: token, expected: apiKey })) { + // Clear any prior JWT context (e.g. sibling `/api/v1/sessions` mount with standalone auth). + c.set('request_context', undefined); + c.set('subject', undefined); + return next(); + } + + const requestContext = await tryAuthenticate({ authenticator, context: c }); + if (!requestContext) { + throw new HTTPException(401, { message: 'Authentication required' }); + } + c.set('subject', requestContext.subject); + c.set('request_context', requestContext); + updateLogContext({ tenant_id: requestContext.tenant_id }); + return next(); + }; +} + /** * Soft OIDC probe for login/callback — not request-gate middleware. * From d2d7d7b398d28f585bfea348303033b2708706f4 Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 14:41:26 +0530 Subject: [PATCH 02/13] feat(turns): add ASSUME_USER_HEADER parameter to list and create turns routes --- packages/trueforge/src/routes/turnRoutes.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/packages/trueforge/src/routes/turnRoutes.ts b/packages/trueforge/src/routes/turnRoutes.ts index 1daf8c82a..edccd1614 100644 --- a/packages/trueforge/src/routes/turnRoutes.ts +++ b/packages/trueforge/src/routes/turnRoutes.ts @@ -5,6 +5,7 @@ * Handlers are registered in apis/turns.ts. */ import { createRoute, z } from '@hono/zod-openapi'; +import { ASSUME_USER_HEADER, AssumeUser } from '../auth/assumeUser'; import { RequestErrorResponseSchema } from '../schemas/errors'; import { CreateTurnEventRequestSchema, @@ -30,6 +31,15 @@ export const TurnIdParamsSchema = SessionIdParamsSchema.extend({ turn_id: z.string().min(1).describe('Turn identifier.'), }); +/** OpenAPI-only (like Nest `@ApiHeader`); not a Zod request validator. */ +const ASSUME_USER_HEADER_PARAM = { + name: ASSUME_USER_HEADER, + in: 'header' as const, + required: false, + description: 'With the service API key, set to session-creator to act as the session creator.', + schema: { type: 'string' as const, enum: [AssumeUser.SessionCreator] }, +}; + export const listTurnsRoute = createRoute({ method: 'get', path: '/{session_id}/turns', @@ -37,6 +47,7 @@ export const listTurnsRoute = createRoute({ summary: 'List turns in a session', description: 'List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.', + parameters: [ASSUME_USER_HEADER_PARAM], 'x-fern-sdk-group-name': ['sessions'], 'x-fern-sdk-method-name': 'list_turns', 'x-fern-pagination': TOKEN_PAGINATION, @@ -232,6 +243,7 @@ Only the session creator may create turns. When \`stream\` is true (default), respond with a Server-Sent Events stream of turn events. When \`stream\` is false, return the turn immediately with \`state.status: "running"\` while execution continues in the background; use get turn or subscribe to observe completion. Use \`previous_turn_id\` to chain to the session's last turn (defaults to \`auto\`); use \`none\` for a new root.`, + parameters: [ASSUME_USER_HEADER_PARAM], 'x-fern-sdk-group-name': ['sessions'], 'x-fern-sdk-method-name': 'create_turn', 'x-fern-streaming': { From d16b008de16a559194b16add9816786358a14682 Mon Sep 17 00:00:00 2001 From: "trueforge-dev-bot[bot]" Date: Thu, 12 Nov 2026 09:14:11 +0000 Subject: [PATCH 03/13] Regenerate OpenAPI document and SDKs --- .github/fern/openapi/openapi.json | 24 ++++++++ docs/openapi.json | 24 ++++++++ .../api/resources/sessions/client/Client.ts | 13 ++-- .../requests/CreateTurnSessionsRequest.ts | 2 + .../CreateTurnSessionsStreamRequest.ts | 2 + .../requests/ListTurnsSessionsRequest.ts | 2 + .../requests/CreateTurnSessionsRequest.ts | 2 +- .../CreateTurnSessionsStreamRequest.ts | 2 +- python/trueforge_sdk/reference.md | 24 ++++++++ .../src/trueforge_sdk/__init__.py | 6 +- .../src/trueforge_sdk/sessions/client.py | 60 +++++++++++++++++-- .../src/trueforge_sdk/sessions/raw_client.py | 36 +++++++++++ .../src/trueforge_sdk/types/__init__.py | 6 +- 13 files changed, 185 insertions(+), 18 deletions(-) diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.json index 0ebe5588a..18af639ba 100644 --- a/.github/fern/openapi/openapi.json +++ b/.github/fern/openapi/openapi.json @@ -10724,6 +10724,18 @@ "get": { "description": "List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.", "parameters": [ + { + "description": "With the service API key, set to session-creator to act as the session creator.", + "in": "header", + "name": "assume-user", + "required": false, + "schema": { + "enum": [ + "session-creator" + ], + "type": "string" + } + }, { "description": "Session identifier.", "in": "path", @@ -10819,6 +10831,18 @@ "post": { "description": "Create a turn within a session and execute it.\nOnly the session creator may create turns.\nWhen `stream` is true (default), respond with a Server-Sent Events stream of turn events.\nWhen `stream` is false, return the turn immediately with `state.status: \"running\"` while execution continues in the background; use get turn or subscribe to observe completion.\nUse `previous_turn_id` to chain to the session's last turn (defaults to `auto`); use `none` for a new root.", "parameters": [ + { + "description": "With the service API key, set to session-creator to act as the session creator.", + "in": "header", + "name": "assume-user", + "required": false, + "schema": { + "enum": [ + "session-creator" + ], + "type": "string" + } + }, { "description": "Session identifier.", "in": "path", diff --git a/docs/openapi.json b/docs/openapi.json index 0ebe5588a..18af639ba 100644 --- a/docs/openapi.json +++ b/docs/openapi.json @@ -10724,6 +10724,18 @@ "get": { "description": "List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.", "parameters": [ + { + "description": "With the service API key, set to session-creator to act as the session creator.", + "in": "header", + "name": "assume-user", + "required": false, + "schema": { + "enum": [ + "session-creator" + ], + "type": "string" + } + }, { "description": "Session identifier.", "in": "path", @@ -10819,6 +10831,18 @@ "post": { "description": "Create a turn within a session and execute it.\nOnly the session creator may create turns.\nWhen `stream` is true (default), respond with a Server-Sent Events stream of turn events.\nWhen `stream` is false, return the turn immediately with `state.status: \"running\"` while execution continues in the background; use get turn or subscribe to observe completion.\nUse `previous_turn_id` to chain to the session's last turn (defaults to `auto`); use `none` for a new root.", "parameters": [ + { + "description": "With the service API key, set to session-creator to act as the session creator.", + "in": "header", + "name": "assume-user", + "required": false, + "schema": { + "enum": [ + "session-creator" + ], + "type": "string" + } + }, { "description": "Session identifier.", "in": "path", diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts index 5e77bff0c..8e41849c7 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/Client.ts @@ -2,7 +2,7 @@ import type { BaseClientOptions, BaseRequestOptions } from "../../../../BaseClient.js"; import { type NormalizedClientOptionsWithAuth, normalizeClientOptionsWithAuth } from "../../../../BaseClient.js"; -import { mergeHeaders } from "../../../../core/headers.js"; +import { mergeHeaders, mergeOnlyDefinedHeaders } from "../../../../core/headers.js"; import * as core from "../../../../core/index.js"; import { mergeAdditionalBodyParameters } from "../../../../core/requestBody.js"; import { handleNonStatusCodeError } from "../../../../errors/handleNonStatusCodeError.js"; @@ -1112,7 +1112,7 @@ export class SessionsClient { async ( request: TrueForge.ListTurnsSessionsRequest, ): Promise> => { - const { limit = 25, pageToken } = request; + const { limit = 25, pageToken, assumeUser } = request; const _queryParams: Record = { limit, page_token: pageToken, @@ -1121,6 +1121,7 @@ export class SessionsClient { const _headers: core.Fetcher.Args["headers"] = mergeHeaders( _authRequest.headers, this._options?.headers, + mergeOnlyDefinedHeaders({ "assume-user": assumeUser }), requestOptions?.headers, ); const _response = await (this._options.fetcher ?? core.fetcher)({ @@ -1239,10 +1240,12 @@ export class SessionsClient { request: TrueForge.CreateTurnSessionsStreamRequest, requestOptions?: SessionsClient.RequestOptions, ): Promise>> { + const { assumeUser, ..._body } = request; const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest(); const _headers: core.Fetcher.Args["headers"] = mergeHeaders( _authRequest.headers, this._options?.headers, + mergeOnlyDefinedHeaders({ "assume-user": assumeUser }), requestOptions?.headers, ); const _response = await (this._options.fetcher ?? core.fetcher)({ @@ -1258,7 +1261,7 @@ export class SessionsClient { requestType: "json", body: mergeAdditionalBodyParameters( { - ...serializers.CreateTurnSessionsStreamRequest.jsonOrThrow(request, { + ...serializers.CreateTurnSessionsStreamRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -1435,10 +1438,12 @@ export class SessionsClient { request: TrueForge.CreateTurnSessionsRequest, requestOptions?: SessionsClient.RequestOptions, ): Promise> { + const { assumeUser, ..._body } = request; const _authRequest: core.AuthRequest = await this._options.authProvider.getAuthRequest(); const _headers: core.Fetcher.Args["headers"] = mergeHeaders( _authRequest.headers, this._options?.headers, + mergeOnlyDefinedHeaders({ "assume-user": assumeUser }), requestOptions?.headers, ); const _response = await (this._options.fetcher ?? core.fetcher)({ @@ -1454,7 +1459,7 @@ export class SessionsClient { requestType: "json", body: mergeAdditionalBodyParameters( { - ...serializers.CreateTurnSessionsRequest.jsonOrThrow(request, { + ...serializers.CreateTurnSessionsRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts index 63af663f4..0c05c2518 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts @@ -12,6 +12,8 @@ import type * as TrueForge from "../../../../index.js"; * } */ export interface CreateTurnSessionsRequest { + /** With the service API key, set to session-creator to act as the session creator. */ + assumeUser?: "session-creator"; /** User messages for this turn. At least one is required. */ input: TrueForge.CreateTurnSessionsRequestInputItem[]; previousTurnId?: TrueForge.PreviousTurnIdInput; diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts index 803fd631a..88cd564a3 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts @@ -12,6 +12,8 @@ import type * as TrueForge from "../../../../index.js"; * } */ export interface CreateTurnSessionsStreamRequest { + /** With the service API key, set to session-creator to act as the session creator. */ + assumeUser?: "session-creator"; /** User messages for this turn. At least one is required. */ input: TrueForge.CreateTurnSessionsStreamRequestInputItem[]; previousTurnId?: TrueForge.PreviousTurnIdInput; diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts index 81882d9b4..e9df53e17 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts @@ -9,4 +9,6 @@ export interface ListTurnsSessionsRequest { limit?: number; /** Opaque token from a previous response `next_page_token`. */ pageToken?: string; + /** With the service API key, set to session-creator to act as the session creator. */ + assumeUser?: "session-creator"; } diff --git a/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsRequest.ts b/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsRequest.ts index 0c61affcb..0ce0a8aad 100644 --- a/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsRequest.ts +++ b/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsRequest.ts @@ -8,7 +8,7 @@ import { CreateTurnSessionsRequestInputItem } from "../../types/CreateTurnSessio export const CreateTurnSessionsRequest: core.serialization.Schema< serializers.CreateTurnSessionsRequest.Raw, - TrueForge.CreateTurnSessionsRequest + Omit > = core.serialization.object({ input: core.serialization.list(CreateTurnSessionsRequestInputItem), previousTurnId: core.serialization.property("previous_turn_id", PreviousTurnIdInput.optional()), diff --git a/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts b/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts index a6dc2d3f5..abc4b4842 100644 --- a/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts +++ b/packages/trueforge-sdk/src/serialization/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts @@ -8,7 +8,7 @@ import { CreateTurnSessionsStreamRequestInputItem } from "../../types/CreateTurn export const CreateTurnSessionsStreamRequest: core.serialization.Schema< serializers.CreateTurnSessionsStreamRequest.Raw, - TrueForge.CreateTurnSessionsStreamRequest + Omit > = core.serialization.object({ input: core.serialization.list(CreateTurnSessionsStreamRequestInputItem), previousTurnId: core.serialization.property("previous_turn_id", PreviousTurnIdInput.optional()), diff --git a/python/trueforge_sdk/reference.md b/python/trueforge_sdk/reference.md index e77cbe50e..b387bc477 100644 --- a/python/trueforge_sdk/reference.md +++ b/python/trueforge_sdk/reference.md @@ -2948,6 +2948,14 @@ client.sessions.list_turns(
+**assume_user:** `typing.Optional[typing.Literal]` — With the service API key, set to session-creator to act as the session creator. + +
+
+ +
+
+ **request_options:** `typing.Optional[RequestOptions]` — Request-specific configuration.
@@ -3047,6 +3055,14 @@ client.sessions.create_turn_stream(
+**assume_user:** `typing.Optional[typing.Literal]` — With the service API key, set to session-creator to act as the session creator. + +
+
+ +
+
+ **previous_turn_id:** `typing.Optional[PreviousTurnIdInput]`
@@ -3154,6 +3170,14 @@ client.sessions.create_turn_stream(
+**assume_user:** `typing.Optional[typing.Literal]` — With the service API key, set to session-creator to act as the session creator. + +
+
+ +
+
+ **previous_turn_id:** `typing.Optional[PreviousTurnIdInput]`
diff --git a/python/trueforge_sdk/src/trueforge_sdk/__init__.py b/python/trueforge_sdk/src/trueforge_sdk/__init__.py index f995179ef..9366c3bfe 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/__init__.py +++ b/python/trueforge_sdk/src/trueforge_sdk/__init__.py @@ -64,7 +64,6 @@ CreateScheduleRunResponse, CreateSessionAgent, CreateTurnEventResponse, - Subject, CronExpression, CustomModelProvider, DaytonaSandboxProviderAuth, @@ -246,6 +245,7 @@ SkillCapability, SkillManifest, SkillVersion, + Subject, TextContent, ThreadContextCompactionFinishedEvent, ThreadContextCompactionStartedEvent, @@ -404,7 +404,6 @@ "CreateTurnEventResponse": ".types", "CreateTurnSessionsRequestInputItem": ".sessions", "CreateTurnSessionsStreamRequestInputItem": ".sessions", - "Subject": ".types", "CronExpression": ".types", "CustomModelProvider": ".types", "DaytonaSandboxProviderAuth": ".types", @@ -594,6 +593,7 @@ "SkillCapability": ".types", "SkillManifest": ".types", "SkillVersion": ".types", + "Subject": ".types", "TextContent": ".types", "ThreadContextCompactionFinishedEvent": ".types", "ThreadContextCompactionStartedEvent": ".types", @@ -759,7 +759,6 @@ def __dir__(): "CreateTurnEventResponse", "CreateTurnSessionsRequestInputItem", "CreateTurnSessionsStreamRequestInputItem", - "Subject", "CronExpression", "CustomModelProvider", "DaytonaSandboxProviderAuth", @@ -949,6 +948,7 @@ def __dir__(): "SkillCapability", "SkillManifest", "SkillVersion", + "Subject", "TextContent", "ThreadContextCompactionFinishedEvent", "ThreadContextCompactionStartedEvent", diff --git a/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py b/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py index 68621406d..daff51cba 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py +++ b/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py @@ -473,6 +473,7 @@ def list_turns( session_id: str, limit: typing.Optional[int] = 25, page_token: typing.Optional[str] = None, + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, request_options: typing.Optional[RequestOptions] = None, ) -> SyncPager[Turn, ListTurnsResponse]: """ @@ -489,6 +490,9 @@ def list_turns( page_token : typing.Optional[str] Opaque token from a previous response `next_page_token`. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -515,7 +519,11 @@ def list_turns( yield page """ return self._raw_client.list_turns( - session_id=session_id, limit=limit, page_token=page_token, request_options=request_options + session_id=session_id, + limit=limit, + page_token=page_token, + assume_user=assume_user, + request_options=request_options, ) def create_turn_stream( @@ -523,6 +531,7 @@ def create_turn_stream( *, session_id: str, input: typing.Sequence[CreateTurnSessionsStreamRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> Stream[TurnStreamingEvent]: @@ -541,6 +550,9 @@ def create_turn_stream( input : typing.Sequence[CreateTurnSessionsStreamRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -574,7 +586,11 @@ def create_turn_stream( def _events() -> typing.Generator[StreamEvent[TurnStreamingEvent], None, None]: with self._raw_client.create_turn_stream( - session_id=session_id, input=input, previous_turn_id=previous_turn_id, request_options=request_options + session_id=session_id, + input=input, + assume_user=assume_user, + previous_turn_id=previous_turn_id, + request_options=request_options, ) as r: yield from r.data.with_metadata() @@ -585,6 +601,7 @@ def create_turn( *, session_id: str, input: typing.Sequence[CreateTurnSessionsRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> GetTurnResponse: @@ -603,6 +620,9 @@ def create_turn( input : typing.Sequence[CreateTurnSessionsRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -632,7 +652,11 @@ def create_turn( ) """ _response = self._raw_client.create_turn( - session_id=session_id, input=input, previous_turn_id=previous_turn_id, request_options=request_options + session_id=session_id, + input=input, + assume_user=assume_user, + previous_turn_id=previous_turn_id, + request_options=request_options, ) return _response.data @@ -1411,6 +1435,7 @@ async def list_turns( session_id: str, limit: typing.Optional[int] = 25, page_token: typing.Optional[str] = None, + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, request_options: typing.Optional[RequestOptions] = None, ) -> AsyncPager[Turn, ListTurnsResponse]: """ @@ -1427,6 +1452,9 @@ async def list_turns( page_token : typing.Optional[str] Opaque token from a previous response `next_page_token`. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -1462,7 +1490,11 @@ async def main() -> None: asyncio.run(main()) """ return await self._raw_client.list_turns( - session_id=session_id, limit=limit, page_token=page_token, request_options=request_options + session_id=session_id, + limit=limit, + page_token=page_token, + assume_user=assume_user, + request_options=request_options, ) def create_turn_stream( @@ -1470,6 +1502,7 @@ def create_turn_stream( *, session_id: str, input: typing.Sequence[CreateTurnSessionsStreamRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> AsyncStream[TurnStreamingEvent]: @@ -1488,6 +1521,9 @@ def create_turn_stream( input : typing.Sequence[CreateTurnSessionsStreamRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -1529,7 +1565,11 @@ async def main() -> None: async def _events() -> typing.AsyncGenerator[StreamEvent[TurnStreamingEvent], None]: async with self._raw_client.create_turn_stream( - session_id=session_id, input=input, previous_turn_id=previous_turn_id, request_options=request_options + session_id=session_id, + input=input, + assume_user=assume_user, + previous_turn_id=previous_turn_id, + request_options=request_options, ) as r: async for _event in r.data.with_metadata(): yield _event @@ -1541,6 +1581,7 @@ async def create_turn( *, session_id: str, input: typing.Sequence[CreateTurnSessionsRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> GetTurnResponse: @@ -1559,6 +1600,9 @@ async def create_turn( input : typing.Sequence[CreateTurnSessionsRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -1596,7 +1640,11 @@ async def main() -> None: asyncio.run(main()) """ _response = await self._raw_client.create_turn( - session_id=session_id, input=input, previous_turn_id=previous_turn_id, request_options=request_options + session_id=session_id, + input=input, + assume_user=assume_user, + previous_turn_id=previous_turn_id, + request_options=request_options, ) return _response.data diff --git a/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py index 9d47dfebf..e0024afd0 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py +++ b/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py @@ -872,6 +872,7 @@ def list_turns( session_id: str, limit: typing.Optional[int] = 25, page_token: typing.Optional[str] = None, + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, request_options: typing.Optional[RequestOptions] = None, ) -> SyncPager[Turn, ListTurnsResponse]: """ @@ -888,6 +889,9 @@ def list_turns( page_token : typing.Optional[str] Opaque token from a previous response `next_page_token`. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -903,6 +907,9 @@ def list_turns( "limit": limit, "page_token": page_token, }, + headers={ + "assume-user": str(assume_user) if assume_user is not None else None, + }, request_options=request_options, ) try: @@ -924,6 +931,7 @@ def list_turns( session_id=session_id, limit=limit, page_token=_parsed_next, + assume_user=assume_user, request_options=request_options, ) return SyncPager(has_next=_has_next, items=_items, get_next=_get_next, response=_parsed_response) @@ -975,6 +983,7 @@ def create_turn_stream( *, session_id: str, input: typing.Sequence[CreateTurnSessionsStreamRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> typing.Iterator[HttpResponse[Stream[TurnStreamingEvent]]]: @@ -993,6 +1002,9 @@ def create_turn_stream( input : typing.Sequence[CreateTurnSessionsStreamRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -1019,6 +1031,7 @@ def create_turn_stream( }, headers={ "content-type": "application/json", + "assume-user": str(assume_user) if assume_user is not None else None, }, request_options=request_options, omit=OMIT, @@ -1160,6 +1173,7 @@ def create_turn( *, session_id: str, input: typing.Sequence[CreateTurnSessionsRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> HttpResponse[GetTurnResponse]: @@ -1178,6 +1192,9 @@ def create_turn( input : typing.Sequence[CreateTurnSessionsRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -1202,6 +1219,7 @@ def create_turn( }, headers={ "content-type": "application/json", + "assume-user": str(assume_user) if assume_user is not None else None, }, request_options=request_options, omit=OMIT, @@ -2716,6 +2734,7 @@ async def list_turns( session_id: str, limit: typing.Optional[int] = 25, page_token: typing.Optional[str] = None, + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, request_options: typing.Optional[RequestOptions] = None, ) -> AsyncPager[Turn, ListTurnsResponse]: """ @@ -2732,6 +2751,9 @@ async def list_turns( page_token : typing.Optional[str] Opaque token from a previous response `next_page_token`. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -2747,6 +2769,9 @@ async def list_turns( "limit": limit, "page_token": page_token, }, + headers={ + "assume-user": str(assume_user) if assume_user is not None else None, + }, request_options=request_options, ) try: @@ -2770,6 +2795,7 @@ async def _get_next(): session_id=session_id, limit=limit, page_token=_parsed_next, + assume_user=assume_user, request_options=request_options, ) @@ -2822,6 +2848,7 @@ async def create_turn_stream( *, session_id: str, input: typing.Sequence[CreateTurnSessionsStreamRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> typing.AsyncIterator[AsyncHttpResponse[AsyncStream[TurnStreamingEvent]]]: @@ -2840,6 +2867,9 @@ async def create_turn_stream( input : typing.Sequence[CreateTurnSessionsStreamRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -2866,6 +2896,7 @@ async def create_turn_stream( }, headers={ "content-type": "application/json", + "assume-user": str(assume_user) if assume_user is not None else None, }, request_options=request_options, omit=OMIT, @@ -3007,6 +3038,7 @@ async def create_turn( *, session_id: str, input: typing.Sequence[CreateTurnSessionsRequestInputItem], + assume_user: typing.Optional[typing.Literal["session-creator"]] = None, previous_turn_id: typing.Optional[PreviousTurnIdInput] = OMIT, request_options: typing.Optional[RequestOptions] = None, ) -> AsyncHttpResponse[GetTurnResponse]: @@ -3025,6 +3057,9 @@ async def create_turn( input : typing.Sequence[CreateTurnSessionsRequestInputItem] User messages for this turn. At least one is required. + assume_user : typing.Optional[typing.Literal["session-creator"]] + With the service API key, set to session-creator to act as the session creator. + previous_turn_id : typing.Optional[PreviousTurnIdInput] request_options : typing.Optional[RequestOptions] @@ -3049,6 +3084,7 @@ async def create_turn( }, headers={ "content-type": "application/json", + "assume-user": str(assume_user) if assume_user is not None else None, }, request_options=request_options, omit=OMIT, diff --git a/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py b/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py index ea0478976..2ce7a5922 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py +++ b/python/trueforge_sdk/src/trueforge_sdk/types/__init__.py @@ -63,7 +63,6 @@ from .create_schedule_run_response import CreateScheduleRunResponse from .create_session_agent import CreateSessionAgent from .create_turn_event_response import CreateTurnEventResponse - from .subject import Subject from .cron_expression import CronExpression from .custom_model_provider import CustomModelProvider from .daytona_sandbox_provider_auth import DaytonaSandboxProviderAuth @@ -245,6 +244,7 @@ from .skill_capability import SkillCapability from .skill_manifest import SkillManifest from .skill_version import SkillVersion + from .subject import Subject from .text_content import TextContent from .thread_context_compaction_finished_event import ThreadContextCompactionFinishedEvent from .thread_context_compaction_started_event import ThreadContextCompactionStartedEvent @@ -362,7 +362,6 @@ "CreateScheduleRunResponse": ".create_schedule_run_response", "CreateSessionAgent": ".create_session_agent", "CreateTurnEventResponse": ".create_turn_event_response", - "Subject": ".subject", "CronExpression": ".cron_expression", "CustomModelProvider": ".custom_model_provider", "DaytonaSandboxProviderAuth": ".daytona_sandbox_provider_auth", @@ -544,6 +543,7 @@ "SkillCapability": ".skill_capability", "SkillManifest": ".skill_manifest", "SkillVersion": ".skill_version", + "Subject": ".subject", "TextContent": ".text_content", "ThreadContextCompactionFinishedEvent": ".thread_context_compaction_finished_event", "ThreadContextCompactionStartedEvent": ".thread_context_compaction_started_event", @@ -685,7 +685,6 @@ def __dir__(): "CreateScheduleRunResponse", "CreateSessionAgent", "CreateTurnEventResponse", - "Subject", "CronExpression", "CustomModelProvider", "DaytonaSandboxProviderAuth", @@ -867,6 +866,7 @@ def __dir__(): "SkillCapability", "SkillManifest", "SkillVersion", + "Subject", "TextContent", "ThreadContextCompactionFinishedEvent", "ThreadContextCompactionStartedEvent", From 42f047d860bb2a9fe725b08626139cbe071b6d65 Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 15:00:01 +0530 Subject: [PATCH 04/13] feat(api): refactor session routes to use publicSessionsRouter for JWT and service key authentication --- packages/trueforge/src/apis/turns.ts | 59 +++++++------ packages/trueforge/src/app.ts | 103 +++++++++++----------- packages/trueforge/src/auth/middleware.ts | 5 +- 3 files changed, 90 insertions(+), 77 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index 22c282e07..850dda293 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -2008,32 +2008,41 @@ export function createTurnsRouter(deps: TurnsRouterDeps = { @@ -2047,7 +2056,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps(deps: ServerDeps) { authMiddleware, ), ); - app.route( - '/api/v1/sessions', - withAuth( - createSessionsRouter({ - accessControlStore: deps.accessControlStore, - activeTurns: deps.activeTurns, - authorizer: deps.authorizer, - logger: deps.logger, - redis: deps.redis, - requestReplyRouter: deps.requestReplyRouter, - resolveAgentStore: resolveHttpAgentStore, - resolveMcpServerStore: deps.resolveMcpServerStore, - resolveModelProviderStore: deps.resolveModelProviderStore, - resolveRequestContext, - resolveSkillStore: deps.resolveSkillStore, - sandboxEnvironmentStore: deps.sandboxEnvironmentStore, - sandboxProviderStore: deps.sandboxProviderStore, - sessions: deps.sessions, - sessionStore: deps.sessionStore, - userStore: deps.userStore, - webSearchProviderStore: deps.webSearchProviderStore, - memoryProviderStore: deps.memoryProviderStore, - configurationStore: deps.configurationStore, - withTransaction: deps.withTransaction, - }), - authMiddleware, - ), + // One mount so JWT-only sessions auth cannot 401 a service-key list/create-turn before dual auth runs. + const publicSessionsRouter = new OpenAPIHono(); + publicSessionsRouter.use( + '*', + createAuthOrServiceKeyMiddleware({ + authenticator: deps.authenticator, + apiKey: configuration.TRUEFORGE_API_KEY, + }), ); - app.route( - '/api/v1/sessions', - withAuth( - createTurnsRouter({ - accessControlStore: deps.accessControlStore, - activeTurns: deps.activeTurns, - authorizer: deps.authorizer, - eventSubscriptions: deps.eventSubscriptions, - logger: deps.logger, - redis: deps.redis, - requestReplyRouter: deps.requestReplyRouter, - resolveAgentStore: deps.resolveAgentStore, - resolveRequestContext, - resolveTurnExecutionStores: deps.resolveTurnExecutionStores, - sandboxEnvironmentStore: deps.sandboxEnvironmentStore, - sandboxProviderStore: deps.sandboxProviderStore, - sessions: deps.sessions, - sessionStore: deps.sessionStore, - }), - createAuthOrServiceKeyMiddleware({ - authenticator: deps.authenticator, - apiKey: configuration.TRUEFORGE_API_KEY, - }), - ), + publicSessionsRouter.route( + '/', + createSessionsRouter({ + accessControlStore: deps.accessControlStore, + activeTurns: deps.activeTurns, + authorizer: deps.authorizer, + logger: deps.logger, + redis: deps.redis, + requestReplyRouter: deps.requestReplyRouter, + resolveAgentStore: resolveHttpAgentStore, + resolveMcpServerStore: deps.resolveMcpServerStore, + resolveModelProviderStore: deps.resolveModelProviderStore, + resolveRequestContext, + resolveSkillStore: deps.resolveSkillStore, + sandboxEnvironmentStore: deps.sandboxEnvironmentStore, + sandboxProviderStore: deps.sandboxProviderStore, + sessions: deps.sessions, + sessionStore: deps.sessionStore, + userStore: deps.userStore, + webSearchProviderStore: deps.webSearchProviderStore, + memoryProviderStore: deps.memoryProviderStore, + configurationStore: deps.configurationStore, + withTransaction: deps.withTransaction, + }), + ); + publicSessionsRouter.route( + '/', + createTurnsRouter({ + accessControlStore: deps.accessControlStore, + activeTurns: deps.activeTurns, + authorizer: deps.authorizer, + eventSubscriptions: deps.eventSubscriptions, + logger: deps.logger, + redis: deps.redis, + requestReplyRouter: deps.requestReplyRouter, + resolveAgentStore: deps.resolveAgentStore, + resolveRequestContext, + resolveTurnExecutionStores: deps.resolveTurnExecutionStores, + sandboxEnvironmentStore: deps.sandboxEnvironmentStore, + sandboxProviderStore: deps.sandboxProviderStore, + sessions: deps.sessions, + sessionStore: deps.sessionStore, + }), ); + app.route('/api/v1/sessions', publicSessionsRouter); // First-party TrueForge MCP (Streamable HTTP). Protocol endpoint. app.use('/mcp', authMiddleware); diff --git a/packages/trueforge/src/auth/middleware.ts b/packages/trueforge/src/auth/middleware.ts index 591317088..2f1514b0b 100644 --- a/packages/trueforge/src/auth/middleware.ts +++ b/packages/trueforge/src/auth/middleware.ts @@ -83,6 +83,10 @@ export function createApiKeyAuthMiddleware(apiKey: string): MiddlewareHandler { }; } +/** + * JWT for session + turn routes; service API key leaves request_context unset so + * list/create-turn can assume the session creator. Other handlers still require a JWT context. + */ export function createAuthOrServiceKeyMiddleware(params: { authenticator: Authenticator; apiKey: string; @@ -91,7 +95,6 @@ export function createAuthOrServiceKeyMiddleware(params: { return async (c, next) => { const token = readBearerToken(c); if (token && matchesServiceKey({ provided: token, expected: apiKey })) { - // Clear any prior JWT context (e.g. sibling `/api/v1/sessions` mount with standalone auth). c.set('request_context', undefined); c.set('subject', undefined); return next(); From 5ce68b5a4d548621ee4f03ed77fc8ee8a64afff0 Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 15:08:08 +0530 Subject: [PATCH 05/13] feat(turns): enhance resolveTurnSession to support resolveRequestContext for improved session handling --- packages/trueforge/src/apis/turns.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index 850dda293..134dce7be 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -1150,10 +1150,12 @@ async function resolveTurnSession(params: { c: Context; sessions: Sessions; session_id: string; + resolveRequestContext: ResolveRequestContext; }): Promise<{ requestContext: RequestContext; session: SessionHandle }> { - const { c, sessions, session_id: sessionId } = params; + const { c, sessions, session_id: sessionId, resolveRequestContext } = params; const existing = c.get('request_context'); - if (!existing) { + // Service key leaves request_context unset and sends assume-user; JWT/tests use resolveRequestContext. + if (!existing && c.req.header(ASSUME_USER_HEADER)?.trim()) { parseAssumeUserHeader(c.req.header(ASSUME_USER_HEADER)); const session = await sessions.getById({ session_id: sessionId }); if (!session) { @@ -1169,14 +1171,15 @@ async function resolveTurnSession(params: { return { requestContext, session }; } + const requestContext = existing ?? resolveRequestContext(c); const session = await sessions.get({ - tenant_id: existing.tenant_id, + tenant_id: requestContext.tenant_id, session_id: sessionId, }); if (!session) { throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); } - return { requestContext: existing, session }; + return { requestContext, session }; } /** Request-reply path the owner serves for inbound turn events. */ @@ -1829,6 +1832,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps(deps: TurnsRouterDeps = async c => { const { session_id: sessionId } = c.req.valid('param'); const body = c.req.valid('json'); - const serviceAuth = !c.get('request_context'); + const serviceAuth = Boolean(c.req.header(ASSUME_USER_HEADER)?.trim()); const { requestContext, session } = await resolveTurnSession({ c, sessions: deps.sessions, session_id: sessionId, + resolveRequestContext: deps.resolveRequestContext, }); let referencedAgent: AgentRecord | undefined; From 933c6314e2ece31c6af4465a087ce829ea1ae985 Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 15:47:53 +0530 Subject: [PATCH 06/13] Require unset request_context plus assume-user for service create-turn. Stops a JWT caller from skipping owner and authorizer checks by sending assume-user alone. Co-authored-by: Cursor --- packages/trueforge/src/apis/turns.ts | 4 ++-- packages/trueforge/src/auth/middleware.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index 134dce7be..d91e9b110 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -1154,7 +1154,7 @@ async function resolveTurnSession(params: { }): Promise<{ requestContext: RequestContext; session: SessionHandle }> { const { c, sessions, session_id: sessionId, resolveRequestContext } = params; const existing = c.get('request_context'); - // Service key leaves request_context unset and sends assume-user; JWT/tests use resolveRequestContext. + // Service key clears context; require assume-user so a JWT+header cannot take this path. if (!existing && c.req.header(ASSUME_USER_HEADER)?.trim()) { parseAssumeUserHeader(c.req.header(ASSUME_USER_HEADER)); const session = await sessions.getById({ session_id: sessionId }); @@ -2005,7 +2005,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps = async c => { const { session_id: sessionId } = c.req.valid('param'); const body = c.req.valid('json'); - const serviceAuth = Boolean(c.req.header(ASSUME_USER_HEADER)?.trim()); + const serviceAuth = !c.get('request_context') && Boolean(c.req.header(ASSUME_USER_HEADER)?.trim()); const { requestContext, session } = await resolveTurnSession({ c, sessions: deps.sessions, diff --git a/packages/trueforge/src/auth/middleware.ts b/packages/trueforge/src/auth/middleware.ts index 2f1514b0b..c346a75bd 100644 --- a/packages/trueforge/src/auth/middleware.ts +++ b/packages/trueforge/src/auth/middleware.ts @@ -85,7 +85,7 @@ export function createApiKeyAuthMiddleware(apiKey: string): MiddlewareHandler { /** * JWT for session + turn routes; service API key leaves request_context unset so - * list/create-turn can assume the session creator. Other handlers still require a JWT context. + * list/create-turn can assume the session creator. */ export function createAuthOrServiceKeyMiddleware(params: { authenticator: Authenticator; From b75afc3919c7d4468e03acbff50807ba3896cd9e Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 18:25:28 +0530 Subject: [PATCH 07/13] refactor(auth): enhance assume-user handling and improve context resolution --- packages/trueforge/src/apis/turns.ts | 26 +++++---- packages/trueforge/src/app.ts | 3 +- packages/trueforge/src/auth/assumeUser.ts | 60 +++++++++++++++++++-- packages/trueforge/src/auth/identity.ts | 3 ++ packages/trueforge/src/routes/turnRoutes.ts | 11 +--- 5 files changed, 79 insertions(+), 24 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index d91e9b110..d229af911 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -67,7 +67,7 @@ import { HTTPException } from 'hono/http-exception'; import { streamSSE } from 'hono/streaming'; import type { Logger } from 'winston'; import { z } from 'zod'; -import { ASSUME_USER_HEADER, parseAssumeUserHeader } from '../auth/assumeUser'; +import { applyAssumeUserToContext, ASSUME_USER_HEADER } from '../auth/assumeUser'; import type { Authorizer } from '../auth/authorizer'; import { requestContextFromCreatedBySubject, @@ -1156,18 +1156,24 @@ async function resolveTurnSession(params: { const existing = c.get('request_context'); // Service key clears context; require assume-user so a JWT+header cannot take this path. if (!existing && c.req.header(ASSUME_USER_HEADER)?.trim()) { - parseAssumeUserHeader(c.req.header(ASSUME_USER_HEADER)); - const session = await sessions.getById({ session_id: sessionId }); + let session: SessionHandle | undefined; + const requestContext = await applyAssumeUserToContext({ + c, + resolveCreatedBy: async () => { + session = await sessions.getById({ session_id: sessionId }); + if (!session) { + throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); + } + return { + tenant_id: session.record.tenant_id, + created_by_subject: session.record.created_by_subject, + session_id: sessionId, + }; + }, + }); if (!session) { throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); } - const requestContext = requestContextFromCreatedBySubject({ - tenant_id: session.record.tenant_id, - created_by_subject: session.record.created_by_subject, - user_credential: null, - }); - c.set('request_context', requestContext); - updateLogContext({ tenant_id: session.record.tenant_id, session_id: sessionId }); return { requestContext, session }; } diff --git a/packages/trueforge/src/app.ts b/packages/trueforge/src/app.ts index e832c3f36..1e4833067 100644 --- a/packages/trueforge/src/app.ts +++ b/packages/trueforge/src/app.ts @@ -647,7 +647,8 @@ export function createServerApp(deps: ServerDeps) { authMiddleware, ), ); - // One mount so JWT-only sessions auth cannot 401 a service-key list/create-turn before dual auth runs. + // Sibling JWT-only sessions + dual-auth turns mounts share this prefix; JWT would 401 the + // service key before turns auth runs. One mount + dual auth avoids that ordering bug. const publicSessionsRouter = new OpenAPIHono(); publicSessionsRouter.use( '*', diff --git a/packages/trueforge/src/auth/assumeUser.ts b/packages/trueforge/src/auth/assumeUser.ts index 5a4ccb66b..0077f560c 100644 --- a/packages/trueforge/src/auth/assumeUser.ts +++ b/packages/trueforge/src/auth/assumeUser.ts @@ -1,15 +1,37 @@ +import type { Subject } from '@truefoundry/trueforge-core/agent-session'; +import type { Context } from 'hono'; import { HTTPException } from 'hono/http-exception'; +import { updateLogContext } from '../logger'; +import { requestContextFromCreatedBySubject, type RequestContext } from './identity'; + export const ASSUME_USER_HEADER = 'assume-user'; -export enum AssumeUser { - SessionCreator = 'session-creator', -} +/** Header values are assume roles (not raw user ids). More roles can be added later. */ +export const AssumeUser = { + SessionCreator: 'session-creator', +} as const; + +export type AssumeUser = (typeof AssumeUser)[keyof typeof AssumeUser]; const ASSUME_USER_BY_VALUE: Record = { [AssumeUser.SessionCreator]: AssumeUser.SessionCreator, }; +/** + * OpenAPI `parameters` entry (docs only). Prefer this over Zod `request.headers`: + * a headers schema validates the header bag and must allow Authorization and other + * client headers; Nest-style `@ApiHeader` / OpenAPI parameters document without that. + */ +export const ASSUME_USER_HEADER_PARAM = { + name: ASSUME_USER_HEADER, + in: 'header' as const, + required: false, + description: + 'Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.', + schema: { type: 'string' as const, enum: [AssumeUser.SessionCreator] }, +}; + export function parseAssumeUserHeader(header: string | undefined): AssumeUser { const raw = header?.trim(); if (!raw) { @@ -23,3 +45,35 @@ export function parseAssumeUserHeader(header: string | undefined): AssumeUser { } return assumed; } + +/** Load tenant + created_by for the assume role (session_id here, schedule_id later). */ +export type ResolveAssumedCreatedBy = () => Promise<{ + tenant_id: string; + created_by_subject: Subject; + session_id?: string; +}>; + +/** + * Parse assume-user, resolve the assumed subject, and set `request_context` + `assume_user` + * for handlers / token vending. + */ +export async function applyAssumeUserToContext(params: { + c: Context; + resolveCreatedBy: ResolveAssumedCreatedBy; +}): Promise { + const { c, resolveCreatedBy } = params; + const assumed = parseAssumeUserHeader(c.req.header(ASSUME_USER_HEADER)); + const createdBy = await resolveCreatedBy(); + const requestContext = requestContextFromCreatedBySubject({ + tenant_id: createdBy.tenant_id, + created_by_subject: createdBy.created_by_subject, + user_credential: null, + }); + c.set('request_context', requestContext); + c.set('assume_user', assumed); + updateLogContext({ + tenant_id: createdBy.tenant_id, + ...(createdBy.session_id ? { session_id: createdBy.session_id } : {}), + }); + return requestContext; +} diff --git a/packages/trueforge/src/auth/identity.ts b/packages/trueforge/src/auth/identity.ts index d474761f8..95055ebbe 100644 --- a/packages/trueforge/src/auth/identity.ts +++ b/packages/trueforge/src/auth/identity.ts @@ -9,6 +9,7 @@ import configuration, { } from '../config'; import { RESERVED_SANDBOX_ENVIRONMENT_NAME } from '../schemas/sandboxEnvironment'; import { createTrueFoundryRequestContext } from '../truefoundry/accessToken'; +import type { AssumeUser } from './assumeUser'; /** Standalone / default TrueForge admin role string. */ export const STANDALONE_ADMIN_ROLE = 'admin'; @@ -46,6 +47,8 @@ declare module 'hono' { interface ContextVariableMap { subject?: RequestSubject; request_context?: RequestContext; + /** Set when service auth assumed a role via `assume-user`. */ + assume_user?: AssumeUser; } } diff --git a/packages/trueforge/src/routes/turnRoutes.ts b/packages/trueforge/src/routes/turnRoutes.ts index edccd1614..4368dbb24 100644 --- a/packages/trueforge/src/routes/turnRoutes.ts +++ b/packages/trueforge/src/routes/turnRoutes.ts @@ -5,7 +5,7 @@ * Handlers are registered in apis/turns.ts. */ import { createRoute, z } from '@hono/zod-openapi'; -import { ASSUME_USER_HEADER, AssumeUser } from '../auth/assumeUser'; +import { ASSUME_USER_HEADER_PARAM } from '../auth/assumeUser'; import { RequestErrorResponseSchema } from '../schemas/errors'; import { CreateTurnEventRequestSchema, @@ -31,15 +31,6 @@ export const TurnIdParamsSchema = SessionIdParamsSchema.extend({ turn_id: z.string().min(1).describe('Turn identifier.'), }); -/** OpenAPI-only (like Nest `@ApiHeader`); not a Zod request validator. */ -const ASSUME_USER_HEADER_PARAM = { - name: ASSUME_USER_HEADER, - in: 'header' as const, - required: false, - description: 'With the service API key, set to session-creator to act as the session creator.', - schema: { type: 'string' as const, enum: [AssumeUser.SessionCreator] }, -}; - export const listTurnsRoute = createRoute({ method: 'get', path: '/{session_id}/turns', From 05fc0a6f91173c7898afa0c6689406b7eb057055 Mon Sep 17 00:00:00 2001 From: "trueforge-dev-bot[bot]" Date: Thu, 12 Nov 2026 12:58:46 +0000 Subject: [PATCH 08/13] Regenerate OpenAPI document and SDKs --- .github/fern/openapi/openapi.json | 4 ++-- docs/openapi.json | 4 ++-- .../client/requests/CreateTurnSessionsRequest.ts | 2 +- .../requests/CreateTurnSessionsStreamRequest.ts | 2 +- .../client/requests/ListTurnsSessionsRequest.ts | 2 +- python/trueforge_sdk/reference.md | 6 +++--- .../src/trueforge_sdk/sessions/client.py | 12 ++++++------ .../src/trueforge_sdk/sessions/raw_client.py | 12 ++++++------ 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.json index 18af639ba..61aaf765f 100644 --- a/.github/fern/openapi/openapi.json +++ b/.github/fern/openapi/openapi.json @@ -10725,7 +10725,7 @@ "description": "List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.", "parameters": [ { - "description": "With the service API key, set to session-creator to act as the session creator.", + "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", "in": "header", "name": "assume-user", "required": false, @@ -10832,7 +10832,7 @@ "description": "Create a turn within a session and execute it.\nOnly the session creator may create turns.\nWhen `stream` is true (default), respond with a Server-Sent Events stream of turn events.\nWhen `stream` is false, return the turn immediately with `state.status: \"running\"` while execution continues in the background; use get turn or subscribe to observe completion.\nUse `previous_turn_id` to chain to the session's last turn (defaults to `auto`); use `none` for a new root.", "parameters": [ { - "description": "With the service API key, set to session-creator to act as the session creator.", + "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", "in": "header", "name": "assume-user", "required": false, diff --git a/docs/openapi.json b/docs/openapi.json index 18af639ba..61aaf765f 100644 --- a/docs/openapi.json +++ b/docs/openapi.json @@ -10725,7 +10725,7 @@ "description": "List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.", "parameters": [ { - "description": "With the service API key, set to session-creator to act as the session creator.", + "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", "in": "header", "name": "assume-user", "required": false, @@ -10832,7 +10832,7 @@ "description": "Create a turn within a session and execute it.\nOnly the session creator may create turns.\nWhen `stream` is true (default), respond with a Server-Sent Events stream of turn events.\nWhen `stream` is false, return the turn immediately with `state.status: \"running\"` while execution continues in the background; use get turn or subscribe to observe completion.\nUse `previous_turn_id` to chain to the session's last turn (defaults to `auto`); use `none` for a new root.", "parameters": [ { - "description": "With the service API key, set to session-creator to act as the session creator.", + "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", "in": "header", "name": "assume-user", "required": false, diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts index 0c05c2518..03056529a 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts @@ -12,7 +12,7 @@ import type * as TrueForge from "../../../../index.js"; * } */ export interface CreateTurnSessionsRequest { - /** With the service API key, set to session-creator to act as the session creator. */ + /** Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. */ assumeUser?: "session-creator"; /** User messages for this turn. At least one is required. */ input: TrueForge.CreateTurnSessionsRequestInputItem[]; diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts index 88cd564a3..82e9309f9 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts @@ -12,7 +12,7 @@ import type * as TrueForge from "../../../../index.js"; * } */ export interface CreateTurnSessionsStreamRequest { - /** With the service API key, set to session-creator to act as the session creator. */ + /** Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. */ assumeUser?: "session-creator"; /** User messages for this turn. At least one is required. */ input: TrueForge.CreateTurnSessionsStreamRequestInputItem[]; diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts index e9df53e17..11db907c2 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts @@ -9,6 +9,6 @@ export interface ListTurnsSessionsRequest { limit?: number; /** Opaque token from a previous response `next_page_token`. */ pageToken?: string; - /** With the service API key, set to session-creator to act as the session creator. */ + /** Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. */ assumeUser?: "session-creator"; } diff --git a/python/trueforge_sdk/reference.md b/python/trueforge_sdk/reference.md index b387bc477..69ccc4098 100644 --- a/python/trueforge_sdk/reference.md +++ b/python/trueforge_sdk/reference.md @@ -2948,7 +2948,7 @@ client.sessions.list_turns(
-**assume_user:** `typing.Optional[typing.Literal]` — With the service API key, set to session-creator to act as the session creator. +**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.
@@ -3055,7 +3055,7 @@ client.sessions.create_turn_stream(
-**assume_user:** `typing.Optional[typing.Literal]` — With the service API key, set to session-creator to act as the session creator. +**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.
@@ -3170,7 +3170,7 @@ client.sessions.create_turn_stream(
-**assume_user:** `typing.Optional[typing.Literal]` — With the service API key, set to session-creator to act as the session creator. +**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.
diff --git a/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py b/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py index daff51cba..453ceba66 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py +++ b/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py @@ -491,7 +491,7 @@ def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -551,7 +551,7 @@ def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -621,7 +621,7 @@ def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -1453,7 +1453,7 @@ async def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -1522,7 +1522,7 @@ def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -1601,7 +1601,7 @@ async def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] diff --git a/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py index e0024afd0..8db4b4dee 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py +++ b/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py @@ -890,7 +890,7 @@ def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -1003,7 +1003,7 @@ def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -1193,7 +1193,7 @@ def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -2752,7 +2752,7 @@ async def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -2868,7 +2868,7 @@ async def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -3058,7 +3058,7 @@ async def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - With the service API key, set to session-creator to act as the session creator. + Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. previous_turn_id : typing.Optional[PreviousTurnIdInput] From aec3abfbdbf6c9510adf1d5ea33644cc1786b0dd Mon Sep 17 00:00:00 2001 From: thesujai Date: Thu, 12 Nov 2026 18:59:15 +0530 Subject: [PATCH 09/13] refactor(routes): restructure session handling to utilize turnsRouter for improved authentication flow --- packages/trueforge/src/app.ts | 68 ++++++++++++----------- packages/trueforge/src/auth/middleware.ts | 5 +- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/packages/trueforge/src/app.ts b/packages/trueforge/src/app.ts index 1e4833067..c61daf984 100644 --- a/packages/trueforge/src/app.ts +++ b/packages/trueforge/src/app.ts @@ -647,42 +647,18 @@ export function createServerApp(deps: ServerDeps) { authMiddleware, ), ); - // Sibling JWT-only sessions + dual-auth turns mounts share this prefix; JWT would 401 the - // service key before turns auth runs. One mount + dual auth avoids that ordering bug. - const publicSessionsRouter = new OpenAPIHono(); - publicSessionsRouter.use( - '*', + // Turns before sessions: a JWT-only sessions shell mounted first would 401 the service key + // on list/create turns before dual-auth runs. + const turnsRouter = new OpenAPIHono(); + turnsRouter.use( + '/:session_id/turns', createAuthOrServiceKeyMiddleware({ authenticator: deps.authenticator, apiKey: configuration.TRUEFORGE_API_KEY, }), ); - publicSessionsRouter.route( - '/', - createSessionsRouter({ - accessControlStore: deps.accessControlStore, - activeTurns: deps.activeTurns, - authorizer: deps.authorizer, - logger: deps.logger, - redis: deps.redis, - requestReplyRouter: deps.requestReplyRouter, - resolveAgentStore: resolveHttpAgentStore, - resolveMcpServerStore: deps.resolveMcpServerStore, - resolveModelProviderStore: deps.resolveModelProviderStore, - resolveRequestContext, - resolveSkillStore: deps.resolveSkillStore, - sandboxEnvironmentStore: deps.sandboxEnvironmentStore, - sandboxProviderStore: deps.sandboxProviderStore, - sessions: deps.sessions, - sessionStore: deps.sessionStore, - userStore: deps.userStore, - webSearchProviderStore: deps.webSearchProviderStore, - memoryProviderStore: deps.memoryProviderStore, - configurationStore: deps.configurationStore, - withTransaction: deps.withTransaction, - }), - ); - publicSessionsRouter.route( + turnsRouter.use('/:session_id/turns/:turn_id/*', authMiddleware); + turnsRouter.route( '/', createTurnsRouter({ accessControlStore: deps.accessControlStore, @@ -701,7 +677,35 @@ export function createServerApp(deps: ServerDeps) { sessionStore: deps.sessionStore, }), ); - app.route('/api/v1/sessions', publicSessionsRouter); + app.route('/api/v1/sessions', turnsRouter); + app.route( + '/api/v1/sessions', + withAuth( + createSessionsRouter({ + accessControlStore: deps.accessControlStore, + activeTurns: deps.activeTurns, + authorizer: deps.authorizer, + logger: deps.logger, + redis: deps.redis, + requestReplyRouter: deps.requestReplyRouter, + resolveAgentStore: resolveHttpAgentStore, + resolveMcpServerStore: deps.resolveMcpServerStore, + resolveModelProviderStore: deps.resolveModelProviderStore, + resolveRequestContext, + resolveSkillStore: deps.resolveSkillStore, + sandboxEnvironmentStore: deps.sandboxEnvironmentStore, + sandboxProviderStore: deps.sandboxProviderStore, + sessions: deps.sessions, + sessionStore: deps.sessionStore, + userStore: deps.userStore, + webSearchProviderStore: deps.webSearchProviderStore, + memoryProviderStore: deps.memoryProviderStore, + configurationStore: deps.configurationStore, + withTransaction: deps.withTransaction, + }), + authMiddleware, + ), + ); // First-party TrueForge MCP (Streamable HTTP). Protocol endpoint. app.use('/mcp', authMiddleware); diff --git a/packages/trueforge/src/auth/middleware.ts b/packages/trueforge/src/auth/middleware.ts index c346a75bd..cca1dfc00 100644 --- a/packages/trueforge/src/auth/middleware.ts +++ b/packages/trueforge/src/auth/middleware.ts @@ -84,8 +84,9 @@ export function createApiKeyAuthMiddleware(apiKey: string): MiddlewareHandler { } /** - * JWT for session + turn routes; service API key leaves request_context unset so - * list/create-turn can assume the session creator. + * JWT or service API key. Service key leaves request_context unset so list/create-turn + * can assume the session creator. Mount only on those routes; other /sessions routes + * stay on {@link createAuthMiddleware}. */ export function createAuthOrServiceKeyMiddleware(params: { authenticator: Authenticator; From dad08d2d5de9ec8c013ccf36f353c21aa7bed1c4 Mon Sep 17 00:00:00 2001 From: thesujai Date: Fri, 13 Nov 2026 10:32:13 +0530 Subject: [PATCH 10/13] refactor(turns): rename resolveTurnSession to resolveTurnRequestContext and streamline session handling logic --- packages/trueforge/src/apis/turns.ts | 51 +++++++++++++---------- packages/trueforge/src/auth/assumeUser.ts | 26 ++++-------- packages/trueforge/src/auth/identity.ts | 2 +- packages/trueforge/src/auth/middleware.ts | 5 +-- 4 files changed, 40 insertions(+), 44 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index d229af911..d2ba21b3a 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -1146,21 +1146,27 @@ function isSessionOwner({ return created_by_subject.subject_id === subject_id; } -async function resolveTurnSession(params: { +/** + * JWT context from auth middleware, or service-key + `assume-user` as the session creator. + * Callers load the session themselves after this returns. + */ +async function resolveTurnRequestContext(params: { c: Context; sessions: Sessions; session_id: string; resolveRequestContext: ResolveRequestContext; -}): Promise<{ requestContext: RequestContext; session: SessionHandle }> { +}): Promise { const { c, sessions, session_id: sessionId, resolveRequestContext } = params; const existing = c.get('request_context'); + if (existing) { + return existing; + } // Service key clears context; require assume-user so a JWT+header cannot take this path. - if (!existing && c.req.header(ASSUME_USER_HEADER)?.trim()) { - let session: SessionHandle | undefined; - const requestContext = await applyAssumeUserToContext({ + if (c.req.header(ASSUME_USER_HEADER)?.trim()) { + return applyAssumeUserToContext({ c, resolveCreatedBy: async () => { - session = await sessions.getById({ session_id: sessionId }); + const session = await sessions.getById({ session_id: sessionId }); if (!session) { throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); } @@ -1171,21 +1177,8 @@ async function resolveTurnSession(params: { }; }, }); - if (!session) { - throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); - } - return { requestContext, session }; } - - const requestContext = existing ?? resolveRequestContext(c); - const session = await sessions.get({ - tenant_id: requestContext.tenant_id, - session_id: sessionId, - }); - if (!session) { - throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); - } - return { requestContext, session }; + return resolveRequestContext(c); } /** Request-reply path the owner serves for inbound turn events. */ @@ -1834,12 +1827,19 @@ export function createTurnsRouter(deps: TurnsRouterDeps = async c => { const { session_id: sessionId } = c.req.valid('param'); const query = c.req.valid('query'); - const { requestContext, session } = await resolveTurnSession({ + const requestContext = await resolveTurnRequestContext({ c, sessions: deps.sessions, session_id: sessionId, resolveRequestContext: deps.resolveRequestContext, }); + const session = await deps.sessions.get({ + tenant_id: requestContext.tenant_id, + session_id: sessionId, + }); + if (!session) { + return c.json({ error: { message: `Session not found: ${sessionId}` } }, 404); + } const allowed = await canReadSession({ session_id: session.record.session_id, accessControlStore: deps.accessControlStore, @@ -2012,12 +2012,19 @@ export function createTurnsRouter(deps: TurnsRouterDeps = { - [AssumeUser.SessionCreator]: AssumeUser.SessionCreator, -}; +/** Supported `assume-user` header values (not raw user ids). */ +export type AssumeUser = 'session-creator'; /** * OpenAPI `parameters` entry (docs only). Prefer this over Zod `request.headers`: @@ -27,9 +19,8 @@ export const ASSUME_USER_HEADER_PARAM = { name: ASSUME_USER_HEADER, in: 'header' as const, required: false, - description: - 'Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.', - schema: { type: 'string' as const, enum: [AssumeUser.SessionCreator] }, + description: 'Service API key only: which user identity to assume. Currently only session-creator.', + schema: { type: 'string' as const, enum: ['session-creator'] satisfies AssumeUser[] }, }; export function parseAssumeUserHeader(header: string | undefined): AssumeUser { @@ -37,16 +28,15 @@ export function parseAssumeUserHeader(header: string | undefined): AssumeUser { if (!raw) { throw new HTTPException(400, { message: `Missing ${ASSUME_USER_HEADER} header` }); } - const assumed = ASSUME_USER_BY_VALUE[raw]; - if (!assumed) { + if (raw !== 'session-creator') { throw new HTTPException(400, { - message: `Invalid ${ASSUME_USER_HEADER}: only "${AssumeUser.SessionCreator}" is supported`, + message: `Invalid ${ASSUME_USER_HEADER}: only "session-creator" is supported`, }); } - return assumed; + return raw; } -/** Load tenant + created_by for the assume role (session_id here, schedule_id later). */ +/** Load tenant + created_by for the assumed identity. */ export type ResolveAssumedCreatedBy = () => Promise<{ tenant_id: string; created_by_subject: Subject; diff --git a/packages/trueforge/src/auth/identity.ts b/packages/trueforge/src/auth/identity.ts index 95055ebbe..45caddd0f 100644 --- a/packages/trueforge/src/auth/identity.ts +++ b/packages/trueforge/src/auth/identity.ts @@ -47,7 +47,7 @@ declare module 'hono' { interface ContextVariableMap { subject?: RequestSubject; request_context?: RequestContext; - /** Set when service auth assumed a role via `assume-user`. */ + /** Set when service auth applied `assume-user`. */ assume_user?: AssumeUser; } } diff --git a/packages/trueforge/src/auth/middleware.ts b/packages/trueforge/src/auth/middleware.ts index cca1dfc00..955c383a9 100644 --- a/packages/trueforge/src/auth/middleware.ts +++ b/packages/trueforge/src/auth/middleware.ts @@ -84,9 +84,8 @@ export function createApiKeyAuthMiddleware(apiKey: string): MiddlewareHandler { } /** - * JWT or service API key. Service key leaves request_context unset so list/create-turn - * can assume the session creator. Mount only on those routes; other /sessions routes - * stay on {@link createAuthMiddleware}. + * JWT or service API key. Service key leaves `request_context` unset so the handler can + * apply `assume-user`. Prefer {@link createAuthMiddleware} when service keys are not allowed. */ export function createAuthOrServiceKeyMiddleware(params: { authenticator: Authenticator; From 24538a74d7428cc1297061a146327273b212bbeb Mon Sep 17 00:00:00 2001 From: "trueforge-dev-bot[bot]" Date: Fri, 13 Nov 2026 05:05:15 +0000 Subject: [PATCH 11/13] Regenerate OpenAPI document and SDKs --- .github/fern/openapi/openapi.json | 4 ++-- docs/openapi.json | 4 ++-- .../client/requests/CreateTurnSessionsRequest.ts | 2 +- .../requests/CreateTurnSessionsStreamRequest.ts | 2 +- .../client/requests/ListTurnsSessionsRequest.ts | 2 +- python/trueforge_sdk/reference.md | 6 +++--- .../src/trueforge_sdk/sessions/client.py | 12 ++++++------ .../src/trueforge_sdk/sessions/raw_client.py | 12 ++++++------ 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/fern/openapi/openapi.json b/.github/fern/openapi/openapi.json index 61aaf765f..6399bf97d 100644 --- a/.github/fern/openapi/openapi.json +++ b/.github/fern/openapi/openapi.json @@ -10725,7 +10725,7 @@ "description": "List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.", "parameters": [ { - "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", + "description": "Service API key only: which user identity to assume. Currently only session-creator.", "in": "header", "name": "assume-user", "required": false, @@ -10832,7 +10832,7 @@ "description": "Create a turn within a session and execute it.\nOnly the session creator may create turns.\nWhen `stream` is true (default), respond with a Server-Sent Events stream of turn events.\nWhen `stream` is false, return the turn immediately with `state.status: \"running\"` while execution continues in the background; use get turn or subscribe to observe completion.\nUse `previous_turn_id` to chain to the session's last turn (defaults to `auto`); use `none` for a new root.", "parameters": [ { - "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", + "description": "Service API key only: which user identity to assume. Currently only session-creator.", "in": "header", "name": "assume-user", "required": false, diff --git a/docs/openapi.json b/docs/openapi.json index 61aaf765f..6399bf97d 100644 --- a/docs/openapi.json +++ b/docs/openapi.json @@ -10725,7 +10725,7 @@ "description": "List turns for a session (newest first by default), token-paginated. Allowed for the creator, a manager of the bound named agent, or any tenant member when the session is shared.", "parameters": [ { - "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", + "description": "Service API key only: which user identity to assume. Currently only session-creator.", "in": "header", "name": "assume-user", "required": false, @@ -10832,7 +10832,7 @@ "description": "Create a turn within a session and execute it.\nOnly the session creator may create turns.\nWhen `stream` is true (default), respond with a Server-Sent Events stream of turn events.\nWhen `stream` is false, return the turn immediately with `state.status: \"running\"` while execution continues in the background; use get turn or subscribe to observe completion.\nUse `previous_turn_id` to chain to the session's last turn (defaults to `auto`); use `none` for a new root.", "parameters": [ { - "description": "Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later.", + "description": "Service API key only: which user identity to assume. Currently only session-creator.", "in": "header", "name": "assume-user", "required": false, diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts index 03056529a..d7450c73d 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsRequest.ts @@ -12,7 +12,7 @@ import type * as TrueForge from "../../../../index.js"; * } */ export interface CreateTurnSessionsRequest { - /** Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. */ + /** Service API key only: which user identity to assume. Currently only session-creator. */ assumeUser?: "session-creator"; /** User messages for this turn. At least one is required. */ input: TrueForge.CreateTurnSessionsRequestInputItem[]; diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts index 82e9309f9..41283d900 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/CreateTurnSessionsStreamRequest.ts @@ -12,7 +12,7 @@ import type * as TrueForge from "../../../../index.js"; * } */ export interface CreateTurnSessionsStreamRequest { - /** Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. */ + /** Service API key only: which user identity to assume. Currently only session-creator. */ assumeUser?: "session-creator"; /** User messages for this turn. At least one is required. */ input: TrueForge.CreateTurnSessionsStreamRequestInputItem[]; diff --git a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts index 11db907c2..e54b30027 100644 --- a/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts +++ b/packages/trueforge-sdk/src/api/resources/sessions/client/requests/ListTurnsSessionsRequest.ts @@ -9,6 +9,6 @@ export interface ListTurnsSessionsRequest { limit?: number; /** Opaque token from a previous response `next_page_token`. */ pageToken?: string; - /** Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. */ + /** Service API key only: which user identity to assume. Currently only session-creator. */ assumeUser?: "session-creator"; } diff --git a/python/trueforge_sdk/reference.md b/python/trueforge_sdk/reference.md index 69ccc4098..20a21a712 100644 --- a/python/trueforge_sdk/reference.md +++ b/python/trueforge_sdk/reference.md @@ -2948,7 +2948,7 @@ client.sessions.list_turns(
-**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. +**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: which user identity to assume. Currently only session-creator.
@@ -3055,7 +3055,7 @@ client.sessions.create_turn_stream(
-**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. +**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: which user identity to assume. Currently only session-creator.
@@ -3170,7 +3170,7 @@ client.sessions.create_turn_stream(
-**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. +**assume_user:** `typing.Optional[typing.Literal]` — Service API key only: which user identity to assume. Currently only session-creator.
diff --git a/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py b/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py index 453ceba66..3c826d5b4 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py +++ b/python/trueforge_sdk/src/trueforge_sdk/sessions/client.py @@ -491,7 +491,7 @@ def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -551,7 +551,7 @@ def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -621,7 +621,7 @@ def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -1453,7 +1453,7 @@ async def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -1522,7 +1522,7 @@ def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -1601,7 +1601,7 @@ async def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] diff --git a/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py b/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py index 8db4b4dee..104a65b06 100644 --- a/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py +++ b/python/trueforge_sdk/src/trueforge_sdk/sessions/raw_client.py @@ -890,7 +890,7 @@ def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -1003,7 +1003,7 @@ def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -1193,7 +1193,7 @@ def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -2752,7 +2752,7 @@ async def list_turns( Opaque token from a previous response `next_page_token`. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. request_options : typing.Optional[RequestOptions] Request-specific configuration. @@ -2868,7 +2868,7 @@ async def create_turn_stream( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] @@ -3058,7 +3058,7 @@ async def create_turn( User messages for this turn. At least one is required. assume_user : typing.Optional[typing.Literal["session-creator"]] - Service API key only: assume role (not a user id). Today only session-creator; more roles may be added later. + Service API key only: which user identity to assume. Currently only session-creator. previous_turn_id : typing.Optional[PreviousTurnIdInput] From e97f44f527219a3f8e5e2f38b11fabc03f5079b1 Mon Sep 17 00:00:00 2001 From: thesujai Date: Fri, 13 Nov 2026 10:44:15 +0530 Subject: [PATCH 12/13] refactor(turns): simplify resolveTurnRequestContext by removing resolveRequestContext parameter and clarifying assume-user handling --- packages/trueforge/src/apis/turns.ts | 38 ++++++++++++---------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index 90a74cec0..f5d71b053 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -1155,31 +1155,27 @@ async function resolveTurnRequestContext(params: { c: Context; sessions: Sessions; session_id: string; - resolveRequestContext: ResolveRequestContext; }): Promise { - const { c, sessions, session_id: sessionId, resolveRequestContext } = params; + const { c, sessions, session_id: sessionId } = params; const existing = c.get('request_context'); if (existing) { return existing; } - // Service key clears context; require assume-user so a JWT+header cannot take this path. - if (c.req.header(ASSUME_USER_HEADER)?.trim()) { - return applyAssumeUserToContext({ - c, - resolveCreatedBy: async () => { - const session = await sessions.getById({ session_id: sessionId }); - if (!session) { - throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); - } - return { - tenant_id: session.record.tenant_id, - created_by_subject: session.record.created_by_subject, - session_id: sessionId, - }; - }, - }); - } - return resolveRequestContext(c); + // Service key left context unset; assume-user is required (400 if missing/invalid). + return applyAssumeUserToContext({ + c, + resolveCreatedBy: async () => { + const session = await sessions.getById({ session_id: sessionId }); + if (!session) { + throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); + } + return { + tenant_id: session.record.tenant_id, + created_by_subject: session.record.created_by_subject, + session_id: sessionId, + }; + }, + }); } /** Request-reply path the owner serves for inbound turn events. */ @@ -1832,7 +1828,6 @@ export function createTurnsRouter(deps: TurnsRouterDeps(deps: TurnsRouterDeps Date: Fri, 13 Nov 2026 10:51:55 +0530 Subject: [PATCH 13/13] refactor(turns): enhance resolveTurnRequestContext to include resolveRequestContext parameter and improve error handling for missing assume-user header --- packages/trueforge/src/apis/turns.ts | 46 ++++++++++++++++++---------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/packages/trueforge/src/apis/turns.ts b/packages/trueforge/src/apis/turns.ts index f5d71b053..26c71d79d 100644 --- a/packages/trueforge/src/apis/turns.ts +++ b/packages/trueforge/src/apis/turns.ts @@ -1155,27 +1155,39 @@ async function resolveTurnRequestContext(params: { c: Context; sessions: Sessions; session_id: string; + resolveRequestContext: ResolveRequestContext; }): Promise { - const { c, sessions, session_id: sessionId } = params; + const { c, sessions, session_id: sessionId, resolveRequestContext } = params; const existing = c.get('request_context'); if (existing) { return existing; } - // Service key left context unset; assume-user is required (400 if missing/invalid). - return applyAssumeUserToContext({ - c, - resolveCreatedBy: async () => { - const session = await sessions.getById({ session_id: sessionId }); - if (!session) { - throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); - } - return { - tenant_id: session.record.tenant_id, - created_by_subject: session.record.created_by_subject, - session_id: sessionId, - }; - }, - }); + // Service key clears context; require assume-user so a JWT+header cannot take this path. + if (c.req.header(ASSUME_USER_HEADER)?.trim()) { + return applyAssumeUserToContext({ + c, + resolveCreatedBy: async () => { + const session = await sessions.getById({ session_id: sessionId }); + if (!session) { + throw new HTTPException(404, { message: `Session not found: ${sessionId}` }); + } + return { + tenant_id: session.record.tenant_id, + created_by_subject: session.record.created_by_subject, + session_id: sessionId, + }; + }, + }); + } + try { + return resolveRequestContext(c); + } catch (error) { + // Service key left context unset with no assume-user → 400, not a 500 from missing context. + if (error instanceof Error && error.message === 'RequestContext missing; auth middleware did not run') { + throw new HTTPException(400, { message: `Missing ${ASSUME_USER_HEADER} header`, cause: error }); + } + throw error; + } } /** Request-reply path the owner serves for inbound turn events. */ @@ -1828,6 +1840,7 @@ export function createTurnsRouter(deps: TurnsRouterDeps(deps: TurnsRouterDeps